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

1.修改车辆认证。

石慧云 4 éve
szülő
commit
8b2c106408
100 módosított fájl, 27 hozzáadás és 69 törlés
  1. 2 2
      app/src/main/java/com/quansu/heifengwuliu/activity/HomeActivity.kt
  2. 2 2
      app/src/main/java/com/quansu/heifengwuliu/config/Config.kt
  3. 1 1
      app/src/main/java/com/quansu/heifengwuliu/fragment/OwnerSingleFragment.kt
  4. 22 0
      app/src/main/java/com/quansu/heifengwuliu/vmodel/VehicleInfoVModel.kt
  5. 0 7
      app/src/main/res/anim/dialog_dismiss.xml
  6. 0 7
      app/src/main/res/anim/dialog_dismiss_to_top.xml
  7. 0 16
      app/src/main/res/anim/dialog_in_anim.xml
  8. 0 18
      app/src/main/res/anim/dialog_out_anim.xml
  9. 0 8
      app/src/main/res/anim/dialog_show.xml
  10. 0 8
      app/src/main/res/anim/dialog_show_from_top.xml
  11. BIN
      app/src/main/res/drawable-xxhdpi/begin_time_bg.png
  12. BIN
      app/src/main/res/drawable-xxhdpi/begin_time_bg.webp
  13. BIN
      app/src/main/res/drawable-xxhdpi/end_time_bg.png
  14. BIN
      app/src/main/res/drawable-xxhdpi/end_time_bg.webp
  15. BIN
      app/src/main/res/drawable-xxhdpi/ic_address.webp
  16. BIN
      app/src/main/res/drawable-xxhdpi/ic_app_info.webp
  17. BIN
      app/src/main/res/drawable-xxhdpi/ic_app_uninstall.webp
  18. BIN
      app/src/main/res/drawable-xxhdpi/ic_arrow_top.webp
  19. BIN
      app/src/main/res/drawable-xxhdpi/ic_check_update.png
  20. BIN
      app/src/main/res/drawable-xxhdpi/ic_check_update.webp
  21. BIN
      app/src/main/res/drawable-xxhdpi/ic_chose_driver.png
  22. BIN
      app/src/main/res/drawable-xxhdpi/ic_chose_driver.webp
  23. BIN
      app/src/main/res/drawable-xxhdpi/ic_chose_off.png
  24. BIN
      app/src/main/res/drawable-xxhdpi/ic_chose_off.webp
  25. BIN
      app/src/main/res/drawable-xxhdpi/ic_chose_on.png
  26. BIN
      app/src/main/res/drawable-xxhdpi/ic_chose_on.webp
  27. BIN
      app/src/main/res/drawable-xxhdpi/ic_chose_owner.png
  28. BIN
      app/src/main/res/drawable-xxhdpi/ic_chose_owner.webp
  29. BIN
      app/src/main/res/drawable-xxhdpi/ic_close.png
  30. BIN
      app/src/main/res/drawable-xxhdpi/ic_close.webp
  31. BIN
      app/src/main/res/drawable-xxhdpi/ic_company_bg.png
  32. BIN
      app/src/main/res/drawable-xxhdpi/ic_company_bg.webp
  33. BIN
      app/src/main/res/drawable-xxhdpi/ic_default_off.png
  34. BIN
      app/src/main/res/drawable-xxhdpi/ic_default_off.webp
  35. BIN
      app/src/main/res/drawable-xxhdpi/ic_default_on.png
  36. BIN
      app/src/main/res/drawable-xxhdpi/ic_default_on.webp
  37. BIN
      app/src/main/res/drawable-xxhdpi/ic_details_grab.png
  38. BIN
      app/src/main/res/drawable-xxhdpi/ic_details_grab.webp
  39. BIN
      app/src/main/res/drawable-xxhdpi/ic_details_phone.png
  40. BIN
      app/src/main/res/drawable-xxhdpi/ic_details_phone.webp
  41. BIN
      app/src/main/res/drawable-xxhdpi/ic_down.png
  42. BIN
      app/src/main/res/drawable-xxhdpi/ic_down.webp
  43. BIN
      app/src/main/res/drawable-xxhdpi/ic_enter.png
  44. BIN
      app/src/main/res/drawable-xxhdpi/ic_enter.webp
  45. BIN
      app/src/main/res/drawable-xxhdpi/ic_goods.png
  46. BIN
      app/src/main/res/drawable-xxhdpi/ic_goods.webp
  47. BIN
      app/src/main/res/drawable-xxhdpi/ic_google.webp
  48. BIN
      app/src/main/res/drawable-xxhdpi/ic_hot_search.webp
  49. BIN
      app/src/main/res/drawable-xxhdpi/ic_human_face.png
  50. BIN
      app/src/main/res/drawable-xxhdpi/ic_human_face.webp
  51. BIN
      app/src/main/res/drawable-xxhdpi/ic_identity_off.png
  52. BIN
      app/src/main/res/drawable-xxhdpi/ic_identity_off.webp
  53. BIN
      app/src/main/res/drawable-xxhdpi/ic_identity_on.png
  54. BIN
      app/src/main/res/drawable-xxhdpi/ic_identity_on.webp
  55. BIN
      app/src/main/res/drawable-xxhdpi/ic_item_address.png
  56. BIN
      app/src/main/res/drawable-xxhdpi/ic_item_address.webp
  57. BIN
      app/src/main/res/drawable-xxhdpi/ic_login_bg.png
  58. BIN
      app/src/main/res/drawable-xxhdpi/ic_login_bg.webp
  59. BIN
      app/src/main/res/drawable-xxhdpi/ic_long_arrow.png
  60. BIN
      app/src/main/res/drawable-xxhdpi/ic_long_arrow.webp
  61. BIN
      app/src/main/res/drawable-xxhdpi/ic_mine_bg.png
  62. BIN
      app/src/main/res/drawable-xxhdpi/ic_mine_bg.webp
  63. BIN
      app/src/main/res/drawable-xxhdpi/ic_mine_two.png
  64. BIN
      app/src/main/res/drawable-xxhdpi/ic_mine_two.webp
  65. BIN
      app/src/main/res/drawable-xxhdpi/ic_more_friend.png
  66. BIN
      app/src/main/res/drawable-xxhdpi/ic_more_friend.webp
  67. BIN
      app/src/main/res/drawable-xxhdpi/ic_more_moment.png
  68. BIN
      app/src/main/res/drawable-xxhdpi/ic_more_moment.webp
  69. BIN
      app/src/main/res/drawable-xxhdpi/ic_more_save.png
  70. BIN
      app/src/main/res/drawable-xxhdpi/ic_more_save.webp
  71. BIN
      app/src/main/res/drawable-xxhdpi/ic_msg.png
  72. BIN
      app/src/main/res/drawable-xxhdpi/ic_msg.webp
  73. BIN
      app/src/main/res/drawable-xxhdpi/ic_my_account.png
  74. BIN
      app/src/main/res/drawable-xxhdpi/ic_my_account.webp
  75. BIN
      app/src/main/res/drawable-xxhdpi/ic_my_collection.png
  76. BIN
      app/src/main/res/drawable-xxhdpi/ic_my_collection.webp
  77. BIN
      app/src/main/res/drawable-xxhdpi/ic_my_evaluate.png
  78. BIN
      app/src/main/res/drawable-xxhdpi/ic_my_evaluate.webp
  79. BIN
      app/src/main/res/drawable-xxhdpi/ic_my_invoice.png
  80. BIN
      app/src/main/res/drawable-xxhdpi/ic_my_invoice.webp
  81. BIN
      app/src/main/res/drawable-xxhdpi/ic_my_owner.png
  82. BIN
      app/src/main/res/drawable-xxhdpi/ic_my_owner.webp
  83. BIN
      app/src/main/res/drawable-xxhdpi/ic_my_service.png
  84. BIN
      app/src/main/res/drawable-xxhdpi/ic_my_service.webp
  85. BIN
      app/src/main/res/drawable-xxhdpi/ic_name_enter.png
  86. BIN
      app/src/main/res/drawable-xxhdpi/ic_name_enter.webp
  87. BIN
      app/src/main/res/drawable-xxhdpi/ic_name_out.png
  88. BIN
      app/src/main/res/drawable-xxhdpi/ic_name_out.webp
  89. BIN
      app/src/main/res/drawable-xxhdpi/ic_national_emblem.png
  90. BIN
      app/src/main/res/drawable-xxhdpi/ic_national_emblem.webp
  91. BIN
      app/src/main/res/drawable-xxhdpi/ic_out.png
  92. BIN
      app/src/main/res/drawable-xxhdpi/ic_out.webp
  93. BIN
      app/src/main/res/drawable-xxhdpi/ic_pen.png
  94. BIN
      app/src/main/res/drawable-xxhdpi/ic_pen.webp
  95. BIN
      app/src/main/res/drawable-xxhdpi/ic_phone_enter.png
  96. BIN
      app/src/main/res/drawable-xxhdpi/ic_phone_enter.webp
  97. BIN
      app/src/main/res/drawable-xxhdpi/ic_phone_out.png
  98. BIN
      app/src/main/res/drawable-xxhdpi/ic_phone_out.webp
  99. BIN
      app/src/main/res/drawable-xxhdpi/ic_qr.png
  100. BIN
      app/src/main/res/drawable-xxhdpi/ic_qr.webp

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

