From 61864990b6999d828f9ef9d517cd37e5535080e4 Mon Sep 17 00:00:00 2001 From: lijia Date: Thu, 18 Apr 2024 08:40:38 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=9B=9E=E5=8D=95=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gldriver/ui/account/AuthSuccActivity.kt | 10 +++++++--- .../account/authperson/AuthDrivingActivity.kt | 5 ++++- .../ui/mine/activity/CarsManActivity.kt | 5 +++-- .../waybill/activity/WaybillUpPicActivity.kt | 8 ++++---- .../com/dahe/mylibrary/pop/PopBottomPic.kt | 4 ++++ .../java/com/dahe/mylibrary/utils/PopsUtils.kt | 4 ++-- .../src/main/res/drawable-xxhdpi/huidan.jpg | Bin 0 -> 611120 bytes 7 files changed, 24 insertions(+), 12 deletions(-) create mode 100644 mylibrary/src/main/res/drawable-xxhdpi/huidan.jpg diff --git a/app/src/main/java/com/dahe/gldriver/ui/account/AuthSuccActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/account/AuthSuccActivity.kt index b7ad583..91e6e8b 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/account/AuthSuccActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/account/AuthSuccActivity.kt @@ -27,7 +27,11 @@ class AuthSuccActivity : BaseActivity() { val get = BaseSPUtils.get(mContext, AppConfig.IS_GO_MINE, false) as Boolean binding.run { - btnLeft.text = if (BaseSPUtils.get(mContext, AppConfig.IS_GO_MINE, false) as Boolean) "回到个人中心" else "跳转首页" + btnLeft.text = if (intent.extras?.getBoolean( + AppConfig.IS_GO_MINE, + false + ) == true + ) "回到个人中心" else "跳转首页" btnLeft.setOnClickListener { goLeftOrRight(type, true) } @@ -49,9 +53,9 @@ class AuthSuccActivity : BaseActivity() { private fun goLeftOrRight(type: Int?, isLeft: Boolean) { if (isLeft) { // ActivityUtils.finishToActivity(HomeActivity::class.java, false) - ActivityUtils.startActivity(mContext,HomeActivity::class.java) + ActivityUtils.startActivity(mContext, HomeActivity::class.java) } else { - ActivityUtils.startActivity(mContext,AuthDrivingActivity::class.java) + ActivityUtils.startActivity(mContext, AuthDrivingActivity::class.java) // ActivityUtils.finishToActivityAndGoNew(mContext,CarsManActivity::class.java,AuthDrivingActivity::class.java,false) } } diff --git a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthDrivingActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthDrivingActivity.kt index 547acca..3325c0a 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthDrivingActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthDrivingActivity.kt @@ -287,9 +287,12 @@ class AuthDrivingActivity : BaseActivity() { AuthTrailerActivity::class.java, Bundle().apply { putString(AppConfig.CAR_ID, t.data.carId) + putBoolean(AppConfig.IS_GO_MINE,true) }) } else { - ActivityUtils.startActivity(mContext, AuthSuccActivity::class.java) + ActivityUtils.startActivity(mContext, AuthSuccActivity::class.java,Bundle().apply { + putBoolean(AppConfig.IS_GO_MINE,true) + }) } } })) diff --git a/app/src/main/java/com/dahe/gldriver/ui/mine/activity/CarsManActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/mine/activity/CarsManActivity.kt index c94d94c..c88f1e5 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/mine/activity/CarsManActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/mine/activity/CarsManActivity.kt @@ -83,8 +83,9 @@ class CarsManActivity : BaseActivity() { } btnOk.setOnClickListener { - BaseSPUtils.put(mContext,AppConfig.IS_GO_MINE,true) - ActivityUtils.startActivity(mContext, AuthDrivingActivity::class.java) + ActivityUtils.startActivity(mContext, AuthDrivingActivity::class.java,Bundle().apply { + putBoolean(AppConfig.IS_GO_MINE,true) + }) } } } diff --git a/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillUpPicActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillUpPicActivity.kt index ba4dd35..4517f60 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillUpPicActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillUpPicActivity.kt @@ -90,7 +90,7 @@ class WaybillUpPicActivity : BaseActivity() { myAdapter.setOnItemClickListener(object : OnItemClickListener { override fun onItemClick(v: View?, position: Int) { - PopsUtils.getInstance().showSelPic(mContext, myAdapter) { + PopsUtils.getInstance().showSelPic(mContext,false, myAdapter) { OssServiceUtil.getInstance().run { asyncPutImage(it[0].realPath, this@WaybillUpPicActivity) setResultCallBack { data, oldPath -> @@ -125,7 +125,7 @@ class WaybillUpPicActivity : BaseActivity() { } override fun openPicture() { - PopsUtils.getInstance().showSelPic(mContext, myAdapter) { + PopsUtils.getInstance().showSelPic(mContext,false, myAdapter) { // TODO: 暂时注释 OssServiceUtil.getInstance().run { asyncPutImage(it[0].realPath, this@WaybillUpPicActivity) @@ -171,7 +171,7 @@ class WaybillUpPicActivity : BaseActivity() { myAdapter.selectMax = 1 myAdapter.setOnItemClickListener(object : OnItemClickListener { override fun onItemClick(v: View?, position: Int) { - PopsUtils.getInstance().showSelPic(mContext, myAdapter) { + PopsUtils.getInstance().showSelPic(mContext,true, myAdapter) { OssServiceUtil.getInstance().run { asyncPutImage(it[0].realPath, this@WaybillUpPicActivity) setResultCallBack { data, oldPath -> @@ -199,7 +199,7 @@ class WaybillUpPicActivity : BaseActivity() { } override fun openPicture() { - PopsUtils.getInstance().showSelPic(mContext, myAdapter) { + PopsUtils.getInstance().showSelPic(mContext,true, myAdapter) { OssServiceUtil.getInstance().run { asyncPutImage(it[0].realPath, this@WaybillUpPicActivity) setResultCallBack { data, oldPath -> diff --git a/mylibrary/src/main/java/com/dahe/mylibrary/pop/PopBottomPic.kt b/mylibrary/src/main/java/com/dahe/mylibrary/pop/PopBottomPic.kt index 11fc287..7688d15 100644 --- a/mylibrary/src/main/java/com/dahe/mylibrary/pop/PopBottomPic.kt +++ b/mylibrary/src/main/java/com/dahe/mylibrary/pop/PopBottomPic.kt @@ -2,6 +2,7 @@ package com.dahe.mylibrary.pop import android.content.Context import android.widget.Button +import android.widget.ImageView import com.dahe.mylibrary.R import com.dahe.mylibrary.adapter.GridImageAdapter import com.dahe.mylibrary.callback.OnPicResultListener @@ -26,6 +27,7 @@ import kotlin.properties.Delegates class PopBottomPic( context: Context, num: Int = 1, + var isReturn: Boolean, myAdapter: GridImageAdapter, onPicResultListener: OnPicResultListener ) : BottomPopupView(context) { @@ -49,6 +51,8 @@ class PopBottomPic( var paizhao = findViewById