升级版本至1.0.1, 升级XUpdate的版本

Author: xuexiangjys

README.md

@@ -37,10 +37,10 @@ allprojects {
 2.然后在dependencies添加:
 
 ```
-   implementation 'com.github.xuexiangjys:XUpdate:2.0.6'
-   implementation 'com.github.xuexiangjys.XUpdateAPI:xupdate-easy:1.0.0'
+   implementation 'com.github.xuexiangjys:XUpdate:2.0.9'
+   implementation 'com.github.xuexiangjys.XUpdateAPI:xupdate-easy:1.0.1'
    // 如果需要使用断点续传下载功能的话添加该依赖（可选）
-   implementation 'com.github.xuexiangjys.XUpdateAPI:xupdate-downloader-aria:1.0.0'
+   implementation 'com.github.xuexiangjys.XUpdateAPI:xupdate-downloader-aria:1.0.1'
 ```
 
 3.自定义初始化配置（可选）

app/build.gradle

@@ -92,11 +92,11 @@ dependencies {
     androidTestImplementation deps.runner
     androidTestImplementation deps.espresso.core
 
-    implementation 'com.github.xuexiangjys:XUpdate:2.0.6'
-//    implementation project(':xupdate-easy')
-//    implementation project(':xupdate-downloader-aria')
-    implementation 'com.github.xuexiangjys.XUpdateAPI:xupdate-easy:1.0.0'
-    implementation 'com.github.xuexiangjys.XUpdateAPI:xupdate-downloader-aria:1.0.0'
+    implementation 'com.github.xuexiangjys:XUpdate:2.0.9'
+    implementation project(':xupdate-easy')
+    implementation project(':xupdate-downloader-aria')
+//    implementation 'com.github.xuexiangjys.XUpdateAPI:xupdate-easy:1.0.0'
+//    implementation 'com.github.xuexiangjys.XUpdateAPI:xupdate-downloader-aria:1.0.0'
 
     implementation 'com.arialyy.aria:core:3.8.15'
     implementation deps.androidx.multidex

app/src/main/java/com/xuexiang/xupdateapi/fragment/EasyUpdateFragment.java

@@ -137,6 +137,11 @@ public void noNewVersion(Throwable throwable) {
 
     @MemoryCache
     private UpdateEntity getUpdateEntityFromAssets() {
-        return new DefaultUpdateParser().parseJson(ResourceUtils.readStringFromAssert("update_test.json"));
+        try {
+            return new DefaultUpdateParser().parseJson(ResourceUtils.readStringFromAssert("update_test.json"));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
     }
 }

app/src/main/java/com/xuexiang/xupdateapi/utils/sdkinit/XBasicLibInit.java

@@ -19,14 +19,13 @@
 
 import android.app.Application;
 
-import com.xuexiang.xupdateapi.MyApp;
-import com.xuexiang.xupdateapi.core.BaseActivity;
-import com.xuexiang.xupdateapi.utils.XToastUtils;
 import com.xuexiang.xaop.XAOP;
-import com.xuexiang.xpage.AppPageConfig;
 import com.xuexiang.xpage.PageConfig;
 import com.xuexiang.xrouter.launcher.XRouter;
 import com.xuexiang.xui.XUI;
+import com.xuexiang.xupdateapi.MyApp;
+import com.xuexiang.xupdateapi.core.BaseActivity;
+import com.xuexiang.xupdateapi.utils.XToastUtils;
 import com.xuexiang.xutil.XUtil;
 import com.xuexiang.xutil.common.StringUtils;
 
@@ -74,13 +73,7 @@ private static void initXUtil(Application application) {
      */
     private static void initXPage(Application application) {
         PageConfig.getInstance()
-                //页面注册
-                .setPageConfiguration(context -> {
-                    //自动注册页面,是编译时自动生成的，build一下就出来了
-                    return AppPageConfig.getInstance().getPages();
-                })
                 .debug(MyApp.isDebug() ? "PageLog" : null)
-                .enableWatcher(MyApp.isDebug())
                 .setContainActivityClazz(BaseActivity.class)
                 .init(application);
     }

app/x-library-simple.gradle

@@ -8,7 +8,7 @@ project.configurations.each { configuration ->
     if (configuration.name == "implementation") {
         //为Project加入X-Library依赖
         //XUI框架
-        configuration.dependencies.add(getProject().dependencies.create('com.github.xuexiangjys:XUI:1.1.5'))
+        configuration.dependencies.add(getProject().dependencies.create('com.github.xuexiangjys:XUI:1.1.7'))
         configuration.dependencies.add(getProject().dependencies.create(deps.androidx.appcompat))
         configuration.dependencies.add(getProject().dependencies.create(deps.androidx.recyclerview))
         configuration.dependencies.add(getProject().dependencies.create(deps.androidx.design))
@@ -18,31 +18,23 @@ project.configurations.each { configuration ->
         //XAOP切片，版本号前带x的是支持androidx的版本
         configuration.dependencies.add(getProject().dependencies.create('com.github.xuexiangjys.XAOP:xaop-runtime:1.1.0'))
         //XPage
-        configuration.dependencies.add(getProject().dependencies.create('com.github.xuexiangjys.XPage:xpage-lib:3.0.3'))
+        configuration.dependencies.add(getProject().dependencies.create('com.github.xuexiangjys.XPage:xpage-lib:3.1.1'))
         configuration.dependencies.add(getProject().dependencies.create(deps.butterknife.runtime))
         //XRouter
         configuration.dependencies.add(getProject().dependencies.create('com.github.xuexiangjys.XRouter:xrouter-runtime:1.0.1'))
     }
 
     if (configuration.name == "annotationProcessor") {
         //XPage
-        configuration.dependencies.add(getProject().dependencies.create('com.github.xuexiangjys.XPage:xpage-compiler:3.0.3'))
+        configuration.dependencies.add(getProject().dependencies.create('com.github.xuexiangjys.XPage:xpage-compiler:3.1.1'))
         configuration.dependencies.add(getProject().dependencies.create(deps.butterknife.compiler))
         //XRouter
         configuration.dependencies.add(getProject().dependencies.create('com.github.xuexiangjys.XRouter:xrouter-compiler:1.0.1'))
     }
 
     if (configuration.name == "debugImplementation") {
         //内存泄漏监测leak
-        configuration.dependencies.add(getProject().dependencies.create('com.squareup.leakcanary:leakcanary-android:1.6.3'))
-    }
-    if (configuration.name == "releaseImplementation") {
-        //内存泄漏监测leak
-        configuration.dependencies.add(getProject().dependencies.create('com.squareup.leakcanary:leakcanary-android-no-op:1.6.3'))
-    }
-    if (configuration.name == "testImplementation") {
-        //内存泄漏监测leak
-        configuration.dependencies.add(getProject().dependencies.create('com.squareup.leakcanary:leakcanary-android-no-op:1.6.3'))
+        configuration.dependencies.add(getProject().dependencies.create('com.squareup.leakcanary:leakcanary-android:2.6'))
     }
 }
 

versions.gradle

@@ -24,7 +24,7 @@ versions.rxbinding = "2.2.0"
 versions.butterknife = "10.1.0"
 versions.runner = "1.2.0"
 versions.gson = "2.8.5"
-versions.okhttp3 = "3.14.9"
+versions.okhttp3 = "3.12.12"
 
 def deps = [:]
 

xupdate-downloader-aria/build.gradle

@@ -36,7 +36,7 @@ dependencies {
     implementation deps.androidx.appcompat
     implementation 'com.arialyy.aria:core:3.8.15'
     compileOnly project(':xupdate-easy')
-    compileOnly 'com.github.xuexiangjys:XUpdate:2.0.6'
+    compileOnly 'com.github.xuexiangjys:XUpdate:2.0.9'
 }
 
 apply from: "../JitPackUpload.gradle"

xupdate-easy/build.gradle

@@ -36,7 +36,7 @@ dependencies {
     implementation deps.androidx.appcompat
     implementation deps.gson
     implementation deps.okhttp3
-    compileOnly 'com.github.xuexiangjys:XUpdate:2.0.6'
+    compileOnly 'com.github.xuexiangjys:XUpdate:2.0.9'
     implementation 'com.zhy:okhttputils:2.6.2'
 }
 

xupdate-easy/src/main/java/com/xuexiang/xupdate/easy/init/Utils.java

@@ -34,7 +34,7 @@ private Utils() {
         throw new UnsupportedOperationException("u can't instantiate me...");
     }
 
-    public static Application getApplicationByReflect() {
+    static Application getApplicationByReflect() {
         try {
             @SuppressLint("PrivateApi")
             Class<?> activityThread = Class.forName("android.app.ActivityThread");
@@ -64,7 +64,9 @@ public static Application getApplicationByReflect() {
      * @param <T>
      * @return 类型强转结果
      */
-    public static <T> T cast(final Object object, Class<T> clazz) {
+    static <T> T cast(final Object object, Class<T> clazz) {
         return clazz != null && clazz.isInstance(object) ? (T) object : null;
     }
+
+
 }

xupdate-easy/src/main/java/com/xuexiang/xupdate/easy/service/OkHttpUpdateHttpServiceImpl.java

@@ -19,9 +19,9 @@
 
 import androidx.annotation.NonNull;
 
+import com.google.gson.Gson;
 import com.xuexiang.xupdate.logs.UpdateLog;
 import com.xuexiang.xupdate.proxy.IUpdateHttpService;
-import com.xuexiang.xupdate.utils.UpdateUtils;
 import com.zhy.http.okhttp.OkHttpUtils;
 import com.zhy.http.okhttp.callback.FileCallBack;
 import com.zhy.http.okhttp.callback.StringCallback;
@@ -115,7 +115,7 @@ public void asyncPost(@NonNull String url, @NonNull Map<String, Object> params,
         if (mIsPostJson) {
             requestCall = OkHttpUtils.postString()
                     .url(url)
-                    .content(UpdateUtils.toJson(params))
+                    .content(toJson(params))
                     .mediaType(MediaType.parse("application/json; charset=utf-8"))
                     .build();
         } else {
@@ -189,5 +189,14 @@ private Map<String, String> transform(Map<String, Object> params) {
         return map;
     }
 
+    /**
+     * 把 单个指定类型的对象 转换为 JSON 字符串
+     *
+     * @param src 序列化的对象
+     * @return JSON 字符串
+     */
+    private static String toJson(Object src) {
+        return new Gson().toJson(src);
+    }
 
 }