diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml
index 2b87f82..a1afe87 100644
--- a/AndroidManifest-common.xml
+++ b/AndroidManifest-common.xml
@@ -49,23 +49,11 @@
-
-
-
-
-
-
-
-
-
-
@@ -234,150 +222,5 @@
android:readPermission="android.permission.WRITE_SECURE_SETTINGS"
android:writePermission="android.permission.WRITE_SECURE_SETTINGS" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/build.gradle b/build.gradle
index 54192f0..d6108ba 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,6 @@ buildscript {
dependencies {
classpath GRADLE_CLASS_PATH
classpath PROTOBUF_CLASS_PATH
- classpath "com.tencent.android.tpns:tpnsplugin:1.8.0"
}
}
@@ -66,13 +65,8 @@ android {
minSdkVersion 26
targetSdkVersion 28
-// //MTK
-// versionCode 49
-// versionName "2.3.9"
-
- //cube
- versionCode 135
- versionName "1.4.0530"
+ versionCode 151
+ versionName "1.4.0628"
ndk {
//选择要添加的对应 cpu 类型的 .so 库。
@@ -80,11 +74,6 @@ android {
// 还可以添加 'x86', 'x86_64', 'mips', 'mips64'
}
- manifestPlaceholders = [
- XG_ACCESS_ID : "1500026378",
- XG_ACCESS_KEY: "AH5QD9ZMBJ6R",
- ]
-
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
}
@@ -181,6 +170,20 @@ android {
}
buildTypes {
+// AiUduDebug.initWith(debug)
+// AiUduDebug {
+// versionNameSuffix "-debug"
+// debuggable true
+// signingConfig signingConfigs.G10P
+// buildConfigField "String", "platform", '"AUDG104"'
+// }
+//
+// AiUduRelease.initWith(release)
+// AiUduRelease {
+// signingConfig signingConfigs.G10P
+// buildConfigField "String", "platform", '"AUDG104"'
+// }
+
Huaruian8768Debug.initWith(debug)
Huaruian8768Debug {
versionNameSuffix "-debug"
@@ -534,15 +537,17 @@ dependencies {
implementation 'com.jakewharton:disklrucache:2.0.2'
//mmkv
implementation 'com.tencent:mmkv-static:1.2.13'
- //腾讯移动推送 TPNS
- implementation 'com.tencent.tpns:tpns:1.3.2.0-release'
- //阿里云推送
- implementation 'com.aliyun.ams:alicloud-android-push:3.8.0'
+// //腾讯移动推送 TPNS
+// implementation 'com.tencent.tpns:tpns:1.3.2.0-release'
+// //阿里云推送
+// implementation 'com.aliyun.ams:alicloud-android-push:3.8.0'
//下载
implementation 'me.laoyuyu.aria:core:3.8.16'
annotationProcessor 'me.laoyuyu.aria:compiler:3.8.16'
//工具类
implementation 'com.blankj:utilcodex:1.31.0'
+ // 吐司框架：https://github.com/getActivity/Toaster
+ implementation 'com.github.getActivity:Toaster:12.6'
}
preBuild {
diff --git a/iconloaderlib/build.gradle b/iconloaderlib/build.gradle
index 49f5098..fb6bc2e 100644
--- a/iconloaderlib/build.gradle
+++ b/iconloaderlib/build.gradle
@@ -13,6 +13,8 @@ android {
}
buildTypes {
+ AiUduDebug {}
+ AiUduRelease {}
Huaruian8768Debug {}
Huaruian8768Release {}
G11Debug {}
diff --git a/iconloaderlib/src/com/aoleyun/os/icons/BaseIconFactory.java b/iconloaderlib/src/com/aoleyun/os/icons/BaseIconFactory.java
index 71ed39c..da48737 100644
--- a/iconloaderlib/src/com/aoleyun/os/icons/BaseIconFactory.java
+++ b/iconloaderlib/src/com/aoleyun/os/icons/BaseIconFactory.java
@@ -329,7 +329,7 @@ public class BaseIconFactory implements AutoCloseable {
/**
* An extension of {@link BitmapDrawable} which returns the bitmap pixel size as intrinsic size.
* This allows the badging to be done based on the action bitmap size rather than
- * the scaled bitmap size.
+ * the scaled bitmap size.c
*/
private static class FixedSizeBitmapDrawable extends BitmapDrawable {
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 4bcb8a7..088df02 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -34,6 +34,7 @@
0dp
34dp
+ 56dp
0dp
diff --git a/res/xml/default_workspace_aiudu.xml b/res/xml/default_workspace_aiudu.xml
new file mode 100644
index 0000000..dbe54b7
--- /dev/null
+++ b/res/xml/default_workspace_aiudu.xml
@@ -0,0 +1,161 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/res/xml/device_profiles.xml b/res/xml/device_profiles.xml
index a8f981a..cf86326 100644
--- a/res/xml/device_profiles.xml
+++ b/res/xml/device_profiles.xml
@@ -149,4 +149,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/com/aoleyun/os/CellLayout.java b/src/com/aoleyun/os/CellLayout.java
index 91b22fc..3b570ab 100644
--- a/src/com/aoleyun/os/CellLayout.java
+++ b/src/com/aoleyun/os/CellLayout.java
@@ -34,6 +34,7 @@ import android.graphics.Point;
import android.graphics.Rect;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
+import android.os.Build;
import android.os.Parcelable;
import android.util.ArrayMap;
import android.util.AttributeSet;
@@ -578,7 +579,11 @@ public class CellLayout extends ViewGroup implements Transposable {
// Hotseat icons - remove text
if (child instanceof BubbleTextView) {
BubbleTextView bubbleChild = (BubbleTextView) child;
- bubbleChild.setTextVisibility(mContainerType != HOTSEAT);
+ if ("Aiud_A8_ag_1095".equals(Build.MODEL)) {
+ bubbleChild.setTextVisibility(true);
+ } else {
+ bubbleChild.setTextVisibility(mContainerType != HOTSEAT);
+ }
}
child.setScaleX(mChildScale);
diff --git a/src/com/aoleyun/os/DeviceProfile.java b/src/com/aoleyun/os/DeviceProfile.java
index 1fa1915..7b8d7c5 100644
--- a/src/com/aoleyun/os/DeviceProfile.java
+++ b/src/com/aoleyun/os/DeviceProfile.java
@@ -22,6 +22,7 @@ import android.content.res.Resources;
import android.graphics.Point;
import android.graphics.PointF;
import android.graphics.Rect;
+import android.os.Build;
import android.util.DisplayMetrics;
import android.view.Surface;
import android.view.WindowManager;
@@ -206,10 +207,18 @@ public class DeviceProfile {
res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_side_padding);
// Add a bit of space between nav bar and hotseat in vertical bar layout.
hotseatBarSidePaddingStartPx = isVerticalBarLayout() ? verticalDragHandleSizePx : 0;
- hotseatBarSizePx = ResourceUtils.pxFromDp(inv.iconSize, dm) + (isVerticalBarLayout()
- ? (hotseatBarSidePaddingStartPx + hotseatBarSidePaddingEndPx)
- : (res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_extra_vertical_size)
- + hotseatBarTopPaddingPx + hotseatBarBottomPaddingPx));
+ if ("Aiud_A8_ag_1095".equals(Build.MODEL)) {
+ hotseatBarSizePx = ResourceUtils.pxFromDp(inv.iconSize, dm) + (isVerticalBarLayout()
+ ? (hotseatBarSidePaddingStartPx + hotseatBarSidePaddingEndPx)
+ : (res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_extra_vertical_size_aiudu)
+ + hotseatBarTopPaddingPx + hotseatBarBottomPaddingPx));
+ } else {
+ hotseatBarSizePx = ResourceUtils.pxFromDp(inv.iconSize, dm) + (isVerticalBarLayout()
+ ? (hotseatBarSidePaddingStartPx + hotseatBarSidePaddingEndPx)
+ : (res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_extra_vertical_size)
+ + hotseatBarTopPaddingPx + hotseatBarBottomPaddingPx));
+ }
+
// Calculate all of the remaining variables.
updateAvailableDimensions(dm, res);
diff --git a/src/com/aoleyun/os/InvariantDeviceProfile.java b/src/com/aoleyun/os/InvariantDeviceProfile.java
index b1d4aec..ba67d30 100644
--- a/src/com/aoleyun/os/InvariantDeviceProfile.java
+++ b/src/com/aoleyun/os/InvariantDeviceProfile.java
@@ -32,6 +32,7 @@ import android.content.res.TypedArray;
import android.content.res.XmlResourceParser;
import android.graphics.Point;
import android.graphics.Rect;
+import android.os.Build;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.util.DisplayMetrics;
@@ -54,6 +55,8 @@ import org.xmlpull.v1.XmlPullParserException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
@@ -182,6 +185,9 @@ public class InvariantDeviceProfile {
display.getCurrentSizeRange(smallestSize, largestSize);
ArrayList allOptions = getPredefinedDeviceProfiles(context, gridName);
+ for (DisplayOption displayOption:allOptions){
+ Log.e(TAG, "initGrid: "+displayOption.grid.name);
+ }
// This guarantees that width < height
float minWidthDps = Utilities.dpiFromPx(Math.min(smallestSize.x, smallestSize.y), dm);
float minHeightDps = Utilities.dpiFromPx(Math.min(largestSize.x, largestSize.y), dm);
@@ -191,8 +197,17 @@ public class InvariantDeviceProfile {
dist(minWidthDps, minHeightDps, b.minWidthDps, b.minHeightDps)));
DisplayOption interpolatedDisplayOption =
invDistWeightedInterpolate(minWidthDps, minHeightDps, allOptions);
-
- GridOption closestProfile = allOptions.get(0).grid;
+ GridOption closestProfile;
+ if ("Aiud_A8_ag_1095".equals(Build.MODEL)) {
+ closestProfile = allOptions.stream().filter(new Predicate() {
+ @Override
+ public boolean test(DisplayOption displayOption) {
+ return "aiudu".equals(displayOption.grid.name);
+ }
+ }).collect(Collectors.toList()).get(0).grid;
+ }else {
+ closestProfile = allOptions.get(0).grid;
+ }
numRows = closestProfile.numRows;
numColumns = closestProfile.numColumns;
numHotseatIcons = closestProfile.numHotseatIcons;
diff --git a/src/com/aoleyun/os/Launcher.java b/src/com/aoleyun/os/Launcher.java
index fa3b4ef..3677bd1 100644
--- a/src/com/aoleyun/os/Launcher.java
+++ b/src/com/aoleyun/os/Launcher.java
@@ -71,9 +71,6 @@ import android.widget.Toast;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
-import com.alibaba.sdk.android.push.CloudPushService;
-import com.alibaba.sdk.android.push.CommonCallback;
-import com.alibaba.sdk.android.push.noonesdk.PushServiceFactory;
import com.aoleyun.os.DropTarget.DragObject;
import com.aoleyun.os.accessibility.LauncherAccessibilityDelegate;
import com.aoleyun.os.allapps.AllAppsContainerView;
@@ -156,9 +153,6 @@ 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;
@@ -478,68 +472,6 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
});
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);
- }
- });
- 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());
- String sn = Utils.getSerial(Launcher.this);
- if (TextUtils.isEmpty(sn)) {
- return;
- }
- pushService.bindAccount(sn, new CommonCallback() {
- @Override
- public void onSuccess(String s) {
- Log.e("AliyunPush", "bind account " + sn + " success\n");
- }
-
- @Override
- public void onFailed(String errorCode, String errorMsg) {
- Log.e("AliyunPush", "bind account " + sn + " failed." +
- "errorCode: " + errorCode + ", errorMsg:" + errorMsg);
- }
- });
- pushService.addAlias(sn, new CommonCallback() {
- @Override
- public void onSuccess(String s) {
- Log.e("AliyunPush", "add alias " + sn + " success\n");
- }
-
- @Override
- public void onFailed(String errorCode, String errorMsg) {
- Log.e("AliyunPush", "add alias " + sn + " failed." +
- "errorCode: " + errorCode + ", errorMsg:" + errorMsg + "\n");
- }
- });
- }
-
- @Override
- public void onFailed(String errorCode, String errorMessage) {
- Log.e("AliyunPush", "init cloudchannel failed -- errorcode:" + errorCode + " -- errorMessage:" + errorMessage);
- }
- });
}
private void SetWallPaper() {
diff --git a/src/com/aoleyun/os/base/BaseApplication.java b/src/com/aoleyun/os/base/BaseApplication.java
index 528ba2b..2a7b930 100644
--- a/src/com/aoleyun/os/base/BaseApplication.java
+++ b/src/com/aoleyun/os/base/BaseApplication.java
@@ -5,11 +5,10 @@ import android.util.Log;
import com.aoleyun.os.manager.ConnectManager;
import com.aoleyun.os.network.NetInterfaceManager;
-import com.aoleyun.os.push.PushManager;
import com.aoleyun.os.uiuiutils.JGYUtils;
import com.aoleyun.os.uiuiutils.TimeUtils;
-import com.aoleyun.os.uiuiutils.ToastUtil;
import com.arialyy.aria.core.Aria;
+import com.hjq.toast.Toaster;
import com.tencent.mmkv.MMKV;
public class BaseApplication extends Application {
@@ -21,12 +20,12 @@ public class BaseApplication extends Application {
String rootDir = MMKV.initialize(this);
Log.e(TAG, "onCreate: " + rootDir);
- PushManager.init(this);
JGYUtils.init(this);
TimeUtils.init(this);
Aria.init(this);
NetInterfaceManager.init(this);
- ToastUtil.init(this);
+ // 初始化 Toast 框架
+ Toaster.init(this);
ConnectManager.init(this);
}
}
diff --git a/src/com/aoleyun/os/icons/IconCache.java b/src/com/aoleyun/os/icons/IconCache.java
index 518a043..a792baf 100644
--- a/src/com/aoleyun/os/icons/IconCache.java
+++ b/src/com/aoleyun/os/icons/IconCache.java
@@ -248,6 +248,7 @@ public class IconCache extends BaseIconCache {
this.add("com.android.gallery3d.v2.app.GalleryActivity2");//图库
this.add("com.android.gallery3d.app.GalleryActivity");//图库
this.add("com.android.messaging.ui.conversationlist.ConversationListActivity");//信息
+ this.add("com.android.mms.ui.BootActivity");//信息
this.add("com.android.music.MusicBrowserActivity");//音乐
this.add("com.android.providers.downloads.ui.DownloadList");//下载
this.add("com.android.quicksearchbox.SearchActivity");//搜索
@@ -284,6 +285,7 @@ public class IconCache extends BaseIconCache {
this.add("com_android_gallery3d_app");
this.add("com_android_gallery3d_app");
this.add("com_android_mms_ui");
+ this.add("com_android_mms_ui");
this.add("com_android_music");
this.add("com_android_providers_downloads_ui");
this.add("com_android_quicksearchbox");
diff --git a/src/com/aoleyun/os/network/NetInterfaceManager.java b/src/com/aoleyun/os/network/NetInterfaceManager.java
index 2ce1246..fe68b0a 100644
--- a/src/com/aoleyun/os/network/NetInterfaceManager.java
+++ b/src/com/aoleyun/os/network/NetInterfaceManager.java
@@ -5,9 +5,6 @@ import android.content.Context;
import android.text.TextUtils;
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.aoleyun.os.disklrucache.CacheHelper;
import com.aoleyun.os.manager.ConnectManager;
import com.aoleyun.os.manager.ConnectMode;
@@ -24,8 +21,6 @@ import com.aoleyun.os.network.bean.Batch;
import com.aoleyun.os.network.interceptor.RepeatRequestInterceptor;
import com.aoleyun.os.uiuiutils.JGYUtils;
import com.aoleyun.os.uiuiutils.Utils;
-import com.tencent.android.tpush.XGIOperateCallback;
-import com.tencent.android.tpush.XGPushManager;
import com.tencent.mmkv.MMKV;
import java.io.File;
@@ -205,8 +200,9 @@ public class NetInterfaceManager {
set.add(JGYUtils.G10PTag);
} else if (platform == JGYUtils.C2Platform) {
set.add(JGYUtils.C2Tag);
+ } else if (platform == JGYUtils.AUDG104Platform) {
+ set.add(JGYUtils.AUDG104Tag);
}
-
}
});
getPushTagsObservable()
@@ -248,31 +244,7 @@ public class NetInterfaceManager {
});
}
- synchronized private void clearAndAppendTags(Set tagSets) {
- XGPushManager.clearAndAppendTags(mContext, "clearAndAppendTags :" + System.currentTimeMillis(), tagSets, new XGIOperateCallback() {
- @Override
- public void onSuccess(Object o, int i) {
- Log.e("clearAndAppendTags", "onSuccess: " + o);
- }
+ private void clearAndAppendTags(Set tagSets) {
- @Override
- public void onFail(Object o, int i, String s) {
- Log.e("clearAndAppendTags", "onFail: " + o);
- }
- });
- String[] tag = new ArrayList<>(tagSets).toArray(new String[tagSets.size()]);
- CloudPushService pushService = PushServiceFactory.getCloudPushService();
- pushService.bindTag(CloudPushService.DEVICE_TARGET, tag, null, new CommonCallback() {
- @Override
- public void onSuccess(String s) {
- Log.e("bindTag", "bind tag " + Arrays.toString(tag) + " success\n");
- }
-
- @Override
- public void onFailed(String errorCode, String errorMsg) {
- Log.e("bindTag", "bind tag " + Arrays.toString(tag) + " failed." +
- "errorCode: " + errorCode + ", errorMsg:" + errorMsg + "\n");
- }
- });
}
}
\ No newline at end of file
diff --git a/src/com/aoleyun/os/push/PushManager.java b/src/com/aoleyun/os/push/PushManager.java
deleted file mode 100644
index 501767a..0000000
--- a/src/com/aoleyun/os/push/PushManager.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.aoleyun.os.push;
-
-import android.annotation.SuppressLint;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.pm.PackageManager;
-
-import com.aoleyun.os.comm.CommonConfig;
-import com.aoleyun.os.disklrucache.CacheHelper;
-import com.aoleyun.os.network.HTTPInterface;
-import com.tencent.mmkv.MMKV;
-
-public class PushManager {
- private static final String TAG = PushManager.class.getSimpleName();
-
- @SuppressLint("StaticFieldLeak")
- private static PushManager sInstance;
- private Context mContext;
-
- private PushManager(Context context) {
- if (context == null) {
- throw new RuntimeException("Context is NULL");
- }
- this.mContext = context;
- }
-
- public static void init(Context context) {
- if (sInstance == null) {
- sInstance = new PushManager(context);
- }
- }
-
- public static PushManager getInstance() {
- if (sInstance == null) {
- throw new IllegalStateException("You must be init PushManager first");
- }
- return sInstance;
- }
-
- /*删除应用*/
- private final String UPDATEPASSWD = "39";
-
- public void setPushContent(String title, String extras) {
- switch (title) {
- case UPDATEPASSWD:
- HTTPInterface.getAppPasswd();
- break;
- default:
- }
- }
-}
diff --git a/src/com/aoleyun/os/push/alipush/AliMessageIntentService.java b/src/com/aoleyun/os/push/alipush/AliMessageIntentService.java
deleted file mode 100644
index 194063a..0000000
--- a/src/com/aoleyun/os/push/alipush/AliMessageIntentService.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.aoleyun.os.push.alipush;
-
-import android.content.Context;
-import android.util.Log;
-
-import com.alibaba.sdk.android.push.AliyunMessageIntentService;
-import com.alibaba.sdk.android.push.notification.CPushMessage;
-
-import java.util.Map;
-
-/**
- * Created by liyazhou on 17/8/22.
- * 为避免推送广播被系统拦截的小概率事件,我们推荐用户通过IntentService处理消息互调,接入步骤:
- * 1. 创建IntentService并继承AliyunMessageIntentService
- * 2. 覆写相关方法,并在Manifest的注册该Service
- * 3. 调用接口CloudPushService.setPushIntentService
- * 详细用户可参考:https://help.aliyun.com/document_detail/30066.html#h2-2-messagereceiver-aliyunmessageintentservice
- */
-
-public class AliMessageIntentService extends AliyunMessageIntentService {
- private static final String TAG = AliyunMessageIntentService.class.getSimpleName();
-
- /**
- * 推送通知的回调方法
- *
- * @param context
- * @param title
- * @param summary
- * @param extraMap
- */
- @Override
- protected void onNotification(Context context, String title, String summary, Map extraMap) {
- Log.i(TAG, "收到一条推送通知 ： " + title + ", summary:" + summary);
- }
-
- /**
- * 推送消息的回调方法
- *
- * @param context
- * @param cPushMessage
- */
- @Override
- protected void onMessage(Context context, CPushMessage cPushMessage) {
- Log.i(TAG, "收到一条推送消息 ： " + cPushMessage.getTitle() + ", content:" + cPushMessage.getContent());
- }
-
- /**
- * 从通知栏打开通知的扩展处理
- *
- * @param context
- * @param title
- * @param summary
- * @param extraMap
- */
- @Override
- protected void onNotificationOpened(Context context, String title, String summary, String extraMap) {
- Log.i(TAG, "onNotificationOpened ： " + " : " + title + " : " + summary + " : " + extraMap);
- }
-
- /**
- * 无动作通知点击回调。当在后台或阿里云控制台指定的通知动作为无逻辑跳转时,通知点击回调为onNotificationClickedWithNoAction而不是onNotificationOpened
- *
- * @param context
- * @param title
- * @param summary
- * @param extraMap
- */
- @Override
- protected void onNotificationClickedWithNoAction(Context context, String title, String summary, String extraMap) {
- Log.i(TAG, "onNotificationClickedWithNoAction ： " + " : " + title + " : " + summary + " : " + extraMap);
- }
-
- /**
- * 通知删除回调
- *
- * @param context
- * @param messageId
- */
- @Override
- protected void onNotificationRemoved(Context context, String messageId) {
- Log.i(TAG, "onNotificationRemoved ： " + messageId);
- }
-
- /**
- * 应用处于前台时通知到达回调。注意:该方法仅对自定义样式通知有效,相关详情请参考https://help.aliyun.com/document_detail/30066.html#h3-3-4-basiccustompushnotification-api
- *
- * @param context
- * @param title
- * @param summary
- * @param extraMap
- * @param openType
- * @param openActivity
- * @param openUrl
- */
- @Override
- protected void onNotificationReceivedInApp(Context context, String title, String summary, Map extraMap, int openType, String openActivity, String openUrl) {
- Log.i(TAG, "onNotificationReceivedInApp ： " + " : " + title + " : " + summary + " " + extraMap + " : " + openType + " : " + openActivity + " : " + openUrl);
- }
-}
diff --git a/src/com/aoleyun/os/push/alipush/AliyunMessageReceiver.java b/src/com/aoleyun/os/push/alipush/AliyunMessageReceiver.java
deleted file mode 100644
index 0c22234..0000000
--- a/src/com/aoleyun/os/push/alipush/AliyunMessageReceiver.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.aoleyun.os.push.alipush;
-
-import android.content.Context;
-import android.util.Log;
-
-import com.alibaba.sdk.android.push.MessageReceiver;
-import com.alibaba.sdk.android.push.notification.CPushMessage;
-import com.aoleyun.os.push.PushManager;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-import java.util.Map;
-
-/**
- * @author: 正纬
- * @since: 15/4/9
- * @version: 1.1
- * @feature: 用于接收推送的通知和消息
- */
-public class AliyunMessageReceiver extends MessageReceiver {
- // 消息接收部分的LOG_TAG
- public static final String TAG = AliyunMessageReceiver.class.getSimpleName();
-
- /**
- * 推送通知的回调方法
- *
- * @param context
- * @param title
- * @param summary
- * @param extraMap
- */
- @Override
- public void onNotification(Context context, String title, String summary, Map extraMap) {
- // TODO 处理推送通知
- if (null != extraMap) {
- for (Map.Entry entry : extraMap.entrySet()) {
- Log.i(TAG, "@Get diy param : Key=" + entry.getKey() + " , Value=" + entry.getValue());
- }
- } else {
- Log.i(TAG, "@收到通知 && 自定义消息为空");
- }
- Log.i(TAG, "收到一条推送通知 ： " + title + ", summary:" + summary);
- }
-
- /**
- * 应用处于前台时通知到达回调。注意:该方法仅对自定义样式通知有效,相关详情请参考https://help.aliyun.com/document_detail/30066.html?spm=5176.product30047.6.620.wjcC87#h3-3-4-basiccustompushnotification-api
- *
- * @param context
- * @param title
- * @param summary
- * @param extraMap
- * @param openType
- * @param openActivity
- * @param openUrl
- */
- @Override
- protected void onNotificationReceivedInApp(Context context, String title, String summary, Map extraMap, int openType, String openActivity, String openUrl) {
- Log.i(TAG, "onNotificationReceivedInApp ： " + " : " + title + " : " + summary + " " + extraMap + " : " + openType + " : " + openActivity + " : " + openUrl);
- }
-
- /**
- * 推送消息的回调方法
- *
- * @param context
- * @param cPushMessage
- */
- @Override
- public void onMessage(Context context, CPushMessage cPushMessage) {
- Log.e(TAG, "收到一条推送消息 ： " + cPushMessage.getTitle() + ", content:" + cPushMessage.getContent());
- String title = cPushMessage.getTitle();
- String content = cPushMessage.getContent();
- JsonObject extrasJson = JsonParser.parseString(content).getAsJsonObject();
- String extras = "";
- if (extrasJson.get("extras") != null) {
- extras = extrasJson.get("extras").toString();
- }
- PushManager.getInstance().setPushContent(title, extras);
- }
-
- /**
- * 从通知栏打开通知的扩展处理
- *
- * @param context
- * @param title
- * @param summary
- * @param extraMap
- */
- @Override
- public void onNotificationOpened(Context context, String title, String summary, String extraMap) {
- Log.i(TAG, "onNotificationOpened ： " + " : " + title + " : " + summary + " : " + extraMap);
- }
-
- /**
- * 通知删除回调
- *
- * @param context
- * @param messageId
- */
- @Override
- public void onNotificationRemoved(Context context, String messageId) {
- Log.i(TAG, "onNotificationRemoved ： " + messageId);
- }
-
- /**
- * 无动作通知点击回调。当在后台或阿里云控制台指定的通知动作为无逻辑跳转时,通知点击回调为onNotificationClickedWithNoAction而不是onNotificationOpened
- *
- * @param context
- * @param title
- * @param summary
- * @param extraMap
- */
- @Override
- protected void onNotificationClickedWithNoAction(Context context, String title, String summary, String extraMap) {
- Log.i(TAG, "onNotificationClickedWithNoAction ： " + " : " + title + " : " + summary + " : " + extraMap);
- }
-}
\ No newline at end of file
diff --git a/src/com/aoleyun/os/push/tpush/Constants.java b/src/com/aoleyun/os/push/tpush/Constants.java
deleted file mode 100644
index 74b488f..0000000
--- a/src/com/aoleyun/os/push/tpush/Constants.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.aoleyun.os.push.tpush;
-
-/**
- * Created by chacewang on 2019/7/5.
- */
-
-public class Constants {
- public static final int TEST_LOCAL_NOTIFICATION = 1;
- public static final int TEST_NOTIFICATION = 2;
- public static final int TEST_SET_TAG = 3;
- public static final int TEST_DEL_TAG = 4;
- public static final int TEST_SET_ACCOUNT = 5;
- public static final int TEST_DEL_ACCOUNT = 6;
-
- public static final String LOCAL_NOTIFICATION_TITLE = "localtest";
- public static final String TEST_TAG_NAME = "DiagnosisTag";
-}
diff --git a/src/com/aoleyun/os/push/tpush/MessageReceiver.java b/src/com/aoleyun/os/push/tpush/MessageReceiver.java
deleted file mode 100644
index a8773d5..0000000
--- a/src/com/aoleyun/os/push/tpush/MessageReceiver.java
+++ /dev/null
@@ -1,299 +0,0 @@
-package com.aoleyun.os.push.tpush;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.text.TextUtils;
-import android.util.Log;
-import android.widget.Toast;
-
-import com.aoleyun.os.network.HTTPInterface;
-import com.aoleyun.os.push.PushManager;
-import com.aoleyun.os.push.tpush.common.NotificationService;
-import com.aoleyun.os.push.tpush.po.XGNotification;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.tencent.android.tpush.NotificationAction;
-import com.tencent.android.tpush.XGPushBaseReceiver;
-import com.tencent.android.tpush.XGPushClickedResult;
-import com.tencent.android.tpush.XGPushRegisterResult;
-import com.tencent.android.tpush.XGPushShowedResult;
-import com.tencent.android.tpush.XGPushTextMessage;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-
-public class MessageReceiver extends XGPushBaseReceiver {
- private static final String TAG = MessageReceiver.class.getSimpleName();
-
- public static final String UPDATE_LISTVIEW_ACTION = "com.qq.xgdemo.activity.UPDATE_LISTVIEW";
- public static final String TEST_ACTION = "com.qq.xgdemo.activity.TEST_ACTION";
- public static final String LogTag = "xg.test";
-
- /**
- * 消息透传处理
- *
- * @param context
- * @param message 解析自定义的 JSON
- */
- @Override
- public void onTextMessage(Context context, XGPushTextMessage message) {
- String text = "收到消息:" + message.toString();
- // 获取自定义key-value
- String customContent = message.getCustomContent();
- if (customContent != null && customContent.length() != 0) {
- JsonObject obj = JsonParser.parseString(customContent).getAsJsonObject();
- // key1为前台配置的key
- if (!TextUtils.isEmpty(obj.get("key").getAsString())) {
- String value = obj.get("key").getAsString();
- Log.d(LogTag, "get custom value:" + value);
- }
- // ...
- }
- // APP自主处理消息的过程...
- Log.e(LogTag, text);
- show(context, text);
- processCustomMessage(context, message);
- }
-
- /**
- * 通知展示
- *
- * @param context
- * @param notifiShowedRlt 包含通知的内容
- */
- @Override
- public void onNotificationShowedResult(Context context, XGPushShowedResult notifiShowedRlt) {
- if (context == null || notifiShowedRlt == null) {
- return;
- }
- XGNotification notific = new XGNotification();
- notific.setMsg_id(notifiShowedRlt.getMsgId());
- notific.setTitle(notifiShowedRlt.getTitle());
- notific.setContent(notifiShowedRlt.getContent());
- // notificationActionType==1为Activity，2为url，3为intent
- notific.setNotificationActionType(notifiShowedRlt
- .getNotificationActionType());
- // Activity,url,intent都可以通过getActivity()获得
- notific.setActivity(notifiShowedRlt.getActivity());
- notific.setUpdate_time(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
- .format(Calendar.getInstance().getTime()));
- NotificationService.getInstance(context).save(notific);
-
- Intent testIntent = new Intent(TEST_ACTION);
- if (notifiShowedRlt.getTitle().equals(Constants.LOCAL_NOTIFICATION_TITLE)) {
- testIntent.putExtra("step", Constants.TEST_LOCAL_NOTIFICATION);
- } else {
- testIntent.putExtra("step", Constants.TEST_NOTIFICATION);
- }
- context.sendBroadcast(testIntent);
-
- Intent viewIntent = new Intent(UPDATE_LISTVIEW_ACTION);
- context.sendBroadcast(viewIntent);
- show(context, "您有1条新消息, " + "通知被展示 ， " + notifiShowedRlt.toString());
- Log.d(LogTag, "您有1条新消息, " + "通知被展示 ， " + notifiShowedRlt.toString() + ", PushChannel:" + notifiShowedRlt.getPushChannel());
- }
-
- /**
- * 注册回调
- *
- * @param context
- * @param errorCode 0 为成功，其它为错误码
- */
- @Override
- public void onRegisterResult(Context context, int errorCode, XGPushRegisterResult message) {
- if (context == null || message == null) {
- return;
- }
- String text = "";
- if (errorCode == XGPushBaseReceiver.SUCCESS) {
- // 在这里拿token
- String token = message.getToken();
- text = "注册成功1. token：" + token;
- } else {
- text = message + "注册失败，错误码：" + errorCode;
- }
- Log.d(LogTag, text);
- show(context, text);
- }
-
- /**
- * 反注册回调
- *
- * @param context
- * @param errorCode 0 为成功，其它为错误码
- */
- @Override
- public void onUnregisterResult(Context context, int errorCode) {
- if (context == null) {
- return;
- }
- String text = "";
- if (errorCode == XGPushBaseReceiver.SUCCESS) {
- text = "反注册成功";
- } else {
- text = "反注册失败" + errorCode;
- }
- Log.d(LogTag, text);
- show(context, text);
-
- }
-
- /**
- * 设置标签回调
- *
- * @param context
- * @param errorCode 0 为成功，其它为错误码
- * @param tagName 设置的 TAG
- */
- @Override
- public void onSetTagResult(Context context, int errorCode, String tagName) {
- if (context == null) {
- return;
- }
- String text = "";
- if (errorCode == XGPushBaseReceiver.SUCCESS) {
- text = "\"" + tagName + "\"设置成功";
- } else {
- text = "\"" + tagName + "\"设置失败,错误码：" + errorCode;
- }
- Log.d(LogTag, text);
- show(context, text);
-
- Intent testIntent = new Intent(TEST_ACTION);
- testIntent.putExtra("step", Constants.TEST_SET_TAG);
- context.sendBroadcast(testIntent);
- }
-
- /**
- * 删除标签的回调
- *
- * @param context
- * @param errorCode 0 为成功，其它为错误码
- * @param tagName 设置的 TAG
- */
- @Override
- public void onDeleteTagResult(Context context, int errorCode, String tagName) {
- if (context == null) {
- return;
- }
- String text = "";
- if (errorCode == XGPushBaseReceiver.SUCCESS) {
- text = "\"" + tagName + "\"删除成功";
- } else {
- text = "\"" + tagName + "\"删除失败,错误码：" + errorCode;
- }
- Log.d(LogTag, text);
- show(context, text);
-
- Intent testIntent = new Intent(TEST_ACTION);
- testIntent.putExtra("step", Constants.TEST_DEL_TAG);
- context.sendBroadcast(testIntent);
- }
-
- /**
- * 设置账号回调
- *
- * @param context
- * @param errorCode 0 为成功，其它为错误码
- * @param account 设置的账号
- */
- @Override
- public void onSetAccountResult(Context context, int errorCode, String account) {
- Intent testIntent = new Intent(TEST_ACTION);
- testIntent.putExtra("step", Constants.TEST_SET_ACCOUNT);
- context.sendBroadcast(testIntent);
- }
-
-
- /**
- * 删除账号回调
- *
- * @param context
- * @param errorCode 0 为成功，其它为错误码
- * @param account 设置的账号
- */
- @Override
- public void onDeleteAccountResult(Context context, int errorCode, String account) {
- Intent testIntent = new Intent(TEST_ACTION);
- testIntent.putExtra("step", Constants.TEST_DEL_ACCOUNT);
- context.sendBroadcast(testIntent);
- }
-
- @Override
- public void onSetAttributeResult(Context context, int i, String s) {
-
- }
-
- @Override
- public void onDeleteAttributeResult(Context context, int i, String s) {
-
- }
-
- @Override
- public void onQueryTagsResult(Context context, int errorCode, String data, String operateName) {
- Log.i(LogTag, "action - onQueryTagsResult, errorCode:" + errorCode + ", operateName:" + operateName + ", data: " + data);
- }
-
- /**
- * 通知点击回调 actionType=1为该消息被清除，actionType=0为该消息被点击
- *
- * @param context
- * @param message 包含被点击通知的内容
- */
- @Override
- public void onNotificationClickedResult(Context context, XGPushClickedResult message) {
- if (context == null || message == null) {
- return;
- }
- String text = "";
- if (message.getActionType() == NotificationAction.clicked.getType()) {
- // 通知在通知栏被点击啦。。。。。
- // APP自己处理点击的相关动作
- // 这个动作可以在activity的onResume也能监听，请看第3点相关内容
- text = "通知被打开 :" + message;
- } else if (message.getActionType() == NotificationAction.delete.getType()) {
- // 通知被清除啦。。。。
- // APP自己处理通知被清除后的相关动作
- text = "通知被清除 :" + message;
- }
- Toast.makeText(context, "广播接收到通知被点击:" + message.toString(),
- Toast.LENGTH_SHORT).show();
- // 获取自定义key-value
- String customContent = message.getCustomContent();
- if (customContent != null && customContent.length() != 0) {
- JsonObject obj = JsonParser.parseString(customContent).getAsJsonObject();
- // key1为前台配置的key
- if (!TextUtils.isEmpty(obj.get("key").getAsString())) {
- String value = obj.get("key").getAsString();
- Log.d(LogTag, "get custom value:" + value);
- }
- // ...
- }
- // APP自主处理的过程。。。
- Log.d(LogTag, text);
- show(context, text);
- }
-
- private void show(Context context, String text) {
-// Toast.makeText(context, text, Toast.LENGTH_SHORT).show();
- }
-
- private void processCustomMessage(Context context, XGPushTextMessage message) {
- if (context == null || message == null) {
- return;
- }
-
- String title = message.getTitle();
- String content = message.getContent();
- JsonObject extrasJson = JsonParser.parseString(content).getAsJsonObject();
-
- String extras = "";
- if (extrasJson.get("extras") != null) {
- extras = extrasJson.get("extras").toString();
- }
- PushManager.getInstance().setPushContent(title, extras);
- }
-
-}
diff --git a/src/com/aoleyun/os/push/tpush/common/DBOpenHelper.java b/src/com/aoleyun/os/push/tpush/common/DBOpenHelper.java
deleted file mode 100644
index 2f30da5..0000000
--- a/src/com/aoleyun/os/push/tpush/common/DBOpenHelper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.aoleyun.os.push.tpush.common;
-
-import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
-
-public class DBOpenHelper extends SQLiteOpenHelper {
-
- public DBOpenHelper(Context context) {
- super(context, "XGExample.db", null, 1);
- }
-
- @Override
- public void onCreate(SQLiteDatabase db) {
- db.execSQL("CREATE TABLE notification (id integer primary key autoincrement,msg_id varchar(64),title varchar(128),activity varchar(256),notificationActionType varchar(512),content text,update_time varchar(16))");
- }
-
- @Override
- public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-
- }
-
-}
diff --git a/src/com/aoleyun/os/push/tpush/common/NotificationService.java b/src/com/aoleyun/os/push/tpush/common/NotificationService.java
deleted file mode 100644
index cb8eb2c..0000000
--- a/src/com/aoleyun/os/push/tpush/common/NotificationService.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.aoleyun.os.push.tpush.common;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-
-
-import com.aoleyun.os.push.tpush.po.XGNotification;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class NotificationService {
- private DBOpenHelper dbOpenHelper;
- private static NotificationService instance = null;
-
- public NotificationService(Context context) {
- this.dbOpenHelper = new DBOpenHelper(context);
- }
-
- public synchronized static NotificationService getInstance(Context ctx) {
- if (null == instance) {
- instance = new NotificationService(ctx);
- }
- return instance;
- }
-
- public void save(XGNotification notification) {
- SQLiteDatabase db = dbOpenHelper.getWritableDatabase();
- ContentValues values = new ContentValues();
- values.put("msg_id", notification.getMsg_id());
- values.put("title", notification.getTitle());
- values.put("content", notification.getContent());
- values.put("activity", notification.getActivity());
- values.put("notificationActionType", notification.getNotificationActionType());
- values.put("update_time", notification.getUpdate_time());
- db.insert("notification", null, values);
- }
-
- public void delete(Integer id) {
- SQLiteDatabase db = dbOpenHelper.getWritableDatabase();
- db.delete("notification", "id=?", new String[] { id.toString() });
- }
-
- public void deleteAll() {
- SQLiteDatabase db = dbOpenHelper.getWritableDatabase();
- db.delete("notification", "", null);
- }
-
- public void update(XGNotification notification) {
- SQLiteDatabase db = dbOpenHelper.getWritableDatabase();
- ContentValues values = new ContentValues();
- values.put("msg_id", notification.getMsg_id());
- values.put("title", notification.getTitle());
- values.put("content", notification.getContent());
- values.put("activity", notification.getActivity());
- values.put("notificationActionType", notification.getNotificationActionType());
- values.put("update_time", notification.getUpdate_time());
- db.update("notification", values, "id=?", new String[] { notification
- .getId().toString() });
- }
-
- public XGNotification find(Integer id) {
- SQLiteDatabase db = dbOpenHelper.getReadableDatabase();
- Cursor cursor = db
- .query("notification",
- new String[] { "id,msg_id,title,content,activity,notificationActionType,update_time" },
- "id=?", new String[] { id.toString() }, null, null,
- null, "1");
- try {
- if (cursor.moveToFirst()) {
- return new XGNotification(cursor.getInt(cursor
- .getColumnIndex("id")), cursor.getLong(cursor
- .getColumnIndex("msg_id")), cursor.getString(cursor
- .getColumnIndex("title")), cursor.getString(cursor
- .getColumnIndex("content")), cursor.getString(cursor
- .getColumnIndex("activity")), cursor.getInt(cursor
- .getColumnIndex("notificationActionType")), cursor.getString(cursor
- .getColumnIndex("update_time")));
- }
- return null;
- } finally {
- cursor.close();
- }
- }
-
- public List getScrollData(int currentPage, int lineSize,
- String msg_id) {
- String firstResult = String.valueOf((currentPage - 1) * lineSize);
- SQLiteDatabase db = dbOpenHelper.getReadableDatabase();
- Cursor cursor = null;
- try {
- if (msg_id == null || "".equals(msg_id)) {
- cursor = db
- .query("notification",
- new String[] { "id,msg_id,title,content,activity,notificationActionType,update_time" },
- null, null, null, null, "update_time DESC",
- firstResult + "," + lineSize);
- } else {
- cursor = db
- .query("notification",
- new String[] { "id,msg_id,title,content,activity,notificationActionType,update_time" },
- "msg_id like ?", new String[] { msg_id + "%" },
- null, null, "update_time DESC", firstResult
- + "," + lineSize);
- }
- List notifications = new ArrayList();
- while (cursor.moveToNext()) {
- notifications.add(new XGNotification(cursor.getInt(cursor
- .getColumnIndex("id")), cursor.getLong(cursor
- .getColumnIndex("msg_id")), cursor.getString(cursor
- .getColumnIndex("title")), cursor.getString(cursor
- .getColumnIndex("content")), cursor.getString(cursor
- .getColumnIndex("activity")), cursor.getInt(cursor
- .getColumnIndex("notificationActionType")), cursor.getString(cursor
- .getColumnIndex("update_time"))));
- }
- return notifications;
- } finally {
- cursor.close();
- }
- }
-
- public int getCount() {
- SQLiteDatabase db = dbOpenHelper.getReadableDatabase();
- Cursor cursor = db.rawQuery("select count(*) from notification", null);
- try {
- cursor.moveToFirst();
- return cursor.getInt(0);
- } finally {
- cursor.close();
- }
- }
-}
diff --git a/src/com/aoleyun/os/push/tpush/po/XGNotification.java b/src/com/aoleyun/os/push/tpush/po/XGNotification.java
deleted file mode 100644
index 16e915f..0000000
--- a/src/com/aoleyun/os/push/tpush/po/XGNotification.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.aoleyun.os.push.tpush.po;
-
-public class XGNotification {
- private Integer id;
- private Long msg_id;
- private String title;
- private String content;
- private String activity;
- private int notificationActionType;
- private String update_time;
-
- public XGNotification() {
-
- }
-
- public XGNotification(Integer id, Long msg_id, String title,
- String content, String activity, int notificationActionType, String update_time) {
- super();
- this.id = id;
- this.msg_id = msg_id;
- this.title = title;
- this.content = content;
- this.activity = activity;
- this.notificationActionType = notificationActionType;
- this.update_time = update_time;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Long getMsg_id() {
- return msg_id;
- }
-
- public void setMsg_id(Long msg_id) {
- this.msg_id = msg_id;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- public String getUpdate_time() {
- return update_time;
- }
-
- public void setUpdate_time(String update_time) {
- this.update_time = update_time;
- }
-
- public String getActivity() {
- return activity;
- }
-
- public void setActivity(String activity) {
- this.activity = activity;
- }
-
- public int getNotificationActionType() {
- return notificationActionType;
- }
-
- public void setNotificationActionType(int notificationActionType) {
- this.notificationActionType = notificationActionType;
- }
-}
diff --git a/src/com/aoleyun/os/receiver/InstallResultReceiver.java b/src/com/aoleyun/os/receiver/InstallResultReceiver.java
index 730c6be..08996ea 100644
--- a/src/com/aoleyun/os/receiver/InstallResultReceiver.java
+++ b/src/com/aoleyun/os/receiver/InstallResultReceiver.java
@@ -51,7 +51,7 @@ public class InstallResultReceiver extends BroadcastReceiver {
// Log.e("fht", LEGACY_STATUS);
// Log.e("fht", STATUS_MESSAGE);
if (STATUS_MESSAGE != null && STATUS_MESSAGE.equals("INSTALL_SUCCEEDED")) {
-// ToastUtil.show(PACKAGE_NAME + "安装成功");
+// Toaster.show(PACKAGE_NAME + "安装成功");
}
}
}
diff --git a/src/com/aoleyun/os/touch/ItemClickHandler.java b/src/com/aoleyun/os/touch/ItemClickHandler.java
index e1addb9..a186393 100644
--- a/src/com/aoleyun/os/touch/ItemClickHandler.java
+++ b/src/com/aoleyun/os/touch/ItemClickHandler.java
@@ -46,7 +46,7 @@ import com.aoleyun.os.LauncherAppWidgetInfo;
import com.aoleyun.os.LauncherAppWidgetProviderInfo;
import com.aoleyun.os.uiuiutils.CustomDialog;
import com.aoleyun.os.uiuiutils.JGYUtils;
-import com.aoleyun.os.uiuiutils.ToastUtil;
+import com.hjq.toast.Toaster;
import com.aoleyun.os.base.BaseApplication;
import com.aoleyun.os.PromiseAppInfo;
import com.aoleyun.os.R;
@@ -141,7 +141,7 @@ public class ItemClickHandler {
onClickAppShortcut(v, (WorkspaceItemInfo) tag, launcher, sourceContainer);
dialog.dismiss();
} else {
- ToastUtil.showCenter("密码错误");
+ Toaster.show("密码错误");
}
}
@@ -187,57 +187,57 @@ public class ItemClickHandler {
return false;
}
if (JGYUtils.isDisable(context, pkg)) {
- ToastUtil.show("应用已被禁用");
+ Toaster.show("应用已被禁用");
return true;
}
switch (pkg) {
case "com.mediatek.camera":
case "com.android.camera2":
if (Settings.System.getInt(context.getContentResolver(), "qch_app_camera", 0) == 1) {
- ToastUtil.show("摄像头已禁止使用");
+ Toaster.show("摄像头已禁止使用");
return true;
}
break;
case "com.android.gallery3d":
if (Settings.System.getInt(context.getContentResolver(), "qch_app_gallery", 1) == 1) {
- ToastUtil.show("图库已禁止使用");
+ Toaster.show("图库已禁止使用");
return true;
}
break;
case "com.android.documentsui":
if (Settings.System.getInt(context.getContentResolver(), "qch_app_filemanager", 1) == 1) {
- ToastUtil.show("文件已禁止使用");
+ Toaster.show("文件已禁止使用");
return true;
}
break;
case "com.android.deskclock":
if (Settings.System.getInt(context.getContentResolver(), "qch_app_deskclock", 0) == 1) {
- ToastUtil.show("时钟已禁止使用");
+ Toaster.show("时钟已禁止使用");
return true;
}
break;
case "com.android.music":
if (Settings.System.getInt(context.getContentResolver(), "qch_app_music", 1) == 1) {
- ToastUtil.show("音乐已禁止使用");
+ Toaster.show("音乐已禁止使用");
return true;
}
break;
case "com.android.soundrecorder":
if (Settings.System.getInt(context.getContentResolver(), "qch_app_soundrecorder", 1) == 1) {
- ToastUtil.show("录音机已禁止使用");
+ Toaster.show("录音机已禁止使用");
return true;
}
break;
case "com.aoleyun.browser":
case "com.android.browser":
if (Settings.System.getInt(context.getContentResolver(), "qch_app_browser", 1) == 1) {
- ToastUtil.show("浏览器已禁止使用");
+ Toaster.show("浏览器已禁止使用");
return true;
}
break;
case "com.android.messaging":
if (Settings.System.getInt(context.getContentResolver(), "qch_app_sms", 1) == 1) {
- ToastUtil.show("短信已禁止使用");
+ Toaster.show("短信已禁止使用");
return true;
}
break;
diff --git a/src/com/aoleyun/os/uiuiutils/ApkUtils.java b/src/com/aoleyun/os/uiuiutils/ApkUtils.java
index 472420e..4c9f744 100644
--- a/src/com/aoleyun/os/uiuiutils/ApkUtils.java
+++ b/src/com/aoleyun/os/uiuiutils/ApkUtils.java
@@ -17,6 +17,7 @@ import androidx.annotation.RequiresApi;
import com.aoleyun.os.BuildConfig;
import com.aoleyun.os.receiver.InstallResultReceiver;
+import com.hjq.toast.Toaster;
import java.io.BufferedReader;
import java.io.File;
@@ -45,7 +46,7 @@ public class ApkUtils {
return true;
} catch (Exception e) {
Log.e(TAG, "openPackage: " + e.getMessage());
- ToastUtil.show("打开失败");
+ Toaster.show("打开失败");
return false;
}
}
diff --git a/src/com/aoleyun/os/uiuiutils/JGYUtils.java b/src/com/aoleyun/os/uiuiutils/JGYUtils.java
index 2c17db7..94d2a30 100644
--- a/src/com/aoleyun/os/uiuiutils/JGYUtils.java
+++ b/src/com/aoleyun/os/uiuiutils/JGYUtils.java
@@ -40,6 +40,10 @@ public class JGYUtils {
public static final int HRAD13Platform = 11;
public static final int G10PPlatform = 12;
public static final int C2Platform = 13;
+ public static final int YXPD1Platform = 15;
+ public static final int G11Platform = 16;
+ public static final int MT8768Platform = 17;
+ public static final int AUDG104Platform = 18;
public static final String Other = "其他";
@@ -53,7 +57,10 @@ public class JGYUtils {
public static final String HRAD13Tag = "HRAD13";
public static final String G10PTag = "G10P";
public static final String C2Tag = "MTK8183";
-
+ public static final String YXPD1TAG = "YXPD1";
+ public static final String G11TAG = "MTKG11";
+ public static final String MT8768Tag = "MT8768";
+ public static final String AUDG104Tag = "AUDG104";
private JGYUtils(Context context) {
if (context == null) {
@@ -105,6 +112,9 @@ public class JGYUtils {
} else if (C2Tag.equalsIgnoreCase(platform)) {
Log.i(TAG, "checkAppPlatform: " + "C2");
return C2Platform;
+ } else if (AUDG104Tag.equalsIgnoreCase(platform)) {
+ Log.i(TAG, "checkAppPlatform: " + "AUDG104");
+ return AUDG104Platform;
} else {
Log.i(TAG, "checkAppPlatform: " + "没有数据");
return UnknowPlatform;
@@ -135,6 +145,8 @@ public class JGYUtils {
getAppPlatformCallback.AppPlatform(G10PPlatform);
} else if (C2Tag.equalsIgnoreCase(platform)) {
getAppPlatformCallback.AppPlatform(C2Platform);
+ } else if (AUDG104Tag.equalsIgnoreCase(platform)) {
+ getAppPlatformCallback.AppPlatform(AUDG104Platform);
} else {
getAppPlatformCallback.AppPlatform(UnknowPlatform);
}
diff --git a/src/com/aoleyun/os/uiuiutils/ToastUtil.java b/src/com/aoleyun/os/uiuiutils/ToastUtil.java
deleted file mode 100644
index 003ae02..0000000
--- a/src/com/aoleyun/os/uiuiutils/ToastUtil.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.aoleyun.os.uiuiutils;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.graphics.Color;
-import android.os.Build;
-import android.os.Handler;
-import android.os.Looper;
-import android.util.Log;
-import android.view.Gravity;
-import android.widget.Toast;
-
-import com.aoleyun.os.BuildConfig;
-import com.aoleyun.os.R;
-import com.blankj.utilcode.util.ColorUtils;
-import com.blankj.utilcode.util.ToastUtils;
-
-
-/**
- * Created by haoge on 2017/3/2.
- */
-
-public class ToastUtil {
- private static final String TAG = ToastUtil.class.getSimpleName();
- @SuppressLint("StaticFieldLeak")
- private static Context mContext;
- private static Handler mainHandler = new Handler(Looper.getMainLooper());
- private static Toast debugToast;
- private static Toast toast;
-
-
- @SuppressLint("ShowToast")
- public static void init(Context context) {
- mContext = context;
- toast = Toast.makeText(mContext, "", Toast.LENGTH_SHORT);
- debugToast = Toast.makeText(mContext, "", Toast.LENGTH_SHORT);
-
- }
-
- private static long time1 = 0L;
- private static long time2 = 0L;
-
- public static void show(final String msg) {
- ToastUtils.make()
-// .setBgColor(ColorUtils.getColor(R.color.toast_color))
- .setTextColor(Color.DKGRAY)
-// .setGravity(Gravity.CENTER, 0, 0)
- .setNotUseSystemToast()
- .show(msg);
- }
-
- public static void betaShow(final String msg) {
- if (JGYUtils.isBetaVersion() || BuildConfig.DEBUG) {
- ToastUtils.make()
-// .setBgColor(ColorUtils.getColor(R.color.toast_color))
- .setTextColor(Color.RED)
-// .setGravity(Gravity.CENTER, 0, 0)
- .setNotUseSystemToast()
- .setDurationIsLong(true)
- .show(msg);
- } else {
- Log.e(TAG, "debugShow: " + msg);
- }
- }
-
- public static void showCenter(final String msg) {
- ToastUtils.make()
- .setBgColor(ColorUtils.getColor(R.color.toast_color))
- .setTextColor(Color.WHITE)
- .setGravity(Gravity.CENTER, 0, 0)
- .setNotUseSystemToast()
- .show(msg);
- }
-
- private static Toast mToast = null;
-
- //android 8.0以后限制
- //https://www.jianshu.com/p/d9813ad03d59
- //https://www.jianshu.com/p/050ce052b873
- public static void showToast(Context context, String text, int duration) {
- if (Build.VERSION.SDK_INT == Build.VERSION_CODES.P) {
- Toast.makeText(context, text, duration).show();
- } else {
- if (mToast == null) {
- mToast = Toast.makeText(context, text, duration);
- } else {
- mToast.setText(text);
- mToast.setDuration(duration);
- }
- mToast.show();
- }
- }
-
- // public static void showInCenter(String msg) {
-// mainHandler.post(() -> {
-// if (toast != null) {
-// toast.setGravity(Gravity.CENTER, 0, 0);
-// toast.setText(msg);
-// toast.show();
-// }
-// });
-// }
-
-
-}