Merge branch 'feat/lp/lp_confide_2.0_2' into 'd/v_confide_2.0'

feat: 倾诉列表加入toast，未升级confide

See merge request app_android_lib/YDL-Component!44

config.gradle

@@ -5,12 +5,12 @@ ext {
     ydlPublishVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
-            "m-confide"       : "0.0.49.77",
+            "m-confide"       : "0.0.49.78",
             "m-consultant"    : "0.0.60.21",
             "m-fm"            : "0.0.30.08",
             "m-user"          : "0.0.62.04",
             "m-home"          : "0.0.23.44",
-            "m-im"            : "0.0.21.33",
+            "m-im"            : "0.0.21.45",
             "m-dynamic"       : "0.0.7.37",
             "m-article"       : "0.0.0.10",
 
@@ -35,7 +35,7 @@ ext {
             //mdt 组件
             "ydl-tuicore"   : "0.0.22",
             //第一步
-            "ydl-platform"    : "0.0.41.10",
+            "ydl-platform"    : "0.0.41.11",
 
             //第二步 若干
             "ydl-webview"     : "0.0.38.62",
@@ -91,12 +91,12 @@ ext {
             // -------------- 业务模块 --------------
             //第三步 若干
 
-            "m-confide"       : "0.0.49.77",
+            "m-confide"       : "0.0.49.78",
             "m-consultant"    : "0.0.60.21",
             "m-fm"            : "0.0.30.08",
             "m-user"          : "0.0.62.04",
             "m-home"          : "0.0.23.41",
-            "m-im"            : "0.0.21.33",
+            "m-im"            : "0.0.21.45",
             "m-dynamic"       : "0.0.7.37",
             "m-article"       : "0.0.0.8",
 
@@ -119,7 +119,7 @@ ext {
             //mdt组件
             "ydl-tuicore"   : "0.0.22",
             //第一步
-            "ydl-platform"    : "0.0.41.10",
+            "ydl-platform"    : "0.0.41.11",
 
             //第二步 若干
             "ydl-webview"     : "0.0.38.62",

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

@@ -11,10 +11,8 @@ import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.SimpleItemAnimator
 import com.alibaba.android.arouter.facade.annotation.Route
-import com.alibaba.android.arouter.launcher.ARouter
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.jcodecraeer.xrecyclerview.ProgressStyle
 import com.jcodecraeer.xrecyclerview.XRecyclerView
 import com.ydl.confide.R
@@ -35,7 +33,6 @@ import com.ydl.confide.home.presenter.ConfideHomePresenterImpl
 import com.ydl.confide.home.util.ConfideHomeUtils
 import com.ydl.confide.home.widget.FilterItemDecoration
 import com.ydl.confide.router.PhoneCallIn
-import com.ydl.consultantim.event.AudioHomeEvent
 import com.ydl.webview.H5Params
 import com.ydl.webview.NewH5Activity
 import com.ydl.ydl_image.listener.YDLImageRecyclerOnScrollListener
@@ -44,12 +41,13 @@ import com.ydl.ydlcommon.base.config.HttpConfig.Companion.H5_URL
 import com.ydl.ydlcommon.base.config.HttpConfig.Companion.YDL_H5
 import com.ydl.ydlcommon.modular.findRouteService
 import com.ydl.ydlcommon.mvp.lce.BaseLceActivity
+import com.ydl.ydlcommon.router.IYDLRouterConstant
 import com.ydl.ydlcommon.utils.BuryPointUtils
-import com.ydl.ydlcommon.utils.LogUtil
 import com.ydl.ydlcommon.utils.remind.ToastHelper
 import com.ydl.ydlcommon.view.DrawableRightTextView
 import com.ydl.ydlcommon.view.WrapContentLinearLayoutManager
 import com.yidianling.common.tools.RxImageTool
+import com.yidianling.common.tools.ToastUtil
 import com.yidianling.im.api.service.IImService
 import de.greenrobot.event.EventBus
 import kotlinx.android.synthetic.main.confide_home_activity.*
@@ -157,6 +155,7 @@ class ConfideHomeActivity : BaseLceActivity<IConfideHomeContract.View,IConfideHo
         recommendList(page + 1)
     }
 
+    @SuppressLint("MissingSuperCall")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         EventBus.getDefault().register(this)
@@ -190,6 +189,9 @@ class ConfideHomeActivity : BaseLceActivity<IConfideHomeContract.View,IConfideHo
     }
 
     override fun initDataAndEvent() {
+        //来自首页倾诉红包入口
+        val isFromRed = intent.getBooleanExtra(IYDLRouterConstant.EXTRA_RED_PACKET,false)
+
         isSplash = intent.getBooleanExtra("isSplash", false)
         //初始化View
         initView()
@@ -210,6 +212,9 @@ class ConfideHomeActivity : BaseLceActivity<IConfideHomeContract.View,IConfideHo
             .load(R.drawable.confide__free)
             .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
             .into(confide_Free)
+        if (isFromRed){
+            ToastUtil.toastLong(this@ConfideHomeActivity,"红包已领取成功 可立即点击拨打")
+        }
     }
 
 

ydl-platform/src/main/java/com/ydl/ydlcommon/router/IYDLRouterConstant.kt

@@ -77,6 +77,7 @@ interface IYDLRouterConstant{
         const val EXTRA_CATETITLE = "cateTitle"
         const val EXTRA_SHOWTYPE  = "showType"
         const val EXTRA_KEYWORD   = "keyword"
+        const val EXTRA_RED_PACKET = "by_red_packet"
 
         /**
          * 冥想模块额外参数