From addda19fd559456fa65913bada554c97146bb97a Mon Sep 17 00:00:00 2001 From: tongtongstudio Date: Thu, 22 Jul 2021 16:51:25 +0800 Subject: [PATCH] =?UTF-8?q?version:2.2.0=20update:=E5=B9=B3=E6=9D=BF?= =?UTF-8?q?=E9=87=8D=E5=90=AF=E6=97=B6=E9=97=B4=E7=AE=A1=E6=8E=A7=E5=BC=B9?= =?UTF-8?q?=E5=87=BA=E5=A4=AA=E6=85=A2=EF=BC=8C=E9=87=8D=E5=90=AF=E5=90=8E?= =?UTF-8?q?=E7=AE=A1=E5=AF=BC=E8=88=AA=E6=A0=8F=E6=8C=89=E9=94=AE=E5=A4=AA?= =?UTF-8?q?=E6=85=A2=20fix:log=E9=9B=86=E4=B8=AD=E7=AE=A1=E7=90=86=20add:?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=AE=BE=E5=A4=87ip=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=EF=BC=8C=E8=87=AA=E5=AE=9A=E4=B9=89=E7=99=BD=E5=90=8D=E5=8D=95?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 9 +- app/src/main/AndroidManifest.xml | 12 +- .../myappstore/activity/HomeActivity.java | 24 +- .../myappstore/activity/MainActivity.java | 31 +- .../myappstore/activity/MainContact.java | 4 + .../myappstore/activity/MainPresenter.java | 405 ++++++++++-------- .../myappstore/base/BaseApplication.java | 98 ++--- .../mjsheng/myappstore/bean/AppListInfo.java | 84 ++++ .../jpush/TagAliasOperatorHelper.java | 4 +- .../mjsheng/myappstore/log/LogReceiver.java | 6 +- .../myappstore/manager/AmapManager.java | 16 +- .../myappstore/manager/FileManager.java | 6 +- .../manager/NetInterfaceManager.java | 13 + .../myappstore/network/HTTPInterface.java | 271 ++++++++---- .../myappstore/network/URLAddress.java | 8 +- .../network/api/newapi/GetAllApp.java | 21 + .../network/api/newapi/GetEBagCode.java | 18 + .../myappstore/receiver/BootReceiver.java | 4 +- .../myappstore/receiver/MyJPushReceiver.java | 217 +++++----- .../myappstore/receiver/NewAppReceiver.java | 32 +- .../myappstore/service/GuardService.java | 72 ++-- .../myappstore/service/JWebSocketClient.java | 10 +- .../myappstore/service/LogcatService.java | 16 +- .../myappstore/service/MainService.java | 121 +++--- .../myappstore/service/RemoteService.java | 11 +- .../myappstore/service/StepService.java | 34 +- .../mjsheng/myappstore/utils/ApkUtils.java | 115 ++--- .../mjsheng/myappstore/utils/BootManager.java | 21 +- .../mjsheng/myappstore/utils/CacheUtils.java | 13 +- .../com/mjsheng/myappstore/utils/CmdUtil.java | 13 +- .../myappstore/utils/ForegroundAppUtil.java | 5 +- .../utils/InstallResultReceiver.java | 3 +- .../mjsheng/myappstore/utils/JGYUtils.java | 399 +++++++++++------ .../mjsheng/myappstore/utils/Logutils.java | 37 ++ .../myappstore/utils/NetworkUtils.java | 2 +- .../myappstore/utils/SaveListUtils.java | 19 +- .../myappstore/utils/ServiceAliveUtils.java | 5 +- .../myappstore/utils/SysSettingUtils.java | 169 +++++--- .../mjsheng/myappstore/utils/ToastUtil.java | 3 +- .../mjsheng/myappstore/utils/URLUtils.java | 125 +++--- .../com/mjsheng/myappstore/utils/Utils.java | 65 ++- .../mjsheng/myappstore/utils/XAPKUtils.java | 45 +- .../main/res/layout-land/activity_main.xml | 4 +- .../main/res/layout-port/activity_main.xml | 4 +- 44 files changed, 1560 insertions(+), 1034 deletions(-) create mode 100644 app/src/main/java/com/mjsheng/myappstore/bean/AppListInfo.java create mode 100644 app/src/main/java/com/mjsheng/myappstore/network/api/newapi/GetAllApp.java create mode 100644 app/src/main/java/com/mjsheng/myappstore/network/api/newapi/GetEBagCode.java create mode 100644 app/src/main/java/com/mjsheng/myappstore/utils/Logutils.java diff --git a/app/build.gradle b/app/build.gradle index fface70..e3b2b06 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -41,9 +41,9 @@ android { //新平台正式 newly { flavorDimensions "default" - versionCode 519 + versionCode 520 //versionCode 1037 - versionName "2.1.9" + versionName "2.2.0" /*********************************极光推送************************************/ manifestPlaceholders = [ JPUSH_PKGNAME: "com.jiaoguanyi.appstore", @@ -61,8 +61,8 @@ android { //新平台测试 beta { flavorDimensions "default" - versionCode 528 - versionName "2.1.8" + versionCode 530 + versionName "2.2.0" /*********************************极光推送************************************/ manifestPlaceholders = [ JPUSH_PKGNAME: "com.jiaoguanyi.appstore", @@ -75,6 +75,7 @@ android { buildConfigField "String", "ROOT_URL", '"http://name.uiuios.com/api/"' buildConfigField "String", "WebsocketURL", '"ws://39.108.116.195:2345"' buildConfigField "String", "SCREEN_URL", '"https://name.uiuios.com:2018/wm/is_online"' + versionNameSuffix "-beta" } // //老平台正式 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 032a0d1..ddcfd4f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -28,18 +28,22 @@ - + + + tools:ignore="ProtectedPermissions" /> + + tools:ignore="ProtectedPermissions" /> + + android:protectionLevel="signature" /> + diff --git a/app/src/main/java/com/mjsheng/myappstore/activity/HomeActivity.java b/app/src/main/java/com/mjsheng/myappstore/activity/HomeActivity.java index acf4845..5879e54 100644 --- a/app/src/main/java/com/mjsheng/myappstore/activity/HomeActivity.java +++ b/app/src/main/java/com/mjsheng/myappstore/activity/HomeActivity.java @@ -8,7 +8,6 @@ import android.graphics.Bitmap; import android.os.Bundle; import android.os.Handler; import android.provider.Settings; -import android.util.Log; import android.view.View; import android.webkit.WebView; import android.webkit.WebViewClient; @@ -20,6 +19,8 @@ import com.mjsheng.myappstore.BuildConfig; import com.mjsheng.myappstore.R; import com.lzy.okgo.model.HttpHeaders; import com.mjsheng.myappstore.service.LogcatService; +import com.mjsheng.myappstore.utils.JGYUtils; +import com.mjsheng.myappstore.utils.Logutils; import com.mjsheng.myappstore.utils.ServiceAliveUtils; @@ -73,20 +74,21 @@ public class HomeActivity extends AppCompatActivity { // Utils.getHardware(this); // setWebView(); // hideStatusBar(); - Log.e(TAG, "DebugTest: " + HttpHeaders.getUserAgent()); + Logutils.e(TAG, "DebugTest: " + HttpHeaders.getUserAgent()); // boolean qch_force_app = Settings.System.putString(getContentResolver(), "qch_launcher_icon_app", ""); - Log.e(TAG, "DebugTest: qch_launcher_icon_app:" + Settings.System.getString(getContentResolver(), "qch_launcher_icon_app")); - Log.e(TAG, "DebugTest: qch_hide_NavigationBar: " + Settings.System.getString(getContentResolver(), "qch_hide_NavigationBar")); + Logutils.e(TAG, "DebugTest: qch_launcher_icon_app:" + Settings.System.getString(getContentResolver(), "qch_launcher_icon_app")); + Logutils.e(TAG, "DebugTest: qch_hide_NavigationBar: " + Settings.System.getString(getContentResolver(), "qch_hide_NavigationBar")); String only_jgy_shortcut_list = Settings.System.getString(getContentResolver(), "only_jgy_shortcut_list"); - Log.e(TAG, "debugTest: only_jgy_shortcut_list:" + only_jgy_shortcut_list); + Logutils.e(TAG, "debugTest: only_jgy_shortcut_list:" + only_jgy_shortcut_list); String qch_app_forbid = Settings.System.getString(getContentResolver(), "qch_app_forbid"); - Log.e(TAG, "debugTest: qch_app_forbid:" + qch_app_forbid); + Logutils.e(TAG, "debugTest: qch_app_forbid:" + qch_app_forbid); + Logutils.e(TAG, "debugTest: ip = " + JGYUtils.getInstance().getIPAddress()); // try { // new CacheUtils().cleanApplicationUserData(HomeActivity.this, "com.android.launcher3"); // } catch (Exception e) { // e.printStackTrace(); -// Log.e(TAG, "DebugTest: " + e.getMessage()); +// Logutils.e(TAG, "DebugTest: " + e.getMessage()); // } // ActivityManager mAm = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE); // mAm.killBackgroundProcesses("com.android.documentsui"); @@ -116,15 +118,15 @@ public class HomeActivity extends AppCompatActivity { // file.createNewFile(); // } catch (IOException e) { // e.printStackTrace(); -// Log.e("bootanimation", e.getMessage()); +// Logutils.e("bootanimation", e.getMessage()); // } // } -// Log.e("bootanimation", "SD卡路径存在"); +// Logutils.e("bootanimation", "SD卡路径存在"); // try { // Path path = Paths.get(file.getAbsolutePath()); // Files.copy(path, new FileOutputStream(path0)); // } catch (Exception e) { -// Log.e("bootanimation", e.getMessage()); +// Logutils.e("bootanimation", e.getMessage()); // } // } } @@ -148,7 +150,7 @@ public class HomeActivity extends AppCompatActivity { super.onPageFinished(view, url); String realUrl = url; //这个realUrl即为重定向之后的地址 - Log.e(TAG, "onPageFinished: " + realUrl); + Logutils.e(TAG, "onPageFinished: " + realUrl); } }); } diff --git a/app/src/main/java/com/mjsheng/myappstore/activity/MainActivity.java b/app/src/main/java/com/mjsheng/myappstore/activity/MainActivity.java index 7c1ad5f..f2dd0c1 100644 --- a/app/src/main/java/com/mjsheng/myappstore/activity/MainActivity.java +++ b/app/src/main/java/com/mjsheng/myappstore/activity/MainActivity.java @@ -8,7 +8,6 @@ import android.content.Intent; import android.content.IntentFilter; import android.graphics.Bitmap; import android.text.TextUtils; -import android.util.Log; import android.view.KeyEvent; import android.view.View; import android.widget.Button; @@ -26,6 +25,7 @@ import com.mjsheng.myappstore.service.MainService; import com.mjsheng.myappstore.utils.ApkUtils; import com.mjsheng.myappstore.utils.ExampleUtil; import com.mjsheng.myappstore.utils.JGYUtils; +import com.mjsheng.myappstore.utils.Logutils; import com.mjsheng.myappstore.utils.SaveListUtils; import com.mjsheng.myappstore.utils.SysSettingUtils; import com.mjsheng.myappstore.utils.ToastUtil; @@ -104,7 +104,7 @@ public class MainActivity extends BaseActivity implements MainContact.MainView { ButterKnife.bind(this); mPresenter = new MainPresenter(this); mPresenter.attachView(this); - Log.e(TAG, "initView: " + "start request"); + Logutils.e(TAG, "initView: " + "start request"); mPresenter.getFirstConnect(); getDevicesInfo(); setStoreUpdateListener(bt_checkupdate); @@ -123,10 +123,10 @@ public class MainActivity extends BaseActivity implements MainContact.MainView { } tv_version.setText(BuildConfig.VERSION_NAME); //获取自定义版本 - //Log.e(TAG, "getDevicesInfo: " + Utils.getProperty("ro.build.id", "获取失败")); + //Logutils.e(TAG, "getDevicesInfo: " + Utils.getProperty("ro.build.id", "获取失败")); //展讯获取自定义版本 - Log.e(TAG, "getDevicesInfo: CustomVersion: " + Utils.getCustomVersion()); - Log.e(TAG, "getDevicesInfo: RomVersion: " + Utils.getRomVersion()); + Logutils.e(TAG, "getDevicesInfo: CustomVersion: " + Utils.getCustomVersion()); + Logutils.e(TAG, "getDevicesInfo: RomVersion: " + Utils.getRomVersion()); tv_customversion.setText(Utils.getCustomVersion()); } @@ -135,7 +135,7 @@ public class MainActivity extends BaseActivity implements MainContact.MainView { if (sn.length() != 12) { showSNErrorDialog("设备SN号码格式错误！"); } else { - Log.e(TAG, "checkSNError: " + sn); + Logutils.e(TAG, "checkSNError: " + sn); } //检查平台和sn是否对应 if (JGYUtils.getInstance().checkSNPlatform(sn) != JGYUtils.getInstance().checkAppPlatform()) { @@ -162,7 +162,7 @@ public class MainActivity extends BaseActivity implements MainContact.MainView { @Override public void initData() { registerMessageReceiver(); - Log.e("getMacAddress", Utils.getAndroid7MAC()); + Logutils.e("getMacAddress", Utils.getAndroid7MAC()); timeMillis = System.currentTimeMillis(); mPresenter.getLockedState(); } @@ -233,7 +233,7 @@ public class MainActivity extends BaseActivity implements MainContact.MainView { */ @Override public void setFirstConnect(boolean state) { - Log.e(TAG, "isFirstConnect: " + "end request"); + Logutils.e(TAG, "isFirstConnect: " + "end request"); if (state) { mPresenter.setDisableSetting(); } else { @@ -253,6 +253,11 @@ public class MainActivity extends BaseActivity implements MainContact.MainView { @Override public void getSnTimeControlFinished() { + mPresenter.getEBagCode(); + } + + @Override + public void getEBagCodeFinished() { } @@ -394,7 +399,7 @@ public class MainActivity extends BaseActivity implements MainContact.MainView { @Override public void setTopAppFinished() { netWorkIsRunning = false; - Log.e(TAG, "SettingFinished: " + (System.currentTimeMillis() - timeMillis) + " ms"); + Logutils.e(TAG, "SettingFinished: " + (System.currentTimeMillis() - timeMillis) + " ms"); } @Override @@ -481,25 +486,25 @@ public class MainActivity extends BaseActivity implements MainContact.MainView { Observer mObserver = new Observer() { @Override public void onSubscribe(@NonNull Disposable d) { - Log.e("mObserver", "onSubscribe"); + Logutils.e("mObserver", "onSubscribe"); } @Override public void onNext(@NonNull View view) { - Log.e("mObserver", "onNext"); + Logutils.e("mObserver", "onNext"); ToastUtil.show("正在检查更新"); mPresenter.buttonCheckUpdate(bt_checkupdate); } @Override public void onError(@NonNull Throwable e) { - Log.e("mObserver", "onError"); + Logutils.e("mObserver", "onError"); onComplete(); } @Override public void onComplete() { - Log.e("mObserver", "onComplete"); + Logutils.e("mObserver", "onComplete"); } }; diff --git a/app/src/main/java/com/mjsheng/myappstore/activity/MainContact.java b/app/src/main/java/com/mjsheng/myappstore/activity/MainContact.java index 979efd6..198f596 100644 --- a/app/src/main/java/com/mjsheng/myappstore/activity/MainContact.java +++ b/app/src/main/java/com/mjsheng/myappstore/activity/MainContact.java @@ -29,6 +29,8 @@ public class MainContact { void updateDeviceInfoFinished(); //获取时间管控 void getSnTimeControlFinished(); + //获取电子书包激活码 + void getEBagCodeFinished(); //设置击关推送别名 void setAliasFinished(); //设置极光推送标签 @@ -98,6 +100,8 @@ public class MainContact { void updateDeviceInfo(); //获取时间管控 void getSnTimeControl(); + //获取电子书包激活码 + void getEBagCode(); //设置击关推送别名 void setJpushAlias(); //设置极光推送标签 diff --git a/app/src/main/java/com/mjsheng/myappstore/activity/MainPresenter.java b/app/src/main/java/com/mjsheng/myappstore/activity/MainPresenter.java index d5b4f6c..1eb335c 100644 --- a/app/src/main/java/com/mjsheng/myappstore/activity/MainPresenter.java +++ b/app/src/main/java/com/mjsheng/myappstore/activity/MainPresenter.java @@ -7,7 +7,6 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.provider.Settings; import android.text.TextUtils; -import android.util.Log; import android.view.View; import com.alibaba.fastjson.JSON; @@ -35,6 +34,7 @@ import com.mjsheng.myappstore.utils.ApkUtils; import com.mjsheng.myappstore.utils.AES.CXAESUtil; import com.mjsheng.myappstore.utils.ForegroundAppUtil; import com.mjsheng.myappstore.utils.JGYUtils; +import com.mjsheng.myappstore.utils.Logutils; import com.mjsheng.myappstore.utils.SPUtils; import com.mjsheng.myappstore.utils.SysSettingUtils; import com.mjsheng.myappstore.utils.TimeUtils; @@ -75,7 +75,7 @@ public class MainPresenter implements MainContact.Presenter { public MainPresenter(Context context) { this.mContext = context; - Log.e(TAG, "MainPresenter: " + context.getClass()); + Logutils.e(TAG, "MainPresenter: " + context.getClass()); } @Override @@ -92,7 +92,7 @@ public class MainPresenter implements MainContact.Presenter { @Override public void getQRImage(String mac) { - Log.e(TAG, "getQRImage: " + mac); + Logutils.e(TAG, "getQRImage: " + mac); JsonObject jsonObject = new JsonObject(); jsonObject.addProperty("sn", Utils.getSerial()); jsonObject.addProperty("mac", mac); @@ -100,9 +100,9 @@ public class MainPresenter implements MainContact.Presenter { String content = mac; try { content = CXAESUtil.encrypt(key, json); - Log.e(TAG, "getQRImage: " + content); + Logutils.e(TAG, "getQRImage: " + content); } catch (Exception e) { - Log.e(TAG, "getQRImage: " + e.getMessage()); + Logutils.e(TAG, "getQRImage: " + e.getMessage()); e.printStackTrace(); } mView.setQRImage(JGYUtils.getInstance().createQRImage(content, 300, 300)); @@ -119,12 +119,12 @@ public class MainPresenter implements MainContact.Presenter { .subscribe(new Observer>() { @Override public void onSubscribe(@NonNull Disposable d) { - Log.e("getStudesInfo", "onSubscribe: "); + Logutils.e(TAG + ":" + "getStudesInfo", "onSubscribe: "); } @Override public void onNext(@NonNull BaseResponse studentsInfoBaseResponse) { - Log.e("getStudesInfo", "onNext: " + studentsInfoBaseResponse.data); + Logutils.e(TAG + ":" + "getStudesInfo", "onNext: " + studentsInfoBaseResponse.data); if (studentsInfoBaseResponse.code == OK) { String sno = studentsInfoBaseResponse.data.getSno(); String realname = studentsInfoBaseResponse.data.getRealname(); @@ -163,24 +163,27 @@ public class MainPresenter implements MainContact.Presenter { /* * 没有获取到的时候显示缓存 * */ -// mView.setNumberText("", View.GONE); -// mView.setNameText("", View.GONE); -// mView.setClassText("", View.GONE); -// mView.setBatchText("", View.GONE); - Log.e("getStudesInfo", "onNext: " + studentsInfoBaseResponse.toString()); + Logutils.e(TAG + ":" + "getStudesInfo", "onNext: " + studentsInfoBaseResponse.toString()); } } @Override public void onError(@NonNull Throwable e) { - Log.e("getStudesInfo", "onError: " + e.getMessage()); + Logutils.e(TAG + ":" + "getStudesInfo", "onError: " + e.getMessage()); setState(); onComplete(); } @Override public void onComplete() { - Log.e("getStudesInfo", "onComplete: "); + //如果是解锁状态就隐藏，锁定就显示缓存 + if (Settings.System.getInt(mContext.getContentResolver(), "qch_unlock_ipad", 0) == 1) { + mView.setNumberText("", View.GONE); + mView.setNameText("", View.GONE); + mView.setClassText("", View.GONE); + mView.setBatchText("", View.GONE); + } + Logutils.e(TAG + ":" + "getStudesInfo", "onComplete: "); } }); } @@ -221,23 +224,23 @@ public class MainPresenter implements MainContact.Presenter { .subscribe(new Observer() { @Override public void onSubscribe(@NonNull Disposable d) { - Log.e("getLockedState", "onSubscribe: "); + Logutils.e(TAG + ":" + "getLockedState", "onSubscribe: "); } @Override public void onNext(@NonNull BaseResponse response) { - Log.e("getLockedState", "onNext: "); + Logutils.e(TAG + ":" + "getLockedState", "onNext: "); if (response.code == OK) { JsonObject jsonObject = JsonParser.parseString(new Gson().toJson(response.data)).getAsJsonObject(); int locked = jsonObject.get("lock").getAsInt(); - Log.e("getLockedState", "locked: " + locked); + Logutils.e(TAG + ":" + "getLockedState", "locked: " + locked); int oldState = Settings.System.getInt(mContext.getContentResolver(), "qch_unlock_ipad", 0); - Log.e("getLockedState", "qch_unlock_ipad: " + oldState); + Logutils.e(TAG + ":" + "getLockedState", "qch_unlock_ipad: " + oldState); //后台1是锁定，底层0是锁定 SPUtils.put(mContext, "first_connect", 1); if (locked == 1) { if (oldState == 1) { - Log.e("getLockedState", "onNext: " + "state changed , reset devices"); + Logutils.e(TAG + ":" + "getLockedState", "onNext: " + "state changed , reset devices"); Utils.doMasterClear(mContext); } Settings.System.putInt(mContext.getContentResolver(), "qch_unlock_ipad", 0); @@ -248,22 +251,22 @@ public class MainPresenter implements MainContact.Presenter { mView.setLockedState(locked == 1); } else if (response.code == -300) { mView.setLockedState(false); - Log.e("getLockedState", "locked: " + false); + Logutils.e(TAG + ":" + "getLockedState", "locked: " + false); } } @Override public void onError(@NonNull Throwable e) { - Log.e("getLockedState", "onError: " + e.getMessage()); + Logutils.e(TAG + ":" + "getLockedState", "onError: " + e.getMessage()); int locked = Settings.System.getInt(mContext.getContentResolver(), "qch_unlock_ipad", 0); - Log.e("getLockedState", "locked: " + locked); + Logutils.e(TAG + ":" + "getLockedState", "locked: " + locked); mView.setLockedState(locked == 0); } @Override public void onComplete() { - Log.e("getLockedState", "onComplete: "); + Logutils.e(TAG + ":" + "getLockedState", "onComplete: "); } }); } @@ -292,27 +295,27 @@ public class MainPresenter implements MainContact.Presenter { .subscribe(new Observer() { @Override public void onSubscribe(@NonNull Disposable d) { - Log.e("sendMACAddress", "onSubscribe: "); + Logutils.e(TAG + ":" + "sendMACAddress", "onSubscribe: "); } @Override public void onNext(@NonNull BaseResponse response) { if (response.code == OK) { - Log.e("sendMACAddress", response.msg); + Logutils.e(TAG + ":" + "sendMACAddress", response.msg); } else { - Log.e("sendMACAddress", response.toString()); + Logutils.e(TAG + ":" + "sendMACAddress", response.toString()); } } @Override public void onError(@NonNull Throwable e) { - Log.e("sendMACAddress", "onError: " + e.getMessage()); + Logutils.e(TAG + ":" + "sendMACAddress", "onError: " + e.getMessage()); onComplete(); } @Override public void onComplete() { - Log.e("sendMACAddress", "onComplete: "); + Logutils.e(TAG + ":" + "sendMACAddress", "onComplete: "); mView.sendMACFinished(); } }); @@ -341,7 +344,7 @@ public class MainPresenter implements MainContact.Presenter { jsonObject.addProperty("longitude", longitude); jsonObject.addProperty("latitude", latitude); String add = jsonObject.toString(); - Log.e(TAG, "updateDevicesInfo: " + add); + Logutils.e(TAG, "updateDevicesInfo: " + add); NetInterfaceManager.getUpdateDeviceInfo() .updateDeviceInfo( Utils.getSerial(), @@ -354,28 +357,28 @@ public class MainPresenter implements MainContact.Presenter { .subscribe(new Observer() { @Override public void onSubscribe(@NonNull Disposable d) { - Log.e("updateDevicesInfo", "onSubscribe: "); + Logutils.e(TAG + ":" + "updateDevicesInfo", "onSubscribe: "); } @Override public void onNext(@NonNull ResponseBody responseBody) { try { - Log.e("updateDevicesInfo", "onSubscribe: " + responseBody.string()); + Logutils.e(TAG + ":" + "updateDevicesInfo", "onSubscribe: " + responseBody.string()); } catch (IOException e) { e.printStackTrace(); - Log.e("updateDevicesInfo", "onSubscribe: IOException: " + e.getMessage()); + Logutils.e(TAG + ":" + "updateDevicesInfo", "onSubscribe: IOException: " + e.getMessage()); } } @Override public void onError(@NonNull Throwable e) { - Log.e("updateDevicesInfo", "onError: " + e.getMessage()); + Logutils.e(TAG + ":" + "updateDevicesInfo", "onError: " + e.getMessage()); onComplete(); } @Override public void onComplete() { - Log.e("updateDevicesInfo", "onComplete: "); + Logutils.e(TAG + ":" + "updateDevicesInfo", "onComplete: "); } }); } @@ -391,12 +394,12 @@ public class MainPresenter implements MainContact.Presenter { .subscribe(new Observer() { @Override public void onSubscribe(@NonNull Disposable d) { - Log.e("getSnTimeControl", "onSubscribe: "); + Logutils.e(TAG + ":" + "getSnTimeControl", "onSubscribe: "); } @Override public void onNext(@NonNull BaseResponse response) { - Log.e("getSnTimeControl", "onNext: "); + Logutils.e(TAG + ":" + "getSnTimeControl", "onNext: "); int code = response.code; if (code == OK) { JSONObject jsonObject = (JSONObject) JSON.toJSON(response.data); @@ -404,26 +407,26 @@ public class MainPresenter implements MainContact.Presenter { String end_time = jsonObject.getString("end_time"); TimeUtils.ContralTime c = TimeUtils.String2ContralTime(mContext, start_time + "-" + end_time); if (null != c) { - Log.e("getTimeControl", "OK:" + c.toString()); + Logutils.e(TAG + ":" + "getTimeControl", "OK:" + c.toString()); } } else { TimeUtils.setEmpty(mContext); TimeUtils.ContralTime c = TimeUtils.getDefaltContralTime(mContext); if (null != c) { - Log.e("getTimeControl", c.toString()); + Logutils.e(TAG + ":" + "getTimeControl", c.toString()); } } } @Override public void onError(@NonNull Throwable e) { - Log.e("getSnTimeControl", "onError: " + e.getMessage()); + Logutils.e(TAG + ":" + "getSnTimeControl", "onError: " + e.getMessage()); onComplete(); } @Override public void onComplete() { - Log.e("getSnTimeControl", "onComplete: "); + Logutils.e(TAG + ":" + "getSnTimeControl", "onComplete: "); Intent intent = new Intent(); intent.setAction(MainService.TimeChangedReceiver.ACTION_UPDATE); mContext.sendBroadcast(intent); @@ -433,13 +436,49 @@ public class MainPresenter implements MainContact.Presenter { } + @Override + public void getEBagCode() { + NetInterfaceManager.getInstance().getEBagCodeControl() + .subscribe(new Observer() { + @Override + public void onSubscribe(Disposable d) { + Logutils.e(TAG + ":" + "getEBagCode", "onSubscribe: "); + } + + @Override + public void onNext(BaseResponse baseResponse) { + Logutils.e(TAG + ":" + "getEBagCode", "onNext: " + baseResponse); + int code = baseResponse.code; + if (code == OK) { + JsonObject jsonObject = JsonParser.parseString(new Gson().toJson(baseResponse.data)).getAsJsonObject(); + String ebagCode = jsonObject.get("ebagCode").getAsString(); + SPUtils.put(mContext, "ebagCode", ebagCode); + } else { + Logutils.e(TAG + ":" + "getEBagCode", "onNext: " + baseResponse.data); + } + } + + @Override + public void onError(Throwable e) { + Logutils.e(TAG + ":" + "getEBagCode", "onError: " + e.getMessage()); + onComplete(); + } + + @Override + public void onComplete() { + Logutils.e(TAG + ":" + "getEBagCode", "onComplete: "); + mView.getEBagCodeFinished(); + } + }); + } + @Override public void setJpushAlias() { JPushInterface.init(mContext); SetAlias(); String rid = JPushInterface.getRegistrationID(mContext); if (!TextUtils.isEmpty(rid)) { - Log.e("setJpushAlias", "RegId:" + rid); + Logutils.e(TAG + ":" + "setJpushAlias", "RegId:" + rid); } JPushInterface.getAlias(mContext, new Random().nextInt(100)); mView.setAliasFinished(); @@ -461,7 +500,7 @@ public class MainPresenter implements MainContact.Presenter { .subscribe(new Observer() { @Override public void onSubscribe(@NonNull Disposable d) { - Log.e("setJpushTags", "onSubscribe: "); + Logutils.e(TAG + ":" + "setJpushTags", "onSubscribe: "); } @Override @@ -469,7 +508,7 @@ public class MainPresenter implements MainContact.Presenter { if (response.code == OK) { JsonObject jsonObject = JsonParser.parseString(new Gson().toJson(response.data)).getAsJsonObject(); String batch = jsonObject.get("batch").getAsString(); - Log.e("setJpushTags", "onNext: " + batch); + Logutils.e(TAG + ":" + "setJpushTags", "onNext: " + batch); if (!TextUtils.isEmpty(batch)) { Set set = new HashSet(); set.add(batch); @@ -485,22 +524,22 @@ public class MainPresenter implements MainContact.Presenter { }); setTag(set); } else { - Log.e("setJpushTags", "onNext: " + "batch empty"); + Logutils.e(TAG + ":" + "setJpushTags", "onNext: " + "batch empty"); } } else { - Log.e("setJpushTags", "onNext: " + response.toString()); + Logutils.e(TAG + ":" + "setJpushTags", "onNext: " + response.toString()); } } @Override public void onError(@NonNull Throwable e) { - Log.e("setJpushTags", "onError: " + e.getMessage()); + Logutils.e(TAG + ":" + "setJpushTags", "onError: " + e.getMessage()); onComplete(); } @Override public void onComplete() { - Log.e("setJpushTags", "onComplete: "); + Logutils.e(TAG + ":" + "setJpushTags", "onComplete: "); mView.setTagsFinished(); } }); @@ -536,31 +575,31 @@ public class MainPresenter implements MainContact.Presenter { .subscribe(new Observer() { @Override public void onSubscribe(@NonNull Disposable d) { - Log.e("checkUpdateStore", "onSubscribe: "); + Logutils.e(TAG + ":" + "checkUpdateStore", "onSubscribe: "); } @Override public void onNext(@NonNull BaseResponse response) { - Log.e("checkUpdateStore", "onNext: " + response.data); + Logutils.e(TAG + ":" + "checkUpdateStore", "onNext: " + response.data); if (response.code == OK) { JsonObject jsonObject = JsonParser.parseString(new Gson().toJson(response.data)).getAsJsonObject(); JGYUtils.getInstance().installAPK(jsonObject); } else { - Log.e("checkUpdateStore", "onNext: " + response); + Logutils.e(TAG + ":" + "checkUpdateStore", "onNext: " + response); } - Log.e("checkUpdateStore", "onNext: "); + Logutils.e(TAG + ":" + "checkUpdateStore", "onNext: "); } @Override public void onError(@NonNull Throwable e) { - Log.e("checkUpdateStore", "onError: " + e.getMessage()); + Logutils.e(TAG + ":" + "checkUpdateStore", "onError: " + e.getMessage()); onComplete(); } @Override public void onComplete() { - Log.e("checkUpdateStore", "onComplete: "); + Logutils.e(TAG + ":" + "checkUpdateStore", "onComplete: "); mView.checkStoreUpdateFinished(); } }); @@ -589,12 +628,12 @@ public class MainPresenter implements MainContact.Presenter { .subscribe(new Observer() { @Override public void onSubscribe(@NonNull Disposable d) { - Log.e("checkUpdateInfo", "onSubscribe: "); + Logutils.e(TAG + ":" + "checkUpdateInfo", "onSubscribe: "); } @Override public void onNext(@NonNull BaseResponse response) { - Log.e("checkUpdateInfo", "onNext: " + response.data); + Logutils.e(TAG + ":" + "checkUpdateInfo", "onNext: " + response.data); if (response.code == OK) { JsonObject jsonObject = JsonParser.parseString(new Gson().toJson(response.data)).getAsJsonObject(); long versionCode = jsonObject.get("version_code").getAsLong(); @@ -617,13 +656,13 @@ public class MainPresenter implements MainContact.Presenter { @Override public void onError(@NonNull Throwable e) { - Log.e("checkUpdateInfo", "onError: " + e.getMessage()); + Logutils.e(TAG + ":" + "checkUpdateInfo", "onError: " + e.getMessage()); onComplete(); } @Override public void onComplete() { - Log.e("checkUpdateInfo", "onComplete: "); + Logutils.e(TAG + ":" + "checkUpdateInfo", "onComplete: "); } }); } @@ -643,7 +682,7 @@ public class MainPresenter implements MainContact.Presenter { .subscribe(new Observer>>() { @Override public void onSubscribe(Disposable d) { - Log.e("checkTestUpdate", "onSubscribe: "); + Logutils.e(TAG + ":" + "checkTestUpdate", "onSubscribe: "); } @Override @@ -652,19 +691,19 @@ public class MainPresenter implements MainContact.Presenter { List APPlist = listBaseResponse.data; JGYUtils.getInstance().installTestAPK(APPlist); } else { - Log.e("checkTestUpdate", "onNext: " + listBaseResponse.msg); + Logutils.e(TAG + ":" + "checkTestUpdate", "onNext: " + listBaseResponse.msg); } } @Override public void onError(Throwable e) { - Log.e("checkTestUpdate", "onError: " + e.getMessage()); + Logutils.e(TAG + ":" + "checkTestUpdate", "onError: " + e.getMessage()); onComplete(); } @Override public void onComplete() { - Log.e("checkTestUpdate", "onComplete: "); + Logutils.e(TAG + ":" + "checkTestUpdate", "onComplete: "); mView.checkTestUpdateFinished(); } }); @@ -685,47 +724,47 @@ public class MainPresenter implements MainContact.Presenter { .subscribe(new Observer() { @Override public void onSubscribe(@NonNull Disposable d) { - Log.e("getAppLimit", "onSubscribe: "); + Logutils.e(TAG + ":" + "getAppLimit", "onSubscribe: "); } @Override public void onNext(@NonNull ResponseBody responseBody) { try { String bodyString = responseBody.string(); - Log.e("getAppLimit", "onNext: " + bodyString); + Logutils.e(TAG + ":" + "getAppLimit", "onNext: " + bodyString); JsonObject jsonObject = JsonParser.parseString(bodyString).getAsJsonObject(); int code = jsonObject.get("code").getAsInt(); if (code == OK) { String data = jsonObject.get("data").getAsJsonObject().get("result").getAsString(); //开机图标 boolean write = Settings.System.putString(mContext.getContentResolver(), "only_jgy_shortcut_list", data); - Log.e(TAG, "onNext: only_jgy_shortcut_list: " + write); + Logutils.e(TAG, "onNext: only_jgy_shortcut_list: " + write); JGYUtils.getInstance().writeAppPackageList(mContext, data); mView.getAppLimitFinished(data); } else { // mView.getAppLimitFinished(""); boolean write = Settings.System.putString(mContext.getContentResolver(), "only_jgy_shortcut_list", ""); - Log.e(TAG, "onNext: only_jgy_shortcut_list: " + write); - Log.e("getAppLimit", "onNext: " + bodyString); + Logutils.e(TAG, "onNext: only_jgy_shortcut_list: " + write); + Logutils.e(TAG + ":" + "getAppLimit", "onNext: " + bodyString); mView.getAppLimitFinished(""); } } catch (IOException e) { e.printStackTrace(); - Log.e("getAppLimit", "onNext: IOException: " + e.getMessage()); + Logutils.e(TAG + ":" + "getAppLimit", "onNext: IOException: " + e.getMessage()); } } @Override public void onError(@NonNull Throwable e) { - Log.e("getAppLimit", "onError: " + e.getMessage()); + Logutils.e(TAG + ":" + "getAppLimit", "onError: " + e.getMessage()); String oldListString = Settings.System.getString(mContext.getContentResolver(), "qch_app_forbid"); - Log.e("getAppLimit", "oldListString: " + oldListString); + Logutils.e(TAG + ":" + "getAppLimit", "oldListString: " + oldListString); mView.getAppLimitFinished(oldListString); } @Override public void onComplete() { - Log.e("getAppLimit", "onComplete: "); + Logutils.e(TAG + ":" + "getAppLimit", "onComplete: "); } }); } @@ -737,7 +776,7 @@ public class MainPresenter implements MainContact.Presenter { return; } int locked = Settings.System.getInt(mContext.getContentResolver(), "qch_unlock_ipad", 0); - Log.e(TAG, "getDeviceBatch: " + locked); + Logutils.e(TAG, "getDeviceBatch: " + locked); if (locked == 0) { // NetInterfaceManager.getInstance() // .getBatchObservable() @@ -745,12 +784,12 @@ public class MainPresenter implements MainContact.Presenter { // .subscribe(new Observer() { // @Override // public void onSubscribe(@NonNull Disposable d) { -// Log.e("getDeviceBatch", "onSubscribe: "); +// Logutils.e(TAG+":"+"getDeviceBatch", "onSubscribe: "); // } // // @Override // public void onNext(@NonNull ResponseBody responseBody) { -// Log.e("getDeviceBatch", "onNext: "); +// Logutils.e(TAG+":"+"getDeviceBatch", "onNext: "); // try { // String respons = responseBody.string(); // JSONObject jsonObject = JSON.parseObject(respons); @@ -759,13 +798,13 @@ public class MainPresenter implements MainContact.Presenter { // String data = jsonObject.getString("data"); // List batchList = JSON.parseArray(data, Batch.class); // if (null != batchList && batchList.size() > 1) { -// Log.e("getDeviceBatch", "onNext: " + "deleteOtherApp"); +// Logutils.e(TAG+":"+"getDeviceBatch", "onNext: " + "deleteOtherApp"); // if (!BuildConfig.DEBUG) { JGYUtils.getInstance().deleteOtherApp(); // } // } else { -// Log.e("getDeviceBatch", "批次为空"); -// Log.e("getDeviceBatch", "onNext: respons:" + respons); +// Logutils.e(TAG+":"+"getDeviceBatch", "批次为空"); +// Logutils.e(TAG+":"+"getDeviceBatch", "onNext: respons:" + respons); // } // } // } catch (IOException e) { @@ -775,13 +814,13 @@ public class MainPresenter implements MainContact.Presenter { // // @Override // public void onError(@NonNull Throwable e) { -// Log.e("getDeviceBatch", "onError: " + e.getMessage()); +// Logutils.e(TAG+":"+"getDeviceBatch", "onError: " + e.getMessage()); // onComplete(); // } // // @Override // public void onComplete() { -// Log.e("getDeviceBatch", "onComplete: "); +// Logutils.e(TAG+":"+"getDeviceBatch", "onComplete: "); mView.getDeviceBatchFinished(); // } // }); @@ -797,15 +836,15 @@ public class MainPresenter implements MainContact.Presenter { .subscribe(new Observer() { @Override public void onSubscribe(@NonNull Disposable d) { - Log.e("getForceDownload", "onSubscribe: "); + Logutils.e(TAG + ":" + "getForceDownload", "onSubscribe: "); } @Override public void onNext(@NonNull ForceDownloadBean forceDownloadBean) { - Log.e("getForceDownload", "onNext: "); + Logutils.e(TAG + ":" + "getForceDownload", "onNext: "); switch (forceDownloadBean.getCode()) { case 200: - Log.e("getForceDownload", "isDownloading=" + BaseApplication.getInstance().isDownloading()); + Logutils.e(TAG + ":" + "getForceDownload", "isDownloading=" + BaseApplication.getInstance().isDownloading()); BaseApplication.getInstance().checkIsDownloading(); if (!BaseApplication.getInstance().isDownloading()) { // Aria.download(this).removeAllTask(true); @@ -820,23 +859,23 @@ public class MainPresenter implements MainContact.Presenter { break; case -200: boolean qch_force_app = Settings.System.putString(mContext.getContentResolver(), "qch_force_app", "invalid"); - Log.e("getForceDownload", "qch_force_app:" + qch_force_app); + Logutils.e(TAG + ":" + "getForceDownload", "qch_force_app:" + qch_force_app); break; default: - Log.e("getForceDownload", forceDownloadBean.getMsg()); + Logutils.e(TAG + ":" + "getForceDownload", forceDownloadBean.getMsg()); break; } } @Override public void onError(@NonNull Throwable e) { - Log.e("getForceDownload", "onError: " + e.getMessage()); + Logutils.e(TAG + ":" + "getForceDownload", "onError: " + e.getMessage()); onComplete(); } @Override public void onComplete() { - Log.e("getForceDownload", "onComplete: "); + Logutils.e(TAG + ":" + "getForceDownload", "onComplete: "); mView.getForceDownloadFinished(); } }); @@ -860,12 +899,12 @@ public class MainPresenter implements MainContact.Presenter { .subscribe(new Observer>() { @Override public void onSubscribe(@NonNull Disposable d) { - Log.e("getBrowserList", "onSubscribe: "); + Logutils.e(TAG + ":" + "getBrowserList", "onSubscribe: "); } @Override public void onNext(@NonNull BaseResponse browserDataBaseResponse) { - Log.e("getBrowserList", "onNext: "); + Logutils.e(TAG + ":" + "getBrowserList", "onNext: "); if (browserDataBaseResponse.code == 200) { String white = browserDataBaseResponse.data.getWhite(); @@ -875,7 +914,7 @@ public class MainPresenter implements MainContact.Presenter { white += "," + homePage; } boolean whiteList = Settings.System.putString(mContext.getContentResolver(), "DeselectBrowserArray", white); - Log.e("getBrowserList", "setBrowserList white: " + white + ":" + whiteList); + Logutils.e(TAG + ":" + "getBrowserList", "setBrowserList white: " + white + ":" + whiteList); mView.getBrowserListFinished(white); } else { Settings.System.putString(mContext.getContentResolver(), "DeselectBrowserArray", " "); @@ -884,7 +923,7 @@ public class MainPresenter implements MainContact.Presenter { String black = browserDataBaseResponse.data.getBlack(); if (!TextUtils.isEmpty(black)) { boolean blackList = Settings.System.putString(mContext.getContentResolver(), "qch_webblack_url", black); - Log.e("getBrowserList", "setBrowserList black: " + black + ":" + blackList); + Logutils.e(TAG + ":" + "getBrowserList", "setBrowserList black: " + black + ":" + blackList); } else { Settings.System.putString(mContext.getContentResolver(), "qch_webblack_url", " "); } @@ -895,16 +934,16 @@ public class MainPresenter implements MainContact.Presenter { @Override public void onError(@NonNull Throwable e) { - Log.e("getBrowserList", "onError: " + e.getMessage()); + Logutils.e(TAG + ":" + "getBrowserList", "onError: " + e.getMessage()); String whiteURLList = Settings.System.getString(mContext.getContentResolver(), "DeselectBrowserArray"); - Log.e("getBrowserList", "whiteURLList: " + whiteURLList); + Logutils.e(TAG + ":" + "getBrowserList", "whiteURLList: " + whiteURLList); mView.getBrowserListFinished(whiteURLList); onComplete(); } @Override public void onComplete() { - Log.e("getBrowserList", "onComplete: "); + Logutils.e(TAG + ":" + "getBrowserList", "onComplete: "); } }); } @@ -917,12 +956,12 @@ public class MainPresenter implements MainContact.Presenter { .subscribe(new Observer>() { @Override public void onSubscribe(@NonNull Disposable d) { - Log.e("NewSetBrowserList", "onSubscribe: "); + Logutils.e(TAG + ":" + "NewSetBrowserList", "onSubscribe: "); } @Override public void onNext(@NonNull BaseResponse browserDataBaseResponse) { - Log.e("NewSetBrowserList", "onNext: "); + Logutils.e(TAG + ":" + "NewSetBrowserList", "onNext: "); if (browserDataBaseResponse.code == OK) { String white = browserDataBaseResponse.data.getWhite(); String black = browserDataBaseResponse.data.getBlack(); @@ -931,9 +970,9 @@ public class MainPresenter implements MainContact.Presenter { Settings.System.putString(mContext.getContentResolver(), "BlackBrowserArray", " "); //黑白名单同时存在时由以前的逻辑管控 boolean whiteList = Settings.System.putString(mContext.getContentResolver(), "DeselectBrowserArray", white); - Log.e("setBrowserList", "setBrowserList white: " + white + ":" + whiteList); + Logutils.e(TAG + ":" + "setBrowserList", "setBrowserList white: " + white + ":" + whiteList); boolean blackList = Settings.System.putString(mContext.getContentResolver(), "qch_webblack_url", black); - Log.e("setBrowserList", "setBrowserList black: " + black + ":" + blackList); + Logutils.e(TAG + ":" + "setBrowserList", "setBrowserList black: " + black + ":" + blackList); mView.getBrowserListFinished(white); } else if (TextUtils.isEmpty(white)) { //设置黑名单 @@ -960,13 +999,13 @@ public class MainPresenter implements MainContact.Presenter { @Override public void onError(@NonNull Throwable e) { - Log.e("NewSetBrowserList", "onError: " + e.getMessage()); + Logutils.e(TAG + ":" + "NewSetBrowserList", "onError: " + e.getMessage()); onComplete(); } @Override public void onComplete() { - Log.e("NewSetBrowserList", "onComplete: "); + Logutils.e(TAG + ":" + "NewSetBrowserList", "onComplete: "); } }); } @@ -978,13 +1017,13 @@ public class MainPresenter implements MainContact.Presenter { .subscribe(new Observer>() { @Override public void onSubscribe(@NonNull Disposable d) { - Log.e("SetBrowserList", "onSubscribe: "); + Logutils.e(TAG + ":" + "SetBrowserList", "onSubscribe: "); } @Override public void onNext(@NonNull BaseResponse browserDataBaseResponse) { Settings.System.putInt(mContext.getContentResolver(), "qch_website_isBlackWebUrl", 0); - Log.e("SetBrowserList", "onNext: "); + Logutils.e(TAG + ":" + "SetBrowserList", "onNext: "); if (browserDataBaseResponse.code == OK) { //白名单 String white = browserDataBaseResponse.data.getWhite(); @@ -994,9 +1033,9 @@ public class MainPresenter implements MainContact.Presenter { white += "," + homePage; } boolean whiteList = Settings.System.putString(mContext.getContentResolver(), "DeselectBrowserArray", white); - Log.e("SetBrowserList", "setBrowserList white: " + white + " :" + whiteList); + Logutils.e(TAG + ":" + "SetBrowserList", "setBrowserList white: " + white + " :" + whiteList); String black = Settings.System.getString(mContext.getContentResolver(), "qch_webblack_url"); - Log.e("SetBrowserList", "getBrowserList black: " + black); + Logutils.e(TAG + ":" + "SetBrowserList", "getBrowserList black: " + black); mView.getBrowserListFinished(white); } else { Settings.System.putString(mContext.getContentResolver(), "DeselectBrowserArray", " "); @@ -1006,9 +1045,9 @@ public class MainPresenter implements MainContact.Presenter { String black = browserDataBaseResponse.data.getBlack(); if (!TextUtils.isEmpty(black)) { boolean blackList = Settings.System.putString(mContext.getContentResolver(), "qch_webblack_url", black); - Log.e("SetBrowserList", "setBrowserList black: " + black + " :" + blackList); + Logutils.e(TAG + ":" + "SetBrowserList", "setBrowserList black: " + black + " :" + blackList); String whiteList = Settings.System.getString(mContext.getContentResolver(), "DeselectBrowserArray"); - Log.e("SetBrowserList", "getBrowserList white: " + whiteList); + Logutils.e(TAG + ":" + "SetBrowserList", "getBrowserList white: " + whiteList); } else { Settings.System.putString(mContext.getContentResolver(), "qch_webblack_url", " "); } @@ -1019,22 +1058,22 @@ public class MainPresenter implements MainContact.Presenter { @Override public void onError(@NonNull Throwable e) { - Log.e("SetBrowserList", "onError: " + e.getMessage()); + Logutils.e(TAG + ":" + "SetBrowserList", "onError: " + e.getMessage()); String whiteURLList = Settings.System.getString(mContext.getContentResolver(), "DeselectBrowserArray"); - Log.e("SetBrowserList", "whiteURLList: " + whiteURLList); + Logutils.e(TAG + ":" + "SetBrowserList", "whiteURLList: " + whiteURLList); mView.getBrowserListFinished(whiteURLList); } @Override public void onComplete() { - Log.e("SetBrowserList", "onComplete: "); + Logutils.e(TAG + ":" + "SetBrowserList", "onComplete: "); } }); } @Override public void getBrowserBookmarks(String whitelist) { -// Log.e(TAG, "getBrowserBookmarks: " + "whitelist: " + whitelist); +// Logutils.e(TAG, "getBrowserBookmarks: " + "whitelist: " + whitelist); // List whiteLists = Arrays.asList(whitelist.split(",")); // NetInterfaceManager.getInstance() // .getBrowserBookmarksObservable() @@ -1042,23 +1081,23 @@ public class MainPresenter implements MainContact.Presenter { // .subscribe(new Observer>() { // @Override // public void onSubscribe(@NonNull Disposable d) { -// Log.e("getBrowserBookmarks", "onSubscribe: "); +// Logutils.e(TAG+":"+"getBrowserBookmarks", "onSubscribe: "); // } // // @Override // public void onNext(@NonNull BaseResponse browserBookmarksBaseResponse) { -// Log.e("getBrowserBookmarks", "onNext: "); +// Logutils.e(TAG+":"+"getBrowserBookmarks", "onNext: "); // StringBuilder whiteString = new StringBuilder(whitelist); // if (browserBookmarksBaseResponse.code == OK) { // //主页不包含白名单添加进去 // String homepagURL = browserBookmarksBaseResponse.data.getHomepage(); //// boolean home = Settings.System.putString(mContext.getContentResolver(), "homepagURL", homepagURL); -//// Log.e("getBrowserBookmarks", "onNext: homepagURL: save homepagURL = " + homepagURL); +//// Logutils.e(TAG+":"+"getBrowserBookmarks", "onNext: homepagURL: save homepagURL = " + homepagURL); // if (whiteLists.size() <= 0 || !whiteLists.contains(homepagURL)) { // whiteString.append(",").append(homepagURL); -// Log.e("getBrowserBookmarks ", "homepagURL: " + homepagURL); +// Logutils.e(TAG+":"+"getBrowserBookmarks ", "homepagURL: " + homepagURL); // boolean white = Settings.System.putString(mContext.getContentResolver(), "DeselectBrowserArray", whiteString.toString()); -// Log.e("getBrowserBookmarks", "onNext: homepagURL: add to whiteList = " + whiteString + "write: " + white); +// Logutils.e(TAG+":"+"getBrowserBookmarks", "onNext: homepagURL: add to whiteList = " + whiteString + "write: " + white); // } // //主页 // Intent homepag = new Intent("qch_app_brower_homepage"); @@ -1108,35 +1147,35 @@ public class MainPresenter implements MainContact.Presenter { // // @Override // public void onError(@NonNull Throwable e) { -// Log.e("getBrowserBookmarks", "onError: " + e.getMessage()); +// Logutils.e(TAG+":"+"getBrowserBookmarks", "onError: " + e.getMessage()); // onComplete(); // } // // @Override // public void onComplete() { -// Log.e("getBrowserBookmarks", "onComplete: "); +// Logutils.e(TAG+":"+"getBrowserBookmarks", "onComplete: "); // mView.getBrowserBookmarksFinished(); // } // }); HTTPInterface.getHomePageBookmarks(mContext, new HTTPInterface.BookmarksCallback() { @Override public void onSubscribe() { - Log.e("getBrowserBookmarks", "onSubscribe: "); + Logutils.e(TAG + ":" + "getBrowserBookmarks", "onSubscribe: "); } @Override public void onNext() { - Log.e("getBrowserBookmarks", "onNext: "); + Logutils.e(TAG + ":" + "getBrowserBookmarks", "onNext: "); } @Override public void onError(Throwable e) { - Log.e("getBrowserBookmarks", "onError: " + e.getMessage()); + Logutils.e(TAG + ":" + "getBrowserBookmarks", "onError: " + e.getMessage()); } @Override public void onComplete() { - Log.e("getBrowserBookmarks", "onComplete: "); + Logutils.e(TAG + ":" + "getBrowserBookmarks", "onComplete: "); mView.getBrowserBookmarksFinished(); } }); @@ -1152,10 +1191,10 @@ public class MainPresenter implements MainContact.Presenter { // String BlackBrowserArray = Settings.System.getString(mContext.getContentResolver(), "BlackBrowserArray"); // String DeselectBrowserArray = Settings.System.getString(mContext.getContentResolver(), "DeselectBrowserArray"); // String qch_webblack_url = Settings.System.getString(mContext.getContentResolver(), "qch_webblack_url"); -// Log.e("getBrowserWhiteList", "qch_website_isBlackWebUrl: " + qch_website_isBlackWebUrl); -// Log.e("getBrowserWhiteList", "BlackBrowserArray: " + BlackBrowserArray); -// Log.e("getBrowserWhiteList", "DeselectBrowserArray: " + DeselectBrowserArray); -// Log.e("getBrowserWhiteList", "qch_webblack_url: " + qch_webblack_url); +// Logutils.e(TAG+":"+"getBrowserWhiteList", "qch_website_isBlackWebUrl: " + qch_website_isBlackWebUrl); +// Logutils.e(TAG+":"+"getBrowserWhiteList", "BlackBrowserArray: " + BlackBrowserArray); +// Logutils.e(TAG+":"+"getBrowserWhiteList", "DeselectBrowserArray: " + DeselectBrowserArray); +// Logutils.e(TAG+":"+"getBrowserWhiteList", "qch_webblack_url: " + qch_webblack_url); // } catch (Settings.SettingNotFoundException e) { // e.printStackTrace(); // } @@ -1169,16 +1208,16 @@ public class MainPresenter implements MainContact.Presenter { .subscribe(new Observer() { @Override public void onSubscribe(@NonNull Disposable d) { - Log.e("getDesktopIcon", "onSubscribe: "); + Logutils.e(TAG + ":" + "getDesktopIcon", "onSubscribe: "); } @Override public void onNext(@NonNull BaseResponse response) { - Log.e("getDesktopIcon", "onNext: "); + Logutils.e(TAG + ":" + "getDesktopIcon", "onNext: "); ApkUtils.showAllAPP(mContext); if (response.code == OK) { String data = response.data.toString(); - Log.e("getDesktopIcon", "data: " + data); + Logutils.e(TAG + ":" + "getDesktopIcon", "data: " + data); if (!TextUtils.isEmpty(data)) { List newList = Arrays.asList(data.split(","));//新的list PackageManager pm = mContext.getPackageManager(); @@ -1193,29 +1232,29 @@ public class MainPresenter implements MainContact.Presenter { pm.setApplicationEnabledSetting("com.android.messaging", PackageManager.COMPONENT_ENABLED_STATE_DISABLED, 0); } } catch (Exception ex) { - Log.e("getDesktopIcon", "Exception: ex: " + ex.getMessage()); + Logutils.e(TAG + ":" + "getDesktopIcon", "Exception: ex: " + ex.getMessage()); } pm.setApplicationEnabledSetting(pack, PackageManager.COMPONENT_ENABLED_STATE_DISABLED, 0); - Log.e("getDesktopIcon", pack); + Logutils.e(TAG + ":" + "getDesktopIcon", pack); } catch (Exception e) { - Log.e("getDesktopIcon", "Exception: " + e.getMessage()); + Logutils.e(TAG + ":" + "getDesktopIcon", "Exception: " + e.getMessage()); } } } } else { - Log.e("getDesktopIcon", "onNext: " + response.toString()); + Logutils.e(TAG + ":" + "getDesktopIcon", "onNext: " + response.toString()); } } @Override public void onError(@NonNull Throwable e) { - Log.e("getDesktopIcon", "onError: " + e.getMessage()); + Logutils.e(TAG + ":" + "getDesktopIcon", "onError: " + e.getMessage()); onComplete(); } @Override public void onComplete() { - Log.e("getDesktopIcon", "onComplete: "); + Logutils.e(TAG + ":" + "getDesktopIcon", "onComplete: "); mView.getDesktopIconFinished(); } }); @@ -1230,28 +1269,28 @@ public class MainPresenter implements MainContact.Presenter { .subscribe(new Observer() { @Override public void onSubscribe(@NonNull Disposable d) { - Log.e("getAppAutoStart", "onSubscribe: "); + Logutils.e(TAG + ":" + "getAppAutoStart", "onSubscribe: "); } @Override public void onNext(@NonNull NetAndLaunchBean netAndLaunchBean) { - Log.e("getAppAutoStart", "onNext: "); + Logutils.e(TAG + ":" + "getAppAutoStart", "onNext: " + netAndLaunchBean.toString()); if (netAndLaunchBean.getCode() == OK) { JGYUtils.getInstance().setNetAndlaunch(netAndLaunchBean); } else { - Log.e("getAppAutoStart", "onNext: " + netAndLaunchBean.toString()); + Logutils.e(TAG + ":" + "getAppAutoStart", "onNext: " + netAndLaunchBean.toString()); } } @Override public void onError(@NonNull Throwable e) { - Log.e("getAppAutoStart", "onError: " + e.getMessage()); + Logutils.e(TAG + ":" + "getAppAutoStart", "onError: " + e.getMessage()); onComplete(); } @Override public void onComplete() { - Log.e("getAppAutoStart", "onSubscribe: "); + Logutils.e(TAG + ":" + "getAppAutoStart", "onSubscribe: "); mView.getAppAutoStartUpdateAndNetFinished(); } }); @@ -1265,15 +1304,15 @@ public class MainPresenter implements MainContact.Presenter { .subscribe(new Observer() { @Override public void onSubscribe(@NonNull Disposable d) { - Log.e("getAppIDControl", "onSubscribe: "); + Logutils.e(TAG + ":" + "getAppIDControl", "onSubscribe: "); } @Override public void onNext(@NonNull ResponseBody responseBody) { - Log.e("getAppIDControl", "onNext: "); + Logutils.e(TAG + ":" + "getAppIDControl", "onNext: "); try { String bodyString = responseBody.string(); - Log.e("getAppIDControl", "bodyString: " + bodyString); + Logutils.e(TAG + ":" + "getAppIDControl", "bodyString: " + bodyString); JsonObject jsonObject = JsonParser.parseString(bodyString).getAsJsonObject(); int code = jsonObject.get("code").getAsInt(); if (code == OK) { @@ -1287,23 +1326,23 @@ public class MainPresenter implements MainContact.Presenter { } } else { JGYUtils.getInstance().writeDeselectIDtoSystem("", ""); - Log.e("getAppIDControl", "onNext: " + bodyString); + Logutils.e(TAG + ":" + "getAppIDControl", "onNext: " + bodyString); } } catch (IOException e) { e.printStackTrace(); - Log.e("getAppIDControl", "onNext: IOException: " + e.getMessage()); + Logutils.e(TAG + ":" + "getAppIDControl", "onNext: IOException: " + e.getMessage()); } } @Override public void onError(@NonNull Throwable e) { - Log.e("getAppIDControl", "onError: " + e.getMessage()); + Logutils.e(TAG + ":" + "getAppIDControl", "onError: " + e.getMessage()); onComplete(); } @Override public void onComplete() { - Log.e("getAppIDControl", "onComplete: "); + Logutils.e(TAG + ":" + "getAppIDControl", "onComplete: "); mView.getAppIDControlFinished(); } }); @@ -1328,7 +1367,7 @@ public class MainPresenter implements MainContact.Presenter { .subscribe(new Observer() { @Override public void onSubscribe(@NonNull Disposable d) { - Log.e("setSystemSetting", "onSubscribe: "); + Logutils.e(TAG + ":" + "setSystemSetting", "onSubscribe: "); } @Override @@ -1336,7 +1375,7 @@ public class MainPresenter implements MainContact.Presenter { SPUtils.put(mContext, "first_connect", 1); try { String bodyString = responseBody.string(); - Log.e("setSystemSetting", "onNext: " + bodyString); + Logutils.e(TAG + ":" + "setSystemSetting", "onNext: " + bodyString); JsonObject jsonObject = JsonParser.parseString(bodyString).getAsJsonObject(); int code = jsonObject.get("code").getAsInt(); if (code == OK) { @@ -1355,22 +1394,22 @@ public class MainPresenter implements MainContact.Presenter { } } catch (IOException e) { e.printStackTrace(); - Log.e("setSystemSetting", "onNext: IOException: " + e.getMessage()); + Logutils.e(TAG + ":" + "setSystemSetting", "onNext: IOException: " + e.getMessage()); } } @Override public void onError(@NonNull Throwable e) { - Log.e("setSystemSetting", "onError: " + e.getMessage()); + Logutils.e(TAG + ":" + "setSystemSetting", "onError: " + e.getMessage()); String oldData = (String) SPUtils.get(mContext, "SystemSettingData", ""); - Log.e("setSystemSetting", "oldData: " + oldData); + Logutils.e(TAG + ":" + "setSystemSetting", "oldData: " + oldData); JGYUtils.getInstance().SettingSysData(oldData); onComplete(); } @Override public void onComplete() { - Log.e("setSystemSetting", "onComplete: "); + Logutils.e(TAG + ":" + "setSystemSetting", "onComplete: "); mView.setSystemSettingFinished(); } }); @@ -1380,7 +1419,7 @@ public class MainPresenter implements MainContact.Presenter { @Override public void getROMApp() { String customVersion = Utils.getCustomVersion(); - Log.e(TAG, "getROMApp: " + customVersion); + Logutils.e(TAG, "getROMApp: " + customVersion); NetInterfaceManager.getInstance().getCustomROMAppApi() .getROMApp(NetInterfaceManager.HTTP_KEY, customVersion) .subscribeOn(Schedulers.io()) @@ -1388,18 +1427,18 @@ public class MainPresenter implements MainContact.Presenter { .subscribe(new Observer() { @Override public void onSubscribe(Disposable d) { - Log.e("getROMApp", "onSubscribe: "); + Logutils.e(TAG + ":" + "getROMApp", "onSubscribe: "); } @Override public void onNext(BaseResponse baseResponse) { - Log.e("getROMApp", "onNext: " + baseResponse); + Logutils.e(TAG + ":" + "getROMApp", "onNext: " + baseResponse); if (baseResponse.code == OK) { JsonObject jsonObject = JsonParser.parseString(new Gson().toJson(baseResponse.data)).getAsJsonObject(); String packageName = jsonObject.get("package_name").getAsString(); Settings.System.putString(mContext.getContentResolver(), "jgy_customromapp", packageName); } else { - Log.e("getROMApp", "onNext: " + baseResponse.msg); + Logutils.e(TAG + ":" + "getROMApp", "onNext: " + baseResponse.msg); Settings.System.putString(mContext.getContentResolver(), "jgy_customromapp", ""); // onComplete(); } @@ -1407,13 +1446,13 @@ public class MainPresenter implements MainContact.Presenter { @Override public void onError(Throwable e) { - Log.e("getROMApp", "onError: " + e.getMessage()); + Logutils.e(TAG + ":" + "getROMApp", "onError: " + e.getMessage()); onComplete(); } @Override public void onComplete() { - Log.e("getROMApp", "onComplete: "); + Logutils.e(TAG + ":" + "getROMApp", "onComplete: "); mView.getROMAppFinished(); } }); @@ -1425,7 +1464,7 @@ public class MainPresenter implements MainContact.Presenter { .subscribe(new Observer() { @Override public void onSubscribe(Disposable d) { - Log.e("getDeveloper", "onSubscribe: "); + Logutils.e(TAG + ":" + "getDeveloper", "onSubscribe: "); } @Override @@ -1433,7 +1472,7 @@ public class MainPresenter implements MainContact.Presenter { if (baseResponse.code == OK) { JSONObject jsonObject = (JSONObject) JSON.toJSON(baseResponse.data); int is_developer = jsonObject.getInteger("is_developer"); - Log.e("getDeveloper", "onNext: " + is_developer); + Logutils.e(TAG + ":" + "getDeveloper", "onNext: " + is_developer); //后台1是0否 底层0是1否 JGYUtils.getInstance().setDeveloperOptions(is_developer == 0 ? 1 : 0); } else { @@ -1443,10 +1482,10 @@ public class MainPresenter implements MainContact.Presenter { @Override public void onError(Throwable e) { - Log.e("getDeveloper", "onError: " + e.getMessage()); + Logutils.e(TAG + ":" + "getDeveloper", "onError: " + e.getMessage()); if (!BuildConfig.DEBUG) { int oldStatus = Settings.System.getInt(mContext.getContentResolver(), "qch_Developeroptions", 1); - Log.e("getDeveloper", "oldStatus: " + oldStatus); + Logutils.e(TAG + ":" + "getDeveloper", "oldStatus: " + oldStatus); JGYUtils.getInstance().setDeveloperOptions(oldStatus); } onComplete(); @@ -1455,7 +1494,7 @@ public class MainPresenter implements MainContact.Presenter { @Override public void onComplete() { mView.getDeveloperFinished(); - Log.e("getDeveloper", "onComplete: "); + Logutils.e(TAG + ":" + "getDeveloper", "onComplete: "); } }); } @@ -1471,38 +1510,38 @@ public class MainPresenter implements MainContact.Presenter { .subscribe(new Observer>() { @Override public void onSubscribe(@NonNull Disposable d) { - Log.e("setLogoImg", "onSubscribe: "); + Logutils.e(TAG + ":" + "setLogoImg", "onSubscribe: "); } @Override public void onNext(@NonNull BaseResponse logoImgBaseResponse) { - Log.e("setLogoImg", "onNext: " + logoImgBaseResponse.data); + Logutils.e(TAG + ":" + "setLogoImg", "onNext: " + logoImgBaseResponse.data); if (logoImgBaseResponse.code == OK) { LogoImg logoImg = logoImgBaseResponse.data; String file_url = logoImg.getFile_url(); String file_md5 = logoImg.getFile_md5(); String batch = logoImg.getBatch(); if (TextUtils.isEmpty(file_url)) { - Log.e("setLogoImg", "onNext: file_url is empty"); + Logutils.e(TAG + ":" + "setLogoImg", "onNext: file_url is empty"); } else { JGYUtils.getInstance().checkBootFile(file_url, file_md5); } } else { - Log.e("setLogoImg", "onNext: delete"); + Logutils.e(TAG + ":" + "setLogoImg", "onNext: delete"); JGYUtils.getInstance().removeBootanimation(); } } @Override public void onError(@NonNull Throwable e) { - Log.e("setLogoImg", "onError: " + e.getMessage()); + Logutils.e(TAG + ":" + "setLogoImg", "onError: " + e.getMessage()); onComplete(); } @Override public void onComplete() { - Log.e("setLogoImg", "onComplete: "); + Logutils.e(TAG + ":" + "setLogoImg", "onComplete: "); mView.setLogoImgFinished(); } }); @@ -1518,12 +1557,12 @@ public class MainPresenter implements MainContact.Presenter { .subscribe(new Observer() { @Override public void onSubscribe(Disposable d) { - Log.e("setTopApp", "onSubscribe: "); + Logutils.e(TAG + ":" + "setTopApp", "onSubscribe: "); } @Override public void onNext(BaseResponse response) { - Log.e("setTopApp", "onNext: " + response.data); + Logutils.e(TAG + ":" + "setTopApp", "onNext: " + response.data); if (response.code == OK) { JSONObject jsonObject = (JSONObject) JSON.toJSON(response.data); String app_package = jsonObject.getString("app_package"); @@ -1536,13 +1575,13 @@ public class MainPresenter implements MainContact.Presenter { @Override public void onError(Throwable e) { - Log.e("setTopApp", "onError: " + e.getMessage()); + Logutils.e(TAG + ":" + "setTopApp", "onError: " + e.getMessage()); onComplete(); } @Override public void onComplete() { - Log.e("setTopApp", "onComplete: "); + Logutils.e(TAG + ":" + "setTopApp", "onComplete: "); mView.setTopAppFinished(); } }); @@ -1560,12 +1599,12 @@ public class MainPresenter implements MainContact.Presenter { .subscribe(new Observer() { @Override public void onSubscribe(@NonNull Disposable d) { - Log.e("getScreenLockState", "onSubscribe: "); + Logutils.e(TAG + ":" + "getScreenLockState", "onSubscribe: "); } @Override public void onNext(@NonNull BaseResponse response) { - Log.e("getScreenLockState", "onNext: "); + Logutils.e(TAG + ":" + "getScreenLockState", "onNext: "); if (response.code == OK) { String bodyString = response.data.toString(); JsonObject jsonObject = JsonParser.parseString(new Gson().toJson(response.data)).getAsJsonObject(); @@ -1574,19 +1613,19 @@ public class MainPresenter implements MainContact.Presenter { mView.setScreenLockStateFinished(is_screen_lock == 1, name); } else { mView.setScreenLockStateFinished(false, ""); - Log.e("getScreenLockState", "onNext: " + response); + Logutils.e(TAG + ":" + "getScreenLockState", "onNext: " + response); } } @Override public void onError(@NonNull Throwable e) { - Log.e("getScreenLockState", "onError: " + e.getMessage()); + Logutils.e(TAG + ":" + "getScreenLockState", "onError: " + e.getMessage()); onComplete(); } @Override public void onComplete() { - Log.e("getScreenLockState", "onComplete: "); + Logutils.e(TAG + ":" + "getScreenLockState", "onComplete: "); } }); } @@ -1595,6 +1634,7 @@ public class MainPresenter implements MainContact.Presenter { public void getDefaultDesktop() { if (JGYUtils.isOfficialVersion()) { mView.getDefaultDesktopFinished(); + HTTPInterface.getAppLimit(mContext); return; } NetInterfaceManager.getInstance() @@ -1602,39 +1642,40 @@ public class MainPresenter implements MainContact.Presenter { .subscribe(new Observer() { @Override public void onSubscribe(@NonNull Disposable d) { - Log.e("getDefaultDesktop", "onSubscribe: "); + Logutils.e(TAG + ":" + "getDefaultDesktop", "onSubscribe: "); } @Override public void onNext(@NonNull ResponseBody responseBody) { try { JSONObject jsonObject = JSONObject.parseObject(responseBody.string()); - Log.e("getDefaultDesktop", "onNext: " + jsonObject.toString()); + Logutils.e(TAG + ":" + "getDefaultDesktop", "onNext: " + jsonObject.toString()); int code = jsonObject.getInteger("code"); if (code == OK) { JSONObject data = jsonObject.getJSONObject("data"); JGYUtils.getInstance().installDesktop(data); } else { - Log.e("getDefaultDesktop", "onNext: " + "删除定制桌面"); + Logutils.e(TAG + ":" + "getDefaultDesktop", "onNext: " + "删除定制桌面"); ApkUtils.UninstallAPP(mContext, ApkUtils.desktopAPP.get(0)); ApkUtils.UninstallAPP(mContext, ApkUtils.desktopAPP.get(1)); } } catch (IOException e) { e.printStackTrace(); - Log.e("getDefaultDesktop", "onNext: IOException: " + e.getMessage()); + Logutils.e(TAG + ":" + "getDefaultDesktop", "onNext: IOException: " + e.getMessage()); } } @Override public void onError(@NonNull Throwable e) { - Log.e("getDefaultDesktop", "onError: " + e.getMessage()); + Logutils.e(TAG + ":" + "getDefaultDesktop", "onError: " + e.getMessage()); onComplete(); } @Override public void onComplete() { - Log.e("getDefaultDesktop", "onComplete: "); + Logutils.e(TAG + ":" + "getDefaultDesktop", "onComplete: "); + HTTPInterface.getAllAppList(); mView.getDefaultDesktopFinished(); } }); diff --git a/app/src/main/java/com/mjsheng/myappstore/base/BaseApplication.java b/app/src/main/java/com/mjsheng/myappstore/base/BaseApplication.java index 73bf575..dc737e3 100644 --- a/app/src/main/java/com/mjsheng/myappstore/base/BaseApplication.java +++ b/app/src/main/java/com/mjsheng/myappstore/base/BaseApplication.java @@ -4,7 +4,6 @@ import android.content.Context; import android.os.Handler; import android.os.Looper; import android.os.Process; -import android.util.Log; import androidx.multidex.MultiDexApplication; @@ -29,6 +28,7 @@ import com.mjsheng.myappstore.statistics.AppInformation; import com.mjsheng.myappstore.statistics.StatisticsInfo; import com.mjsheng.myappstore.utils.ApkUtils; import com.mjsheng.myappstore.utils.JGYUtils; +import com.mjsheng.myappstore.utils.Logutils; import com.mjsheng.myappstore.utils.SystemUtils; import com.mjsheng.myappstore.utils.ToastUtil; import com.mjsheng.myappstore.utils.Utils; @@ -112,7 +112,7 @@ public class BaseApplication extends MultiDexApplication { } // Configuration config = getResources().getConfiguration(); // int smallestScreenWidthDp = config.smallestScreenWidthDp; -// Log.e("mjsheng", "smallestScreenWidthDp=" + smallestScreenWidthDp); +// Logutils.e("mjsheng", "smallestScreenWidthDp=" + smallestScreenWidthDp); // CalligraphyConfig.initDefault(new CalligraphyConfig.Builder() // .setDefaultFontPath("fonts/1234.ttf") // .setDefaultFontPath("fonts/Roboto-RobotoRegular.ttf") @@ -132,7 +132,7 @@ public class BaseApplication extends MultiDexApplication { } public static void setJpushAlias() { - Log.e("jiguangInterface", "30s后重新设置alias"); + Logutils.e("jiguangInterface", "30s后重新设置alias"); JPushInterface.setAlias(context, TagAliasOperatorHelper.sequence++, Utils.getSerial()); } @@ -145,7 +145,7 @@ public class BaseApplication extends MultiDexApplication { } public static void setJpushTags() { - Log.e(TAG, "30s后重新设置tags"); + Logutils.e(TAG, "30s后重新设置tags"); HTTPInterface.setJpushTags(context); } @@ -156,14 +156,14 @@ public class BaseApplication extends MultiDexApplication { } private static void initAliasObservable() { - Log.e(TAG, "initAliasObservable: "); + Logutils.e(TAG, "initAliasObservable: "); Observable.create(new ObservableOnSubscribe() { @Override public void subscribe(ObservableEmitter emitter) throws Exception { onAliasResult = new OnAliasResult() { @Override public void onResult(int code) { - Log.e("initAliasObservable", "onResult: " + code); + Logutils.e("initAliasObservable", "onResult: " + code); emitter.onNext(code); } }; @@ -177,45 +177,45 @@ public class BaseApplication extends MultiDexApplication { @Override public void onNext(Integer integer) { - Log.e("initAliasObservable", "onNext: " + integer); + Logutils.e("initAliasObservable", "onNext: " + integer); String s = "alias:\t"; switch (integer) { case 0: - Log.e("jiguangInterface", s + "Alias绑定成功"); + Logutils.e("jiguangInterface", s + "Alias绑定成功"); break; case 6001: - Log.e("jiguangInterface", s + "无效的设置"); + Logutils.e("jiguangInterface", s + "无效的设置"); break; case 6011: - Log.e("jiguangInterface", s + "短时间内操作过于频繁"); + Logutils.e("jiguangInterface", s + "短时间内操作过于频繁"); break; case 6013: - Log.e("jiguangInterface", s + "用户设备时间轴异常"); + Logutils.e("jiguangInterface", s + "用户设备时间轴异常"); ToastUtil.show("用户设备时间轴异常,修改后重新登陆\t" + s + "code:6013"); break; case 6022: - Log.e("jiguangInterface", s + "alias 操作正在进行中"); + Logutils.e("jiguangInterface", s + "alias 操作正在进行中"); break; //需要重新设置 case 6002: - Log.e("jiguangInterface", s + "设置超时，请重试"); + Logutils.e("jiguangInterface", s + "设置超时，请重试"); setJpushAlias(); break; case 6014: - Log.e("jiguangInterface", s + "服务器繁忙,建议重试"); + Logutils.e("jiguangInterface", s + "服务器繁忙,建议重试"); setJpushAlias(); break; case 6020: - Log.e("jiguangInterface", s + "建议过一段时间再设置"); + Logutils.e("jiguangInterface", s + "建议过一段时间再设置"); setJpushAlias(); break; case 6024: - Log.e("jiguangInterface", s + "服务器内部错误"); + Logutils.e("jiguangInterface", s + "服务器内部错误"); setJpushAlias(); break; case 6017: case 6027: - Log.e("jiguangInterface", s + "别名绑定的设备数超过限制"); + Logutils.e("jiguangInterface", s + "别名绑定的设备数超过限制"); clean(); setJpushAlias(); break; @@ -238,14 +238,14 @@ public class BaseApplication extends MultiDexApplication { } private static void initTagObservable() { - Log.e(TAG, "initTagObservable: "); + Logutils.e(TAG, "initTagObservable: "); Observable.create(new ObservableOnSubscribe() { @Override public void subscribe(ObservableEmitter emitter) { onTagResult = new OnTagResult() { @Override public void onResult(int code) { - Log.e("initTagObservable", "onResult: " + code); + Logutils.e("initTagObservable", "onResult: " + code); emitter.onNext(code); } }; @@ -259,60 +259,60 @@ public class BaseApplication extends MultiDexApplication { @Override public void onNext(Integer integer) { - Log.e("initTagObservable", "onNext: " + integer); + Logutils.e("initTagObservable", "onNext: " + integer); String s = "tags:\t"; switch (integer) { case 0: - Log.e("jiguangInterface", s + "Tag绑定成功"); + Logutils.e("jiguangInterface", s + "Tag绑定成功"); break; case 6001: - Log.e("jiguangInterface", s + "无效的设置"); + Logutils.e("jiguangInterface", s + "无效的设置"); break; case 6005: - Log.e("jiguangInterface", s + "某一个 tag 字符串不合法"); + Logutils.e("jiguangInterface", s + "某一个 tag 字符串不合法"); ToastUtil.show("设备标签不合法,联系管理员修改\t" + "code:6005"); break; case 6006: - Log.e("jiguangInterface", s + "某一个 tag 超长"); + Logutils.e("jiguangInterface", s + "某一个 tag 超长"); ToastUtil.show("设备标签过长,联系管理员修改\t" + "code:6006"); break; case 6007: - Log.e("jiguangInterface", s + "tags 数量超出限制"); + Logutils.e("jiguangInterface", s + "tags 数量超出限制"); ToastUtil.show("设备标签数量超出限制,联系管理员修改\t" + "code:6007"); break; case 6008: - Log.e("jiguangInterface", s + "tag 超出总长度限制"); + Logutils.e("jiguangInterface", s + "tag 超出总长度限制"); ToastUtil.show("设备标签超出总长度限制,联系管理员修改\t" + "code:6008"); break; case 6011: - Log.e("jiguangInterface", s + "短时间内操作过于频繁"); + Logutils.e("jiguangInterface", s + "短时间内操作过于频繁"); break; case 6013: - Log.e("jiguangInterface", s + "用户设备时间轴异常"); + Logutils.e("jiguangInterface", s + "用户设备时间轴异常"); ToastUtil.show("用户设备时间轴异常,修改后重新登陆\t" + "code:6013"); break; case 6018: - Log.e("jiguangInterface", s + "Tags 过多"); + Logutils.e("jiguangInterface", s + "Tags 过多"); ToastUtil.show("设备标签数量超出限制,联系管理员修改\t" + "code:6018"); break; case 6021: - Log.e("jiguangInterface", s + "tags 操作正在进行中"); + Logutils.e("jiguangInterface", s + "tags 操作正在进行中"); break; //需要重新设置 case 6002: - Log.e("jiguangInterface", s + "设置超时，请重试"); + Logutils.e("jiguangInterface", s + "设置超时，请重试"); setJpushTags(); break; case 6014: - Log.e("jiguangInterface", s + "服务器繁忙,建议重试"); + Logutils.e("jiguangInterface", s + "服务器繁忙,建议重试"); setJpushTags(); break; case 6020: - Log.e("jiguangInterface", s + "建议过一段时间再设置"); + Logutils.e("jiguangInterface", s + "建议过一段时间再设置"); setJpushTags(); break; case 6024: - Log.e("jiguangInterface", s + "服务器内部错误"); + Logutils.e("jiguangInterface", s + "服务器内部错误"); setJpushTags(); break; default: @@ -349,7 +349,7 @@ public class BaseApplication extends MultiDexApplication { new Thread.UncaughtExceptionHandler() { @Override public void uncaughtException(Thread t, Throwable e) { - Log.e("捕获异常子线程:", Thread.currentThread().getName() + + Logutils.e("捕获异常子线程:", Thread.currentThread().getName() + "在:" + e.getStackTrace()[0].getClassName()); } } @@ -362,7 +362,7 @@ public class BaseApplication extends MultiDexApplication { try { Looper.loop(); //会先执行这个方法,然后在执行下面的异常捕获方法! } catch (Exception e) { - Log.e("捕获异常主线程:", Thread.currentThread().getName() + "在:" + e.getStackTrace()[0].getClassName()); + Logutils.e("捕获异常主线程:", Thread.currentThread().getName() + "在:" + e.getStackTrace()[0].getClassName()); e.printStackTrace(); } } @@ -427,10 +427,10 @@ public class BaseApplication extends MultiDexApplication { } } } else { - Log.e("fht", "今日没有打开的应用"); + Logutils.e("fht", "今日没有打开的应用"); } } else { - Log.e("fht", "获取信息失败"); + Logutils.e("fht", "获取信息失败"); } JSONObject data = new JSONObject(); @@ -447,7 +447,7 @@ public class BaseApplication extends MultiDexApplication { data.put("data", appinfo); } } catch (Exception e) { - Log.e("sendAppUsedTime", e.getMessage()); + Logutils.e("sendAppUsedTime", e.getMessage()); } OkGo.post(URLAddress.SEND_USEDTIME) .params("sn", Utils.getSerial()) @@ -459,13 +459,13 @@ public class BaseApplication extends MultiDexApplication { com.alibaba.fastjson.JSONObject object = JSON.parseObject(s); int code = object.getInteger("code"); String msg = object.getString("msg"); - Log.e("fht", "code:" + code + "," + msg); + Logutils.e("fht", "code:" + code + "," + msg); } @Override public void onError(Call call, Response response, Exception e) { super.onError(call, response, e); - Log.e("sendAppUsedTime", e.getMessage()); + Logutils.e("sendAppUsedTime", e.getMessage()); } }); @@ -503,7 +503,7 @@ public class BaseApplication extends MultiDexApplication { // @Override // public void uncaughtException(Thread thread, Throwable ex) { -//// Log.e(TAG, ex.getMessage(), new Exception(ex)); +//// Logutils.e(TAG, ex.getMessage(), new Exception(ex)); //// Utils.showToast(this, "程序出现异常，即将退出。。。"); //// try { //// Thread.sleep(3000); @@ -527,7 +527,7 @@ public class BaseApplication extends MultiDexApplication { // // public void setInstallIngPackageName(String packageNames) { // packageName = packageNames; -// Log.e("fht", "正在安装：" + packageNames); +// Logutils.e("fht", "正在安装：" + packageNames); // } // // public String getInstallIngPackageName() { @@ -546,7 +546,7 @@ public class BaseApplication extends MultiDexApplication { // fileList.remove(data); // break; // } else { -// Log.e("fht", "not found object"); +// Logutils.e("fht", "not found object"); // } // } // } @@ -554,7 +554,7 @@ public class BaseApplication extends MultiDexApplication { // if (fileList.size() > 0) { // updateList(); // } else { -// Log.e("fht", "fileList为空"); +// Logutils.e("fht", "fileList为空"); // setInstallIngPackageName(""); // } // @@ -569,14 +569,14 @@ public class BaseApplication extends MultiDexApplication { // setInstallIngPackageName(fileList.get(0).getPackageName()); // } else { // removeDate(fileList.get(0).getPackageName()); -// Log.e("fht", "已安装"); +// Logutils.e("fht", "已安装"); // setInstallIngPackageName(""); // } // } else { -// Log.e("fht", "任务为空"); +// Logutils.e("fht", "任务为空"); // } // } else { -// Log.e("fht", "安装中：" + packageName); +// Logutils.e("fht", "安装中：" + packageName); // // } // } @@ -597,6 +597,6 @@ public class BaseApplication extends MultiDexApplication { } else { BaseApplication.getInstance().setDownloadState(true); } - Log.e(TAG, "isDownloading=" + BaseApplication.getInstance().isDownloading()); + Logutils.e(TAG, "isDownloading=" + BaseApplication.getInstance().isDownloading()); } } diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/AppListInfo.java b/app/src/main/java/com/mjsheng/myappstore/bean/AppListInfo.java new file mode 100644 index 0000000..4c9fc51 --- /dev/null +++ b/app/src/main/java/com/mjsheng/myappstore/bean/AppListInfo.java @@ -0,0 +1,84 @@ +package com.mjsheng.myappstore.bean; + +import java.io.Serializable; + +public class AppListInfo implements Serializable { + private static final long serialVersionUID = 9075899098432175779L; + private long app_version_code; + private String app_name; + private String app_package; + private String app_version_name; + private String app_url; + private String app_id; + private String app_md5; + String id; + String app_desc; + String app_downloads; + String app_size; + String app_img; + String app_createtime; + String app_score; + String xitong_id; + String zixitong_id; + String app_tag; + + public static long getSerialVersionUID() { + return serialVersionUID; + } + + public String getApp_package() { + return app_package; + } + + public void setApp_package(String app_package) { + this.app_package = app_package; + } + + public String getApp_version_name() { + return app_version_name; + } + + public void setApp_version_name(String app_version_name) { + this.app_version_name = app_version_name; + } + + public long getApp_version_code() { + return app_version_code; + } + + public void setApp_version_code(long app_version_code) { + this.app_version_code = app_version_code; + } + + public String getApp_url() { + return app_url; + } + + public void setApp_url(String app_url) { + this.app_url = app_url; + } + + public String getApp_name() { + return app_name; + } + + public void setApp_name(String app_name) { + this.app_name = app_name; + } + + public String getApp_id() { + return app_id; + } + + public void setApp_id(String app_id) { + this.app_id = app_id; + } + + public String getApp_md5() { + return app_md5; + } + + public void setApp_md5(String app_md5) { + this.app_md5 = app_md5; + } +} diff --git a/app/src/main/java/com/mjsheng/myappstore/jpush/TagAliasOperatorHelper.java b/app/src/main/java/com/mjsheng/myappstore/jpush/TagAliasOperatorHelper.java index ec397b9..332b5a1 100644 --- a/app/src/main/java/com/mjsheng/myappstore/jpush/TagAliasOperatorHelper.java +++ b/app/src/main/java/com/mjsheng/myappstore/jpush/TagAliasOperatorHelper.java @@ -6,6 +6,8 @@ import android.os.Message; import android.util.Log; import android.util.SparseArray; +import com.mjsheng.myappstore.utils.Logutils; + import java.util.Locale; import java.util.Set; @@ -240,7 +242,7 @@ public class TagAliasOperatorHelper { setActionCache.remove(sequence); String logs = getActionStr(tagAliasBean.action)+" tags success"; Logger.i(TAG,logs); - Log.e(TAG,"Tag绑定成功: " + jPushMessage.getTags()); + Logutils.e(TAG,"Tag绑定成功: " + jPushMessage.getTags()); ExampleUtil.showToast(logs, context); }else{ String logs = "Failed to " + getActionStr(tagAliasBean.action)+" tags"; diff --git a/app/src/main/java/com/mjsheng/myappstore/log/LogReceiver.java b/app/src/main/java/com/mjsheng/myappstore/log/LogReceiver.java index 9d64828..aefde01 100644 --- a/app/src/main/java/com/mjsheng/myappstore/log/LogReceiver.java +++ b/app/src/main/java/com/mjsheng/myappstore/log/LogReceiver.java @@ -5,6 +5,8 @@ import android.content.Context; import android.content.Intent; import android.util.Log; +import com.mjsheng.myappstore.utils.Logutils; + /** * @author MTK81255 */ @@ -19,7 +21,7 @@ public class LogReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { String action = intent.getAction(); - Log.e(TAG, " -->onReceive(), action=" + action); + Logutils.e(TAG, " -->onReceive(), action=" + action); // if (Utils.isServiceOnDestroying()) { // Utils.logw(TAG, "Service is On Destroying, juet do nothing for " + action); // return; @@ -42,7 +44,7 @@ public class LogReceiver extends BroadcastReceiver { receiverHandler.obtainMessage(ReceiverHandler.MSG_RECEIVER_FROM_BYPASS, intent).sendToTarget(); } - Log.e(TAG, " OnReceive function exit."); + Logutils.e(TAG, " OnReceive function exit."); } } diff --git a/app/src/main/java/com/mjsheng/myappstore/manager/AmapManager.java b/app/src/main/java/com/mjsheng/myappstore/manager/AmapManager.java index 6e93396..50441a3 100644 --- a/app/src/main/java/com/mjsheng/myappstore/manager/AmapManager.java +++ b/app/src/main/java/com/mjsheng/myappstore/manager/AmapManager.java @@ -1,12 +1,12 @@ package com.mjsheng.myappstore.manager; import android.content.Context; -import android.util.Log; import com.amap.api.location.AMapLocation; import com.amap.api.location.AMapLocationClient; import com.amap.api.location.AMapLocationClientOption; import com.amap.api.location.AMapLocationListener; +import com.mjsheng.myappstore.utils.Logutils; import com.mjsheng.myappstore.utils.SPUtils; public class AmapManager { @@ -64,8 +64,8 @@ public class AmapManager { StringBuilder sb = new StringBuilder(); //errCode等于0代表定位成功，其他的为定位失败，具体的可以参照官网定位错误码说明 if (aMapLocation.getErrorCode() == 0) { - Log.e(TAG, "onLocationChanged: " + "定位成功"); - Log.e(TAG, "onLocationChanged: " + aMapLocation.getAddress()); + Logutils.e(TAG, "onLocationChanged: " + "定位成功"); + Logutils.e(TAG, "onLocationChanged: " + aMapLocation.getAddress()); sb.append(aMapLocation.getAddress()).append("\n"); SPUtils.put(mContext, "AmapAddress", aMapLocation.getAddress()); SPUtils.put(mContext, "longitude", aMapLocation.getLongitude()); @@ -73,18 +73,18 @@ public class AmapManager { } else { //定位失败 sb.append("定位失败" + "\n"); - Log.e(TAG, "onLocationChanged: " + "定位失败"); + Logutils.e(TAG, "onLocationChanged: " + "定位失败"); SPUtils.put(mContext, "AmapError", String.valueOf(aMapLocation.getErrorInfo())); } - Log.e(TAG, (String) SPUtils.get(mContext, "AmapAddress", "-")); - Log.e(TAG, (String) SPUtils.get(mContext, "AmapError", "-")); - Log.e(TAG, "amap: " + sb.toString()); + Logutils.e(TAG, (String) SPUtils.get(mContext, "AmapAddress", "-")); + Logutils.e(TAG, (String) SPUtils.get(mContext, "AmapError", "-")); + Logutils.e(TAG, "amap: " + sb.toString()); } }); //设置场景模式后最好调用一次stop，再调用start以保证场景模式生效 locationClient.stopLocation(); locationClient.startLocation(); - Log.e(TAG, "initAmap: " + "startLocation"); + Logutils.e(TAG, "initAmap: " + "startLocation"); } diff --git a/app/src/main/java/com/mjsheng/myappstore/manager/FileManager.java b/app/src/main/java/com/mjsheng/myappstore/manager/FileManager.java index c23f8cd..ccebdb2 100644 --- a/app/src/main/java/com/mjsheng/myappstore/manager/FileManager.java +++ b/app/src/main/java/com/mjsheng/myappstore/manager/FileManager.java @@ -1,9 +1,9 @@ package com.mjsheng.myappstore.manager; import android.content.Context; -import android.util.Log; import com.blankj.utilcode.util.PathUtils; +import com.mjsheng.myappstore.utils.Logutils; import java.io.File; @@ -34,9 +34,9 @@ public class FileManager { File file = new File(PathUtils.getExternalDownloadsPath() + File.separator + "jgy" + File.separator); if (!file.exists()) { if (file.mkdirs()) { - Log.e("initFolder", "initFolder: success"); + Logutils.e("initFolder", "initFolder: success"); } else { - Log.e("initFolder", "initFolder: failed"); + Logutils.e("initFolder", "initFolder: failed"); } } } diff --git a/app/src/main/java/com/mjsheng/myappstore/manager/NetInterfaceManager.java b/app/src/main/java/com/mjsheng/myappstore/manager/NetInterfaceManager.java index 8be0f6b..bdb08d8 100644 --- a/app/src/main/java/com/mjsheng/myappstore/manager/NetInterfaceManager.java +++ b/app/src/main/java/com/mjsheng/myappstore/manager/NetInterfaceManager.java @@ -33,9 +33,11 @@ import com.mjsheng.myappstore.network.api.newapi.CheckUpdateApi; import com.mjsheng.myappstore.network.api.newapi.CustomROMApp; import com.mjsheng.myappstore.network.api.newapi.DesktopIconApi; import com.mjsheng.myappstore.network.api.newapi.DevicesLockedStateApi; +import com.mjsheng.myappstore.network.api.newapi.GetAllApp; import com.mjsheng.myappstore.network.api.newapi.GetBatchApi; import com.mjsheng.myappstore.network.api.newapi.GetDesktopApi; import com.mjsheng.myappstore.network.api.newapi.GetDeveloper; +import com.mjsheng.myappstore.network.api.newapi.GetEBagCode; import com.mjsheng.myappstore.network.api.newapi.GetLockStateApi; import com.mjsheng.myappstore.network.api.newapi.JpushTagsApi; import com.mjsheng.myappstore.network.api.newapi.LogoImgApi; @@ -322,6 +324,13 @@ public class NetInterfaceManager { .observeOn(AndroidSchedulers.mainThread()); } + public Observable getEBagCodeControl() { + return mRetrofit.create(GetEBagCode.class) + .getEBagCode(NetInterfaceManager.HTTP_KEY, Utils.getSerial()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()); + } + /* * * API @@ -403,4 +412,8 @@ public class NetInterfaceManager { return mRetrofit.create(CustomROMApp.class); } + public GetAllApp GetAllAppApi() { + return mRetrofit.create(GetAllApp.class); + } + } diff --git a/app/src/main/java/com/mjsheng/myappstore/network/HTTPInterface.java b/app/src/main/java/com/mjsheng/myappstore/network/HTTPInterface.java index ae03f46..b5df747 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/HTTPInterface.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/HTTPInterface.java @@ -10,7 +10,6 @@ import android.os.Handler; import android.os.Message; import android.provider.Settings; import android.text.TextUtils; -import android.util.Log; import com.alibaba.fastjson.JSON; @@ -18,9 +17,12 @@ import com.alibaba.fastjson.JSONException; import com.alibaba.fastjson.JSONObject; import com.google.gson.JsonObject; import com.google.gson.JsonParser; +import com.mjsheng.myappstore.bean.AppListInfo; import com.mjsheng.myappstore.bean.BrowserBookmarks; import com.mjsheng.myappstore.bean.BrowserData; +import com.mjsheng.myappstore.utils.CacheUtils; import com.mjsheng.myappstore.utils.JGYUtils; +import com.mjsheng.myappstore.utils.Logutils; import com.mjsheng.myappstore.utils.URLUtils; import com.lzy.okgo.OkGo; import com.lzy.okgo.callback.StringCallback; @@ -55,6 +57,7 @@ import io.reactivex.schedulers.Schedulers; import okhttp3.Call; import okhttp3.Response; import okhttp3.ResponseBody; +import okhttp3.internal.Util; import static com.mjsheng.myappstore.jpush.TagAliasOperatorHelper.ACTION_SET; import static com.mjsheng.myappstore.jpush.TagAliasOperatorHelper.sequence; @@ -68,7 +71,7 @@ public class HTTPInterface { // .execute(new StringCallback() { // @Override // public void onSuccess(String s, Call call, okhttp3.Response response) { -// Log.e("onSuccess", "checkDevicesInfo"); +// Logutils.e("onSuccess", "checkDevicesInfo"); // try { // JSONObject bodyObject = JSON.parseObject(s); // Integer code = (bodyObject.getInteger("code")); @@ -89,7 +92,7 @@ public class HTTPInterface { // //设备验证 // } // } catch (Exception ex) { -// Log.e("checkDevicesInfo", ex.getMessage()); +// Logutils.e("checkDevicesInfo", ex.getMessage()); // } // } // @@ -97,7 +100,7 @@ public class HTTPInterface { // @Override // public void onError(Call call, Response response, Exception e) { // super.onError(call, response, e); -// Log.e("onError", e.getMessage()); +// Logutils.e("onError", e.getMessage()); // // } // @@ -119,10 +122,10 @@ public class HTTPInterface { // .execute(new StringCallback() { // @Override // public void onSuccess(String s, Call call, okhttp3.Response response) { -// Log.e("onSuccess", "sendTimeLog"); +// Logutils.e("onSuccess", "sendTimeLog"); // try { // JSONObject bodyObject = JSON.parseObject(s); -// Log.e("onSuccess", bodyObject.toString()); +// Logutils.e("onSuccess", bodyObject.toString()); // // Integer code = (bodyObject.getInteger("code")); // String msg = bodyObject.getString("msg"); @@ -138,14 +141,14 @@ public class HTTPInterface { // // } // } catch (Exception ex) { -// Log.e("checkDevicesInfo", ex.getMessage()); +// Logutils.e("checkDevicesInfo", ex.getMessage()); // } // } // // @Override // public void onError(Call call, Response response, Exception e) { // super.onError(call, response, e); -// Log.e("onError", e.getMessage()); +// Logutils.e("onError", e.getMessage()); // // } // @@ -180,19 +183,19 @@ public class HTTPInterface { // message.what = -200; // } // handler.sendMessage(message); -// Log.e("checkUpdateByPackage", msg); +// Logutils.e("checkUpdateByPackage", msg); // } else { -// Log.e("checkUpdateByPackage", msg); +// Logutils.e("checkUpdateByPackage", msg); // } // } catch (Exception e) { -// Log.e("checkUpdateByPackage", e.getMessage()); +// Logutils.e("checkUpdateByPackage", e.getMessage()); // } // } // // @Override // public void onError(Call call, Response response, Exception e) { // super.onError(call, response, e); -// Log.e("onError", e.getMessage()); +// Logutils.e("onError", e.getMessage()); // // } // }); @@ -208,7 +211,7 @@ public class HTTPInterface { // JSONObject object = JSON.parseObject(s); // int code = object.getInteger("code"); // String msg = object.getString("msg"); -// Log.e("setAppinstallInfo", msg); +// Logutils.e("setAppinstallInfo", msg); // if (code == 200) { // // } else { @@ -219,7 +222,7 @@ public class HTTPInterface { // @Override // public void onError(Call call, Response response, Exception e) { // super.onError(call, response, e); -// Log.e("onError", e.getMessage()); +// Logutils.e("onError", e.getMessage()); // // } // }); @@ -240,13 +243,13 @@ public class HTTPInterface { // @Override // public void onSuccess(String s, Call call, okhttp3.Response response) { // String body = s; -// Log.e("sendStartTime", body); +// Logutils.e("sendStartTime", body); // } // // @Override // public void onError(Call call, Response response, Exception e) { // super.onError(call, response, e); -// Log.e("onError", e.getMessage()); +// Logutils.e("onError", e.getMessage()); // // } // }); @@ -267,7 +270,7 @@ public class HTTPInterface { // @Override // public void onError(Call call, Response response, Exception e) { // super.onError(call, response, e); -// Log.e("onError", e.getMessage()); +// Logutils.e("onError", e.getMessage()); // // } // }); @@ -281,7 +284,7 @@ public class HTTPInterface { .execute(new StringCallback() { @Override public void onSuccess(String s, Call call, okhttp3.Response response) { - Log.e("checkUpdate", "onSuccess: " + s); + Logutils.e("checkUpdate", "onSuccess: " + s); JSONObject jsonObject = JSON.parseObject(s); int code = jsonObject.getInteger("code"); String msg = jsonObject.getString("msg"); @@ -299,7 +302,7 @@ public class HTTPInterface { @Override public void onError(Call call, Response response, Exception e) { super.onError(call, response, e); - Log.e("onError", e.getMessage()); + Logutils.e("onError", e.getMessage()); } }); @@ -318,14 +321,14 @@ public class HTTPInterface { JSONObject data = JSON.parseObject(jsonObject.getString("data")); installTestAPK(context, data); } else { - Log.e("checkTestUpdate", "onSuccess: " + msg); + Logutils.e("checkTestUpdate", "onSuccess: " + msg); } } @Override public void onError(Call call, Response response, Exception e) { super.onError(call, response, e); - Log.e("checkTestUpdate", "onError" + e.getMessage()); + Logutils.e("checkTestUpdate", "onError" + e.getMessage()); } }); @@ -349,7 +352,7 @@ public class HTTPInterface { if (packageInfo == null || packageInfo.versionCode < versionCode) { Utils.ariaDownload(context, url, object); } else { - Log.e("installTestAPK", "APK: " + "无更新"); + Logutils.e("installTestAPK", "APK: " + "无更新"); } } @@ -359,7 +362,7 @@ public class HTTPInterface { .execute(new StringCallback() { @Override public void onSuccess(String s, Call call, Response response) { - Log.e("setJpushTags", s); + Logutils.e("setJpushTags", s); com.alibaba.fastjson.JSONObject jsonObject = JSON.parseObject(s); int code = jsonObject.getInteger("code"); com.alibaba.fastjson.JSONObject data = jsonObject.getJSONObject("data"); @@ -382,7 +385,7 @@ public class HTTPInterface { @Override public void onError(Call call, Response response, Exception e) { super.onError(call, response, e); - Log.e("setJpushTags", e.getMessage()); + Logutils.e("setJpushTags", e.getMessage()); } }); } @@ -395,16 +398,16 @@ public class HTTPInterface { public void onSuccess(String s, Call call, Response response) { String body = response.body().toString(); if (body.equals("200")) { - Log.e("jiguangInterface", "alias清除成功"); + Logutils.e("jiguangInterface", "alias清除成功"); } else { - Log.e("jiguangInterface", "alias清除失败"); + Logutils.e("jiguangInterface", "alias清除失败"); } } @Override public void onError(Call call, Response response, Exception e) { super.onError(call, response, e); - Log.e("cleanJpushAlias", e.getMessage() + "???"); + Logutils.e("cleanJpushAlias", e.getMessage() + "???"); } }); } @@ -415,10 +418,10 @@ public class HTTPInterface { synchronized public static void getAppinsideWeb(Context context, GetAppinsideWebCallback callback) { if (JGYUtils.getInstance().checkAppPlatform() == JGYUtils.MTKPlatform) { - Log.e(TAG, "getAppinsideWeb: "+ "setAppinsideWeb"); + Logutils.e(TAG, "getAppinsideWeb: " + "setAppinsideWeb"); setAppinsideWeb(callback); } else { - Log.e(TAG, "getAppinsideWeb: "+ "setNewAppinsideWeb"); + Logutils.e(TAG, "getAppinsideWeb: " + "setNewAppinsideWeb"); setNewAppinsideWeb(callback); } } @@ -430,24 +433,24 @@ public class HTTPInterface { .subscribe(new Observer>>() { @Override public void onSubscribe(@NonNull Disposable d) { - Log.e("setAppinsideWeb", "onSubscribe: "); + Logutils.e("setAppinsideWeb", "onSubscribe: "); } @Override public void onNext(@NonNull BaseResponse> listBaseResponse) { - Log.e("setAppinsideWeb", "onNext: " + listBaseResponse); + Logutils.e("setAppinsideWeb", "onNext: " + listBaseResponse); JGYUtils.getInstance().setAppinsideWeb(listBaseResponse); } @Override public void onError(@NonNull Throwable e) { - Log.e("setAppinsideWeb", "onError: " + e.getMessage()); + Logutils.e("setAppinsideWeb", "onError: " + e.getMessage()); onComplete(); } @Override public void onComplete() { - Log.e("setAppinsideWeb", "onComplete: "); + Logutils.e("setAppinsideWeb", "onComplete: "); callback.ononComplete(); } }); @@ -460,26 +463,26 @@ public class HTTPInterface { .subscribe(new Observer() { @Override public void onSubscribe(@NonNull Disposable d) { - Log.e("getNewAppinsideWeb", "onSubscribe: "); + Logutils.e("getNewAppinsideWeb", "onSubscribe: "); } @Override public void onNext(@NonNull BaseResponse listBaseResponse) { - Log.e("getNewAppinsideWeb", "onNext: " + listBaseResponse); + Logutils.e("getNewAppinsideWeb", "onNext: " + listBaseResponse); long time1 = System.currentTimeMillis(); JGYUtils.getInstance().setNewAppinsideWeb(listBaseResponse); - Log.e(TAG, "setWhiteApp: time = " + (System.currentTimeMillis() - time1)); + Logutils.e(TAG, "setWhiteApp: time = " + (System.currentTimeMillis() - time1)); } @Override public void onError(@NonNull Throwable e) { - Log.e("getNewAppinsideWeb", "onError: " + e.getMessage()); + Logutils.e("getNewAppinsideWeb", "onError: " + e.getMessage()); onComplete(); } @Override public void onComplete() { - Log.e("getNewAppinsideWeb", "onComplete: "); + Logutils.e("getNewAppinsideWeb", "onComplete: "); callback.ononComplete(); } }); @@ -534,23 +537,23 @@ public class HTTPInterface { boolean whiteList = Settings.System.putString(context.getContentResolver(), "DeselectBrowserArray", white); new URLUtils(context).setBrowserWhiteList(); - Log.e("setBrowserBlackList", "setBrowserList----white-----" + whiteList + ":" + white); + Logutils.e("setBrowserBlackList", "setBrowserList----white-----" + whiteList + ":" + white); } else { Settings.System.putString(context.getContentResolver(), "DeselectBrowserArray", " "); } String black = data.getString("black"); if (!TextUtils.isEmpty(black)) { boolean blackList = Settings.System.putString(context.getContentResolver(), "qch_webblack_url", black); - Log.e("setBrowserBlackList", "setBrowserList----black-----" + blackList + ":" + black); + Logutils.e("setBrowserBlackList", "setBrowserList----black-----" + blackList + ":" + black); new URLUtils(context).setBrowserBlackList(); } else { Settings.System.putString(context.getContentResolver(), "qch_webblack_url", " "); } } else { - Log.e("setBrowserBlackList", "setBrowserList" + msg); + Logutils.e("setBrowserBlackList", "setBrowserList" + msg); } } catch (JSONException e) { - Log.e("setBrowserBlackList", "JSONException" + e.getMessage()); + Logutils.e("setBrowserBlackList", "JSONException" + e.getMessage()); } } @@ -558,7 +561,7 @@ public class HTTPInterface { @Override public void onError(Call call, Response response, Exception e) { super.onError(call, response, e); - Log.e(TAG, "onError: " + e.getMessage()); + Logutils.e(TAG, "onError: " + e.getMessage()); } }); } @@ -570,12 +573,12 @@ public class HTTPInterface { .subscribe(new Observer>() { @Override public void onSubscribe(@NonNull Disposable d) { - Log.e("NewSetBrowserList", "onSubscribe: "); + Logutils.e("NewSetBrowserList", "onSubscribe: "); } @Override public void onNext(@NonNull BaseResponse browserDataBaseResponse) { - Log.e("NewSetBrowserList", "onNext: "); + Logutils.e("NewSetBrowserList", "onNext: "); if (browserDataBaseResponse.code == 200) { String white = browserDataBaseResponse.data.getWhite(); String black = browserDataBaseResponse.data.getBlack(); @@ -584,9 +587,9 @@ public class HTTPInterface { Settings.System.putString(context.getContentResolver(), "BlackBrowserArray", " "); //黑白名单同时存在时由以前的逻辑管控 boolean whiteList = Settings.System.putString(context.getContentResolver(), "DeselectBrowserArray", white); - Log.e("NewSetBrowserList", "setBrowserList white: " + white + ":" + whiteList); + Logutils.e("NewSetBrowserList", "setBrowserList white: " + white + ":" + whiteList); boolean blackList = Settings.System.putString(context.getContentResolver(), "qch_webblack_url", black); - Log.e("NewSetBrowserList", "setBrowserList black: " + black + ":" + blackList); + Logutils.e("NewSetBrowserList", "setBrowserList black: " + black + ":" + blackList); } else if (TextUtils.isEmpty(white)) { //设置黑名单 Settings.System.putInt(context.getContentResolver(), "qch_website_isBlackWebUrl", 1); @@ -612,13 +615,13 @@ public class HTTPInterface { @Override public void onError(@NonNull Throwable e) { - Log.e("NewSetBrowserList", "onError: " + e.getMessage()); + Logutils.e("NewSetBrowserList", "onError: " + e.getMessage()); onComplete(); } @Override public void onComplete() { - Log.e("NewSetBrowserList", "onComplete: "); + Logutils.e("NewSetBrowserList", "onComplete: "); new URLUtils(context).setBrowserWhiteList(); } }); @@ -632,13 +635,13 @@ public class HTTPInterface { .subscribe(new Observer>() { @Override public void onSubscribe(@NonNull Disposable d) { - Log.e("SetBrowserList", "onSubscribe: "); + Logutils.e("SetBrowserList", "onSubscribe: "); } @Override public void onNext(@NonNull BaseResponse browserDataBaseResponse) { Settings.System.putInt(context.getContentResolver(), "qch_website_isBlackWebUrl", 0); - Log.e("SetBrowserList", "onNext: "); + Logutils.e("SetBrowserList", "onNext: "); if (browserDataBaseResponse.code == 200) { //白名单 String white = browserDataBaseResponse.data.getWhite(); @@ -649,9 +652,9 @@ public class HTTPInterface { } boolean whiteList = Settings.System.putString(context.getContentResolver(), "DeselectBrowserArray", white); Settings.System.putString(context.getContentResolver(), "qch_webblack_url", " "); - Log.e("SetBrowserList", "setBrowserList white: " + white + " :" + whiteList); + Logutils.e("SetBrowserList", "setBrowserList white: " + white + " :" + whiteList); String black = Settings.System.getString(context.getContentResolver(), "qch_webblack_url"); - Log.e("SetBrowserList", "getBrowserList black: " + black); + Logutils.e("SetBrowserList", "getBrowserList black: " + black); } else { Settings.System.putString(context.getContentResolver(), "DeselectBrowserArray", " "); } @@ -660,9 +663,9 @@ public class HTTPInterface { if (!TextUtils.isEmpty(black)) { boolean blackList = Settings.System.putString(context.getContentResolver(), "qch_webblack_url", black); Settings.System.putString(context.getContentResolver(), "DeselectBrowserArray", " "); - Log.e("SetBrowserList", "setBrowserList black: " + black + " :" + blackList); + Logutils.e("SetBrowserList", "setBrowserList black: " + black + " :" + blackList); String whiteList = Settings.System.getString(context.getContentResolver(), "DeselectBrowserArray"); - Log.e("SetBrowserList", "getBrowserList white: " + whiteList); + Logutils.e("SetBrowserList", "getBrowserList white: " + whiteList); } else { Settings.System.putString(context.getContentResolver(), "qch_webblack_url", " "); } @@ -674,14 +677,14 @@ public class HTTPInterface { @Override public void onError(@NonNull Throwable e) { - Log.e("SetBrowserList", "onError: " + e.getMessage()); + Logutils.e("SetBrowserList", "onError: " + e.getMessage()); onComplete(); } @Override public void onComplete() { new URLUtils(context).setBrowserWhiteList(); - Log.e("SetBrowserList", "onComplete: "); + Logutils.e("SetBrowserList", "onComplete: "); } }); } @@ -703,22 +706,22 @@ public class HTTPInterface { String white = data.getString("white"); if (white != null && !white.equals("")) { boolean whiteList = Settings.System.putString(context.getContentResolver(), "DeselectBrowserArray", white); - Log.e("SystemSetting", "OldSetBrowserList----white-----" + whiteList + ":" + white); + Logutils.e("SystemSetting", "OldSetBrowserList----white-----" + whiteList + ":" + white); } else { Settings.System.putString(context.getContentResolver(), "DeselectBrowserArray", " "); } String black = data.getString("black"); if (black != null && !black.equals("")) { boolean blackList = Settings.System.putString(context.getContentResolver(), "qch_webblack_url", black); - Log.e("SystemSetting", "OldSetBrowserList----black-----" + blackList + ":" + black); + Logutils.e("SystemSetting", "OldSetBrowserList----black-----" + blackList + ":" + black); } else { Settings.System.putString(context.getContentResolver(), "qch_webblack_url", " "); } } else { - Log.e("fht", "OldSetBrowserList" + msg); + Logutils.e("fht", "OldSetBrowserList" + msg); } } catch (JSONException e) { - Log.e("fht", "OldSetBrowserList" + e.getMessage()); + Logutils.e("fht", "OldSetBrowserList" + e.getMessage()); } } @@ -748,11 +751,11 @@ public class HTTPInterface { String homepagURL = jsondata.getString("homepage"); boolean home = Settings.System.putString(context.getContentResolver(), "homepagURL", homepagURL); String DeselectBrowserArray = Settings.System.getString(context.getContentResolver(), "DeselectBrowserArray"); - Log.e("setHomepagtag", "execute: DeselectBrowserArray: = " + DeselectBrowserArray); + Logutils.e("setHomepagtag", "execute: DeselectBrowserArray: = " + DeselectBrowserArray); if (!DeselectBrowserArray.contains(homepagURL)) { DeselectBrowserArray += "," + homepagURL; boolean white = Settings.System.putString(context.getContentResolver(), "DeselectBrowserArray", DeselectBrowserArray); - Log.e("setHomepagtag", "execute: homepagURL: add to whiteList = " + DeselectBrowserArray + "write: " + white); + Logutils.e("setHomepagtag", "execute: homepagURL: add to whiteList = " + DeselectBrowserArray + "write: " + white); } //主页 Intent homepag = new Intent("qch_app_brower_homepage"); @@ -798,7 +801,7 @@ public class HTTPInterface { context.sendBroadcast(intent2); } // } catch (Exception e) { -// Log.e("fht", "setHomepagtag" + e.getMessage()); +// Logutils.e("fht", "setHomepagtag" + e.getMessage()); //// ToastUtil.show("数据错误"); // } } @@ -835,34 +838,43 @@ public class HTTPInterface { public void onSubscribe(@NonNull Disposable d) { if (callback != null) callback.onSubscribe(); - Log.e("getHomePageBookmarks", "onSubscribe: "); + Logutils.e("getHomePageBookmarks", "onSubscribe: "); } @Override public void onNext(@NonNull BaseResponse browserBookmarksBaseResponse) { if (callback != null) callback.onNext(); - Log.e("getHomePageBookmarks", "onNext: "); + Logutils.e("getHomePageBookmarks", "onNext: "); if (browserBookmarksBaseResponse.code == 200) { //主页不包含白名单添加进去 String homepagURL = browserBookmarksBaseResponse.data.getHomepage(); + Logutils.e("getHomePageBookmarks ", "homepagURL: " + homepagURL); + String oldHome = Settings.System.getString(context.getContentResolver(), "homepagURL"); + //数据和之前不一样的时候清除缓存 + if (!TextUtils.isEmpty(oldHome)&&oldHome.equalsIgnoreCase(homepagURL)){ + try { + new CacheUtils().cleanApplicationUserData(context, "com.android.browser"); + } catch (Exception e) { + e.printStackTrace(); + Logutils.e(TAG, "setHomepagtag: " + e.getMessage()); + } + } boolean home = Settings.System.putString(context.getContentResolver(), "homepagURL", homepagURL); - Log.e("getHomePageBookmarks ", "homepagURL: " + homepagURL); - Log.e("getHomePageBookmarks", "onNext: homepagURL: save homepagURL = " + home); - + Logutils.e("getHomePageBookmarks", "onNext: homepagURL: save homepagURL = " + home); String whitelist = Settings.System.getString(context.getContentResolver(), "DeselectBrowserArray"); - Log.e("getHomePageBookmarks ", "whitelist: " + whitelist); + Logutils.e("getHomePageBookmarks ", "whitelist: " + whitelist); if (!TextUtils.isEmpty(whitelist.trim())) { HashSet whiteLists = new HashSet<>(Arrays.asList(whitelist.trim().split(","))); whiteLists.add(homepagURL); String whiteString = String.join(",", whiteLists); boolean white = Settings.System.putString(context.getContentResolver(), "DeselectBrowserArray", whiteString); - Log.e("getHomePageBookmarks", "onNext: homepagURL: add to whiteList = " + whiteString + "write: " + white); + Logutils.e("getHomePageBookmarks", "onNext: homepagURL: add to whiteList = " + whiteString + "write: " + white); } else { - Log.e("getHomePageBookmarks", "onNext: whitelist is NULL"); + Logutils.e("getHomePageBookmarks", "onNext: whitelist is NULL"); boolean white = Settings.System.putString(context.getContentResolver(), "DeselectBrowserArray", homepagURL); - Log.e("getHomePageBookmarks", "onNext: homepagURL: homepagURL = " + homepagURL + "write: " + white); + Logutils.e("getHomePageBookmarks", "onNext: homepagURL: homepagURL = " + homepagURL + "write: " + white); } //主页 @@ -873,7 +885,7 @@ public class HTTPInterface { } if (!TextUtils.isEmpty(homepagURL)) { String newHomePage = JGYUtils.getPrefixHttpsURL(homepagURL); - Log.e("getHomePageBookmarks", "onNext: newHomePage: " + newHomePage); + Logutils.e("getHomePageBookmarks", "onNext: newHomePage: " + newHomePage); homepag.putExtra("homepage", newHomePage); } else { homepag.putExtra("homepage", "Invalid"); @@ -894,7 +906,7 @@ public class HTTPInterface { urlList.add(JGYUtils.getPrefixHttpsURL(urls)); } String join = String.join(",", urlList); - Log.e("getHomePageBookmarks", "onNext: getHomePageBookmarks: " + join); + Logutils.e("getHomePageBookmarks", "onNext: getHomePageBookmarks: " + join); websiteBookMark.putExtra("websiteBookMark", join); } else { websiteBookMark.putExtra("websiteBookMark", "Invalid"); @@ -924,7 +936,7 @@ public class HTTPInterface { public void onError(@NonNull Throwable e) { if (callback != null) callback.onError(e); - Log.e("getHomePageBookmarks", "onError: " + e.getMessage()); + Logutils.e("getHomePageBookmarks", "onError: " + e.getMessage()); onComplete(); } @@ -932,7 +944,7 @@ public class HTTPInterface { public void onComplete() { if (callback != null) callback.onComplete(); - Log.e("getHomePageBookmarks", "onComplete: "); + Logutils.e("getHomePageBookmarks", "onComplete: "); setBrowserBlackList(context); } }); @@ -968,7 +980,7 @@ public class HTTPInterface { pm.setApplicationEnabledSetting("com.android.messaging", PackageManager.COMPONENT_ENABLED_STATE_DISABLED, 0); } } catch (Exception ex) { - Log.e("setHideDesktopIcon", "Exception: ex: " + ex.getMessage()); + Logutils.e("setHideDesktopIcon", "Exception: ex: " + ex.getMessage()); } pm.setApplicationEnabledSetting(pack, PackageManager.COMPONENT_ENABLED_STATE_DISABLED, 0); Logger.e("setHideDesktopIcon", pack); @@ -988,11 +1000,11 @@ public class HTTPInterface { // newList.add("com.android.email"); // for (String pack : newList) { // pm.setApplicationEnabledSetting(pack, PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0); -// Log.e("setHideDesktopIcon", pack); +// Logutils.e("setHideDesktopIcon", pack); // } } } catch (Exception e) { - Log.e("fht", "setHideDesktopIcon" + e.getMessage()); + Logutils.e("fht", "setHideDesktopIcon" + e.getMessage()); } } @@ -1059,7 +1071,7 @@ public class HTTPInterface { @Override public void onNext(ResponseBody responseBody) { try { - Log.e("updateDeviceInfo", "上传的结果" + responseBody.string()); + Logutils.e("updateDeviceInfo", "上传的结果" + responseBody.string()); } catch (IOException e) { e.printStackTrace(); } @@ -1067,7 +1079,7 @@ public class HTTPInterface { @Override public void onError(Throwable e) { - Log.e("updateDeviceInfo", e.getMessage()); + Logutils.e("updateDeviceInfo", e.getMessage()); } @Override @@ -1098,20 +1110,20 @@ public class HTTPInterface { String end_time = jsonObject.getString("end_time"); TimeUtils.ContralTime c = TimeUtils.String2ContralTime(context, start_time + "-" + end_time); if (null != c) { - Log.e("getTimeControl", "200: " + c.toString()); + Logutils.e("getTimeControl", "200: " + c.toString()); } } else { TimeUtils.setEmpty(context); TimeUtils.ContralTime c = TimeUtils.getDefaltContralTime(context); if (null != c) { - Log.e("getTimeControl", c.toString()); + Logutils.e("getTimeControl", c.toString()); } } } @Override public void onError(Throwable e) { - Log.e("getSnTimeControl", "onError: " + e.getMessage()); + Logutils.e("getSnTimeControl", "onError: " + e.getMessage()); } @Override @@ -1165,44 +1177,117 @@ public class HTTPInterface { .subscribe(new Observer() { @Override public void onSubscribe(@NonNull Disposable d) { - Log.e("getAppLimit", "onSubscribe: "); + Logutils.e("getAppLimit", "onSubscribe: "); } @Override public void onNext(@NonNull ResponseBody responseBody) { try { String bodyString = responseBody.string(); - Log.e("getAppLimit", "onNext: " + bodyString); + Logutils.e("getAppLimit", "onNext: " + bodyString); JsonObject jsonObject = JsonParser.parseString(bodyString).getAsJsonObject(); int code = jsonObject.get("code").getAsInt(); if (code == 200) { String data = jsonObject.get("data").getAsJsonObject().get("result").getAsString(); //开机图标 只记录后台传的包名 boolean write = Settings.System.putString(context.getContentResolver(), "only_jgy_shortcut_list", data); - Log.e(TAG, "onNext: only_jgy_shortcut_list: " + write); + Logutils.e(TAG, "onNext: only_jgy_shortcut_list: " + write); JGYUtils.getInstance().writeAppPackageList(context, data); } else { //为错误的时候不删除 // boolean write = Settings.System.putString(context.getContentResolver(), "only_jgy_shortcut_list", ""); // Settings.System.putString(context.getContentResolver(), "qch_app_forbid", " "); -// Log.e(TAG, "onNext: only_jgy_shortcut_list: " + write); - Log.e("getAppLimit", "onNext: " + bodyString); +// Logutils.e(TAG, "onNext: only_jgy_shortcut_list: " + write); + Logutils.e("getAppLimit", "onNext: " + bodyString); } } catch (IOException e) { e.printStackTrace(); - Log.e("getAppLimit", "onNext: IOException: " + e.getMessage()); + Logutils.e("getAppLimit", "onNext: IOException: " + e.getMessage()); } } @Override public void onError(@NonNull Throwable e) { - Log.e("getAppLimit", "onError: " + e.getMessage()); + Logutils.e("getAppLimit", "onError: " + e.getMessage()); onComplete(); } @Override public void onComplete() { - Log.e("getAppLimit", "onComplete: "); + Logutils.e("getAppLimit", "onComplete: "); + getAllAppList(); + } + }); + } + + + public static void getAllAppList() { + NetInterfaceManager.getInstance().GetAllAppApi() + .getAllAppList(NetInterfaceManager.HTTP_KEY, Utils.getSerial()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer>>() { + @Override + public void onSubscribe(Disposable d) { + Logutils.e("getAllAppList", "onSubscribe: "); + } + + @Override + public void onNext(BaseResponse> listBaseResponse) { + Logutils.e("getAllAppList", "onNext: " + listBaseResponse.toString()); + int code = listBaseResponse.code; + if (code == 200) { + List appListInfos = listBaseResponse.data; + getAppAutoStartUpdateAndNet(appListInfos); + } else { + Logutils.e("getAllAppList", "onNext: " + "no data"); + Logutils.e("getAllAppList", "onNext: " + listBaseResponse.data); + } + } + + @Override + public void onError(Throwable e) { + Logutils.e("getAllAppList", "onError: " + e.getMessage()); + } + + @Override + public void onComplete() { + Logutils.e("getAllAppList", "onComplete: "); + } + }); + } + + + public static void getAppAutoStartUpdateAndNet(List appListInfos) { + NetInterfaceManager.getInstance() + .getAppAutoStartUpdateAndNetObservable() + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { + Logutils.e("getAppAutoStart", "onSubscribe: "); + } + + @Override + public void onNext(@NonNull NetAndLaunchBean netAndLaunchBean) { + Logutils.e("getAppAutoStart", "onNext: " + netAndLaunchBean.toString()); + if (netAndLaunchBean.getCode() == 200) { + JGYUtils.getInstance().setNetAndlaunch(netAndLaunchBean, appListInfos); + } else { + Logutils.e("getAppAutoStart", "onNext: " + netAndLaunchBean.toString()); + } + } + + @Override + public void onError(@NonNull Throwable e) { + Logutils.e("getAppAutoStart", "onError: " + e.getMessage()); + onComplete(); + } + + @Override + public void onComplete() { + Logutils.e("getAppAutoStart", "onSubscribe: "); } }); } diff --git a/app/src/main/java/com/mjsheng/myappstore/network/URLAddress.java b/app/src/main/java/com/mjsheng/myappstore/network/URLAddress.java index f035fed..2b8cefe 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/URLAddress.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/URLAddress.java @@ -1,5 +1,6 @@ package com.mjsheng.myappstore.network; +import com.mjsheng.myappstore.BuildConfig; import com.mjsheng.myappstore.manager.NetInterfaceManager; /** @@ -7,7 +8,7 @@ import com.mjsheng.myappstore.manager.NetInterfaceManager; */ public class URLAddress { //根网址 - private static final String HTTP_TAG_HEAD_NEW = NetInterfaceManager.ROOT_URL; + private static final String HTTP_TAG_HEAD_NEW = BuildConfig.ROOT_URL; // 下载接口 根据包名匹配 请求后更新下载次数 @@ -62,5 +63,8 @@ public class URLAddress { public final static String GET_DEVELOPER = HTTP_TAG_HEAD_NEW + "Sn/getDeveloper"; //通过固件名获取内置应用 public final static String GET_ROM_APP = HTTP_TAG_HEAD_NEW + "And/getFirmwareApp"; - + //获取全部应用 + public final static String GET_ALL_APP = HTTP_TAG_HEAD_NEW + "recommend/index"; + //获取电子书包激活码 + public final static String GET_EBAG_CODE = HTTP_TAG_HEAD_NEW + "And/getEbagCode"; } diff --git a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/GetAllApp.java b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/GetAllApp.java new file mode 100644 index 0000000..720719e --- /dev/null +++ b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/GetAllApp.java @@ -0,0 +1,21 @@ +package com.mjsheng.myappstore.network.api.newapi; + +import com.mjsheng.myappstore.bean.AppListInfo; +import com.mjsheng.myappstore.bean.BaseResponse; +import com.mjsheng.myappstore.network.URLAddress; + +import java.util.List; + +import io.reactivex.Observable; +import retrofit2.http.Field; +import retrofit2.http.FormUrlEncoded; +import retrofit2.http.POST; + +public interface GetAllApp { + @FormUrlEncoded + @POST(URLAddress.GET_ALL_APP) + Observable>> getAllAppList( + @Field("key") String key, + @Field("sn") String sn + ); +} diff --git a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/GetEBagCode.java b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/GetEBagCode.java new file mode 100644 index 0000000..1ea8527 --- /dev/null +++ b/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/GetEBagCode.java @@ -0,0 +1,18 @@ +package com.mjsheng.myappstore.network.api.newapi; + +import com.mjsheng.myappstore.bean.BaseResponse; +import com.mjsheng.myappstore.network.URLAddress; + +import io.reactivex.Observable; +import retrofit2.http.Field; +import retrofit2.http.FormUrlEncoded; +import retrofit2.http.POST; + +public interface GetEBagCode { + @FormUrlEncoded + @POST(URLAddress.GET_EBAG_CODE) + Observable getEBagCode( + @Field("key") String key, + @Field("sn") String sn + ); +} diff --git a/app/src/main/java/com/mjsheng/myappstore/receiver/BootReceiver.java b/app/src/main/java/com/mjsheng/myappstore/receiver/BootReceiver.java index 1ad9ec9..6805a2f 100644 --- a/app/src/main/java/com/mjsheng/myappstore/receiver/BootReceiver.java +++ b/app/src/main/java/com/mjsheng/myappstore/receiver/BootReceiver.java @@ -3,13 +3,13 @@ package com.mjsheng.myappstore.receiver; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import android.util.Log; import com.mjsheng.myappstore.service.GuardService; import com.mjsheng.myappstore.service.LogcatService; import com.mjsheng.myappstore.service.MainService; import com.mjsheng.myappstore.service.StepService; import com.mjsheng.myappstore.utils.BootManager; +import com.mjsheng.myappstore.utils.Logutils; public class BootReceiver extends BroadcastReceiver { private String TAG = BootReceiver.class.getSimpleName() + ":myappstore"; @@ -17,7 +17,7 @@ public class BootReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { - Log.e(TAG, "action:" + intent.getAction()); + Logutils.e(TAG, "action:" + intent.getAction()); switch (intent.getAction()) { default: break; diff --git a/app/src/main/java/com/mjsheng/myappstore/receiver/MyJPushReceiver.java b/app/src/main/java/com/mjsheng/myappstore/receiver/MyJPushReceiver.java index e359dea..3c0243d 100644 --- a/app/src/main/java/com/mjsheng/myappstore/receiver/MyJPushReceiver.java +++ b/app/src/main/java/com/mjsheng/myappstore/receiver/MyJPushReceiver.java @@ -15,7 +15,6 @@ import android.os.Build; import android.os.Bundle; import android.provider.Settings; import android.text.TextUtils; -import android.util.Log; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -38,6 +37,7 @@ import com.mjsheng.myappstore.service.MainService; import com.mjsheng.myappstore.utils.ApkUtils; import com.mjsheng.myappstore.utils.CmdUtil; import com.mjsheng.myappstore.utils.ForegroundAppUtil; +import com.mjsheng.myappstore.utils.Logutils; import com.mjsheng.myappstore.utils.MySQLData; import com.mjsheng.myappstore.utils.SPUtils; import com.mjsheng.myappstore.utils.SaveListUtils; @@ -129,8 +129,10 @@ public class MyJPushReceiver extends BroadcastReceiver { private final String DEVELOPER_OPTIONS = "33"; //全局更新 private final String GLOBAL_UPDATE = "34"; - - + //电子书包激活码 + private final String EBAG_CODE = "35"; + //更新白名单 + private final String UPDATE_WHITELIST = "36"; private Context mContext; private int changeNum(int paramInt) { @@ -144,32 +146,32 @@ public class MyJPushReceiver extends BroadcastReceiver { if (JPushInterface.ACTION_REGISTRATION_ID.equals(intent.getAction())) { String regId = bundle.getString(JPushInterface.EXTRA_REGISTRATION_ID); - Log.e(TAG, "[MyReceiver] 接收Registration Id : " + regId); + Logutils.e(TAG, "[MyReceiver] 接收Registration Id : " + regId); //send the Registration Id to your server... } else if (JPushInterface.ACTION_MESSAGE_RECEIVED.equals(intent.getAction())) { // ToastTool.show("[MyReceiver] 接收到推送下来的自定义消息: " + bundle.getString(JPushInterface.EXTRA_MESSAGE) // + "---" + bundle.getString(JPushInterface.EXTRA_TITLE) + "---" + bundle.getString(JPushInterface.EXTRA_CONTENT_TYPE) // + "---" + bundle.getString(JPushInterface.EXTRA_EXTRA) + "----" + bundle.getString("package_name")); - // Log.e(TAG, "[MyReceiver] 接收到推送下来的自定义消息: " + bundle.getString(JPushInterface.EXTRA_MESSAGE) + // Logutils.e(TAG, "[MyReceiver] 接收到推送下来的自定义消息: " + bundle.getString(JPushInterface.EXTRA_MESSAGE) // + "---" + bundle.getString(JPushInterface.EXTRA_TITLE) + "---" + bundle.getString(JPushInterface.EXTRA_CONTENT_TYPE) // + "---" + bundle.getString(JPushInterface.EXTRA_EXTRA) + "----" + bundle.getString("package_name")); processCustomMessage(context, bundle);//屏蔽推送 } else if (JPushInterface.ACTION_NOTIFICATION_RECEIVED.equals(intent.getAction())) { - Log.e(TAG, "[MyReceiver] 接收到推送下来的通知" + bundle.getString(JPushInterface.EXTRA_EXTRA)); + Logutils.e(TAG, "[MyReceiver] 接收到推送下来的通知" + bundle.getString(JPushInterface.EXTRA_EXTRA)); // doDownloadAndInstall(bundle.getString(JPushInterface.EXTRA_EXTRA)); - // Log.e(getBatteryLevel()+"-0-iweroiwerewefeerer-----------"); + // Logutils.e(getBatteryLevel()+"-0-iweroiwerewefeerer-----------"); int notifactionId = bundle.getInt(JPushInterface.EXTRA_NOTIFICATION_ID); - Log.e(TAG, "[MyReceiver] 接收到推送下来的通知的ID: " + notifactionId); + Logutils.e(TAG, "[MyReceiver] 接收到推送下来的通知的ID: " + notifactionId); } else if (JPushInterface.ACTION_NOTIFICATION_OPENED.equals(intent.getAction())) { - Log.e(TAG, "[MyReceiver] 用户点击打开了通知"); + Logutils.e(TAG, "[MyReceiver] 用户点击打开了通知"); } else if (JPushInterface.ACTION_RICHPUSH_CALLBACK.equals(intent.getAction())) { - Log.e(TAG, "[MyReceiver] 用户收到到RICH PUSH CALLBACK: " + bundle.getString(JPushInterface.EXTRA_EXTRA)); + Logutils.e(TAG, "[MyReceiver] 用户收到到RICH PUSH CALLBACK: " + bundle.getString(JPushInterface.EXTRA_EXTRA)); //在这里根据 JPushInterface.EXTRA_EXTRA 的内容处理代码，比如打开新的Activity， 打开一个网页等.. } else if (JPushInterface.ACTION_CONNECTION_CHANGE.equals(intent.getAction())) { boolean connected = intent.getBooleanExtra(JPushInterface.EXTRA_CONNECTION_CHANGE, false); - Log.e(TAG, "[MyReceiver]" + intent.getAction() + " connected state change to " + connected); + Logutils.e(TAG, "[MyReceiver]" + intent.getAction() + " connected state change to " + connected); } else { - Log.e(TAG, "[MyReceiver] Unhandled intent - " + intent.getAction()); + Logutils.e(TAG, "[MyReceiver] Unhandled intent - " + intent.getAction()); } } @@ -180,7 +182,7 @@ public class MyJPushReceiver extends BroadcastReceiver { String extras = bundle.getString(JPushInterface.EXTRA_EXTRA); String package_name = bundle.getString("package_name"); - Log.e(TAG, "message::" + message + "--type::" + type + "--title::" + title + "--extras::" + extras); + Logutils.e(TAG, "message::" + message + "--type::" + type + "--title::" + title + "--extras::" + extras); // ToastUtils.showShort("message::" + message + "--type::" + type + "--title::" + title + "--extras::" + extras + "---package_name:" + package_name); // Toast.makeText(context, "message::" + message + "--type::" + type + "--title::" + title + "--extras::" + extras + "---package_name:" + package_name, Toast.LENGTH_SHORT).show(); switch (message) { @@ -200,7 +202,7 @@ public class MyJPushReceiver extends BroadcastReceiver { case MSG_SETTING: if (!TextUtils.isEmpty(extras)) { JGYUtils.getInstance().SettingSysData(extras); -// Log.e(TAG, "title--------" + extras); +// Logutils.e(TAG, "title--------" + extras); } // getSystemSetting(); break; @@ -248,7 +250,7 @@ public class MyJPushReceiver extends BroadcastReceiver { file.mkdirs(); } if (TextUtils.isEmpty(extras)) { - Log.e(TAG, "settingNetControl extras is null"); + Logutils.e(TAG, "settingNetControl extras is null"); return; } JSONObject extra = JSON.parseObject(extras); @@ -303,8 +305,8 @@ public class MyJPushReceiver extends BroadcastReceiver { StringBuilder sb = new StringBuilder(); //errCode等于0代表定位成功，其他的为定位失败，具体的可以参照官网定位错误码说明 if (aMapLocation.getErrorCode() == 0) { - Log.e(TAG, "onLocationChanged: " + "定位成功"); - Log.e(TAG, "onLocationChanged: " + aMapLocation.getAddress()); + Logutils.e(TAG, "onLocationChanged: " + "定位成功"); + Logutils.e(TAG, "onLocationChanged: " + aMapLocation.getAddress()); sb.append(aMapLocation.getAddress()).append("\n"); SPUtils.put(mContext, "AmapAddress", aMapLocation.getAddress()); SPUtils.put(mContext, "longitude", aMapLocation.getLongitude()); @@ -314,9 +316,9 @@ public class MyJPushReceiver extends BroadcastReceiver { sb.append("定位失败" + "\n"); SPUtils.put(mContext, "AmapError", String.valueOf(aMapLocation.getErrorCode())); } - Log.e(TAG, (String) SPUtils.get(mContext, "AmapAddress", "-")); - Log.e(TAG, (String) SPUtils.get(mContext, "AmapError", "-")); - Log.e(TAG, "amap: " + sb.toString()); + Logutils.e(TAG, (String) SPUtils.get(mContext, "AmapAddress", "-")); + Logutils.e(TAG, (String) SPUtils.get(mContext, "AmapError", "-")); + Logutils.e(TAG, "amap: " + sb.toString()); HTTPInterface.updateDeviceInfo(mContext); } }); @@ -342,7 +344,7 @@ public class MyJPushReceiver extends BroadcastReceiver { break; case LOGO_IMG: setBootanimation(context, extras); - Log.e(TAG, "processCustomMessage: " + extras); + Logutils.e(TAG, "processCustomMessage: " + extras); break; case DEFAULTP_APP: @@ -359,6 +361,12 @@ public class MyJPushReceiver extends BroadcastReceiver { case GLOBAL_UPDATE: GlobalUpdate(extras); break; + case EBAG_CODE: + setEbagCode(extras); + break; + case UPDATE_WHITELIST: + HTTPInterface.getAppLimit(mContext); + break; } } @@ -382,7 +390,7 @@ public class MyJPushReceiver extends BroadcastReceiver { file.mkdirs(); } if (TextUtils.isEmpty(jsonString)) { - Log.e(TAG, "doDownloadAndInstall: extras is null"); + Logutils.e(TAG, "doDownloadAndInstall: extras is null"); return; } JSONObject jSONObject = JSON.parseObject(jsonString); @@ -397,8 +405,8 @@ public class MyJPushReceiver extends BroadcastReceiver { packageObj.put("app_package", app_package); packageObj.put("app_id", app_id); packageObj.put("MD5", MD5); - Log.e(TAG, "doDownloadAndInstall: app_package:" + app_package); - Log.e(TAG, "doDownloadAndInstall: app_url:" + app_url); + Logutils.e(TAG, "doDownloadAndInstall: app_package:" + app_package); + Logutils.e(TAG, "doDownloadAndInstall: app_url:" + app_url); SaveListUtils.addList(app_package); SaveListUtils.sendForceAPP(mContext); PackageManager pm = mContext.getPackageManager(); @@ -409,14 +417,14 @@ public class MyJPushReceiver extends BroadcastReceiver { e.printStackTrace(); } if (packageInfo == null) { - Log.e(TAG, "doDownloadAndInstall: " + app_package + "未安装"); + Logutils.e(TAG, "doDownloadAndInstall: " + app_package + "未安装"); if (!SaveListUtils.isDownLoading(app_url)) { // Aria.download(this) // .load(app_url) // .setFilePath(PathUtils.getExternalDownloadsPath() + "/jgy/" + EncryptUtils.encryptMD5ToString(s) + ".apk", true) // .setExtendField(packageObj.toJSONString()) // .create(); - Log.e(TAG, "doDownloadAndInstall: " + app_package + "开始下载"); + Logutils.e(TAG, "doDownloadAndInstall: " + app_package + "开始下载"); Utils.ariaDownload(mContext, app_url, packageObj); } } else { @@ -437,7 +445,7 @@ public class MyJPushReceiver extends BroadcastReceiver { } } else { - Log.e(TAG, "doDownloadAndInstall: " + app_package + "已安装最新版"); + Logutils.e(TAG, "doDownloadAndInstall: " + app_package + "已安装最新版"); } } } @@ -454,14 +462,14 @@ public class MyJPushReceiver extends BroadcastReceiver { // // @Override // public void onError(Throwable param1Throwable) { -// Log.e(TAG, "getAppLimitApi=onError:"); +// Logutils.e(TAG, "getAppLimitApi=onError:"); // } // // @Override // public void onNext(ResponseBody param1ResponseBody) { // try { // String str2 = param1ResponseBody.string(); -// Log.e(TAG, str2); +// Logutils.e(TAG, str2); // JSONObject jSONObject = JSON.parseObject(str2); // JSONObject data = jSONObject.getJSONObject("data"); // String result = ""; @@ -489,7 +497,7 @@ public class MyJPushReceiver extends BroadcastReceiver { // .subscribe(new Observer() { // @Override // public void onSubscribe(Disposable d) { -// Log.e("getForceDownload", "forceDownloadApi---onSubscribe"); +// Logutils.e("getForceDownload", "forceDownloadApi---onSubscribe"); // // } // @@ -497,7 +505,7 @@ public class MyJPushReceiver extends BroadcastReceiver { // public void onNext(ForceDownloadBean forceDownloadBean) { // switch (forceDownloadBean.getCode()) { // case 200: -// Log.e("getForceDownload", "isDownloading=" + MyApplication.getInstance().isDownloading()); +// Logutils.e("getForceDownload", "isDownloading=" + MyApplication.getInstance().isDownloading()); // MyApplication.getInstance().checkIsDownloading(); // if (!MyApplication.getInstance().isDownloading()) { // forceDownload(forceDownloadBean.getData()); @@ -505,21 +513,21 @@ public class MyJPushReceiver extends BroadcastReceiver { // } // case -200: // boolean qch_force_app = Settings.System.putString(MainActivity.this.getContentResolver(), "qch_force_app", "invalid"); -// Log.e("fht", "qch_force_app:" + qch_force_app); +// Logutils.e("fht", "qch_force_app:" + qch_force_app); // break; // default: -// Log.e("getForceDownload is error:" + forceDownloadBean.getMsg()); +// Logutils.e("getForceDownload is error:" + forceDownloadBean.getMsg()); // } // } // // @Override // public void onError(Throwable e) { -// Log.e("getForceDownload", "forceDownloadApi=onError:"); +// Logutils.e("getForceDownload", "forceDownloadApi=onError:"); // } // // @Override // public void onComplete() { -// Log.e("getForceDownload", "forceDownloadApi---onComplete"); +// Logutils.e("getForceDownload", "forceDownloadApi---onComplete"); // } // }); // } @@ -537,7 +545,7 @@ public class MyJPushReceiver extends BroadcastReceiver { // jsonObject.put("app_name", app_name); // jsonObject.put("app_package", app_package); // int app_version_code = forceDownloadData.getApp_version_code(); -// Log.e("fht ", "packageName=" + app_package + ",URL= " + app_url + ",app_version_code=" + app_version_code); +// Logutils.e("fht ", "packageName=" + app_package + ",URL= " + app_url + ",app_version_code=" + app_version_code); // if (data.get(i).getApp_package().equals("com.jiaoguanyi.appstore")) { // continue;//为自身的跳过下载 // } @@ -550,7 +558,7 @@ public class MyJPushReceiver extends BroadcastReceiver { // packageInfo = pm.getPackageInfo(app_package, 0); // } catch (PackageManager.NameNotFoundException e) { // e.printStackTrace(); -// Log.e("fht", "forceDownload=" + e.getMessage()); +// Logutils.e("fht", "forceDownload=" + e.getMessage()); // } // if (packageInfo != null) { // long appVersionCode; @@ -560,7 +568,7 @@ public class MyJPushReceiver extends BroadcastReceiver { // appVersionCode = packageInfo.versionCode; // } // if (app_version_code > appVersionCode) { -// Log.e("fht ", "download URL " + app_url); +// Logutils.e("fht ", "download URL " + app_url); //// Aria.download(this) //// .load(app_url) //读取下载地址 //// .setFilePath(PathUtils.getExternalDownloadsPath() + "/jgy/" + EncryptUtils.encryptMD5ToString(app_package) + ".apk", true) @@ -569,7 +577,7 @@ public class MyJPushReceiver extends BroadcastReceiver { // Utils.ariaDownload(this, app_url, jsonObject); // } // } else { -// Log.e("fht ", "download URL " + app_url); +// Logutils.e("fht ", "download URL " + app_url); //// if (!SaveListUtils.isDownLoading(app_package)) { //// Aria.download(this) //// .load(app_url) //读取下载地址 @@ -599,18 +607,18 @@ public class MyJPushReceiver extends BroadcastReceiver { // Network.getDeselectBrowserIDApi().getDeselectBrowserIDApi("YTM3YTAxNTJmMmZmNzkyM2E2YzIwZjlhZTc0NzNmMGI=", Utils.getSerial()).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { // public void onComplete() { -// Log.e(TAG, "getDeselectBrowerID---onComplete"); +// Logutils.e(TAG, "getDeselectBrowerID---onComplete"); // } // // public void onError(Throwable param1Throwable) { -// Log.e(TAG, "getDeselectBrowerID=onError:"); +// Logutils.e(TAG, "getDeselectBrowerID=onError:"); // } // // public void onNext(ResponseBody param1ResponseBody) { // try { // String str1; // String str2 = param1ResponseBody.string(); -// Log.e(TAG, "DeselectBrowserIDApi::" + str2); +// Logutils.e(TAG, "DeselectBrowserIDApi::" + str2); // JSONObject jSONObject = new JSONObject(str2); // switch (Integer.valueOf(jSONObject.optInt("code")).intValue()) { // case 200: @@ -618,17 +626,17 @@ public class MyJPushReceiver extends BroadcastReceiver { // writeDeselectBrowserIDtoSystem(str1); // return; // } -// Log.e(TAG, "getDeselectBrowerID---code is -200"); +// Logutils.e(TAG, "getDeselectBrowerID---code is -200"); // return; // } catch (Exception e) { -// Log.e(TAG, "getDeselectBrowerID---wroing----" + e.getMessage()); +// Logutils.e(TAG, "getDeselectBrowerID---wroing----" + e.getMessage()); // e.printStackTrace(); // return; // } // } // // public void onSubscribe(Disposable param1Disposable) { -// Log.e(TAG, "getDeselectBrowerID---onSubscribe"); +// Logutils.e(TAG, "getDeselectBrowerID---onSubscribe"); // } // }); } @@ -643,7 +651,7 @@ public class MyJPushReceiver extends BroadcastReceiver { .subscribe(new Observer() { @Override public void onSubscribe(Disposable param1Disposable) { - Log.e("getDeselectID", "onSubscribe: "); + Logutils.e("getDeselectID", "onSubscribe: "); } @Override @@ -652,7 +660,7 @@ public class MyJPushReceiver extends BroadcastReceiver { String packages = ""; try { String responString = param1ResponseBody.string(); - Log.e("getDeselectID", "onNext: " + responString); + Logutils.e("getDeselectID", "onNext: " + responString); JSONObject jSONObject = JSON.parseObject(responString); int code = jSONObject.getInteger("code"); if (code == 200) { @@ -660,7 +668,7 @@ public class MyJPushReceiver extends BroadcastReceiver { packages = jSONObject.getJSONObject("data").getString("package"); } } catch (Exception e) { - Log.e("getDeselectID", "onNext: Exception: " + e.getMessage()); + Logutils.e("getDeselectID", "onNext: Exception: " + e.getMessage()); e.printStackTrace(); } JGYUtils.getInstance().writeDeselectIDtoSystem(ids, packages); @@ -668,12 +676,12 @@ public class MyJPushReceiver extends BroadcastReceiver { @Override public void onError(Throwable param1Throwable) { - Log.e("getDeselectID", "onError: " + param1Throwable.getMessage()); + Logutils.e("getDeselectID", "onError: " + param1Throwable.getMessage()); } @Override public void onComplete() { - Log.e("getDeselectID", "onComplete: "); + Logutils.e("getDeselectID", "onComplete: "); } }); } @@ -681,29 +689,30 @@ public class MyJPushReceiver extends BroadcastReceiver { private void setDisableSlideList(String s) { JSONObject jSONObject = JSON.parseObject(s); - Log.e("mymjsheng", "jSONObject::" + jSONObject.toString()); + Logutils.e("mymjsheng", "jSONObject::" + jSONObject.toString()); String strban = jSONObject.getString("ban"); String strnot = jSONObject.getString("not"); String qch_disable_slide = Settings.System.getString(mContext.getApplicationContext().getContentResolver(), "qch_disable_slide"); - Log.e("fht", "qch_disable_slide::" + qch_disable_slide); + Logutils.e("fht", "qch_disable_slide::" + qch_disable_slide); if (!TextUtils.isEmpty(strban)) { Settings.System.putString(mContext.getContentResolver(), "qch_disable_slide", strban); - Log.e("fht", "sendban::" + strban); + Logutils.e("fht", "sendban::" + strban); } else { Settings.System.putString(mContext.getContentResolver(), "qch_disable_slide", "invalid"); } - Log.e("fht", "qch_disable_slide::" + Settings.System.getString(mContext.getApplicationContext().getContentResolver(), "qch_disable_slide")); + Logutils.e("fht", "qch_disable_slide::" + Settings.System.getString(mContext.getApplicationContext().getContentResolver(), "qch_disable_slide")); } private void setDisableUpdateList(String s) { - Log.e("setDisableUpdateList", s); + Logutils.e("setDisableUpdateList", s); JSONObject jsonObject = JSON.parseObject(s); String ban = jsonObject.getString("ban"); String not = jsonObject.getString("not"); String[] banList = ban.split(","); String[] notList = not.split(","); boolean b = Utils.writeDisableUpdateList(mContext, banList, notList); + HTTPInterface.getAppLimit(mContext); } // args[1] = message::11--type::11--title::ok--extras::{"ban":"com.lizi.yuwen,com.iyuyan.jp2listensimple,com.netease.edu.study," + @@ -715,14 +724,14 @@ public class MyJPushReceiver extends BroadcastReceiver { Intent intent = new Intent("qch_camera_forbid").setPackage("com.android.settings"); intent.putExtra("camera_package_name", "close"); this.mContext.sendBroadcast(intent); - Log.e(TAG, "settingNetControl extras is null"); + Logutils.e(TAG, "settingNetControl extras is null"); return; } JSONObject jSONObject = JSON.parseObject(s); String s1 = jSONObject.getString("ban"); // String str = jSONObject.optString("not"); - Log.e("mymjsheng", "ban::" + s1); -// Log.e("mymjsheng", "not::" + str); + Logutils.e("mymjsheng", "ban::" + s1); +// Logutils.e("mymjsheng", "not::" + str); if ("0".equals(s1)) { Intent intent2 = new Intent("qch_camera_forbid").setPackage("com.android.settings"); // intent2.putExtra("camera_package_name", s1); @@ -736,11 +745,11 @@ public class MyJPushReceiver extends BroadcastReceiver { private void settingOneNet(String s) { if (TextUtils.isEmpty(s)) { - Log.e(TAG, "settingNetControl extras is null"); + Logutils.e(TAG, "settingNetControl extras is null"); // return; } JSONObject jSONObject = JSON.parseObject(s); - Log.e("mymjsheng", "jSONObject::" + jSONObject.toString()); + Logutils.e("mymjsheng", "jSONObject::" + jSONObject.toString()); String packages = jSONObject.getString("package"); String status = jSONObject.getString("status"); @@ -748,10 +757,10 @@ public class MyJPushReceiver extends BroadcastReceiver { private void settingNetControl(String s) { if (TextUtils.isEmpty(s)) { - Log.e(TAG, "settingNetControl extras is null"); + Logutils.e(TAG, "settingNetControl extras is null"); } JSONObject jSONObject = JSON.parseObject(s); - Log.e("mymjsheng", "jSONObject::" + jSONObject.toString()); + Logutils.e("mymjsheng", "jSONObject::" + jSONObject.toString()); String disallow = jSONObject.getString("ban"); String allow = jSONObject.getString("not"); HashSet disallowApp = new HashSet<>(Arrays.asList(disallow.split(","))); @@ -760,17 +769,17 @@ public class MyJPushReceiver extends BroadcastReceiver { private void settingPowerOn(String s) { if (TextUtils.isEmpty(s)) { - Log.e(TAG, "settingPowerOn extras is null"); + Logutils.e(TAG, "settingPowerOn extras is null"); return; } JSONObject jSONObject = JSON.parseObject(s); String ban = jSONObject.getString("ban"); String not = jSONObject.getString("not"); - Log.e(TAG, "settingPowerOn： qch_app_power_on = " + not); - if (TextUtils.isEmpty(not)){ + Logutils.e(TAG, "settingPowerOn： qch_app_power_on = " + not); + if (TextUtils.isEmpty(not)) { //当 qch_app_power_on 的值为空时，会造成系统所有应用断网 Settings.System.putString(mContext.getContentResolver(), "qch_app_power_on", "Invalid"); - }else { + } else { Settings.System.putString(mContext.getContentResolver(), "qch_app_power_on", not); } } @@ -779,11 +788,11 @@ public class MyJPushReceiver extends BroadcastReceiver { private void writeDeselectBrowserIDtoSystem(String s) { // if (!TextUtils.isEmpty(s)) { boolean bool = Settings.System.putString(this.mContext.getContentResolver(), "DeselectBrowserArray", s); - Log.e("SystemSetting", "DeselectBrowserArray---------" + s); - Log.e("SystemSetting", "DeselectBrowserArray---------" + bool); + Logutils.e("SystemSetting", "DeselectBrowserArray---------" + s); + Logutils.e("SystemSetting", "DeselectBrowserArray---------" + bool); // return; // } -// Log.e(TAG, "writeDeselectBrowserIDtoSystem is null:"); +// Logutils.e(TAG, "writeDeselectBrowserIDtoSystem is null:"); } private void setHomepagtag(String s) { @@ -794,10 +803,10 @@ public class MyJPushReceiver extends BroadcastReceiver { new CacheUtils().cleanApplicationUserData(mContext, "com.android.browser"); } catch (Exception e) { e.printStackTrace(); - Log.e(TAG, "setHomepagtag: " + e.getMessage()); + Logutils.e(TAG, "setHomepagtag: " + e.getMessage()); } // if (TextUtils.isEmpty(s)) { - // Log.e(TAG, "setHomepagtag extras is null"); + // Logutils.e(TAG, "setHomepagtag extras is null"); // // return; // } else { @@ -819,13 +828,13 @@ public class MyJPushReceiver extends BroadcastReceiver { HTTPInterface.getAppinsideWeb(mContext, new HTTPInterface.GetAppinsideWebCallback() { @Override public void ononComplete() { - Log.e(TAG, "ononComplete: setAPPinsideWebsite"); + Logutils.e(TAG, "ononComplete: setAPPinsideWebsite"); } }); //app内部网页管控 // if (TextUtils.isEmpty(s)) { - // Log.e(TAG, "setAPPinsideWebsite extras is null"); + // Logutils.e(TAG, "setAPPinsideWebsite extras is null"); // // return; // } else { @@ -846,7 +855,7 @@ public class MyJPushReceiver extends BroadcastReceiver { // if (!TextUtils.isEmpty(s1) && !TextUtils.isEmpty(result)) { // String appstore = "com.jiaoguanyi.appstore"; // String store = "com.jiaoguanyi.store"; -// Log.e("writeDeselectIDtoSystem", result); +// Logutils.e("writeDeselectIDtoSystem", result); // if (!result.contains(appstore)) { // result = result + "," + appstore; // } @@ -854,14 +863,14 @@ public class MyJPushReceiver extends BroadcastReceiver { // result = result + "," + store; // } // String olddeselectViewArray = Settings.System.getString(this.mContext.getContentResolver(), "qch_app_forbid_id"); -// Log.e("SystemSetting", "olddeselectViewArray---------" + olddeselectViewArray); +// Logutils.e("SystemSetting", "olddeselectViewArray---------" + olddeselectViewArray); // Settings.System.putString(this.mContext.getContentResolver(), "qch_app_forbid_id", result); // Settings.System.putString(this.mContext.getContentResolver(), "DeselectViewArray", s1); -// Log.e("qch_app_forbid_id", "qch_app_forbid_id---------" + result); -// Log.e("SystemSetting", "deselectViewArray---------" + s1); +// Logutils.e("qch_app_forbid_id", "qch_app_forbid_id---------" + result); +// Logutils.e("SystemSetting", "deselectViewArray---------" + s1); // return; // } else { -// Log.e(TAG, "writeDeselectIDtoSystem is null:"); +// Logutils.e(TAG, "writeDeselectIDtoSystem is null:"); // Settings.System.putString(this.mContext.getContentResolver(), "DeselectViewArray", "Invalid"); // } // } @@ -874,14 +883,14 @@ public class MyJPushReceiver extends BroadcastReceiver { */ public void settingLock(String s) { if (TextUtils.isEmpty(s)) { - Log.e(TAG, "settingLock extras is null"); + Logutils.e(TAG, "settingLock extras is null"); return; } JSONObject jSONObject = JSON.parseObject(s); int i = changeNum(jSONObject.getIntValue("lock")); Settings.System.putInt(this.mContext.getContentResolver(), "qch_unlock_ipad", i); - Log.e("SystemSetting", "qch_unlock_ipad---------" + i); + Logutils.e("SystemSetting", "qch_unlock_ipad---------" + i); if (getBatteryLevel() >= CommonDatas.MIN_POWER) { Utils.doMasterClear(mContext); @@ -894,7 +903,7 @@ public class MyJPushReceiver extends BroadcastReceiver { JSONObject jSONObject = JSON.parseObject(s); long createTime = jSONObject.getLong("createTime"); if (createTime != 0) { - Log.e("createTime", String.valueOf(createTime)); + Logutils.e("createTime", String.valueOf(createTime)); doscreenshot(createTime); } } @@ -920,13 +929,13 @@ public class MyJPushReceiver extends BroadcastReceiver { if (integer == 0) { uplaodImage(time); } else { - Log.e("doss", "失败"); + Logutils.e("doss", "失败"); } } @Override public void onError(Throwable e) { - Log.e("doss", "Throwable=" + e.getMessage()); + Logutils.e("doss", "Throwable=" + e.getMessage()); } @Override @@ -943,7 +952,7 @@ public class MyJPushReceiver extends BroadcastReceiver { File file = new File(filepath + File.separator + time + ".db"); //不要直接使用常用图片格式 if (!file.exists()) { - Log.e("uplaodImage", "File does not exists"); + Logutils.e("uplaodImage", "File does not exists"); return; } OkGo.post(URLAddress.SEND_SCREENSHOT) @@ -956,13 +965,13 @@ public class MyJPushReceiver extends BroadcastReceiver { JSONObject object = JSON.parseObject(s); int code = object.getInteger("code"); String msg = object.getString("msg"); - Log.e("uplaodImage", "code:" + code + "," + msg); + Logutils.e("uplaodImage", "code:" + code + "," + msg); } @Override public void onError(Call call, Response response, Exception e) { super.onError(call, response, e); - Log.e("uplaodImage", "e=" + e.getMessage()); + Logutils.e("uplaodImage", "e=" + e.getMessage()); } }); } @@ -1020,7 +1029,7 @@ public class MyJPushReceiver extends BroadcastReceiver { // mediaPlayer.prepare(); mediaPlayer.setLooping(false); int duration = mediaPlayer.getDuration() / 1000; - Log.e(TAG, "defaultCallMediaPlayer: " + "duration: " + duration); + Logutils.e(TAG, "defaultCallMediaPlayer: " + "duration: " + duration); int loop = 0; if (duration <= 1) { loop = 30; @@ -1036,13 +1045,13 @@ public class MyJPushReceiver extends BroadcastReceiver { setMaxVolume(context); mediaPlayer.start(); soundCount[0] += 1; - Log.e(TAG, "onCompletion: " + "loop: " + finalLoop); - Log.e(TAG, "onCompletion: " + "soundCount: " + soundCount[0]); + Logutils.e(TAG, "onCompletion: " + "loop: " + finalLoop); + Logutils.e(TAG, "onCompletion: " + "soundCount: " + soundCount[0]); } else { mediaPlayer.stop(); mediaPlayer.release(); - Log.e(TAG, "onCompletion: " + "loop: " + finalLoop); - Log.e(TAG, "onCompletion: " + "soundCount: " + soundCount[0]); + Logutils.e(TAG, "onCompletion: " + "loop: " + finalLoop); + Logutils.e(TAG, "onCompletion: " + "soundCount: " + soundCount[0]); } } }); @@ -1051,7 +1060,7 @@ public class MyJPushReceiver extends BroadcastReceiver { mediaPlayer.start(); } catch (Exception e) { e.printStackTrace(); - Log.e(TAG, "defaultCallMediaPlayer: " + e.getMessage()); + Logutils.e(TAG, "defaultCallMediaPlayer: " + e.getMessage()); } } @@ -1073,17 +1082,17 @@ public class MyJPushReceiver extends BroadcastReceiver { JSONObject jsonObject = JSONObject.parseObject(extras); String packageName = jsonObject.getString("app_package"); if (TextUtils.isEmpty(packageName)) { - Log.e(TAG, "cleanCache: " + "package is empty"); + Logutils.e(TAG, "cleanCache: " + "package is empty"); } else { try { if (new CacheUtils().cleanApplicationUserData(context, packageName)) { - Log.e(TAG, "cleanCache: " + packageName + " success"); + Logutils.e(TAG, "cleanCache: " + packageName + " success"); } else { - Log.e(TAG, "cleanCache: " + packageName + " failed"); + Logutils.e(TAG, "cleanCache: " + packageName + " failed"); } } catch (Exception e) { e.printStackTrace(); - Log.e(TAG, "cleanCache: " + e.getMessage()); + Logutils.e(TAG, "cleanCache: " + e.getMessage()); } } } @@ -1091,7 +1100,7 @@ public class MyJPushReceiver extends BroadcastReceiver { private void setDeveloperoptions(String extras) { JSONObject jsonObject = JSONObject.parseObject(extras); int is_developer = jsonObject.getInteger("is_developer"); - Log.e(TAG, "setDeveloperoptions: " + is_developer); + Logutils.e(TAG, "setDeveloperoptions: " + is_developer); JGYUtils.getInstance().setDeveloperOptions(is_developer == 0 ? 1 : 0); } @@ -1104,7 +1113,7 @@ public class MyJPushReceiver extends BroadcastReceiver { if (JGYUtils.getInstance().isSamePlatform(platform)) { checkAPPInstall(jsonObject); } else { - Log.e(TAG, "GlobalUpdate: " + "应用与app平台不符合"); + Logutils.e(TAG, "GlobalUpdate: " + "应用与app平台不符合"); } } @@ -1121,7 +1130,17 @@ public class MyJPushReceiver extends BroadcastReceiver { if (packageInfo == null || packageInfo.getLongVersionCode() < version_code) { Utils.ariaDownload(mContext, jsonObject.getString("app_url"), jsonObject); } else { - Log.e(TAG, "checkAPPInstall: " + "已经是最新版"); + Logutils.e(TAG, "checkAPPInstall: " + "已经是最新版"); + } + } + + private void setEbagCode(String jsonString) { + JSONObject jsonObject = JSON.parseObject(jsonString); + String ebagCode = jsonObject.getString("ebagCode"); + if (TextUtils.isEmpty(ebagCode)) { + Logutils.e(TAG, "setEbagCode: " + "ebagCode is empty"); + } else { + SPUtils.put(mContext, "ebagCode", ebagCode); } } } diff --git a/app/src/main/java/com/mjsheng/myappstore/receiver/NewAppReceiver.java b/app/src/main/java/com/mjsheng/myappstore/receiver/NewAppReceiver.java index a6b32c6..7bc7cb9 100644 --- a/app/src/main/java/com/mjsheng/myappstore/receiver/NewAppReceiver.java +++ b/app/src/main/java/com/mjsheng/myappstore/receiver/NewAppReceiver.java @@ -6,13 +6,13 @@ import android.content.Context; import android.content.Intent; import android.os.Build; import android.text.TextUtils; -import android.util.Log; import com.mjsheng.myappstore.BuildConfig; import com.mjsheng.myappstore.network.HTTPInterface; import com.mjsheng.myappstore.utils.ApkUtils; import com.mjsheng.myappstore.utils.CacheUtils; import com.mjsheng.myappstore.utils.JGYUtils; +import com.mjsheng.myappstore.utils.Logutils; import com.mjsheng.myappstore.utils.SPUtils; import com.mjsheng.myappstore.utils.SaveListUtils; @@ -39,11 +39,11 @@ public class NewAppReceiver extends BroadcastReceiver { public void onReceive(Context context, Intent intent) { mContext = context; String action = intent.getAction(); - cleanLauncherCache(); - Log.e(TAG, "onReceive: " + "action = " + action); + JGYUtils.getInstance().cleanLauncherCache(); + Logutils.e(TAG, "onReceive: " + "action = " + action); String state; if (TextUtils.isEmpty(action)) { - Log.e(TAG, "onReceive: " + "action is empty "); + Logutils.e(TAG, "onReceive: " + "action is empty "); return; } String packageName = intent.getDataString().replace("package:", ""); @@ -61,7 +61,7 @@ public class NewAppReceiver extends BroadcastReceiver { state = "未知:"; break; } - Log.e(TAG, "sendAppInfo: " + state + packageName); + Logutils.e(TAG, "sendAppInfo: " + state + packageName); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { if (!APPSTORE.equals(packageName) || !BuildConfig.APPLICATION_ID.equals(packageName)) { ApkUtils.addShortcut(context); @@ -86,21 +86,6 @@ public class NewAppReceiver extends BroadcastReceiver { // } } - public void cleanLauncherCache() { - Log.e(TAG, "cleanLauncherCache: Start"); - int cleaned = (int) SPUtils.get(mContext, "fristcleanLauncherCache", 0); - if (cleaned == 0) { - try { - new CacheUtils().cleanApplicationUserData(mContext, "com.android.launcher3"); - SPUtils.put(mContext, "fristcleanLauncherCache", 1); - Log.e(TAG, "cleanLauncherCache: end"); - } catch (Exception e) { - e.printStackTrace(); - Log.e(TAG, "cleanLauncherCache: " + e.getMessage()); - } - } - } - public interface NewAppListener { void setNewAppListener(String packageName); } @@ -127,10 +112,11 @@ public class NewAppReceiver extends BroadcastReceiver { @Override public void onNext(@NonNull String s) { - Log.e(TAG, "sendAppInfo: onNext: " + s); + Logutils.e(TAG, "sendAppInfo: onNext: " + s); SaveListUtils.getDownLoadList().remove(s); ApkUtils.getAppInfo(mContext); - HTTPInterface.getNetAndLaunchSetting(mContext); + // HTTPInterface.getNetAndLaunchSetting(mContext); + HTTPInterface.getAppLimit(mContext); } @Override @@ -140,7 +126,7 @@ public class NewAppReceiver extends BroadcastReceiver { @Override public void onComplete() { - Log.e(TAG, "onComplete: "); + Logutils.e(TAG, "onComplete: "); } }); } diff --git a/app/src/main/java/com/mjsheng/myappstore/service/GuardService.java b/app/src/main/java/com/mjsheng/myappstore/service/GuardService.java index cf6338d..0fc25bd 100644 --- a/app/src/main/java/com/mjsheng/myappstore/service/GuardService.java +++ b/app/src/main/java/com/mjsheng/myappstore/service/GuardService.java @@ -25,7 +25,6 @@ import android.os.IBinder; import android.provider.Settings; import android.text.TextUtils; import android.text.format.Formatter; -import android.util.Log; import androidx.annotation.Nullable; @@ -43,6 +42,7 @@ import com.mjsheng.myappstore.network.api.newapi.GetLockStateApi; import com.mjsheng.myappstore.receiver.BootReceiver; import com.mjsheng.myappstore.receiver.NewAppReceiver; import com.mjsheng.myappstore.utils.JGYUtils; +import com.mjsheng.myappstore.utils.Logutils; import com.mjsheng.myappstore.utils.NetworkUtils; import com.mjsheng.myappstore.utils.SPUtils; import com.mjsheng.myappstore.utils.XAPKUtils; @@ -81,7 +81,7 @@ public class GuardService extends Service { private ServiceConnection mServiceConnection = new ServiceConnection() { @Override public void onServiceConnected(ComponentName componentName, IBinder iBinder) { - Log.e(TAG, "GuardService:建立链接"); + Logutils.e(TAG, "GuardService:建立链接"); boolean isServiceRunning = ServiceAliveUtils.isServiceAlive(GuardService.this, StepService.class.getName()); if (!isServiceRunning) { Intent i = new Intent(GuardService.this, StepService.class); @@ -124,7 +124,7 @@ public class GuardService extends Service { @Override public int onStartCommand(Intent intent, int flags, int startId) { - Log.e(TAG, "onStartCommand: "); + Logutils.e(TAG, "onStartCommand: "); Aria.init(this); Aria.download(this).register(); // 绑定建立链接 @@ -180,13 +180,13 @@ public class GuardService extends Service { //获取移动数据连接的信息 NetworkInfo dataNetworkInfo = connMgr.getNetworkInfo(ConnectivityManager.TYPE_MOBILE); if (wifiNetworkInfo.isConnected() && dataNetworkInfo.isConnected()) { - Log.e("NetworkChangedRecceiver", "WIFI已连接,移动数据已连接"); + Logutils.e("NetworkChangedRecceiver", "WIFI已连接,移动数据已连接"); } else if (wifiNetworkInfo.isConnected() && !dataNetworkInfo.isConnected()) { - Log.e("NetworkChangedRecceiver", "WIFI已连接,移动数据已断开"); + Logutils.e("NetworkChangedRecceiver", "WIFI已连接,移动数据已断开"); } else if (!wifiNetworkInfo.isConnected() && dataNetworkInfo.isConnected()) { - Log.e("NetworkChangedRecceiver", "WIFI已连接,移动数据已连接"); + Logutils.e("NetworkChangedRecceiver", "WIFI已连接,移动数据已连接"); } else { - Log.e("NetworkChangedRecceiver", "WIFI已连接,移动数据已断开"); + Logutils.e("NetworkChangedRecceiver", "WIFI已连接,移动数据已断开"); } //API大于23时使用下面的方式进行网络监听 } else { @@ -204,22 +204,22 @@ public class GuardService extends Service { sb.append(networkInfo.getTypeName() + " connect is " + networkInfo.isConnected()); } } - Log.e("NetworkChangedRecceiver", sb.toString()); + Logutils.e("NetworkChangedRecceiver", sb.toString()); } if (intent.getAction().equals(WifiManager.RSSI_CHANGED_ACTION)) { - Log.e("NetworkChangedRecceiver", "wifi信号强度变化"); + Logutils.e("NetworkChangedRecceiver", "wifi信号强度变化"); } //wifi连接上与否 if (intent.getAction().equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)) { NetworkInfo info = intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO); if (info.getState().equals(NetworkInfo.State.DISCONNECTED)) { - Log.e("NetworkChangedRecceiver", "wifi断开"); + Logutils.e("NetworkChangedRecceiver", "wifi断开"); } else if (info.getState().equals(NetworkInfo.State.CONNECTED)) { WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE); WifiInfo wifiInfo = wifiManager.getConnectionInfo(); //获取当前wifi名称 - Log.e("NetworkChangedRecceiver", "连接到网络 " + wifiInfo.getSSID()); + Logutils.e("NetworkChangedRecceiver", "连接到网络 " + wifiInfo.getSSID()); startService(new Intent(context, MainService.class)); Aria.download(this).resumeAllTask(); } @@ -228,9 +228,9 @@ public class GuardService extends Service { if (intent.getAction().equals(WifiManager.WIFI_STATE_CHANGED_ACTION)) { int wifistate = intent.getIntExtra(WifiManager.EXTRA_WIFI_STATE, WifiManager.WIFI_STATE_DISABLED); if (wifistate == WifiManager.WIFI_STATE_DISABLED) { - Log.e("NetworkChangedRecceiver", "系统关闭wifi"); + Logutils.e("NetworkChangedRecceiver", "系统关闭wifi"); } else if (wifistate == WifiManager.WIFI_STATE_ENABLED) { - Log.e("NetworkChangedRecceiver", "系统开启wifi"); + Logutils.e("NetworkChangedRecceiver", "系统开启wifi"); } } } @@ -269,7 +269,7 @@ public class GuardService extends Service { @Override public void onReceive(final Context context, Intent intent) { String action = intent.getAction(); - Log.e(TAG, "action:" + action); + Logutils.e(TAG, "action:" + action); switch (action) { default: break; @@ -337,7 +337,7 @@ public class GuardService extends Service { case "android.intent.action.MASTER_CLEAR": case "android.intent.action.MASTER_CLEAR_NOTIFICATION": case "android.intent.action.FORCE_FACTORY_RESET": - Log.e("PresentReceiver", "MASTER_CLEAR"); + Logutils.e("PresentReceiver", "MASTER_CLEAR"); android.os.Process.killProcess(android.os.Process.myPid()); System.exit(0); break; @@ -347,7 +347,7 @@ public class GuardService extends Service { private void sendScreenStatus(int status) { // if (!JGYUtils.isBetaVersion()) { -// Log.e(TAG, "sendScreenStatus: " + JGYUtils.getCHANNEL_VALUE() + " not support"); +// Logutils.e(TAG, "sendScreenStatus: " + JGYUtils.getCHANNEL_VALUE() + " not support"); // return; // } OkGo.post(BuildConfig.SCREEN_URL) @@ -357,13 +357,13 @@ public class GuardService extends Service { .execute(new StringCallback() { @Override public void onSuccess(String s, Call call, Response response) { - Log.e("sendScreenStatus", "onSuccess: " + s); + Logutils.e("sendScreenStatus", "onSuccess: " + s); } @Override public void onError(Call call, Response response, Exception e) { super.onError(call, response, e); - Log.e("sendScreenStatus", "onError: " + e.getMessage()); + Logutils.e("sendScreenStatus", "onError: " + e.getMessage()); } }); } @@ -433,7 +433,7 @@ public class GuardService extends Service { // 最大电量 int scale = intent.getIntExtra(BatteryManager.EXTRA_SCALE, 0); int elec = (level * 100) / scale; - Log.e(TAG, "electricity:=" + elec + "%"); + Logutils.e(TAG, "electricity:=" + elec + "%"); if (elec == 50) { startService(new Intent(getBaseContext(), MainService.class)); } @@ -443,7 +443,7 @@ public class GuardService extends Service { || Intent.ACTION_BATTERY_OKAY.equals(action) ) { setDefaultUSBStatus(); - Log.e(TAG, action); + Logutils.e(TAG, action); startService(new Intent(getBaseContext(), MainService.class)); } } @@ -451,7 +451,7 @@ public class GuardService extends Service { private void setDefaultUSBStatus() { String setting_usb = Settings.System.getString(getContentResolver(), "qch_usb_choose"); - Log.e("setDefaultUSBStatus", "setting_usb---------" + setting_usb); + Logutils.e("setDefaultUSBStatus", "setting_usb---------" + setting_usb); String usbStatus = ""; if (TextUtils.isEmpty(setting_usb)) { usbStatus = "qch_action_usb_usb_charge"; @@ -496,14 +496,14 @@ public class GuardService extends Service { @Override public void onReceive(Context context, Intent intent) { if (intent == null || intent.getAction() == null) { - Log.e(TAG, "NetworkStateReceiver: 异常"); + Logutils.e(TAG, "NetworkStateReceiver: 异常"); return; } if (NetworkUtils.isConnected(getBaseContext())) { - Log.e(TAG, "NetworkStateReceiver: 网络连接成功"); + Logutils.e(TAG, "NetworkStateReceiver: 网络连接成功"); startService(new Intent(getBaseContext(), MainService.class)); } else { - Log.e(TAG, "NetworkStateReceiver: 网络连接失败"); + Logutils.e(TAG, "NetworkStateReceiver: 网络连接失败"); } } } @@ -515,7 +515,7 @@ public class GuardService extends Service { JSONObject jsonObject = JSON.parseObject(task.getExtendField()); String app_name = jsonObject.getString("app_name"); String app_package = jsonObject.getString("app_package"); - Log.e("aria", "正在下载:" + task.getPercent() + ":" + task.getExtendField()); + Logutils.e("aria", "正在下载:" + task.getPercent() + ":" + task.getExtendField()); ToastUtil.show("正在下载:" + app_name + "-" + task.getPercent() + "%" + "\t" + Formatter.formatFileSize(GuardService.this, task.getSpeed()) + "/s"); } @@ -524,8 +524,8 @@ public class GuardService extends Service { //在这里处理任务完成的状态 String filepath = task.getFilePath(); String extendField = task.getExtendField(); - Log.e("taskComplete", "downloadPath::" + filepath); - Log.e("taskComplete", "extendField::" + extendField); + Logutils.e("taskComplete", "downloadPath::" + filepath); + Logutils.e("taskComplete", "extendField::" + extendField); if (filepath.endsWith("apk")) { JSONObject jsonObject = JSON.parseObject(extendField); @@ -535,13 +535,13 @@ public class GuardService extends Service { ToastUtil.show(app_name + "\t:下载完成"); if (filepath.endsWith(".xapk")) { XAPKUtils.getInstance().installXAPK(filepath); - Log.e(TAG, "taskComplete: " + filepath); + Logutils.e(TAG, "taskComplete: " + filepath); } else if (filepath.endsWith(".apk")) { new Thread(() -> ApkUtils.installApp(GuardService.this, filepath)).start(); List list = Aria.download(this).getDRunningTask(); if (list == null || list.size() == 0) { BaseApplication.getInstance().setDownloadState(false); - Log.e("taskComplete", "isDownloading=" + BaseApplication.getInstance().isDownloading()); + Logutils.e("taskComplete", "isDownloading=" + BaseApplication.getInstance().isDownloading()); } } OkGo.post(URLAddress.HTTP_TAG_DOWNLOAD_URL) @@ -553,12 +553,12 @@ public class GuardService extends Service { .execute(new StringCallback() { @Override public void onSuccess(String s, Call call, okhttp3.Response response) { - Log.e("taskComplete", "onSuccess: "); + Logutils.e("taskComplete", "onSuccess: "); } @Override public void onError(Call call, Response response, Exception e) { - Log.e("taskComplete", "onError: " + e.getMessage()); + Logutils.e("taskComplete", "onError: " + e.getMessage()); super.onError(call, response, e); } }); @@ -574,17 +574,17 @@ public class GuardService extends Service { .execute(new StringCallback() { @Override public void onSuccess(String s, Call call, okhttp3.Response response) { - Log.e("taskComplete", "onSuccess: " + s); + Logutils.e("taskComplete", "onSuccess: " + s); } @Override public void onError(Call call, Response response, Exception e) { super.onError(call, response, e); - Log.e("taskComplete", "onError: " + e.getMessage()); + Logutils.e("taskComplete", "onError: " + e.getMessage()); } }); } else if (filepath.endsWith(".zip")) { - Log.e("taskComplete", "下载完成:" + task.getPercent() + ":" + task.getExtendField()); + Logutils.e("taskComplete", "下载完成:" + task.getPercent() + ":" + task.getExtendField()); JGYUtils.getInstance().setBootanimation(task.getFilePath()); } } @@ -597,10 +597,10 @@ public class GuardService extends Service { JSONObject jsonObject = JSON.parseObject(task.getExtendField()); String app_name = jsonObject.getString("app_name"); String app_package = jsonObject.getString("app_package"); - Log.e("aria", "下载失败: " + packageName + "filepath： " + filepath + "Exception: " + e.getMessage()); + Logutils.e("aria", "下载失败: " + packageName + "filepath： " + filepath + "Exception: " + e.getMessage()); // ToastUtil.show(app_name + "\t:下载失败"); } catch (Exception e1) { - Log.e("aria", "taskFail: " + e1.getMessage()); + Logutils.e("aria", "taskFail: " + e1.getMessage()); } } } diff --git a/app/src/main/java/com/mjsheng/myappstore/service/JWebSocketClient.java b/app/src/main/java/com/mjsheng/myappstore/service/JWebSocketClient.java index 22d986f..894dd88 100644 --- a/app/src/main/java/com/mjsheng/myappstore/service/JWebSocketClient.java +++ b/app/src/main/java/com/mjsheng/myappstore/service/JWebSocketClient.java @@ -1,6 +1,6 @@ package com.mjsheng.myappstore.service; -import android.util.Log; +import com.mjsheng.myappstore.utils.Logutils; import org.java_websocket.client.WebSocketClient; import org.java_websocket.drafts.Draft_6455; @@ -15,22 +15,22 @@ public class JWebSocketClient extends WebSocketClient { @Override public void onOpen(ServerHandshake handshakedata) { - Log.e("JWebSocketClient", "onOpen()"); + Logutils.e("JWebSocketClient", "onOpen()"); } @Override public void onMessage(String message) { - Log.e("JWebSocketClient", "onMessage()"); + Logutils.e("JWebSocketClient", "onMessage()"); } @Override public void onClose(int code, String reason, boolean remote) { - Log.e("JWebSocketClient", "onClose():" + reason); + Logutils.e("JWebSocketClient", "onClose():" + reason); } @Override public void onError(Exception ex) { - Log.e("JWebSocketClient", "onError():" + ex.getMessage()); + Logutils.e("JWebSocketClient", "onError():" + ex.getMessage()); } } \ No newline at end of file diff --git a/app/src/main/java/com/mjsheng/myappstore/service/LogcatService.java b/app/src/main/java/com/mjsheng/myappstore/service/LogcatService.java index 482726f..1fe894a 100644 --- a/app/src/main/java/com/mjsheng/myappstore/service/LogcatService.java +++ b/app/src/main/java/com/mjsheng/myappstore/service/LogcatService.java @@ -7,8 +7,8 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.IBinder; import android.text.TextUtils; -import android.util.Log; +import com.mjsheng.myappstore.utils.Logutils; import com.mjsheng.myappstore.utils.Utils; import java.io.BufferedReader; @@ -58,7 +58,7 @@ public class LogcatService extends Service { //// exec.destroy(); // } catch (IOException e) { //// e.printStackTrace(); -// Log.e("第一个是Logcat", e.getMessage()); +// Logutils.e("第一个是Logcat", e.getMessage()); // } registerLogcatReceiver(); } @@ -133,7 +133,7 @@ public class LogcatService extends Service { try { //新建一个路径信息 File file = new File(logFilePath + logFileName); - Log.e(TAG, "run: " + logFilePath); + Logutils.e(TAG, "run: " + logFilePath); if (!file.exists()) { file.getParentFile().mkdirs(); file.createNewFile(); @@ -146,7 +146,7 @@ public class LogcatService extends Service { os.flush(); } } catch (Exception e) { - Log.e("writelog", "read logcat process failed. message: " + Logutils.e("writelog", "read logcat process failed. message: " + e.getMessage()); } finally { if (null != os) { @@ -181,7 +181,7 @@ public class LogcatService extends Service { BufferedReader bufferedReader; FileOutputStream fileOutputStream; File file = new File(logFilePath); - Log.e(TAG, "getLog: " + logFilePath); + Logutils.e(TAG, "getLog: " + logFilePath); if (!file.exists()) { file.mkdirs(); } @@ -190,7 +190,7 @@ public class LogcatService extends Service { inputStreamReader = new InputStreamReader(process.getInputStream()); bufferedReader = new BufferedReader(inputStreamReader); fileOutputStream = new FileOutputStream(logFilePath + logFileName); - Log.e(TAG, "getLog: " + logFilePath + logFileName); + Logutils.e(TAG, "getLog: " + logFilePath + logFileName); String logEntry; while (shouldGetLog) { @@ -201,7 +201,7 @@ public class LogcatService extends Service { inputStreamReader.close(); bufferedReader.close(); fileOutputStream.close(); - Log.e(TAG, "getLog: " + "closed"); + Logutils.e(TAG, "getLog: " + "closed"); } catch (IOException e) { e.printStackTrace(); } catch (NullPointerException e) { @@ -214,7 +214,7 @@ public class LogcatService extends Service { @Override public void onReceive(Context context, Intent intent) { String action = intent.getAction(); - Log.e(TAG, "onReceive: " + action); + Logutils.e(TAG, "onReceive: " + action); if (TextUtils.isEmpty(action)) { return; } diff --git a/app/src/main/java/com/mjsheng/myappstore/service/MainService.java b/app/src/main/java/com/mjsheng/myappstore/service/MainService.java index 864b245..808f1be 100644 --- a/app/src/main/java/com/mjsheng/myappstore/service/MainService.java +++ b/app/src/main/java/com/mjsheng/myappstore/service/MainService.java @@ -15,20 +15,23 @@ import android.os.SystemClock; import android.provider.Settings; import android.text.TextUtils; import android.util.DisplayMetrics; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.WindowManager; import android.widget.Button; import android.widget.TextView; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.google.gson.JsonObject; import com.mjsheng.myappstore.R; +import com.mjsheng.myappstore.action.JGYActions; import com.mjsheng.myappstore.activity.MainActivity; import com.mjsheng.myappstore.activity.MainContact; import com.mjsheng.myappstore.activity.MainPresenter; import com.mjsheng.myappstore.utils.ApkUtils; import com.mjsheng.myappstore.utils.ForegroundAppUtil; +import com.mjsheng.myappstore.utils.Logutils; import com.mjsheng.myappstore.utils.SPUtils; import com.mjsheng.myappstore.utils.SaveListUtils; import com.mjsheng.myappstore.utils.SysSettingUtils; @@ -59,12 +62,7 @@ public class MainService extends Service implements MainContact.MainView { private ObservableOnSubscribe subscribe = new ObservableOnSubscribe() { @Override public void subscribe(ObservableEmitter emitter) throws Exception { - start = new Start() { - @Override - public void onstar(long time) { - emitter.onNext(time); - } - }; + start = emitter::onNext; } }; @@ -76,7 +74,7 @@ public class MainService extends Service implements MainContact.MainView { @Override public void onNext(Long aLong) { - Log.e("TimeObserver", "onNext: " + aLong); + Logutils.e("TimeObserver", "onNext: " + aLong); startCommandTime = runningTime = SystemClock.elapsedRealtime(); mPresenter.getFirstConnect(); mPresenter.getLockedState(); @@ -102,14 +100,13 @@ public class MainService extends Service implements MainContact.MainView { return null; } - @Override public void onCreate() { mPresenter = new MainPresenter(this); mPresenter.attachView(this); if ((int) SPUtils.get(this, "first_connect", 0) == 0) { // TODO: 2021/5/26 待底层修改，临时解决办法 - Log.e(TAG, "onCreate: " + "Disable All Settings"); + Logutils.e(TAG, "onCreate: " + "Disable All Settings"); mPresenter.setDisableSetting(); } registerReceivers(); @@ -118,6 +115,8 @@ public class MainService extends Service implements MainContact.MainView { .throttleLast(60, TimeUnit.SECONDS) .subscribe(timeObserver); // cleanLauncherCache(); + setFloatingWindow(this); + setStatusbar(); super.onCreate(); } @@ -138,20 +137,20 @@ public class MainService extends Service implements MainContact.MainView { public int onStartCommand(Intent intent, int flags, int startId) { JPushInterface.init(this); if (MainActivity.isForeground) { - Log.e(TAG, "onStartCommand: MainService: isForeground: " + MainActivity.isForeground); + Logutils.e(TAG, "onStartCommand: MainService: isForeground: " + MainActivity.isForeground); } else { // if (((SystemClock.elapsedRealtime() - startCommandTime) < 60000) && startCommandTime != 0) { -// Log.e(TAG, "onStartCommand: " + "启动时间过短"); +// Logutils.e(TAG, "onStartCommand: " + "启动时间过短"); // //一分钟内防止多次调用 // } else { // mPresenter.getFirstConnect(); // mPresenter.getLockedState(); // startCommandTime = runningTime = SystemClock.elapsedRealtime(); -// Log.e(TAG, "onStartCommand: isForeground: " + MainActivity.isForeground); -// Log.e(TAG, "onStartCommand: " + (SystemClock.elapsedRealtime() - startCommandTime)); +// Logutils.e(TAG, "onStartCommand: isForeground: " + MainActivity.isForeground); +// Logutils.e(TAG, "onStartCommand: " + (SystemClock.elapsedRealtime() - startCommandTime)); // } start.onstar(SystemClock.elapsedRealtime()); - Log.e("timeObserver", "onStartCommand: " + (SystemClock.elapsedRealtime() - startCommandTime) + "ms"); + Logutils.e(TAG, "onStartCommand: " + (SystemClock.elapsedRealtime() - startCommandTime) + "ms"); } return START_STICKY; } @@ -160,6 +159,17 @@ public class MainService extends Service implements MainContact.MainView { ApkUtils.addShortcut(MainService.this); } + private void setStatusbar() { + String status = (String) SPUtils.get(this, JGYActions.ACTION_StatusBar_STATUS, ""); + Logutils.e(TAG, "setStatusbar: String: " + status); + if (TextUtils.isEmpty(status)) { + Logutils.e(TAG, "setStatusbar: " + "status is NULL"); + return; + } + JSONObject jsonObject = JSON.parseObject(status); + SysSettingUtils.setStatusBar(this, jsonObject); + } + private void registerReceivers() { registerLockScreenReceiver(); registerTimeReceiver(); @@ -276,7 +286,7 @@ public class MainService extends Service implements MainContact.MainView { @Override public void onReceive(Context context, Intent intent) { String action = intent.getAction(); - Log.e("LockScreenReceiver", "onReceive: " + action); + Logutils.e("LockScreenReceiver", "onReceive: " + action); if (TextUtils.isEmpty(action)) { return; } @@ -320,43 +330,46 @@ public class MainService extends Service implements MainContact.MainView { @Override public void onReceive(Context context, Intent intent) { if (Intent.ACTION_DATE_CHANGED.equals(intent.getAction())) { - Log.e("fht", "TimeChangedReceiver:" + "data changed"); + Logutils.e("TimeChangedReceiver", "onReceive:" + "data changed"); } else if (Intent.ACTION_TIME_CHANGED.equals(intent.getAction())) { - Log.e("fht", "TimeChangedReceiver:" + "time changed"); + Logutils.e("TimeChangedReceiver", "onReceive:" + "time changed"); } else if (Intent.ACTION_TIMEZONE_CHANGED.equals(intent.getAction())) { - Log.e("fht", "TimeChangedReceiver:" + "timezone changed"); + Logutils.e("TimeChangedReceiver", "onReceive:" + "timezone changed"); } else if (Intent.ACTION_TIME_TICK.equals(intent.getAction())) { - Log.e("fht", "TimeChangedReceiver:" + "time tick"); + Logutils.e("TimeChangedReceiver", "onReceive:" + "time tick"); } else if (ACTION_UPDATE.equals(intent.getAction())) { - Log.e("fht", "TimeChangedReceiver:" + "date update"); + Logutils.e("TimeChangedReceiver", "onReceive:" + "date update"); } - ForegroundAppUtil.openTopApp(context); - long nowTime = System.currentTimeMillis(); - TimeUtils.ContralTime contralTime = TimeUtils.getDefaltContralTime(MainService.this); - if (null != contralTime) { - if (contralTime.inControlTime(nowTime)) { - if (!screenlocked) { - showFloatingWindow("管控时间：" + contralTime.toString()); - } else { - TextView textView = topView.findViewById(R.id.textView); - textView.setText("管控时间：" + contralTime.toString()); - } - timelocked = true; + setFloatingWindow(context); + } + } + + private void setFloatingWindow(Context context) { + ForegroundAppUtil.openTopApp(context); + long nowTime = System.currentTimeMillis(); + TimeUtils.ContralTime contralTime = TimeUtils.getDefaltContralTime(MainService.this); + if (null != contralTime) { + if (contralTime.inControlTime(nowTime)) { + if (!screenlocked) { + showFloatingWindow("管控时间：" + contralTime.toString()); } else { - mPresenter.getScreenLockState(); - if (!screenlocked) { - hideFloatingWindow(); - } - timelocked = false; + TextView textView = topView.findViewById(R.id.textView); + textView.setText("管控时间：" + contralTime.toString()); } + timelocked = true; } else { + mPresenter.getScreenLockState(); if (!screenlocked) { hideFloatingWindow(); } - mPresenter.getScreenLockState(); timelocked = false; } - + } else { + if (!screenlocked) { + hideFloatingWindow(); + } + mPresenter.getScreenLockState(); + timelocked = false; } } @@ -382,25 +395,25 @@ public class MainService extends Service implements MainContact.MainView { public void onReceive(Context context, Intent intent) { String action = intent.getAction(); if (TextUtils.isEmpty(action)) { - Log.e(TAG, "onReceive: " + "Action is NULL!"); + Logutils.e(TAG, "onReceive: " + "Action is NULL!"); return; } - Log.e(TAG, "onReceive: " + "Sender is " + intent.getPackage()); + Logutils.e(TAG, "onReceive: " + "Sender is " + intent.getPackage()); String packageName = intent.getStringExtra("packageName"); String filePath = intent.getStringExtra("filePath"); if (!TextUtils.isEmpty(packageName) && !TextUtils.isEmpty(filePath)) { - Log.e(TAG, "onReceive: " + "packageName: " + packageName + "filePath: " + filePath); + Logutils.e(TAG, "onReceive: " + "packageName: " + packageName + "filePath: " + filePath); installApkByPackage(filePath, packageName); } else if (!TextUtils.isEmpty(filePath)) { String pkg = ApkUtils.getPackageName(MainService.this, filePath); if (TextUtils.isEmpty(pkg)) { - Log.e(TAG, "onReceive: " + "unknow packageName"); + Logutils.e(TAG, "onReceive: " + "unknow packageName"); } else { - Log.e(TAG, "onReceive: " + "pkg: " + pkg + "\tfilePath: " + filePath); + Logutils.e(TAG, "onReceive: " + "pkg: " + pkg + "\tfilePath: " + filePath); installApkByPackage(filePath, pkg); } } else { - Log.e(TAG, "onReceive: " + "no filePath and packageName"); + Logutils.e(TAG, "onReceive: " + "no filePath and packageName"); } } } @@ -414,8 +427,9 @@ public class MainService extends Service implements MainContact.MainView { String oldListString = Settings.System.getString(getContentResolver(), "qch_app_forbid"); HashSet packageList = new HashSet<>(Arrays.asList(oldListString.split(","))); if (!packageList.contains(pkg)) { - Log.e(TAG, "installApkByPackage: " + "packageName: " + pkg + " not in whitelist"); + Logutils.e(TAG, "installApkByPackage: " + "packageName: " + pkg + " not in whitelist"); } else { + Logutils.e(TAG, "installApkByPackage: " + "packageName: " + pkg); ApkUtils.installApp(MainService.this, filePath); } } @@ -448,7 +462,7 @@ public class MainService extends Service implements MainContact.MainView { @Override public void setLockedState(boolean loocked) { if (loocked) { - Log.e(TAG, "setLockedState: " + netWorkIsRunning); + Logutils.e(TAG, "setLockedState: " + netWorkIsRunning); //上传APP信息 ApkUtils.getAppInfo(this); //发送设备mac地址和信息 @@ -477,7 +491,7 @@ public class MainService extends Service implements MainContact.MainView { */ @Override public void setFirstConnect(boolean state) { - Log.e(TAG, "isFirstConnect: " + "end request: " + state); + Logutils.e(TAG, "isFirstConnect: " + "end request: " + state); if (state) { mPresenter.setDisableSetting(); } else { @@ -497,6 +511,11 @@ public class MainService extends Service implements MainContact.MainView { @Override public void getSnTimeControlFinished() { + mPresenter.getEBagCode(); + } + + @Override + public void getEBagCodeFinished() { } @@ -605,7 +624,7 @@ public class MainService extends Service implements MainContact.MainView { @Override public void setTopAppFinished() { netWorkIsRunning = false; - Log.e(TAG, "SettingFinished: " + (SystemClock.elapsedRealtime() - runningTime) + " ms"); + Logutils.e(TAG, "SettingFinished: " + (SystemClock.elapsedRealtime() - runningTime) + " ms"); } @Override @@ -627,6 +646,4 @@ public class MainService extends Service implements MainContact.MainView { public void getDefaultDesktopFinished() { } - - } diff --git a/app/src/main/java/com/mjsheng/myappstore/service/RemoteService.java b/app/src/main/java/com/mjsheng/myappstore/service/RemoteService.java index 895b85b..dd2ba83 100644 --- a/app/src/main/java/com/mjsheng/myappstore/service/RemoteService.java +++ b/app/src/main/java/com/mjsheng/myappstore/service/RemoteService.java @@ -4,10 +4,10 @@ import android.app.Service; import android.content.Intent; import android.os.IBinder; import android.os.RemoteException; -import android.util.Log; import com.jiaoguanyi.appstore.IGetLicenseInterface; -import com.mjsheng.myappstore.utils.Utils; +import com.mjsheng.myappstore.utils.Logutils; +import com.mjsheng.myappstore.utils.SPUtils; public class RemoteService extends Service { private String TAG = RemoteService.class.getSimpleName(); @@ -17,7 +17,7 @@ public class RemoteService extends Service { @Override public IBinder onBind(Intent intent) { - Log.e(TAG, "onBind: "); + Logutils.e(TAG, "onBind: "); return mBinde; } @@ -34,8 +34,9 @@ public class RemoteService extends Service { @Override public String getLicense() throws RemoteException { - Log.e(TAG, "getLicense: "); - return "8054u98729"; + String ebagCode = (String) SPUtils.get(RemoteService.this, "ebagCode", ""); + Logutils.e(TAG, "getLicense: " + ebagCode); + return ebagCode; } }; } diff --git a/app/src/main/java/com/mjsheng/myappstore/service/StepService.java b/app/src/main/java/com/mjsheng/myappstore/service/StepService.java index 1f7df92..e07006c 100644 --- a/app/src/main/java/com/mjsheng/myappstore/service/StepService.java +++ b/app/src/main/java/com/mjsheng/myappstore/service/StepService.java @@ -15,12 +15,12 @@ import android.content.ServiceConnection; import android.os.Binder; import android.os.Handler; import android.os.IBinder; -import android.util.Log; import androidx.annotation.Nullable; import com.mjsheng.myappstore.KeepAliveConnection; import com.mjsheng.myappstore.manager.NetInterfaceManager; +import com.mjsheng.myappstore.utils.Logutils; import com.mjsheng.myappstore.utils.ServiceAliveUtils; import com.mjsheng.myappstore.utils.Utils; @@ -50,7 +50,7 @@ public class StepService extends Service { private ServiceConnection mServiceConnection = new ServiceConnection() { @Override public void onServiceConnected(ComponentName componentName, IBinder iBinder) { - Log.e(TAG, "StepService:建立链接"); + Logutils.e(TAG, "StepService:建立链接"); boolean isServiceRunning = ServiceAliveUtils.isServiceAlive(StepService.this, GuardService.class.getName()); if (!isServiceRunning) { Intent i = new Intent(StepService.this, GuardService.class); @@ -81,17 +81,17 @@ public class StepService extends Service { // try { // final String filePath = intent.getStringExtra("filePath"); // final String packageName = intent.getStringExtra("packageName"); -// Log.e("fht", filePath); -// Log.e("fht", packageName); +// Logutils.e("fht", filePath); +// Logutils.e("fht", packageName); // FileData fileData = new FileData(filePath, packageName); // MyApplication.getInstance().addFileData(fileData); // // } catch (Exception e) { -// Log.e("fht", e.getMessage()); +// Logutils.e("fht", e.getMessage()); // } //初始化websocket - Log.e(TAG, "onStartCommand: "); + Logutils.e(TAG, "onStartCommand: "); initSocketClient(); mHandler.postDelayed(heartBeatRunnable, HEART_BEAT_RATE);//开启心跳检测 bindService(new Intent(this, GuardService.class), mServiceConnection, Context.BIND_IMPORTANT); @@ -114,19 +114,19 @@ public class StepService extends Service { client = new JWebSocketClient(uri) { @Override public void onMessage(String message) { - Log.i("JWebSocketClientService", "收到服务器发来的消息：" + message + "?"); + Logutils.i("JWebSocketClientService", "收到服务器发来的消息：" + message + "?"); } @Override public void onOpen(ServerHandshake handshakedata) { super.onOpen(handshakedata); - Log.i("JWebSocketClientService", "websocket连接成功"); + Logutils.i("JWebSocketClientService", "websocket连接成功"); } @Override public void onClose(int code, String reason, boolean remote) { super.onClose(code, reason, remote); - Log.i("JWebSocketClientService", "websocket连接关闭"); + Logutils.i("JWebSocketClientService", "websocket连接关闭"); // client.close(); // initSocketClient(); mHandler.postDelayed(heartBeatRunnable, HEART_BEAT_RATE);//开启心跳检测 @@ -136,7 +136,7 @@ public class StepService extends Service { @Override public void onError(Exception ex) { super.onError(ex); - Log.i("JWebSocketClientService", "websocket连接错误"); + Logutils.i("JWebSocketClientService", "websocket连接错误"); // client.close(); // initSocketClient(); mHandler.postDelayed(heartBeatRunnable, HEART_BEAT_RATE);//开启心跳检测 @@ -155,10 +155,10 @@ public class StepService extends Service { public void run() { try { //connectBlocking多出一个等待操作，会先连接再发送，否则未连接发送会报错 - Log.i("JWebSocketClientService", "websocket链接中"); + Logutils.i("JWebSocketClientService", "websocket链接中"); client.connectBlocking(); } catch (InterruptedException e) { - Log.i("JWebSocketClientService", e.getMessage()); + Logutils.i("JWebSocketClientService", e.getMessage()); // e.printStackTrace(); } } @@ -173,7 +173,7 @@ public class StepService extends Service { */ public void sendMsg(String msg) { if (null != client) { - Log.i("JWebSocketClientService", "发送的消息：" + msg); + Logutils.i("JWebSocketClientService", "发送的消息：" + msg); client.send(msg); } } @@ -199,13 +199,13 @@ public class StepService extends Service { private Runnable heartBeatRunnable = new Runnable() { @Override public void run() { - Log.i("JWebSocketClientService", "心跳包检测websocket连接状态"); + Logutils.i("JWebSocketClientService", "心跳包检测websocket连接状态"); if (client != null) { if (client.isOpen()) { - Log.i("JWebSocketClientService", "websocket已连接"); + Logutils.i("JWebSocketClientService", "websocket已连接"); sendMsg(Utils.getSerial()); } else if (client.isClosed()) { - Log.i("JWebSocketClientService", "websocket重连中"); + Logutils.i("JWebSocketClientService", "websocket重连中"); reconnectWs(); } } else { @@ -227,7 +227,7 @@ public class StepService extends Service { @Override public void run() { try { - Log.i("JWebSocketClientService", "开启重连"); + Logutils.i("JWebSocketClientService", "开启重连"); client.reconnectBlocking(); } catch (InterruptedException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/ApkUtils.java b/app/src/main/java/com/mjsheng/myappstore/utils/ApkUtils.java index 399f263..1475dae 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/ApkUtils.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/ApkUtils.java @@ -22,7 +22,6 @@ import androidx.annotation.RequiresApi; import androidx.core.content.FileProvider; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.widget.Toast; @@ -52,6 +51,7 @@ import java.util.Enumeration; import java.util.HashSet; import java.util.List; import java.util.Set; +import java.util.function.Predicate; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; @@ -83,7 +83,7 @@ public class ApkUtils { return false; } } catch (Exception e) { - Log.e("*** DEBUG ***", "Unexpected error - Here is what I know: " + Logutils.e("*** DEBUG ***", "Unexpected error - Here is what I know: " + e.getMessage()); return false; } finally { @@ -241,14 +241,14 @@ public class ApkUtils { public void call(Subscriber subscriber) { File file = new File(filePath); if (filePath == null || filePath.length() == 0 || file == null) { - Log.e("mjsheng", "errormesg=========" + " 空啊 "); + Logutils.e("mjsheng", "errormesg=========" + " 空啊 "); subscriber.onNext(0); return; } // String[] args = { "pm", "install", "-r", filePath }; String[] args = {"pm", "install", "-i", "com.colorflykids", "--user", "0", filePath}; // String argss = "pm install -i " + "com.colorflykids" + " --user 0 " + filePath; - Log.e("mjsheng", "argss====" + args); + Logutils.e("mjsheng", "argss====" + args); ProcessBuilder processBuilder = new ProcessBuilder(args); Process process = null; BufferedReader successResult = null; @@ -261,15 +261,15 @@ public class ApkUtils { errorResult = new BufferedReader(new InputStreamReader(process.getErrorStream())); String s; while ((s = successResult.readLine()) != null) { - Log.e("mjhseng", "successResult----------" + s); + Logutils.e("mjhseng", "successResult----------" + s); successMsg.append(s); } while ((s = errorResult.readLine()) != null) { - Log.e("mjhseng", "errorResult----------" + s); + Logutils.e("mjhseng", "errorResult----------" + s); errorMsg.append(s); } } catch (IOException e1) { - Log.e("mjsheng", "IOException e1)----------" + e1.toString()); + Logutils.e("mjsheng", "IOException e1)----------" + e1.toString()); e1.printStackTrace(); } finally { try { @@ -280,7 +280,7 @@ public class ApkUtils { errorResult.close(); } } catch (IOException e1) { - Log.e("mjsheng", "IOException e11)---------" + e1.toString()); + Logutils.e("mjsheng", "IOException e11)---------" + e1.toString()); e1.printStackTrace(); } if (process != null) { @@ -290,7 +290,7 @@ public class ApkUtils { if (successMsg.toString().contains("Success") || successMsg.toString().contains("success")) { subscriber.onNext(2); } else { - Log.e("mjsheng", "errormesg=========" + errorMsg.toString()); + Logutils.e("mjsheng", "errormesg=========" + errorMsg.toString()); subscriber.onNext(1); } } @@ -303,10 +303,10 @@ public class ApkUtils { if (value == 2) { //安装成功 ToastUtil.show("安装成功"); - Log.e("mjsheng", "-----------安装成功-----------"); + Logutils.e("mjsheng", "-----------安装成功-----------"); } else { //安装错误 - Log.e("mjsheng", "------------安装错误-----------"); + Logutils.e("mjsheng", "------------安装错误-----------"); ToastUtil.show("安装失败"); } } @@ -331,10 +331,10 @@ public class ApkUtils { // IBinder bind = (IBinder) method_getService.invoke(null, "package"); // IPackageManager iPm = IPackageManager.Stub.asInterface(bind); // iPm.installPackage(Uri.fromFile(apkFile),null, 2, apkFile.getName()); - // Log.e("mjsheng", "安装成功"); + // Logutils.e("mjsheng", "安装成功"); // } catch (Exception e) { // e.printStackTrace(); - // Log.e("mjsheng", "安装失败"); + // Logutils.e("mjsheng", "安装失败"); // } // } public interface InstallCallback { @@ -342,7 +342,7 @@ public class ApkUtils { } public static void installApp(Context context, String filePath) { - Log.e(TAG, "installApp: " + filePath); + Logutils.e(TAG, "installApp: " + filePath); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { installAppatPie(context, filePath); } else { @@ -385,9 +385,9 @@ public class ApkUtils { process.destroy(); } } - Log.e("result", "" + errorMsg.toString()); + Logutils.e("result", "" + errorMsg.toString()); //如果含有“success”认为安装成功 - Log.e("installApp", successMsg.toString()); + Logutils.e("installApp", successMsg.toString()); // if (!successMsg.toString().equalsIgnoreCase("success")) { // ApkUtils.install(context, new File(apkPath)); // } @@ -468,7 +468,7 @@ public class ApkUtils { } } catch (IOException e) { e.printStackTrace(); - Log.e("fht", "copyApkFile" + e.getMessage()); + Logutils.e("fht", "copyApkFile" + e.getMessage()); } return success; } @@ -491,16 +491,16 @@ public class ApkUtils { method.invoke(PackageManagerService, installPath, null, 0x00000040, packageName, getUserId(Binder.getCallingUid()));//getUserId } catch (ClassNotFoundException e) { e.printStackTrace(); - Log.e("installApkInSilence", "ClassNotFoundException:" + e.getMessage()); + Logutils.e("installApkInSilence", "ClassNotFoundException:" + e.getMessage()); } catch (NoSuchMethodException e) { e.printStackTrace(); - Log.e("installApkInSilence", "NoSuchMethodException:" + e.getMessage()); + Logutils.e("installApkInSilence", "NoSuchMethodException:" + e.getMessage()); } catch (IllegalAccessException e) { e.printStackTrace(); - Log.e("installApkInSilence", "IllegalAccessException:" + e.getMessage()); + Logutils.e("installApkInSilence", "IllegalAccessException:" + e.getMessage()); } catch (InvocationTargetException e) { e.printStackTrace(); - Log.e("installApkInSilence", "InvocationTargetException:" + e.getMessage()); + Logutils.e("installApkInSilence", "InvocationTargetException:" + e.getMessage()); } } @@ -538,7 +538,7 @@ public class ApkUtils { Observable.create(new Observable.OnSubscribe() { @Override public void call(Subscriber subscriber) { - Log.e("UninstallAPP", "call： " + Thread.currentThread().getName()); + Logutils.e("UninstallAPP", "call： " + Thread.currentThread().getName()); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { ApkUtils.uninstall(context, pkg); } else { @@ -551,18 +551,18 @@ public class ApkUtils { .subscribe(new Observer() { @Override public void onCompleted() { - Log.e("UninstallAPP", "onCompleted: "); + Logutils.e("UninstallAPP", "onCompleted: "); } @Override public void onError(Throwable e) { - Log.e("UninstallAPP", "onError: " + e.getMessage()); + Logutils.e("UninstallAPP", "onError: " + e.getMessage()); } @Override public void onNext(String s) { - Log.e("UninstallAPP", "onNext： " + Thread.currentThread().getName()); - Log.e("UninstallAPP", "onNext: " + s); + Logutils.e("UninstallAPP", "onNext： " + Thread.currentThread().getName()); + Logutils.e("UninstallAPP", "onNext: " + s); } }); @@ -644,6 +644,7 @@ public class ApkUtils { /** * 获取第三方应用 + * * @param context * @return */ @@ -653,13 +654,13 @@ public class ApkUtils { List appInfos = pm.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES);// GET_UNINSTALLED_PACKAGES代表已删除，但还有安装目录的 List applicationInfos = new ArrayList<>(); for (ApplicationInfo app : appInfos) { -// Log.e("queryFilterAppInfo", String.valueOf(app.flags)); -// Log.e("queryFilterAppInfo", String.valueOf((app.flags & mask))); +// Logutils.e("queryFilterAppInfo", String.valueOf(app.flags)); +// Logutils.e("queryFilterAppInfo", String.valueOf((app.flags & mask))); if ((app.flags & ApplicationInfo.FLAG_SYSTEM) == 1) { //通过flag排除系统应用，会将电话、短信也排除掉 } else { applicationInfos.add(app.packageName); - Log.e("queryFilterAppInfo", app.packageName); + Logutils.e("queryFilterAppInfo", app.packageName); } } return applicationInfos; @@ -914,7 +915,7 @@ public class ApkUtils { try { pm.setApplicationEnabledSetting(packageInfo.packageName, PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0); } catch (Exception e) { - Log.e(TAG, "showAllAPP: " + e.getMessage()); + Logutils.e(TAG, "showAllAPP: " + e.getMessage()); } } } @@ -923,7 +924,7 @@ public class ApkUtils { try { pm.setApplicationEnabledSetting(packageInfo.packageName, PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0); } catch (Exception e) { - Log.e(TAG, "showAllAPP: " + e.getMessage()); + Logutils.e(TAG, "showAllAPP: " + e.getMessage()); } hideSystemSettingAPP(context, packageInfo.packageName); } @@ -978,7 +979,7 @@ public class ApkUtils { List appList = ApkUtils.queryFilterAppInfo(context); if (null != appList && appList.size() > 0) { for (String packageName : appList) { - Log.e("fht", "uninstallAllApp packageName is:" + packageName); + Logutils.e("fht", "uninstallAllApp packageName is:" + packageName); if (packageName.equals("com.jiaoguanyi.store") || packageName.equals(BuildConfig.APPLICATION_ID)) { continue; } @@ -1022,7 +1023,7 @@ public class ApkUtils { PackageManager pm = context.getPackageManager(); pi = pm.getPackageInfo(pkgName, 0); } catch (PackageManager.NameNotFoundException e) { - Log.e("isSystemApp: NameNotFoundException:", e.getMessage()); + Logutils.e("isSystemApp: NameNotFoundException:", e.getMessage()); } // 是系统中已安装的应用 if (pi != null) { @@ -1055,7 +1056,7 @@ public class ApkUtils { // 通过getPackageManager()的queryIntentActivities方法遍历 List resolveinfoList = pm.queryIntentActivities(resolveIntent, 0); for (ResolveInfo resolveInfo : resolveinfoList) { - Log.d("", "resolveInfo:" + resolveInfo); + Logutils.d("", "resolveInfo:" + resolveInfo); } ResolveInfo resolveinfo = resolveinfoList.iterator().next(); if (resolveinfo != null) { @@ -1093,16 +1094,22 @@ public class ApkUtils { Settings.System.putString(context.getContentResolver(), "qch_launcher_icon_app", ""); return; } - Log.e("addShortcut", "addShortcut: " + result); + Logutils.e("addShortcut", "addShortcut: " + result); String[] stringList = result.split(","); HashSet packages = new HashSet<>(Arrays.asList(stringList)); String romapps = Settings.System.getString(context.getContentResolver(), "jgy_customromapp"); - Log.e(TAG, "addShortcut: romapps: " + romapps); + Logutils.e(TAG, "addShortcut: romapps: " + romapps); HashSet appSet = new HashSet<>(); if (!TextUtils.isEmpty(romapps)) { appSet = new HashSet<>(Arrays.asList(romapps.split(","))); packages.addAll(appSet); } + packages.removeIf(new Predicate() { + @Override + public boolean test(String s) { + return TextUtils.isEmpty(s); + } + }); StringBuilder installedListBuilder = new StringBuilder(); for (String s : packages) { if ("com.jiaoguanyi.store".equals(s) || "com.jiaoguanyi.appstore".equals(s)) { @@ -1121,23 +1128,23 @@ public class ApkUtils { installedListBuilder.append(","); } installedListBuilder.append(s); - Log.e("addShortcut", "packages: " + s); + Logutils.e("addShortcut", "packages: " + s); } String installedList = installedListBuilder.toString(); boolean qch_force_app = Settings.System.putString(context.getContentResolver(), "qch_launcher_icon_app", installedList); // String old = Settings.System.getString(context.getContentResolver(), "qch_launcher_icon_app"); -// Log.e("addShortcut", old); - Log.e("addShortcut", "installedList:" + installedList); - Log.e("addShortcut", "putstring:" + qch_force_app); +// Logutils.e("addShortcut", old); + Logutils.e("addShortcut", "installedList:" + installedList); + Logutils.e("addShortcut", "putstring:" + qch_force_app); } public static void getAppInfo(Context context) { ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE); List infoList = activityManager.getRunningServices(Integer.MAX_VALUE); for (ActivityManager.RunningServiceInfo info : infoList) { -// Log.e("fht", "getAppInfo1: "+info.process); -// Log.e("fht", "getAppInfo2: "+info.service.getPackageName()); -// Log.e("fht", "getAppInfo3: "+info.service.getClassName()); +// Logutils.e("fht", "getAppInfo1: "+info.process); +// Logutils.e("fht", "getAppInfo2: "+info.service.getPackageName()); +// Logutils.e("fht", "getAppInfo3: "+info.service.getClassName()); } ArrayList appList = new ArrayList(); //用来存储获取的应用信息数据 List packages = context.getPackageManager().getInstalledPackages(0); @@ -1176,7 +1183,7 @@ public class ApkUtils { uploadAppInfo.setApp_name(packageInfo.applicationInfo.loadLabel(context.getPackageManager()).toString()); uploadAppInfo.setPackage_name(packageInfo.packageName); - Log.e("getAppInfo", "getAppInfo:" + packageInfo.packageName); + Logutils.e("getAppInfo", "getAppInfo:" + packageInfo.packageName); // uploadAppInfo.setId(i); String firstInstallTime = Utils.transferLongToDate(packageInfo.firstInstallTime); uploadAppInfo.setInstall_time(firstInstallTime); @@ -1187,14 +1194,14 @@ public class ApkUtils { for (ActivityManager.RunningServiceInfo info : infoList) { if (info.process.contains(packageInfo.packageName)) { uploadAppInfo.setState(1); - Log.e("getAppInfo", "getAppInfo running: " + packageInfo.packageName); + Logutils.e("getAppInfo", "getAppInfo running: " + packageInfo.packageName); } } appList.add(uploadAppInfo); } Gson gson = new Gson(); String jsonString = gson.toJson(appList); - Log.e(TAG, "getAppInfo: " + jsonString); + Logutils.e(TAG, "getAppInfo: " + jsonString); UploadAppInfoApi uploadAppInfoApi = NetInterfaceManager.getUploadAppInfoApi(); uploadAppInfoApi @@ -1211,7 +1218,7 @@ public class ApkUtils { @Override public void onNext(ResponseBody responseBody) { try { - Log.e("getAppInfo", "上传的结果" + responseBody.string()); + Logutils.e("getAppInfo", "上传的结果" + responseBody.string()); } catch (IOException e) { e.printStackTrace(); } @@ -1219,12 +1226,12 @@ public class ApkUtils { @Override public void onError(Throwable e) { - Log.e("getAppInfo", "UploadAppInfoApi onError: " + e.getMessage()); + Logutils.e("getAppInfo", "UploadAppInfoApi onError: " + e.getMessage()); } @Override public void onComplete() { - Log.e("getAppInfo", "onComplete: "); + Logutils.e("getAppInfo", "onComplete: "); } }); } @@ -1242,7 +1249,7 @@ public class ApkUtils { String extendField = Aria.download(this).load(id).getExtendField(); JSONObject jsonObject = JSON.parseObject(extendField); if (packageName.equals(jsonObject.getString("app_package"))) { - Log.e("RemoveTask", "subscribe: " + "删除文件：" + entity.getFilePath()); + Logutils.e("RemoveTask", "subscribe: " + "删除文件：" + entity.getFilePath()); Aria.download(this).load(id).cancel(true); } } @@ -1253,22 +1260,22 @@ public class ApkUtils { .subscribe(new io.reactivex.Observer() { @Override public void onSubscribe(Disposable d) { - Log.e("RemoveTask", "onSubscribe: "); + Logutils.e("RemoveTask", "onSubscribe: "); } @Override public void onNext(String s) { - Log.e("RemoveTask", "onNext: "); + Logutils.e("RemoveTask", "onNext: "); } @Override public void onError(Throwable e) { - Log.e("RemoveTask", "onError: " + e.getMessage()); + Logutils.e("RemoveTask", "onError: " + e.getMessage()); } @Override public void onComplete() { - Log.e("RemoveTask", "onComplete: "); + Logutils.e("RemoveTask", "onComplete: "); } }); diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/BootManager.java b/app/src/main/java/com/mjsheng/myappstore/utils/BootManager.java index 8941db1..aa1e0e8 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/BootManager.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/BootManager.java @@ -1,13 +1,11 @@ package com.mjsheng.myappstore.utils; import android.content.Context; +import android.content.Intent; import android.provider.Settings; import android.text.TextUtils; -import android.util.Log; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.mjsheng.myappstore.action.JGYActions; +import com.mjsheng.myappstore.service.MainService; public class BootManager { private Context mContext; @@ -19,7 +17,7 @@ public class BootManager { public void start() { sendLauncherIcon(); - setStatusbar(); + timeControlUpdate(); JGYUtils.getInstance().onBootSendNetwork(); JGYUtils.getInstance().onBootSetAppInsideWeb(); } @@ -31,14 +29,9 @@ public class BootManager { } } - private void setStatusbar() { - String status = (String) SPUtils.get(mContext, JGYActions.ACTION_StatusBar_STATUS, ""); - Log.e(TAG, "setStatusbar: String: " + status); - if (TextUtils.isEmpty(status)) { - Log.e(TAG, "setStatusbar: " + "status is NULL"); - return; - } - JSONObject jsonObject = JSON.parseObject(status); - SysSettingUtils.setStatusBar(mContext, jsonObject); + private void timeControlUpdate(){ + Intent intent = new Intent(); + intent.setAction(MainService.TimeChangedReceiver.ACTION_UPDATE); + mContext.sendBroadcast(intent); } } diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/CacheUtils.java b/app/src/main/java/com/mjsheng/myappstore/utils/CacheUtils.java index fe8ec56..ee04296 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/CacheUtils.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/CacheUtils.java @@ -9,7 +9,6 @@ import android.content.pm.PackageManager; import android.content.pm.PackageStats; import android.os.RemoteException; import android.os.ServiceManager; -import android.util.Log; import java.lang.reflect.Method; @@ -45,13 +44,13 @@ public class CacheUtils { throw new Exception("Timed out waiting for PackageStatsObserver.onGetStatsCompleted"); } } - Log.d(TAG, "toString " + observer.stats.toString()); + Logutils.d(TAG, "toString " + observer.stats.toString()); return observer.stats.dataSize + observer.stats.cacheSize; } catch (RemoteException e) { - Log.w(TAG, "Failed to get handle for PackageManger Exception: " + e); + Logutils.w(TAG, "Failed to get handle for PackageManger Exception: " + e); return -1; } catch (InterruptedException e) { - Log.w(TAG, "InterruptedException :" + e); + Logutils.w(TAG, "InterruptedException :" + e); return -1; } } @@ -81,13 +80,13 @@ public class CacheUtils { throw new Exception("timed out waiting for PackageDataObserver.onRemoveCompleted"); } } - Log.d(TAG, "cleanApplicationCache " + observer.retValue); + Logutils.d(TAG, "cleanApplicationCache " + observer.retValue); return observer.retValue; } catch (RemoteException e) { - Log.w(TAG, "Failed to get handle for PackageManger Exception: " + e); + Logutils.w(TAG, "Failed to get handle for PackageManger Exception: " + e); return false; } catch (InterruptedException e) { - Log.w(TAG, "InterruptedException :" + e); + Logutils.w(TAG, "InterruptedException :" + e); return false; } } diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/CmdUtil.java b/app/src/main/java/com/mjsheng/myappstore/utils/CmdUtil.java index 66d5a57..01f04d0 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/CmdUtil.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/CmdUtil.java @@ -1,7 +1,6 @@ package com.mjsheng.myappstore.utils; import android.text.TextUtils; -import android.util.Log; import java.io.BufferedReader; import java.io.DataOutputStream; @@ -23,11 +22,11 @@ public class CmdUtil { * @return 结果 */ public static Result execute(String command) { - Log.i(TAG, "execute() command = " + command); + Logutils.i(TAG, "execute() command = " + command); Result result = new Result(); if (TextUtils.isEmpty(command)) { - Log.w(TAG, "WARNING: command should not be null or empty"); + Logutils.w(TAG, "WARNING: command should not be null or empty"); return result; } @@ -45,13 +44,13 @@ public class CmdUtil { result.code = process.waitFor(); result.success = readBuffer(new BufferedReader(new InputStreamReader(process.getInputStream()))); result.error = readBuffer(new BufferedReader(new InputStreamReader(process.getErrorStream()))); - Log.i(TAG, "result = " + result); + Logutils.i(TAG, "result = " + result); } catch (IOException ioe) { ioe.printStackTrace(); - Log.e(TAG, ioe.getMessage()); + Logutils.e(TAG, ioe.getMessage()); } catch (InterruptedException ie) { ie.printStackTrace(); - Log.e(TAG, ie.getMessage()); + Logutils.e(TAG, ie.getMessage()); } finally { try { if (null != dos) { @@ -59,7 +58,7 @@ public class CmdUtil { } } catch (IOException ioe) { ioe.printStackTrace(); - Log.e(TAG, ioe.getMessage()); + Logutils.e(TAG, ioe.getMessage()); } if (null != process) { process.destroy(); diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/ForegroundAppUtil.java b/app/src/main/java/com/mjsheng/myappstore/utils/ForegroundAppUtil.java index 4e05883..3c65ab6 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/ForegroundAppUtil.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/ForegroundAppUtil.java @@ -8,7 +8,6 @@ import android.content.Intent; import android.os.Build; import android.provider.Settings; import android.text.TextUtils; -import android.util.Log; import java.util.List; @@ -33,14 +32,14 @@ public class ForegroundAppUtil { return; } String packages = ForegroundAppUtil.getForegroundPackageName(context); - Log.e("openTopApp", "old:" + topAppName); + Logutils.e("openTopApp", "old:" + topAppName); if (!TextUtils.isEmpty(topAppName)) { if (!packages.equals(topAppName)) { ApkUtils.openApp(context, topAppName); } } else { - Log.e("openTopApp", ":" + packages); + Logutils.e("openTopApp", ":" + packages); } } diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/InstallResultReceiver.java b/app/src/main/java/com/mjsheng/myappstore/utils/InstallResultReceiver.java index 3d74484..1031241 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/InstallResultReceiver.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/InstallResultReceiver.java @@ -6,7 +6,6 @@ import android.content.Intent; import android.content.pm.PackageInstaller; import android.os.Build; import androidx.annotation.RequiresApi; -import android.util.Log; public class InstallResultReceiver extends BroadcastReceiver { private static final String TAG = "InstallResultReceiver"; @@ -26,7 +25,7 @@ public class InstallResultReceiver extends BroadcastReceiver { // success String PACKAGE_NAME = intent.getStringExtra("android.content.pm.extra.PACKAGE_NAME"); - Log.e(TAG, "APP Install Success!"); + Logutils.e(TAG, "APP Install Success!"); } else { String msg = intent.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE); } diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/JGYUtils.java b/app/src/main/java/com/mjsheng/myappstore/utils/JGYUtils.java index 2bbe89e..8d6e089 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/JGYUtils.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/JGYUtils.java @@ -14,6 +14,8 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.UserInfo; import android.graphics.Bitmap; +import android.net.ConnectivityManager; +import android.net.NetworkInfo; import android.net.Uri; import android.os.BatteryManager; import android.os.Build; @@ -21,7 +23,6 @@ import android.os.PowerManager; import android.os.RemoteException; import android.provider.Settings; import android.text.TextUtils; -import android.util.Log; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -39,6 +40,7 @@ import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; import com.mjsheng.myappstore.BuildConfig; import com.mjsheng.myappstore.action.JGYActions; import com.mjsheng.myappstore.base.BaseApplication; +import com.mjsheng.myappstore.bean.AppListInfo; import com.mjsheng.myappstore.bean.Appground; import com.mjsheng.myappstore.bean.BaseResponse; import com.mjsheng.myappstore.bean.ForceDownloadData; @@ -56,11 +58,16 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Type; +import java.net.Inet4Address; +import java.net.InetAddress; +import java.net.NetworkInterface; +import java.net.SocketException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; import java.util.Arrays; +import java.util.Enumeration; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashSet; @@ -91,7 +98,7 @@ public class JGYUtils { public static void init(Context context) { if (sInstance == null) { - Log.e(TAG, "init: "); + Logutils.e(TAG, "init: "); sInstance = new JGYUtils(context); } } @@ -109,7 +116,7 @@ public class JGYUtils { } public static boolean isOfficialVersion(Context context) { - Log.e(TAG, "isOfficialVersion: " + ProcessUtil.getCurrentProcessName(context)); + Logutils.e(TAG, "isOfficialVersion: " + ProcessUtil.getCurrentProcessName(context)); String channelValue = JGYUtils.getInstance().getStringMetaData(); return "official".equals(channelValue); } @@ -131,7 +138,7 @@ public class JGYUtils { public void resetDevice() { boolean isReset = MySQLData.GetBooleanData(mContext, CommonDatas.IS_RESET); int batteryLevel = getBatteryLevel(); - Log.e(TAG, "batteryLevel:" + batteryLevel + " isReset" + isReset); + Logutils.e(TAG, "batteryLevel:" + batteryLevel + " isReset" + isReset); if (isReset && batteryLevel >= CommonDatas.MIN_POWER) { Utils.doMasterClear(mContext); } @@ -163,7 +170,7 @@ public class JGYUtils { wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK | PowerManager.ON_AFTER_RELEASE, mWakeLockName); if (null != wakeLock) { - Log.e("fht", "acquireWakeLock!"); + Logutils.e("fht", "acquireWakeLock!"); wakeLock.acquire(); } } @@ -174,7 +181,7 @@ public class JGYUtils { */ private synchronized void releaseWakeLock() { if (null != wakeLock) { - Log.e("fht", "releaseWakeLock!"); + Logutils.e("fht", "releaseWakeLock!"); wakeLock.release(); wakeLock = null; } @@ -186,9 +193,9 @@ public class JGYUtils { * @param netAndLaunchBean */ @SuppressLint("NewApi") - synchronized public void setNetAndlaunch(NetAndLaunchBean netAndLaunchBean) { - Log.e(TAG, "setNetAndlaunch: " + "应用联网管控： " + netAndLaunchBean.getData().toString()); - Log.e(TAG, "setNetAndlaunch: "); + synchronized public void setNetAndlaunch(NetAndLaunchBean netAndLaunchBean, List appListInfos) { + Logutils.e(TAG, "setNetAndlaunch: " + "应用联网管控： " + netAndLaunchBean.getData().toString()); + Logutils.e(TAG, "setNetAndlaunch: "); HashSet autoLaunchApp = new HashSet<>();//开机自启app HashSet allowNetApp = new HashSet<>();//允许联网 HashSet disallowNetApp = new HashSet<>();//禁止联网 @@ -220,20 +227,21 @@ public class JGYUtils { if (disallowSlide.size() != 0) { String slide_not = String.join(",", disallowSlide); boolean writeSucceed = Settings.System.putString(mContext.getContentResolver(), "qch_disable_slide", slide_not); - Log.e("fht", "qch_disable_slide=" + writeSucceed + ":" + slide_not); + Logutils.e("fht", "qch_disable_slide=" + writeSucceed + ":" + slide_not); } else { String slide_ok = String.join(",", allowSlide); boolean writeSucceed = Settings.System.putString(mContext.getContentResolver(), "qch_disable_slide", "Invalid"); - Log.e("fht", "qch_disable_slide ok=" + writeSucceed + ":" + slide_ok); + Logutils.e("fht", "qch_disable_slide ok=" + writeSucceed + ":" + slide_ok); } String[] upgrade_ok = new String[allowUpgrade.size()]; allowUpgrade.toArray(upgrade_ok); + checkPackageAndVersion(disallowUpgrade, appListInfos); String[] upgrade_not = new String[disallowUpgrade.size()]; disallowUpgrade.toArray(upgrade_not); Utils.writeDisableUpdateList(mContext, upgrade_not, upgrade_ok); String qch_app_power_on = String.join(",", autoLaunchApp); - Log.e(TAG, "setNetAndlaunch: qch_app_power_on: " + qch_app_power_on); + Logutils.e(TAG, "setNetAndlaunch: qch_app_power_on: " + qch_app_power_on); if (TextUtils.isEmpty(qch_app_power_on)) { //当 qch_app_power_on 的值为空时，会造成系统所有应用断网 Settings.System.putString(mContext.getContentResolver(), "qch_app_power_on", "Invalid"); @@ -243,25 +251,130 @@ public class JGYUtils { // if (BuildConfig.DEBUG) { // TODO: 2021/7/2 测试写入为空是否断网 // boolean w = Settings.System.putString(mContext.getContentResolver(), "qch_app_power_on", ""); -// Log.e(TAG, "setNetAndlaunch: 测试写入: " + w); +// Logutils.e(TAG, "setNetAndlaunch: 测试写入: " + w); // } setAppNetwork(mContext, disallowNetApp); BaseApplication.getInstance().setFinished(true); } + private void checkPackageAndVersion(HashSet disallowUpgrade, List appListInfos) { + Logutils.e(TAG, "checkPackageAndVersion: " + disallowUpgrade); + PackageManager pm = mContext.getPackageManager(); + HashMap listInfoHashMap = new HashMap<>(); + for (AppListInfo appListInfo : appListInfos) { + listInfoHashMap.put(appListInfo.getApp_package(), appListInfo); + } + for (String pkg : disallowUpgrade) { + AppListInfo info = listInfoHashMap.get(pkg); + if (info != null) { + PackageInfo packageInfo = null; + try { + packageInfo = pm.getPackageInfo(pkg, 0); + long appVersionCode; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { + appVersionCode = packageInfo.getLongVersionCode(); + } else { + appVersionCode = packageInfo.versionCode; + } + if (appVersionCode > info.getApp_version_code() && info.getApp_version_code() != 0) { + Logutils.e(TAG, "checkPackageAndVersion: appVersionCode: " + appVersionCode + " getApp_version_code: " + info.getApp_version_code()); + Logutils.e(TAG, "checkPackageAndVersion: " + pkg + " 卸载"); + ApkUtils.UninstallAPP(mContext, pkg); + JSONObject packageObj = new JSONObject(); + packageObj.put("app_name", info.getApp_name()); + packageObj.put("app_package", info.getApp_package()); + packageObj.put("app_id", info.getApp_id()); + packageObj.put("MD5", info.getApp_md5()); + Utils.ariaDownload(mContext, info.getApp_url(), packageObj); + } else { + Logutils.e(TAG, "checkPackageAndVersion: " + pkg + " 版本正常"); + } + } catch (PackageManager.NameNotFoundException e) { + e.printStackTrace(); + } + + } + } + + + } + + @SuppressLint("NewApi") + synchronized public void setNetAndlaunch(NetAndLaunchBean netAndLaunchBean) { + Logutils.e(TAG, "setNetAndlaunch: " + "应用联网管控： " + netAndLaunchBean.getData().toString()); + Logutils.e(TAG, "setNetAndlaunch: "); + HashSet autoLaunchApp = new HashSet<>();//开机自启app + HashSet allowNetApp = new HashSet<>();//允许联网 + HashSet disallowNetApp = new HashSet<>();//禁止联网 + HashSet allowUpgrade = new HashSet<>();//允许升级 + HashSet disallowUpgrade = new HashSet<>();//禁止升级 + HashSet allowSlide = new HashSet<>();//允许滑动 + HashSet disallowSlide = new HashSet<>();//禁止滑动 + + List data = netAndLaunchBean.getData(); + for (NetAndLaunchData netAndLaunchData : data) { + String app_package = netAndLaunchData.getApp_package(); + int is_auto = netAndLaunchData.getIs_auto(); + int is_network = netAndLaunchData.getIs_network(); + int is_upgrade = netAndLaunchData.getIs_upgrade(); + int is_slide = netAndLaunchData.getIs_slide(); + + if (is_auto == 1) autoLaunchApp.add(app_package); + + if (is_network == 1) allowNetApp.add(app_package); + else disallowNetApp.add(app_package); + + if (is_upgrade == 1) allowUpgrade.add(app_package); + else disallowUpgrade.add(app_package); + + if (is_slide == 1) allowSlide.add(app_package); + else disallowSlide.add(app_package); + } + + if (disallowSlide.size() != 0) { + String slide_not = String.join(",", disallowSlide); + boolean writeSucceed = Settings.System.putString(mContext.getContentResolver(), "qch_disable_slide", slide_not); + Logutils.e("fht", "qch_disable_slide=" + writeSucceed + ":" + slide_not); + } else { + String slide_ok = String.join(",", allowSlide); + boolean writeSucceed = Settings.System.putString(mContext.getContentResolver(), "qch_disable_slide", "Invalid"); + Logutils.e("fht", "qch_disable_slide ok=" + writeSucceed + ":" + slide_ok); + } + + String[] upgrade_ok = new String[allowUpgrade.size()]; + allowUpgrade.toArray(upgrade_ok); + String[] upgrade_not = new String[disallowUpgrade.size()]; + disallowUpgrade.toArray(upgrade_not); + Utils.writeDisableUpdateList(mContext, upgrade_not, upgrade_ok); + String qch_app_power_on = String.join(",", autoLaunchApp); + Logutils.e(TAG, "setNetAndlaunch: qch_app_power_on: " + qch_app_power_on); + if (TextUtils.isEmpty(qch_app_power_on)) { + //当 qch_app_power_on 的值为空时，会造成系统所有应用断网 + Settings.System.putString(mContext.getContentResolver(), "qch_app_power_on", "Invalid"); + } else { + Settings.System.putString(mContext.getContentResolver(), "qch_app_power_on", qch_app_power_on); + } +// if (BuildConfig.DEBUG) { + // TODO: 2021/7/2 测试写入为空是否断网 +// boolean w = Settings.System.putString(mContext.getContentResolver(), "qch_app_power_on", ""); +// Logutils.e(TAG, "setNetAndlaunch: 测试写入: " + w); +// } + setAppNetwork(mContext, disallowNetApp); + BaseApplication.getInstance().setFinished(true); + } @SuppressLint("NewApi") synchronized public static void setAppNetwork(Context context, HashSet blackList) { - Log.e(TAG, "setAppNetwork: " + "设置应用联网管控" + blackList); + Logutils.e(TAG, "setAppNetwork: " + "设置应用联网管控" + blackList); String dis = Settings.System.getString(context.getContentResolver(), JGYActions.ACTION_HrReceiver_JGY_DIS); String not = Settings.System.getString(context.getContentResolver(), JGYActions.ACTION_HrReceiver_JGY); //清除旧数据 if (!TextUtils.isEmpty(dis)) { - Log.e(TAG, "setAppNetwork: " + dis); + Logutils.e(TAG, "setAppNetwork: " + dis); Settings.System.putString(context.getContentResolver(), JGYActions.ACTION_HrReceiver_JGY_DIS, "Invalid"); } if (!TextUtils.isEmpty(not)) { - Log.e(TAG, "setAppNetwork: " + not); + Logutils.e(TAG, "setAppNetwork: " + not); Settings.System.putString(context.getContentResolver(), JGYActions.ACTION_HrReceiver_JGY, "Invalid"); } @@ -275,9 +388,9 @@ public class JGYUtils { } }); //之前禁止上网得列表 - Log.e(TAG, "setAppNetwork: oldBlackListSet: " + oldBlackListSet); + Logutils.e(TAG, "setAppNetwork: oldBlackListSet: " + oldBlackListSet); if (oldBlackListSet.size() == 0) { - Log.e(TAG, "setAppNetwork: blackList: " + blackList); + Logutils.e(TAG, "setAppNetwork: blackList: " + blackList); for (String pkg : blackList) { if (TextUtils.isEmpty(pkg)) continue; Intent netControlNotIntent = new Intent(JGYActions.ACTION_HrReceiver_JGY_DIS); @@ -299,8 +412,8 @@ public class JGYUtils { } } - Log.e(TAG, "setAppNetwork: removedNet: " + removedNet); - Log.e(TAG, "setAppNetwork: addedNet: " + addedNet); + Logutils.e(TAG, "setAppNetwork: removedNet: " + removedNet); + Logutils.e(TAG, "setAppNetwork: addedNet: " + addedNet); for (String pkg : removedNet) { if (TextUtils.isEmpty(pkg)) continue; Intent netControlNotIntent = new Intent(JGYActions.ACTION_HrReceiver_JGY); @@ -320,7 +433,7 @@ public class JGYUtils { String net_not = String.join(",", blackList); SPUtils.put(context, JGYActions.ACTION_HrReceiver_JGY_DIS, net_not); //Settings.System.putString(mContext.getContentResolver(), JGYActions.ACTION_HrReceiver_JGY_DIS, net_not); - Log.e("fht", "not::" + net_not); + Logutils.e("fht", "not::" + net_not); //Intent netControlIntent = new Intent(CommonDatas.ACTION_HrReceiver_JGY_DIS); //netControlIntent.putExtra("package_name", net_not); @@ -335,7 +448,7 @@ public class JGYUtils { synchronized public void onBootSendNetwork() { String oldBlackListString = (String) SPUtils.get(mContext, JGYActions.ACTION_HrReceiver_JGY_DIS, ""); HashSet oldBlackListSet = new HashSet<>(Arrays.asList(oldBlackListString.split(","))); - Log.e(TAG, "setAppNetwork: oldBlackListSet: " + oldBlackListSet); + Logutils.e(TAG, "setAppNetwork: oldBlackListSet: " + oldBlackListSet); oldBlackListSet.removeIf(new Predicate() { @Override public boolean test(String s) { @@ -380,14 +493,14 @@ public class JGYUtils { String olddeselectViewArray = Settings.System.getString(mContext.getContentResolver(), "qch_app_forbid_id"); - Log.e("writeDeselectIDtoSystem", "olddeselectViewArray: " + olddeselectViewArray); + Logutils.e("writeDeselectIDtoSystem", "olddeselectViewArray: " + olddeselectViewArray); Settings.System.putString(mContext.getContentResolver(), "qch_app_forbid_id", packageStringBuilder.toString()); Settings.System.putString(mContext.getContentResolver(), "DeselectViewArray", idStringBuilder.toString()); - Log.e("writeDeselectIDtoSystem", "qch_app_forbid_id: " + packageStringBuilder.toString()); - Log.e("writeDeselectIDtoSystem", "deselectViewArray: " + idStringBuilder.toString()); + Logutils.e("writeDeselectIDtoSystem", "qch_app_forbid_id: " + packageStringBuilder.toString()); + Logutils.e("writeDeselectIDtoSystem", "deselectViewArray: " + idStringBuilder.toString()); } else { - Log.e("writeDeselectIDtoSystem", "writeDeselectIDtoSystem is null:"); + Logutils.e("writeDeselectIDtoSystem", "writeDeselectIDtoSystem is null:"); Settings.System.putString(mContext.getContentResolver(), "qch_app_forbid_id", ""); Settings.System.putString(mContext.getContentResolver(), "DeselectViewArray", ""); } @@ -416,7 +529,7 @@ public class JGYUtils { if (packageList.length() > 0) { //app内所有的网页禁止 - Log.e("setAppinsideWeb ", "packageList:" + packageList.toString()); + Logutils.e("setAppinsideWeb ", "packageList:" + packageList.toString()); Intent qch_app_website = new Intent("qch_app_website") .setPackage("com.android.settings"); qch_app_website.putExtra("package_name", packageList.toString()); @@ -427,7 +540,7 @@ public class JGYUtils { if (strings.length() > 0) { //app内单个网页地址禁止打开 - Log.e("setAppinsideWeb ", "strings:" + strings.toString()); + Logutils.e("setAppinsideWeb ", "strings:" + strings.toString()); Intent intent = new Intent("qch_app_inside_website") .setPackage("com.android.settings"); intent.putExtra("websitelist", strings.toString()); @@ -441,7 +554,7 @@ public class JGYUtils { sendAllweb(mContext); sendwebUrl(mContext); //ToastUtil.show(msg); - Log.e("setAppinsideWeb", "setAppinsideWeb: " + response.msg); + Logutils.e("setAppinsideWeb", "setAppinsideWeb: " + response.msg); } } @@ -449,7 +562,7 @@ public class JGYUtils { * @param response 黑白名单都可以管控 */ synchronized public void setNewAppinsideWeb(BaseResponse response) { - Log.e(TAG, "setNewAppinsideWeb: " + "应用内部联网管控： " + response); + Logutils.e(TAG, "setNewAppinsideWeb: " + "应用内部联网管控： " + response); if (response.code == 200) { String jsonString = JSONArray.toJSONString(response.data); List appgrounds = JSONObject.parseArray(jsonString, TTAppground.class); @@ -463,8 +576,8 @@ public class JGYUtils { blackApp.add(appground); } } - Log.e(TAG, "setAppinsideWeb: whiteApp: " + whiteApp); - Log.e(TAG, "setAppinsideWeb: blackApp: " + blackApp); + Logutils.e(TAG, "setAppinsideWeb: whiteApp: " + whiteApp); + Logutils.e(TAG, "setAppinsideWeb: blackApp: " + blackApp); setWhiteApp(whiteApp); setBlackApp(blackApp); } @@ -473,7 +586,7 @@ public class JGYUtils { sendAllweb(mContext); sendwebUrl(mContext); //ToastUtil.show(msg); - Log.e("setAppinsideWeb", "setAppinsideWeb: " + response.msg); + Logutils.e("setAppinsideWeb", "setAppinsideWeb: " + response.msg); } } @@ -518,9 +631,9 @@ public class JGYUtils { addAppgrounds.add(entry.getValue()); } - Log.e(TAG, "comparedAppground: addAppgrounds.size():" + addAppgrounds.size()); - Log.e(TAG, "comparedAppground: deleteAppgrounds.size():" + deleteAppgrounds.size()); - Log.e(TAG, "comparedAppground: changedAppgrounds.size():" + changedAppgrounds.size()); + Logutils.e(TAG, "comparedAppground: addAppgrounds.size():" + addAppgrounds.size()); + Logutils.e(TAG, "comparedAppground: deleteAppgrounds.size():" + deleteAppgrounds.size()); + Logutils.e(TAG, "comparedAppground: changedAppgrounds.size():" + changedAppgrounds.size()); addAppground(addAppgrounds); deleteAppground(deleteAppgrounds); @@ -535,14 +648,14 @@ public class JGYUtils { //删除空的，旧版本使用这个清除 deleteWhitelistUrl(appground.getPackages(), "Invalid"); addToWhitelist(appground.getPackages(), appground.getAddress()); - Log.e("comparedAppground", "addAppground: " + appground.getAddress()); + Logutils.e("comparedAppground", "addAppground: " + appground.getAddress()); } } private void deleteAppground(List appgroundList) { for (TTAppground appground : appgroundList) { deleteWhitelistUrl(appground.getPackages(), appground.getAddress()); - Log.e("comparedAppground", "deleteAppground: " + appground.getAddress()); + Logutils.e("comparedAppground", "deleteAppground: " + appground.getAddress()); } } @@ -556,12 +669,12 @@ public class JGYUtils { oldURL.remove(url); } else { addToWhitelist(appground.getPackages(), url); - Log.e("comparedAppground", "addToWhitelist: " + url); + Logutils.e("comparedAppground", "addToWhitelist: " + url); } } for (String url : oldURL) { deleteWhitelistUrl(appground.getPackages(), url); - Log.e("comparedAppground", "deleteWhitelistUrl: " + url); + Logutils.e("comparedAppground", "deleteWhitelistUrl: " + url); } } } @@ -569,7 +682,7 @@ public class JGYUtils { private List getOldWhitelist() { String whiteListString = (String) SPUtils.get(mContext, JGY_APPINSIDE_WHITELIST, ""); - Log.e(TAG, "getOldWhitelist: " + whiteListString); + Logutils.e(TAG, "getOldWhitelist: " + whiteListString); Gson gson = new Gson(); Type listType = new TypeToken>() { }.getType(); @@ -590,10 +703,10 @@ public class JGYUtils { public void onBootSetAppInsideWeb() { List old = getOldWhitelist(); - Log.e(TAG, "onBootSetAppInsideWeb: " + old); + Logutils.e(TAG, "onBootSetAppInsideWeb: " + old); for (TTAppground appground : old) { if (TextUtils.isEmpty(appground.getAddress())) { - Log.e(TAG, "setWhiteApp: " + "skip: " + appground.getAddress()); + Logutils.e(TAG, "setWhiteApp: " + "skip: " + appground.getAddress()); } else { addPackage(appground.getPackages()); //删除空的，旧版本使用这个清除 @@ -608,7 +721,7 @@ public class JGYUtils { * @param pkg 开启app白名单 */ synchronized private void addPackage(String pkg) { - Log.e(TAG, "addPackage: " + pkg); + Logutils.e(TAG, "addPackage: " + pkg); Intent intent26 = new Intent(); intent26.setAction("qch_app_inside_website"); intent26.putExtra("WEBURLforbidapp", pkg); @@ -622,7 +735,7 @@ public class JGYUtils { */ synchronized private void addToWhitelist(String pkg, String urls) { if (TextUtils.isEmpty(urls.trim())) { - Log.e(TAG, "addToWhitelist: " + "urls is NULL"); + Logutils.e(TAG, "addToWhitelist: " + "urls is NULL"); return; } HashSet urlSet = new HashSet<>(Arrays.asList(urls.trim().split(","))); @@ -630,7 +743,7 @@ public class JGYUtils { if (TextUtils.isEmpty(url)) { continue; } - Log.e(TAG, "addToWhitelist: pkg:" + pkg); + Logutils.e(TAG, "addToWhitelist: pkg:" + pkg); Intent intent25 = new Intent(); intent25.setAction("qch_app_setAddAppWhitWebUid"); intent25.putExtra("AddAppWhitWebUidPackage", pkg); @@ -646,7 +759,7 @@ public class JGYUtils { */ synchronized private void deleteWhitelistUrl(String pkg, String urls) { if (TextUtils.isEmpty(urls.trim())) { - Log.e(TAG, "addToWhitelist: " + "urls is NULL"); + Logutils.e(TAG, "addToWhitelist: " + "urls is NULL"); return; } HashSet urlSet = new HashSet<>(Arrays.asList(urls.trim().split(","))); @@ -654,7 +767,7 @@ public class JGYUtils { if (TextUtils.isEmpty(url)) { continue; } - Log.e(TAG, "deleteWhitelistUrl: qch_app_setDelAppWhitWebUid" + "pkg: " + pkg + " url: " + url); + Logutils.e(TAG, "deleteWhitelistUrl: qch_app_setDelAppWhitWebUid" + "pkg: " + pkg + " url: " + url); Intent intent25 = new Intent(); intent25.setAction("qch_app_setDelAppWhitWebUid"); intent25.putExtra("DelAppWhitWebUidPackage", pkg); @@ -669,7 +782,7 @@ public class JGYUtils { */ // TODO: 2021/6/16 底层未实现功能 synchronized private void disableAppWhitelist(String pkg) { - Log.e(TAG, "disableAppWhitelist: " + pkg); + Logutils.e(TAG, "disableAppWhitelist: " + pkg); Intent intent24 = new Intent(); intent24.setAction("qch_app_setDelAppWhitUid"); intent24.putExtra("DelAppWhitUidPackage", pkg); @@ -681,7 +794,7 @@ public class JGYUtils { * @param appgrounds 设置黑名单管控 */ synchronized private void setBlackApp(List appgrounds) { - Log.e(TAG, "setBlackApp: " + appgrounds); + Logutils.e(TAG, "setBlackApp: " + appgrounds); StringBuilder blackList = new StringBuilder(); StringBuilder packageList = new StringBuilder();//单条管控名单 for (TTAppground appground : appgrounds) { @@ -700,7 +813,7 @@ public class JGYUtils { //old if (packageList.length() > 0) { //app内所有的网页禁止 - Log.e("setAppinsideWeb ", "packageList:" + packageList.toString()); + Logutils.e("setAppinsideWeb ", "packageList:" + packageList.toString()); Intent qch_app_website = new Intent("qch_app_website") .setPackage("com.android.settings"); qch_app_website.putExtra("package_name", packageList.toString()); @@ -710,7 +823,7 @@ public class JGYUtils { } if (blackList.length() > 0) { //app内单个网页地址禁止打开 - Log.e("setAppinsideWeb ", "blackList:" + blackList.toString()); + Logutils.e("setAppinsideWeb ", "blackList:" + blackList.toString()); Intent intent = new Intent("qch_app_inside_website") .setPackage("com.android.settings"); intent.putExtra("websitelist", blackList.toString()); @@ -720,9 +833,8 @@ public class JGYUtils { } } - synchronized private static void sendAllweb(Context context) { - Log.e(TAG, "sendAllweb: "); + Logutils.e(TAG, "sendAllweb: "); Intent intent = new Intent("qch_app_website") .setPackage("com.android.settings"); intent.putExtra("package_name", "Invalid"); @@ -730,7 +842,7 @@ public class JGYUtils { } synchronized private static void sendwebUrl(Context context) { - Log.e(TAG, "sendwebUrl: "); + Logutils.e(TAG, "sendwebUrl: "); Intent intent = new Intent("qch_app_inside_website") .setPackage("com.android.settings"); intent.putExtra("websitelist", "Invalid"); @@ -739,7 +851,7 @@ public class JGYUtils { synchronized public void SettingSysData(String data) { if (TextUtils.isEmpty(data)) { - Log.e(TAG, "SettingSysData: " + "data is empty"); + Logutils.e(TAG, "SettingSysData: " + "data is empty"); SysSettingUtils.setDisableSetting(mContext); } else { SysSettingUtils.setSystemSetting(mContext, data); @@ -766,9 +878,9 @@ public class JGYUtils { } }); String qch_app_forbid = String.join(",", pkgSet); - Log.e(TAG, "writeAppPackageList: " + qch_app_forbid); + Logutils.e(TAG, "writeAppPackageList: " + qch_app_forbid); boolean b = Settings.System.putString(mContext.getContentResolver(), "qch_app_forbid", qch_app_forbid); - Log.e("writeAppPackageList: ", "qch_app_forbid is :" + b + " " + Settings.System.getString(mContext.getContentResolver(), "qch_app_forbid")); + Logutils.e("writeAppPackageList: ", "qch_app_forbid is :" + b + " " + Settings.System.getString(mContext.getContentResolver(), "qch_app_forbid")); } public void forceDownload(List data) { @@ -790,7 +902,7 @@ public class JGYUtils { jsonObject.put("app_id", app_id); jsonObject.put("MD5", app_md5); long app_version_code = forceDownloadData.getApp_version_code(); - Log.e("fht ", "packageName=" + app_package + ",URL= " + app_url + ",app_version_code=" + app_version_code); + Logutils.e("fht ", "packageName=" + app_package + ",URL= " + app_url + ",app_version_code=" + app_version_code); if (BuildConfig.APPLICATION_ID.equals(data.get(i).getApp_package())) { continue;//为自身的跳过下载 } @@ -803,7 +915,7 @@ public class JGYUtils { packageInfo = pm.getPackageInfo(app_package, 0); } catch (PackageManager.NameNotFoundException e) { e.printStackTrace(); - Log.e("fht", "forceDownload=" + e.getMessage()); + Logutils.e("fht", "forceDownload=" + e.getMessage()); } if (packageInfo != null) { long appVersionCode; @@ -813,7 +925,7 @@ public class JGYUtils { appVersionCode = packageInfo.versionCode; } if (app_version_code > appVersionCode) { - Log.e("fht ", "download URL " + app_url); + Logutils.e("fht ", "download URL " + app_url); // Aria.download(this) // .load(app_url) //读取下载地址 // .setFilePath(PathUtils.getExternalDownloadsPath() + "/jgy/" + EncryptUtils.encryptMD5ToString(app_package) + ".apk", true) @@ -822,7 +934,7 @@ public class JGYUtils { Utils.ariaDownload(mContext, app_url, jsonObject); } } else { - Log.e("fht ", "download URL " + app_url); + Logutils.e("fht ", "download URL " + app_url); // if (!SaveListUtils.isDownLoading(app_package)) { // Aria.download(this) // .load(app_url) //读取下载地址 @@ -860,7 +972,7 @@ public class JGYUtils { } } else { -// Log.e("fht", "未上传应用"); +// Logutils.e("fht", "未上传应用"); } } } @@ -891,7 +1003,7 @@ public class JGYUtils { if (packageInfo == null || packageInfo.versionCode < versionCode) { Utils.ariaDownload(mContext, url, object); } else { - Log.e("installAPK", "已是最新版本"); + Logutils.e("installAPK", "已是最新版本"); } } @@ -918,7 +1030,7 @@ public class JGYUtils { if (packageInfo == null || packageInfo.versionCode < versionCode) { Utils.ariaDownload(mContext, url, object); } else { - Log.e("installTestAPK", "TestAPK: " + "无更新"); + Logutils.e("installTestAPK", "TestAPK: " + "无更新"); } } @@ -949,7 +1061,7 @@ public class JGYUtils { if (packageInfo == null || packageInfo.versionCode < versionCode) { Utils.ariaDownload(mContext, url, object); } else { - Log.e("installTestAPK", "TestAPK: " + packageName + "\t无更新"); + Logutils.e("installTestAPK", "TestAPK: " + packageName + "\t无更新"); } } } @@ -971,7 +1083,7 @@ public class JGYUtils { info = packageManager.getPackageInfo(app_package, 0); } catch (PackageManager.NameNotFoundException e) { e.printStackTrace(); - Log.e("fht", "installDesktop: " + e.getMessage()); + Logutils.e("fht", "installDesktop: " + e.getMessage()); } if (null != info) { long versionCode; @@ -996,13 +1108,13 @@ public class JGYUtils { //删除用户除了在应用市场的其他应用 public void deleteOtherApp() { - Log.e(TAG, "deleteOtherApp: " + "start"); + Logutils.e(TAG, "deleteOtherApp: " + "start"); //获取后台应用白名单 String only_jgy_shortcut_list = Settings.System.getString(mContext.getContentResolver(), "only_jgy_shortcut_list"); //获取可以被安装的包名 String qch_app_forbid = Settings.System.getString(mContext.getContentResolver(), "qch_app_forbid"); - Log.e("deleteOtherApp", "only_jgy_shortcut_list:" + only_jgy_shortcut_list); - Log.e("deleteOtherApp", "qch_app_forbid:" + qch_app_forbid); + Logutils.e("deleteOtherApp", "only_jgy_shortcut_list:" + only_jgy_shortcut_list); + Logutils.e("deleteOtherApp", "qch_app_forbid:" + qch_app_forbid); String[] result_white = only_jgy_shortcut_list.split(","); String[] result_forbid = qch_app_forbid.split(","); List resulWhitetList = new ArrayList<>(Arrays.asList(result_white)); @@ -1011,11 +1123,11 @@ public class JGYUtils { HashSet allWhitePkg = new HashSet<>(resulWhitetList); List installedPackageList = ApkUtils.queryFilterAppInfo(mContext); - Log.e("deleteOtherApp", "installedPackageList:" + installedPackageList.toString()); + Logutils.e("deleteOtherApp", "installedPackageList:" + installedPackageList.toString()); if (allWhitePkg.size() > 0) { for (final String packageName : installedPackageList) { if (ApkUtils.isSystemApp(mContext, packageName)) { - Log.e("deleteOtherApp", "is systemApp:" + packageName); + Logutils.e("deleteOtherApp", "is systemApp:" + packageName); continue; } if (ApkUtils.desktopAPP.contains(packageName)) { @@ -1030,11 +1142,11 @@ public class JGYUtils { } if (!allWhitePkg.contains(packageName)) { ApkUtils.UninstallAPP(mContext, packageName); - Log.e("deleteOtherApp", "uninstall apkName:" + packageName); + Logutils.e("deleteOtherApp", "uninstall apkName:" + packageName); } } } - Log.e(TAG, "deleteOtherApp: " + "end"); + Logutils.e(TAG, "deleteOtherApp: " + "end"); } @@ -1058,18 +1170,18 @@ public class JGYUtils { public void checkBootFile(String url, String MD5) { String urlFileName = Utils.getFileNamefromURL(url); File bootFile = new File(PathUtils.getExternalDownloadsPath() + File.separator + "jgy" + File.separator + urlFileName); - Log.e(TAG, "checkBootFile: bootFile file path=" + bootFile.getAbsolutePath()); - Log.e(TAG, "checkBootFile: bootFile exists=" + bootFile.exists() + " isFile=" + bootFile.isFile()); + Logutils.e(TAG, "checkBootFile: bootFile file path=" + bootFile.getAbsolutePath()); + Logutils.e(TAG, "checkBootFile: bootFile exists=" + bootFile.exists() + " isFile=" + bootFile.isFile()); if (bootFile.exists() && bootFile.isFile()) { String oldMd5 = FileUtils.getFileMD5ToString(bootFile); if (!TextUtils.isEmpty(oldMd5) && oldMd5.equalsIgnoreCase(MD5)) { - Log.e(TAG, "checkBootFile: Bootanimation file exists"); + Logutils.e(TAG, "checkBootFile: Bootanimation file exists"); setBootanimation(bootFile.getAbsolutePath()); } else { JSONObject jsonObject = new JSONObject(); jsonObject.put("MD5", MD5); Utils.ariaDownload(mContext, url, jsonObject); - Log.e(TAG, "checkBootFile: " + "download file"); + Logutils.e(TAG, "checkBootFile: " + "download file"); } } else { JSONObject jsonObject = new JSONObject(); @@ -1087,12 +1199,12 @@ public class JGYUtils { if (!systemFile.exists()) { systemFile.getParentFile().mkdirs(); File file = systemFile.getParentFile(); - Log.e(TAG, "setBootanimation: " + file.getAbsolutePath()); + Logutils.e(TAG, "setBootanimation: " + file.getAbsolutePath()); try { systemFile.createNewFile(); } catch (IOException e) { e.printStackTrace(); - Log.e("setBootanimation: ", "createNewFile: " + e.getMessage()); + Logutils.e("setBootanimation: ", "createNewFile: " + e.getMessage()); } } File newFile = new File(filePath); @@ -1100,31 +1212,31 @@ public class JGYUtils { String systemMD5 = FileUtils.getFileMD5ToString(systemFile); String newMD5 = FileUtils.getFileMD5ToString(newFile); if (systemMD5.equals(newMD5)) { - Log.e(TAG, "setBootanimation: 文件一致"); + Logutils.e(TAG, "setBootanimation: 文件一致"); } else { Path path = Paths.get(newFile.getAbsolutePath()); try { Files.copy(path, new FileOutputStream(systemFile)); - Log.e(TAG, "setBootanimation: 设置新开机动画"); + Logutils.e(TAG, "setBootanimation: 设置新开机动画"); } catch (IOException e) { - Log.e(TAG, "setBootanimation: IOException: " + e.getMessage()); + Logutils.e(TAG, "setBootanimation: IOException: " + e.getMessage()); e.printStackTrace(); } } } else { File file = new File(BOOTANIMATION_PATH); - Log.e(TAG, "setBootanimation: " + file.getParentFile().getAbsolutePath()); - Log.e(TAG, "setBootanimation: " + "Is a directory = " + file.isDirectory()); + Logutils.e(TAG, "setBootanimation: " + file.getParentFile().getAbsolutePath()); + Logutils.e(TAG, "setBootanimation: " + "Is a directory = " + file.isDirectory()); if (!file.getParentFile().delete()) { - Log.e(TAG, "setBootanimation: " + "系统动画删除失败"); + Logutils.e(TAG, "setBootanimation: " + "系统动画删除失败"); } Path path = Paths.get(newFile.getAbsolutePath()); try { Files.copy(path, new FileOutputStream(systemFile)); copy(systemFile.getAbsolutePath(), newFile.getAbsolutePath()); - Log.e(TAG, "setBootanimation: 设置新开机动画"); + Logutils.e(TAG, "setBootanimation: 设置新开机动画"); } catch (IOException e) { - Log.e(TAG, "setBootanimation: IOException: " + e.getMessage()); + Logutils.e(TAG, "setBootanimation: IOException: " + e.getMessage()); e.printStackTrace(); } } @@ -1134,9 +1246,9 @@ public class JGYUtils { File systemFile = new File(BOOTANIMATION_PATH); if (systemFile.exists()) { if (systemFile.delete()) { - Log.e(TAG, "removeBootanimation: delete: " + "ture"); + Logutils.e(TAG, "removeBootanimation: delete: " + "ture"); } else { - Log.e(TAG, "removeBootanimation: delete: " + "false"); + Logutils.e(TAG, "removeBootanimation: delete: " + "false"); } } } @@ -1159,7 +1271,7 @@ public class JGYUtils { inStream.close(); } } catch (Exception e) { - Log.e(TAG, "setBootanimation: " + e.getMessage()); + Logutils.e(TAG, "setBootanimation: " + e.getMessage()); e.printStackTrace(); } } @@ -1185,7 +1297,7 @@ public class JGYUtils { field.setAccessible(true); Object sProviderInstance = field.get(null); if (sProviderInstance != null) { - Log.i(TAG, "sProviderInstance isn't null"); + Logutils.i(TAG, "sProviderInstance isn't null"); return; } @@ -1195,7 +1307,7 @@ public class JGYUtils { } else if (sdkInt == 22) { getProviderClassMethod = factoryClass.getDeclaredMethod("getFactoryClass"); } else { - Log.i(TAG, "Don't need to Hook WebView"); + Logutils.i(TAG, "Don't need to Hook WebView"); return; } getProviderClassMethod.setAccessible(true); @@ -1224,23 +1336,23 @@ public class JGYUtils { if (sProviderInstance != null) { field.set("sProviderInstance", sProviderInstance); - Log.i(TAG, "Hook success!"); + Logutils.i(TAG, "Hook success!"); } else { - Log.i(TAG, "Hook failed!"); + Logutils.i(TAG, "Hook failed!"); } } catch (Throwable e) { - Log.w(TAG, e); + Logutils.w(TAG, e.getMessage()); } } public void deleteScreenshots() { - Log.e("File", "deleteScreenshots"); + Logutils.e("File", "deleteScreenshots"); String path = mContext.getExternalFilesDir("db").getAbsolutePath(); File file = new File(path); File[] files = file.listFiles(); for (File f : files) { if (f.isFile()) { - Log.e("File", f.getAbsolutePath()); + Logutils.e("File", f.getAbsolutePath()); f.delete(); } } @@ -1265,6 +1377,12 @@ public class JGYUtils { } } + public void killPackage(String pkg) { + ActivityManager manager = (ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE); + manager.killBackgroundProcesses(pkg); + CmdUtil.execute("am force-stop " + pkg); + } + public void KillOTA() { ActivityManager manager = (ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE); manager.killBackgroundProcesses("com.adups.fota"); @@ -1279,6 +1397,32 @@ public class JGYUtils { mContext.startActivity(intent); } + public void openLauncher() { + Logutils.e(TAG, "openLauncher: "); + killPackage("com.android.launcher3"); + Intent intent = new Intent(); + // 为Intent设置Action、Category属性 + intent.setAction(Intent.ACTION_MAIN);// "android.intent.action.MAIN" + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + intent.addCategory(Intent.CATEGORY_HOME); //"android.intent.category.HOME" + mContext.startActivity(intent); + } + + public void cleanLauncherCache() { + Logutils.e(TAG, "cleanLauncherCache: Start"); + int cleaned = (int) SPUtils.get(mContext, "fristcleanLauncherCache", 0); + if (cleaned == 0) { + try { + new CacheUtils().cleanApplicationUserData(mContext, "com.android.launcher3"); + SPUtils.put(mContext, "fristcleanLauncherCache", 1); + Logutils.e(TAG, "cleanLauncherCache: end"); + } catch (Exception e) { + e.printStackTrace(); + Logutils.e(TAG, "cleanLauncherCache: " + e.getMessage()); + } + } + } + public int checkSNPlatform(String sn) { String secondChars = sn.substring(1, 2); if ("N".equalsIgnoreCase(secondChars)) {//MTK平台 @@ -1286,7 +1430,7 @@ public class JGYUtils { } else if ("R".equalsIgnoreCase(secondChars)) {//展锐平台 return ZhanruiPlatform; } else { - Log.e(TAG, "checkSNPlatform: " + "sn: " + sn + "没有对应平台"); + Logutils.e(TAG, "checkSNPlatform: " + "sn: " + sn + "没有对应平台"); return UnknowPlatform; } } @@ -1294,13 +1438,13 @@ public class JGYUtils { public int checkAppPlatform() { String platform = BuildConfig.platform; if ("MTK".equalsIgnoreCase(platform)) { - Log.i(TAG, "checkAppPlatform: " + "MTK平台"); + Logutils.i(TAG, "checkAppPlatform: " + "MTK平台"); return MTKPlatform; } else if ("ZhanRui".equalsIgnoreCase(platform)) { - Log.i(TAG, "checkAppPlatform: " + "展锐平台"); + Logutils.i(TAG, "checkAppPlatform: " + "展锐平台"); return ZhanruiPlatform; } else { - Log.i(TAG, "checkAppPlatform: " + "没有数据"); + Logutils.i(TAG, "checkAppPlatform: " + "没有数据"); return UnknowPlatform; } } @@ -1340,22 +1484,6 @@ public class JGYUtils { } } - public void cleanLauncherCache() { - Log.e(TAG, "cleanLauncherCache: Start"); - int cleaned = (int) SPUtils.get(mContext, "cleanLauncherCache", 0); - if (cleaned == 0) { - try { - new CacheUtils().cleanApplicationUserData(mContext, "com.android.launcher3"); - SPUtils.put(mContext, "cleanLauncherCache", 1); - Log.e(TAG, "cleanLauncherCache: end"); - - } catch (Exception e) { - e.printStackTrace(); - Log.e(TAG, "cleanLauncherCache: " + e.getMessage()); - } - } - } - public void killBackgroundProcesses(Context context, String processName) { gotoLauncher(); // mIsScanning = true; @@ -1387,7 +1515,7 @@ public class JGYUtils { for (ActivityManager.RecentTaskInfo info : list) { if (info.realActivity != null) { - Log.e(TAG, "removeAllTask: " + info.realActivity.getPackageName()); + Logutils.e(TAG, "removeAllTask: " + info.realActivity.getPackageName()); //排除自身 if (BuildConfig.APPLICATION_ID.equals(info.realActivity.getPackageName())) { continue; @@ -1397,7 +1525,7 @@ public class JGYUtils { ActivityManagerNative.getDefault().removeTask(info.id); } catch (RemoteException e) { e.printStackTrace(); - Log.e(TAG, "removeAllTask: " + e.getMessage()); + Logutils.e(TAG, "removeAllTask: " + e.getMessage()); } } } @@ -1412,9 +1540,9 @@ public class JGYUtils { ActivityManagerNative.getDefault().removeTask(taskMap.get(packageName)); } catch (RemoteException e) { e.printStackTrace(); - Log.e(TAG, "removeTask: " + e.getMessage()); + Logutils.e(TAG, "removeTask: " + e.getMessage()); } catch (NullPointerException e) { - Log.e(TAG, "removeTask: " + e.getMessage()); + Logutils.e(TAG, "removeTask: " + e.getMessage()); } } @@ -1438,7 +1566,7 @@ public class JGYUtils { return ActivityTaskManager.getService().getRecentTasks(numTasks, RECENT_IGNORE_UNAVAILABLE, userId).getList(); } catch (RemoteException e) { - Log.e(TAG, "Failed to get recent tasks", e); + Logutils.e(TAG, "Failed to get recent tasks "+ e); return new ArrayList<>(); } } @@ -1531,4 +1659,29 @@ public class JGYUtils { return null; } + public String getIPAddress() { + ConnectivityManager mConnectivityManager = (ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE);//获取系统的连接服务 + NetworkInfo info = mConnectivityManager.getActiveNetworkInfo(); + if (info != null && info.isConnected()) { + if ((info.getType() == ConnectivityManager.TYPE_MOBILE) || (info.getType() == ConnectivityManager.TYPE_WIFI)) {//当前使用2G/3G/4G网络 + try { + for (Enumeration en = NetworkInterface.getNetworkInterfaces(); en.hasMoreElements(); ) { + NetworkInterface intf = en.nextElement(); + for (Enumeration enumIpAddr = intf.getInetAddresses(); enumIpAddr.hasMoreElements(); ) { + InetAddress inetAddress = enumIpAddr.nextElement(); + if (!inetAddress.isLoopbackAddress() && inetAddress instanceof Inet4Address) { + return inetAddress.getHostAddress(); + } + } + } + } catch (SocketException e) { + e.printStackTrace(); + } + } + } else { //当前无网络连接,请在设置中打开网络 + return "未连接到网络"; + } + return "未获取到IP"; + } + } diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/Logutils.java b/app/src/main/java/com/mjsheng/myappstore/utils/Logutils.java new file mode 100644 index 0000000..1857285 --- /dev/null +++ b/app/src/main/java/com/mjsheng/myappstore/utils/Logutils.java @@ -0,0 +1,37 @@ +package com.mjsheng.myappstore.utils; + +import android.util.Log; + +import com.mjsheng.myappstore.BuildConfig; + +public class Logutils { + private final static boolean debug = BuildConfig.DEBUG; + + public static void i(String tag, String msg) { + if (debug) { + Log.i(tag, msg); + } + } + + public static void d(String tag, String msg) { + if (debug) { + Log.d(tag, msg); + } + } + + public static void e(String tag, String msg) { + if (debug) { + Log.e(tag, msg); + } + } + + + public static void w(String tag, String msg) { + if (debug) { + Log.w(tag, msg); + } + } + + + +} diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/NetworkUtils.java b/app/src/main/java/com/mjsheng/myappstore/utils/NetworkUtils.java index 00b8ae0..6949909 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/NetworkUtils.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/NetworkUtils.java @@ -15,7 +15,7 @@ public class NetworkUtils { //获取网络属性 NetworkCapabilities networkCapabilities = mConnectivityManager.getNetworkCapabilities(mConnectivityManager.getActiveNetwork()); if (networkCapabilities != null) { - Log.e("Avalible", "NetworkCapalbilities:" + networkCapabilities.toString()); + Logutils.e("Avalible", "NetworkCapalbilities:" + networkCapabilities.toString()); return networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED); } } else { diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/SaveListUtils.java b/app/src/main/java/com/mjsheng/myappstore/utils/SaveListUtils.java index 237cf0a..b86e8c5 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/SaveListUtils.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/SaveListUtils.java @@ -2,7 +2,6 @@ package com.mjsheng.myappstore.utils; import android.content.Context; import android.provider.Settings; -import android.util.Log; import com.blankj.utilcode.util.SPStaticUtils; import com.google.gson.Gson; @@ -19,14 +18,14 @@ public class SaveListUtils { public static List getList() { String data = SPStaticUtils.getString(CommonDatas.FORCE_INSTALL); - Log.e("SaveListUtils", data); + Logutils.e("SaveListUtils", data); Gson gson = new Gson(); Type listType = new TypeToken>() { }.getType(); List list = gson.fromJson(data, listType); -// Log.e("mjshenglist1", list.toString()); +// Logutils.e("mjshenglist1", list.toString()); if (list != null && list.size() > 0) { - Log.e("fht", "getList:" + list.toString()); + Logutils.e("fht", "getList:" + list.toString()); } else { list = new ArrayList<>(); } @@ -35,7 +34,7 @@ public class SaveListUtils { public static void addToList(String data) { List list = getList(); -// Log.e("mjshenglist2", list.toString()); +// Logutils.e("mjshenglist2", list.toString()); if (list == null) { list = new ArrayList<>(); @@ -46,7 +45,7 @@ public class SaveListUtils { String gsonData = gson.toJson(list); SPStaticUtils.put(CommonDatas.FORCE_INSTALL, gsonData); } - Log.e("fht", "addToList:" + list.toString()); + Logutils.e("fht", "addToList:" + list.toString()); } @@ -61,7 +60,7 @@ public class SaveListUtils { Gson gson = new Gson(); String gsonData = gson.toJson(forceList); SPStaticUtils.put(CommonDatas.FORCE_INSTALL, gsonData); - Log.e("fht", "setList:" + forceList.toString()); + Logutils.e("fht", "setList:" + forceList.toString()); } @@ -69,7 +68,7 @@ public class SaveListUtils { if (!forceList.contains(s)) { forceList.add(s); } - Log.e("fht", "addList:" + forceList.toString()); + Logutils.e("fht", "addList:" + forceList.toString()); } @@ -96,10 +95,10 @@ public class SaveListUtils { String txt = txtBuilder.toString(); if (txt.length() > 0) { boolean qch_force_app = Settings.System.putString(context.getContentResolver(), "qch_force_app", txt); - Log.e("fht", "qch_force_app:" + qch_force_app + ":" + txt); + Logutils.e("fht", "qch_force_app:" + qch_force_app + ":" + txt); } else { boolean qch_force_app = Settings.System.putString(context.getContentResolver(), "qch_force_app", "invalid"); - Log.e("fht", "qch_force_app:" + qch_force_app + ":" + txt); + Logutils.e("fht", "qch_force_app:" + qch_force_app + ":" + txt); } setList(); } diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/ServiceAliveUtils.java b/app/src/main/java/com/mjsheng/myappstore/utils/ServiceAliveUtils.java index 5d68357..b84bd55 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/ServiceAliveUtils.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/ServiceAliveUtils.java @@ -2,7 +2,6 @@ package com.mjsheng.myappstore.utils; import android.app.ActivityManager; import android.content.Context; -import android.util.Log; public class ServiceAliveUtils { public static boolean isServiceAlive(Context mContext) { @@ -17,7 +16,7 @@ public class ServiceAliveUtils { isServiceRunning = true; } } - Log.e("ServiceAliveUtils", mContext.getClass().getName() + "isServiceAlice: " + isServiceRunning); + Logutils.e("ServiceAliveUtils", mContext.getClass().getName() + "isServiceAlice: " + isServiceRunning); return isServiceRunning; } @@ -33,7 +32,7 @@ public class ServiceAliveUtils { isServiceRunning = true; } } - Log.e("ServiceAliveUtils", serviceName + " :isServiceAlice: " + isServiceRunning); + Logutils.e("ServiceAliveUtils", serviceName + " :isServiceAlice: " + isServiceRunning); return isServiceRunning; } } diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/SysSettingUtils.java b/app/src/main/java/com/mjsheng/myappstore/utils/SysSettingUtils.java index 36589d9..13e1263 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/SysSettingUtils.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/SysSettingUtils.java @@ -8,7 +8,6 @@ import android.content.Intent; import android.os.Build; import android.provider.Settings; import android.text.TextUtils; -import android.util.Log; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; @@ -53,9 +52,10 @@ public class SysSettingUtils { JSONObject navJson = jsonObject.getJSONObject("setting_nav"); SPUtils.put(context, JGYActions.ACTION_StatusBar_STATUS, jsonObject.getJSONObject("setting_nav").toJSONString()); setStatusBar(context, navJson); + setBrowserInput(context, jsonObject); //otg开关 // int setting_otg = changeNum(jsonObject.getInteger("setting_otg")); -// Log.e("SystemSetting", "setting_otg---------" + setting_otg); +// Logutils.e("SystemSetting", "setting_otg---------" + setting_otg); // String otgStatus = ""; // switch (setting_otg) { // case 0: @@ -73,7 +73,7 @@ public class SysSettingUtils { * @param context 关闭所有功能 */ public static void setDisableSetting(Context context) { - Log.e("setDisableSetting", "Close all settings: "); + Logutils.e("setDisableSetting", "Close all settings: "); setPhoneList(context, 1); setUSBstate(context, 1); setBluetooth(context, 1); @@ -85,6 +85,7 @@ public class SysSettingUtils { setWallpaper(context, 0); setCanReset(context, 1); setAutoTime(context, 1); + setBrowserInput(context, 0); JGYUtils.getInstance().setDeveloperOptions(1); setStatusBar(context, 1); } @@ -104,6 +105,7 @@ public class SysSettingUtils { setWallpaper(context, 0); setCanReset(context, 0); setAutoTime(context, 0); + setBrowserInput(context, 0); JGYUtils.getInstance().setDeveloperOptions(0); } @@ -111,51 +113,51 @@ public class SysSettingUtils { try { //设置电话功能，电话白名单 boolean qch_call_forbid = Settings.System.putInt(context.getContentResolver(), "qch_call_forbid", state); - Log.e("SystemSetting", "qch_call_forbid:" + qch_call_forbid); + Logutils.e("SystemSetting", "qch_call_forbid:" + qch_call_forbid); boolean qch_white_list_on = Settings.System.putInt(context.getContentResolver(), "qch_white_list_on", state); - Log.e("SystemSetting", "qch_white_list_on:" + qch_white_list_on); + Logutils.e("SystemSetting", "qch_white_list_on:" + qch_white_list_on); boolean qch_white_list_Array = Settings.System.putString(context.getContentResolver(), "qch_white_list_Array", ""); // ToastTool.show("qch_call_forbid::"+setting_call+"----setting_phones::"+setting_phones+"----"+qch_white_list_Array+"---"+qch_call_forbid); - Log.e("SystemSetting", "qch_white_list_Array:" + qch_white_list_Array + "---" + qch_white_list_Array); + Logutils.e("SystemSetting", "qch_white_list_Array:" + qch_white_list_Array + "---" + qch_white_list_Array); boolean qch_sdcard_forbid_on = Settings.System.putInt(context.getContentResolver(), "qch_sdcard_forbid_on", state); - Log.e("SystemSetting", "qch_sdcard_forbid_on:" + qch_sdcard_forbid_on); + Logutils.e("SystemSetting", "qch_sdcard_forbid_on:" + qch_sdcard_forbid_on); } catch (Exception e) { - Log.e(TAG, "setPhoneList: " + e.getMessage()); + Logutils.e(TAG, "setPhoneList: " + e.getMessage()); } } private static void setPhoneList(Context context, JSONObject jsonObject) { - Log.e(TAG, "setPhoneList: " + jsonObject.toJSONString()); + Logutils.e(TAG, "setPhoneList: " + jsonObject.toJSONString()); try { //设置电话功能，电话白名单 //电话通话开关 int setting_call = changeNum(jsonObject.getInteger("setting_call")); boolean qch_call_forbid = Settings.System.putInt(context.getContentResolver(), "qch_call_forbid", setting_call); - Log.e("SystemSetting", "qch_call_forbid:" + qch_call_forbid); + Logutils.e("SystemSetting", "qch_call_forbid:" + qch_call_forbid); //电话白名单开关 int setting_phone = changeNum(jsonObject.getInteger("setting_phone")); boolean qch_white_list_on = Settings.System.putInt(context.getContentResolver(), "qch_white_list_on", setting_phone); - Log.e("SystemSetting", "qch_white_list_on:" + qch_white_list_on); + Logutils.e("SystemSetting", "qch_white_list_on:" + qch_white_list_on); //白名单列表 if (setting_phone == 1) { boolean qch_white_list_Array = Settings.System.putString(context.getContentResolver(), "qch_white_list_Array", "empty"); // ToastTool.show("qch_call_forbid::"+setting_call+"----setting_phones::"+setting_phones+"----"+qch_white_list_Array+"---"+qch_call_forbid); - Log.e("SystemSetting", "qch_white_list_Array:" + qch_white_list_Array); + Logutils.e("SystemSetting", "qch_white_list_Array:" + qch_white_list_Array); } else { String setting_phones = jsonObject.getString("setting_phones"); boolean qch_white_list_Array = Settings.System.putString(context.getContentResolver(), "qch_white_list_Array", setting_phones); // ToastTool.show("qch_call_forbid::"+setting_call+"----setting_phones::"+setting_phones+"----"+qch_white_list_Array+"---"+qch_call_forbid); - Log.e("SystemSetting", "qch_white_list_Array:" + qch_white_list_Array + "---" + setting_phones); + Logutils.e("SystemSetting", "qch_white_list_Array:" + qch_white_list_Array + "---" + setting_phones); } //存储卡 int setting_memory = changeNum(jsonObject.getInteger("setting_memory")); boolean qch_sdcard_forbid_on = Settings.System.putInt(context.getContentResolver(), "qch_sdcard_forbid_on", setting_memory); - Log.e("SystemSetting", "qch_sdcard_forbid_on:" + qch_sdcard_forbid_on); + Logutils.e("SystemSetting", "qch_sdcard_forbid_on:" + qch_sdcard_forbid_on); } catch (Exception e) { - Log.e(TAG, "setPhoneList: " + e.getMessage()); + Logutils.e(TAG, "setPhoneList: " + e.getMessage()); } } @@ -167,12 +169,12 @@ public class SysSettingUtils { if (!BuildConfig.DEBUG) { try { boolean qch_usb_choose = Settings.System.putString(context.getContentResolver(), "qch_usb_choose", "usb_charge"); - Log.e("SystemSetting", "qch_usb_choose:" + qch_usb_choose); + Logutils.e("SystemSetting", "qch_usb_choose:" + qch_usb_choose); String usbStatus = "qch_action_usb_usb_charge"; Intent usbIntent = new Intent(usbStatus).setPackage("com.android.settings"); context.sendBroadcast(usbIntent); } catch (Exception e) { - Log.e(TAG, "setUSBstate: " + e.getMessage()); + Logutils.e(TAG, "setUSBstate: " + e.getMessage()); } } } @@ -186,7 +188,7 @@ public class SysSettingUtils { if (!BuildConfig.DEBUG) { try { boolean qch_usb_choose = Settings.System.putString(context.getContentResolver(), "qch_usb_choose", setting_usb); - Log.e("SystemSetting", "qch_usb_choose---------" + qch_usb_choose); + Logutils.e("SystemSetting", "qch_usb_choose---------" + qch_usb_choose); String usbStatus = ""; switch (setting_usb) { case "usb_charge": @@ -203,7 +205,7 @@ public class SysSettingUtils { Intent usbIntent = new Intent(usbStatus).setPackage("com.android.settings"); context.sendBroadcast(usbIntent); } catch (Exception e) { - Log.e(TAG, "setUSBstate: " + e.getMessage()); + Logutils.e(TAG, "setUSBstate: " + e.getMessage()); } } } @@ -212,7 +214,7 @@ public class SysSettingUtils { try { boolean qch_bht_forbid_on = Settings.System.putInt(context.getContentResolver(), "qch_bht_forbid_on", state); //写入系统数据库 - Log.e("SystemSetting", "qch_bht_forbid_on:" + qch_bht_forbid_on); + Logutils.e("SystemSetting", "qch_bht_forbid_on:" + qch_bht_forbid_on); BluetoothAdapter mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); if (qch_bht_forbid_on) { //成功 @@ -227,7 +229,7 @@ public class SysSettingUtils { //设置关闭时关闭蓝牙 } } catch (Exception e) { - Log.e(TAG, "setBluetooth: " + e.getMessage()); + Logutils.e(TAG, "setBluetooth: " + e.getMessage()); } } @@ -242,7 +244,7 @@ public class SysSettingUtils { //蓝牙传输开关 boolean qch_bht_forbid_on = Settings.System.putInt(context.getContentResolver(), "qch_bht_forbid_on", setting_bht); - Log.e("SystemSetting", "qch_bht_forbid_on:" + qch_bht_forbid_on); + Logutils.e("SystemSetting", "qch_bht_forbid_on:" + qch_bht_forbid_on); BluetoothAdapter mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); if (qch_bht_forbid_on) { //成功 @@ -255,7 +257,7 @@ public class SysSettingUtils { String setting_context = jsonObject.getString("setting_context"); if (setting_bhtvideo == 0) { if (null != setting_context && !setting_context.equals("") && !setting_context.equals(" ") && !setting_context.equals("null")) { - Log.e("SystemSetting", "setting_context:" + setting_context); + Logutils.e("SystemSetting", "setting_context:" + setting_context); Settings.System.putString(context.getContentResolver(), "qch_bhtvideo_forbid_on", setting_context); } else { Settings.System.putString(context.getContentResolver(), "qch_bhtvideo_forbid_on", "Empty"); @@ -270,7 +272,7 @@ public class SysSettingUtils { } } } catch (Exception e) { - Log.e(TAG, "setBluetooth: " + e.getMessage()); + Logutils.e(TAG, "setBluetooth: " + e.getMessage()); } } @@ -281,9 +283,9 @@ public class SysSettingUtils { intent.setPackage("com.android.settings"); context.sendStickyBroadcast(intent); boolean qch_hotspot_forbid_on = Settings.System.putInt(context.getContentResolver(), "qch_hotspot_forbid_on", state); - Log.e("SystemSetting", "qch_hotspot_forbid_on:" + qch_hotspot_forbid_on); + Logutils.e("SystemSetting", "qch_hotspot_forbid_on:" + qch_hotspot_forbid_on); } catch (Exception e) { - Log.e(TAG, "setHotspot: " + e.getMessage()); + Logutils.e(TAG, "setHotspot: " + e.getMessage()); } } @@ -297,10 +299,10 @@ public class SysSettingUtils { context.sendStickyBroadcast(intent); } boolean qch_hotspot_forbid_on = Settings.System.putInt(context.getContentResolver(), "qch_hotspot_forbid_on", setting_hotspot); - Log.e("SystemSetting", "qch_hotspot_forbid_on---------" + setting_hotspot); - Log.e("SystemSetting", "qch_hotspot_forbid_on---------" + qch_hotspot_forbid_on); + Logutils.e("SystemSetting", "qch_hotspot_forbid_on---------" + setting_hotspot); + Logutils.e("SystemSetting", "qch_hotspot_forbid_on---------" + qch_hotspot_forbid_on); } catch (Exception e) { - Log.e(TAG, "setHotspot: " + e.getMessage()); + Logutils.e(TAG, "setHotspot: " + e.getMessage()); } } @@ -309,7 +311,7 @@ public class SysSettingUtils { int setting_navigation = 0; //写入到系统不涉及任何管控，因为之前调用会频繁隐藏显示 boolean qch_hide_navigationBar = Settings.System.putInt(context.getContentResolver(), "qch_hide_NavigationBar", setting_navigation); - Log.e("SystemSetting", "qch_hide_navigationBar---------" + qch_hide_navigationBar); + Logutils.e("SystemSetting", "qch_hide_navigationBar---------" + qch_hide_navigationBar); String navigationStatus = ""; switch (setting_navigation) { @@ -331,7 +333,7 @@ public class SysSettingUtils { if (oldNum != setting_statusbar) { //写入到系统不涉及任何管控，因为之前调用会频繁隐藏显示 boolean qch_hide_statusBar = Settings.System.putInt(context.getContentResolver(), "qch_hide_statusBar", setting_statusbar); - Log.e("SystemSetting", "qch_hide_statusBar---------" + qch_hide_statusBar); + Logutils.e("SystemSetting", "qch_hide_statusBar---------" + qch_hide_statusBar); String statusbarStatus = ""; switch (setting_statusbar) { case 0: @@ -351,7 +353,7 @@ public class SysSettingUtils { int setting_navigation = changeNum(jsonObject.getInteger("setting_navigation")); //写入到系统不涉及任何管控，因为之前调用会频繁隐藏显示 boolean qch_hide_navigationBar = Settings.System.putInt(context.getContentResolver(), "qch_hide_NavigationBar", setting_navigation); - Log.e("SystemSetting", "qch_hide_navigationBar---------" + qch_hide_navigationBar); + Logutils.e("SystemSetting", "qch_hide_navigationBar---------" + qch_hide_navigationBar); String navigationStatus = ""; switch (setting_navigation) { @@ -372,7 +374,7 @@ public class SysSettingUtils { if (oldNum != setting_statusbar) { //写入到系统不涉及任何管控，因为之前调用会频繁隐藏显示 boolean qch_hide_statusBar = Settings.System.putInt(context.getContentResolver(), "qch_hide_statusBar", setting_statusbar); - Log.e("SystemSetting", "qch_hide_statusBar---------" + qch_hide_statusBar); + Logutils.e("SystemSetting", "qch_hide_statusBar---------" + qch_hide_statusBar); String statusbarStatus = ""; switch (setting_statusbar) { case 0: @@ -391,9 +393,9 @@ public class SysSettingUtils { try { //摄像头开关 boolean qch_app_camera = Settings.System.putInt(context.getContentResolver(), "qch_app_camera", state); - Log.e("SystemSetting", "qch_app_camera1:" + state); + Logutils.e("SystemSetting", "qch_app_camera1:" + state); // ApkUtils.hideSystemSettingAPP(context, "com.mediatek.camera"); - Log.e("SystemSetting", "setting_camera---------" + qch_app_camera); + Logutils.e("SystemSetting", "setting_camera---------" + qch_app_camera); String cameraStatus = "qch_camera_forbid"; switch (state) { case 0: @@ -406,7 +408,7 @@ public class SysSettingUtils { Intent cameraIntent = new Intent(cameraStatus).setPackage("com.android.settings"); context.sendBroadcast(cameraIntent); } catch (Exception e) { - Log.e(TAG, "setCamera: " + e.getMessage()); + Logutils.e(TAG, "setCamera: " + e.getMessage()); } } @@ -415,9 +417,9 @@ public class SysSettingUtils { //摄像头开关 int setting_camera = changeNum(jsonObject.getInteger("setting_camera")); Settings.System.putInt(context.getContentResolver(), "qch_app_camera", setting_camera); - Log.e("SystemSetting", "qch_app_camera2:" + setting_camera); + Logutils.e("SystemSetting", "qch_app_camera2:" + setting_camera); // ApkUtils.hideSystemSettingAPP(context, "com.mediatek.camera"); - Log.e("SystemSetting", "setting_camera---------" + setting_camera); + Logutils.e("SystemSetting", "setting_camera---------" + setting_camera); String cameraStatus = ""; switch (setting_camera) { case 0: @@ -430,7 +432,7 @@ public class SysSettingUtils { Intent cameraIntent = new Intent(cameraStatus).setPackage("com.android.settings"); context.sendBroadcast(cameraIntent); } catch (Exception e) { - Log.e(TAG, "setCamera: " + e.getMessage()); + Logutils.e(TAG, "setCamera: " + e.getMessage()); } } @@ -439,7 +441,7 @@ public class SysSettingUtils { //tfmedia开关 // int setting_tfmedia = 1; boolean qch_tfmedia_forbid = Settings.System.putInt(context.getContentResolver(), "qch_tfmedia_forbid", state); - Log.e("SystemSetting", "setting_tfmedia---------" + qch_tfmedia_forbid); + Logutils.e("SystemSetting", "setting_tfmedia---------" + qch_tfmedia_forbid); String tfmediaStatus = ""; switch (state) { case 0: @@ -453,12 +455,12 @@ public class SysSettingUtils { context.sendBroadcast(tfmediaIntent); if (state == 1) { boolean qch_tfmedia_filetypes = Settings.System.putString(context.getContentResolver(), "qch_tfmedia_filetypes", "Empty");//影音管控 - Log.e("SystemSetting", "qch_tfmedia_filetypes:" + qch_tfmedia_filetypes); + Logutils.e("SystemSetting", "qch_tfmedia_filetypes:" + qch_tfmedia_filetypes); } else { Settings.System.putInt(context.getContentResolver(), "qch_tfmedia_forbid", 0); } } catch (Exception e) { - Log.e(TAG, "setTF: " + e.getMessage()); + Logutils.e(TAG, "setTF: " + e.getMessage()); } } @@ -472,7 +474,7 @@ public class SysSettingUtils { } boolean qch_tfmedia_forbid = Settings.System.putInt(context.getContentResolver(), "qch_tfmedia_forbid", setting_tfmedia); - Log.e("SystemSetting", "setting_tfmedia---------" + qch_tfmedia_forbid); + Logutils.e("SystemSetting", "setting_tfmedia---------" + qch_tfmedia_forbid); String tfmediaStatus = ""; switch (setting_tfmedia) { case 0: @@ -495,12 +497,12 @@ public class SysSettingUtils { } stringBuffer.deleteCharAt(stringBuffer.length() - 1); Settings.System.putString(context.getContentResolver(), "qch_tfmedia_filetypes", stringBuffer.toString());//影音管控 - Log.e("SystemSetting", "qch_tfmedia_filetypes---------" + stringBuffer.toString()); + Logutils.e("SystemSetting", "qch_tfmedia_filetypes---------" + stringBuffer.toString()); } else { Settings.System.putInt(context.getContentResolver(), "qch_tfmedia_forbid", 0); } } catch (Exception e) { - Log.e("SystemSetting", "setTF: " + e.getMessage()); + Logutils.e("SystemSetting", "setTF: " + e.getMessage()); } } @@ -512,22 +514,22 @@ public class SysSettingUtils { // int deskclock = 1; Settings.System.putInt(context.getContentResolver(), "qch_app_deskclock", state); ApkUtils.hideSystemSettingAPP(context, "com.android.deskclock"); - Log.e("SystemSetting", "qch_app_deskclock" + state); + Logutils.e("SystemSetting", "qch_app_deskclock" + state); //录音机 // int soundrecorder = 1; Settings.System.putInt(context.getContentResolver(), "qch_app_soundrecorder", state); ApkUtils.hideSystemSettingAPP(context, "com.android.soundrecorder"); - Log.e("SystemSetting", "qch_app_soundrecorder" + state); + Logutils.e("SystemSetting", "qch_app_soundrecorder" + state); //音乐 // int music = 1; Settings.System.putInt(context.getContentResolver(), "qch_app_music", state); ApkUtils.hideSystemSettingAPP(context, "com.android.music"); - Log.e("SystemSetting", "qch_app_music" + state); + Logutils.e("SystemSetting", "qch_app_music" + state); //图库 // int gallery = 1; Settings.System.putInt(context.getContentResolver(), "qch_app_gallery", state); ApkUtils.hideSystemSettingAPP(context, "com.android.gallery3d"); - Log.e("SystemSetting", "qch_app_gallery" + state); + Logutils.e("SystemSetting", "qch_app_gallery" + state); //文件管理器 // int filemanager = 1; Settings.System.putInt(context.getContentResolver(), "qch_app_filemanager", state); @@ -536,9 +538,9 @@ public class SysSettingUtils { } else { ApkUtils.hideSystemSettingAPP(context, "com.android.documentsui"); } - Log.e("SystemSetting", "qch_app_filemanager" + state); + Logutils.e("SystemSetting", "qch_app_filemanager" + state); } catch (Exception e) { - Log.e(TAG, "setIcon: " + e.getMessage()); + Logutils.e(TAG, "setIcon: " + e.getMessage()); } } @@ -550,22 +552,22 @@ public class SysSettingUtils { int deskclock = changeNum(jsonObject.getInteger("setting_clock")); Settings.System.putInt(context.getContentResolver(), "qch_app_deskclock", deskclock); ApkUtils.hideSystemSettingAPP(context, "com.android.deskclock"); - Log.e("SystemSetting", "qch_app_deskclock" + deskclock); + Logutils.e("SystemSetting", "qch_app_deskclock" + deskclock); //录音机 int soundrecorder = changeNum(jsonObject.getInteger("setting_recording")); Settings.System.putInt(context.getContentResolver(), "qch_app_soundrecorder", soundrecorder); ApkUtils.hideSystemSettingAPP(context, "com.android.soundrecorder"); - Log.e("SystemSetting", "qch_app_soundrecorder" + soundrecorder); + Logutils.e("SystemSetting", "qch_app_soundrecorder" + soundrecorder); //音乐 int music = changeNum(jsonObject.getInteger("setting_music")); Settings.System.putInt(context.getContentResolver(), "qch_app_music", music); ApkUtils.hideSystemSettingAPP(context, "com.android.music"); - Log.e("SystemSetting", "qch_app_music" + music); + Logutils.e("SystemSetting", "qch_app_music" + music); //图库 int gallery = changeNum(jsonObject.getInteger("setting_picture")); Settings.System.putInt(context.getContentResolver(), "qch_app_gallery", gallery); ApkUtils.hideSystemSettingAPP(context, "com.android.gallery3d"); - Log.e("SystemSetting", "qch_app_gallery" + gallery); + Logutils.e("SystemSetting", "qch_app_gallery" + gallery); //壁纸 int wallpaper = changeNum(jsonObject.getInteger("setting_wallpaper")); setWallpaper(context, wallpaper); @@ -577,9 +579,9 @@ public class SysSettingUtils { } else { ApkUtils.hideSystemSettingAPP(context, "com.android.documentsui"); } - Log.e("SystemSetting", "qch_app_filemanager" + filemanager); + Logutils.e("SystemSetting", "qch_app_filemanager" + filemanager); } catch (Exception e) { - Log.e(TAG, "setIcon: " + e.getMessage()); + Logutils.e(TAG, "setIcon: " + e.getMessage()); } } @@ -587,12 +589,12 @@ public class SysSettingUtils { //壁纸 // int wallpaper = 1; Settings.System.putInt(context.getContentResolver(), "qch_app_wallpaper", state); - Log.e("SystemSetting", "qch_app_wallpaper" + state); + Logutils.e("SystemSetting", "qch_app_wallpaper" + state); } private static void setCanReset(Context context, int state) { boolean qch_restore_forbid_on = Settings.System.putInt(context.getContentResolver(), "qch_restore_forbid_on", 0); - Log.e("SystemSetting", "qch_restore_forbid_on:" + qch_restore_forbid_on); + Logutils.e("SystemSetting", "qch_restore_forbid_on:" + qch_restore_forbid_on); //默认打开 } @@ -602,10 +604,10 @@ public class SysSettingUtils { int mode = jsonObject.getInteger("qch_restore"); if (mode == 1) { boolean qch_restore_forbid_on = Settings.System.putInt(context.getContentResolver(), "qch_restore_forbid_on", 0); - Log.e("SystemSetting", "qch_restore_forbid_on:" + qch_restore_forbid_on); + Logutils.e("SystemSetting", "qch_restore_forbid_on:" + qch_restore_forbid_on); } else { boolean qch_restore_forbid_on = Settings.System.putInt(context.getContentResolver(), "qch_restore_forbid_on", 1); - Log.e("SystemSetting", "qch_restore_forbid_on:" + qch_restore_forbid_on); + Logutils.e("SystemSetting", "qch_restore_forbid_on:" + qch_restore_forbid_on); } } @@ -647,7 +649,7 @@ public class SysSettingUtils { break; } } - Log.e("SystemSetting", "setAutoTime: " + "action=" + action); + Logutils.e("SystemSetting", "setAutoTime: " + "action=" + action); Intent intent = new Intent(); intent.setAction(action); intent.setPackage("com.android.settings"); @@ -655,7 +657,7 @@ public class SysSettingUtils { } private static void setAutoTime(Context context, int state) { - Log.e("SystemSetting", "setAutoTime: " + "default"); + Logutils.e("SystemSetting", "setAutoTime: " + "default"); Intent intent = new Intent(); intent.setAction("qch_autotime_network"); intent.setPackage("com.android.settings"); @@ -664,7 +666,7 @@ public class SysSettingUtils { @SuppressLint("NewApi") public static void setStatusBar(Context context, JSONObject jsonObject) { - Log.e(TAG, "setStatusBar: " + jsonObject.toJSONString()); + Logutils.e(TAG, "setStatusBar: " + jsonObject.toJSONString()); if (null != jsonObject) { int whole = jsonObject.getInteger("whole"); if (whole == 1) { @@ -698,11 +700,46 @@ public class SysSettingUtils { @SuppressLint("NewApi") private static void setStatusBar(Context context, int state) { - Log.e(TAG, "setStatusBar: " + "default"); + Logutils.e(TAG, "setStatusBar: " + "default"); StatusBarManager mStatusBarManager = (StatusBarManager) context.getSystemService(Context.STATUS_BAR_SERVICE); mStatusBarManager.disable(StatusBarManager.DISABLE_BACK | StatusBarManager.DISABLE_RECENT | StatusBarManager.DISABLE_HOME); mStatusBarManager.disable(StatusBarManager.DISABLE_NONE);//显示隐藏的虚拟按键 - } + /** + * 设置浏览器禁止输入 + * + * @param context + * @param jsonObject + */ + private static void setBrowserInput(Context context, JSONObject jsonObject) { + int state = 1; + try { + state = jsonObject.getInteger("setting_browserInput"); + Logutils.e(TAG, "setBrowserInput: " + state); + String json = jsonObject.getString("setting_browserInput"); + if (TextUtils.isEmpty(json)) { + state = 1; + } + } catch (Exception e) { + Logutils.e(TAG, "setBrowserInput: e: " + e.getMessage()); + } + Logutils.e(TAG, "setBrowserInput: " + state); + //后台没有这个选项默认打开 + if (state == 0) { + Settings.System.putInt(context.getContentResolver(), "qch_Browser_input", 1); + } else { + Settings.System.putInt(context.getContentResolver(), "qch_Browser_input", 0); + } + } + + /** + * 置浏览器禁止输入，默认打开 + * + * @param context + * @param state + */ + private static void setBrowserInput(Context context, int state) { + Settings.System.putInt(context.getContentResolver(), "qch_Browser_input", 0); + } } diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/ToastUtil.java b/app/src/main/java/com/mjsheng/myappstore/utils/ToastUtil.java index cb04b85..acbbe1b 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/ToastUtil.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/ToastUtil.java @@ -5,7 +5,6 @@ import android.content.Context; import android.os.Build; import android.os.Handler; import android.os.Looper; -import android.util.Log; import android.widget.Toast; import com.mjsheng.myappstore.BuildConfig; @@ -39,7 +38,7 @@ public class ToastUtil { time2 = System.currentTimeMillis(); if ((time2 - time1) > 3500) { showToast(mContext, msg, Toast.LENGTH_SHORT); - Log.e("fht", "LENGTH_LONG"); + Logutils.e("fht", "LENGTH_LONG"); time1 = time2; } } else { diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/URLUtils.java b/app/src/main/java/com/mjsheng/myappstore/utils/URLUtils.java index 19b6dd3..62e6c78 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/URLUtils.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/URLUtils.java @@ -4,7 +4,6 @@ import android.content.Context; import android.os.Build; import android.provider.Settings; import android.text.TextUtils; -import android.util.Log; import android.webkit.WebSettings; import java.io.IOException; @@ -40,9 +39,9 @@ public class URLUtils { public void setBrowserWhiteList() { String whiteList = Settings.System.getString(mContext.getContentResolver(), "DeselectBrowserArray"); if (TextUtils.isEmpty(whiteList.trim())) { - Log.e(TAG, "getBrowserWhiteList: " + "oldwhiteList is empty"); + Logutils.e(TAG, "getBrowserWhiteList: " + "oldwhiteList is empty"); } else { - Log.e(TAG, "getBrowserWhiteList: " + "oldwhiteList is : " + whiteList); + Logutils.e(TAG, "getBrowserWhiteList: " + "oldwhiteList is : " + whiteList); HashSet URLList = new HashSet<>(Arrays.asList(whiteList.split(","))); Observable.create(new ObservableOnSubscribe() { @Override @@ -64,41 +63,41 @@ public class URLUtils { // } // }else { // } - baseURLList.add(url); - if (url.startsWith("www.")) {//前缀为www的顶级域名 - String nowww = url.substring(4); - baseURLList.add(nowww); - baseURLList.add("http://" + nowww); - emitter.onNext(getOkHttpURL("http://" + nowww)); - baseURLList.add("https://" + nowww); - emitter.onNext(getOkHttpURL("https://" + nowww)); - Log.e(TAG, "subscribe: nowww: " + nowww); - baseURLList.add("http://" + url); - emitter.onNext(getOkHttpURL("http://" + url)); - baseURLList.add("https://" + url); - emitter.onNext(getOkHttpURL("https://" + url)); - } else if (getCount(url, ".") == 1 && getCount(url, ":") == 0) {//不带www的顶级域名 - baseURLList.add("http://www." + url); - emitter.onNext(getOkHttpURL("http://www." + url)); - baseURLList.add("https://www." + url); - emitter.onNext(getOkHttpURL("https://www." + url)); - baseURLList.add("http://" + url); - emitter.onNext(getOkHttpURL("http://" + url)); - baseURLList.add("https://" + url); - emitter.onNext(getOkHttpURL("https://" + url)); - } else if (!url.startsWith("http://") && !url.startsWith("https://")) {//没有前缀的网址 - baseURLList.add("http://" + url); - emitter.onNext(getOkHttpURL("http://" + url)); - baseURLList.add("https://" + url); - emitter.onNext(getOkHttpURL("https://" + url)); - } else { -// Log.e(TAG, "subscribe: 0:" + url); - baseURLList.add(url); - if (!TextUtils.isEmpty(url)) { - emitter.onNext(getOkHttpURL(url)); - } - } - Log.e(TAG, "subscribe: " + url); + baseURLList.add("https://" + url); +// if (url.startsWith("www.")) {//前缀为www的顶级域名 +// String nowww = url.substring(4); +// baseURLList.add(nowww); +// baseURLList.add("http://" + nowww); +// emitter.onNext(getOkHttpURL("http://" + nowww)); +// baseURLList.add("https://" + nowww); +// emitter.onNext(getOkHttpURL("https://" + nowww)); +// Logutils.e(TAG, "subscribe: nowww: " + nowww); +// baseURLList.add("http://" + url); +// emitter.onNext(getOkHttpURL("http://" + url)); +// baseURLList.add("https://" + url); +// emitter.onNext(getOkHttpURL("https://" + url)); +// } else if (getCount(url, ".") == 1 && getCount(url, ":") == 0) {//不带www的顶级域名 +// baseURLList.add("http://www." + url); +// emitter.onNext(getOkHttpURL("http://www." + url)); +// baseURLList.add("https://www." + url); +// emitter.onNext(getOkHttpURL("https://www." + url)); +// baseURLList.add("http://" + url); +// emitter.onNext(getOkHttpURL("http://" + url)); +// baseURLList.add("https://" + url); +// emitter.onNext(getOkHttpURL("https://" + url)); +// } else if (!url.startsWith("http://") && !url.startsWith("https://")) {//没有前缀的网址 +// baseURLList.add("http://" + url); +// emitter.onNext(getOkHttpURL("http://" + url)); +// baseURLList.add("https://" + url); +// emitter.onNext(getOkHttpURL("https://" + url)); +// } else { +//// Logutils.e(TAG, "subscribe: 0:" + url); +// baseURLList.add(url); +// if (!TextUtils.isEmpty(url)) { +// emitter.onNext(getOkHttpURL(url)); +// } +// } +// Logutils.e(TAG, "subscribe: " + url); // emitter.onNext(getOkHttpURL(url)); } emitter.onComplete(); @@ -113,28 +112,28 @@ public class URLUtils { @Override public void onNext(String s) { - Log.e(TAG, "onNext: " + s); - baseURLList.add(s); - if (s.startsWith("http://")) { - String noHttp = s.substring(7); - Log.e(TAG, "onNext: noHttp: " + noHttp); - baseURLList.add(noHttp); - } - if (s.startsWith("https://")) { - String noHttps = s.substring(8); - Log.e(TAG, "onNext: noHttps: " + noHttps); - baseURLList.add(noHttps); - } + Logutils.e(TAG, "onNext: " + s); +// baseURLList.add(s); +// if (s.startsWith("http://")) { +// String noHttp = s.substring(7); +// Logutils.e(TAG, "onNext: noHttp: " + noHttp); +// baseURLList.add(noHttp); +// } +// if (s.startsWith("https://")) { +// String noHttps = s.substring(8); +// Logutils.e(TAG, "onNext: noHttps: " + noHttps); +// baseURLList.add(noHttps); +// } } @Override public void onError(Throwable e) { - Log.e(TAG, "onError: " + e.getMessage()); + Logutils.e(TAG, "onError: " + e.getMessage()); } @Override public void onComplete() { - Log.e(TAG, "onComplete: " + baseURLList); + Logutils.e(TAG, "onComplete: " + baseURLList); StringBuilder stringBuilder = new StringBuilder(); for (String s : baseURLList) { if (stringBuilder.length() > 0) { @@ -143,9 +142,9 @@ public class URLUtils { stringBuilder.append(s); } String DeselectBrowserArray = stringBuilder.toString(); - Log.e(TAG, "onComplete: " + "white list: " + DeselectBrowserArray); + Logutils.e(TAG, "onComplete: " + "white list: " + DeselectBrowserArray); boolean write = Settings.System.putString(mContext.getContentResolver(), "DeselectBrowserArray", DeselectBrowserArray); - Log.e(TAG, "onComplete: " + "write :" + write); + Logutils.e(TAG, "onComplete: " + "write :" + write); } }); } @@ -157,13 +156,13 @@ public class URLUtils { public void setBrowserBlackList() { String qch_webblack_url = Settings.System.getString(mContext.getContentResolver(), "qch_webblack_url"); - Log.e(TAG, "setBrowserBlackList: " + qch_webblack_url); + Logutils.e(TAG, "setBrowserBlackList: " + qch_webblack_url); if (TextUtils.isEmpty(qch_webblack_url.trim())) { return; } HashSet URLList = new HashSet<>(Arrays.asList(qch_webblack_url.split(","))); for (String url : URLList) { - Log.e(TAG, "setBrowserBlackList: url: " + url); + Logutils.e(TAG, "setBrowserBlackList: url: " + url); if (qch_webblack_url.startsWith("http://")) { blackList.add(url); blackList.add(url.replace("http://", "https://")); @@ -182,9 +181,9 @@ public class URLUtils { } stringBuilder.append(url); } - Log.e(TAG, "setBrowserBlackList: blackList: " + blackList); + Logutils.e(TAG, "setBrowserBlackList: blackList: " + blackList); boolean write = Settings.System.putString(mContext.getContentResolver(), "qch_webblack_url", stringBuilder.toString()); - Log.e(TAG, "setBrowserBlackList: write: " + write); + Logutils.e(TAG, "setBrowserBlackList: write: " + write); } private String getOkHttpURL(String URL) { @@ -202,25 +201,25 @@ public class URLUtils { // call.enqueue(new Callback() { // @Override // public void onFailure(Call call, IOException e) { -// Log.e(TAG, "onFailure: "); +// Logutils.e(TAG, "onFailure: "); // } // // @Override // public void onResponse(Call call, Response response) throws IOException { -// Log.e(TAG, "onResponse: " + getIP(response.request().url().uri())); +// Logutils.e(TAG, "onResponse: " + getIP(response.request().url().uri())); // } // }); try { Response response = call.execute(); if (response.isSuccessful()) { - Log.e(TAG, "getOkHttpURL: " + response.request().url().toString()); + Logutils.e(TAG, "getOkHttpURL: " + response.request().url().toString()); return getIP(response.request().url().uri()).toString(); } else { return ""; } } catch (IOException e) { e.printStackTrace(); - Log.e(TAG, "getOkHttpURL: " + e.getMessage() + " : " + URL); + Logutils.e(TAG, "getOkHttpURL: " + e.getMessage() + " : " + URL); return ""; } } @@ -278,7 +277,7 @@ public class URLUtils { userAgent = WebSettings.getDefaultUserAgent(mContext); //需要hook webview } catch (Exception e) { - Log.e(TAG, "getUserAgent: " + e.getMessage()); + Logutils.e(TAG, "getUserAgent: " + e.getMessage()); userAgent = System.getProperty("http.agent"); } } else { diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/Utils.java b/app/src/main/java/com/mjsheng/myappstore/utils/Utils.java index 6cc3c3b..4efb16b 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/Utils.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/Utils.java @@ -39,7 +39,6 @@ import android.telephony.TelephonyManager; import android.text.TextUtils; import android.text.format.Formatter; import android.util.DisplayMetrics; -import android.util.Log; import android.view.MotionEvent; import android.view.View; import android.view.WindowManager; @@ -632,7 +631,7 @@ public class Utils { } } catch (Exception e) { e.printStackTrace(); - Log.e("e", "读取设备序列号异常：" + e.toString()); + Logutils.e("e", "读取设备序列号异常：" + e.toString()); } return serial; } @@ -650,7 +649,7 @@ public class Utils { return String.format("%.2fGB", gbValue); } else { double mbValue = (double) space / A_MB; - // Log.e("GB", "gbvalue=" + mbValue); + // Logutils.e("GB", "gbvalue=" + mbValue); if (mbValue >= 1) { return String.format("%.2fMB", mbValue); } else { @@ -768,7 +767,7 @@ public class Utils { // // float roundPx = 15; //圆角半径 // mPaint.setAntiAlias(true); -// //Log.d("wy"+TAG,"mBitmap.getWidth()="+mBitmap.getWidth()+", mBitmap.getHeight()="+mBitmap.getHeight()); +// //Logutils.d("wy"+TAG,"mBitmap.getWidth()="+mBitmap.getWidth()+", mBitmap.getHeight()="+mBitmap.getHeight()); // mCanvas.drawRoundRect(mRectF, roundPx, roundPx, mPaint); // mPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN)); // mCanvas.drawBitmap(mBitmap, mRect, mRect, mPaint); @@ -887,9 +886,9 @@ public class Utils { list += str + ","; } list = list.substring(0, list.length() - 1); - Log.e("fht", list); + Logutils.e("fht", list); writeSucceed = Settings.System.putString(context.getContentResolver(), "qch_app_forbid", list); - Log.e("fht", "qch_app_forbid:" + list); + Logutils.e("fht", "qch_app_forbid:" + list); } else { writeSucceed = Settings.System.putString(context.getContentResolver(), "qch_app_forbid", "Invalid"); } @@ -933,15 +932,15 @@ public class Utils { public static void ariaDownload(Context context, String url, JSONObject jsonObject) { String fileName = getFileNamefromURL(url); String urlMD5 = jsonObject.getString("MD5"); - Log.e("ariaDownload", "urlMD5=" + urlMD5); + Logutils.e("ariaDownload", "urlMD5=" + urlMD5); String p = PathUtils.getExternalDownloadsPath(); File file = new File(PathUtils.getExternalDownloadsPath() + "/jgy/" + fileName); if (file.exists() && !file.isDirectory()) { String filenameMD5 = getMD5fromFileName(url); String fileMD5 = FileUtils.getFileMD5ToString(file); - Log.e("ariaDownload", "filenameMD5=" + filenameMD5); - Log.e("ariaDownload", "fileMD5=" + fileMD5); + Logutils.e("ariaDownload", "filenameMD5=" + filenameMD5); + Logutils.e("ariaDownload", "fileMD5=" + fileMD5); //后端还没有完成json字段的MD5，暂时用文件名获取 if (fileMD5.equalsIgnoreCase(urlMD5)) { ApkUtils.installApp(context, file.getAbsolutePath()); @@ -989,15 +988,15 @@ public class Utils { @Override public void onNext(Integer integer) { if (integer == 0) { - Log.e("doss", "成功"); + Logutils.e("doss", "成功"); } else { - Log.e("doss", "失败"); + Logutils.e("doss", "失败"); } } @Override public void onError(Throwable e) { - Log.e("doss", "Throwable=" + e.getMessage()); + Logutils.e("doss", "Throwable=" + e.getMessage()); } @Override @@ -1008,12 +1007,12 @@ public class Utils { // new Thread(new Runnable() { // @Override // public void run() { -// Log.e("whh0914", "开始屏幕截图..."); +// Logutils.e("whh0914", "开始屏幕截图..."); // String filepath = context.getFileStreamPath("screenshot").getAbsolutePath(); // try { // CmdUtil.execute("screencap -p " + filepath); // } catch (Exception e) { -// Log.e("whh0914", "屏幕截图出现异常：" + e.toString()); +// Logutils.e("whh0914", "屏幕截图出现异常：" + e.toString()); // } // } // }).start(); @@ -1063,12 +1062,12 @@ public class Utils { int screenWidth = (int) (width / density); // 屏幕宽度(dp) int screenHeight = (int) (height / density);// 屏幕高度(dp) -// Log.e("h_bl", "屏幕宽度（像素）：" + width); -// Log.e("h_bl", "屏幕高度（像素）：" + height); -// Log.e("h_bl", "屏幕密度（0.75 / 1.0 / 1.5）：" + density); -// Log.e("h_bl", "屏幕密度dpi（120 / 160 / 240）：" + densityDpi); -// Log.e("h_bl", "屏幕宽度（dp）：" + screenWidth); -// Log.e("h_bl", "屏幕高度（dp）：" + screenHeight); +// Logutils.e("h_bl", "屏幕宽度（像素）：" + width); +// Logutils.e("h_bl", "屏幕高度（像素）：" + height); +// Logutils.e("h_bl", "屏幕密度（0.75 / 1.0 / 1.5）：" + density); +// Logutils.e("h_bl", "屏幕密度dpi（120 / 160 / 240）：" + densityDpi); +// Logutils.e("h_bl", "屏幕宽度（dp）：" + screenWidth); +// Logutils.e("h_bl", "屏幕高度（dp）：" + screenHeight); return width + "×" + height; } @@ -1114,14 +1113,14 @@ public class Utils { // IMEI = (String) method.invoke(TelephonyMgr); // } catch (Exception e) { // e.printStackTrace(); -// Log.e("getIMEI", e.getMessage()); +// Logutils.e("getIMEI", e.getMessage()); // } // IMEI = TelephonyMgr.getDeviceId(); // } else {//9.0到10.0获取 IMEI = Settings.System.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID); } - Log.e("IMEI:", "IMEI: " + IMEI); + Logutils.e("IMEI:", "IMEI: " + IMEI); if (null == IMEI) { return "-"; } else { @@ -1145,7 +1144,7 @@ public class Utils { jsonObject.put("rom", rom); jsonObject.put("screen_rate", screen_rate); String jsonString = jsonObject.toJSONString(); - Log.e(TAG, "getMachine: " + jsonString); + Logutils.e(TAG, "getMachine: " + jsonString); return jsonString; } @@ -1154,7 +1153,7 @@ public class Utils { int electric = getBattery(context); int charging = getIsCharging(context); String memory = Formatter.formatFileSize(context, getFreeMemory(context)) + "\t 已用" + "/" + "共" + Formatter.formatFileSize(context, getTotalMemory(context)); - Log.e("getHardware", "Memory: " + memory); + Logutils.e("getHardware", "Memory: " + memory); String storage = getRemnantSize(context) + "/" + getDataTotalSize(context); int CPU = getNumCores(); JSONObject jsonObject = new JSONObject(); @@ -1164,7 +1163,7 @@ public class Utils { jsonObject.put("storage", storage); jsonObject.put("CPU", CPU + "核"); String jsonString = jsonObject.toJSONString(); - Log.e(TAG, "getHardware: " + jsonString); + Logutils.e(TAG, "getHardware: " + jsonString); return jsonString; } @@ -1200,7 +1199,7 @@ public class Utils { BatteryManager batteryManager = (BatteryManager) context.getSystemService(Context.BATTERY_SERVICE); return batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY); } catch (Exception e) { - Log.e("getBattery", "getBattery" + e.getMessage()); + Logutils.e("getBattery", "getBattery" + e.getMessage()); } return 0; } @@ -1261,7 +1260,7 @@ public class Utils { ActivityManager.MemoryInfo memoryInfo = new ActivityManager.MemoryInfo(); activityManager.getMemoryInfo(memoryInfo); long freeMem = memoryInfo.totalMem - memoryInfo.availMem; -// Log.e("getHardware", "getFreeMemory: " + freeMem); +// Logutils.e("getHardware", "getFreeMemory: " + freeMem); return freeMem; } @@ -1274,7 +1273,7 @@ public class Utils { ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE); ActivityManager.MemoryInfo memoryInfo = new ActivityManager.MemoryInfo(); activityManager.getMemoryInfo(memoryInfo); -// Log.e("getHardware", "getFreeMemory: " + memoryInfo.totalMem); +// Logutils.e("getHardware", "getFreeMemory: " + memoryInfo.totalMem); return memoryInfo.totalMem; } @@ -1347,13 +1346,13 @@ public class Utils { long totalSize = statFs.getTotalBytes(); long availableSize = statFs.getAvailableBytes(); - Log.e("statfs", "total = " + getUnit(totalSize)); - Log.e("statfs", "availableSize = " + getUnit(availableSize)); + Logutils.e("statfs", "total = " + getUnit(totalSize)); + Logutils.e("statfs", "availableSize = " + getUnit(availableSize)); //这里可以看出 available 是小于 free ,free 包括保留块。 - Log.e("statfs", "total = " + getUnit(blockSize * blockCount)); - Log.e("statfs", "available = " + getUnit(blockSize * availableCount)); - Log.e("statfs", "free = " + getUnit(blockSize * freeBlocks)); + Logutils.e("statfs", "total = " + getUnit(blockSize * blockCount)); + Logutils.e("statfs", "available = " + getUnit(blockSize * availableCount)); + Logutils.e("statfs", "free = " + getUnit(blockSize * freeBlocks)); } diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/XAPKUtils.java b/app/src/main/java/com/mjsheng/myappstore/utils/XAPKUtils.java index a163480..dd1a1d4 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/XAPKUtils.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/XAPKUtils.java @@ -7,7 +7,6 @@ import android.content.pm.PackageInstaller; import android.os.Build; import android.os.Environment; import android.text.TextUtils; -import android.util.Log; import androidx.annotation.RequiresApi; @@ -76,7 +75,7 @@ public class XAPKUtils { if (file.exists() && file.isFile()) { upzipXAPK(file); } else { - Log.e(TAG, "installXAPK: " + "File not exists"); + Logutils.e(TAG, "installXAPK: " + "File not exists"); } } @@ -119,17 +118,17 @@ public class XAPKUtils { //获取OBB文件配置 JsonElement split_apks_em = jsonObject.get("split_apks"); readConfig(split_configs_em, expansions_em, split_apks_em); -// Log.e(TAG, "installXAPK: " + jsonString); +// Logutils.e(TAG, "installXAPK: " + jsonString); } @Override public void onError(Throwable e) { - Log.e(TAG, "onError: " + e.getMessage()); + Logutils.e(TAG, "onError: " + e.getMessage()); } @Override public void onComplete() { - Log.e(TAG, "onComplete: "); + Logutils.e(TAG, "onComplete: "); } }); } @@ -141,19 +140,19 @@ public class XAPKUtils { if (null != split_configs) { getSplitConfigs(split_configs.getAsJsonArray()); } else { - Log.e(TAG, "readConfig: " + "not found split_configs json data"); + Logutils.e(TAG, "readConfig: " + "not found split_configs json data"); } if (null != expansions) { readOBBConfig(expansions.getAsJsonArray()); } else { - Log.e(TAG, "readConfig: " + "not found expansions json data"); + Logutils.e(TAG, "readConfig: " + "not found expansions json data"); } if (null != split_apks) { getSplitApks(split_apks.getAsJsonArray()); } else { - Log.e(TAG, "readConfig: " + "not found split_apks json data"); + Logutils.e(TAG, "readConfig: " + "not found split_apks json data"); } @@ -178,7 +177,7 @@ public class XAPKUtils { // } // configStringBuilder.append(config); // } -// Log.e(TAG, "getSplitConfigs: " + configStringBuilder.toString()); +// Logutils.e(TAG, "getSplitConfigs: " + configStringBuilder.toString()); } /** @@ -188,7 +187,7 @@ public class XAPKUtils { */ private void readOBBConfig(JsonArray jsonArray) { if (TextUtils.isEmpty(unpackPath)) { - Log.e(TAG, "readOBBConfig: " + "unpack directory is empty"); + Logutils.e(TAG, "readOBBConfig: " + "unpack directory is empty"); return; } Type type = new TypeToken>() { @@ -198,9 +197,9 @@ public class XAPKUtils { if (null != expansionsList && expansionsList.size() > 0) { for (Expansions expansions : expansionsList) { if (copyObbFile(expansions)) { - Log.e(TAG, "readOBBConfig: " + "success"); + Logutils.e(TAG, "readOBBConfig: " + "success"); } else { - Log.e(TAG, "readOBBConfig: " + "copy oob File failure"); + Logutils.e(TAG, "readOBBConfig: " + "copy oob File failure"); } } } @@ -215,25 +214,25 @@ public class XAPKUtils { String install_path = expansions.getInstall_path(); if (TextUtils.isEmpty(file)) { - Log.e(TAG, "copyObbFile: " + "file path is empty"); + Logutils.e(TAG, "copyObbFile: " + "file path is empty"); return false; } else { File localFile = new File(unpackPath + File.separator + file); if (localFile.exists() && localFile.isFile()) { File installFile = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + File.separator + install_path); - Log.e(TAG, "copyObbFile: " + "localFile: " + localFile.getAbsolutePath()); - Log.e(TAG, "copyObbFile: " + "installFile: " + installFile.getAbsolutePath()); + Logutils.e(TAG, "copyObbFile: " + "localFile: " + localFile.getAbsolutePath()); + Logutils.e(TAG, "copyObbFile: " + "installFile: " + installFile.getAbsolutePath()); try { Path path = Paths.get(localFile.getAbsolutePath()); Files.copy(path, new FileOutputStream(installFile)); return true; } catch (IOException e) { - Log.e(TAG, "copyObbFile: " + "IOException" + e.getMessage()); + Logutils.e(TAG, "copyObbFile: " + "IOException" + e.getMessage()); e.printStackTrace(); return false; } } else { - Log.e(TAG, "copyObbFile: " + "localFile: " + "File not exists"); + Logutils.e(TAG, "copyObbFile: " + "localFile: " + "File not exists"); return false; } @@ -277,14 +276,14 @@ public class XAPKUtils { filePath.add(unpackPath + File.separator + file); } } -// Log.e(TAG, "installxApk: " + filePath.toString()); +// Logutils.e(TAG, "installxApk: " + filePath.toString()); } else { //split_configs为空的情况 int position = getFileFromId(apkList, "base"); if (position != -1) { String file = apkList.get(position).getFile(); filePath.add(file); - Log.e(TAG, "installxApk: " + "base file = " + file); + Logutils.e(TAG, "installxApk: " + "base file = " + file); } } @@ -354,7 +353,7 @@ public class XAPKUtils { session.commit(pendingIntent.getIntentSender()); } catch (IOException e) { e.printStackTrace(); - Log.e(TAG, "install: " + e.getMessage()); + Logutils.e(TAG, "install: " + e.getMessage()); } } @@ -366,7 +365,7 @@ public class XAPKUtils { sessionId = packageInstaller.createSession(sessionParams); } catch (IOException e) { e.printStackTrace(); - Log.e(TAG, "createSession: " + e.getMessage()); + Logutils.e(TAG, "createSession: " + e.getMessage()); } return sessionId; } @@ -399,9 +398,9 @@ public class XAPKUtils { } } catch (IOException e) { e.printStackTrace(); - Log.e("fht", "copyApkFile" + e.getMessage()); + Logutils.e("fht", "copyApkFile" + e.getMessage()); } - Log.e("fht", "copyApkFile" + "success = " + success); + Logutils.e("fht", "copyApkFile" + "success = " + success); return success; } } diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml index fe3b6b3..5e3b7f1 100644 --- a/app/src/main/res/layout-land/activity_main.xml +++ b/app/src/main/res/layout-land/activity_main.xml @@ -51,8 +51,8 @@