From b1645f0fae7c64f25aafc65e3f267bcf0832f38d Mon Sep 17 00:00:00 2001
From: tongtongstudio <tongtongstudio@outlook.com>
Date: Fri, 4 Nov 2022 09:33:43 +0800
Subject: [PATCH] =?UTF-8?q?version:beta=20fix:=20update:=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |   4 +-
 .../sn/network/NetInterfaceManager.java       | 175 +++++++++++++-----
 .../com/fuying/sn/service/ManagerService.java |  56 +++---
 .../fuying/sn/service/main/MainService.java   |   3 +-
 .../res/layout-land/activity_screen_lock.xml  |  50 ++---
 .../res/layout-port/activity_screen_lock.xml  |  50 ++---
 6 files changed, 212 insertions(+), 126 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5964f71..274aa85 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -73,8 +73,8 @@ android {
 
         official {
             flavorDimensions "default"
-            versionCode 5
-            versionName "1.4"
+            versionCode 6
+            versionName "1.5"
         }
     }
 
diff --git a/app/src/main/java/com/fuying/sn/network/NetInterfaceManager.java b/app/src/main/java/com/fuying/sn/network/NetInterfaceManager.java
index 87da628..2ed2f71 100644
--- a/app/src/main/java/com/fuying/sn/network/NetInterfaceManager.java
+++ b/app/src/main/java/com/fuying/sn/network/NetInterfaceManager.java
@@ -608,7 +608,7 @@ public class NetInterfaceManager {
     public void getSnInfo(boolean refresh, BehaviorSubject<ActivityEvent> lifecycle, ObserverCallback callback) {
         ConnectMode connectMode = ConnectMode.SIX_HOUR;
         if (refresh) {
-            connectMode = ConnectMode.ONE_MINUTE;
+            connectMode = ConnectMode.ONE_HOUR;
         }
         if (ConnectManager.getInstance().isNeedConnect(UrlAddress.SNINFO, connectMode)) {
             getSnInfo(lifecycle, callback);
@@ -1360,36 +1360,76 @@ public class NetInterfaceManager {
                 });
     }
 
+    public void getBrowserWhiteList(boolean refresh, BehaviorSubject<ActivityEvent> lifecycle, CompleteCallback callback) {
+        ConnectMode connectMode = ConnectMode.SIX_HOUR;
+        if (refresh) {
+            connectMode = ConnectMode.ONE_HOUR;
+        }
+        if (ConnectManager.getInstance().isNeedConnect(UrlAddress.SET_BROWSER_URL, connectMode)) {
+            getBrowserWhiteList(lifecycle, callback);
+        } else {
+            String jsonString = mCacheHelper.getAsString(UrlAddress.SET_BROWSER_URL);
+            //为 "" 是已经请求成功的
+            if (jsonString == null) {
+                getBrowserWhiteList(lifecycle, callback);
+            } else {
+                Gson gson = new Gson();
+                Type type = new TypeToken<String>() {
+                }.getType();
+                callback.onComplete();
+            }
+        }
+    }
+
+    public void getBrowserWhiteList(BehaviorSubject<ActivityEvent> lifecycle, CompleteCallback callback) {
+        getBrowserControl()
+                .compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY))
+                .subscribe(getBrowserWhiteListObserver(callback));
+    }
+
+    public void getBrowserWhiteList(CompleteCallback callback) {
+        getBrowserControl()
+                .subscribe(getBrowserWhiteListObserver(callback));
+    }
+
     /**
      * 获取浏览器黑白名单
      */
     public void getBrowserWhiteList() {
         getBrowserControl()
-                .subscribe(new Observer<BaseResponse<BrowserApiData>>() {
-                    @Override
-                    public void onSubscribe(@NonNull Disposable d) {
-                        Log.e("getBrowserWhiteList", "onSubscribe: ");
-                    }
-
-                    @Override
-                    public void onNext(@NonNull BaseResponse<BrowserApiData> response) {
-                        setBrowserResponse(response);
-                    }
-
-                    @Override
-                    public void onError(@NonNull Throwable e) {
-                        Log.e("getBrowserWhiteList", "onError: " + e.getMessage());
-                        onComplete();
-                    }
-
-                    @Override
-                    public void onComplete() {
-                        Log.e("getBrowserWhiteList", "onComplete: ");
-                        new URLUtils(mContext).setBrowserList();
-                    }
-                });
+                .subscribe(getBrowserWhiteListObserver(null));
     }
 
