version:2.1

fix:完善推送
update:

app/src/main/java/com/aoleyun/sn/base/BaseApplication.java

@@ -16,7 +16,6 @@ import com.aoleyun.sn.utils.WiFiUtils;
 import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.download.DownloadEntity;
 import com.aoleyun.sn.BuildConfig;
-import com.aoleyun.sn.jpush.TagAliasOperatorHelper;
 import com.aoleyun.sn.manager.AmapManager;
 import com.aoleyun.sn.manager.FileManager;
 import com.aoleyun.sn.network.NetInterfaceManager;
@@ -30,6 +29,9 @@ import com.aoleyun.sn.utils.SystemUtils;
 import com.aoleyun.sn.utils.ToastUtil;
 import com.aoleyun.sn.utils.Utils;
 import com.aoleyun.sn.utils.XAPKUtils;
+import com.tencent.android.tpush.XGIOperateCallback;
+import com.tencent.android.tpush.XGPushConfig;
+import com.tencent.android.tpush.XGPushManager;
 import com.tencent.mmkv.MMKV;
 
 import org.jetbrains.annotations.NotNull;
@@ -39,8 +41,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import cn.jpush.android.api.JPushInterface;
-import cn.jpush.android.api.JPushMessage;
 import io.reactivex.Observable;
 import io.reactivex.ObservableEmitter;
 import io.reactivex.ObservableOnSubscribe;
@@ -87,6 +87,8 @@ public class BaseApplication extends MultiDexApplication {
     private void init() {
         String rootDir = MMKV.initialize(this);
         Log.e(TAG, "mmkv root: " + rootDir);
+
+        tPushInit();
         ToastUtil.init(this);
         NetInterfaceManager.init(this);
         JGYUtils.init(this);
@@ -99,8 +101,8 @@ public class BaseApplication extends MultiDexApplication {
         JGYUtils.getInstance().hookWebView();
 
         // 设置开启日志,发布时请关闭日志
-        JPushInterface.setDebugMode(true);
-        JPushInterface.requestPermission(this);
+//        JPushInterface.setDebugMode(true);
+//        JPushInterface.requestPermission(this);
         //解锁设备不需要初始化
         // 初始化 JPush
         //JPushInterface.init(this);
@@ -150,6 +152,37 @@ public class BaseApplication extends MultiDexApplication {
         });
     }
 
+    private void tPushInit() {
+        XGPushConfig.enableDebug(this, true);
+        XGPushManager.registerPush(this, new XGIOperateCallback() {
+            @Override
+            public void onSuccess(Object data, int flag) {
+                //token在设备卸载重装的时候有可能会变
+                Log.e("TPush", "注册成功，设备token为：" + data);
+                List<XGPushManager.AccountInfo> accountInfoList = new ArrayList<>();
+                accountInfoList.add(new XGPushManager.AccountInfo(XGPushManager.AccountType.CUSTOM.getValue(), Utils.getSerial()));
+                XGPushManager.upsertAccounts(getAppContext(), accountInfoList, new XGIOperateCallback() {
+                    @Override
+                    public void onSuccess(Object data, int flag) {
+                        Log.e("TPush", "onSuccess, data:" + data + ", flag:" + flag);
+                    }
+
+                    @Override
+                    public void onFail(Object data, int errCode, String msg) {
+                        Log.e("TPush", "onFail, data:" + data + ", code:" + errCode + ", msg:" + msg);
+                    }
+                });
+            }
+
+            @Override
+            public void onFail(Object data, int errCode, String msg) {
+                Log.e("TPush", "注册失败，错误码：" + errCode + ",错误信息：" + msg);
+            }
+        });
+
+
+    }
+
     private static void initAliasObservable() {
         Log.e(TAG, "initAliasObservable: ");
         Observable.create(new ObservableOnSubscribe<Integer>() {
@@ -232,17 +265,17 @@ public class BaseApplication extends MultiDexApplication {
                 });
     }
 
-    public void onAliasOperatorResult(JPushMessage jPushMessage) {
-        if (jPushMessage == null) {
-            return;
-        }
-        int errorCode = jPushMessage.getErrorCode();
-        onAliasResult.onResult(errorCode);
-    }
+//    public void onAliasOperatorResult(JPushMessage jPushMessage) {
+//        if (jPushMessage == null) {
+//            return;
+//        }
+//        int errorCode = jPushMessage.getErrorCode();
+//        onAliasResult.onResult(errorCode);
+//    }
 
     public static void setJpushAlias() {
         Log.e("jiguangInterface", "30s后重新设置alias");
-        JPushInterface.setAlias(context, TagAliasOperatorHelper.sequence++, Utils.getSerial());
+//        JPushInterface.setAlias(context, TagAliasOperatorHelper.sequence++, Utils.getSerial());
     }
 
     private static void initTagObservable() {
@@ -341,17 +374,17 @@ public class BaseApplication extends MultiDexApplication {
                 });
     }
 
-    public void onTagOperatorResult(JPushMessage jPushMessage) {
-        if (jPushMessage == null) {
-            return;
-        }
-        int errorCode = jPushMessage.getErrorCode();
-        onTagResult.onResult(errorCode);
-    }
+//    public void onTagOperatorResult(JPushMessage jPushMessage) {
+//        if (jPushMessage == null) {
+//            return;
+//        }
+//        int errorCode = jPushMessage.getErrorCode();
+//        onTagResult.onResult(errorCode);
+//    }
 
     public static void setJpushTags() {
         Log.e(TAG, "30s后重新设置tags");
-        HTTPInterface.setJpushTags(context);
+        HTTPInterface.setPushTags(context);
     }
 
     private static OnAliasResult onAliasResult;