version:1.1

fix:
update:增加推送

app/src/main/java/com/uiui/zyos/base/BaseApplication.java

@@ -6,6 +6,9 @@ import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
 
+import com.alibaba.sdk.android.push.CloudPushService;
+import com.alibaba.sdk.android.push.CommonCallback;
+import com.alibaba.sdk.android.push.noonesdk.PushServiceFactory;
 import com.arialyy.aria.core.Aria;
 import com.tencent.android.tpush.XGIOperateCallback;
 import com.tencent.android.tpush.XGPushConfig;
@@ -15,6 +18,7 @@ import com.uiui.zyos.BuildConfig;
 import com.uiui.zyos.manager.ConnectManager;
 import com.uiui.zyos.manager.RemoteManager;
 import com.uiui.zyos.network.NetInterfaceManager;
+import com.uiui.zyos.push.PushManager;
 import com.uiui.zyos.service.main.MainService;
 import com.uiui.zyos.utils.SystemUtils;
 import com.uiui.zyos.utils.Utils;
@@ -41,8 +45,11 @@ public class BaseApplication extends Application {
             Aria.init(this);
             Aria.get(this).getDownloadConfig().setMaxTaskNum(1);
             Aria.get(this).getDownloadConfig().setConvertSpeed(true);
+            PushManager.init(this);
             tpushInit();
+            aliyunPushInit();
             RemoteManager.init(this);
+            RemoteManager.getInstance().aliyunPushInit();
             ConnectManager.init(this);
             NetInterfaceManager.init(this);
             startService(new Intent(this, MainService.class));
@@ -57,7 +64,7 @@ public class BaseApplication extends Application {
                 //token在设备卸载重装的时候有可能会变
                 Log.e("TPush", "注册成功，设备token为：" + data);
                 List<XGPushManager.AccountInfo> accountInfoList = new ArrayList<>();
-                accountInfoList.add(new XGPushManager.AccountInfo(XGPushManager.AccountType.CUSTOM.getValue(), Utils.getSerial()));
+                accountInfoList.add(new XGPushManager.AccountInfo(XGPushManager.AccountType.CUSTOM.getValue(), RemoteManager.getInstance().getSerial()));
                 XGPushManager.upsertAccounts(getApplicationContext(), accountInfoList, new XGIOperateCallback() {
                     @Override
                     public void onSuccess(Object data, int flag) {
@@ -78,6 +85,23 @@ public class BaseApplication extends Application {
         });
     }
 
+    public void aliyunPushInit() {
+        PushServiceFactory.init(this);
+        final CloudPushService pushService = PushServiceFactory.getCloudPushService();
+        pushService.setLogLevel(CloudPushService.LOG_DEBUG);
+        pushService.register(this, new CommonCallback() {
+            @Override
+            public void onSuccess(String response) {
+                Log.e("AliyunPush", "init cloudchannel success");
+                Log.e("AliyunPush", "init cloudchannel success  " + pushService.getDeviceId());
+            }
+
+            @Override
+            public void onFailed(String errorCode, String errorMessage) {
+                Log.e("AliyunPush", "init cloudchannel failed -- errorcode:" + errorCode + " -- errorMessage:" + errorMessage);
+            }
+        });
+    }
 
     private void catchException() {
         Thread.setDefaultUncaughtExceptionHandler(