+    public Observer<BaseResponse<BrowserApiData>> getBrowserWhiteListObserver(CompleteCallback callback) {
+        return new Observer<BaseResponse<BrowserApiData>>() {
+            @Override
+            public void onSubscribe(@NonNull Disposable d) {
+                Log.e("getBrowserWhiteList", "onSubscribe: ");
+            }
+
+            @Override
+            public void onNext(@NonNull BaseResponse<BrowserApiData> response) {
+                setBrowserResponse(response);
+            }
+
+            @Override
+            public void onError(@NonNull Throwable e) {
+                Log.e("getBrowserWhiteList", "onError: " + e.getMessage());
+                onComplete();
+            }
+
+            @Override
+            public void onComplete() {
+                Log.e("getBrowserWhiteList", "onComplete: ");
+                if (callback != null) {
+                    callback.onComplete();
+                }
+                new URLUtils(mContext).setBrowserList();
+            }
+        };
+    }
+
+
     private void setBrowserResponse(BaseResponse<BrowserApiData> response) {
         if (response.code == 200) {
             //白名单
@@ -1416,31 +1456,73 @@ public class NetInterfaceManager {
         }
     }
 
+
+    public void getBrowserLabel(boolean refresh, BehaviorSubject<ActivityEvent> lifecycle, CompleteCallback callback) {
+        ConnectMode connectMode = ConnectMode.SIX_HOUR;
+        if (refresh) {
+            connectMode = ConnectMode.ONE_HOUR;
+        }
+        if (ConnectManager.getInstance().isNeedConnect(UrlAddress.SET_BROWSER_LABEL, connectMode)) {
+            getBrowserLabel(lifecycle, callback);
+        } else {
+            String jsonString = mCacheHelper.getAsString(UrlAddress.SET_BROWSER_LABEL);
+            //为 "" 是已经请求成功的
+            if (jsonString == null) {
+                getBrowserLabel(lifecycle, callback);
+            } else {
+                Gson gson = new Gson();
+                Type type = new TypeToken<String>() {
+                }.getType();
+                callback.onComplete();
+            }
+        }
+    }
+
+    public void getBrowserLabel(BehaviorSubject<ActivityEvent> lifecycle, CompleteCallback callback) {
+        getLabelControl()
+                .compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY))
+                .subscribe(getBrowserLabelObserver(callback));
+    }
+
+    public void getBrowserLabel(CompleteCallback callback) {
+        getLabelControl()
+                .subscribe(getBrowserLabelObserver(callback));
+    }
+
+
     public void getBrowserLabel() {
         getLabelControl()
-                .subscribe(new Observer<BaseResponse<Label>>() {
-                    @Override
-                    public void onSubscribe(@NonNull Disposable d) {
-                        Log.e("getBrowserLabel", "onSubscribe: ");
-                    }
+                .subscribe(getBrowserLabelObserver(null));
 
-                    @Override
-                    public void onNext(@NonNull BaseResponse<Label> response) {
-                        setLabelResponse(response);
-                    }
+    }
 
-                    @Override
-                    public void onError(@NonNull Throwable e) {
-                        Log.e("getBrowserLabel", "onError: " + e.getMessage());
-                        onComplete();
-                    }
+    public Observer<BaseResponse<Label>> getBrowserLabelObserver(CompleteCallback callback) {
+        return new Observer<BaseResponse<Label>>() {
+            @Override
+            public void onSubscribe(@NonNull Disposable d) {
+                Log.e("getBrowserLabel", "onSubscribe: ");
+            }
 
-                    @Override
-                    public void onComplete() {
-                        Log.e("getBrowserLabel", "onComplete: ");
-                        new URLUtils(mContext).setBrowserList();
-                    }
-                });
+            @Override
+            public void onNext(@NonNull BaseResponse<Label> response) {
+                setLabelResponse(response);
+            }
+
+            @Override
+            public void onError(@NonNull Throwable e) {
+                Log.e("getBrowserLabel", "onError: " + e.getMessage());
+                onComplete();
+            }
+
+            @Override
+            public void onComplete() {
+                Log.e("getBrowserLabel", "onComplete: ");
+                if (callback != null) {
+                    callback.onComplete();
+                }
+                new URLUtils(mContext).setBrowserList();
+            }
+        };
     }
 
     private void setLabelResponse(BaseResponse<Label> response) {
@@ -2142,8 +2224,11 @@ public class NetInterfaceManager {
 
     public void sendRunningApp() {
         String packageName = AppUsedTimeUtils.getInstance().getApp_package();
-        if (TextUtils.isEmpty(packageName))
+        Log.e(TAG, "sendRunningApp: packageName = " + packageName);
+        if (TextUtils.isEmpty(packageName)) {
+            Log.e(TAG, "sendRunningApp: packageName is empty");
             return;
+        }
         long time = AppUsedTimeUtils.getInstance().getStart_time();
         JsonObject jsonObject = new JsonObject();
         jsonObject.addProperty("app_package", packageName);
diff --git a/app/src/main/java/com/fuying/sn/service/ManagerService.java b/app/src/main/java/com/fuying/sn/service/ManagerService.java
index 871cf2f..aa2e3ac 100644
--- a/app/src/main/java/com/fuying/sn/service/ManagerService.java
+++ b/app/src/main/java/com/fuying/sn/service/ManagerService.java
@@ -226,38 +226,38 @@ public class ManagerService extends Service implements NetworkUtils.OnNetworkSta
                 topView = LayoutInflater.from(getApplicationContext()).inflate(R.layout.activity_screen_lock, null);
                 TextView textView = topView.findViewById(R.id.textView);
                 textView.setText(name);
-                EditText et_password = topView.findViewById(R.id.et_password);
-                TextView tv_confirm = topView.findViewById(R.id.tv_confirm);
-                tv_confirm.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        String password = (String) SPUtils.get(ManagerService.this, UrlAddress.LOCK_SCREEN_PWD, "");
-                        String pwd = et_password.getText().toString();
-                        if (!TextUtils.isEmpty(pwd) && !TextUtils.isEmpty(password) && password.equals(pwd)) {
-                            hideFloatingWindow();
-                        }else {
-                            ToastUtil.show("密码错误");
-                        }
-                    }
-                });
+//                EditText et_password = topView.findViewById(R.id.et_password);
+//                TextView tv_confirm = topView.findViewById(R.id.tv_confirm);
+//                tv_confirm.setOnClickListener(new View.OnClickListener() {
+//                    @Override
+//                    public void onClick(View view) {
+//                        String password = (String) SPUtils.get(ManagerService.this, UrlAddress.LOCK_SCREEN_PWD, "");
+//                        String pwd = et_password.getText().toString();
+//                        if (!TextUtils.isEmpty(pwd) && !TextUtils.isEmpty(password) && password.equals(pwd)) {
+//                            hideFloatingWindow();
+//                        }else {
+//                            ToastUtil.show("密码错误");
+//                        }
+//                    }
+//                });
             } else {
                 if ("added".equals(topView.getTag())) {
                     TextView textView = topView.findViewById(R.id.textView);
                     textView.setText(name);
-                    EditText et_password = topView.findViewById(R.id.et_password);
-                    TextView tv_confirm = topView.findViewById(R.id.tv_confirm);
-                    tv_confirm.setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View view) {
-                            String password = (String) SPUtils.get(ManagerService.this, UrlAddress.LOCK_SCREEN_PWD, "");
-                            String pwd = et_password.getText().toString();
-                            if (!TextUtils.isEmpty(pwd) && !TextUtils.isEmpty(password) && password.equals(pwd)) {
-                                hideFloatingWindow();
-                            }else {
-                                ToastUtil.show("密码错误");
-                            }
-                        }
-                    });
+//                    EditText et_password = topView.findViewById(R.id.et_password);
+//                    TextView tv_confirm = topView.findViewById(R.id.tv_confirm);
+//                    tv_confirm.setOnClickListener(new View.OnClickListener() {
+//                        @Override
+//                        public void onClick(View view) {
+//                            String password = (String) SPUtils.get(ManagerService.this, UrlAddress.LOCK_SCREEN_PWD, "");
+//                            String pwd = et_password.getText().toString();
+//                            if (!TextUtils.isEmpty(pwd) && !TextUtils.isEmpty(password) && password.equals(pwd)) {
+//                                hideFloatingWindow();
+//                            }else {
+//                                ToastUtil.show("密码错误");
+//                            }
+//                        }
+//                    });
                 } else {
                     return;
                 }
