diff --git a/app/build.gradle b/app/build.gradle index c9548ca..5224de8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { applicationId "com.uiuipad.find" minSdkVersion 24 targetSdkVersion 29 - versionCode 17 - versionName "1.1.6" + versionCode 19 + versionName "1.1.8" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/com/uiuipad/find/activity/main/MainActivity.java b/app/src/main/java/com/uiuipad/find/activity/main/MainActivity.java index 4010d3d..feac99f 100644 --- a/app/src/main/java/com/uiuipad/find/activity/main/MainActivity.java +++ b/app/src/main/java/com/uiuipad/find/activity/main/MainActivity.java @@ -114,6 +114,8 @@ public class MainActivity extends BaseActivity implements MainAContact.MainView, bindService(intent, serviceConnect, BIND_AUTO_CREATE); startService(intent); + sendBroadcast(new Intent(MainService.OS_REFRESH_ACTION)); + iv_back.setOnClickListener(view -> lazyExit()); tv_version.setText(BuildConfig.VERSION_NAME); diff --git a/app/src/main/java/com/uiuipad/find/network/NetInterfaceManager.java b/app/src/main/java/com/uiuipad/find/network/NetInterfaceManager.java index 5efb238..6c1542d 100644 --- a/app/src/main/java/com/uiuipad/find/network/NetInterfaceManager.java +++ b/app/src/main/java/com/uiuipad/find/network/NetInterfaceManager.java @@ -466,6 +466,7 @@ public class NetInterfaceManager { Log.e("getTimeControl", c.toString()); } ControlUtils.disableSystemControl(mContext); + Settings.Global.putInt(mCrv, "is_control", 0); } } @@ -570,7 +571,7 @@ public class NetInterfaceManager { Map params = new HashMap<>(); params.put("package", NetInterfaceManager.convertToRequestBody(packageInfo.packageName)); Call call = getUploadAppImgApi().uploadAppImg(params, body); - call.enqueue(new RetryCallback(call, 10, 30 * 1000) { + call.enqueue(new RetryCallback(call, 1, 30 * 1000) { @Override public void onRequestResponse(Call call, Response response) { BaseResponse baseResponse = (BaseResponse) response.body(); @@ -644,7 +645,7 @@ public class NetInterfaceManager { intent2.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent2.setClassName(ApkInfo.JXW_LAUNCHER_PACKAGE_NAME, ApkInfo.JXW_LAUNCHER_UPDATE_CLASS_NAME); try { - mContext.startActivity(intent2); +// mContext.startActivity(intent2); mMMKV.encode("start_jxw_key", true); } catch (Exception e) { Log.e(TAG, "run: " + e.getMessage()); diff --git a/app/src/main/java/com/uiuipad/find/push/PushManager.java b/app/src/main/java/com/uiuipad/find/push/PushManager.java index 4afaade..23eeb06 100644 --- a/app/src/main/java/com/uiuipad/find/push/PushManager.java +++ b/app/src/main/java/com/uiuipad/find/push/PushManager.java @@ -8,6 +8,7 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.os.Handler; import android.os.PowerManager; +import android.provider.Settings; import android.util.Log; import android.view.Gravity; import android.view.WindowManager; @@ -241,6 +242,7 @@ public class PushManager { mMMKV.clearAll(); ControlUtils.disableSystemControl(mContext); mContext.sendBroadcast(new Intent(MainService.OS_REFRESH_ACTION)); + Settings.Global.putInt(mContext.getContentResolver(), "is_control", 0); break; case RESTORE_FACTORY: ToastUtil.debugShow("收到管控:恢复出厂"); @@ -452,6 +454,7 @@ public class PushManager { @Override public void onComplete() { Log.e("snConfirmBind", "onComplete: "); + mContext.sendBroadcast(new Intent(MainService.OS_REFRESH_ACTION)); } }); } diff --git a/app/src/main/java/com/uiuipad/find/push/alipush/AliMessageIntentService.java b/app/src/main/java/com/uiuipad/find/push/alipush/AliMessageIntentService.java index 77a7ac3..24ee753 100644 --- a/app/src/main/java/com/uiuipad/find/push/alipush/AliMessageIntentService.java +++ b/app/src/main/java/com/uiuipad/find/push/alipush/AliMessageIntentService.java @@ -5,6 +5,9 @@ import android.util.Log; import com.alibaba.sdk.android.push.AliyunMessageIntentService; import com.alibaba.sdk.android.push.notification.CPushMessage; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import com.uiuipad.find.push.PushManager; import java.util.Map; @@ -42,6 +45,14 @@ public class AliMessageIntentService extends AliyunMessageIntentService { @Override protected void onMessage(Context context, CPushMessage cPushMessage) { Log.i(TAG, "收到一条推送消息 : " + cPushMessage.getTitle() + ", content:" + cPushMessage.getContent()); + String title = cPushMessage.getTitle(); + String content = cPushMessage.getContent(); + JsonObject extrasJson = JsonParser.parseString(content).getAsJsonObject(); + String extras = ""; + if (extrasJson.get("extras") != null) { + extras = extrasJson.get("extras").toString(); + } + PushManager.getInstance().setPushContent(title, extras); } /** diff --git a/app/src/main/java/com/uiuipad/find/receiver/APKinstallReceiver.java b/app/src/main/java/com/uiuipad/find/receiver/APKinstallReceiver.java index 3617861..ae8a9a8 100644 --- a/app/src/main/java/com/uiuipad/find/receiver/APKinstallReceiver.java +++ b/app/src/main/java/com/uiuipad/find/receiver/APKinstallReceiver.java @@ -8,6 +8,7 @@ import android.text.TextUtils; import android.util.Log; import com.uiuipad.find.network.NetInterfaceManager; +import com.uiuipad.find.service.main.MainService; import java.util.concurrent.TimeUnit; @@ -59,6 +60,7 @@ public class APKinstallReceiver extends BroadcastReceiver { Log.e(TAG, "sendAppInfo: " + state + packageName); // ApkUtils.RemoveTask(mContext, packageName); newAppListener.setNewAppListener(packageName); + // if (JGYUtils.PACKAGE_APPSTORE.equals(packageName)) { // //启动应用市场 // JGYUtils.getInstance().wakeUpDeviceInfo(); @@ -106,11 +108,13 @@ public class APKinstallReceiver extends BroadcastReceiver { @Override public void onError(Throwable e) { Log.e("sendAppInfo", "onError: " + e.getMessage()); + onComplete(); } @Override public void onComplete() { Log.e("sendAppInfo", "onComplete: "); + mContext.sendBroadcast(new Intent(MainService.OS_REFRESH_ACTION)); } }); } diff --git a/app/src/main/java/com/uiuipad/find/service/main/MainService.java b/app/src/main/java/com/uiuipad/find/service/main/MainService.java index c6341ee..3e0db2b 100644 --- a/app/src/main/java/com/uiuipad/find/service/main/MainService.java +++ b/app/src/main/java/com/uiuipad/find/service/main/MainService.java @@ -166,6 +166,7 @@ public class MainService extends Service implements MainSContact.MainView, Netwo .subscribe(killObserver); registerReceivers(); + NetworkUtils.registerNetworkStatusChangedListener(this); mPresenter.updateSnInfo(); }