api替换

app/build.gradle

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

app/src/main/AndroidManifest.xml

@@ -349,6 +349,12 @@
             android:configChanges="keyboardHidden|orientation|locale"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateHidden" />
+
+        <activity
+            android:name=".ui.mine.activity.ComProDetailActivity"
+            android:configChanges="keyboardHidden|orientation|locale"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name=".ui.mine.activity.QuesActivity"
             android:configChanges="keyboardHidden|orientation|locale"

app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/UpInfoBean.kt

@@ -80,14 +80,14 @@ data class UpDrivingInfoBean(
     var roadLicense: String = "",
     var roadLicensePhotoUrl: String = "",
     var roadLicenseSend: String = "",
-    var roadLicensevaridity: String = "",
+    var roadLicensevaridity: String? = null,
     var totalWeight: String = "",
     var tractionWeight: String = "",
     var useNature: String = "",
     var vehicleNum: String = "",
     var vehicleType: String = "",
     var vehicleTypeCode: String = "",
-    var roadLicenseValidity: String = "",
+    var roadLicenseValidity: String ?= null,
     var licenseValidity: String = "",//到期时间
     var vinCode: String = ""
 )

app/src/main/java/com/arpa/hndahesudintocctmsdriver/net/RequestHeadInterceptor.kt

@@ -31,6 +31,7 @@ class RequestHeadInterceptor : Interceptor {
             .addHeader("versionValue", AppUtils.getAppVersionName() + "")
             .addHeader("deviceType", "ANDROID")
             .addHeader("language", BaseUtils.getLanguage(App.app).toString() + "")
+            .addHeader("Authorization","""Bearer ${SPUtils.instance.getUserToken(App.app)}""")
             .build()
         Log.i(TAG, "intercept: " + request.headers)
         return chain.proceed(request)

app/src/main/java/com/arpa/hndahesudintocctmsdriver/net/RxHttpCallBack.kt

@@ -4,6 +4,7 @@ import android.accounts.NetworkErrorException
 import android.content.Context
 import android.text.TextUtils
 import androidx.appcompat.app.AppCompatActivity
+import com.arpa.hndahesudintocctmsdriver.utils.UserUtils
 import com.arpa.mylibrary.net.CommonResponseBean
 import com.arpa.mylibrary.net.ResultException
 import com.arpa.mylibrary.utils.LoadingUtils
@@ -98,7 +99,7 @@ abstract class RxHttpCallBack<T> {
                 it.finishRefresh()
         }
         if (t.code == 401) {
-//            instance.loginOut(mContext!!)
+            mContext?.let { UserUtils.instance.loginOut(it) }
             //            Intent intent = new Intent(mContext, LoginActivity.class);
 //            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
 //            mContext.startActivity(intent);

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/CodeLoginActivity.kt

@@ -73,7 +73,6 @@ class CodeLoginActivity : BaseActivity<ActivityCodeBinding>(), View.OnClickListe
                             UserUtils.instance.loginIn(mContext, t.data)
                         }
                     }))
-
             }
         }
     }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthDrivingActivity.kt

@@ -1,6 +1,7 @@
 package com.arpa.hndahesudintocctmsdriver.ui.account.authperson
 
 import android.os.Bundle
+import android.text.TextUtils
 import android.view.View
 import android.widget.ImageView
 import com.arpa.hndahesudintocctmsdriver.R
@@ -334,7 +335,7 @@ class AuthDrivingActivity : BaseActivity<ActivityAuthDrivingBinding>() {
         }
 
         upDrivingInfoBean.run {
-            roadLicenseValidity = binding.tvDate.text.toString()//道路有效期
+            roadLicenseValidity =if (TextUtils.isEmpty(binding.tvDate.text.toString())) null else binding.tvDate.text.toString()//道路有效期
             licenseValidity = binding.tvEnd.text.toString()//行驶证有效期
             roadLicense = binding.etID.text.toString()//道路运输许可证号
             vehicleNum = binding.etCarNum.text.trim().toString()

app/src/main/java/com/arpa/hndahesudintocctmsdriver/utils/UserUtils.kt

@@ -36,11 +36,11 @@ class UserUtils private constructor() {
 
     fun loginOut(context: Context) {
         SPUtils.instance.removeUserToken(context)
-        if (null == SPUtils.instance.getUserInfo(context))
+//        if (null == SPUtils.instance.getUserInfo(context))
-            return
+//            return
-        //删除推送别名
+//        //删除推送别名
-        PushHelper.delete(context)
+//        PushHelper.delete(context)
-        BaseSPUtils.cleanUserInfo(context)
+//        BaseSPUtils.cleanUserInfo(context)
         val intent = Intent(context, LauncherActivity::class.java)
         intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK
         context.startActivity(intent)

mylibrary/src/main/java/com/arpa/mylibrary/net/CommonResponseBean.java

@@ -1,12 +1,14 @@
 package com.arpa.mylibrary.net;
 
+import org.json.JSONObject;
+
 import java.io.Serializable;
 
 /**
  * 返回通用的实体类
  */
 
-public class CommonResponseBean<T> implements Serializable {
+public class CommonResponseBean<T> extends JSONObject implements Serializable {
     private T data;
     private int code;
     private String info;
@@ -16,6 +18,7 @@ public class CommonResponseBean<T> implements Serializable {
 
     private boolean success;
 
+
     public int getRes() {
         return res;
     }

mylibrary/src/main/java/com/arpa/mylibrary/utils/BaseSPUtils.java

@@ -16,14 +16,14 @@ public class BaseSPUtils {
     /**
      * 保存在手机里面的文件名
      */
-    public static final String FILE_NAME = "sp_data";
+    public static final String FILE_NAME = "driver_sp_data";
-    public static final String USER_INFO_KEY = "user_info_key";
+    public static final String USER_INFO_KEY = "driver_user_info_key";
-    public static final String USER_TOKEN_KEY = "user_token_key";
+    public static final String USER_TOKEN_KEY = "driver_user_token_key";
-    public static final String NET_SERVICE_TEST = "net_service_test";
+    public static final String NET_SERVICE_TEST = "driver_net_service_test";
-    public static final String SEARRH_CACHE = "search_cache";
+    public static final String SEARRH_CACHE = "driver_search_cache";
-    public static final String NAVI_PH_EDIT_CACHE = "navi_ph_edit_cache";
+    public static final String NAVI_PH_EDIT_CACHE = "driver_navi_ph_edit_cache";
-    public static final String FIRST_OPEN = "first_open";
+    public static final String FIRST_OPEN = "driver_first_open";
-    public static final String KEY_PRIVACY_AGREEMENT = "privacy_agreement";
+    public static final String KEY_PRIVACY_AGREEMENT = "driver_privacy_agreement";
 
     /**
      * 保存数据的方法，我们需要拿到保存数据的具体类型，然后根据类型调用不同的保存方法