feat: 埋点与bugfix

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

@@ -459,6 +459,7 @@ class AudioHomeActivity :
         //权限申请
         requestPermission()
 
+        ActionCountUtils.record("call_phone_page", "call_phone_page_visit", "0", "1")
     }
 
 
@@ -588,6 +589,7 @@ class AudioHomeActivity :
         }
         //静音开启
         rl_mute_on_off.setOnClickListener {
+            ActionCountUtils.record("call_phone_page", "call_phone_icon_click", "0", "2")
             if (iv_mute_on_off.isSelected) {
                 iv_mute_on_off.isSelected = false
                 iv_mute_on_off.setImageResource(R.drawable.audiohome_muteoff)
@@ -602,6 +604,7 @@ class AudioHomeActivity :
         }
         //切换线路
         ll_changeRoute.setOnClickListener {
+            ActionCountUtils.record("call_phone_page", "call_phone_icon_click", "0", "4")
             showChooseDialog(1)
         }
         //挂断
@@ -610,6 +613,7 @@ class AudioHomeActivity :
                 //防止连击
                 return@setOnClickListener
             }
+            ActionCountUtils.record("call_phone_page", "call_phone_icon_click", "0", "1")
             if (isConnectSuccess) {
                 writeAgoraLog("已接通：主叫主动挂断")
                 AliYunRichLogsHelper.getInstance()
@@ -632,6 +636,7 @@ class AudioHomeActivity :
         }
         //免提
         iv_hands_free.setOnClickListener {
+            ActionCountUtils.record("call_phone_page", "call_phone_icon_click", "0", "3")
             if (iv_hands_free.isSelected) {
                 iv_hands_free.isSelected = false
                 iv_hands_free.setImageResource(R.drawable.audioim_img_hands_free_unuse)

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

@@ -21,6 +21,7 @@ import com.tencent.smtt.export.external.interfaces.JsResult
 import com.tencent.smtt.sdk.*
 import com.ydl.confide.R
 import com.ydl.confide.home.http.ConfideHomeApi
+import com.ydl.confide.router.PhoneCallIn
 import com.ydl.utils.WebUrlParamsUtils
 import com.ydl.webview.ProgressWebView
 import com.ydl.webview.TellData
@@ -146,6 +147,9 @@ class ConfideBottomSheetDialogFragment : BottomSheetDialogFragment() {
         val isLogin = findRouteService(IUserService::class.java)?.isLogin() ?: false
         first_order.visibility = if (isLogin) View.GONE else View.VISIBLE
         layoutCall.setOnClickListener {
+            if (!PhoneCallIn.loginByOneKeyLogin(requireContext(), true)) {
+                return@setOnClickListener
+            }
             callJsFun(wv_content, "listenCallClick()")
         }
         layoutChange.setOnClickListener {
@@ -215,7 +219,11 @@ class ConfideBottomSheetDialogFragment : BottomSheetDialogFragment() {
             }
         }
     }
-    fun updateChange(doctorId: String,title:String,uid: String){
+    fun updateChange(doctorId: String,title:String, uid: String) {
+        if (doctorId == "0") {//没有下一位了
+            layoutChange.visibility = View.GONE
+            return
+        }
         this.uid=uid
         text_title.text=title
         confideProgress.visibility=View.GONE

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

@@ -219,6 +219,15 @@ class ConfideHomeActivity : BaseLceActivity<IConfideHomeContract.View,IConfideHo
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        //登录了回来之后就不显示了
+        val isLogin = (findRouteService(IUserService::class.java)?.isLogin()) ?: false
+        if (isLogin) {
+            findViewById<View>(R.id.confide_Free).visibility = View.GONE
+        }
+    }
+
 
     /**
      * 初始化状态栏位置

m-confide/src/main/java/com/ydl/confide/intro/IntroAdapter.kt

@@ -39,6 +39,8 @@ internal class IntroAdapter(
 
     private var dispose: Disposable? = null
 
+    private val keySp = "check_network_continue"
+
     init {
         lifecycleOwner.lifecycle.addObserver(this)
     }
@@ -80,10 +82,17 @@ internal class IntroAdapter(
 
     internal fun checkNetwork() {
         if (!ConfideNetworkUtil.isWifi(context)) {
+            val lastCheck = context.getSharedPreferences("temp_test", Context.MODE_PRIVATE).getLong(keySp, 0)
+            val duration = System.currentTimeMillis() - lastCheck
+            if (duration < 1 * 60 * 1000) {
+                return
+            }
             val dialog = CommonDialog.create(context)
                 .setTitle(context.getString(R.string.confide_tip))
                 .setMessage(context.getString(R.string.confide_video_wifi_tip))
                 .setLeftOnclick("继续播放") {
+                    context.getSharedPreferences("temp_test", Context.MODE_PRIVATE).edit()
+                        .putLong(keySp, System.currentTimeMillis()).apply()
                     hasAgreePlayWithoutWiFi = true
                     for (entry in videoViews.entries) {
                         val value = entry.value
@@ -137,6 +146,7 @@ internal class IntroAdapter(
     private fun onResume() {
         val ijkVideoView = videoViews[curPos]
         ijkVideoView?.start()
+        onLoadDialStatus(curPos)
     }
 
     @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)

m-course/src/main/java/com/yidianling/course/widget/CourseRedPacketView.kt

@@ -10,6 +10,7 @@ import com.ydl.ydl_router.manager.YDLRouterManager
 import com.ydl.ydlcommon.data.http.RxUtils
 import com.ydl.ydlcommon.data.http.ThrowableConsumer
 import com.ydl.ydlcommon.router.IYDLRouterConstant
+import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
 import com.yidianling.course.R
 import com.yidianling.course.bean.RedListParam
 import com.yidianling.course.net.CourseRetrofitUtils
@@ -62,6 +63,7 @@ class CourseRedPacketView : RelativeLayout {
                 }
                 JUMP_CONFIDE_HOME -> {//跳转倾诉频道页
 //                    ARouter.getInstance().build("/confide/home").navigation()
+                    ActionCountUtils.record("listen_counselor_list_page", "listen_counselor_list_page_visit", "3")
                     YDLRouterManager.router(IYDLRouterConstant.ROUTER_CONFIDE_HOME)
                 }
                 JUMP_EXPERT_INFO -> {//跳转专家详情页

m-home/src/main/java/com/yidianling/home/event/HomeBaseImpl.kt

@@ -7,11 +7,9 @@ import android.os.Bundle
 import android.text.TextUtils
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
-import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.RecyclerView
 import com.alibaba.android.arouter.launcher.ARouter
 import com.ydl.confide.api.ConfideRoute
-import com.ydl.confide.api.IConfideService
 import com.ydl.media.audio.AudioPlayer
 import com.ydl.media.audio.model.Music
 import com.ydl.media.view.PlayTypeEnum
@@ -26,7 +24,6 @@ import com.ydl.ydlcommon.base.config.HttpConfig
 import com.ydl.ydlcommon.bean.ShareData
 import com.ydl.ydlcommon.data.PlatformRamImpl
 import com.ydl.ydlcommon.modular.ModularServiceManager
-import com.ydl.ydlcommon.modular.findRouteService
 import com.ydl.ydlcommon.modular.route
 import com.ydl.ydlcommon.router.IYDLRouterConstant
 import com.ydl.ydlcommon.utils.LogUtil
@@ -305,6 +302,7 @@ open class HomeBaseImpl : IHomeBaseEvent {
         ActionCountUtils.count(HomeBIConstants.YDL_USER_TALK_IN_TIME_CLICK)
 
         //倾诉首页 ydl-user://confide/home
+        ActionCountUtils.record("listen_counselor_list_page", "listen_counselor_list_page_visit", "1")
         route(mContext, ConfideRoute.R_CONFIDE_HOME, "listenFree" to listenFree)
     }
 
@@ -361,12 +359,14 @@ open class HomeBaseImpl : IHomeBaseEvent {
             doctorId.toString()
         )
 
-        findRouteService(IConfideService::class.java)
-            ?.showExpertDetailDialog(
-                mContext as FragmentActivity,
-                HttpConfig.MH5_URL + ConfideRoute.h5ConfideIntro(doctorId.toString()),
-                doctorId.toString()
+        if (linkUrl.startsWith("http")) {
+            YDLRouterManager.router(
+                IYDLRouterConstant.ROUTER_H5_H5,
+                YDLRouterParams().putExtra(IYDLRouterConstant.EXTRA_URL, linkUrl), ""
             )
+        } else {
+            YDLRouterManager.router(linkUrl)
+        }
     }
 
     /**

m-home/src/ydl/java/com/yidianling/home/ui/view/HomeConfideView.kt

@@ -10,6 +10,7 @@ import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.tabs.TabLayout
+import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
 import com.yidianling.common.tools.LogUtil
 import com.yidianling.home.R
 import com.yidianling.home.constract.HomeViewConfig
@@ -47,6 +48,7 @@ class HomeConfideView(private val mContext: Context, private var homeEvent: IHom
         View.inflate(mContext, R.layout.home_confide_view, this)
         homeModuleConfideViewHomeCommonTitleView.setTitle(HomeViewConfig.getOrder().confideTitle)
         homeModuleConfideViewHomeCommonTitleView.setOnClickListener {
+            ActionCountUtils.record("listen_counselor_list_page", "listen_counselor_list_page_visit", "2")
             homeEvent?.confideMoreClick()
         }
     }

ydl-webview/src/main/java/com/ydl/webview/H5JsBean.kt

@@ -40,6 +40,7 @@ class H5JsBean {
             var isFromQingShu = 0//是否是从专家倾述主页跳转私聊界面   0： 不是  1：是
             var docHead: String? = null//聊天头像
             var doctorId: Int = 0//医生id
+            var confideId: String?=null//医生id
             var listenerId: Int = 0
             var orderStatus: Int = 0
             var orderStatusDesc: String? = null