From 19fb7d24510a4a95d908971d066d4822dcf25735 Mon Sep 17 00:00:00 2001
From: Fanhuitong <981964879@qq.com>
Date: Fri, 13 Jan 2023 22:08:18 +0800
Subject: [PATCH] =?UTF-8?q?version:zhanrui=206.3.2=EF=BC=8CMTK=202.3.2=20f?=
 =?UTF-8?q?ix:=20update:=E4=BC=98=E5=8C=96=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                                  |  8 +++----
 src/com/aoleyun/os/Launcher.java              | 22 +++++++++++++++++
 src/com/aoleyun/os/base/BaseApplication.java  | 24 -------------------
 .../os/network/NetInterfaceManager.java       |  6 ++---
 4 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/build.gradle b/build.gradle
index 11b1c05..49a64b9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -67,11 +67,11 @@ android {
         targetSdkVersion 28
 
 //       //MTK
-        versionCode 41
-        versionName "2.3.1"
+        versionCode 42
+        versionName "2.3.2"
 //        //cube
-//        versionCode 71
-//        versionName "6.3.1"
+//        versionCode 72
+//        versionName "6.3.2"
 
         ndk {
             //选择要添加的对应 cpu 类型的 .so 库。
diff --git a/src/com/aoleyun/os/Launcher.java b/src/com/aoleyun/os/Launcher.java
index 0274aab..41e8ab4 100644
--- a/src/com/aoleyun/os/Launcher.java
+++ b/src/com/aoleyun/os/Launcher.java
@@ -155,6 +155,9 @@ import com.aoleyun.os.widget.custom.CustomWidgetParser;
 import com.arialyy.aria.core.Aria;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
+import com.tencent.android.tpush.XGIOperateCallback;
+import com.tencent.android.tpush.XGPushConfig;
+import com.tencent.android.tpush.XGPushManager;
 import com.tencent.mmkv.MMKV;
 
 import java.io.File;
@@ -482,6 +485,25 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
 //        JPushInterface.getAlias(this, new Random().nextInt(100));
         JGYUtils.getInstance().wakeUpAppstore();
         JGYUtils.getInstance().wakeUpDeviceInfo();
+        XGPushConfig.enableDebug(this, true);
+        XGPushManager.registerPush(this, new XGIOperateCallback() {
+            @Override
+            public void onSuccess(Object data, int flag) {
+                //token在设备卸载重装的时候有可能会变
+                Log.e("TPush", "注册成功，设备token为：" + data);
+                NetInterfaceManager.getInstance().setPushTag(true, new NetInterfaceManager.onCompleteCallback() {
+                    @Override
+                    public void onComplete() {
+
+                    }
+                });
+            }
+
+            @Override
+            public void onFail(Object data, int errCode, String msg) {
+                Log.e("TPush", "注册失败，错误码：" + errCode + ",错误信息：" + msg);
+            }
+        });
     }
 
 
diff --git a/src/com/aoleyun/os/base/BaseApplication.java b/src/com/aoleyun/os/base/BaseApplication.java
index 7b185d2..5e86a4f 100644
--- a/src/com/aoleyun/os/base/BaseApplication.java
+++ b/src/com/aoleyun/os/base/BaseApplication.java
@@ -67,31 +67,7 @@ public class BaseApplication extends Application {
     }
 
     private void initPush() {
-//        JPushInterface.setDebugMode(BuildConfig.DEBUG);    // 设置开启日志,发布时请关闭日志
-//        JPushInterface.init(this);
-        XGPushConfig.enableDebug(this, true);
-        XGPushManager.registerPush(this, new XGIOperateCallback() {
-            @Override
-            public void onSuccess(Object data, int flag) {
-                //token在设备卸载重装的时候有可能会变
-                Log.e("TPush", "注册成功，设备token为：" + data);
-            }
 
-            @Override
-            public void onFail(Object data, int errCode, String msg) {
-                Log.e("TPush", "注册失败，错误码：" + errCode + ",错误信息：" + msg);
-            }
-        });
-        NetInterfaceManager.getInstance().setPushTag(true, new NetInterfaceManager.onCompleteCallback() {
-            @Override
-            public void onComplete() {
-
-            }
-        });
-//        initAliasObservable();
-//        initTagObservable();
-//        setJpushAlias();
-//        setJpushTags();
     }
 
     private void initAliasObservable() {
diff --git a/src/com/aoleyun/os/network/NetInterfaceManager.java b/src/com/aoleyun/os/network/NetInterfaceManager.java
index f38b7d9..65da00b 100644
--- a/src/com/aoleyun/os/network/NetInterfaceManager.java
+++ b/src/com/aoleyun/os/network/NetInterfaceManager.java
@@ -108,7 +108,6 @@ public class NetInterfaceManager {
     }
 
 
-
     public Observable<BaseResponse> getRunningAppObservable(String json) {
         return mRetrofit.create(RunningApp.class)
                 .sendRunningInfo(Utils.getSerial(), json)
@@ -170,7 +169,7 @@ public class NetInterfaceManager {
             if (jsonString == null) {
                 setPushTag(callback);
             } else {
-                Set tagSets = mMMKV.decodeStringSet(UrlAddress.GET_DEVICES_TAGS);
+                Set tagSets = mMMKV.decodeStringSet(UrlAddress.GET_DEVICES_TAGS + "pushset");
                 Log.e("setPushTags", "tagSets: " + tagSets);
                 clearAndAppendTags(tagSets);
                 callback.onComplete();
@@ -178,7 +177,6 @@ public class NetInterfaceManager {
         }
     }
 
-
     public void setPushTag(onCompleteCallback callback) {
         Set set = new HashSet();
         JGYUtils.getInstance().getAppPlatform(new JGYUtils.GetAppPlatformCallback() {
@@ -223,7 +221,7 @@ public class NetInterfaceManager {
                     @Override
                     public void onComplete() {
                         Log.e("setPushTag", "onComplete: ");
-                        mMMKV.encode(UrlAddress.GET_DEVICES_TAGS, set);
+                        mMMKV.encode(UrlAddress.GET_DEVICES_TAGS + "pushset", set);
                         clearAndAppendTags(set);
                         callback.onComplete();
                     }