diff --git a/app/src/main/java/com/dahe/gldriver/bean/UpInfoBean.kt b/app/src/main/java/com/dahe/gldriver/bean/UpInfoBean.kt index 5b8f3ba..ba0e617 100644 --- a/app/src/main/java/com/dahe/gldriver/bean/UpInfoBean.kt +++ b/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, +) + + diff --git a/app/src/main/java/com/dahe/gldriver/net/Api.kt b/app/src/main/java/com/dahe/gldriver/net/Api.kt index 85dc02f..9aebb5f 100644 --- a/app/src/main/java/com/dahe/gldriver/net/Api.kt +++ b/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> + /** + * 司机设置自定义头像 + * @param userBean UserBean + * @return Observable> + */ + @POST(BASE_URL+"driver/driver/setUpDriverAvatar") + fun setUpDriverAvatar(@Body upPersonHead: UpPersonHead): Observable> + + /** * 查询车队所属的司机列表(包含车辆) * @return Observable>> diff --git a/app/src/main/java/com/dahe/gldriver/ui/mine/MineFragment.kt b/app/src/main/java/com/dahe/gldriver/ui/mine/MineFragment.kt index 492e809..c326f53 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/mine/MineFragment.kt +++ b/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(), 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() { + override fun onSuccess(t: CommonResponseBean) { + 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) diff --git a/app/src/main/res/layout/activity_auth_driver.xml b/app/src/main/res/layout/activity_auth_driver.xml index e0fb40b..e6124db 100644 --- a/app/src/main/res/layout/activity_auth_driver.xml +++ b/app/src/main/res/layout/activity_auth_driver.xml @@ -23,235 +23,253 @@ android:textColor="#FF5F20" android:textSize="@dimen/sp_14"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:layout_width="match_parent" + android:layout_height="match_parent" + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mylibrary/src/main/java/com/dahe/mylibrary/base/BaseActivity.java b/mylibrary/src/main/java/com/dahe/mylibrary/base/BaseActivity.java index 9083f2b..a5ea2ce 100644 --- a/mylibrary/src/main/java/com/dahe/mylibrary/base/BaseActivity.java +++ b/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 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