Forráskód Böngészése

1.升级jar包。
2,修改bugly上的问题。

石慧云 4 éve
szülő
commit
df27e851dd

+ 2 - 0
app/proguard-rules.pro

@@ -385,6 +385,8 @@
 # Application classes that will be serialized/deserialized over Gson
 -keep class com.quansu.heifengwuliu.model.** { *; }
 -keep class com.ysnows.base.model.** { *; }
+-keep class com.ysnows.base.route.** { *; }
+
 #保持 Parcelable 不被混淆
 -keep class * implements android.os.Parcelable {
   public static final android.os.Parcelable$Creator *;

+ 2 - 0
app/src/main/java/com/quansu/heifengwuliu/activity/CustomErrorActivity.kt

@@ -62,6 +62,8 @@ class CustomErrorActivity : MBActivity<BViewModel<BRepository>, ActivityErrorBin
 
 
     }
+
+
     override fun title(): String? {
         return "错误信息"
 

+ 1 - 1
app/src/main/java/com/quansu/heifengwuliu/config/Config.kt

@@ -5,7 +5,7 @@ import com.ysnows.base.config.IConfig
 class Config : IConfig {
     override fun baseUrl(): String {
         return "https://heifengwuliu.qs110.com/"
-       // return "https://heifengwuliudev.qs110.com/"
+       //return "https://heifengwuliudev.qs110.com/"
 
     }
 

+ 4 - 4
app/src/main/java/com/quansu/heifengwuliu/vmodel/WaybillDetailsVModel.kt

@@ -117,11 +117,11 @@ open class WaybillDetailsVModel(application: Application) : BViewModel<BReposito
                         if (it.ok()) {
 
                             info.value = it.data()
-                            is_collect.value=it.data()!!.driver.is_collect
+                            is_collect.value=it.data()?.driver?.is_collect
                             order_state = info.value!!.order.order_state
-                            if(info.value!!.is_baoxian==1&&info.value!!.info.is_insurance==1){
+                            if(info.value?.is_baoxian==1&&info.value?.info?.is_insurance==1){
                                 isInsureShow.value=true
-                                insureMoney.value=info.value!!.baoxian_money
+                                insureMoney.value=info.value?.baoxian_money
                             }else{
                                 isInsureShow.value=false
                             }
@@ -131,7 +131,7 @@ open class WaybillDetailsVModel(application: Application) : BViewModel<BReposito
                                 20 -> tvTitle.value = "运输轨迹"
                                 30 -> {
                                     tvTitle.value = "去结算"
-                                    number = info.value!!.order.t_nums
+                                    number = info.value?.order?.t_nums
                                     modifyTime.value = info.value!!.order.sd_time
                                     nopath.addAll(info.value!!.order.t_img)
 

BIN
app/src/main/res/mipmap-hdpi/ic_launcher.png


BIN
app/src/main/res/mipmap-mdpi/ic_launcher.png


BIN
app/src/main/res/mipmap-xhdpi/ic_launcher.png


BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher.png


BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher.png


+ 1 - 2
gaode/build.gradle

@@ -53,8 +53,7 @@ dependencies {
     // implementation (name:'locationsdk-1.0.0', ext:'aar')
 
 
-
-    implementation files('libs/locationsdk-1.0.0.aar')
+    provided files('libs/locationsdk-1.0.0.aar')
 
 
 

+ 7 - 2
jpush/build.gradle

@@ -33,14 +33,19 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
+    packagingOptions {
+        doNotStrip '*/mips/*.so'
+        doNotStrip '*/mips64/*.so'
+    }
+
 }
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     implementation 'cn.jiguang.sdk:jverification:2.6.4'  // 此处以2.6.4 版本为例。
-    implementation 'cn.jiguang.sdk:jcore:2.4.2'  // 此处以JCore 2.3.4 版本为例。
+    implementation 'cn.jiguang.sdk:jcore:2.5.5'  // 此处以JCore 2.3.4 版本为例。
 
-    implementation 'cn.jiguang.sdk:jpush:3.7.0'
+    implementation 'cn.jiguang.sdk:jpush:3.8.6'
 
     implementation project(':base')
 }

+ 1 - 0
settings.gradle

@@ -5,3 +5,4 @@ include ':gaode'
 //include ':lookimg'
 
 include ':app',':base'
+

+ 3 - 3
umeng/build.gradle

@@ -39,6 +39,6 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation project(':base')
-    implementation files('libs/umeng-asms-armeabi-v1.1.3.aar')
-    implementation files('libs/umeng-crash-armeabi-v0.0.4.aar')
-}
+    provided files('libs/umeng-asms-armeabi-v1.1.3.aar')
+    provided files('libs/umeng-crash-armeabi-v0.0.5.aar')
+}

BIN
umeng/libs/umeng-common-9.2.4.jar


BIN
umeng/libs/umeng-common-9.3.0.jar


BIN
umeng/libs/umeng-crash-armeabi-v0.0.4.aar → umeng/libs/umeng-crash-armeabi-v0.0.5.aar