denghuan/GLDriver
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

推送别名设置

Browse Source
This commit is contained in:
lijia 2024-04-23 15:13:41 +08:00
parent d073e8a708
commit e9033410b4
12 changed files with 174 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -182,7 +182,7 @@ dependencies {
implementation 'com.umeng.umsdk:uverify-logger:2.1.4'// 必选 implementation 'com.umeng.umsdk:uverify-logger:2.1.4'// 必选
implementation 'com.umeng.umsdk:uverify-crashshield:2.1.4'// 必选 implementation 'com.umeng.umsdk:uverify-crashshield:2.1.4'// 必选
//推送 //推送
implementation 'com.umeng.umsdk:push:6.6.3'// 必选 // implementation 'com.umeng.umsdk:push:6.6.3'// 必选
implementation 'cn.jiguang.sdk:jpush:5.3.1' implementation 'cn.jiguang.sdk:jpush:5.3.1'
} }

97
app/src/main/java/com/dahe/gldriver/base/App.kt
View File

@ -9,7 +9,6 @@ import android.content.Context
import android.content.Intent import android.content.Intent
import android.os.Process import android.os.Process
import android.util.Log import android.util.Log
import anet.channel.util.Utils.context
import cn.jiguang.api.utils.JCollectionAuth import cn.jiguang.api.utils.JCollectionAuth
import cn.jpush.android.api.JPushInterface import cn.jpush.android.api.JPushInterface
import com.alct.mdp.MDPLocationCollectionManager import com.alct.mdp.MDPLocationCollectionManager
@ -17,7 +16,6 @@ import com.dahe.gldriver.BuildConfig
import com.dahe.gldriver.R import com.dahe.gldriver.R
import com.dahe.gldriver.net.Api import com.dahe.gldriver.net.Api
import com.dahe.gldriver.oss.OssServiceUtil import com.dahe.gldriver.oss.OssServiceUtil
import com.dahe.gldriver.push.PushHelper
import com.dahe.gldriver.third.JTTProcess import com.dahe.gldriver.third.JTTProcess
import com.dahe.gldriver.third.PlayerMusicService import com.dahe.gldriver.third.PlayerMusicService
import com.dahe.gldriver.third.SPUtil import com.dahe.gldriver.third.SPUtil
@ -32,8 +30,6 @@ import com.gyf.cactus.Cactus
import com.gyf.cactus.callback.CactusBackgroundCallback import com.gyf.cactus.callback.CactusBackgroundCallback
import com.tencent.bugly.crashreport.CrashReport import com.tencent.bugly.crashreport.CrashReport
import com.umeng.commonsdk.UMConfigure import com.umeng.commonsdk.UMConfigure
import com.umeng.message.PushAgent
import com.umeng.message.api.UPushRegisterCallback
import com.umeng.umverify.UMVerifyHelper import com.umeng.umverify.UMVerifyHelper
import com.umeng.umverify.listener.UMTokenResultListener import com.umeng.umverify.listener.UMTokenResultListener
import java.security.SecureRandom import java.security.SecureRandom
@ -55,7 +51,7 @@ class App : Application() {
// CrashHandler.getInstance().init(this); // CrashHandler.getInstance().init(this);
// CrashHandler2.getInstance().init(getApplicationContext()); // CrashHandler2.getInstance().init(getApplicationContext());
} }
CrashReport.initCrashReport(getApplicationContext(), AppConfig.BUGLY_APP_ID, false); CrashReport.initCrashReport(applicationContext, AppConfig.BUGLY_APP_ID, false);
OssServiceUtil.getInstance().init(); OssServiceUtil.getInstance().init();
@ -65,39 +61,39 @@ class App : Application() {
initThird() initThird()
var pendingIntent: PendingIntent = getActivity( // var pendingIntent: PendingIntent = getActivity(
applicationContext, 0, // applicationContext, 0,
Intent(applicationContext, HomeActivity::class.java), // Intent(applicationContext, HomeActivity::class.java),
FLAG_UPDATE_CURRENT // FLAG_UPDATE_CURRENT
) // )
Cactus.instance // Cactus.instance
.isDebug(true) // .isDebug(true)
.setTitle("大河好运") // .setTitle("大河好运")
.setContent("大河好运司机端为您提供服务") // .setContent("大河好运司机端为您提供服务")
.setSmallIcon(R.mipmap.app_icon) // .setSmallIcon(R.mipmap.app_icon)
.setChannelId(AppUtils.getAppPackageName()) // .setChannelId(AppUtils.getAppPackageName())
.setChannelName(AppUtils.getAppPackageName()) // .setChannelName(AppUtils.getAppPackageName())
//可选，设置通知栏点击事件 // //可选，设置通知栏点击事件
.setPendingIntent(pendingIntent) // .setPendingIntent(pendingIntent)
.setBackgroundMusicEnabled(true)//可选，退到后台是否可以播放音乐 // .setBackgroundMusicEnabled(true)//可选，退到后台是否可以播放音乐
.setMusicInterval(20000)//设置音乐间隔时间，时间间隔越长，越省电，默认间隔时间是0 // .setMusicInterval(20000)//设置音乐间隔时间，时间间隔越长，越省电，默认间隔时间是0
// .setMusicId(R.raw.main) //可选，设置音乐 //// .setMusicId(R.raw.main) //可选，设置音乐
// .addCallback(new CactusCallback())//可选，运行时回调 //// .addCallback(new CactusCallback())//可选，运行时回调
// .setCrashRestartUIEnabled(true) //可选，设置奔溃可以重启，google原生rom android 10以下可以正常重启 //// .setCrashRestartUIEnabled(true) //可选，设置奔溃可以重启，google原生rom android 10以下可以正常重启
// .setNotification(MyNotification.getInstance().getNotification(this)) //// .setNotification(MyNotification.getInstance().getNotification(this))
.hideNotificationAfterO(true) // .hideNotificationAfterO(true)
.addCallback { // .addCallback {
OrderUtils.getInstance().upLocation(applicationContext) // OrderUtils.getInstance().upLocation(applicationContext)
} // }
.addBackgroundCallback(object : CactusBackgroundCallback { // .addBackgroundCallback(object : CactusBackgroundCallback {
//
override fun onBackground(background: Boolean) { // override fun onBackground(background: Boolean) {
if (background) { // if (background) {
// getBillLocation(); //// getBillLocation();
} // }
} // }
}) // })
.register(this) // .register(this)
} }
override fun attachBaseContext(base: Context) { override fun attachBaseContext(base: Context) {
@ -112,7 +108,7 @@ class App : Application() {
if (packageName == getCurrentProcessName(this)) { if (packageName == getCurrentProcessName(this)) {
//Log.e("--使用的测试环境--",BuildConfig.OPEN_API_URL); //Log.e("--使用的测试环境--",BuildConfig.OPEN_API_URL);
MDPLocationCollectionManager.initialize(applicationContext, BuildConfig.OPEN_AL_URL) MDPLocationCollectionManager.initialize(applicationContext, BuildConfig.OPEN_AL_URL)
MDPLocationCollectionManager.initServiceProcessProguard(context) // 保活代码 MDPLocationCollectionManager.initServiceProcessProguard(applicationContext) // 保活代码
startService(Intent(this, PlayerMusicService::class.java)) // 保活代码 startService(Intent(this, PlayerMusicService::class.java)) // 保活代码
} }
@ -151,29 +147,6 @@ class App : Application() {
//友盟 //友盟
UMConfigure.preInit(this, AppConfig.APP_KEY, "Umeng"); UMConfigure.preInit(this, AppConfig.APP_KEY, "Umeng");
// 推送注册
val api = PushAgent.getInstance(this)
PushHelper.setting(api)
api.register(object : UPushRegisterCallback {
override fun onSuccess(p0: String?) {//注册厂商通道
Log.e(
"TAG",
"register failed! code:$p0"
)
//注册厂商通道
// registerDevicePush(context)
}
override fun onFailure(p0: String?, p1: String?) {
Log.e(
"TAG",
"register failed! code:$p0,desc:$p1"
)
}
})
UMConfigure.init( UMConfigure.init(
this, this,
AppConfig.APP_KEY, AppConfig.APP_KEY,

204
app/src/main/java/com/dahe/gldriver/push/PushHelper.kt
View File

@ -1,15 +1,11 @@
package com.dahe.gldriver.push package com.dahe.gldriver.push
import android.app.Notification
import android.content.Context import android.content.Context
import android.util.Log import cn.jpush.android.api.JPushInterface
import cn.jpush.android.api.TagAliasCallback
import com.dahe.gldriver.utils.SPUtils import com.dahe.gldriver.utils.SPUtils
import com.dahe.glex.bean.UserBean import com.dahe.glex.bean.UserBean
import com.dahe.mylibrary.callback.PushAliasListener import com.dahe.mylibrary.callback.PushAliasListener
import com.umeng.message.PushAgent
import com.umeng.message.UmengMessageHandler
import com.umeng.message.UmengNotificationClickHandler
import com.umeng.message.entity.UMessage
/** /**
* PushSDK集成帮助类 * PushSDK集成帮助类
@ -20,67 +16,67 @@ object PushHelper {
/** /**
* 推送设置 * 推送设置
*/ */
fun setting(api: PushAgent) { // fun setting(api: PushAgent) {
//修改为您app/src/main/AndroidManifest.xml中package值 // //修改为您app/src/main/AndroidManifest.xml中package值
api.resourcePackageName = "com.dahe.gldriver" // api.resourcePackageName = "com.dahe.gldriver"
//
//设置通知栏显示通知的最大个数（0～10），0：不限制个数 // //设置通知栏显示通知的最大个数（0～10），0：不限制个数
api.displayNotificationNumber = 0 // api.displayNotificationNumber = 0
//
//推送消息处理 // //推送消息处理
val msgHandler: UmengMessageHandler = object : UmengMessageHandler() { // val msgHandler: UmengMessageHandler = object : UmengMessageHandler() {
//处理通知栏消息 // //处理通知栏消息
override fun dealWithNotificationMessage(context: Context, msg: UMessage) { // override fun dealWithNotificationMessage(context: Context, msg: UMessage) {
super.dealWithNotificationMessage(context, msg) // super.dealWithNotificationMessage(context, msg)
Log.i(TAG, """notification receiver:${msg.raw}""".trimIndent()) // Log.i(TAG, """notification receiver:${msg.raw}""".trimIndent())
} // }
//
//自定义通知样式，此方法可以修改通知样式等 // //自定义通知样式，此方法可以修改通知样式等
override fun getNotification(context: Context, msg: UMessage): Notification { // override fun getNotification(context: Context, msg: UMessage): Notification {
return super.getNotification(context, msg) // return super.getNotification(context, msg)
} // }
//
//处理透传消息 // //处理透传消息
override fun dealWithCustomMessage(context: Context, msg: UMessage) { // override fun dealWithCustomMessage(context: Context, msg: UMessage) {
super.dealWithCustomMessage(context, msg) // super.dealWithCustomMessage(context, msg)
Log.i( // Log.i(
TAG, """custom receiver:${msg.raw}""".trimIndent() // TAG, """custom receiver:${msg.raw}""".trimIndent()
) // )
} // }
} // }
api.messageHandler = msgHandler // api.messageHandler = msgHandler
//
//推送消息点击处理 // //推送消息点击处理
val notificationClickHandler: UmengNotificationClickHandler = // val notificationClickHandler: UmengNotificationClickHandler =
object : UmengNotificationClickHandler() { // object : UmengNotificationClickHandler() {
override fun openActivity(context: Context, msg: UMessage) { // override fun openActivity(context: Context, msg: UMessage) {
super.openActivity(context, msg) // super.openActivity(context, msg)
Log.i(TAG, """click open activity:${msg.raw}""".trimIndent()) // Log.i(TAG, """click open activity:${msg.raw}""".trimIndent())
} // }
//
override fun launchApp(context: Context, msg: UMessage) { // override fun launchApp(context: Context, msg: UMessage) {
super.launchApp(context, msg) // super.launchApp(context, msg)
Log.i(TAG, """click launch app:${msg.raw}""".trimIndent()) // Log.i(TAG, """click launch app:${msg.raw}""".trimIndent())
} // }
//
override fun openUrl(context: Context, msg: UMessage) { // override fun openUrl(context: Context, msg: UMessage) {
super.openUrl(context, msg) // super.openUrl(context, msg)
Log.i(TAG, """click open deeplink:${msg.raw}""".trimIndent()) // Log.i(TAG, """click open deeplink:${msg.raw}""".trimIndent())
} // }
//
override fun dismissNotification(context: Context, msg: UMessage) { // override fun dismissNotification(context: Context, msg: UMessage) {
super.dismissNotification(context, msg) // super.dismissNotification(context, msg)
Log.i(TAG, """dismissNotification:${msg.raw}""".trimIndent()) // Log.i(TAG, """dismissNotification:${msg.raw}""".trimIndent())
} // }
} // }
api.notificationClickHandler = notificationClickHandler // api.notificationClickHandler = notificationClickHandler
//
//通过Service自定义接收并处理消息 // //通过Service自定义接收并处理消息
// api.setPushIntentServiceClass(MyCustomMessageService.class); //// api.setPushIntentServiceClass(MyCustomMessageService.class);
//
//设置厂商Token回调 // //设置厂商Token回调
api.setThirdTokenCallback { type, token -> Log.i(TAG, "push type:$type token:$token") } // api.setThirdTokenCallback { type, token -> Log.i(TAG, "push type:$type token:$token") }
} // }
/** /**
* 注册设备推送通道（小米、华为等设备的推送） * 注册设备推送通道（小米、华为等设备的推送）
@ -106,16 +102,23 @@ object PushHelper {
* 绑定别名，绑定成功后可通过别名推送消息 * 绑定别名，绑定成功后可通过别名推送消息
*/ */
fun setAlias(context: Context, userBean: UserBean) { fun setAlias(context: Context, userBean: UserBean) {
val alias = userBean.contactPhone JPushInterface.setAlias(
val type = "uid" context,
PushAgent.getInstance(context).setAlias(alias, type) { success, message -> 1,
val msg: String userBean.contactPhone
msg = if (success) { )
"set alias success! type:$type alias:$alias"
} else {
"set alias failure! msg:$message" // val alias = userBean.contactPhone
} // val type = "uid"
} // PushAgent.getInstance(context).setAlias(alias, type) { success, message ->
// val msg: String
// msg = if (success) {
// "set alias success! type:$type alias:$alias"
// } else {
// "set alias failure! msg:$message"
// }
// }
} }
/** /**
@ -123,16 +126,17 @@ object PushHelper {
*/ */
fun delete(context: Context, listener: PushAliasListener? = null) { fun delete(context: Context, listener: PushAliasListener? = null) {
val alias = SPUtils.instance.getUserInfo(context)?.contactPhone val alias = SPUtils.instance.getUserInfo(context)?.contactPhone
val type = "uid" JPushInterface.deleteAlias(context, 1)
PushAgent.getInstance(context).deleteAlias(alias, type) { success, message -> // val type = "uid"
val msg: String // PushAgent.getInstance(context).deleteAlias(alias, type) { success, message ->
listener?.onResult(success) // val msg: String
msg = if (success) { // listener?.onResult(success)
"delete alias success! type:$type alias:$alias" // msg = if (success) {
} else { // "delete alias success! type:$type alias:$alias"
"delete alias failure! msg:$message" // } else {
} // "delete alias failure! msg:$message"
} // }
// }
} }
/** /**
@ -140,16 +144,22 @@ object PushHelper {
*/ */
fun setAlias(context: Context, listener: PushAliasListener) { fun setAlias(context: Context, listener: PushAliasListener) {
val alias = (SPUtils.instance.getUserInfo(context) as UserBean).contactPhone val alias = (SPUtils.instance.getUserInfo(context) as UserBean).contactPhone
val type = "uid" JPushInterface.setAlias(
PushAgent.getInstance(context).setAlias(alias, type) { success, message -> context,
val msg: String 1,
listener.onResult(success) alias
msg = if (success) { )
"set alias success! type:$type alias:$alias" // val alias = (SPUtils.instance.getUserInfo(context) as UserBean).contactPhone
} else { // val type = "uid"
"set alias failure! msg:$message" // PushAgent.getInstance(context).setAlias(alias, type) { success, message ->
} // val msg: String
} // listener.onResult(success)
// msg = if (success) {
// "set alias success! type:$type alias:$alias"
// } else {
// "set alias failure! msg:$message"
// }
// }
} }
} }

2
app/src/main/java/com/dahe/gldriver/push/TagAliasOperatorHelper.java
View File

@ -76,7 +76,7 @@ public class TagAliasOperatorHelper {
if(jPushMessage.getErrorCode() == 0){ if(jPushMessage.getErrorCode() == 0){
Log.i(TAG,"action - modify alias Success,sequence:"+sequence); Log.i(TAG,"action - modify alias Success,sequence:"+sequence);
ToastUtils.showToast(context,"modify success"); // ToastUtils.showToast(context,"modify success");
}else{ }else{
String logs = "Failed to modify alias, errorCode:" + jPushMessage.getErrorCode(); String logs = "Failed to modify alias, errorCode:" + jPushMessage.getErrorCode();
Log.e(TAG, logs); Log.e(TAG, logs);

26
app/src/main/java/com/dahe/gldriver/ui/LauncherActivity.kt
View File

@ -14,6 +14,7 @@ import com.dahe.gldriver.databinding.ActivityLauncherBinding
import com.dahe.gldriver.third.JTTProcess import com.dahe.gldriver.third.JTTProcess
import com.dahe.gldriver.third.SPUtil import com.dahe.gldriver.third.SPUtil
import com.dahe.gldriver.ui.account.LoginActivity import com.dahe.gldriver.ui.account.LoginActivity
import com.dahe.gldriver.ui.account.SelectRoleActivity
import com.dahe.gldriver.utils.CommonPopUtils import com.dahe.gldriver.utils.CommonPopUtils
import com.dahe.gldriver.utils.SPUtils import com.dahe.gldriver.utils.SPUtils
import com.dahe.mylibrary.base.BaseActivity import com.dahe.mylibrary.base.BaseActivity
@ -35,6 +36,15 @@ class LauncherActivity : BaseActivity<ActivityLauncherBinding>() {
//已登录，直接跳转首页 //已登录，直接跳转首页
// //
if (!SPUtils.instance.getUserToken(mContext).isNullOrEmpty()) { if (!SPUtils.instance.getUserToken(mContext).isNullOrEmpty()) {
// val userInfo = SPUtils.instance.getUserInfo(mContext)
// if (userInfo?.isCarCaptain == "9") {//是否是车队长（0=否,1=是,9=未选择）
// ActivityUtils.startActivity(
// mContext,
// SelectRoleActivity::class.java
// )
// } else {
// ActivityUtils.startActivity(mContext, HomeActivity::class.java, intent.extras)
// }
ActivityUtils.startActivity(mContext, HomeActivity::class.java, intent.extras) ActivityUtils.startActivity(mContext, HomeActivity::class.java, intent.extras)
} else { } else {
ActivityUtils.startActivity(this@LauncherActivity, LoginActivity::class.java) ActivityUtils.startActivity(this@LauncherActivity, LoginActivity::class.java)
@ -107,16 +117,22 @@ class LauncherActivity : BaseActivity<ActivityLauncherBinding>() {
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe { aLong: Long -> .subscribe { aLong: Long ->
binding.tvCount.setText((count - aLong).toString()) binding.tvCount.text = (count - aLong).toString()
if (count - aLong == 0L) { if (count - aLong == 0L) {
mDisposable?.dispose() mDisposable?.dispose()
//已登录，直接跳转首页 //已登录，直接跳转首页
//已登录，直接跳转首页 //已登录，直接跳转首页
if (!SPUtils.instance.getUserToken(mContext).isNullOrEmpty()) { if (!SPUtils.instance.getUserToken(mContext).isNullOrEmpty()) {
ActivityUtils.startActivity( // val userInfo = SPUtils.instance.getUserInfo(mContext)
mContext, // if (userInfo?.isCarCaptain == "9") {//是否是车队长（0=否,1=是,9=未选择）
HomeActivity::class.java // ActivityUtils.startActivity(
) // mContext,
// SelectRoleActivity::class.java
// )
// } else {
// ActivityUtils.startActivity(mContext, HomeActivity::class.java, intent.extras)
// }
ActivityUtils.startActivity(mContext, HomeActivity::class.java, intent.extras)
} else { } else {
ActivityUtils.startActivity( ActivityUtils.startActivity(
this@LauncherActivity, this@LauncherActivity,

1
app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthTrailerActivity.kt
View File

@ -154,6 +154,7 @@ class AuthTrailerActivity : BaseActivity<ActivityAuthTrailerBinding>() {
passengerCapacity = it.passengerCapacity passengerCapacity = it.passengerCapacity
totalWeight = if (it.totalWeight.contains("kg")) it.totalWeight.split("kg")[0] else "" totalWeight = if (it.totalWeight.contains("kg")) it.totalWeight.split("kg")[0] else ""
curbWeight = if (it.curbWeight.contains("kg")) it.curbWeight.split("kg")[0] else "" curbWeight = if (it.curbWeight.contains("kg")) it.curbWeight.split("kg")[0] else ""
approvedLoad = if (it.permittedWeight.contains("kg")) it.permittedWeight.split("kg")[0] else ""
} }
//车长 //车长

2
app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditTrailerActivity.kt
View File

@ -208,6 +208,8 @@ class EditTrailerActivity : BaseActivity<ActivityAuthTrailerBinding>() {
if (it.totalWeight.contains("kg")) it.totalWeight.split("kg")[0] else "" if (it.totalWeight.contains("kg")) it.totalWeight.split("kg")[0] else ""
curbWeight = curbWeight =
if (it.curbWeight.contains("kg")) it.curbWeight.split("kg")[0] else "" if (it.curbWeight.contains("kg")) it.curbWeight.split("kg")[0] else ""
approvedLoad =
if (it.permittedWeight.contains("kg")) it.permittedWeight.split("kg")[0] else ""
} }
//车长 //车长

2
app/src/main/java/com/dahe/gldriver/ui/waybill/activity/SeeDocActivity.kt
View File

@ -144,7 +144,7 @@ class SeeDocActivity : BaseActivity<ActivitySeeDocBinding>() {
super.onSuccess(t) super.onSuccess(t)
if (t.data != null && t.data.size > 0) { if (t.data != null && t.data.size > 0) {
val load = t.data.find { it.type == "1" } val load = t.data.find { it.type == "1" }
val unLoad = t.data.filter { it.type == "2" }.maxBy { it.displayOrder } val unLoad = t.data.lastOrNull { it.type == "2" }
loadDatas.submitList(t.data.filter { it.type == "1" } loadDatas.submitList(t.data.filter { it.type == "1" }
.map { LocalMedia().apply { path = it.photoUrl } }.toMutableList()) .map { LocalMedia().apply { path = it.photoUrl } }.toMutableList())

3
app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillUpPicActivity.kt
View File

@ -316,6 +316,7 @@ class WaybillUpPicActivity : BaseActivity<ActivityWaybillUppicBinding>() {
} }
private fun unLoad(location: Location) { private fun unLoad(location: Location) {
showLoading()
MDPLocationCollectionManager.unload(mContext, orderBean.orderNum, location, MDPLocationCollectionManager.unload(mContext, orderBean.orderNum, location,
object : OnResultListener { object : OnResultListener {
override fun onSuccess() { override fun onSuccess() {
@ -501,7 +502,7 @@ class WaybillUpPicActivity : BaseActivity<ActivityWaybillUppicBinding>() {
object : OnResultListener { object : OnResultListener {
override fun onSuccess() { override fun onSuccess() {
Log.e("上报安联", "回单照片上传成功") Log.e("上报安联", "回单照片上传成功")
dissLoading()
//跳转成功页面，停止上传轨迹 //跳转成功页面，停止上传轨迹
OrderUtils.getInstance().stopUpLocation(mContext) OrderUtils.getInstance().stopUpLocation(mContext)
ActivityUtils.startActivity( ActivityUtils.startActivity(

1
app/src/main/res/layout/grid_item.xml
View File

@ -14,7 +14,6 @@
<TextView <TextView
android:maxLines="1" android:maxLines="1"
android:singleLine="true"
android:id="@+id/title" android:id="@+id/title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

2
app/src/main/res/layout/item_waybill.xml
View File

@ -137,7 +137,7 @@
android:layout_height="@dimen/dp_36" android:layout_height="@dimen/dp_36"
android:layout_below="@+id/tvModel" android:layout_below="@+id/tvModel"
android:layout_marginTop="@dimen/dp_10" android:layout_marginTop="@dimen/dp_10"
android:background="@color/color_9"></ImageView> ></ImageView>
<TextView <TextView
android:id="@+id/tvCom" android:id="@+id/tvCom"

5
mylibrary/src/main/java/com/dahe/mylibrary/pop/PopNorBottomPic.kt
View File

@ -87,9 +87,8 @@ class PopNorBottomPic(
.isPreviewImage(true) .isPreviewImage(true)
.isMaxSelectEnabledMask(true) .isMaxSelectEnabledMask(true)
// .setMaxSelectNum(1) // .setMaxSelectNum(1)
.setSelectionMode(SelectModeConfig.SINGLE) // .setSelectionMode(SelectModeConfig.SINGLE)
.isDirectReturnSingle(true) // .isDirectReturnSingle(true)
.setSelectionMode(SelectModeConfig.SINGLE)
.isGif(false) .isGif(false)
// .isDirectReturnSingle(true) // .isDirectReturnSingle(true)
// .setSelectedData(myAdapter.data) // .setSelectedData(myAdapter.data)