From 3d15a60ac91f83ad37a6f54cdaece034f4980a68 Mon Sep 17 00:00:00 2001 From: Fanhuitong <981964879@qq.com> Date: Tue, 31 Oct 2023 18:11:25 +0800 Subject: [PATCH] =?UTF-8?q?version:1.1.1=20fix:=20update:=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=8A=A5=E9=94=99,=E4=BC=98=E5=8C=96=E6=8E=A8?= =?UTF-8?q?=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 4 +- src/com/uiuipad/os/Launcher.java | 4 +- .../uiuipad/os/manager/RunningAppManager.java | 30 +++++--- .../os/manager/TimeControlManager.java | 9 ++- .../os/network/NetInterfaceManager.java | 18 +---- src/com/uiuipad/os/network/UrlAddress.java | 7 -- .../os/network/api/CloudLessonAppApi.java | 15 ---- .../os/network/api/CloudLessonSettingApi.java | 15 ---- src/com/uiuipad/os/push/PushManager.java | 12 ++- src/com/uiuipad/os/service/MainService.java | 74 ++++++++++++++----- 10 files changed, 94 insertions(+), 94 deletions(-) delete mode 100644 src/com/uiuipad/os/network/api/CloudLessonAppApi.java delete mode 100644 src/com/uiuipad/os/network/api/CloudLessonSettingApi.java diff --git a/build.gradle b/build.gradle index 03fc3b4..f961abb 100644 --- a/build.gradle +++ b/build.gradle @@ -50,8 +50,8 @@ android { minSdkVersion 26 targetSdkVersion 28 - versionCode 9 - versionName "1.0.8" + versionCode 12 + versionName "1.1.1" ndk { //选择要添加的对应 cpu 类型的 .so 库。 diff --git a/src/com/uiuipad/os/Launcher.java b/src/com/uiuipad/os/Launcher.java index e182a8f..54698b9 100644 --- a/src/com/uiuipad/os/Launcher.java +++ b/src/com/uiuipad/os/Launcher.java @@ -426,10 +426,10 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, setWorkspaceLoading(true); } - if (!isDefaultHome()) { +// if (!isDefaultHome()) { // setDefaultL(); setRoleHolderAsUser(this, BuildConfig.APPLICATION_ID); - } +// } SharedPreferences sharedPref = getPreferences(MODE_PRIVATE); int i = sharedPref.getInt("SetWallPaper", 0); if (i == 0) { diff --git a/src/com/uiuipad/os/manager/RunningAppManager.java b/src/com/uiuipad/os/manager/RunningAppManager.java index 72b2267..4de5865 100644 --- a/src/com/uiuipad/os/manager/RunningAppManager.java +++ b/src/com/uiuipad/os/manager/RunningAppManager.java @@ -538,6 +538,9 @@ public class RunningAppManager { } boolean havaConfigure = TimeControlManager.getInstance().havaConfigure(pkg); TimeManageSn machineControl = TimeControlManager.getInstance().getGlobalMachineControl(); + if (machineControl == null) { + return; + } Log.e(TAG, "inControlTime: globalRemainingTime = " + globalRemainingTime); if (globalRemainingTime <= 0) { @@ -684,6 +687,9 @@ public class RunningAppManager { } boolean havaConfigure = TimeControlManager.getInstance().havaConfigure(pkg); TimeManageSn machineControl = TimeControlManager.getInstance().getGlobalMachineControl(); + if (machineControl == null) { + return false; + } if (havaConfigure) { //有单独设置 不管是分类整机还是其他都是这个设置 @@ -708,8 +714,8 @@ public class RunningAppManager { // return false; // } // } else { - ToastUtil.show("今日可使用时间已用完"); - return true; + ToastUtil.show("今日可使用时间已用完"); + return true; // } } } @@ -931,18 +937,18 @@ public class RunningAppManager { remainTime.setTotalTime(machineControl.getRest_time()); } // if (machineControl.is_quota == 1) { - if (haveUseTime(machineControl.getWork_time(), machineControl.getRest_time(), machineControl.getToday_time())) { - return ""; + if (haveUseTime(machineControl.getWork_time(), machineControl.getRest_time(), machineControl.getToday_time())) { + return ""; + } else { + boolean inControlTime = inControlTime(machineControl); + if (inControlTime) { + remainTime.setDisableType(3); + remainTime.setContent("该应用" + partTime2String(machineControl)); + return remainTime.getContent(); } else { - boolean inControlTime = inControlTime(machineControl); - if (inControlTime) { - remainTime.setDisableType(3); - remainTime.setContent("该应用" + partTime2String(machineControl)); - return remainTime.getContent(); - } else { - return ""; - } + return ""; } + } // } else { // //关闭整机额度开关 始终可用 // return ""; diff --git a/src/com/uiuipad/os/manager/TimeControlManager.java b/src/com/uiuipad/os/manager/TimeControlManager.java index d8d8ca5..8961c87 100644 --- a/src/com/uiuipad/os/manager/TimeControlManager.java +++ b/src/com/uiuipad/os/manager/TimeControlManager.java @@ -107,8 +107,13 @@ public class TimeControlManager { Gson gson = new Gson(); Type Type = new TypeToken() { }.getType(); - TimeManageSn machineControl = gson.fromJson(jsonString, Type); - return machineControl; + try { + TimeManageSn machineControl = gson.fromJson(jsonString, Type); + return machineControl; + } catch (Exception e) { + Log.e(TAG, "getGlobalMachineControl: " + e.getMessage()); + return null; + } } } else { return mGlobalMachineControl; diff --git a/src/com/uiuipad/os/network/NetInterfaceManager.java b/src/com/uiuipad/os/network/NetInterfaceManager.java index ff9eee4..9e0a3dc 100644 --- a/src/com/uiuipad/os/network/NetInterfaceManager.java +++ b/src/com/uiuipad/os/network/NetInterfaceManager.java @@ -5,8 +5,6 @@ import android.content.Context; import com.tencent.mmkv.MMKV; import com.uiuipad.os.disklrucache.CacheHelper; -import com.uiuipad.os.network.api.CloudLessonAppApi; -import com.uiuipad.os.network.api.CloudLessonSettingApi; import com.uiuipad.os.network.api.TimeManageAppApi; import com.uiuipad.os.network.api.TimeManageSnApi; import com.uiuipad.os.network.api.UploadAppUseLogApi; @@ -21,8 +19,8 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.schedulers.Schedulers; import okhttp3.Cache; import okhttp3.MediaType; @@ -111,20 +109,6 @@ public class NetInterfaceManager { return requestBody; } - public Observable getCloudLessonSettingObservable() { - return mRetrofit.create(CloudLessonSettingApi.class) - .getCloudLessonSetting(Utils.getSerial(mContext)) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()); - } - - public Observable getCloudLessonAppObservable() { - return mRetrofit.create(CloudLessonAppApi.class) - .getCloudLessonApp(Utils.getSerial(mContext)) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()); - } - public Observable getUploadAppUseLogObservable(Map params) { return mRetrofit.create(UploadAppUseLogApi.class) .uploadAppUseLog(params) diff --git a/src/com/uiuipad/os/network/UrlAddress.java b/src/com/uiuipad/os/network/UrlAddress.java index a52292a..9973a64 100644 --- a/src/com/uiuipad/os/network/UrlAddress.java +++ b/src/com/uiuipad/os/network/UrlAddress.java @@ -3,16 +3,9 @@ package com.uiuipad.os.network; public class UrlAddress { public static final String ROOT_URL = "https://kxapi.uiuios.com/android/"; - /*上传应用使用记录*/ public static final String UPLOAD_APP_USE_LOG = "app/app/uploadAppUseLog"; - /*获取专注模式设置*/ - @Deprecated - public static final String GET_CLOUD_LESSON_SETTING = "equipment/manage/getCloudLessonSetting"; - /*获取专注模式应用*/ - @Deprecated - public static final String GET_CLOUD_LESSON_APP = "equipment/manage/getCloudLessonApp"; /* * 时间管控 * */ diff --git a/src/com/uiuipad/os/network/api/CloudLessonAppApi.java b/src/com/uiuipad/os/network/api/CloudLessonAppApi.java deleted file mode 100644 index 26d4a8c..0000000 --- a/src/com/uiuipad/os/network/api/CloudLessonAppApi.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.uiuipad.os.network.api; - -import com.uiuipad.os.network.UrlAddress; -import com.uiuipad.os.network.bean.BaseResponse; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.GET; -import retrofit2.http.Query; - -public interface CloudLessonAppApi { - @GET(UrlAddress.GET_CLOUD_LESSON_APP) - Observable getCloudLessonApp( - @Query("sn") String sn - ); -} diff --git a/src/com/uiuipad/os/network/api/CloudLessonSettingApi.java b/src/com/uiuipad/os/network/api/CloudLessonSettingApi.java deleted file mode 100644 index 84a1591..0000000 --- a/src/com/uiuipad/os/network/api/CloudLessonSettingApi.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.uiuipad.os.network.api; - -import com.uiuipad.os.network.UrlAddress; -import com.uiuipad.os.network.bean.BaseResponse; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.GET; -import retrofit2.http.Query; - -public interface CloudLessonSettingApi { - @GET(UrlAddress.GET_CLOUD_LESSON_SETTING) - Observable getCloudLessonSetting( - @Query("sn") String sn - ); -} diff --git a/src/com/uiuipad/os/push/PushManager.java b/src/com/uiuipad/os/push/PushManager.java index 6d6c688..0ba4f75 100644 --- a/src/com/uiuipad/os/push/PushManager.java +++ b/src/com/uiuipad/os/push/PushManager.java @@ -2,6 +2,10 @@ package com.uiuipad.os.push; import android.annotation.SuppressLint; import android.content.Context; +import android.content.Intent; + +import com.uiuipad.os.service.MainService; +import com.uiuipad.os.uiuiutils.ToastUtil; public class PushManager { private static final String TAG = PushManager.class.getSimpleName(); @@ -30,12 +34,14 @@ public class PushManager { return sInstance; } - /*删除应用*/ - private final String UPDATEPASSWD = "39"; + /*时间管控*/ + private static final String TIME_MANAGEMENT = "28"; public void setPushContent(String title, String extras) { switch (title) { - case UPDATEPASSWD: + case TIME_MANAGEMENT: + ToastUtil.betaShow("收到管控：时间管控"); + mContext.sendBroadcast(new Intent(MainService.REFRESH_ACTION)); break; default: } diff --git a/src/com/uiuipad/os/service/MainService.java b/src/com/uiuipad/os/service/MainService.java index 885b8e6..e6bc843 100644 --- a/src/com/uiuipad/os/service/MainService.java +++ b/src/com/uiuipad/os/service/MainService.java @@ -25,18 +25,17 @@ import org.jetbrains.annotations.NotNull; import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.subjects.BehaviorSubject; -public class MainService extends Service implements MainSContact.MainView , LifecycleProvider { +public class MainService extends Service implements MainSContact.MainView, LifecycleProvider { private String TAG = MainService.class.getSimpleName(); - public MainSPresenter mPresenter; public MainService() { } - private BehaviorSubject lifecycleSubject = BehaviorSubject.create(); + private BehaviorSubject lifecycleSubject = BehaviorSubject.create(); @NotNull @Override @@ -73,7 +72,7 @@ public class MainService extends Service implements MainSContact.MainView , Lif public void onCreate() { super.onCreate(); Log.e(TAG, "onCreate: "); - registerTimeReceiver(); + registerReceivers(); Aria.download(this).register(); lifecycleSubject.onNext(ActivityEvent.CREATE); @@ -88,6 +87,22 @@ public class MainService extends Service implements MainSContact.MainView , Lif return START_STICKY; } + private void registerReceivers() { + registerTimeReceiver(); + registerRefreshReceiver(); + } + + private void unregisterReceivers() { + if (mTimeChangedReceiver != null) { + unregisterReceiver(mTimeChangedReceiver); + } + if (mRefreshReceiver != null) { + unregisterReceiver(mRefreshReceiver); + } + } + + private TimeChangedReceiver mTimeChangedReceiver; + //监听时间和日期变化 public void registerTimeReceiver() { mTimeChangedReceiver = new TimeChangedReceiver(); @@ -100,18 +115,6 @@ public class MainService extends Service implements MainSContact.MainView , Lif registerReceiver(mTimeChangedReceiver, filter); } - private TimeChangedReceiver mTimeChangedReceiver; - - @Override - public void getTimeManageSnFinish() { - mPresenter.getTimeManageApp(); - } - - @Override - public void getTimeManageAppFinish() { - - } - private class TimeChangedReceiver extends BroadcastReceiver { @Override @@ -130,14 +133,47 @@ public class MainService extends Service implements MainSContact.MainView , Lif } } + public static final String REFRESH_ACTION = "uiui.find.os.action.refresh"; + private RefreshReceiver mRefreshReceiver; + + private void registerRefreshReceiver() { + if (null == mRefreshReceiver) { + mRefreshReceiver = new RefreshReceiver(); + } + IntentFilter filter = new IntentFilter(); + filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY); + filter.addAction(REFRESH_ACTION); + registerReceiver(mRefreshReceiver, filter); + } + + class RefreshReceiver extends BroadcastReceiver { + @Override + public void onReceive(Context context, Intent intent) { + String action = intent.getAction(); + Log.e("RefreshReceiver", "onReceive: " + action); + if (REFRESH_ACTION.equals(action)) { + mPresenter.getTimeManageSn(); + } + } + } + + @Override + public void getTimeManageSnFinish() { + mPresenter.getTimeManageApp(); + } + + @Override + public void getTimeManageAppFinish() { + + } + + @Override public void onDestroy() { super.onDestroy(); lifecycleSubject.onNext(ActivityEvent.DESTROY); mPresenter.detachView(); - if (mTimeChangedReceiver != null) { - unregisterReceiver(mTimeChangedReceiver); - } + unregisterReceivers(); } @Download.onTaskRunning