Merge branch 'feat/lp/lp_change_text' into 'd/v4.4.07'

feat: 1. 埋点外部加入deviceid参数,2. im消息文案替换

See merge request app_android_lib/YDL-Component!303

m-im/src/main/java/com/yidianling/uikit/custom/widget/expertConsultService/view/ExpertConsultServiceListDialog.kt

@@ -78,11 +78,23 @@ class ExpertConsultServiceListDialog(val mContext: Context, val mList: List<Serv
             override fun addTime() { // 提醒添加时间回调
                 dismiss()
                 // 埋点
-                ActionCountUtils.baiDuCountSign3("ydl_user_product_page","remind_add_click",toUid,ActionHandlerStorage.getL(toUid).info.name,"")
+                ActionCountUtils.baiDuCountSign3(
+                    "ydl_user_product_page",
+                    "remind_add_click",
+                    toUid,
+                    ActionHandlerStorage.getL(toUid).info.name,
+                    ""
+                )
                 // 发送提醒消息
-                val customTime = CustomAttachSubScriptTime("请尽快添加可预约时间")
-                val message = MessageBuilder.createCustomMessage(toUid, SessionTypeEnum.P2P, "请尽快添加可预约时间", customTime)
-                NIMClient.getService(MsgService::class.java).sendMessage(message, false).setCallback(object :
+                val customTime = CustomAttachSubScriptTime("我想预约服务，请尽快开启服务时间")
+                val message = MessageBuilder.createCustomMessage(
+                    toUid,
+                    SessionTypeEnum.P2P,
+                    "我想预约服务，请尽快开启服务时间",
+                    customTime
+                )
+                NIMClient.getService(MsgService::class.java).sendMessage(message, false)
+                    .setCallback(object :
                         RequestCallback<Void> {
                         override fun onSuccess(param: Void?) {
                             MessageListPanelHelper.getInstance().notifyAddMessage(message)

m-im/src/main/java/com/yidianling/uikit/custom/widget/expertConsultService/view/ExpertConsultServiceListDialog2.kt

@@ -21,7 +21,6 @@ import com.ydl.ydlcommon.data.http.BaseAPIResponse
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
 import com.yidianling.common.tools.RxDeviceTool
 import com.yidianling.common.tools.RxImageTool
-import com.yidianling.common.tools.ToastUtil
 import com.yidianling.im.R
 import com.yidianling.im.api.service.IImService
 import com.yidianling.im.bean.BusyBean
@@ -154,11 +153,11 @@ class ExpertConsultServiceListDialog2(
                         )
                     }
                     // 发送提醒消息
-                    val customTime = CustomAttachSubScriptTime("请尽快添加可预约时间")
+                    val customTime = CustomAttachSubScriptTime("我想预约服务，请尽快开启服务时间")
                     val message = MessageBuilder.createCustomMessage(
                         toUid,
                         SessionTypeEnum.P2P,
-                        "请尽快添加可预约时间",
+                        "我想预约服务，请尽快开启服务时间",
                         customTime
                     )
                     NIMClient.getService(MsgService::class.java).sendMessage(message, false)

m-im/src/main/res/layout/im_ui_message_subscript_time.xml

@@ -19,7 +19,7 @@
             android:layout_marginTop="10dp"
             android:layout_toRightOf="@+id/packte_im"
             android:paddingRight="10dp"
-            android:text="请尽快添加可预约时间"
+            android:text="我想预约服务，请尽快开启服务时间"
             android:textColor="#ffffff"
             android:textSize="14sp" />
 

ydl-platform/src/main/java/com/ydl/ydlcommon/utils/actionutil/ActionCountUtils.kt

@@ -270,7 +270,7 @@ class ActionCountUtils {
                 * 所以Utils.getIMEI(topTaskActivity)传入activity解决这个问题
                 * */
 
-                if (DeviceTool.checkHasAgreeSecret()){
+                if (DeviceTool.checkHasAgreeSecret()) {
                     deviceId = if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P) {
                         val topTaskActivity = ActivityManager.getInstance().getTopTaskActivity()
                         //获取imei
@@ -280,7 +280,8 @@ class ActionCountUtils {
                         DeviceIDHelper.getInstance().deviceId
                     }
                 }
-
+                //外部参数添加deviceid
+                actionDataParams.deviceId(deviceId)
                 baiduActionDataParams.deviceId(deviceId)
                 baiduActionDataParams.convertType(convertType)
                 baiduActionDataParams.convertTime(System.currentTimeMillis() / 1000)
@@ -288,9 +289,12 @@ class ActionCountUtils {
                 baiduActionDataParams.appName(appName)
                 try {
                     @SuppressLint("HardwareIds") val id =
-                        if (DeviceTool.checkHasAgreeSecret()){
-                            Settings.Secure.getString(RxTool.getContext().contentResolver, Settings.Secure.ANDROID_ID)
-                        }else{
+                        if (DeviceTool.checkHasAgreeSecret()) {
+                            Settings.Secure.getString(
+                                RxTool.getContext().contentResolver,
+                                Settings.Secure.ANDROID_ID
+                            )
+                        } else {
                             ""
                         }
                     LogUtil.e("androidid未加密:${id}")