1.运单展示接单时间。

2.货主运单详情展示司机车牌号。

app/build.gradle

@@ -39,7 +39,6 @@ android {
             signingConfig signingConfigs.release
             versionNameSuffix "-" + name
 
-
         }
         release {
             debuggable false

app/src/main/java/com/quansu/heifengwuliu/App.java

@@ -1,9 +1,7 @@
 package com.quansu.heifengwuliu;
 
-import android.util.Log;
 
 import com.quansu.heifengwuliu.activity.CustomErrorActivity;
-import com.quansu.heifengwuliu.activity.HomeActivity;
 import com.quansu.heifengwuliu.config.Config;
 import com.quansu.heifengwuliu.utils.WeChatUtil;
 import com.ysnows.base.base.BApp;
@@ -12,9 +10,6 @@ import com.ysnows.base.config.IConfig;
 import com.ysnows.base.route.IGaode;
 import com.ysnows.base.route.IJpush;
 import com.ysnows.base.route.IUpdate;
-
-import cat.ereza.customactivityoncrash.CustomActivityOnCrash;
-import cat.ereza.customactivityoncrash.activity.DefaultErrorActivity;
 import cat.ereza.customactivityoncrash.config.CaocConfig;
 
 public class App extends BApp {
@@ -28,21 +23,29 @@ public class App extends BApp {
     protected void init() {
         app = this;
 
-        new Thread() {
-            @Override
-            public void run() {
-                super.run();
-
-                CCRetrofit.instance()
-                        .create(IUpdate.class)
-                        .init()
-                        .subscribe();
+//        new Thread() {
+//            @Override
+//            public void run() {
+//                super.run();
+//
+//                CCRetrofit.instance()
+//                        .create(IUpdate.class)
+//                        .init()
+//                        .subscribe();
+//
+//                //注册微信
+//                WeChatUtil.Companion.regToWx(app);
+//
+//            }
+//        }.start();
 
-                //注册微信
-                WeChatUtil.Companion.regToWx(app);
+        CCRetrofit.instance()
+                .create(IUpdate.class)
+                .init()
+                .subscribe();
 
-            }
-        }.start();
+        //注册微信
+        WeChatUtil.Companion.regToWx(app);
 
 
         //一键登录

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

@@ -8,7 +8,7 @@ class Config : IConfig {
      // return "https://heifengwuliudev.qs110.com/"
 
       return "https://xinyunbida.qs110.com/"
-    // return "https://xinyunbidadev.qs110.com/"//注意：切换的时候注意切换buggly
+     //return "https://xinyunbidadev.qs110.com/"//注意：切换的时候注意切换buggly
 
     }
 
@@ -25,9 +25,9 @@ class Config : IConfig {
     }
 
     override fun buglyAppId(): String? {
-      //  return "577d2c7c52"//正式的buggly
+         return "577d2c7c52"//正式的bugly
 
-        return "3837125332"//测试的buggly
+       // return "3837125332"//测试的bugly
     }
 
     override fun ossEndpoint(): String? {

app/src/main/java/com/quansu/heifengwuliu/repository/LoginRepository.kt

@@ -31,8 +31,7 @@ class LoginRepository : BRepository() {
         rxLreq(NetEngine.service.login(mobile, passWord))
                 .doOnNext() {
                     if (it.ok(true)) {
-                        var bean: LoginBean =it.data() as LoginBean;
-
+                        var bean: LoginBean =it.data() as LoginBean
                         MMKV.defaultMMKV().putString("token",bean.TOKEN)
                         UiSwitch.single(context, HomeActivity::class.java)
 
@@ -59,8 +58,7 @@ class LoginRepository : BRepository() {
         rxLreq(NetEngine.service.smsLogin(mobile, code))
                 .doOnNext() {
                     if (it.ok(true)) {
-                        var bean: LoginBean =it.data() as LoginBean;
-
+                        var bean: LoginBean =it.data() as LoginBean
                         MMKV.defaultMMKV().putString("token",bean.TOKEN)
                         UiSwitch.single(context, HomeActivity::class.java)
                         RxBus.get().post(ConfigRx.CLOSE_LOGIN, "")

app/src/main/java/com/quansu/heifengwuliu/vmodel/LoginVModel.kt

@@ -11,6 +11,7 @@ import com.quansu.heifengwuliu.activity.ForgetPasswordActivity
 import com.quansu.heifengwuliu.config.ConfigMMKV
 import com.quansu.heifengwuliu.repository.LoginRepository
 import com.quansu.heifengwuliu.utils.net.NetEngine
+import com.tencent.mmkv.MMKV
 import com.ysnows.base.base.BViewModel
 import com.ysnows.base.utils.MMKVManager
 import com.ysnows.base.utils.UiSwitch
@@ -93,8 +94,9 @@ open class LoginVModel(application: Application) : BViewModel<LoginRepository>(a
         disposable?.isDisposed ?: disposable?.dispose()
     }
 
+
     @Bindable
-    open var phone: String? = null
+    open var phone: String? =null
         set(value) {
             field = value
             notifyPropertyChanged(BR.phone)

app/src/main/res/layout/activity_waybilldetails.xml

@@ -161,14 +161,14 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="17dp"
+                            android:layout_marginTop="12dp"
                             android:layout_marginEnd="16dp"
                             android:minHeight="76dp"
-                            android:paddingTop="16dp"
-                            android:layout_marginTop="12dp"
-                            android:paddingBottom="21dp"
                             android:orientation="horizontal"
                             android:paddingStart="11dp"
+                            android:paddingTop="16dp"
                             android:paddingEnd="26dp"
+                            android:paddingBottom="21dp"
                             android:visibility="@{vm.type==2?View.VISIBLE :View.GONE}"
                             app:layout_goneMarginTop="@dimen/dp_10"
                             app:qmui_backgroundColor="@color/white"
@@ -261,9 +261,9 @@
 
                                 <TextView
                                     android:layout_width="50dp"
-                                    android:gravity="center"
                                     android:layout_height="wrap_content"
                                     android:layout_marginTop="4dp"
+                                    android:gravity="center"
                                     android:text="@{vm.info.company.name}"
                                     android:textColor="@color/text_title"
                                     android:textSize="13sp"
@@ -284,17 +284,16 @@
                             android:layout_marginEnd="16dp"
                             android:gravity="center_vertical"
                             android:minHeight="76dp"
-                            android:paddingTop="15dp"
-                            android:paddingBottom="17dp"
                             android:orientation="horizontal"
                             android:paddingStart="11dp"
+                            android:paddingTop="15dp"
                             android:paddingEnd="26dp"
+                            android:paddingBottom="17dp"
                             android:visibility="@{vm.type==0?View.VISIBLE :View.GONE}"
                             app:layout_goneMarginTop="@dimen/dp_10"
                             app:qmui_backgroundColor="@color/white"
                             app:qmui_radius="@dimen/dp_4">
 
-
                             <ImageView
                                 android:layout_width="40dp"
                                 android:layout_height="40dp"
@@ -303,15 +302,15 @@
 
                             </ImageView>
 
+
                             <LinearLayout
-                                android:layout_width="0dp"
+                                android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="8dp"
                                 android:layout_marginEnd="@dimen/dp_10"
-                                android:layout_weight="1"
-                                android:gravity="center"
                                 android:orientation="vertical">
 
+
                                 <LinearLayout
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
@@ -342,49 +341,92 @@
                                 <LinearLayout
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:layout_marginTop="6dp"
                                     android:orientation="horizontal">
 
-                                    <TextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text="@{vm.info.driver.car_cate}"
-                                        android:textColor="#979899"
-                                        android:textSize="@dimen/sp_13"
-                                        tools:text="鲁QAA888"></TextView>
-
 
-                                    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="26dp"
-                                        android:layout_marginStart="2dp"
-                                        android:paddingStart="10dp"
-                                        android:paddingEnd="10dp"
-                                        android:text="@{vm.info.is_baoxian==1?@string/buy_insure_on:@string/buy_insure_off}"
-                                        android:textColor="@{vm.info.is_baoxian==1?@color/insure_text_on:@color/insure_text_off}"
-                                        android:onClick="@{v->vm.toBuy(vm.info.is_baoxian)}"
-                                        android:textSize="14sp"
-                                        app:qmui_backgroundColor="@{vm.info.is_baoxian==1?@color/insure_on:@color/insure_off}"
-                                        app:qmui_borderColor="@{vm.info.is_baoxian==1?@color/insure_boder_on:@color/insure_boder_off}"
-                                        app:qmui_borderWidth="1dp"
-                                        android:visibility="@{vm.info.info.is_insurance==1?View.VISIBLE:View.GONE}"
-                                        app:qmui_radius="2dp" />
-
-
-                                    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                                        android:layout_width="81dp"
-                                        android:layout_height="26dp"
-                                        android:layout_marginStart="2dp"
-                                        android:paddingStart="10dp"
-                                        android:paddingEnd="10dp"
-                                        android:text="购买保险"
-                                        android:visibility="gone"
-                                        android:textColor="#9E9E9E"
-                                        android:textSize="14sp"
-                                        app:qmui_backgroundColor="#EBEBEB"
-                                        app:qmui_borderColor="#A0A0A0"
-                                        app:qmui_borderWidth="1dp"
-                                        app:qmui_radius="2dp" />
+                                    <LinearLayout
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_weight="1"
+                                        android:orientation="vertical">
+
+
+                                        <LinearLayout
+                                            android:layout_width="match_parent"
+                                            android:layout_height="wrap_content"
+                                            android:layout_marginTop="6dp"
+                                            android:orientation="horizontal">
+
+                                            <TextView
+                                                android:layout_width="wrap_content"
+                                                android:layout_height="wrap_content"
+                                                android:text="@{vm.info.driver.car_cate+@string/slash+vm.info.driver.number}"
+                                                android:textColor="#979899"
+                                                android:textSize="@dimen/sp_13"
+                                                tools:text="鲁QAA888"></TextView>
+
+
+                                        </LinearLayout>
+
+                                        <LinearLayout
+                                            android:layout_width="match_parent"
+                                            android:layout_height="wrap_content">
+
+                                            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                                                android:layout_width="wrap_content"
+                                                android:layout_height="26dp"
+                                                android:layout_marginTop="6dp"
+                                                android:onClick="@{v->vm.toBuy(vm.info.is_baoxian)}"
+                                                android:paddingStart="10dp"
+                                                android:paddingEnd="10dp"
+                                                android:text="@{vm.info.is_baoxian==1?@string/buy_insure_on:@string/buy_insure_off}"
+                                                android:textColor="@{vm.info.is_baoxian==1?@color/insure_text_on:@color/insure_text_off}"
+                                                android:textSize="14sp"
+                                                android:visibility="@{vm.info.info.is_insurance==1?View.VISIBLE:View.GONE}"
+                                                app:qmui_backgroundColor="@{vm.info.is_baoxian==1?@color/insure_on:@color/insure_off}"
+                                                app:qmui_borderColor="@{vm.info.is_baoxian==1?@color/insure_boder_on:@color/insure_boder_off}"
+                                                app:qmui_borderWidth="1dp"
+                                                app:qmui_radius="2dp" />
+
+
+                                            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                                                android:layout_width="81dp"
+                                                android:layout_height="26dp"
+                                                android:layout_marginTop="6dp"
+                                                android:paddingStart="10dp"
+                                                android:paddingEnd="10dp"
+                                                android:text="购买保险"
+                                                android:textColor="#9E9E9E"
+                                                android:textSize="14sp"
+                                                android:visibility="gone"
+                                                app:qmui_backgroundColor="#EBEBEB"
+                                                app:qmui_borderColor="#A0A0A0"
+                                                app:qmui_borderWidth="1dp"
+                                                app:qmui_radius="2dp" />
+
+
+                                        </LinearLayout>
+
+                                    </LinearLayout>
+
+
+                                    <ImageView
+                                        android:id="@+id/img_collect"
+                                        android:layout_width="24dp"
+                                        android:layout_height="24dp"
+                                        android:layout_marginEnd="16dp"
+                                        android:src="@{vm.is_collect==1?@drawable/ic_star_on:@drawable/ic_star_off_to}"
+                                        tools:src="@drawable/ic_star_off_to">
+
+                                    </ImageView>
+
+                                    <ImageView
+                                        android:layout_width="24dp"
+                                        android:layout_height="24dp"
+                                        android:onClick="@{v->vm.toCallPhone(vm.info.driver.mobile)}"
+                                        android:src="@drawable/ic_details_phone">
+
+                                    </ImageView>
 
 
                                 </LinearLayout>
@@ -392,24 +434,6 @@
 
                             </LinearLayout>
 
-                            <ImageView
-                                android:id="@+id/img_collect"
-                                android:layout_width="24dp"
-                                android:layout_height="24dp"
-                                android:layout_marginEnd="16dp"
-                                android:src="@{vm.is_collect==1?@drawable/ic_star_on:@drawable/ic_star_off_to}"
-                                tools:src="@drawable/ic_star_off_to">
-
-                            </ImageView>
-
-                            <ImageView
-                                android:layout_width="24dp"
-                                android:layout_height="24dp"
-                                android:onClick="@{v->vm.toCallPhone(vm.info.driver.mobile)}"
-                                android:src="@drawable/ic_details_phone">
-
-                            </ImageView>
-
 
                         </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
@@ -468,6 +492,34 @@
                                 <TextView
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
+                                    android:text="接单时间"
+                                    android:textColor="#767778"
+                                    android:textSize="@dimen/sp_14" />
+
+
+                                <TextView
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1"
+                                    android:gravity="right"
+                                    android:text="@{vm.info.order.create_time}"
+                                    android:textColor="@color/text_title"
+                                    android:textSize="@dimen/sp_13"
+                                    tools:text="进行中"></TextView>
+
+
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="12dp"
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
                                     android:text="运单状态"
                                     android:textColor="#767778"
                                     android:textSize="@dimen/sp_14" />
@@ -665,7 +717,6 @@
                         </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
 
-
                         <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="50dp"
@@ -713,7 +764,6 @@
                         </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
 
-
                         <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -727,14 +777,14 @@
                             android:visibility="@{vm.isVoucherShow?View.VISIBLE:View.GONE}"
                             app:layout_goneMarginTop="@dimen/dp_10"
                             app:qmui_backgroundColor="@color/white"
-                            tools:visibility="visible"
-                            app:qmui_radius="@dimen/dp_4">
+                            app:qmui_radius="@dimen/dp_4"
+                            tools:visibility="visible">
 
                             <LinearLayout
                                 android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
                                 android:layout_marginTop="20dp"
-                                android:gravity="center_vertical"
-                                android:layout_height="wrap_content">
+                                android:gravity="center_vertical">
 
                                 <TextView
                                     android:layout_width="wrap_content"
@@ -750,10 +800,10 @@
                                     android:layout_weight="1"
                                     android:gravity="right"
                                     android:onClick="@{v->vm.reviseModel(vm.info.order.order_id)}"
-                                    android:visibility="@{vm.isModify?View.VISIBLE:View.GONE}"
+                                    android:text="修改"
                                     android:textColor="#FFBC00"
                                     android:textSize="13sp"
-                                    android:text="修改" />
+                                    android:visibility="@{vm.isModify?View.VISIBLE:View.GONE}" />
 
 
                             </LinearLayout>
@@ -776,24 +826,24 @@
                                     android:layout_height="wrap_content"
                                     android:layout_weight="1"
                                     android:gravity="right"
-                                    android:visibility="@{vm.isModify?View.GONE:View.VISIBLE}"
+                                    android:text="@{vm.number}"
                                     android:textColor="#26292F"
                                     android:textSize="13sp"
-                                    android:text="@{vm.number}"
+                                    android:visibility="@{vm.isModify?View.GONE:View.VISIBLE}"
                                     tools:text="30吨" />
 
-                                   <com.ysnows.base.widget.DelEditText
-                                       android:layout_width="0dp"
-                                       android:layout_weight="1"
-                                       android:background="@null"
-                                       android:textColor="#26292F"
-                                       android:text="@={vm.number}"
-                                       android:textSize="13sp"
-                                       android:hint="请输入送达数量"
-                                       android:visibility="@{vm.isModify?View.VISIBLE:View.GONE}"
-                                       android:gravity="right"
-                                       android:textColorHint="#767778"
-                                       android:layout_height="wrap_content"/>
+                                <com.ysnows.base.widget.DelEditText
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1"
+                                    android:background="@null"
+                                    android:gravity="right"
+                                    android:hint="请输入送达数量"
+                                    android:text="@={vm.number}"
+                                    android:textColor="#26292F"
+                                    android:textColorHint="#767778"
+                                    android:textSize="13sp"
+                                    android:visibility="@{vm.isModify?View.VISIBLE:View.GONE}" />
 
                             </LinearLayout>
 
@@ -835,8 +885,8 @@
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:layout_marginBottom="18dp"
-                                android:visibility="@{vm.isModify?View.GONE:View.VISIBLE}"
-                                android:orientation="horizontal">
+                                android:orientation="horizontal"
+                                android:visibility="@{vm.isModify?View.GONE:View.VISIBLE}">
 
                                 <TextView
                                     android:layout_width="wrap_content"
@@ -862,9 +912,9 @@
                         </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
 
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="106dp"/>
+                        <View
+                            android:layout_width="match_parent"
+                            android:layout_height="106dp" />
 
 
                     </LinearLayout>
@@ -877,8 +927,8 @@
             <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
                 android:layout_gravity="bottom"
+                android:layout_marginStart="16dp"
                 android:layout_marginEnd="@dimen/dp_16"
                 android:onClick="@{v->vm.toStartShip(vm.info.order.order_id)}"
                 android:visibility="@{vm.isButShow?View.VISIBLE:View.GONE}">
@@ -899,6 +949,7 @@
                 </TextView>
 
             </FrameLayout>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -959,7 +1010,6 @@
                                 android:textSize="@dimen/sp_13" />
 
 
-
                         </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
 

app/src/main/res/values/strings.xml

@@ -519,6 +519,7 @@ Api 已达到使用限制
 
     <string name="buy_insure_off">购买保险</string>
     <string name="buy_insure_on">已购买保险</string>
+    <string name="slash">/</string>
 
 
 </resources >

build.gradle

@@ -9,8 +9,8 @@ buildscript {
     ext.coroutines = '1.3.4'
 
     ext.application_id = "com.quansu.heifengwuliu"
-    ext.application_version_code = 5
-    ext.application_version_name = "1.0.5"
+    ext.application_version_code = 6
+    ext.application_version_name = "1.0.6"
     ext.support_version = "29.0.2"
     ext.min_sdk_version = 23
     ext.target_sdk_version = 30

update/src/main/AndroidManifest.xml

@@ -26,6 +26,7 @@
 
         <activity
             android:name="com.ysnows.update.StormUpgradeActivity"
+            android:launchMode="singleTask"
             android:theme="@style/dialog" />
 
     </application >

update/src/main/java/com/ysnows/update/StormUpgradeActivity.java

@@ -47,6 +47,9 @@ public class StormUpgradeActivity extends UpgradeActivity {
     }
 
     private void updateBtn(DownloadTask task) {
+        if(null==task){
+            return;
+        }
 
         switch (task.getStatus()) {
             case DownloadTask.INIT:
@@ -129,6 +132,9 @@ public class StormUpgradeActivity extends UpgradeActivity {
         //立即升级
         buttonRight.setOnClickListener(v -> {
             DownloadTask task = Beta.startDownload();
+            if(null==task){
+                return;
+            }
             updateBtn(task);
             if (task.getStatus() == DownloadTask.DOWNLOADING) {
                 finish();

update/src/main/java/com/ysnows/update/component/CpUpdate.java

@@ -25,8 +25,10 @@ import com.ysnows.update.util.InitUpgrade;
 public class CpUpdate extends BIComponent implements IComponent {
 
     public boolean init(CC cc) {
-        InitUpgrade.initBugly(cc.getContext().getApplicationContext());
-        CC.sendCCResult(cc.getCallId(), CCResult.success());
+        if(null!=cc.getContext()) {
+            InitUpgrade.initBugly(cc.getContext().getApplicationContext());
+            CC.sendCCResult(cc.getCallId(), CCResult.success());
+        }
         return false;
     }