From c5478df95cb567885e631eb1742f9a5ad2f5b6d5 Mon Sep 17 00:00:00 2001 From: Administrator <981964879@qq.com> Date: Sat, 1 Aug 2020 17:16:29 +0800 Subject: [PATCH] =?UTF-8?q?version:2.0.1.9=20update:2020.08.1=20fix:?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=BA=E5=88=B6=E5=AE=89=E8=A3=85=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E9=87=8D=E5=A4=8D=E4=B8=8B=E8=BD=BD=EF=BC=8C=E7=A6=81?= =?UTF-8?q?=E6=AD=A2=E5=8D=87=E7=BA=A7=E5=BA=94=E7=94=A8=E5=8D=B8=E8=BD=BD?= =?UTF-8?q?=E5=90=8E=E6=97=A0=E6=B3=95=E5=AE=89=E8=A3=85=20add:=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=B5=8B=E8=AF=95=E5=9B=BE=E6=A0=87=EF=BC=8C=E5=A4=9A?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 59 ++++++++++++++---- app/src/beta/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 5982 bytes app/src/beta/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 5982 bytes app/src/beta/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 5982 bytes .../beta/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 5982 bytes .../beta/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 5982 bytes app/src/beta/res/values/strings.xml | 4 ++ app/src/main/AndroidManifest.xml | 7 ++- .../com/mjsheng/myappstore/MyApplication.java | 2 +- .../myappstore/activity/MainActivity.java | 9 ++- .../mjsheng/myappstore/network/Network.java | 9 ++- .../myappstore/server/InitJpushServer.java | 33 +++++++--- .../com/mjsheng/myappstore/utils/Utils.java | 45 ++++++++++--- jiaoguanyiInfo.iml | 2 +- local.properties | 4 +- 15 files changed, 136 insertions(+), 38 deletions(-) create mode 100644 app/src/beta/res/mipmap-hdpi/ic_launcher.png create mode 100644 app/src/beta/res/mipmap-mdpi/ic_launcher.png create mode 100644 app/src/beta/res/mipmap-xhdpi/ic_launcher.png create mode 100644 app/src/beta/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 app/src/beta/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 app/src/beta/res/values/strings.xml diff --git a/app/build.gradle b/app/build.gradle index a2a71cb..da208b3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,10 +15,10 @@ android { minSdkVersion 20 targetSdkVersion 29 -// versionCode 104 -// versionName "3.0.9"//测试jiaoguanyi.cn - versionCode 1006 - versionName "2.0.1.6"// 正式jiaoguanyi.com 双数正式 单数测试 +// versionCode 105 +// versionName "3.1.0"//测试jiaoguanyi.cn +// versionCode 1008 +// versionName "2.0.1.8"// 正式jiaoguanyi.com 双数正式 单数测试 multiDexEnabled true testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -26,14 +26,7 @@ android { exclude 'META-INF/rxjava.properties' } - /*********************************极光推送************************************/ - manifestPlaceholders = [ - JPUSH_PKGNAME: "com.jiaoguanyi.appstore", - JPUSH_APPKEY : "20f70bbeb78bad23eddd08d0", //JPush上注册的包名对应的appkey. - JPUSH_CHANNEL: "developer-default", //暂时填写默认值即可. - ] - /*********************************极光推送end************************************/ } lintOptions { checkReleaseBuilds false @@ -41,6 +34,46 @@ android { dexOptions { jumboMode true } + //多版本 + productFlavors { + official { + flavorDimensions "default" + versionCode 1009 + versionName "2.0.1.9"// 正式jiaoguanyi.com 双数正式 单数测试 + /*********************************极光推送************************************/ + manifestPlaceholders = [ + JPUSH_PKGNAME: "com.jiaoguanyi.appstore", + JPUSH_APPKEY : "20f70bbeb78bad23eddd08d0", //JPush上注册的包名对应的appkey. + JPUSH_CHANNEL: "developer-default", //暂时填写默认值即可. + ] + signingConfig signingConfigs.debug + /*********************************极光推送end************************************/ + buildConfigField "String", "ROOT_URL", '"https://partner.jiaoguanyi.com/api/"' + buildConfigField "String", "WebsocketURL", '"ws://47.107.133.19:1234"' + + } + + beta { + flavorDimensions "default" + versionCode 105 + versionName "3.1.0"//测试jiaoguanyi.cn + /*********************************极光推送************************************/ + manifestPlaceholders = [ + JPUSH_PKGNAME: "com.jiaoguanyi.appstore", + JPUSH_APPKEY : "52d81643665bb2cadacf0e9e", //JPush上注册的包名对应的appkey. + JPUSH_CHANNEL: "developer-default", //暂时填写默认值即可. + ] + signingConfig signingConfigs.debug + /*********************************极光推送end************************************/ + buildConfigField "String", "ROOT_URL", '"http://www.jiaoguanyi.cn/api/"' + buildConfigField "String", "WebsocketURL", '"ws://47.107.133.19:2345"' + + } + } + sourceSets { + beta.res.srcDirs = ['src/beta/res'] + } + //签名 signingConfigs { debug { @@ -72,7 +105,7 @@ android { variant.outputs.each { output -> def outputFile = output.outputFile if (outputFile != null) { - def fileName = "${appName()}-V${defaultConfig.versionName}-${releaseTime()}.apk" + def fileName = "${appName()}-${variant.versionCode}-V${variant.versionName}-${releaseTime()}-${buildType.name}.apk" output.outputFileName = new File(outputFile.parent, fileName) } } @@ -94,7 +127,7 @@ android { variant.outputs.each { output -> def outputFile = "" if (outputFile != null) { - def fileName = "${appName()}-${defaultConfig.versionCode}-V${defaultConfig.versionName}-${releaseTime()}.apk" + def fileName = "${appName()}-${variant.versionCode}-V${variant.versionName}-${releaseTime()}-${buildType.name}.apk" output.outputFileName = new File(outputFile, fileName) } diff --git a/app/src/beta/res/mipmap-hdpi/ic_launcher.png b/app/src/beta/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..e2eb09e863316eff59b5e0402ef7e8c130f84345 GIT binary patch literal 5982 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 X3~zYM5vuU#kGGb(o?5AjP0;@Uu-7sX literal 0 HcmV?d00001 diff --git a/app/src/beta/res/mipmap-mdpi/ic_launcher.png b/app/src/beta/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..e2eb09e863316eff59b5e0402ef7e8c130f84345 GIT binary patch literal 5982 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 X3~zYM5vuU#kGGb(o?5AjP0;@Uu-7sX literal 0 HcmV?d00001 diff --git a/app/src/beta/res/mipmap-xhdpi/ic_launcher.png b/app/src/beta/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..e2eb09e863316eff59b5e0402ef7e8c130f84345 GIT binary patch literal 5982 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 X3~zYM5vuU#kGGb(o?5AjP0;@Uu-7sX literal 0 HcmV?d00001 diff --git a/app/src/beta/res/mipmap-xxhdpi/ic_launcher.png b/app/src/beta/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..e2eb09e863316eff59b5e0402ef7e8c130f84345 GIT binary patch literal 5982 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 X3~zYM5vuU#kGGb(o?5AjP0;@Uu-7sX literal 0 HcmV?d00001 diff --git a/app/src/beta/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/beta/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..e2eb09e863316eff59b5e0402ef7e8c130f84345 GIT binary patch literal 5982 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 X3~zYM5vuU#kGGb(o?5AjP0;@Uu-7sX literal 0 HcmV?d00001 diff --git a/app/src/beta/res/values/strings.xml b/app/src/beta/res/values/strings.xml new file mode 100644 index 0000000..b3cd6ec --- /dev/null +++ b/app/src/beta/res/values/strings.xml @@ -0,0 +1,4 @@ + + + 设备信息测试 + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 25c3df0..e2f5877 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -28,7 +28,8 @@ + android:protectionLevel="signature" /> + @@ -109,7 +110,7 @@ - + @@ -291,7 +292,7 @@ android:value="developer-default" /> + android:value="${JPUSH_APPKEY}" /> \ No newline at end of file diff --git a/app/src/main/java/com/mjsheng/myappstore/MyApplication.java b/app/src/main/java/com/mjsheng/myappstore/MyApplication.java index a2cf1c8..0dce20e 100644 --- a/app/src/main/java/com/mjsheng/myappstore/MyApplication.java +++ b/app/src/main/java/com/mjsheng/myappstore/MyApplication.java @@ -171,7 +171,7 @@ public class MyApplication extends MultiDexApplication { startService(new Intent(this, MyDownloadService.class)); } registerTimeReceiver(); - ignoreBatteryOptimization(this); +// ignoreBatteryOptimization(this); } diff --git a/app/src/main/java/com/mjsheng/myappstore/activity/MainActivity.java b/app/src/main/java/com/mjsheng/myappstore/activity/MainActivity.java index 40ceba2..298fa65 100644 --- a/app/src/main/java/com/mjsheng/myappstore/activity/MainActivity.java +++ b/app/src/main/java/com/mjsheng/myappstore/activity/MainActivity.java @@ -206,7 +206,7 @@ public class MainActivity extends AppCompatActivity { // setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); // } requestPermission(); - acquireWakeLock(); +// acquireWakeLock();//加入后锁屏解锁有延迟 registerMessageReceiver(); // used for receive msg // HTTPInterface.checkDevicesInfo(handler); startService(new Intent(MainActivity.this, MyDownloadService.class)); @@ -508,7 +508,7 @@ public class MainActivity extends AppCompatActivity { lazyLoading(); } } else if (code == -300) { - ApkUtils.uninstallAllApp(MainActivity.this); +// ApkUtils.uninstallAllApp(MainActivity.this); } } @@ -1049,6 +1049,7 @@ public class MainActivity extends AppCompatActivity { private void writeAppPackageList(String result) { String appstore = "com.jiaoguanyi.appstore"; String store = "com.jiaoguanyi.store"; + String iflytek = "iflytek.eface2sdk"; if (!TextUtils.isEmpty(result)) { LogUtils.e(result); if (!result.contains(appstore)) { @@ -1057,6 +1058,10 @@ public class MainActivity extends AppCompatActivity { if (!result.contains(store)) { result = result + "," + store; } + if (!result.contains(iflytek)) { + result = result + "," + iflytek; + } + //人脸识别 boolean b = Settings.System.putString(getContentResolver(), "qch_app_forbid", result); Log.e("mjsheng", "qch_app_forbid is :" + b + Settings.System.getString(getContentResolver(), "qch_app_forbid")); diff --git a/app/src/main/java/com/mjsheng/myappstore/network/Network.java b/app/src/main/java/com/mjsheng/myappstore/network/Network.java index 45315fe..953ccc1 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/Network.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/Network.java @@ -1,9 +1,11 @@ package com.mjsheng.myappstore.network; +import android.os.Build; import android.os.Environment; import android.util.Log; +import com.mjsheng.myappstore.BuildConfig; import com.mjsheng.myappstore.network.api.AppLimitApi; import com.mjsheng.myappstore.network.api.BrankPicApi; import com.mjsheng.myappstore.network.api.CategoryPicApi; @@ -41,10 +43,12 @@ public class Network { // public static final String ROOT_URL = "http://www.as.xueshibao.com.cn/api/"; 弃用 // public static final String ROOT_URL = "https://www.jiaoguanyi.com/api/";//正式 弃用 - public static final String ROOT_URL = "https://partner.jiaoguanyi.com/api/";//正式 - public static final String WebsocketURL = "ws://47.107.133.19:1234"; + // public static final String ROOT_URL = "https://partner.jiaoguanyi.com/api/";//正式 +// public static final String WebsocketURL = "ws://47.107.133.19:1234"; // public static final String ROOT_URL = "http://www.jiaoguanyi.cn/api/";//测试 // public static final String WebsocketURL = "ws://47.107.133.19:2345"; + public static final String ROOT_URL = BuildConfig.ROOT_URL; + public static final String WebsocketURL = BuildConfig.WebsocketURL; private static UploadAppInfoApi uploadAppInfoApi; private static DeselectIDApi deselectIDApi; @@ -250,6 +254,7 @@ public class Network { Log.e("mjsheng", "forceDownloadApi"); return forceDownloadApi; } + public static GetLockState getLockState() { if (getLockState == null) { Retrofit retrofit = new Retrofit.Builder() diff --git a/app/src/main/java/com/mjsheng/myappstore/server/InitJpushServer.java b/app/src/main/java/com/mjsheng/myappstore/server/InitJpushServer.java index 8b59bfc..90ccefa 100644 --- a/app/src/main/java/com/mjsheng/myappstore/server/InitJpushServer.java +++ b/app/src/main/java/com/mjsheng/myappstore/server/InitJpushServer.java @@ -2,9 +2,12 @@ package com.mjsheng.myappstore.server; import android.app.Service; import android.content.Context; +import android.content.ContextWrapper; import android.content.Intent; +import android.content.IntentFilter; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; +import android.os.BatteryManager; import android.os.Build; import android.os.Handler; import android.os.IBinder; @@ -23,6 +26,7 @@ import com.lzy.okgo.OkGo; import com.lzy.okgo.callback.StringCallback; import com.mjsheng.myappstore.BuildConfig; import com.mjsheng.myappstore.MyApplication; +import com.mjsheng.myappstore.activity.MainActivity; import com.mjsheng.myappstore.bean.ForceDownloadBean; import com.mjsheng.myappstore.bean.ForceDownloadData; import com.mjsheng.myappstore.bean.NetAndLaunchBean; @@ -299,7 +303,7 @@ public class InitJpushServer extends Service { } private void writeAppPackageList(String result) { - ApkUtils. addShortcut(this, result);//开机之后添加图标到桌面 + ApkUtils.addShortcut(this, result);//开机之后添加图标到桌面 String appstore = "com.jiaoguanyi.appstore"; String store = "com.jiaoguanyi.store"; if (!TextUtils.isEmpty(result)) { @@ -315,12 +319,13 @@ public class InitJpushServer extends Service { } else { Log.e("mjsheng", "writeAppPackageList is null:"); } - deleteOtherApp(result); + int locked = Settings.System.getInt(InitJpushServer.this.getContentResolver(), "qch_unlock_ipad", 1); + if (locked == 0) { + deleteOtherApp(result); + } } - - private void deleteOtherApp(String packageList) { Log.e("deleteOtherApp", "packageList:" + packageList); String[] result = packageList.split(","); @@ -812,7 +817,7 @@ public class InitJpushServer extends Service { } } else if (code == -300) { - ApkUtils.uninstallAllApp(InitJpushServer.this); +// ApkUtils.uninstallAllApp(InitJpushServer.this); } } @@ -826,13 +831,27 @@ public class InitJpushServer extends Service { } - synchronized private void resetDevice() { + private void resetDevice() { boolean isReset = MySQLData.GetBooleanData(this, CommonDatas.IS_RESET); - if (isReset) { + int batteryLevel = getBatteryLevel(); + LogUtils.e(batteryLevel + "------------------" + isReset); + if (isReset && batteryLevel >= CommonDatas.MIN_POWER) { Utils.doMasterClear(this); } } + private int getBatteryLevel() { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + BatteryManager batteryManager = (BatteryManager) getSystemService(BATTERY_SERVICE); + return batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY); + } else { + Intent intent = new ContextWrapper(InitJpushServer.this). + registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED)); + return (intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1) * 100) / + intent.getIntExtra(BatteryManager.EXTRA_SCALE, -1); + } + } + private void checkUpdate() { HTTPInterface.checkUpdate(mHandler, "com.jiaoguanyi.store"); } diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/Utils.java b/app/src/main/java/com/mjsheng/myappstore/utils/Utils.java index a2b4d1a..77e8209 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/Utils.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/Utils.java @@ -42,6 +42,7 @@ import android.widget.Toast; import com.alibaba.fastjson.JSONObject; import com.arialyy.aria.core.Aria; import com.blankj.utilcode.util.EncryptUtils; +import com.blankj.utilcode.util.FileUtils; import com.blankj.utilcode.util.PathUtils; import com.google.zxing.BarcodeFormat; import com.google.zxing.EncodeHintType; @@ -53,6 +54,7 @@ import com.mjsheng.myappstore.R; import com.mjsheng.myappstore.MyApplication; import com.mjsheng.myappstore.comm.CommonDatas; +import java.io.File; import java.io.FileReader; import java.io.InputStreamReader; import java.io.LineNumberReader; @@ -937,6 +939,12 @@ public class Utils { if (ApkUtils.isAvailable(context, s)) { allList.remove(s); //去掉已经安装的 + } else { + if (allList.indexOf(s) == -1) { + allList.add(s); + } + //没有安装就加入进去 + //没有加入会导致安装后卸载不能再安装的情况 } } } @@ -978,21 +986,44 @@ public class Utils { return url.substring(position + 1); } - private String getMD5fromFileName(String fileName) { + private static String getMD5fromFileName(String fileName) { int position = fileName.lastIndexOf("/"); - return fileName.substring(position + 9); + + return fileName.substring(position + 9, fileName.length() - 4); } public static void ariaDownload(Context context, String url, JSONObject jsonObject) { String fileName = getFileNamefromURL(url); - Aria.download(context) - .load(url) //读取下载地址 - .setFilePath(PathUtils.getExternalDownloadsPath() + "/jgy/" + fileName, true) - .setExtendField(jsonObject.toJSONString()) - .create(); //启动下载} + String urlMD5 = jsonObject.getString("MD5"); + Log.e("ariaDownload", "urlMD5=" + urlMD5); + File file = new File(PathUtils.getExternalDownloadsPath() + "/jgy/" + fileName); + if (file.exists() && !file.isDirectory()) { + String filenameMD5 = getMD5fromFileName(url); + + String fileMD5 = FileUtils.getFileMD5ToString(file); + Log.e("ariaDownload", "filenameMD5=" + filenameMD5); + Log.e("ariaDownload", "fileMD5=" + fileMD5); + //后端还没有完成json字段的MD5，暂时用文件名获取 + if (fileMD5.equalsIgnoreCase(filenameMD5)) { + ApkUtils.installApp(context, file.getAbsolutePath()); + } else { + Aria.download(context) + .load(url) //读取下载地址 + .setFilePath(PathUtils.getExternalDownloadsPath() + "/jgy/" + fileName, true) + .setExtendField(jsonObject.toJSONString()) + .create(); //启动下载} // SaveListUtils.addDownLoadList(app_package); // } + } + } else { + Aria.download(context) + .load(url) //读取下载地址 + .setFilePath(PathUtils.getExternalDownloadsPath() + "/jgy/" + fileName, true) + .setExtendField(jsonObject.toJSONString()) + .create(); //启动下载} + } + } } diff --git a/jiaoguanyiInfo.iml b/jiaoguanyiInfo.iml index b89c795..0c823ed 100644 --- a/jiaoguanyiInfo.iml +++ b/jiaoguanyiInfo.iml @@ -13,7 +13,7 @@ - + \ No newline at end of file diff --git a/local.properties b/local.properties index 529dff7..3e5f772 100644 --- a/local.properties +++ b/local.properties @@ -4,5 +4,5 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Mon Feb 24 11:04:00 CST 2020 -sdk.dir=C\:\\Users\\Administrator\\AppData\\Local\\Android\\Sdk +#Mon Jul 20 16:54:17 CST 2020 +sdk.dir=G\:\\Sdk