version:1.8

fix:应用使用记录
add:

src/com/aoleyun/os/touch/ItemClickHandler.java

@@ -31,7 +31,6 @@ import android.os.Build;
 import android.os.Process;
 import android.provider.Settings;
 import android.text.TextUtils;
-import android.text.format.DateUtils;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
@@ -55,7 +54,6 @@ import com.aoleyun.os.PromiseAppInfo;
 import com.aoleyun.os.R;
 import com.aoleyun.os.Statistics.AppInformation;
 import com.aoleyun.os.Statistics.StatisticsInfo;
-import com.aoleyun.os.TTUtils.APKUtils;
 import com.aoleyun.os.TTUtils.Utils;
 import com.aoleyun.os.WorkspaceItemInfo;
 import com.aoleyun.os.compat.AppWidgetManagerCompat;
@@ -63,9 +61,11 @@ import com.aoleyun.os.folder.Folder;
 import com.aoleyun.os.folder.FolderIcon;
 import com.aoleyun.os.network.AppPasswdBean;
 import com.aoleyun.os.network.BaseResponse;
-import com.aoleyun.os.network.NetWorkManager;
+import com.aoleyun.os.network.HTTPInterface;
+import com.aoleyun.os.network.NetworkManager;
 import com.aoleyun.os.network.api.AddAppLog;
 import com.aoleyun.os.testing.TestProtocol;
+import com.aoleyun.os.uiuiutils.TimeUtils;
 import com.aoleyun.os.util.PackageManagerHelper;
 import com.aoleyun.os.views.FloatingIconView;
 import com.aoleyun.os.widget.PendingAppWidgetHostView;
@@ -74,10 +74,7 @@ import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.tencent.mmkv.MMKV;
 
-import org.json.JSONArray;
-
 import java.lang.reflect.Type;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 
@@ -126,6 +123,7 @@ public class ItemClickHandler {
 
         Object tag = v.getTag();
         if (tag instanceof WorkspaceItemInfo) {
+            //获取本地密码
             String ApplicationLock = MMKV.defaultMMKV().decodeString("ApplicationLock");
             Log.e("onClick", "onClick: " + ApplicationLock);
             Type type = new TypeToken<List<AppPasswdBean>>() {
@@ -152,7 +150,7 @@ public class ItemClickHandler {
                             if (hashMap.get(packageName).equals(dialog.messageTv.getText().toString())) {
                                 onClickAppShortcut(v, (WorkspaceItemInfo) tag, launcher, sourceContainer);
                                 dialog.dismiss();
-                            }else {
+                            } else {
                                 ToastUtil.showCenter("密码错误");
                             }
                         }
@@ -176,29 +174,29 @@ public class ItemClickHandler {
 //                return;
 //            }
 //            onClickAppShortcut(v, (WorkspaceItemInfo) tag, launcher, sourceContainer);
-//            AppInformation app = null;
-//            try {
-//                app = getInfoFromPackageName(packageName);
-//            } catch (Exception e) {
-//                Log.e("onClick", e.getMessage());
-//            }
+            AppInformation app = null;
+            try {
+                app = getInfoFromPackageName(packageName);
+            } catch (Exception e) {
+                Log.e("onClick", e.getMessage());
+            }
 //            if (app != null) {
 //                Log.e("fht", "运行时间: " + DateUtils.formatElapsedTime(app.getUsedTimebyDay() / 1000));
 //                Log.e("fht", "运行时间: " + app.getUsedTimebyDay() / 1000);
-//                MyApplication.getInstance().setTime(app.getUsedTimebyDay() / 1000);
+//                TimeUtils.getInstance().setTime(app.getUsedTimebyDay() / 1000);
 //
 //            } else {
 //                Log.e("fht", "首次运行:" + "包名:" + packageName);
-//                MyApplication.getInstance().setTime(0);
-//
+//                TimeUtils.getInstance().setTime(0);
 //            }
 //            if (!APKUtils.isSystemApp(v.getContext(), packageName) && !Arrays.asList(packages).contains(packageName)) {
-////                HTTPInterface.sendTimeLog(handler, userInfo, ((ShortcutInfo) tag).title.toString(), 1, 0);
-//                SendOpenApp(packageName);
+//                HTTPInterface.sendTimeLog(handler, userInfo, ((ShortcutInfo) tag).title.toString(), 1, 0);
+//            SendOpenApp(packageName);
 //            }
-//            //写入正在运行的app的包名和时间
-//            MyApplication.getInstance().setAppPackageName(packageName);
-//            MyApplication.getInstance().setOnClickTime(System.currentTimeMillis());
+            //写入正在运行的app的包名和时间
+            TimeUtils.getInstance().setAppPackageName(packageName);
+            TimeUtils.getInstance().setStartTime(System.currentTimeMillis());
+            HTTPInterface.SendRunningApp(MyApplication.getInstance().getApplicationContext());
         } else if (tag instanceof FolderInfo) {
             if (v instanceof FolderIcon) {
                 onClickFolderIcon(v);
@@ -269,7 +267,7 @@ public class ItemClickHandler {
             } else {
                 appVersionCode = appInfo.versionCode;
             }
-            AddAppLog appLog = NetWorkManager.getInstance().getapplogControl();
+            AddAppLog appLog = NetworkManager.getInstance().getapplogControl();
             String sn = Utils.getSerial();
             appLog.addLog(sn, packageName, appVersionCode, System.currentTimeMillis() / 1000, 1)
                     .subscribeOn(Schedulers.io())
@@ -277,7 +275,7 @@ public class ItemClickHandler {
                     .subscribe(new Observer<BaseResponse>() {
                         @Override
                         public void onSubscribe(Disposable d) {
-
+                            Log.e("SendOpenApp", "onSubscribe: ");
                         }
 
                         @Override
@@ -297,7 +295,7 @@ public class ItemClickHandler {
 
                         @Override
                         public void onComplete() {
-
+                            Log.e("SendOpenApp", "onComplete: ");
                         }
                     });
         }