() {
@Override
public void onSubscribe(Disposable d) {
diff --git a/src/com/aoleyun/os/base/BaseApplication.java b/src/com/aoleyun/os/base/BaseApplication.java
index bcac4ed..05f61a1 100644
--- a/src/com/aoleyun/os/base/BaseApplication.java
+++ b/src/com/aoleyun/os/base/BaseApplication.java
@@ -8,13 +8,15 @@ import android.util.Log;
import com.aoleyun.os.BuildConfig;
import com.aoleyun.os.uiuiutils.ToastUtil;
import com.aoleyun.os.uiuiutils.Utils;
-import com.aoleyun.os.jpush.TagAliasOperatorHelper;
import com.aoleyun.os.network.HTTPInterface;
import com.aoleyun.os.network.NetworkManager;
import com.aoleyun.os.network.URLPath;
import com.aoleyun.os.uiuiutils.JGYUtils;
import com.aoleyun.os.uiuiutils.TimeUtils;
import com.arialyy.aria.core.Aria;
+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;
@@ -22,8 +24,6 @@ import org.jetbrains.annotations.NotNull;
import java.io.IOException;
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;
@@ -67,8 +67,21 @@ public class BaseApplication extends Application {
}
private void initJPush() {
- JPushInterface.setDebugMode(BuildConfig.DEBUG); // 设置开启日志,发布时请关闭日志
- JPushInterface.init(this);
+// 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.d("TPush", "注册成功，设备token为：" + data);
+ }
+
+ @Override
+ public void onFail(Object data, int errCode, String msg) {
+ Log.d("TPush", "注册失败，错误码：" + errCode + ",错误信息：" + msg);
+ }
+ });
initAliasObservable();
initTagObservable();
setJpushAlias();
@@ -157,17 +170,17 @@ public class BaseApplication extends Application {
});
}
- 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 void initTagObservable() {
@@ -266,13 +279,13 @@ public class BaseApplication extends Application {
});
}
- 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("jiguangInterface", "30s后重新设置tags");
diff --git a/src/com/aoleyun/os/jpush/ExampleApplication.java b/src/com/aoleyun/os/jpush/ExampleApplication.java
index 353e5c6..0106f47 100644
--- a/src/com/aoleyun/os/jpush/ExampleApplication.java
+++ b/src/com/aoleyun/os/jpush/ExampleApplication.java
@@ -1,7 +1,6 @@
package com.aoleyun.os.jpush;
import android.app.Application;
-import cn.jpush.android.api.JPushInterface;
/**
* For developer startup JPush SDK
@@ -16,7 +15,7 @@ public class ExampleApplication extends Application {
Logger.d(TAG, "[ExampleApplication] onCreate");
super.onCreate();
- JPushInterface.setDebugMode(true); // 设置开启日志,发布时请关闭日志
- JPushInterface.init(this); // 初始化 JPush
+// JPushInterface.setDebugMode(true); // 设置开启日志,发布时请关闭日志
+// JPushInterface.init(this); // 初始化 JPush
}
}
diff --git a/src/com/aoleyun/os/jpush/ExampleUtil.java b/src/com/aoleyun/os/jpush/ExampleUtil.java
index a0d152c..9de70b0 100644
--- a/src/com/aoleyun/os/jpush/ExampleUtil.java
+++ b/src/com/aoleyun/os/jpush/ExampleUtil.java
@@ -15,7 +15,6 @@ import android.text.TextUtils;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import cn.jpush.android.api.JPushInterface;
public class ExampleUtil {
public static final String PREFS_NAME = "JPUSH_EXAMPLE";
@@ -126,7 +125,7 @@ public class ExampleUtil {
}
}
- public static String getDeviceId(Context context) {
- return JPushInterface.getUdid(context);
- }
+// public static String getDeviceId(Context context) {
+// return JPushInterface.getUdid(context);
+// }
}
diff --git a/src/com/aoleyun/os/jpush/MyJPushMessageReceiver.java b/src/com/aoleyun/os/jpush/MyJPushMessageReceiver.java
index 1f6f237..8b0a136 100644
--- a/src/com/aoleyun/os/jpush/MyJPushMessageReceiver.java
+++ b/src/com/aoleyun/os/jpush/MyJPushMessageReceiver.java
@@ -4,43 +4,37 @@ import android.content.Context;
import com.aoleyun.os.base.BaseApplication;
-import cn.jpush.android.api.CustomMessage;
-import cn.jpush.android.api.JPushMessage;
-import cn.jpush.android.service.JPushMessageReceiver;
-
/**
* 自定义JPush message 接收器,包括操作tag/alias的结果返回(仅仅包含tag/alias新接口部分)
* */
-public class MyJPushMessageReceiver extends JPushMessageReceiver {
-
- @Override
- public void onTagOperatorResult(Context context, JPushMessage jPushMessage) {
- TagAliasOperatorHelper.getInstance().onTagOperatorResult(context,jPushMessage);
- super.onTagOperatorResult(context, jPushMessage);
- BaseApplication.getInstance().onTagOperatorResult(jPushMessage);
- }
- @Override
- public void onCheckTagOperatorResult(Context context, JPushMessage jPushMessage){
- TagAliasOperatorHelper.getInstance().onCheckTagOperatorResult(context,jPushMessage);
- super.onCheckTagOperatorResult(context, jPushMessage);
- }
- @Override
- public void onAliasOperatorResult(Context context, JPushMessage jPushMessage) {
- TagAliasOperatorHelper.getInstance().onAliasOperatorResult(context,jPushMessage);
- super.onAliasOperatorResult(context, jPushMessage);
- BaseApplication.getInstance().onAliasOperatorResult(jPushMessage);
- }
-
- @Override
- public void onMobileNumberOperatorResult(Context context, JPushMessage jPushMessage) {
- TagAliasOperatorHelper.getInstance().onMobileNumberOperatorResult(context,jPushMessage);
- super.onMobileNumberOperatorResult(context, jPushMessage);
- }
-
- @Override
- public void onMessage(Context context, CustomMessage customMessage) {
- super.onMessage(context, customMessage);
- }
-
-
-}
+//public class MyJPushMessageReceiver extends JPushMessageReceiver {
+//
+// @Override
+// public void onTagOperatorResult(Context context, JPushMessage jPushMessage) {
+// TagAliasOperatorHelper.getInstance().onTagOperatorResult(context,jPushMessage);
+// super.onTagOperatorResult(context, jPushMessage);
+// BaseApplication.getInstance().onTagOperatorResult(jPushMessage);
+// }
+// @Override
+// public void onCheckTagOperatorResult(Context context, JPushMessage jPushMessage){
+// TagAliasOperatorHelper.getInstance().onCheckTagOperatorResult(context,jPushMessage);
+// super.onCheckTagOperatorResult(context, jPushMessage);
+// }
+// @Override
+// public void onAliasOperatorResult(Context context, JPushMessage jPushMessage) {
+// TagAliasOperatorHelper.getInstance().onAliasOperatorResult(context,jPushMessage);
+// super.onAliasOperatorResult(context, jPushMessage);
+// BaseApplication.getInstance().onAliasOperatorResult(jPushMessage);
+// }
+//
+// @Override
+// public void onMobileNumberOperatorResult(Context context, JPushMessage jPushMessage) {
+// TagAliasOperatorHelper.getInstance().onMobileNumberOperatorResult(context,jPushMessage);
+// super.onMobileNumberOperatorResult(context, jPushMessage);
+// }
+//
+// @Override
+// public void onMessage(Context context, CustomMessage customMessage) {
+// super.onMessage(context, customMessage);
+// }
+//}
diff --git a/src/com/aoleyun/os/jpush/MyReceiver.java b/src/com/aoleyun/os/jpush/MyReceiver.java
index 566214f..f2236c5 100644
--- a/src/com/aoleyun/os/jpush/MyReceiver.java
+++ b/src/com/aoleyun/os/jpush/MyReceiver.java
@@ -15,8 +15,6 @@ import org.json.JSONObject;
import java.util.Iterator;
-import cn.jpush.android.api.JPushInterface;
-
/**
* 自定义接收器
*
@@ -24,132 +22,130 @@ import cn.jpush.android.api.JPushInterface;
* 1) 默认用户会打开主界面
* 2) 接收不到自定义消息
*/
-public class MyReceiver extends BroadcastReceiver {
- private static final String TAG = "JIGUANG-Example";
-
- @Override
- public void onReceive(Context context, Intent intent) {
- try {
- Bundle bundle = intent.getExtras();
- Logger.d(TAG, "[MyReceiver] onReceive - " + intent.getAction() + ", extras: " + printBundle(bundle));
-
- if (JPushInterface.ACTION_REGISTRATION_ID.equals(intent.getAction())) {
- String regId = bundle.getString(JPushInterface.EXTRA_REGISTRATION_ID);
- Logger.d(TAG, "[MyReceiver] 接收Registration Id : " + regId);
- //send the Registration Id to your server...
-
- } else if (JPushInterface.ACTION_MESSAGE_RECEIVED.equals(intent.getAction())) {
- Logger.d(TAG, "[MyReceiver] 接收到推送下来的自定义消息: " + bundle.getString(JPushInterface.EXTRA_MESSAGE));
- processCustomMessage(context, bundle);
-
- } else if (JPushInterface.ACTION_NOTIFICATION_RECEIVED.equals(intent.getAction())) {
- Logger.d(TAG, "[MyReceiver] 接收到推送下来的通知");
- int notifactionId = bundle.getInt(JPushInterface.EXTRA_NOTIFICATION_ID);
- Logger.d(TAG, "[MyReceiver] 接收到推送下来的通知的ID: " + notifactionId);
-
- } else if (JPushInterface.ACTION_NOTIFICATION_OPENED.equals(intent.getAction())) {
- Logger.d(TAG, "[MyReceiver] 用户点击打开了通知");
-
- //打开自定义的Activity
- Intent i = new Intent(context, TestActivity.class);
- i.putExtras(bundle);
- //i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
- context.startActivity(i);
-
- } else if (JPushInterface.ACTION_CONNECTION_CHANGE.equals(intent.getAction())) {
- boolean connected = intent.getBooleanExtra(JPushInterface.EXTRA_CONNECTION_CHANGE, false);
- Logger.w(TAG, "[MyReceiver]" + intent.getAction() + " connected state change to " + connected);
- } else {
- Logger.d(TAG, "[MyReceiver] Unhandled intent - " + intent.getAction());
- }
- } catch (Exception e) {
-
- }
-
- }
-
- // 打印所有的 intent extra 数据
- private static String printBundle(Bundle bundle) {
- StringBuilder sb = new StringBuilder();
- for (String key : bundle.keySet()) {
- if (key.equals(JPushInterface.EXTRA_NOTIFICATION_ID)) {
- sb.append("\nkey:" + key + ", value:" + bundle.getInt(key));
- } else if (key.equals(JPushInterface.EXTRA_CONNECTION_CHANGE)) {
- sb.append("\nkey:" + key + ", value:" + bundle.getBoolean(key));
- } else if (key.equals(JPushInterface.EXTRA_EXTRA)) {
- if (TextUtils.isEmpty(bundle.getString(JPushInterface.EXTRA_EXTRA))) {
- Logger.i(TAG, "This message has no Extra data");
- continue;
- }
-
- try {
- JSONObject json = new JSONObject(bundle.getString(JPushInterface.EXTRA_EXTRA));
- Iterator it = json.keys();
-
- while (it.hasNext()) {
- String myKey = it.next();
- sb.append("\nkey:" + key + ", value: [" +
- myKey + " - " + json.optString(myKey) + "]");
- }
- } catch (JSONException e) {
- Logger.e(TAG, "Get message extra JSON error!");
- }
-
- } else {
- sb.append("\nkey:" + key + ", value:" + bundle.get(key));
- }
- }
- return sb.toString();
- }
-
- private static final String SEND_RUNNING_APP = "2";
- //应用锁
- private static final String UPDATE_APP_LOCK = "39";
-
-
- //send msg to MainActivity
- private void processCustomMessage(Context context, Bundle bundle) {
-// if (Launcher.isForeground) {
-// String message = bundle.getString(JPushInterface.EXTRA_MESSAGE);
-// String extras = bundle.getString(JPushInterface.EXTRA_EXTRA);
-// Intent msgIntent = new Intent(Launcher.MESSAGE_RECEIVED_ACTION);
-// msgIntent.putExtra(Launcher.KEY_MESSAGE, message);
-// if (!ExampleUtil.isEmpty(extras)) {
-// try {
-// JSONObject extraJson = new JSONObject(extras);
-// if (extraJson.length() > 0) {
-// msgIntent.putExtra(Launcher.KEY_EXTRAS, extras);
-// }
-// } catch (JSONException e) {
+//public class MyReceiver extends BroadcastReceiver {
+// private static final String TAG = "JIGUANG-Example";
//
-// }
+// @Override
+// public void onReceive(Context context, Intent intent) {
+// try {
+// Bundle bundle = intent.getExtras();
+// Logger.d(TAG, "[MyReceiver] onReceive - " + intent.getAction() + ", extras: " + printBundle(bundle));
//
-// }
-// LocalBroadcastManager.getInstance(context).sendBroadcast(msgIntent);
-// }
-
- String message = bundle.getString(JPushInterface.EXTRA_MESSAGE);
- String title = bundle.getString(JPushInterface.EXTRA_TITLE);
- String type = bundle.getString(JPushInterface.EXTRA_CONTENT_TYPE);
- String extras = bundle.getString(JPushInterface.EXTRA_EXTRA);
-
- switch (message) {
- case SEND_RUNNING_APP:
- getRunningApp(context);
- break;
- case UPDATE_APP_LOCK:
- HTTPInterface.getAppPasswd();
- break;
- default:
- break;
- }
-
-
- }
-
- private void getRunningApp(Context context) {
- HTTPInterface.sendRunningApp(context);
- }
-
-}
+// if (JPushInterface.ACTION_REGISTRATION_ID.equals(intent.getAction())) {
+// String regId = bundle.getString(JPushInterface.EXTRA_REGISTRATION_ID);
+// Logger.d(TAG, "[MyReceiver] 接收Registration Id : " + regId);
+// //send the Registration Id to your server...
+//
+// } else if (JPushInterface.ACTION_MESSAGE_RECEIVED.equals(intent.getAction())) {
+// Logger.d(TAG, "[MyReceiver] 接收到推送下来的自定义消息: " + bundle.getString(JPushInterface.EXTRA_MESSAGE));
+// processCustomMessage(context, bundle);
+//
+// } else if (JPushInterface.ACTION_NOTIFICATION_RECEIVED.equals(intent.getAction())) {
+// Logger.d(TAG, "[MyReceiver] 接收到推送下来的通知");
+// int notifactionId = bundle.getInt(JPushInterface.EXTRA_NOTIFICATION_ID);
+// Logger.d(TAG, "[MyReceiver] 接收到推送下来的通知的ID: " + notifactionId);
+//
+// } else if (JPushInterface.ACTION_NOTIFICATION_OPENED.equals(intent.getAction())) {
+// Logger.d(TAG, "[MyReceiver] 用户点击打开了通知");
+//
+// //打开自定义的Activity
+// Intent i = new Intent(context, TestActivity.class);
+// i.putExtras(bundle);
+// //i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+// i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+// context.startActivity(i);
+//
+// } else if (JPushInterface.ACTION_CONNECTION_CHANGE.equals(intent.getAction())) {
+// boolean connected = intent.getBooleanExtra(JPushInterface.EXTRA_CONNECTION_CHANGE, false);
+// Logger.w(TAG, "[MyReceiver]" + intent.getAction() + " connected state change to " + connected);
+// } else {
+// Logger.d(TAG, "[MyReceiver] Unhandled intent - " + intent.getAction());
+// }
+// } catch (Exception e) {
+//
+// }
+//
+// }
+//
+// // 打印所有的 intent extra 数据
+// private static String printBundle(Bundle bundle) {
+// StringBuilder sb = new StringBuilder();
+// for (String key : bundle.keySet()) {
+// if (key.equals(JPushInterface.EXTRA_NOTIFICATION_ID)) {
+// sb.append("\nkey:" + key + ", value:" + bundle.getInt(key));
+// } else if (key.equals(JPushInterface.EXTRA_CONNECTION_CHANGE)) {
+// sb.append("\nkey:" + key + ", value:" + bundle.getBoolean(key));
+// } else if (key.equals(JPushInterface.EXTRA_EXTRA)) {
+// if (TextUtils.isEmpty(bundle.getString(JPushInterface.EXTRA_EXTRA))) {
+// Logger.i(TAG, "This message has no Extra data");
+// continue;
+// }
+//
+// try {
+// JSONObject json = new JSONObject(bundle.getString(JPushInterface.EXTRA_EXTRA));
+// Iterator it = json.keys();
+//
+// while (it.hasNext()) {
+// String myKey = it.next();
+// sb.append("\nkey:" + key + ", value: [" +
+// myKey + " - " + json.optString(myKey) + "]");
+// }
+// } catch (JSONException e) {
+// Logger.e(TAG, "Get message extra JSON error!");
+// }
+//
+// } else {
+// sb.append("\nkey:" + key + ", value:" + bundle.get(key));
+// }
+// }
+// return sb.toString();
+// }
+//
+// private static final String SEND_RUNNING_APP = "2";
+// //应用锁
+// private static final String UPDATE_APP_LOCK = "39";
+//
+//
+// //send msg to MainActivity
+// private void processCustomMessage(Context context, Bundle bundle) {
+//// if (Launcher.isForeground) {
+//// String message = bundle.getString(JPushInterface.EXTRA_MESSAGE);
+//// String extras = bundle.getString(JPushInterface.EXTRA_EXTRA);
+//// Intent msgIntent = new Intent(Launcher.MESSAGE_RECEIVED_ACTION);
+//// msgIntent.putExtra(Launcher.KEY_MESSAGE, message);
+//// if (!ExampleUtil.isEmpty(extras)) {
+//// try {
+//// JSONObject extraJson = new JSONObject(extras);
+//// if (extraJson.length() > 0) {
+//// msgIntent.putExtra(Launcher.KEY_EXTRAS, extras);
+//// }
+//// } catch (JSONException e) {
+////
+//// }
+////
+//// }
+//// LocalBroadcastManager.getInstance(context).sendBroadcast(msgIntent);
+//// }
+//
+// String message = bundle.getString(JPushInterface.EXTRA_MESSAGE);
+// String title = bundle.getString(JPushInterface.EXTRA_TITLE);
+// String type = bundle.getString(JPushInterface.EXTRA_CONTENT_TYPE);
+// String extras = bundle.getString(JPushInterface.EXTRA_EXTRA);
+//
+// switch (message) {
+// case SEND_RUNNING_APP:
+// getRunningApp(context);
+// break;
+// case UPDATE_APP_LOCK:
+// HTTPInterface.getAppPasswd();
+// break;
+// default:
+// break;
+// }
+// }
+//
+// private void getRunningApp(Context context) {
+// HTTPInterface.sendRunningApp(context);
+// }
+//
+//}
diff --git a/src/com/aoleyun/os/jpush/PushService.java b/src/com/aoleyun/os/jpush/PushService.java
index 249cc39..06cdefd 100644
--- a/src/com/aoleyun/os/jpush/PushService.java
+++ b/src/com/aoleyun/os/jpush/PushService.java
@@ -1,7 +1,6 @@
package com.aoleyun.os.jpush;
-import cn.jpush.android.service.JCommonService;
-public class PushService extends JCommonService {
-
-}
+//public class PushService extends JCommonService {
+//
+//}
diff --git a/src/com/aoleyun/os/jpush/TagAliasOperatorHelper.java b/src/com/aoleyun/os/jpush/TagAliasOperatorHelper.java
index 0c8c321..55f9394 100644
--- a/src/com/aoleyun/os/jpush/TagAliasOperatorHelper.java
+++ b/src/com/aoleyun/os/jpush/TagAliasOperatorHelper.java
@@ -11,335 +11,334 @@ import com.aoleyun.os.uiuiutils.ToastUtil;
import java.util.Locale;
import java.util.Set;
-import cn.jpush.android.api.JPushInterface;
-import cn.jpush.android.api.JPushMessage;
-
/**
* 处理tagalias相关的逻辑
* */
-public class TagAliasOperatorHelper {
- private static final String TAG = "JIGUANG-TagAliasHelper";
- public static int sequence = 1;
- /**增加*/
- public static final int ACTION_ADD = 1;
- /**覆盖*/
- public static final int ACTION_SET = 2;
- /**删除部分*/
- public static final int ACTION_DELETE = 3;
- /**删除所有*/
- public static final int ACTION_CLEAN = 4;
- /**查询*/
- public static final int ACTION_GET = 5;
-
- public static final int ACTION_CHECK = 6;
-
- public static final int DELAY_SEND_ACTION = 1;
-
- public static final int DELAY_SET_MOBILE_NUMBER_ACTION = 2;
-
- private Context context;
-
- private static TagAliasOperatorHelper mInstance;
- private TagAliasOperatorHelper(){
- }
- public static TagAliasOperatorHelper getInstance(){
- if(mInstance == null){
- synchronized (TagAliasOperatorHelper.class){
- if(mInstance == null){
- mInstance = new TagAliasOperatorHelper();
- }
- }
- }
- return mInstance;
- }
- public void init(Context context){
- if(context != null) {
- this.context = context.getApplicationContext();
- }
- }
- private SparseArray