Merge branch 'release/3.2.7'

kingsollyu · Jan 10, 2018 · f27fed3 · f27fed3
2 parents 34b7a8a + eeea454
commit f27fed3
Show file tree

Hide file tree

Showing 7 changed files with 232 additions and 15 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -22,8 +22,8 @@ android {
         applicationId "com.sollyu.xposed.hook.model"
         minSdkVersion 16
         targetSdkVersion 26
-        versionCode 587
-        versionName "3.2.6." + getGitVersion()
+        versionCode 588
+        versionName "3.2.7." + getGitVersion()
     }
     buildTypes {
         release {
@@ -47,7 +47,9 @@ android {
         ys168 {
             dimension "default"
         }
-
+        play {
+            dimension "default"
+        }
     }
     android.applicationVariants.all { variant ->
         variant.outputs.each { output ->

diff --git a/app/src/main/assets/app.env.phone.json b/app/src/main/assets/app.env.phone.json
@@ -1,8 +1,15 @@
 {
-  "VersionCode": 3,
-  "VersionName": "1.0.2",
-  "VersionCont": "增加了N多的手机机型",
+  "VersionCode": 4,
+  "VersionName": "1.0.3",
+  "VersionCont": "增加了常用的机型\n感谢应用变量吧linlinyuyuyu收集分享",
   "PhoneList": {
+    "8848": [
+      {
+        "phoneName": "8848 钛金手机M3",
+        "buildManufacturer": "Everest",
+        "buildModel": "8848 M3"
+      }
+    ],
     "华为": [
       {
         "phoneName": "荣耀7i",
@@ -24,6 +31,56 @@
         "buildManufacturer": "HUAWEI",
         "buildModel": "VTR-AL00"
       },
+      {
+        "phoneName": "P10 Plus",
+        "buildManufacturer": "HUAWEI",
+        "buildModel": "VKY-AL00"
+      },
+      {
+        "phoneName": "荣耀 V8",
+        "buildManufacturer": "HUAWEI",
+        "buildModel": "KNT-AL10"
+      },
+      {
+        "phoneName": "P9",
+        "buildManufacturer": "HUAWEI",
+        "buildModel": "EVA-AL00"
+      },
+      {
+        "phoneName": "P9 Plus",
+        "buildManufacturer": "HUAWEI",
+        "buildModel": "VIE-AL10"
+      },
+      {
+        "phoneName": "Nova",
+        "buildManufacturer": "HUAWEI",
+        "buildModel": "HUAWEI CAZ-AL00"
+      },
+      {
+        "phoneName": "Mate 9",
+        "buildManufacturer": "HUAWEI",
+        "buildModel": "MHA-AL00"
+      },
+      {
+        "phoneName": "Mate 9 Pro",
+        "buildManufacturer": "HUAWEI",
+        "buildModel": "LON-AL00"
+      },
+      {
+        "phoneName": "荣耀 Magic",
+        "buildManufacturer": "HUAWEI",
+        "buildModel": "NTS-AL00"
+      },
+      {
+        "phoneName": "Mate 9 Porsche Design",
+        "buildManufacturer": "HUAWEI",
+        "buildModel": "LON-AL00-PD"
+      },
+      {
+        "phoneName": "P10",
+        "buildManufacturer": "HUAWEI",
+        "buildModel": "VTR-AL00"
+      },
       {
         "phoneName": "P10 Plus",
         "buildManufacturer": "HUAWEI",
@@ -222,6 +279,16 @@
         "phoneName": "一加手机3",
         "buildManufacturer": "OnePlus",
         "buildModel": "OnePlus A3000"
+      },
+      {
+        "phoneName": "一加手机3T",
+        "buildManufacturer": "OnePlus",
+        "buildModel": "ONEPLUS A3010"
+      },
+      {
+        "phoneName": "一加手机5",
+        "buildManufacturer": "OnePlus",
+        "buildModel": "A5000"
       }
     ],
     "中兴": [
@@ -366,6 +433,11 @@
         "buildManufacturer": "samsung",
         "buildModel": "SM-G9550"
       },
+      {
+        "phoneName": " Galaxy Note 7",
+        "buildManufacturer": "samsung",
+        "buildModel": "SM-N9300"
+      },
       {
         "phoneName": "Galaxy C7",
         "buildManufacturer": "samsung",
@@ -407,6 +479,26 @@
         "phoneName": "Xperia Z3+",
         "buildManufacturer": "Sony",
         "buildModel": "E6533"
+      },
+      {
+        "phoneName": "Xperia X Performance",
+        "buildManufacturer": "Sony",
+        "buildModel": "F8132"
+      },
+      {
+        "phoneName": "Xperia XZs",
+        "buildManufacturer": "Sony",
+        "buildModel": "G8231"
+      },
+      {
+        "phoneName": "Xperia XZ Premium",
+        "buildManufacturer": "Sony",
+        "buildModel": "G8141"
+      },
+      {
+        "phoneName": "Xperia L1",
+        "buildManufacturer": "Sony",
+        "buildModel": "G3312"
       }
     ]
   }

diff --git a/app/src/main/java/com/sollyu/android/appenv/activitys/ActivityDetail.kt b/app/src/main/java/com/sollyu/android/appenv/activitys/ActivityDetail.kt
@@ -142,7 +142,7 @@ class ActivityDetail : ActivityBase() {
             }
             "com.tencent.tmgp.sgame" -> {
                 Snackbar.make(fab, "⚠️使用本软件可以打开王者荣耀高帧率模式\n但是也有很小的几率封号，望众知。", Snackbar.LENGTH_INDEFINITE).setAction("开启") {
-                    oieBuildManufacturer.rightEditText = "Xiaomi"
+                    oieBuildManufacturer.rightEditText = "OPPO"
                     oieBuildModel.rightEditText = "MIX"
                 }.show()
             }
@@ -658,7 +658,36 @@ class ActivityDetail : ActivityBase() {
     }
 
     private fun onItemClickRemoteRandom() {
-        Snackbar.make(fab, "后台维护中……", Snackbar.LENGTH_LONG).show()
+        val cookie = AgentWebConfig.getCookiesByUrl(AppEnvConstants.URL_APPENV_SERVER)
+        if (cookie.isNullOrEmpty()) {
+            MaterialDialog.Builder(activity).title(R.string.tip).content("没有检测到您登陆").positiveText(android.R.string.ok).show()
+            return
+        }
+
+        val materialDialog = MaterialDialog.Builder(activity).title(R.string.tip).content("正在获取数据……").progress(true, 0).cancelable(false).show()
+        OkHttpClient().newCall(Request.Builder().url(AppEnvConstants.URL_APPENV_RANDOM_PACKAGE).header("Cookie", cookie).build()).enqueue(object : Callback {
+            override fun onFailure(request: Request, e: IOException) {
+                materialDialog.dismiss()
+                activity.runOnUiThread { MaterialDialog.Builder(activity).title(R.string.tip).content("远程随机出现错误：\n" + Log.getStackTraceString(e)).positiveText(android.R.string.ok).show() }
+            }
+
+            override fun onResponse(response: Response) {
+                materialDialog.dismiss()
+                try {
+                    val serverResult = response.body().string()
+                    XLog.d(serverResult)
+                    val jsonObject = JSON.parseObject(serverResult)
+                    if (jsonObject.getInteger("ret") == 200) {
+                        activity.runOnUiThread { jsonObjectToUi(jsonObject.getJSONObject("data")) }
+                        activity.runOnUiThread { Snackbar.make(fab, "远程随机成功(扣除2次使用点数)", Snackbar.LENGTH_LONG).show() }
+                    } else {
+                        activity.runOnUiThread { MaterialDialog.Builder(activity).title(R.string.tip).content("远程随机出现错误：\n" + jsonObject.getString("msg")).positiveText(android.R.string.ok).show() }
+                    }
+                } catch (throwable: Throwable) {
+                    activity.runOnUiThread { MaterialDialog.Builder(activity).title(R.string.tip).content("远程随机出现错误：\n请确定您已经正确的登陆").positiveText(android.R.string.ok).show() }
+                }
+            }
+        })
     }
 
     private fun JSONObject.put(key: String, value: String, boolean: Boolean) {

diff --git a/app/src/main/java/com/sollyu/android/appenv/define/AppEnvConstants.java b/app/src/main/java/com/sollyu/android/appenv/define/AppEnvConstants.java
@@ -18,6 +18,7 @@ public class AppEnvConstants {
     public static final String URL_APPENV_SERVER           = URL_APPENV_HOST   + "/admin";
     public static final String URL_APPENV_UPLOAD_PACKAGE   = URL_APPENV_SERVER + "/api/upload/package";
     public static final String URL_APPENV_DOWNLOAD_PACKAGE = URL_APPENV_SERVER + "/api/download/package";
+    public static final String URL_APPENV_RANDOM_PACKAGE   = URL_APPENV_SERVER + "/api/random/package";
     public static final String URL_APPENV_SHARE_START      = URL_APPENV_HOST   + "/share";
     public static final String URL_APPENV_REPORT_PHONE     = URL_APPENV_HOST   + "/api/phone/report";
     public static final String URL_APPENV_REGISTER         = URL_APPENV_HOST   + "/api/register";

diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
@@ -107,8 +107,9 @@
                     "<br>"
 
                     "<h2>本版更新</h2>"
-                    "+ 增加启动时检测权限<br>"
-                    "~ 增加版本号 (ง •̀_•́)ง <br>"
+                    "+ 远程随机(扣除2次可使用点数)<br>"
+                    "+ 增加部分当下流行的机型<br>"
+                    "~ 修改王者荣耀高帧率机型为OPPO r11 plus<br>"
                     "<br>"
 
                     "<br>"

diff --git a/online/app.env.phone.json b/online/app.env.phone.json
@@ -1,8 +1,15 @@
 {
-  "VersionCode": 3,
-  "VersionName": "1.0.2",
-  "VersionCont": "增加了N多的手机机型",
+  "VersionCode": 4,
+  "VersionName": "1.0.3",
+  "VersionCont": "增加了常用的机型\n感谢应用变量吧linlinyuyuyu收集分享",
   "PhoneList": {
+    "8848": [
+      {
+        "phoneName": "8848 钛金手机M3",
+        "buildManufacturer": "Everest",
+        "buildModel": "8848 M3"
+      }
+    ],
     "华为": [
       {
         "phoneName": "荣耀7i",
@@ -24,6 +31,56 @@
         "buildManufacturer": "HUAWEI",
         "buildModel": "VTR-AL00"
       },
+      {
+        "phoneName": "P10 Plus",
+        "buildManufacturer": "HUAWEI",
+        "buildModel": "VKY-AL00"
+      },
+      {
+        "phoneName": "荣耀 V8",
+        "buildManufacturer": "HUAWEI",
+        "buildModel": "KNT-AL10"
+      },
+      {
+        "phoneName": "P9",
+        "buildManufacturer": "HUAWEI",
+        "buildModel": "EVA-AL00"
+      },
+      {
+        "phoneName": "P9 Plus",
+        "buildManufacturer": "HUAWEI",
+        "buildModel": "VIE-AL10"
+      },
+      {
+        "phoneName": "Nova",
+        "buildManufacturer": "HUAWEI",
+        "buildModel": "HUAWEI CAZ-AL00"
+      },
+      {
+        "phoneName": "Mate 9",
+        "buildManufacturer": "HUAWEI",
+        "buildModel": "MHA-AL00"
+      },
+      {
+        "phoneName": "Mate 9 Pro",
+        "buildManufacturer": "HUAWEI",
+        "buildModel": "LON-AL00"
+      },
+      {
+        "phoneName": "荣耀 Magic",
+        "buildManufacturer": "HUAWEI",
+        "buildModel": "NTS-AL00"
+      },
+      {
+        "phoneName": "Mate 9 Porsche Design",
+        "buildManufacturer": "HUAWEI",
+        "buildModel": "LON-AL00-PD"
+      },
+      {
+        "phoneName": "P10",
+        "buildManufacturer": "HUAWEI",
+        "buildModel": "VTR-AL00"
+      },
       {
         "phoneName": "P10 Plus",
         "buildManufacturer": "HUAWEI",
@@ -222,6 +279,16 @@
         "phoneName": "一加手机3",
         "buildManufacturer": "OnePlus",
         "buildModel": "OnePlus A3000"
+      },
+      {
+        "phoneName": "一加手机3T",
+        "buildManufacturer": "OnePlus",
+        "buildModel": "ONEPLUS A3010"
+      },
+      {
+        "phoneName": "一加手机5",
+        "buildManufacturer": "OnePlus",
+        "buildModel": "A5000"
       }
     ],
     "中兴": [
@@ -366,6 +433,11 @@
         "buildManufacturer": "samsung",
         "buildModel": "SM-G9550"
       },
+      {
+        "phoneName": " Galaxy Note 7",
+        "buildManufacturer": "samsung",
+        "buildModel": "SM-N9300"
+      },
       {
         "phoneName": "Galaxy C7",
         "buildManufacturer": "samsung",
@@ -407,6 +479,26 @@
         "phoneName": "Xperia Z3+",
         "buildManufacturer": "Sony",
         "buildModel": "E6533"
+      },
+      {
+        "phoneName": "Xperia X Performance",
+        "buildManufacturer": "Sony",
+        "buildModel": "F8132"
+      },
+      {
+        "phoneName": "Xperia XZs",
+        "buildManufacturer": "Sony",
+        "buildModel": "G8231"
+      },
+      {
+        "phoneName": "Xperia XZ Premium",
+        "buildManufacturer": "Sony",
+        "buildModel": "G8141"
+      },
+      {
+        "phoneName": "Xperia L1",
+        "buildManufacturer": "Sony",
+        "buildModel": "G3312"
       }
     ]
   }

diff --git a/online/app.env.soft.json b/online/app.env.soft.json
@@ -1,6 +1,6 @@
 {
-  "last-version-code": 587,
+  "last-version-code": 588,
   "last-version-name": "3.2.7",
-  "last-version-message": "~ xposed环境移除kotlin的依赖\n= 因家中有事，本版本没有通测\n= 所以依然有可能会增加BUG\n= 等事情结束了再说修改吧",
+  "last-version-message": "+ 远程随机(扣除2次可使用点数)\n+ 增加部分当下流行的机型\n~ 修改王者荣耀高帧率机型为OPPO r11 plus",
   "last-version-url": "https://github.com/kingsollyu/AppEnv-Kotlin/releases"
 }