Merge branch 'dev' into 咨询加声网

# Conflicts:
#	config.gradle
#	m-audioim/build.gradle
#	m-audioim/src/main/java/com/ydl/audioim/AudioHomeActivity.kt
#	m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchFragment.kt

config.gradle

@@ -43,10 +43,10 @@ ext {
             // -------------- 业务模块 --------------
             //第三步 若干
             "m-confide"       : "0.0.48.11",
-            "m-consultant"    : "0.0.58.6",
+            "m-consultant"    : "0.0.58.9",
             "m-fm"            : "0.0.29.3",
             "m-user"          : "0.0.60.4",
-            "m-home"          : "0.0.19.1",
+            "m-home"          : "0.0.21.3",
             "m-im"            : "0.0.17.9",
             "m-dynamic"       : "0.0.7.5",
 
@@ -72,11 +72,11 @@ ext {
             "ydl-platform"    : "0.0.39.22",
             //第二步 若干
 
-            "ydl-webview"     : "0.0.38.24",
+            "ydl-webview"     : "0.0.38.27",
             "ydl-media"       : "0.0.20",
             "ydl-pay"         : "0.0.17",
             "m-audioim"       : "0.0.48.3.14",
-            "ydl-flutter-base": "0.0.10.9",
+            "ydl-flutter-base": "0.0.14.12",
 
             //以下 几乎不会动
             "router"          : "0.0.1",
@@ -270,7 +270,7 @@ ext {
 
             //flutter功能组件升级===>发布ydl-flutter组件===>引用flutter相关的业务模块
             "ydl-flutter-base"             : "com.ydl:ydl-flutter-base:${ydlCompileVersion["ydl-flutter-base"]}", //组件化项目中的flutter base模块
-            "ydl-flutter"                  : "com.ydl:ydl-flutter:0.0.18.0@aar", //flutter aar
+            "ydl-flutter"                  : "com.ydl:ydl-flutter:0.0.18.9@aar", //flutter aar
             "ydl-flutter-sp"               : "com.ydl:ydl-flutter-sp:0.0.2@aar", //flutter 缓存 aar
 
             //基础组件 <<--- 先发这个，发完改这里的版本号

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

@@ -41,6 +41,10 @@ import com.ydl.webview.RefreshWebEvent
 import com.ydl.ydl_av.chat.bean.AudioMessageBean
 import com.ydl.ydl_av.messge_service.YDLRTMClient
 import com.ydl.ydl_av.messge_service.callback.CancelCallStatusListener
+import com.ydl.ydl_av.messge_service.callback.CallListener
+import com.ydl.ydl_av.messge_service.callback.CancelCallStatusListener
+import com.ydl.ydl_av.messge_service.response.CallLocalResponse
+import com.ydl.ydl_av.messge_service.response.CallRemoteResponse
 import com.ydl.ydl_av.voice.listener.IYDLVoiceEventHandler
 import com.ydl.ydl_av.voice.manager.YDLVoiceManager
 import com.ydl.ydl_image.config.SimpleImageOpConfiger

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

@@ -174,8 +174,8 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
     private var headData: HeadData? = null //筛选数据
     private var isFromSplash = false
     private val props1 = JSONObject() //筛选标题埋点参数
-    private var fromPageType: Int = 0 //从哪个页面跳转过来的
-    private val fromPages = arrayOf("首页搜索", "找专家", "在线专家")
+    private var fromPageType: Int = 1 //从哪个页面跳转过来的
+    private val fromPages = arrayOf("首页", "搜索页面", "在线专家")
     private var isRecommend = false //埋点数据
     private var keyWord: String? = null //埋点数据
     private var isDoSearch: Boolean = false //埋点判断是否通过搜索进入埋点的
@@ -382,7 +382,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
         v_loading.setViewType(LogoLoadingView.TYPE_LOADING, null)
 
         if (fromPageType != -1) {
-            doctorAdapter.setEntrance(fromPages[fromPageType])
+            doctorAdapter.setEntrance(fromPages[fromPageType],1)
         }
     }
 
@@ -1456,7 +1456,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
 
     override fun onResume() {
         super.onResume()
-        ActionCountUtils.count(ConsultBIConstants.ConsultEvent.APP_CONSULT_LIST_PAGE_VISIT)
+        ActionCountUtils.count(ConsultBIConstants.ConsultSearchListEvent.APP_CONSULT_SEARCH_LIST_PAGE_VISIT)
 
     }
 

m-consultant/src/main/java/com/yidianling/consultant/constants/ConsultBIConstants.kt

@@ -32,6 +32,19 @@ class ConsultBIConstants {
             const val APP_CONSULT_LIST_CHAT_CLICK: String = APP_CONSULT_LIST_PAGE + "app_consult_list_chat_click"//每个咨询师私聊
         }
     }
+
+    class ConsultSearchListEvent {
+        companion object {
+            private const val CONSULT_SEARCH_LIST_PAGE: String = "consul_search_list_page|"//APP咨询搜索列表页  partId
+
+            const val APP_CONSULT_SEARCH_LIST_PAGE_VISIT: String = CONSULT_SEARCH_LIST_PAGE + "consul_search_list_page_visit"//列表页浏览事件
+            const val APP_CONSULT_SEARCH_LIST_CONSULT_ITEM_CLICK: String = CONSULT_SEARCH_LIST_PAGE + "consult_search_list_doctor_click "//每个咨询师页面点击
+            const val APP_CONSULT_SEARCH_LIST_CHAT_CLICK: String = CONSULT_SEARCH_LIST_PAGE + "consult__search_list_chat_click"//每个咨询师私聊
+        }
+    }
+
+
+
     class UserMainEvent {
         companion object {
 

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

@@ -11,6 +11,7 @@
         layout="@layout/consultant_layout_search_toolbar"
         android:layout_width="match_parent"
         android:layout_height="48dp" />
+
     <com.yidianling.consultant.ui.view.ExpertSearchSwipeRefreshLayout
         android:id="@+id/srlContainer"
         android:layout_width="match_parent"
@@ -40,11 +41,20 @@
                     android:clipToPadding="false"
                     app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
+
+                    <!-- 心理咨询app华为渠道紧急处理，咨询师列表页先简单粗暴的隐藏顶部推荐模块-->
+                    <RelativeLayout
+                        android:id="@+id/rl_hot_fix_for_huawei"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone">
+
                         <com.yidianling.consultant.ui.view.topView.RecommendListView
                             android:id="@+id/recommendListView"
                             android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                </com.yidianling.consultant.ui.view.topView.RecommendListView>
+                            android:layout_height="wrap_content" />
+                    </RelativeLayout>
+
 
                 </android.support.design.widget.CollapsingToolbarLayout>
             </android.support.design.widget.AppBarLayout>

m-consultant/src/xlzx/res/drawable/consultant_assistant_dialog_text_bg.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:topLeftRadius="8dp"
+        android:bottomLeftRadius="8dp"/>
+
+    <gradient
+        android:angle="0"
+        android:startColor="#CC1DA1F2"
+        android:endColor="#CC1DA1F2"/>
+</shape>
\ No newline at end of file

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

@@ -2,13 +2,14 @@ package com.yidianling.home.adapter
 
 import android.content.Context
 import android.support.v7.widget.RecyclerView
+import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import com.ydl.ydlcommon.data.PlatformDataManager.getRam
 import com.yidianling.home.R
 import com.yidianling.home.constract.YdlHomeViewHolderConstract
 import com.yidianling.home.event.HomeImpl
-import com.yidianling.home.event.IHomeEvent
 import com.yidianling.home.model.bean.HomeAskBean
 import com.yidianling.home.model.bean.HomeConfideBean
 import com.yidianling.home.model.bean.HomeConsultBean
@@ -22,9 +23,11 @@ import com.yidianling.home.ui.view.*
  * @Company 壹点灵
  * @date 2019/02/13
  */
-class YdlHomeAdapter(private val mContext: Context,
+class YdlHomeAdapter(
+    private val mContext: Context,
     private var homeEvent: HomeImpl,
-                     private var list: ArrayList<HomePagerDataBean>) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+    private var list: ArrayList<HomePagerDataBean>
+) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
     private val mInflater: LayoutInflater = LayoutInflater.from(mContext)
     /**
@@ -141,11 +144,17 @@ class YdlHomeAdapter(private val mContext: Context,
         when (holder) {
             //顶部预约专家，即时倾诉，心理课堂，心理测试按钮模块
             is HomeButtonBannerViewHolder -> {
-                holder.buttonBannerView.initData(list[position].headerBean?.homeSaleData,list[position].headerBean?.askCategoryData)
+                holder.buttonBannerView.initData(
+                    list[position].headerBean?.homeSaleData,
+                    list[position].headerBean?.askCategoryData
+                )
             }
             //倾诉*排解模块
             is HomeConfideViewHolder -> {
-                holder.confideViewView.setTitle(list[position].headerBean?.listenCategoryDate, confideSelectPosition)
+                holder.confideViewView.setTitle(
+                    list[position].headerBean?.listenCategoryDate,
+                    confideSelectPosition
+                )
                 holder.confideViewView.setConfideExpertInfoView(list[position].confideBean?.body)
                 confidePosition = position
             }
@@ -155,16 +164,30 @@ class YdlHomeAdapter(private val mContext: Context,
             }
             //解忧*问答模块
             is HomeAssuageGriefViewHolder -> {
+                val ffrom =
+                    getRam().getChannelName()
+                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)
                 }
+            }
             //文章*阅读模块
             is HomeArticleViewHolder -> {
                 holder.articleViewView.initData(list[position].articleBean?.list)
             }
             //咨询模块
             is HomeConsultViewHolder -> {
-                holder.consultView.setTitle(list[position].headerBean?.consultCategoryData, consultSelectPosition)
-                holder.consultView.setConsultInfoView(list[position].consultBean?.list,list[position].headerBean?.consultCategoryData?.get(consultSelectPosition))
+                holder.consultView.setTitle(
+                    list[position].headerBean?.consultCategoryData,
+                    consultSelectPosition
+                )
+                holder.consultView.setConsultInfoView(
+                    list[position].consultBean?.list,
+                    list[position].headerBean?.consultCategoryData?.get(consultSelectPosition)
+                )
                 consultPosition = position
             }
             //测试模块
@@ -177,25 +200,30 @@ class YdlHomeAdapter(private val mContext: Context,
     override fun getItemCount(): Int {
         return list.size
     }
+
     /**
      * 顶部预约专家，即时倾诉，心理测试按钮模块 ViewHolder
      */
-    inner class HomeButtonBannerViewHolder(val buttonBannerView: HomeButtonBannerView) : RecyclerView.ViewHolder(buttonBannerView)
+    inner class HomeButtonBannerViewHolder(val buttonBannerView: HomeButtonBannerView) :
+        RecyclerView.ViewHolder(buttonBannerView)
 
     /**
      * 咨询模块 ViewHolder
      */
-    inner class HomeConsultViewHolder(val consultView: HomeConsultView) : RecyclerView.ViewHolder(consultView)
+    inner class HomeConsultViewHolder(val consultView: HomeConsultView) :
+        RecyclerView.ViewHolder(consultView)
 
     /**
      * 倾诉*排解模块 ViewHolder
      */
-    inner class HomeConfideViewHolder(val confideViewView: HomeConfideView) : RecyclerView.ViewHolder(confideViewView)
+    inner class HomeConfideViewHolder(val confideViewView: HomeConfideView) :
+        RecyclerView.ViewHolder(confideViewView)
 
     /**
      * 课程*成长模块 ViewHolder
      */
-    inner class HomeCourseViewHolder(val courseViewView: HomeCourseView) : RecyclerView.ViewHolder(courseViewView)
+    inner class HomeCourseViewHolder(val courseViewView: HomeCourseView) :
+        RecyclerView.ViewHolder(courseViewView)
 
     /**
      * 测试模块 ViewHolder
@@ -205,11 +233,14 @@ class YdlHomeAdapter(private val mContext: Context,
     /**
      * 解忧*问答模块 ViewHolder
      */
-    inner class HomeAssuageGriefViewHolder(val assuageGriefViewView: HomeAssuageGriefView) : RecyclerView.ViewHolder(assuageGriefViewView)
+    inner class HomeAssuageGriefViewHolder(val assuageGriefViewView: HomeAssuageGriefView) :
+        RecyclerView.ViewHolder(assuageGriefViewView)
+
     /**
      * 文章*阅读模块 ViewHolder
      */
-    inner class HomeArticleViewHolder(val articleViewView: HomeArticleView) : RecyclerView.ViewHolder(articleViewView)
+    inner class HomeArticleViewHolder(val articleViewView: HomeArticleView) :
+        RecyclerView.ViewHolder(articleViewView)
 
     /**
      * 底部提示语模块 ViewHolder

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

 package com.yidianling.home.ui.view
 
 import android.content.Context
+import android.graphics.Color
 import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
@@ -33,6 +34,7 @@ class HomeAssuageGriefView(private val mContext: Context, private var homeEvent:
         )
         layoutParams = params
         View.inflate(mContext, R.layout.home_assuage_grief_view, this)
+        setBackgroundColor(Color.GREEN)
         homeModuleAssuageGriefViewHomeCommonTitleView.setTitle("解忧·问答")
         homeModuleAssuageGriefViewHomeCommonTitleView.setOnClickListener {
             homeEvent?.askMoreClick()
@@ -42,6 +44,7 @@ class HomeAssuageGriefView(private val mContext: Context, private var homeEvent:
     fun initData(position: Int, list: List<HomeAskBean.DataBean>?) {
         //添加View
         if (list == null) {
+            visibility = View.GONE
             return
         }
         if (cacheList.size != list?.size) {

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

 package com.yidianling.home.ui.view
 
 import android.content.Context
+import android.graphics.Color
 import android.support.v7.widget.RecyclerView
+import android.text.TextUtils
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
 import android.widget.LinearLayout
+import com.ydl.ydlcommon.data.PlatformDataManager
 import com.yidianling.common.tools.RxImageTool
 import com.yidianling.home.R
 import com.yidianling.home.event.IHomeBaseEvent
@@ -56,6 +59,28 @@ class HomeButtonBannerView(private val mContext: Context, private var homeEvent:
 
 //        initButtonView()
 
+        val ffrom = PlatformDataManager.getRam().getChannelName()
+        if (!TextUtils.isEmpty(ffrom) && ffrom.endsWith("huawei")) {
+            homeModuleButtonBannerFirst.background =
+                resources.getDrawable(R.drawable.home_dcotor_bt_bg_huawei)
+            homeModuleButtonBannerSecond.background =
+                resources.getDrawable(R.drawable.home_test_bt_bg_hauwei)
+            homeModuleButtonBannerThird.background =
+                resources.getDrawable(R.drawable.home_course_bt_bg_huawei)
+            homeModuleButtonBannerFourth.background =
+                resources.getDrawable(R.drawable.home_listen_bt_bg_huawei)
+
+
+            homeModuleButtonBannerFirstTitle.setTextColor(Color.WHITE)
+            tv_first_text.setTextColor(Color.WHITE)
+            homeModuleButtonBannerFourthTitle.setTextColor(Color.WHITE)
+            tv_second_text.setTextColor(Color.WHITE)
+            homeModuleButtonBannerThirdTitle.setTextColor(Color.WHITE)
+            tv_third_text.setTextColor(Color.WHITE)
+            homeModuleButtonBannerSecondTitle.setTextColor(Color.WHITE)
+            tv_fourth_text.setTextColor(Color.WHITE)
+        }
+
         homeModuleButtonBannerFirst.setOnClickListener {
             homeEvent?.reservationExpertsClick()
         }

m-home/src/xlzx/res/layout/home_button_banner_view.xml

@@ -5,11 +5,6 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <com.yidianling.home.ui.widget.HomeModuleCategoryView
-        android:id="@+id/home_category_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -17,8 +12,8 @@
         android:layout_marginTop="8dp"
         android:layout_marginRight="15dp"
         android:gravity="center_horizontal"
-        android:orientation="horizontal"
-        android:paddingBottom="20dp">
+        android:paddingBottom="12dp"
+        android:orientation="horizontal">
 
 
         <RelativeLayout
@@ -29,22 +24,23 @@
             android:layout_marginRight="8dp"
             android:layout_weight="1"
             android:background="@drawable/home_dcotor_bt_bg"
-            android:gravity="center">
+            android:gravity="center_horizontal">
 
             <TextView
                 android:id="@+id/homeModuleButtonBannerFirstTitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="7dp"
                 android:text="预约咨询"
                 android:textColor="@color/platform_black"
                 android:textSize="@dimen/platform_dp_16"
                 android:textStyle="bold" />
 
             <TextView
+                android:id="@+id/tv_first_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/homeModuleButtonBannerFirstTitle"
-                android:layout_marginTop="2dp"
                 android:text="1W+师资"
                 android:textColor="@color/platform_color_444444"
                 android:textSize="@dimen/platform_dp_11" />
@@ -58,22 +54,23 @@
             android:layout_marginRight="8dp"
             android:layout_weight="1"
             android:background="@drawable/home_listen_bt_bg"
-            android:gravity="center">
+            android:gravity="center_horizontal">
 
             <TextView
                 android:id="@+id/homeModuleButtonBannerFourthTitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="7dp"
                 android:text="心理测试"
                 android:textColor="@color/platform_black"
                 android:textSize="@dimen/platform_dp_16"
                 android:textStyle="bold" />
 
             <TextView
+                android:id="@+id/tv_second_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/homeModuleButtonBannerFourthTitle"
-                android:layout_marginTop="2dp"
                 android:text="专业权威"
                 android:textColor="@color/platform_color_444444"
                 android:textSize="@dimen/platform_dp_11" />
@@ -87,23 +84,24 @@
             android:layout_marginRight="8dp"
             android:layout_weight="1"
             android:background="@drawable/home_course_bt_bg"
-            android:gravity="center"
+            android:gravity="center_horizontal"
             android:orientation="vertical">
 
             <TextView
                 android:id="@+id/homeModuleButtonBannerThirdTitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="7dp"
                 android:text="心理课堂"
                 android:textColor="@color/platform_black"
                 android:textSize="@dimen/platform_dp_16"
                 android:textStyle="bold" />
 
             <TextView
+                android:id="@+id/tv_third_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/homeModuleButtonBannerThirdTitle"
-                android:layout_marginTop="2dp"
                 android:text="学习与成长"
                 android:textColor="@color/platform_color_444444"
                 android:textSize="@dimen/platform_dp_11" />
@@ -114,59 +112,38 @@
             android:layout_width="0dp"
             android:layout_height="78dp"
             android:layout_weight="1"
-            android:background="@drawable/home_test_bt_bg">
-
-            <RelativeLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:background="@drawable/home_button_first_free_bg"
-                android:paddingLeft="5dp"
-                android:paddingTop="1dp"
-                android:paddingRight="5dp"
-                android:paddingBottom="1dp"
-                android:visibility="gone" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_centerVertical="true"
-                android:layout_gravity="center_horizontal"
-                android:gravity="center_vertical"
-                android:orientation="vertical">
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:orientation="vertical">
+            android:background="@drawable/home_test_bt_bg"
+            android:gravity="center_horizontal">
 
             <TextView
                 android:id="@+id/homeModuleButtonBannerSecondTitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
+                android:layout_marginTop="7dp"
                 android:text="即时倾诉"
                 android:textColor="@color/platform_black"
                 android:textSize="@dimen/platform_dp_16"
                 android:textStyle="bold" />
 
             <TextView
+                android:id="@+id/tv_fourth_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/homeModuleButtonBannerSecondTitle"
                 android:layout_centerVertical="true"
-                        android:layout_marginTop="2dp"
                 android:text="专业解忧"
                 android:textColor="@color/platform_color_444444"
                 android:textSize="@dimen/platform_dp_11" />
 
-                </LinearLayout>
-
-            </LinearLayout>
-
 
         </RelativeLayout>
 
     </LinearLayout>
+
+    <com.yidianling.home.ui.widget.HomeModuleCategoryView
+        android:id="@+id/home_category_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
 </LinearLayout>

m-im/src/main/java/com/yidianling/uikit/custom/widget/ConfideOrderInfoView.java

@@ -36,7 +36,6 @@ public class ConfideOrderInfoView extends RelativeLayout {
     private String mSessionId;
     private IP2PCustomActionHandler.DocInfo info = null;
     private TextView tv_status = null;
-    private TextView tv_tips = null;
     private TextView tv_action = null;
     private TextView tv_order_info = null;
     private ImageView iv_call = null;
@@ -61,7 +60,6 @@ public class ConfideOrderInfoView extends RelativeLayout {
         View.inflate(mContext, R.layout.im_nim_chat_confide_order_info_view, this);
         setBackground(getResources().getDrawable(R.drawable.im_bg_im_confide_action));
         tv_status = findViewById(R.id.tv_status);
-        tv_tips = findViewById(R.id.tv_tips);
         tv_action = findViewById(R.id.tv_action);
         iv_call = findViewById(R.id.iv_call);
         tv_order_info = findViewById(R.id.tv_order_info);
@@ -78,7 +76,6 @@ public class ConfideOrderInfoView extends RelativeLayout {
         //有未完成订单
         if (info.hasAvailableListenOrder == 2) {
             tv_status.setText("剩余时间：" + coverTime(Integer.valueOf(info.listenOrderRemainTime)));
-            tv_tips.setVisibility(View.GONE);
 
 
             if (info.is_online == 3) { //通话中
@@ -98,7 +95,6 @@ public class ConfideOrderInfoView extends RelativeLayout {
             tv_action.setBackground(getResources().getDrawable(R.drawable.im_background_chat_confide_order_action));
             tv_action.setTextColor(getResources().getColor(R.color.im_white));
             tv_action.setText("去评价");
-            tv_tips.setVisibility(View.VISIBLE);
         }
         tv_order_info.setText(info.listenOrderDesc);
     }

m-im/src/main/res_uikit/layout/im_nim_chat_confide_order_info_view.xml

@@ -70,20 +70,4 @@
         tools:background="@drawable/im_background_chat_confide_order_action"
         tools:text="去评价" />
 
-
-    <TextView
-        android:id="@+id/tv_tips"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:background="@drawable/im_background_chat_confide_order_tpis"
-        android:paddingLeft="5dp"
-        android:paddingTop="1dp"
-        android:paddingRight="5dp"
-        android:paddingBottom="1dp"
-        android:text="最高返30元红包"
-        android:textColor="@color/im_white"
-        android:textSize="9sp"
-        android:visibility="gone" />
-
 </merge>

m-user/src/main/java/com/yidianling/user/http/UserApi.kt

@@ -191,7 +191,8 @@ interface UserApi {
     fun getFocusData(@Query("parentId") parentId: String = "0"): Observable<BaseAPIResponse<List<CollectFocusItemBean>>>
 
     //获取新用户引导页面url
+    @FormUrlEncoded
     @POST("user/getNewUserJumpUrl")
     @Headers( YDL_DOMAIN+ YDL_DOMAIN_JAVA)
-    fun getNewUserJumpUrl(): Observable<BaseAPIResponse<String>>
+    fun getNewUserJumpUrl(@FieldMap params: Map<String, String>): Observable<BaseAPIResponse<String>>
 }
\ No newline at end of file

m-user/src/main/java/com/yidianling/user/http/UserHttpImpl.kt

@@ -6,6 +6,7 @@ import com.google.gson.internal.LinkedTreeMap
 import com.umeng.socialize.bean.SHARE_MEDIA
 import com.ydl.ydlcommon.base.BaseApp
 import com.ydl.ydlcommon.data.http.BaseAPIResponse
+import com.ydl.ydlcommon.data.http.BaseCommand
 import com.ydl.ydlcommon.data.http.BaseResponse
 import com.ydl.ydlcommon.data.http.RxUtils
 import com.ydl.ydlcommon.router.YdlCommonOut
@@ -204,7 +205,8 @@ class UserHttpImpl private constructor() : UserHttp {
     }
 
     override fun getNewUserJumpUrl(): Observable<BaseAPIResponse<String>> {
-        return getUserApi().getNewUserJumpUrl()
+        return RxUtils.mapObservable(BaseCommand())
+            .flatMap { getUserApi().getNewUserJumpUrl(it) }
     }
 
     private object Holder {

ydl-flutter-base/src/main/java/com/channel/ydl_flutter_base/plugin/YDLCommonPlugin.kt

@@ -9,6 +9,7 @@ import com.ydl.ydlcommon.base.BaseApp
 import com.ydl.ydlcommon.base.config.YDLConstants
 import com.ydl.ydlcommon.data.PlatformDataManager
 import com.ydl.ydlcommon.modular.ModularServiceManager
+import com.ydl.ydlcommon.router.YdlCommonOut
 import com.ydl.ydlcommon.utils.SharedPreferencesEditor
 import com.ydl.ydlcommon.utils.YDLCacheUtils
 import com.ydl.ydlcommon.utils.YdlBuryPointUtil
@@ -40,6 +41,7 @@ class YDLCommonPlugin : MethodChannel.MethodCallHandler {
     companion object {
         const val CHANNEL: String = "lib/common/channel"
         const val GETPUBLICPARAMAS: String = "getPublicParamas"
+        const val GET_PACKAGE_AND_FFROM: String = "get_package_and_ffrom" // 获取包名和渠道名，中间用，分割
         const val ACTION_PUSH_EVENT_TRACKING_TAP: String = "action_push_event_tracking_tap"// 点击事件埋点
         const val ACTION_PUSH_EVENT_TRACKING_PV: String = "action_push_event_tracking_pv"//pv埋点
 
@@ -127,6 +129,11 @@ class YDLCommonPlugin : MethodChannel.MethodCallHandler {
                     YdlBuryPointUtil.sendPv(pvPath)
                 }
             }
+            GET_PACKAGE_AND_FFROM -> {
+                val packageName = YdlCommonOut.getApp().packageName
+                val ffrom = PlatformDataManager.getRam().getChannelName()
+                result.success("$packageName,$ffrom")
+            }
         }
     }
 }
\ No newline at end of file

ydl-platform/src/main/java/com/ydl/ydlcommon/base/BaseActivity.kt

@@ -102,6 +102,32 @@ abstract class BaseActivity : AppCompatActivity(), IActivityLifecycleable {
         }
     }
 
+    /**
+     * 设置底部抬高的布局的颜色
+     */
+    open fun setBottomColor(color: String) {
+        try {
+            if (getStatusViewOptions()?.isAddStatusView) {
+                if (StatusBarUtils.hasBottomNavigatorLine(this)) {
+                    findViewById<View>(R.id.ll_bottom_v).setBackgroundColor(
+                        Color.parseColor(
+                            color
+                        )
+                    )
+                }
+            } else {
+                if (StatusBarUtils.hasBottomNavigatorLine(this)) {
+                    findViewById<View>(R.id.ll_bottom_fit_v).setBackgroundColor(
+                        Color.parseColor(
+                            color
+                        )
+                    )
+                }
+            }
+        } catch (e: Exception) {
+        }
+    }
+
     open fun getDefaultBottomColor(): Int {
         return Color.parseColor("#00000000")
     }

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

@@ -44,6 +44,8 @@ class H5JsBean {
             var orderStatus: Int = 0
             var orderStatusDesc: String? = null
 
+            var bottomfitViewColor: String? = null //底部适配布局的颜色
+
             var orderContent: String? = null//默认发送的第一天聊天
             var action_name: String? = null
 

ydl-webview/src/main/java/com/ydl/webview/NewH5Activity.java

@@ -17,7 +17,6 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
-import android.webkit.ValueCallback;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
@@ -28,6 +27,7 @@ import com.tencent.smtt.export.external.interfaces.JsResult;
 import com.tencent.smtt.export.external.interfaces.SslError;
 import com.tencent.smtt.export.external.interfaces.SslErrorHandler;
 import com.tencent.smtt.sdk.CookieSyncManager;
+import com.tencent.smtt.sdk.ValueCallback;
 import com.tencent.smtt.sdk.WebChromeClient;
 import com.tencent.smtt.sdk.WebSettings;
 import com.tencent.smtt.sdk.WebView;
@@ -544,6 +544,12 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
         });
     }
 
+    public void setBottomViewColor(String color) {
+        runOnUiThread(() -> {
+            setBottomColor(color);
+        });
+    }
+
     public void showTitleBar() {
         runOnUiThread(() -> {
             tb_title.setVisibility(VISIBLE);
@@ -1267,6 +1273,7 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
              * 新用户侧滑按钮限制
              */
             if (h5Params.getBackLimit() != null && h5Params.getBackLimit() == H5Params.BackLimit.NEW_USER_PAGE) {
+                ModularServiceManager.INSTANCE.provide(IAppService.class).mainIntent(this);
                 return true;
             }