version:1.8.6

fix:
update:修复应用使用记录

app/build.gradle

@@ -16,8 +16,8 @@ android {
         minSdkVersion 24
         targetSdkVersion 29
 
-        versionCode 76
+        versionCode 78
-        versionName "1.8.4"
+        versionName "1.8.6"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true

app/src/main/java/com/uiui/zyos/activity/main/MainAPresenter.java

@@ -11,6 +11,7 @@ import com.uiui.zyos.BuildConfig;
 import com.uiui.zyos.bean.BaseResponse;
 import com.uiui.zyos.manager.RemoteManager;
 import com.uiui.zyos.network.NetInterfaceManager;
+import com.uiui.zyos.utils.ActivationUtil;
 import com.uiui.zyos.utils.ApkUtils;
 import com.uiui.zyos.utils.AppUsedTimeUtils;
 
@@ -53,6 +54,10 @@ public class MainAPresenter implements MainContact.Presenter {
 
     @Override
     public void sendAPPUsage() {
+        boolean activation = ActivationUtil.isActivation(mContext);
+        if (!activation) {
+            return;
+        }
         AppUsedTimeUtils.getInstance().setEndTime(System.currentTimeMillis());
         String packagename = AppUsedTimeUtils.getInstance().getAppPackageName();
         Log.e(TAG, "onRestart  packagename == " + packagename);
@@ -100,6 +105,10 @@ public class MainAPresenter implements MainContact.Presenter {
 
     @Override
     public void sendRunningInfo() {
+        boolean activation = ActivationUtil.isActivation(mContext);
+        if (!activation) {
+            return;
+        }
         AppUsedTimeUtils.getInstance().setAppPackageName(BuildConfig.APPLICATION_ID);
         AppUsedTimeUtils.getInstance().setStartTime(System.currentTimeMillis());
         long time = AppUsedTimeUtils.getInstance().getStartTime();

app/src/main/java/com/uiui/zyos/activity/main/MainActivity.java

@@ -435,8 +435,8 @@ public class MainActivity extends BaseMvpActivity implements MainContact.MainVie
     protected void onRestart() {
         super.onRestart();
         Log.e(TAG, "onRestart: ");
-//        mPresenter.sendAPPUsage();
+        mPresenter.sendAPPUsage();
-//        mPresenter.sendRunningInfo();
+        mPresenter.sendRunningInfo();
     }
 
     @Override

app/src/main/java/com/uiui/zyos/bean/DesktopIcon.java

@@ -135,6 +135,6 @@ public class DesktopIcon implements Serializable, Parcelable {
     @NonNull
     @Override
     public String toString() {
-        return packageName + className;
+        return packageName + "/" + className;
     }
 }

app/src/main/java/com/uiui/zyos/fragment/user/UserPresenter.java

@@ -22,6 +22,7 @@ import com.uiui.zyos.manager.AppManager;
 import com.uiui.zyos.manager.RemoteManager;
 import com.uiui.zyos.network.NetInterfaceManager;
 import com.uiui.zyos.network.UrlAddress;
+import com.uiui.zyos.utils.ActivationUtil;
 import com.uiui.zyos.utils.CXAESUtil;
 import com.uiui.zyos.utils.Utils;
 
@@ -101,6 +102,10 @@ public class UserPresenter implements UserContact.Presenter {
 
     @Override
     public void getStudyStat() {
+        boolean activation = ActivationUtil.isActivation(mContext);
+        if (!activation) {
+            return;
+        }
         NetInterfaceManager.getInstance().getStudyStatObservable()
                 .compose(RxLifecycle.bindUntilEvent(lifecycle, FragmentEvent.DESTROY))
                 .subscribe(new Observer<BaseResponse<StudyStatBean>>() {

app/src/main/java/com/uiui/zyos/utils/ApkUtils.java

@@ -76,7 +76,7 @@ public class ApkUtils {
         this.add("com.teclast.zyappstore");
         this.add("com.teclast.zybrowser");
 
-        this.add("com.lft.turn");
+//        this.add("com.lft.turn");
         this.add("com.huawei.wallet");
         this.add("com.huawei.music");
         this.add("com.huawei.educenter");

app/src/main/java/com/uiui/zyos/utils/AppUsedTimeUtils.java

@@ -179,6 +179,10 @@ public class AppUsedTimeUtils {
     }
 
     public void sendRunningApp(RunningAppCallback runningAppCallback) {
+        boolean activation = ActivationUtil.isActivation(mContext);
+        if (!activation) {
+            return;
+        }
         String packageName = getAppPackageName();
         long time = getStartTime();
         JsonObject jsonObject = new JsonObject();

app/src/main/java/com/uiui/zyos/utils/OpenApkUtils.java

@@ -215,10 +215,14 @@ public class OpenApkUtils {
     }};
 
     private void sendRuningApp(String packageName) {
-//        AppUsedTimeUtils.getInstance().setAppPackageName(packageName);
+        boolean activation = ActivationUtil.isActivation(mContext);
-//        AppUsedTimeUtils.getInstance().setStartTime(System.currentTimeMillis());
+        if (!activation) {
-//        AppUsedTimeUtils.getInstance().sendRunningApp(() -> {
+            return;
-//        });
+        }
+        AppUsedTimeUtils.getInstance().setAppPackageName(packageName);
+        AppUsedTimeUtils.getInstance().setStartTime(System.currentTimeMillis());
+        AppUsedTimeUtils.getInstance().sendRunningApp(() -> {
+        });
     }
 
     public void openApp(String packageName) {
@@ -240,7 +244,11 @@ public class OpenApkUtils {
             return;
         }
         if (isCloudLessonMod(packageName)) {
-            ApkUtils.openPackage(mContext, packageName, className);
+            if ("cn.wps.note".equals(packageName)) {
+                ApkUtils.openPackage(mContext, packageName);
+            } else {
+                ApkUtils.openPackage(mContext, packageName, className);
+            }
             sendRuningApp(packageName);
         } else {
             Toaster.show("专注模式只允许使用指定应用");