diff --git a/app/src/main/java/com/fuying/sn/service/main/MainService.java b/app/src/main/java/com/fuying/sn/service/main/MainService.java
index 69b67e2..da8b8c5 100644
--- a/app/src/main/java/com/fuying/sn/service/main/MainService.java
+++ b/app/src/main/java/com/fuying/sn/service/main/MainService.java
@@ -394,7 +394,8 @@ public class MainService extends Service implements MainSContact.MainView, Netwo
             }
             switch (action) {
                 case Intent.ACTION_USER_PRESENT:
-                    mPresenter.getAppTimeControl();
+                    // TODO: 2022/11/3  暂时屏蔽获取
+//                    mPresenter.getAppTimeControl();
                     break;
                 case Intent.ACTION_SCREEN_ON:
 
diff --git a/app/src/main/res/layout-land/activity_screen_lock.xml b/app/src/main/res/layout-land/activity_screen_lock.xml
index ff636f9..424c99a 100644
--- a/app/src/main/res/layout-land/activity_screen_lock.xml
+++ b/app/src/main/res/layout-land/activity_screen_lock.xml
@@ -17,30 +17,30 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <EditText
-        android:id="@+id/et_password"
-        android:layout_width="@dimen/dp_200"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_16"
-        android:background="@drawable/edit_background"
-        android:gravity="center"
-        android:hint="请输入密码解锁"
-        android:maxEms="20"
-        android:maxLines="1"
-        android:singleLine="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView" />
+<!--    <EditText-->
+<!--        android:id="@+id/et_password"-->
+<!--        android:layout_width="@dimen/dp_200"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:layout_marginTop="@dimen/dp_16"-->
+<!--        android:background="@drawable/edit_background"-->
+<!--        android:gravity="center"-->
+<!--        android:hint="请输入密码解锁"-->
+<!--        android:maxEms="20"-->
+<!--        android:maxLines="1"-->
+<!--        android:singleLine="true"-->
+<!--        app:layout_constraintEnd_toEndOf="parent"-->
+<!--        app:layout_constraintStart_toStartOf="parent"-->
+<!--        app:layout_constraintTop_toBottomOf="@+id/textView" />-->
 
-    <TextView
-        android:id="@+id/tv_confirm"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_16"
-        android:text="确定"
-        android:textColor="@color/white"
-        android:textSize="24sp"
-        app:layout_constraintEnd_toEndOf="@+id/et_password"
-        app:layout_constraintStart_toStartOf="@+id/et_password"
-        app:layout_constraintTop_toBottomOf="@+id/et_password" />
+<!--    <TextView-->
+<!--        android:id="@+id/tv_confirm"-->
+<!--        android:layout_width="wrap_content"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:layout_marginTop="@dimen/dp_16"-->
+<!--        android:text="确定"-->
+<!--        android:textColor="@color/white"-->
+<!--        android:textSize="24sp"-->
+<!--        app:layout_constraintEnd_toEndOf="@+id/et_password"-->
+<!--        app:layout_constraintStart_toStartOf="@+id/et_password"-->
+<!--        app:layout_constraintTop_toBottomOf="@+id/et_password" />-->
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-port/activity_screen_lock.xml b/app/src/main/res/layout-port/activity_screen_lock.xml
index ff636f9..424c99a 100644
--- a/app/src/main/res/layout-port/activity_screen_lock.xml
+++ b/app/src/main/res/layout-port/activity_screen_lock.xml
@@ -17,30 +17,30 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <EditText
-        android:id="@+id/et_password"
-        android:layout_width="@dimen/dp_200"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_16"
-        android:background="@drawable/edit_background"
-        android:gravity="center"
-        android:hint="请输入密码解锁"
-        android:maxEms="20"
-        android:maxLines="1"
-        android:singleLine="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView" />
+<!--    <EditText-->
+<!--        android:id="@+id/et_password"-->
+<!--        android:layout_width="@dimen/dp_200"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:layout_marginTop="@dimen/dp_16"-->
+<!--        android:background="@drawable/edit_background"-->
+<!--        android:gravity="center"-->
+<!--        android:hint="请输入密码解锁"-->
+<!--        android:maxEms="20"-->
+<!--        android:maxLines="1"-->
+<!--        android:singleLine="true"-->
+<!--        app:layout_constraintEnd_toEndOf="parent"-->
+<!--        app:layout_constraintStart_toStartOf="parent"-->
+<!--        app:layout_constraintTop_toBottomOf="@+id/textView" />-->
 
-    <TextView
-        android:id="@+id/tv_confirm"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_16"
-        android:text="确定"
-        android:textColor="@color/white"
-        android:textSize="24sp"
-        app:layout_constraintEnd_toEndOf="@+id/et_password"
-        app:layout_constraintStart_toStartOf="@+id/et_password"
-        app:layout_constraintTop_toBottomOf="@+id/et_password" />
+<!--    <TextView-->
+<!--        android:id="@+id/tv_confirm"-->
+<!--        android:layout_width="wrap_content"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:layout_marginTop="@dimen/dp_16"-->
+<!--        android:text="确定"-->
+<!--        android:textColor="@color/white"-->
+<!--        android:textSize="24sp"-->
+<!--        app:layout_constraintEnd_toEndOf="@+id/et_password"-->
+<!--        app:layout_constraintStart_toStartOf="@+id/et_password"-->
+<!--        app:layout_constraintTop_toBottomOf="@+id/et_password" />-->
 </androidx.constraintlayout.widget.ConstraintLayout>