From 1b83a79957806f99bb88635cff7f5e31c38e292f Mon Sep 17 00:00:00 2001 From: tongtongstudio Date: Wed, 18 May 2022 15:47:37 +0800 Subject: [PATCH] =?UTF-8?q?version:4.5=20fix:=20update:=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E8=8E=B7=E5=8F=96sn=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 8 +- ...nterface.aidl => SystemInfoInterface.aidl} | 7 +- .../sn/activity/main/MainAContact.java | 5 +- .../com/aoleyun/sn/bean/DownloadInfo.java | 76 +++++++++++++++++++ .../com/aoleyun/sn/service/RemoteService.java | 12 ++- .../com/aoleyun/sn/tpush/MessageReceiver.java | 34 +++++++-- 6 files changed, 117 insertions(+), 25 deletions(-) rename app/src/main/aidl/com/aoleyun/sn/{IGetLicenseInterface.aidl => SystemInfoInterface.aidl} (78%) create mode 100644 app/src/main/java/com/aoleyun/sn/bean/DownloadInfo.java diff --git a/app/build.gradle b/app/build.gradle index 8732af2..7d953d9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -83,8 +83,8 @@ android { //酷比魔方 cube { flavorDimensions "default" - versionCode 36 - versionName "4.5" + versionCode 38 + versionName "4.7" buildConfigField "String", "platform", '"ZhanRuiCube"' manifestPlaceholders = [ AMAP_KEY: "6e339305206eeb43f2b4cc1f31751f89" @@ -94,8 +94,8 @@ android { //MTK MTKnewly { flavorDimensions "default" - versionCode 13 - versionName "2.2" + versionCode 15 + versionName "2.4" buildConfigField "String", "platform", '"MTK"' manifestPlaceholders = [ AMAP_KEY: "1af68e0a7edcaac82678b1cbb7643408" diff --git a/app/src/main/aidl/com/aoleyun/sn/IGetLicenseInterface.aidl b/app/src/main/aidl/com/aoleyun/sn/SystemInfoInterface.aidl similarity index 78% rename from app/src/main/aidl/com/aoleyun/sn/IGetLicenseInterface.aidl rename to app/src/main/aidl/com/aoleyun/sn/SystemInfoInterface.aidl index db9cef7..34ab027 100644 --- a/app/src/main/aidl/com/aoleyun/sn/IGetLicenseInterface.aidl +++ b/app/src/main/aidl/com/aoleyun/sn/SystemInfoInterface.aidl @@ -1,14 +1,15 @@ -// IGetLicenseInterface.aidl +// SystemInfoInterface.aidl package com.aoleyun.sn; // Declare any non-default types here with import statements -interface IGetLicenseInterface { +interface SystemInfoInterface { /** * Demonstrates some basic types that you can use as parameters * and return values in AIDL. */ void basicTypes(int anInt, long aLong, boolean aBoolean, float aFloat, double aDouble, String aString); - String getLicense(); + + String getSerial(); } diff --git a/app/src/main/java/com/aoleyun/sn/activity/main/MainAContact.java b/app/src/main/java/com/aoleyun/sn/activity/main/MainAContact.java index b70003d..95af7eb 100644 --- a/app/src/main/java/com/aoleyun/sn/activity/main/MainAContact.java +++ b/app/src/main/java/com/aoleyun/sn/activity/main/MainAContact.java @@ -1,12 +1,11 @@ package com.aoleyun.sn.activity.main; -import android.graphics.Bitmap; import android.view.View; -import com.aoleyun.sn.bean.StudentsInfo; -import com.google.gson.JsonObject; import com.aoleyun.sn.base.BasePresenter; import com.aoleyun.sn.base.BaseView; +import com.aoleyun.sn.bean.StudentsInfo; +import com.google.gson.JsonObject; public class MainAContact { public interface Presenter extends BasePresenter { diff --git a/app/src/main/java/com/aoleyun/sn/bean/DownloadInfo.java b/app/src/main/java/com/aoleyun/sn/bean/DownloadInfo.java new file mode 100644 index 0000000..a049be7 --- /dev/null +++ b/app/src/main/java/com/aoleyun/sn/bean/DownloadInfo.java @@ -0,0 +1,76 @@ +package com.aoleyun.sn.bean; + +import androidx.annotation.NonNull; + +import com.google.gson.Gson; +import com.google.gson.JsonParser; +import com.google.gson.annotations.SerializedName; + +import java.io.Serializable; + +public class DownloadInfo implements Serializable { + private static final long serialVersionUID = 1098419795758711093L; + + String app_name; + @SerializedName(value = "bg",alternate = {"app_package","package"}) + String app_package; + String app_url; + long app_version_code; + String app_id; + @SerializedName("app_md5") + String MD5; + + public String getApp_name() { + return app_name; + } + + public void setApp_name(String app_name) { + this.app_name = app_name; + } + + public String getApp_package() { + return app_package; + } + + public void setApp_package(String app_package) { + this.app_package = app_package; + } + + public String getApp_url() { + return app_url; + } + + public void setApp_url(String app_url) { + this.app_url = app_url; + } + + public long getApp_version_code() { + return app_version_code; + } + + public void setApp_version_code(long app_version_code) { + this.app_version_code = app_version_code; + } + + public String getApp_id() { + return app_id; + } + + public void setApp_id(String app_id) { + this.app_id = app_id; + } + + public String getMD5() { + return MD5; + } + + public void setMD5(String MD5) { + this.MD5 = MD5; + } + + @NonNull + @Override + public String toString() { + return JsonParser.parseString(new Gson().toJson(this)).getAsJsonObject().toString(); + } +} diff --git a/app/src/main/java/com/aoleyun/sn/service/RemoteService.java b/app/src/main/java/com/aoleyun/sn/service/RemoteService.java index 3ebfef8..131c765 100644 --- a/app/src/main/java/com/aoleyun/sn/service/RemoteService.java +++ b/app/src/main/java/com/aoleyun/sn/service/RemoteService.java @@ -6,8 +6,8 @@ import android.os.IBinder; import android.os.RemoteException; import android.util.Log; -import com.aoleyun.sn.IGetLicenseInterface; -import com.aoleyun.sn.utils.SPUtils; +import com.aoleyun.sn.SystemInfoInterface; +import com.aoleyun.sn.utils.Utils; public class RemoteService extends Service { private String TAG = RemoteService.class.getSimpleName(); @@ -26,17 +26,15 @@ public class RemoteService extends Service { return super.onStartCommand(intent, flags, startId); } - IGetLicenseInterface.Stub mBinde = new IGetLicenseInterface.Stub() { + SystemInfoInterface.Stub mBinde = new SystemInfoInterface.Stub() { @Override public void basicTypes(int anInt, long aLong, boolean aBoolean, float aFloat, double aDouble, String aString) throws RemoteException { } @Override - public String getLicense() throws RemoteException { - String ebagCode = (String) SPUtils.get(RemoteService.this, "ebagCode", ""); - Log.e(TAG, "getLicense: " + ebagCode); - return ebagCode; + public String getSerial() throws RemoteException { + return Utils.getSerial(); } }; } diff --git a/app/src/main/java/com/aoleyun/sn/tpush/MessageReceiver.java b/app/src/main/java/com/aoleyun/sn/tpush/MessageReceiver.java index b8bf34c..8a4e5d8 100644 --- a/app/src/main/java/com/aoleyun/sn/tpush/MessageReceiver.java +++ b/app/src/main/java/com/aoleyun/sn/tpush/MessageReceiver.java @@ -1,6 +1,7 @@ package com.aoleyun.sn.tpush; import android.annotation.SuppressLint; +import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; import android.content.ContextWrapper; @@ -27,11 +28,14 @@ import com.amap.api.location.AMapLocationListener; import com.aoleyun.sn.R; import com.aoleyun.sn.base.BaseApplication; import com.aoleyun.sn.bean.BaseResponse; +import com.aoleyun.sn.bean.DownloadInfo; +import com.aoleyun.sn.bean.LogoImg; import com.aoleyun.sn.bean.RemoteDebug; import com.aoleyun.sn.bean.ScreenLockState; import com.aoleyun.sn.comm.CommonConfig; import com.aoleyun.sn.comm.JGYActions; import com.aoleyun.sn.disklrucache.CacheHelper; +import com.aoleyun.sn.gson.NullStringToEmptyAdapterFactory; import com.aoleyun.sn.manager.AmapManager; import com.aoleyun.sn.network.NetInterfaceManager; import com.aoleyun.sn.network.RetryCallback; @@ -52,6 +56,7 @@ import com.aoleyun.sn.utils.ToastUtil; import com.aoleyun.sn.utils.Utils; import com.arialyy.aria.core.Aria; import com.google.gson.Gson; +import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; @@ -767,13 +772,26 @@ public class MessageReceiver extends XGPushBaseReceiver { Log.e(TAG, "doDownloadAndInstall: extras is null"); return; } - JSONObject jSONObject = JSON.parseObject(jsonString); - String app_name = jSONObject.getString("app_name"); - String app_package = jSONObject.getString("bg"); - String app_url = jSONObject.getString("app_url"); - int app_version_code = jSONObject.getInteger("app_version_code"); - String app_id = jSONObject.getString("app_id"); - String MD5 = jSONObject.getString("app_md5"); + Gson gson = new GsonBuilder().registerTypeAdapterFactory(new NullStringToEmptyAdapterFactory()).create(); + Type type = new TypeToken() { + }.getType(); + DownloadInfo downloadInfo = gson.fromJson(jsonString, type); + Log.e("doDownloadAndInstall", "downloadInfo: " + downloadInfo); + + String app_name = downloadInfo.getApp_name(); + String app_package = downloadInfo.getApp_package(); + String app_url = downloadInfo.getApp_url(); + long app_version_code = downloadInfo.getApp_version_code(); + String app_id = downloadInfo.getApp_id(); + String MD5 = downloadInfo.getMD5(); + + if ("com.aoleyunos.dop1".equals(app_package) || "com.aoleyunos.dop2".equals(app_package)) { + Intent intent = new Intent("com.aoleyunos.dop.activity.refresh"); + intent.setPackage(app_package); +// intent.setComponent(new ComponentName(app_package, app_package + ".MainActivity")); + mContext.sendBroadcast(intent); + } + JSONObject packageObj = new JSONObject(); packageObj.put("app_name", app_name); packageObj.put("app_package", app_package); @@ -788,7 +806,7 @@ public class MessageReceiver extends XGPushBaseReceiver { e.printStackTrace(); } if (packageInfo == null) { - Log.e(TAG, "doDownloadAndInstall: " + app_package + "未安装"); + Log.e(TAG, "doDownloadAndInstall: " + app_package + " 未安装"); Utils.ariaDownload(mContext, app_url, packageObj); } else { long appVersionCode;