version:2.2.3

update:
fix:
add:设置系统默认桌面接口和推送

app/build.gradle

@@ -41,9 +41,28 @@ android {
         //新平台正式
         newly {
             flavorDimensions "default"
-            versionCode 520
+            versionCode 623
             //versionCode 1037
-            versionName "2.2.0"
+            versionName "2.2.3"
+            /*********************************极光推送************************************/
+            manifestPlaceholders = [
+                    JPUSH_PKGNAME: "com.jiaoguanyi.appstore",
+                    JPUSH_APPKEY : "20f70bbeb78bad23eddd08d0", //JPush上注册的包名对应的appkey.
+                    JPUSH_CHANNEL: "developer-default", //暂时填写默认值即可.
+                    channel_value: "newly" ,
+//                    AMAP_KEY: "546eb5646a65ac6a5b7d1c7456466e05"
+            ]
+            /*********************************极光推送end************************************/
+            buildConfigField "String", "ROOT_URL", '"http://name.jiaoguanyi.cn/api/"'
+            buildConfigField "String", "WebsocketURL", '"ws://47.119.147.245:2345"'
+            buildConfigField "String", "SCREEN_URL", '"https://name.jiaoguanyi.cn:2018/wm/is_online"'
+        }
+
+        MTKnewly {
+            flavorDimensions "default"
+            versionCode 717
+            //versionCode 1037
+            versionName "2.1.7"
             /*********************************极光推送************************************/
             manifestPlaceholders = [
                     JPUSH_PKGNAME: "com.jiaoguanyi.appstore",
@@ -61,8 +80,10 @@ android {
         //新平台测试
         beta {
             flavorDimensions "default"
-            versionCode 530
-            versionName "2.2.0"
+            versionCode 2
+            versionName "1.1"
+//            versionCode 633
+//            versionName "2.2.3"
             /*********************************极光推送************************************/
             manifestPlaceholders = [
                     JPUSH_PKGNAME: "com.jiaoguanyi.appstore",
@@ -166,10 +187,17 @@ android {
         if (variant.buildType.name.endsWith('zhanRuiRelease')) {
             variant.setIgnore(variant.getFlavors().get(0).name.equals('official')||variant.getFlavors().get(0).name.equals('zhongyou'))
         }
-
         if (variant.buildType.name.endsWith('zhanRuiDebug')) {
             variant.setIgnore(variant.getFlavors().get(0).name.equals('official')||variant.getFlavors().get(0).name.equals('zhongyou'))
         }
+        if (name.contains("MTKnewly")){
+            variant.setIgnore(variant.buildType.name.endsWith("zhanRuiRelease")||variant.buildType.name.endsWith("zhanRuiDebug")||variant.buildType.name.endsWith("zhanRuiUserdebug")
+                    ||variant.buildType.name.endsWith("zhanRuiUserdebugReleas"))
+        }
+        if (name.endsWith("newlyDebug")||name.endsWith("newlyRelease")){
+            variant.setIgnore(!name.contains("MTK"))
+        }
+
 //        // Icon recents is Go only
 //        if (name.contains("WithQuickstepIconRecents") && !name.contains("l3go")) {
 //            variant.setIgnore(true)
@@ -209,6 +237,16 @@ android {
             signingConfig signingConfigs.zhanRuiUserdebug
         }
 
+        zhanRuiUserdebugReleas.initWith(release)
+        zhanRuiUserdebugReleas {
+            manifestPlaceholders = [
+                    AMAP_KEY: "546eb5646a65ac6a5b7d1c7456466e05"
+            ]
+            buildConfigField "String", "platform", '"ZhanRui"'
+            debuggable true
+            signingConfig signingConfigs.zhanRuiUserdebug
+        }
+
         debug {
             buildConfigField "String", "platform", '"MTK"'
             manifestPlaceholders = [
@@ -265,36 +303,47 @@ dependencies {
     //implementation fileTree(include: ['*.jar'], dir: 'libs')
     compileOnly files('src/main/libs/classes.jar')
 
-    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
-    testImplementation 'junit:junit:4.13.1'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     implementation 'com.jakewharton:butterknife:10.1.0'
     annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0'
     implementation 'uk.co.chrisjenx:calligraphy:2.3.0'
     implementation "org.java-websocket:Java-WebSocket:1.4.1"
-    implementation 'com.squareup.okhttp3:okhttp:4.6.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.1'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     implementation 'com.squareup.retrofit2:adapter-rxjava2:2.4.0'
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.5'
-    implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.8'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     //implementation "com.uber.autodispose:autodispose:1.3.0"
     //implementation "com.uber.autodispose:autodispose-android-archcomponents:1.3.0"
-    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'com.google.code.gson:gson:2.8.7'
     implementation 'com.google.zxing:core:3.3.0'
     implementation 'cn.jiguang.sdk:jpush:3.8.6'  // 此处以JPush 3.5.6 版本为例。
     implementation 'cn.jiguang.sdk:jcore:2.6.0'  // 此处以JCore 2.2.8 版本为例。
-    implementation 'com.alibaba:fastjson:1.2.70'
+    implementation 'com.alibaba:fastjson:1.2.76'
+    //逐渐弃用，几年没更新了
     implementation 'com.lzy.net:okgo:2.1.4'
     implementation 'com.lzy.net:okrx:0.1.2'
     //implementation 'com.lzy.net:okserver:1.1.3'
-    implementation 'com.blankj:utilcode:1.23.7'
+    //okhttp框架
+    implementation 'com.github.liujingxing.rxhttp:rxhttp:2.6.5'
+    //implementation 'com.squareup.okhttp3:okhttp:4.9.1' //rxhttp v2.2.2版本起，需要手动依赖okhttp
+    annotationProcessor 'com.github.liujingxing.rxhttp:rxhttp-compiler:2.6.5' //生成RxHttp类，纯Java项目，请使用annotationProcessor代替kapt
+    implementation 'com.github.liujingxing.rxlife:rxlife-coroutine:2.1.0' //管理协程生命周期，页面销毁，关闭请求
+    //rxjava2   (RxJava2/Rxjava3二选一，使用asXxx方法时必须)
+    //implementation 'io.reactivex.rxjava2:rxjava:2.2.8'
+    //implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
+    implementation 'com.github.liujingxing.rxlife:rxlife-rxjava2:2.1.0' //管理RxJava2生命周期，页面销毁，关闭请求
+
+    implementation 'com.blankj:utilcodex:1.30.6'
     implementation 'com.arialyy.aria:core:3.8.15'
     annotationProcessor 'com.arialyy.aria:compiler:3.8.15'
     //高德地图定位
@@ -321,5 +370,6 @@ preBuild {
         }
     }
     //https://www.pianshen.com/article/93481144911/
+    //https://blog.csdn.net/dhl_1986/article/details/102856026
     //使用系统编译后的framework.jar
 }