Merge branch 'feat/zl/confide2' into 'd/v_confide_2.0'

通话埋点

See merge request app_android_lib/YDL-Component!39

app/src/main/java/com/ydl/component/service/web/WVClickAbstractListener.java

@@ -450,8 +450,8 @@ public class WVClickAbstractListener implements WebViewClientClickListener {
     }
 
     @Override
-    public void getNextExpertStatus(String doctorID, String title) {
-        EventBus.getDefault().post(new ChangeAnotherExpertEvent(doctorID,title));
+    public void getNextExpertStatus(String doctorID, String title,String uid) {
+        EventBus.getDefault().post(new ChangeAnotherExpertEvent(doctorID,title,uid));
     }
 
 

app/src/main/java/com/ydl/component/service/web/WebJavascriptHandler.kt

@@ -383,7 +383,7 @@ class WebJavascriptHandler : IJavascriptHandler{
             }
             //再换一位
             "get_next_doctor"->{
-                wvEnventPro?.getNextExpertStatus(jsData.cmd?.params?.doctorId.toString(),jsData.cmd?.params?.title)
+                wvEnventPro?.getNextExpertStatus(jsData.cmd?.params?.doctorId.toString(),jsData.cmd?.params?.title,jsData.cmd?.params?.uid.toString())
             }
         }
     }

app/src/main/java/com/ydl/component/service/web/WebViewClientClickListener.java

@@ -181,5 +181,5 @@ public interface WebViewClientClickListener {
 
     //设置当前页面类型
     void setSelfPageType(int selfType);
-    void getNextExpertStatus(String doctorID,String title);
+    void getNextExpertStatus(String doctorID,String title,String uid);
 }

config.gradle

 ext {
     kotlin_version = "1.3.21"
-    dev_mode = false
+    dev_mode = true
 
     ydlPublishVersion = [
             // -------------- 业务模块 --------------

m-audioim/src/main/java/com/ydl/audioim/AudioHomeActivity.kt

@@ -619,10 +619,10 @@ class AudioHomeActivity :
                 leaveChannel()
                 uploadLog()
                 YDLavManager.instances.callEndStatusUpdate(channelId!!, 3, "主叫主动挂断")
+                callEventSave("51", "已接通：主叫主动挂断")
             } else {
                 userCloseCalling()
             }
-            callEventSave("51", "已接通：主叫主动挂断")
 
             ActionCountUtils.count(
                 "shengwang_popup_layer_page|shengwang_popup_layer_refuse_click",
@@ -784,7 +784,7 @@ class AudioHomeActivity :
                     if (!isConnectSuccess) {
                         //关闭音乐
                         stopPlaying()
-                        callEventSave("80", "未接通挂断：50s等待倒计时结束挂断")
+                        callEventSave("34", "未接通挂断：50s等待倒计时结束挂断")
 
                         writeAgoraLog("未接通挂断：50s等待倒计时结束挂断")
                         AliYunRichLogsHelper.getInstance()
@@ -858,7 +858,7 @@ class AudioHomeActivity :
      *
      */
     private fun userCloseCalling() {
-        callEventSave("51", "未接听时：主叫（用户）主动挂断，取消呼叫")
+        callEventSave("32", "未接听时：主叫（用户）主动挂断，取消呼叫")
 
         writeAgoraLog("未接听时：主叫（用户）主动挂断，取消呼叫")
         AliYunRichLogsHelper.getInstance()

m-confide/src/main/java/com/ydl/confide/home/ConfideBottomSheetDialogFragment.kt

@@ -9,6 +9,7 @@ import android.view.*
 import android.widget.FrameLayout
 import android.widget.TextView
 import androidx.fragment.app.FragmentActivity
+import com.alibaba.android.arouter.launcher.ARouter
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
@@ -31,6 +32,7 @@ import com.ydl.ydlnet.YDLHttpUtils
 import com.yidianling.common.tools.LogUtil
 import com.yidianling.common.tools.RxImageTool
 import com.yidianling.common.tools.ToastUtil
+import com.yidianling.im.api.service.IImService
 import com.yidianling.user.api.service.IUserService
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
@@ -60,6 +62,7 @@ class ConfideBottomSheetDialogFragment : BottomSheetDialogFragment() {
     lateinit var jumpUrl: String
     lateinit var doctorId: String
     var shouldShow: Boolean? = false
+    lateinit var uid:String
     fun showBottomSheetDialog(
         activity: FragmentActivity,
         jumpUrl: String,
@@ -208,11 +211,13 @@ class ConfideBottomSheetDialogFragment : BottomSheetDialogFragment() {
             }
         }
     }
-    fun updateChange(doctorId: String,title:String){
+    fun updateChange(doctorId: String,title:String,uid: String){
+        this.uid=uid
         text_title.text=title
         confideProgress.visibility=View.GONE
         layout_change_text.visibility=View.VISIBLE
         onLoadDialStatus(doctorId)
+        callJsFun(wv_content,"setUnRead(${getUnReadByUid(uid =uid )})")
     }
     @SuppressLint("ClickableViewAccessibility")
     private fun webViewInit(wv_content: ProgressWebView) {
@@ -242,6 +247,7 @@ class ConfideBottomSheetDialogFragment : BottomSheetDialogFragment() {
         var url = WebUrlParamsUtils.getSuffix(jumpurl, jtoJHandle.getUriAppendSuffix())
         LogUtil.e("AAA" + url)
         wv_content.loadUrl(url)
+
 //        wv_content.loadUrl(jumpUrl)
         wv_content.setOnTouchListener { p0, p1 -> //canScrollVertically(-1)的值表示是否能向下滚动，false表示已经滚动到顶部
             if (!wv_content.canScrollVertically(-1)) {
@@ -264,6 +270,7 @@ class ConfideBottomSheetDialogFragment : BottomSheetDialogFragment() {
             override fun onProgressChanged(view: WebView, newProgress: Int) {
                 if (newProgress == 100) {
                     wv_content.progressbar.visibility = View.GONE
+                    callJsFun(wv_content,"setUnRead(${getUnReadByUid(uid =uid )})")
                 } else {
                     if (wv_content.progressbar.visibility == View.GONE) {
                         wv_content.progressbar.visibility = View.VISIBLE
@@ -304,7 +311,9 @@ class ConfideBottomSheetDialogFragment : BottomSheetDialogFragment() {
             }
         }
     }
-
+    fun getUnReadByUid(uid:String):Int{
+        return ARouter.getInstance().navigation(IImService::class.java).getUnReadByUid(uid)
+    }
     @SuppressLint("CheckResult")
     private fun onLoadDialStatus(doctorId: String) {
         val confideApi = YDLHttpUtils.obtainApi(ConfideHomeApi::class.java)

m-confide/src/main/java/com/ydl/confide/home/ConfideHomeActivity.kt

@@ -270,7 +270,7 @@ class ConfideHomeActivity : BaseLceActivity<IConfideHomeContract.View,IConfideHo
         }
     }
     fun onEventMainThread(event: ChangeAnotherExpertEvent) {
-        bottomSheetDialogFragment.updateChange(event.doctorID,event.title)
+        bottomSheetDialogFragment.updateChange(event.doctorID,event.title,event.uid)
     }
     private fun initView() {
         img_back.setOnClickListener {

m-confide/src/main/java/com/ydl/confide/home/event/ChangeAnotherExpertEvent.kt

@@ -2,5 +2,6 @@ package com.ydl.confide.home.event
 
 data class ChangeAnotherExpertEvent(
     var doctorID:String,
-    var title:String
+    var title:String,
+    var uid:String
 )
\ No newline at end of file