运单详情，货源详情优化，登录优化

app/build.gradle

@@ -83,7 +83,8 @@ android {
                                     //暂时填写默认值即可.
                                     JPUSH_CHANNEL: "developer-n",
             ]
-            buildConfigField("String", "BASE_URL", "\"https://platform.test.v2.dahehuoyun.com/\"")
+            buildConfigField("String", "BASE_URL", "\"http://192.168.1.118:18080/\"")
+//            buildConfigField("String", "BASE_URL", "\"https://platform.test.v2.dahehuoyun.com/devApi/\"")
             buildConfigField "boolean", "isTest", "true"
 //            //APP名称，可以在androidMainfest中引用
             resValue "string", "appName", "货主端测试"

app/src/main/java/com/dhsd/glowner/net/Api.kt

@@ -29,16 +29,6 @@ import retrofit2.http.Query
  */
 interface Api {
     /*-------------------登录----------------------------*/
-    @POST(BASE_URL + "common/register")
-    fun log(@Body logBean: LogBean?): Observable<CommonResponseBean<UserBean>>
-
-    //运单列表
-    @POST(BASE_URL + "app/driver/waybill/listV2")
-    fun orderList(@Body bean: RefreshBean?): Observable<CommonResponseBean<CommListBean>>
-
-    //获取正在执行的运单/运单详情
-    @POST(BASE_URL + "app/driver/waybill/getExecuteWaybill")
-    fun getExecuteWaybill(@Body bean: WaybillBean?): Observable<CommonResponseBean<WayBill2>>
 
     companion object {
         const val BASE_URL = BuildConfig.BASE_URL
@@ -52,31 +42,31 @@ interface Api {
      * 是否需要验证码登录
      * @return Observable<CommonResponseBean<CodeBean>>
      */
-    @GET(BASE_URL + "devApi/code")
+    @GET(BASE_URL + "code")
     fun getCode(): Observable<CommonResponseBean<CodeBean>>
 
     /**
      * 是否需要验证码登录
      * @return Observable<CommonResponseBean<CodeBean>>
      */
-    @POST(BASE_URL + "devApi/auth/login")
+    @POST(BASE_URL + "auth/login")
     fun login(@Body bean: LoginBean): Observable<CommonResponseBean<UserBean>>
 
-    @GET(BASE_URL + "devApi/business/shipper/order/list")
+    @GET(BASE_URL + "business/shipper/order/list")
     fun getOrderList(): Observable<CommonResponseBean<OrderListBean<OrderBean>>>
 
-    @PUT(BASE_URL + "devApi/business/shipper/order/cancelSourceOfOrder")
+    @PUT(BASE_URL + "business/shipper/order/cancelSourceOfOrder")
     fun cancelSourceOfOrder(@Body bean: TextOrder): Observable<CommonResponseBean<Any>>
 
 
-    @GET(BASE_URL + "devApi/system/user/getInfo")
+    @GET(BASE_URL + "system/user/getInfo")
     fun getUserInfo(): Observable<CommonResponseBean<UserParent>>
 
 
     /**
      * 查询车辆信息列表
      */
-    @GET(BASE_URL + "devApi/business/ft/common/dict/driver/all")
+    @GET(BASE_URL + "business/ft/common/dict/driver/all")
     fun getCarList(@Query("searchValue") searchValue: String): Observable<CommonResponseBean<MutableList<CarBean>>>
 
 
@@ -85,7 +75,7 @@ interface Api {
      * @param bean DispatchBean
      * @return Observable<CommonResponseBean<Any>>
      */
-    @POST(BASE_URL + "devApi/business/shipper/order/dispatchVehicles")
+    @POST(BASE_URL + "business/shipper/order/dispatchVehicles")
     fun dispatchVehicles(@Body bean: DispatchBean): Observable<CommonResponseBean<Any>>
 
 
@@ -94,7 +84,7 @@ interface Api {
      * @param bean PostOrderBean
      * @return Observable<CommonResponseBean<Any>>
      */
-    @POST(BASE_URL + "devApi//business/shipper/order")
+    @POST(BASE_URL + "business/shipper/order")
     fun addOrder(@Body bean: PostOrderBean): Observable<CommonResponseBean<PostOrderBean>>
 
 
@@ -102,7 +92,7 @@ interface Api {
      * 查询车队列表
      * @return Observable<CommonResponseBean<Any>>
      */
-    @GET(BASE_URL + "devApi/business/ft/common/dict/onlyCaptain")
+    @GET(BASE_URL + "business/ft/common/dict/onlyCaptain")
     fun getCaptainList(): Observable<CommonResponseBean<MutableList<CaptainBean>>>
 
 
@@ -111,7 +101,7 @@ interface Api {
      * @param captainId String 车队ID
      * @return Observable<CommonResponseBean<MutableList<CaptainBean>>>
      */
-    @GET(BASE_URL + "devApi/business/ft/common/dict/captain/driverAndCar")
+    @GET(BASE_URL + "business/ft/common/dict/captain/driverAndCar")
     fun driverAndCarList(@Query("captainId") captainId: String): Observable<CommonResponseBean<MutableList<CarBean>>>
 
 
@@ -120,7 +110,7 @@ interface Api {
      * @param bean PostAddressBean
      * @return Observable<CommonResponseBean<Any>>
      */
-    @POST(BASE_URL + "devApi/business/shipper/common/address")
+    @POST(BASE_URL + "business/shipper/common/address")
     fun postAddress(@Body bean: PostAddressBean): Observable<CommonResponseBean<Any>>
 
     /**
@@ -128,7 +118,7 @@ interface Api {
      * @param addressId String
      * @return Observable<CommonResponseBean<PostAddressBean>>
      */
-    @GET(BASE_URL + "devApi/business/shipper/common/address/{addressId}")
+    @GET(BASE_URL + "business/shipper/common/address/{addressId}")
     fun getAddressDetail(@Path("addressId") addressId: String): Observable<CommonResponseBean<PostAddressBean>>
 
 
@@ -137,7 +127,7 @@ interface Api {
      * @param orderId String
      * @return Observable<CommonResponseBean<PostOrderBean>>
      */
-    @GET(BASE_URL + "devApi/business/shipper/order/{orderId}")
+    @GET(BASE_URL + "business/shipper/order/{orderId}")
     fun getOrderDetail(@Path("orderId") orderId: String): Observable<CommonResponseBean<OrderSourceBean>>
 
 
@@ -146,7 +136,7 @@ interface Api {
      * @param bean TextOrder
      * @return Observable<CommonResponseBean<Any>>
      */
-    @PUT(BASE_URL + "devApi/business/shipper/order/cancelSourceOfOrder")
+    @PUT(BASE_URL + "business/shipper/order/cancelSourceOfOrder")
     fun cancelOrder(@Body bean: TextOrder): Observable<CommonResponseBean<Any>>
 
 
@@ -156,7 +146,7 @@ interface Api {
      * @param waybillStatus String
      * @return Observable<CommonResponseBean<MutableList<AddressBean>>>
      */
-    @GET(BASE_URL + "devApi/business/shipper/waybill/list")
+    @GET(BASE_URL + "business/shipper/waybill/list")
     fun getWaybillList(
         @Query("orderNum") orderNum: String,
         @Query("waybillStatus") waybillStatus: String
@@ -167,7 +157,7 @@ interface Api {
      * @param orderId String
      * @return Observable<CommonResponseBean<PostOrderBean>>
      */
-    @GET(BASE_URL + "devApi/business/shipper/waybill/{orderId}")
+    @GET(BASE_URL + "business/shipper/waybill/{orderId}")
     fun getWayBillDetail(@Path("orderId") orderId: String): Observable<CommonResponseBean<OrderSourceBean>>
 
 
@@ -176,7 +166,7 @@ interface Api {
      * @param bean PostAddressBean
      * @return Observable<CommonResponseBean<Any>>
      */
-    @PUT(BASE_URL + "devApi/business/shipper/common/address")
+    @PUT(BASE_URL + "business/shipper/common/address")
     fun updateAddress(@Body bean: PostAddressBean): Observable<CommonResponseBean<Any>>
 
 
@@ -185,7 +175,7 @@ interface Api {
      * @param addressIds String
      * @return Observable<CommonResponseBean<Any>>
      */
-    @DELETE(BASE_URL + "devApi/business/shipper/common/address/{addressIds}")
+    @DELETE(BASE_URL + "business/shipper/common/address/{addressIds}")
     fun deleteAddress(@Path("addressIds") addressIds: String): Observable<CommonResponseBean<Any>>
 
 
@@ -193,7 +183,7 @@ interface Api {
      * 获取货主常用货物类型列表
      * @return Observable<CommonResponseBean<MutableList<DictBean>>>
      */
-    @GET(BASE_URL + "devApi/business/shipper/common/goods/list")
+    @GET(BASE_URL + "business/shipper/common/goods/list")
     fun getGoodsList(): Observable<CommonResponseBean<OrderListBean<GoodBean>>>
 
 
@@ -201,7 +191,7 @@ interface Api {
      * 获取货主常用车辆列表
      * @return Observable<CommonResponseBean<MutableList<CarBean>>>
      */
-    @GET(BASE_URL + "devApi/business/shipper/shipperCar/list")
+    @GET(BASE_URL + "business/shipper/shipperCar/list")
     fun getKnowCarsList(): Observable<CommonResponseBean<OrderListBean<CarBean>>>
 
 
@@ -209,7 +199,7 @@ interface Api {
      * 获取地址列表
      * @return Observable<CommonResponseBean<OrderListBean<AddressBean>>>
      */
-    @GET(BASE_URL + "devApi/business/shipper/common/address/list")
+    @GET(BASE_URL + "business/shipper/common/address/list")
     fun getAddressList(): Observable<CommonResponseBean<OrderListBean<AddressBean>>>
 
     /**
@@ -217,7 +207,7 @@ interface Api {
      * @param dictType String
      * @return Observable<CommonResponseBean<MutableList<DictBean>>>
      */
-    @GET(BASE_URL + "devApi/system/dict/data/type/{dictType}")
+    @GET(BASE_URL + "system/dict/data/type/{dictType}")
     fun getDictData(@Path("dictType") dictType: String): Observable<CommonResponseBean<MutableList<DictBean>>>
 
 
@@ -225,7 +215,7 @@ interface Api {
      * 查询交通厅与安联货物分类对应关系字典
      * @return Observable<CommonResponseBean<MutableList<GoodTypeBean>>>
      */
-    @GET(BASE_URL + "devApi/business/ft/common/dict/goodsCategor")
+    @GET(BASE_URL + "business/ft/common/dict/goodsCategor")
     fun getGoodsCategor(): Observable<CommonResponseBean<MutableList<GoodTypeBean>>>
 
 
@@ -234,22 +224,21 @@ interface Api {
      * @param problemId String
      * @return Observable<CommonResponseBean<MutableList<ProBean>>>
      */
-    @GET(BASE_URL + "devApi/driver/app/info/commonProblemDetail")
+    @GET(BASE_URL + "driver/app/info/commonProblemDetail")
     fun commonProblemDetail(@Query("problemId") problemId: String): Observable<CommonResponseBean<ProBean>>
 
     /**
      * 常见问题列表
      * @return Observable<CommonResponseBean<MutableList<ProBean>>>
      */
-    @GET(BASE_URL + "devApi/driver/app/info/commonProblemList")
+    @GET(BASE_URL + "driver/app/info/commonProblemList")
     fun commonProblemList(): Observable<CommonResponseBean<MutableList<ProBean>>>
 
     /**
      * 查询党员认证资料
-     * @param upPart UpPart
      * @return Observable<CommonResponseBean<String>>
      */
-    @GET(BASE_URL + "devApi/driver/driver/getCpcAuthenticationInfo")
+    @GET(BASE_URL + "driver/driver/getCpcAuthenticationInfo")
     fun getCpcAuthenticationInfo(): Observable<CommonResponseBean<UpPart>>
 
     /**
@@ -257,14 +246,14 @@ interface Api {
      * @param upPart UpPart
      * @return Observable<CommonResponseBean<String>>
      */
-    @POST(BASE_URL + "devApi/driver/driver/submitToCpcAuthentication")
+    @POST(BASE_URL + "driver/driver/submitToCpcAuthentication")
     fun submitToCpcAuthentication(@Body upPart: UpPart): Observable<CommonResponseBean<Any>>
 
     /**
      * 获取APP最新版本信息
      * @return Observable<CommonResponseBean<ProBean>>
      */
-    @GET(BASE_URL + "devApi/driver/app/info/getLastAppVersion")
+    @GET(BASE_URL + "driver/app/info/getLastAppVersion")
     fun getLastAppVersion(): Observable<CommonResponseBean<AppVersion>>
 
 
@@ -272,7 +261,7 @@ interface Api {
      * 安全课堂列表
      * @return Observable<CommonResponseBean<AppVersion>>
      */
-    @GET(BASE_URL + "devApi/driver/app/info/safeClassroomList")
+    @GET(BASE_URL + "driver/app/info/safeClassroomList")
     fun safeClassroomList(): Observable<CommonResponseBean<MutableList<QuestionBean>>>
 
     /**
@@ -280,7 +269,7 @@ interface Api {
      * @param problemId String
      * @return Observable<CommonResponseBean<QueDetail>>
      */
-    @GET(BASE_URL + "devApi/driver/app/info/safeClassroomDetail")
+    @GET(BASE_URL + "driver/app/info/safeClassroomDetail")
     fun safeClassroomDetail(@Query("classroomId") problemId: String): Observable<CommonResponseBean<QueDetail>>
 
 
@@ -289,13 +278,13 @@ interface Api {
      * opinionsType 评价类型(0=司机评价，1=货主评价)
      * @return Observable<CommonResponseBean<CaptainBean>>
      */
-    @GET(BASE_URL + "devApi/driver/opinions/list")
+    @GET(BASE_URL + "driver/opinions/list")
     fun waybillRate(@Query("opinionsType") opinionsType: String): Observable<CommonResponseBean<MutableList<RateBean>>>
 
     /**
      * 查询司机总评价信息
      * @return Observable<CommonResponseBean<CaptainBean>>
      */
-    @GET(BASE_URL + "devApi/driver/opinions/getDriverOpinionsStatInfo")
+    @GET(BASE_URL + "driver/opinions/getDriverOpinionsStatInfo")
     fun driverRate(): Observable<CommonResponseBean<RateBean>>
 }

app/src/main/java/com/dhsd/glowner/ui/HomeActivity.kt

@@ -30,7 +30,7 @@ class HomeActivity: BaseActivity<ActivityHomeBinding>(), OnTabSelectListener,
 
     private val mNormalRes = mutableListOf(
         R.drawable.tab_home_normal,
-        R.drawable.tab_message_normal,
+//        R.drawable.tab_message_normal,
         R.drawable.tab_waybill_normal,
         R.drawable.tab_mine_normal
     )
@@ -38,19 +38,17 @@ class HomeActivity: BaseActivity<ActivityHomeBinding>(), OnTabSelectListener,
 
     private val mSelectRes = mutableListOf(
         R.drawable.tab_home_press,
-        R.drawable.tab_message_press,
+//        R.drawable.tab_message_press,
         R.drawable.tab_waybill_press,
         R.drawable.tab_mine_press
     )
-    private  var mTitles = arrayOf("首页","消息","运单","我的")
+    private  var mTitles = arrayOf("首页","运单","我的")
     private var mTabEntities = arrayListOf<CustomTabEntity>(
         TabBean(mTitles[0],mSelectRes[0],mNormalRes[0]),
+//        TabBean(mTitles[1],mSelectRes[1],mNormalRes[1]),
         TabBean(mTitles[1],mSelectRes[1],mNormalRes[1]),
-        TabBean(mTitles[2],mSelectRes[2],mNormalRes[2]),
-        TabBean(mTitles[3],mSelectRes[3],mNormalRes[3]))
-    private var mFragments = arrayListOf<Fragment>(HomeFragment(),
-        MessageFragment(), WaybillFragment(), MineFragment()
-    )
+        TabBean(mTitles[2],mSelectRes[2],mNormalRes[2]))
+    private var mFragments = arrayListOf<Fragment>(HomeFragment(), WaybillFragment(), MineFragment())
 
     override fun initView(savedInstanceState: Bundle?) {
 

app/src/main/java/com/dhsd/glowner/ui/account/LoginActivity.kt

@@ -3,6 +3,7 @@ package com.dhsd.glowner.ui.account
 import BaseObserver
 import DataManager
 import RxHttpCallBack
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.text.TextPaint
@@ -121,6 +122,11 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>(), View.OnClickListener
                     )
                     finish()
                 }
+
+                override fun onCodeError(mContext: Context?, t: CommonResponseBean<UserBean>) {
+                    super.onCodeError(mContext, t)
+                    getCode()
+                }
             }))
 
 //        if ("获取验证码" == binding.ok.text) {

app/src/main/java/com/dhsd/glowner/ui/waybill/activity/SourceDetailActivity.kt

@@ -167,7 +167,7 @@ class SourceDetailActivity : BaseActivity<ActivitySourceDetailBinding>(), OnLimi
                     tvDriverName.text = data.order.shipperDispatchInfo.idcardName
                     tvRate.text =
                         """交易 ${data.order.shipperDispatchInfo.driverTransactionVolume} 好评率${
-                            data.order.shipperDispatchInfo.driverPositiveReviewRate.toDoubleOrNull()
+                            data.order.shipperDispatchInfo.driverPositiveReviewRate?.toDoubleOrNull()
                                 ?.times(100)
                         }%"""
                     ImageLoader.getInstance().loadImage(

app/src/main/java/com/dhsd/glowner/ui/waybill/activity/WaybillLDetailActivity.kt

@@ -138,7 +138,7 @@ class WaybillLDetailActivity : BaseActivity<ActivityWaybillDetailBinding>() {
                 """${data.order.shipperDispatchInfo.idcardName}  ${data.order.shipperDispatchInfo.contactPhone}"""
             tvDriverRate.text =
                 """交易${data.order.shipperDispatchInfo.driverTransactionVolume} 好评率${
-                    data.order.shipperDispatchInfo.driverPositiveReviewRate.toIntOrNull()
+                    data.order.shipperDispatchInfo.driverPositiveReviewRate?.toIntOrNull()
                         ?.times(100)
                 }%"""
 

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

@@ -134,7 +134,7 @@
         android:layout_gravity="right"
         android:layout_marginTop="@dimen/dp_10"
         android:text="忘记密码"
-
+        android:visibility="gone"
         android:textColor="#ffaab0b6"
         android:textSize="@dimen/sp_15" />