Merge remote-tracking branch 'origin/master'

app/build.gradle

@@ -129,4 +129,7 @@ dependencies {
    //选择图片
     implementation 'com.github.LuckSiege.PictureSelector:picture_library:v2.5.8'
 
+    //高仿微信朋友圈图片展示效果 ImageWatcher
+    implementation 'com.github.iielse:ImageWatcher:1.1.5'
+
 }

app/src/main/java/com/quansu/heifengwuliu/fragment/OrderListFragment.kt

@@ -17,7 +17,6 @@ class OrderListFragment : MBRFragment<OrderListVModel, OrderListAdapter, Fragmen
 
     override fun __before(savedInstanceState: Bundle?) {
         super.__before(savedInstanceState)
-        val arguments = arguments
         vm.infoState = arguments?.getString("info_state")
     }
 

app/src/main/java/com/quansu/heifengwuliu/fragment/OwnerMoreFragment.kt

@@ -255,7 +255,6 @@ class OwnerMoreFragment : MBFragment<OwnerMoreVModel, FragmentOwnermoreBinding>(
         if(null!=info.default_send){
             binding.viewHead.getTvCity()!!.text = info.default_send.province.name + info.default_send.city.name + info.default_send.area.name
             binding.viewHead.getEtDetailedAddress()!!.setText(info.default_send.address)
-            binding.viewHead.getTvChoseTime()!!.text = info.default_send.create_time
             binding.viewHead.getEtName()!!.setText(info.default_send.name)
             binding.viewHead.getEtPhone()!!.setText(info.default_send.mobile)
             lat_out = info.default_send.lat.toString()
@@ -263,7 +262,6 @@ class OwnerMoreFragment : MBFragment<OwnerMoreVModel, FragmentOwnermoreBinding>(
             area_out = info.default_send.area!!.code.toString()
             province_out = info.default_send.province!!.code.toString()
             city_out = info.default_send.city!!.code.toString()
-            time_out = info.default_send.create_time.toString()
         }
 
         binding.viewHead.getImgNext()!!.setOnClickListener {
@@ -401,7 +399,6 @@ class OwnerMoreFragment : MBFragment<OwnerMoreVModel, FragmentOwnermoreBinding>(
                 if (vm.type == 1) {
                     binding.viewHead.getTvCity()!!.text = item.province?.name + item.city?.name + item.area?.name
                     binding.viewHead.getEtDetailedAddress()!!.setText(item.address)
-                    binding.viewHead.getTvChoseTime()!!.text = item.create_time
                     binding.viewHead.getEtName()!!.setText(item.name)
                     binding.viewHead.getEtPhone()!!.setText(item.mobile)
                     lat_out = item.lat.toString()

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

@@ -361,7 +361,6 @@ class OwnerSingleFragment : MBFragment<OwnerSingleVModel, FragmentOwnersingleBin
         if(null!=info.default_send){
             binding.viewHead.getTvCity()!!.text = info.default_send.province.name + info.default_send.city.name + info.default_send.area.name
             binding.viewHead.getEtDetailedAddress()!!.setText(info.default_send.address)
-            binding.viewHead.getTvChoseTime()!!.text = info.default_send.create_time
             binding.viewHead.getEtName()!!.setText(info.default_send.name)
             binding.viewHead.getEtPhone()!!.setText(info.default_send.mobile)
             lat_out = info.default_send.lat.toString()
@@ -374,7 +373,6 @@ class OwnerSingleFragment : MBFragment<OwnerSingleVModel, FragmentOwnersingleBin
 
             binding.viewEnter.getTvCity()!!.text = info.default_receive.province?.name + info.default_receive.city?.name + info.default_receive.area?.name
             binding.viewEnter.getEtDetailedAddress()!!.setText(info.default_receive.address)
-            binding.viewEnter.getTvChoseTime()!!.text = info.default_receive.create_time
             binding.viewEnter.getEtName()!!.setText(info.default_receive.name)
             binding.viewEnter.getEtPhone()!!.setText(info.default_receive.mobile)
             lat_in = info.default_receive.lat.toString()
@@ -519,7 +517,6 @@ class OwnerSingleFragment : MBFragment<OwnerSingleVModel, FragmentOwnersingleBin
                 if (type == 1) {
                     binding.viewHead.getTvCity()!!.text = item.province?.name + item.city?.name + item.area?.name
                     binding.viewHead.getEtDetailedAddress()!!.setText(item.address)
-                    binding.viewHead.getTvChoseTime()!!.text = item.create_time
                     binding.viewHead.getEtName()!!.setText(item.name)
                     binding.viewHead.getEtPhone()!!.setText(item.mobile)
                     lat_out = item.lat.toString()
@@ -527,13 +524,11 @@ class OwnerSingleFragment : MBFragment<OwnerSingleVModel, FragmentOwnersingleBin
                     area_out = item.area!!.code.toString()
                     province_out = item.province!!.code.toString()
                     city_out = item.city!!.code.toString()
-                    time_out = item.create_time.toString()
 
                 } else {
 
                     binding.viewEnter.getTvCity()!!.text = item.province?.name + item.city?.name + item.area?.name
                     binding.viewEnter.getEtDetailedAddress()!!.setText(item.address)
-                    binding.viewEnter.getTvChoseTime()!!.text = item.create_time
                     binding.viewEnter.getEtName()!!.setText(item.name)
                     binding.viewEnter.getEtPhone()!!.setText(item.mobile)
                     lat_in = item.lat.toString()
@@ -541,7 +536,6 @@ class OwnerSingleFragment : MBFragment<OwnerSingleVModel, FragmentOwnersingleBin
                     area_in = item.area!!.code.toString()
                     province_in = item.province!!.code.toString()
                     city_in = item.city!!.code.toString()
-                    time_in = item.create_time.toString()
                 }
 
             }

app/src/main/java/com/quansu/heifengwuliu/model/InfoListBean.kt

@@ -16,7 +16,8 @@ data class InfoListBean(var info_id: String, var info_state: Int,
                         var is_insurance: String, var type: String,
                         var data: String, var pay_time: String,
                         var create_time: String, var update_time: String,
-                        var delete_time: String, var send: List<SendBean>,
+                        var delete_time: String, var qrcode:String,
+                        var send: List<SendBean>,
                         var receive: List<ReceiveBean>,var type_info:TypeInfoBean) : IModel {
 
     data class TypeInfoBean(var type_id: String,var type_name: String, @SerializedName("long") var longx: String,