Skip to content

Commit 9bce4e9

Browse files
committed
see 12/22 log
1 parent e9f6cf4 commit 9bce4e9

File tree

4 files changed

+9
-13
lines changed

4 files changed

+9
-13
lines changed

app/src/main/java/com/blankj/androidutilcode/Services/LocationService.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
import android.os.Looper;
1010
import android.support.annotation.Nullable;
1111

12-
import com.blankj.androidutilcode.App;
1312
import com.blankj.utilcode.utils.LocationUtils;
14-
import com.blankj.utilcode.utils.ThreadPoolUtils;
1513
import com.blankj.utilcode.utils.ToastUtils;
1614

1715
/**
@@ -55,9 +53,9 @@ public void onLocationChanged(final Location location) {
5553
if (mOnGetLocationListener != null) {
5654
mOnGetLocationListener.getLocation(lastLatitude, lastLongitude, latitude, longitude, country, locality, street);
5755
}
58-
country = LocationUtils.getCountryName(App.getInstance(), Double.parseDouble(latitude), Double.parseDouble(longitude));
59-
locality = LocationUtils.getLocality(App.getInstance(), Double.parseDouble(latitude), Double.parseDouble(longitude));
60-
street = LocationUtils.getStreet(App.getInstance(), Double.parseDouble(latitude), Double.parseDouble(longitude));
56+
country = LocationUtils.getCountryName(Double.parseDouble(latitude), Double.parseDouble(longitude));
57+
locality = LocationUtils.getLocality(Double.parseDouble(latitude), Double.parseDouble(longitude));
58+
street = LocationUtils.getStreet(Double.parseDouble(latitude), Double.parseDouble(longitude));
6159
if (mOnGetLocationListener != null) {
6260
mOnGetLocationListener.getLocation(lastLatitude, lastLongitude, latitude, longitude, country, locality, street);
6361
}
@@ -76,7 +74,7 @@ public void onCreate() {
7674
@Override
7775
public void run() {
7876
Looper.prepare();
79-
isSuccess = LocationUtils.register(App.getInstance(), 0, 0, mOnLocationChangeListener);
77+
isSuccess = LocationUtils.register(0, 0, mOnLocationChangeListener);
8078
if (isSuccess) ToastUtils.showShortToastSafe("init success");
8179
Looper.loop();
8280
}

app/src/main/java/com/blankj/androidutilcode/activities/AppActivity.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import android.view.View;
66
import android.widget.TextView;
77

8-
import com.blankj.androidutilcode.App;
98
import com.blankj.androidutilcode.R;
109
import com.blankj.utilcode.utils.AppUtils;
1110

@@ -60,7 +59,7 @@ public void onClick(View view) {
6059
new Thread(new Runnable() {
6160
@Override
6261
public void run() {
63-
AppUtils.installAppSilent(App.getInstance(), appPath);
62+
AppUtils.installAppSilent(appPath);
6463
}
6564
}).start();
6665
break;

app/src/main/java/com/blankj/androidutilcode/activities/KeyboardActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public void onClick(View view) {
4949
KeyboardUtils.hideSoftInput(this);
5050
break;
5151
case R.id.btn_show_soft_input:
52-
KeyboardUtils.showSoftInput(this, (EditText) findViewById(R.id.et));
52+
KeyboardUtils.showSoftInput((EditText) findViewById(R.id.et));
5353
break;
5454
case R.id.btn_toggle_soft_input:
5555
KeyboardUtils.toggleSoftInput();

utilcode/src/main/java/com/blankj/utilcode/utils/AppUtils.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,14 @@ public static void installApp(Activity activity, File file, int requestCode) {
8787
* 静默安装App
8888
* <p>非root需添加权限 {@code <uses-permission android:name="android.permission.INSTALL_PACKAGES" />}</p>
8989
*
90-
* @param context 上下文
9190
* @param filePath 文件路径
9291
* @return {@code true}: 安装成功<br>{@code false}: 安装失败
9392
*/
94-
public static boolean installAppSilent(Context context, String filePath) {
93+
public static boolean installAppSilent(String filePath) {
9594
File file = FileUtils.getFileByPath(filePath);
9695
if (!FileUtils.isFileExists(file)) return false;
9796
String command = "LD_LIBRARY_PATH=/vendor/lib:/system/lib pm install " + filePath;
98-
ShellUtils.CommandResult commandResult = ShellUtils.execCmd(command, !isSystemApp(context), true);
97+
ShellUtils.CommandResult commandResult = ShellUtils.execCmd(command, !isSystemApp(Utils.context), true);
9998
return commandResult.successMsg != null && commandResult.successMsg.toLowerCase().contains("success");
10099
}
101100

@@ -689,7 +688,7 @@ public static boolean cleanAppData(Context context, String... dirPaths) {
689688
/**
690689
* 清除App所有数据
691690
*
692-
* @param dirs 目录
691+
* @param dirs 目录
693692
* @return {@code true}: 成功<br>{@code false}: 失败
694693
*/
695694
public static boolean cleanAppData(File... dirs) {

0 commit comments

Comments
 (0)