更换头像 页面优化

app/src/main/java/com/dahe/gldriver/bean/UpInfoBean.kt

@@ -250,6 +250,16 @@ data class UpLocation(
 )
 
 
+/**
+ * 上传用户头像
+ * @property avatar String
+ * @constructor
+ */
+data class UpPersonHead(
+    val avatar: String,
+)
+
+
 
 
 

app/src/main/java/com/dahe/gldriver/net/Api.kt

@@ -27,6 +27,7 @@ import com.dahe.gldriver.bean.UpDriverInfoBean
 import com.dahe.gldriver.bean.UpDrivingInfoBean
 import com.dahe.gldriver.bean.UpLocation
 import com.dahe.gldriver.bean.UpPart
+import com.dahe.gldriver.bean.UpPersonHead
 import com.dahe.gldriver.bean.UpPersonInfoBean
 import com.dahe.gldriver.bean.UpPicBean
 import com.dahe.gldriver.bean.UpQualiInfoBean
@@ -437,6 +438,15 @@ interface Api {
     fun unbindDriver(@Body upCaptain: UpCaptain): Observable<CommonResponseBean<Any>>
 
 
+    /**
+     * 司机设置自定义头像
+     * @param userBean UserBean
+     * @return Observable<CommonResponseBean<Any>>
+     */
+    @POST(BASE_URL+"driver/driver/setUpDriverAvatar")
+    fun setUpDriverAvatar(@Body upPersonHead: UpPersonHead): Observable<CommonResponseBean<Any>>
+
+
     /**
      * 查询车队所属的司机列表（包含车辆）
      * @return Observable<CommonResponseBean<MutableList<DriverBean>>>

app/src/main/java/com/dahe/gldriver/ui/mine/MineFragment.kt

@@ -2,12 +2,14 @@ package com.dahe.gldriver.ui.mine
 
 import android.os.Bundle
 import android.view.View
+import androidx.appcompat.app.AppCompatActivity
 import com.dahe.gldriver.R
 import com.dahe.gldriver.adapter.GridItemAdapter
 import com.dahe.gldriver.base.AppConfig
 import com.dahe.gldriver.base.WebActivity
 import com.dahe.gldriver.bean.GridBean
 import com.dahe.gldriver.bean.OcrPersonBean
+import com.dahe.gldriver.bean.UpPersonHead
 import com.dahe.gldriver.databinding.FragmentMineBinding
 import com.dahe.gldriver.net.BaseObserver
 import com.dahe.gldriver.net.DataManager
@@ -26,6 +28,7 @@ import com.dahe.gldriver.ui.mine.activity.RulesActivity
 import com.dahe.gldriver.ui.mine.activity.SettingActivity
 import com.dahe.gldriver.ui.mine.activity.WalletActivity
 import com.dahe.gldriver.utils.AppVersionUtils
+import com.dahe.gldriver.utils.OcrUtils
 import com.dahe.gldriver.utils.SPUtils
 import com.dahe.gldriver.utils.UserUtils
 import com.dahe.glex.bean.UserBean
@@ -91,6 +94,29 @@ class MineFragment : BaseFragment<FragmentMineBinding>(), View.OnClickListener,
                 ActivityUtils.startActivity(mContext, WalletActivity::class.java)
             }
 
+            ivHead.setOnClickListener {
+                OcrUtils.getInstance()
+                    .noOcrUpPic(mContext, activity as AppCompatActivity) { picPath, _ ->
+                        DataManager.getInstance().setUpDriverAvatar(UpPersonHead(picPath.picPath))
+                            .subscribeOn(Schedulers.io())
+                            .observeOn(AndroidSchedulers.mainThread())
+                            .subscribe(BaseObserver(mContext, object : RxHttpCallBack<Any>() {
+                                override fun onSuccess(t: CommonResponseBean<Any>) {
+                                    super.onSuccess(t)
+                                    ImageLoader.getInstance()
+                                        .loadCircleImage(
+                                            mContext,
+                                            picPath.locPic,
+                                            ivHead,
+                                            R.drawable.head_defaut
+                                        )
+                                    ToastUtils.showToast(mContext, "更换头像成功")
+                                }
+                            }))
+
+                    }
+            }
+
             llPerson.setOnClickListener {
                 val userInfo = SPUtils.instance.getUserInfo(mContext)
 

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

@@ -23,7 +23,16 @@
         android:textColor="#FF5F20"
         android:textSize="@dimen/sp_14"></TextView>
 
-
+    <androidx.core.widget.NestedScrollView
+        android:layout_weight="1"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        >
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            >
             <androidx.cardview.widget.CardView
                 android:id="@+id/cdPerson"
                 android:layout_width="match_parent"
@@ -138,6 +147,8 @@
                             android:layout_height="wrap_content"
                             android:drawableLeft="@drawable/start"
                             android:drawablePadding="@dimen/dp_2"
+                            android:maxLines="1"
+                            android:singleLine="true"
                             android:text="驾驶证号"
                             android:textColor="@color/black"
                             android:textSize="@dimen/sp_15"></TextView>
@@ -148,6 +159,8 @@
                             android:layout_height="@dimen/dp_34"
                             android:layout_marginLeft="@dimen/dp_10"
                             android:layout_weight="1"
+                            android:maxLines="1"
+                            android:singleLine="true"
                             android:background="@drawable/shape_phone_bg"
                             android:gravity="right|center_vertical"
                             android:paddingLeft="@dimen/dp_10"
@@ -176,6 +189,8 @@
                             android:layout_height="@dimen/dp_34"
                             android:layout_marginLeft="@dimen/dp_10"
                             android:layout_weight="1"
+                            android:maxLines="1"
+                            android:singleLine="true"
                             android:drawableRight="@drawable/right_gray"
                             android:drawablePadding="@dimen/dp_6"
                             android:gravity="right|center_vertical"
@@ -245,13 +260,16 @@
 
                 </RelativeLayout>
             </androidx.cardview.widget.CardView>
-
-
             <View
                 android:layout_width="match_parent"
-        android:layout_height="0dp"
+                android:layout_height="@dimen/dp_10"/>
-        android:layout_weight="1"
+
-        android:background="@color/white"></View>
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+
+
+
+
 
     <LinearLayout
         android:id="@+id/llBtn"

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

@@ -13,6 +13,8 @@
         ></ImageView>
 
     <TextView
+        android:maxLines="1"
+        android:singleLine="true"
         android:id="@+id/title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

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

@@ -56,7 +56,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/dp_12"
-            android:layout_marginTop="@dimen/dp_10"
             android:text="15835201103"
             android:textColor="@color/color_9"
             android:textSize="@dimen/sp_12" />

mylibrary/src/main/java/com/dahe/mylibrary/base/BaseActivity.java

@@ -1,6 +1,8 @@
 package com.dahe.mylibrary.base;
 
 import android.content.Context;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
@@ -332,7 +334,14 @@ public abstract class BaseActivity<VB extends ViewBinding> extends AppCompatActi
     public void onClick(View view) {
 
     }
-
+    @Override
+    public Resources getResources() {
+        Resources res = super.getResources();
+        Configuration conf = new Configuration();
+        conf.setToDefaults();
+        res.updateConfiguration(conf, res.getDisplayMetrics());
+        return res;
+    }
 
     /**
      * 获取Drawable