backup

config.gradle

@@ -6,10 +6,10 @@ ext {
             // -------------- 业务模块 --------------
             //第三步 若干
             "m-confide"       : "0.0.48.71",
-            "m-consultant"    : "0.0.59.20",
+            "m-consultant"    : "0.0.59.22",
             "m-fm"            : "0.0.30.00",
             "m-user"          : "0.0.60.20",
-            "m-home"          : "0.0.22.18",
+            "m-home"          : "0.0.22.20",
             "m-im"            : "0.0.18.12",
             "m-dynamic"       : "0.0.7.70",
             "m-article"       : "0.0.0.6",

m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchActivity.kt

@@ -87,6 +87,8 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
         window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE or WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN)
         initViews()
         initData(intent)
+
+        rl_hot_fix_for_huawei.visibility = View.VISIBLE
     }
 
     override fun getStatusViewOptions(): StatusBarOptions {

m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchFragment.kt

@@ -79,7 +79,6 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
 
         val ffrom = PlatformDataManager.getRam().getChannelName()
         if (!TextUtils.isEmpty(ffrom) &&
-            (ffrom.startsWith("ATK_7") && ffrom.endsWith("huawei"))||
             (ffrom.startsWith("ATK_android_yyjlcs"))
         ) {
             rl_hot_fix_for_huawei.visibility = View.GONE

m-consultant/src/main/java/com/yidianling/consultant/adapter/ExpertSearchAdapter.kt

@@ -52,8 +52,6 @@ class ExpertSearchAdapter(
         const val EMPTY_VIEW = 2
     }
 
-    private val ffrom = PlatformDataManager.getRam().getChannelName()
-
     //记录当前选择主题的id
     var cateId: String? = null
 
@@ -68,10 +66,6 @@ class ExpertSearchAdapter(
     @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder?, position: Int) {
         if (holder is NormalViewHolder) {
-            val isFromXinliZiXunHuawei =
-                !TextUtils.isEmpty(ffrom) && ffrom.startsWith("ATK_7") && ffrom.endsWith("huawei")
-
-
             val itemBean = listData[position]
             //头像
             val headConfig = SimpleImageOpConfiger()
@@ -304,25 +298,6 @@ class ExpertSearchAdapter(
             }
 
 
-            if (isFromXinliZiXunHuawei) {
-                holder.ll_honor_layout.visibility = View.GONE
-                holder.ll_tags.visibility = View.GONE
-                holder.imgHead_online.visibility = View.GONE
-                holder.imgHead_online_server.visibility = View.GONE
-                holder.tvPrice.visibility = View.GONE
-                holder.tvPriceContent.visibility = View.GONE
-                holder.tv_money_symbol.visibility = View.GONE
-                holder.chat_people_in_question.visibility = View.GONE
-                holder.tvCity.visibility = View.GONE
-                holder.tvChat.visibility = View.GONE
-                holder.tvChat.text = "咨询"
-
-                val params = holder.cv_head_view.layoutParams
-                params.width = RxImageTool.dp2px(92f)
-                params.height = RxImageTool.dp2px(92f)
-                holder.cv_head_view.layoutParams = params
-            }
-
         } else if (holder is FooterViewHolder) {
             if (hasMore) {
                 holder.itemView.visibility = View.VISIBLE

m-consultant/src/main/res/layout/consultant_activity_expert_search_list.xml

@@ -42,7 +42,7 @@
                     app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
 
-                    <!-- 心理咨询app华为渠道紧急处理，咨询师列表页先简单粗暴的隐藏顶部推荐模块-->
+                    <!-- 只剩抑郁焦虑测试需要隐藏，咨询师列表页先简单粗暴的隐藏顶部推荐模块-->
                     <RelativeLayout
                         android:id="@+id/rl_hot_fix_for_huawei"
                         android:layout_width="match_parent"

m-home/src/xlzx/java/com/yidianling/home/adapter/YdlHomeAdapter.kt

@@ -29,7 +29,6 @@ class YdlHomeAdapter(
     private var list: ArrayList<HomePagerDataBean>
 ) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
-    private val ffrom = PlatformDataManager.getRam().getChannelName()
     private val mInflater: LayoutInflater = LayoutInflater.from(mContext)
     /**
      * 倾述item的position
@@ -173,23 +172,13 @@ class YdlHomeAdapter(
 //            }
             //课程*成长模块
             is HomeCourseViewHolder -> {
-                if (!TextUtils.isEmpty(ffrom) && ffrom.endsWith("huawei")) {
-                    val parm = holder.itemView.layoutParams
-                    parm.height = 0
-                    holder.itemView.layoutParams = parm
-                } else {
-                    holder.courseViewView.initData(list[position].courseBean?.list)
-                }
+                holder.courseViewView.initData(list[position].courseBean?.list)
+
             }
             //解忧*问答模块
             is HomeAssuageGriefViewHolder -> {
-                if (!TextUtils.isEmpty(ffrom) && ffrom.endsWith("huawei")) {
-                    val parm = holder.itemView.layoutParams
-                    parm.height = 0
-                    holder.itemView.layoutParams = parm
-                } else {
-                    holder.assuageGriefViewView.initData(position, list[position].askBean?.data)
-                }
+                holder.assuageGriefViewView.initData(position, list[position].askBean?.data)
+
             }
             //文章*阅读模块
             is HomeArticleViewHolder -> {
@@ -197,22 +186,15 @@ class YdlHomeAdapter(
             }
             //咨询模块
             is HomeConsultViewHolder -> {
-                if (!TextUtils.isEmpty(ffrom) && ffrom.endsWith("huawei")) {
-                    val parm = holder.itemView.layoutParams
-                    parm.height = 0
-                    holder.itemView.layoutParams = parm
-                } else {
-
-                    holder.consultView.setTitle(
-                        list[position].headerBean?.consultCategoryData,
-                        consultSelectPosition
-                    )
-                    holder.consultView.setConsultInfoView(
-                        list[position].consultBean?.list,
-                        list[position].headerBean?.consultCategoryData?.get(consultSelectPosition)
-                    )
-                    consultPosition = position
-                }
+                holder.consultView.setTitle(
+                    list[position].headerBean?.consultCategoryData,
+                    consultSelectPosition
+                )
+                holder.consultView.setConsultInfoView(
+                    list[position].consultBean?.list,
+                    list[position].headerBean?.consultCategoryData?.get(consultSelectPosition)
+                )
+                consultPosition = position
             }
             //测试模块
             is HomeTestViewHolder -> {

m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeImageBannerView.kt

@@ -45,7 +45,7 @@ class HomeImageBannerView(val mContext: Context, val homeEvent: IHomeBaseEvent)
         )
         banner_search.layoutParams = bannerLayoutParams
 
-        banner_search.setIndicatorBottomPadding(10)
+//        banner_search.setIndicatorBottomPadding(5)
     }
 
     fun initData(bean: HomePagerDataBean) {