@@ -145,8 +145,8 @@ class HomeActivity : MBActivity<HomeVModel, ActivityHomeBinding>() {
 
         } else {
 
-            //val oneFragment = DeliverGoodsFragment()
-            val oneFragment =  OwnerSingleFragment()
+            val oneFragment = DeliverGoodsFragment()
+          //  val oneFragment =  OwnerSingleFragment()
             val twoFragment = WayBillFragment()
             val threeFragment = MineFragment()
 

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

@@ -7,8 +7,8 @@ class Config : IConfig {
       // return "https://heifengwuliu.qs110.com/"
      // return "https://heifengwuliudev.qs110.com/"
 
-     // return "https://xinyunbida.qs110.com/"
-     return "https://xinyunbidadev.qs110.com/"//注意:切换的时候注意切换buggly
+      return "https://xinyunbida.qs110.com/"
+    // return "https://xinyunbidadev.qs110.com/"//注意:切换的时候注意切换buggly
 
     }
 

+ 1 - 1
app/src/main/java/com/quansu/heifengwuliu/fragment/OwnerSingleFragment.kt

@@ -91,7 +91,7 @@ class OwnerSingleFragment : MBFragment<OwnerSingleVModel, FragmentOwnersingleBin
 
     override fun init(savedInstanceState: Bundle?) {
         super.init(savedInstanceState)
-        setShow()
+       // setShow()
         getData()
 
         vm.info.observe(this, Observer {

+ 22 - 0
app/src/main/java/com/quansu/heifengwuliu/vmodel/VehicleInfoVModel.kt

@@ -3,6 +3,7 @@ package com.quansu.heifengwuliu.vmodel
 import android.app.Activity
 import android.app.Application
 import android.text.TextUtils
+import android.util.Log
 import androidx.databinding.Bindable
 import androidx.lifecycle.MutableLiveData
 import com.hwangjr.rxbus.RxBus
@@ -215,7 +216,20 @@ class VehicleInfoVModel(application: Application) : BViewModel<BRepository>(appl
                             carBrand=bean.model
                             carUse=bean.use_character
                             number=bean.plate_num
+                            //车辆类型
+                            if(null!=info.value?.car_cate_z) {
 
+                                for (item in info.value!!.car_cate_z) {
+
+                                    if(item.name.contains(bean.vehicle_type)){
+                                        carCate_code= item.code
+                                        carCate.value = item.name
+                                       return@doOnNext
+                                    }
+
+                                }
+
+                            }
 
                         }else{//第二面
                             drivingSn=bean.record
@@ -230,6 +244,14 @@ class VehicleInfoVModel(application: Application) : BViewModel<BRepository>(appl
                             }else{
                                 carSizeH=ss[2]
                             }
+                            //总质量
+                            var totalQuality=bean.total_quality.substring(0,bean.total_quality.length-2)
+                            if(totalQuality.toDouble()/1000>4.5){
+                                tonnage.value=2
+                            }else{
+                                tonnage.value=1
+                            }
+
 
                         }
 

+ 0 - 7
app/src/main/res/anim/dialog_dismiss.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">  
-    <translate   
-        android:toYDelta="100%p"
-        android:interpolator="@android:anim/decelerate_interpolator"
-        android:duration="300" />
-</set> 

+ 0 - 7
app/src/main/res/anim/dialog_dismiss_to_top.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">  
-    <translate   
-        android:toYDelta="-100%p"
-        android:interpolator="@android:anim/decelerate_interpolator"
-        android:duration="300" />
-</set> 

+ 0 - 16
app/src/main/res/anim/dialog_in_anim.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android" >
-    <scale
-    android:duration = "400"
-    android:fromXScale="0.1"
-    android:toXScale="1.0"
-    android:fromYScale="0.1"
-    android:toYScale="1.0"
-    android:pivotX="50%"
-    android:pivotY="50%"/>
-
-    <alpha
-        android:duration="300"
-        android:fromAlpha="0.0"
-        android:toAlpha="1.0" />
-</set >

+ 0 - 18
app/src/main/res/anim/dialog_out_anim.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <scale
-        android:duration="400"
-        android:fromXScale="1.0"
-        android:fromYScale="1.0"
-        android:pivotX="50%"
-        android:pivotY="50%"
-        android:toXScale="1.2"
-        android:toYScale="1.2" />
-
-    <alpha
-        android:duration="300"
-        android:fromAlpha="1.0"
-        android:toAlpha="0.0" />
-
-</set >

+ 0 - 8
app/src/main/res/anim/dialog_show.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate
-        android:duration="300"
-        android:fromYDelta="100%p"
-        android:interpolator="@android:anim/accelerate_interpolator"
-    />
-</set> 

+ 0 - 8
app/src/main/res/anim/dialog_show_from_top.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate
-        android:duration="300"
-        android:fromYDelta="-100%p"
-        android:interpolator="@android:anim/accelerate_interpolator"
-    />
-</set>

BIN
app/src/main/res/drawable-xxhdpi/begin_time_bg.png


BIN
app/src/main/res/drawable-xxhdpi/begin_time_bg.webp


BIN
app/src/main/res/drawable-xxhdpi/end_time_bg.png


BIN
app/src/main/res/drawable-xxhdpi/end_time_bg.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_address.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_app_info.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_app_uninstall.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_arrow_top.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_check_update.png


BIN
app/src/main/res/drawable-xxhdpi/ic_check_update.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_chose_driver.png


BIN
app/src/main/res/drawable-xxhdpi/ic_chose_driver.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_chose_off.png


BIN
app/src/main/res/drawable-xxhdpi/ic_chose_off.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_chose_on.png


BIN
app/src/main/res/drawable-xxhdpi/ic_chose_on.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_chose_owner.png


BIN
app/src/main/res/drawable-xxhdpi/ic_chose_owner.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_close.png


BIN
app/src/main/res/drawable-xxhdpi/ic_close.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_company_bg.png


BIN
app/src/main/res/drawable-xxhdpi/ic_company_bg.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_default_off.png


BIN
app/src/main/res/drawable-xxhdpi/ic_default_off.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_default_on.png


BIN
app/src/main/res/drawable-xxhdpi/ic_default_on.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_details_grab.png


BIN
app/src/main/res/drawable-xxhdpi/ic_details_grab.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_details_phone.png


BIN
app/src/main/res/drawable-xxhdpi/ic_details_phone.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_down.png


BIN
app/src/main/res/drawable-xxhdpi/ic_down.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_enter.png


BIN
app/src/main/res/drawable-xxhdpi/ic_enter.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_goods.png


BIN
app/src/main/res/drawable-xxhdpi/ic_goods.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_google.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_hot_search.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_human_face.png


BIN
app/src/main/res/drawable-xxhdpi/ic_human_face.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_identity_off.png


BIN
app/src/main/res/drawable-xxhdpi/ic_identity_off.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_identity_on.png


BIN
app/src/main/res/drawable-xxhdpi/ic_identity_on.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_item_address.png


BIN
app/src/main/res/drawable-xxhdpi/ic_item_address.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_login_bg.png


BIN
app/src/main/res/drawable-xxhdpi/ic_login_bg.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_long_arrow.png


BIN
app/src/main/res/drawable-xxhdpi/ic_long_arrow.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_mine_bg.png


BIN
app/src/main/res/drawable-xxhdpi/ic_mine_bg.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_mine_two.png


BIN
app/src/main/res/drawable-xxhdpi/ic_mine_two.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_more_friend.png


BIN
app/src/main/res/drawable-xxhdpi/ic_more_friend.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_more_moment.png


BIN
app/src/main/res/drawable-xxhdpi/ic_more_moment.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_more_save.png


BIN
app/src/main/res/drawable-xxhdpi/ic_more_save.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_msg.png


BIN
app/src/main/res/drawable-xxhdpi/ic_msg.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_my_account.png


BIN
app/src/main/res/drawable-xxhdpi/ic_my_account.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_my_collection.png


BIN
app/src/main/res/drawable-xxhdpi/ic_my_collection.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_my_evaluate.png


BIN
app/src/main/res/drawable-xxhdpi/ic_my_evaluate.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_my_invoice.png


BIN
app/src/main/res/drawable-xxhdpi/ic_my_invoice.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_my_owner.png


BIN
app/src/main/res/drawable-xxhdpi/ic_my_owner.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_my_service.png


BIN
app/src/main/res/drawable-xxhdpi/ic_my_service.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_name_enter.png


BIN
app/src/main/res/drawable-xxhdpi/ic_name_enter.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_name_out.png


BIN
app/src/main/res/drawable-xxhdpi/ic_name_out.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_national_emblem.png


BIN
app/src/main/res/drawable-xxhdpi/ic_national_emblem.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_out.png


BIN
app/src/main/res/drawable-xxhdpi/ic_out.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_pen.png


BIN
app/src/main/res/drawable-xxhdpi/ic_pen.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_phone_enter.png


BIN
app/src/main/res/drawable-xxhdpi/ic_phone_enter.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_phone_out.png


BIN
app/src/main/res/drawable-xxhdpi/ic_phone_out.webp


BIN
app/src/main/res/drawable-xxhdpi/ic_qr.png


BIN
app/src/main/res/drawable-xxhdpi/ic_qr.webp


Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott