Commit f09b9019 by 严久程

华为渠道特殊处理

parent e428403e
ext { ext {
kotlin_version = "1.3.21" kotlin_version = "1.3.21"
dev_mode = false dev_mode = true
ydl_app = [ ydl_app = [
......
...@@ -77,7 +77,7 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres ...@@ -77,7 +77,7 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
initData() initData()
val ffrom = PlatformDataManager.getRam().getChannelName() val ffrom = PlatformDataManager.getRam().getChannelName()
if (!TextUtils.isEmpty(ffrom) && ffrom.endsWith("huawei")) { if (!TextUtils.isEmpty(ffrom) && ffrom.startsWith("ATK_7") && ffrom.endsWith("huawei")) {
rl_hot_fix_for_huawei.visibility = View.GONE rl_hot_fix_for_huawei.visibility = View.GONE
} else { } else {
rl_hot_fix_for_huawei.visibility = View.VISIBLE rl_hot_fix_for_huawei.visibility = View.VISIBLE
......
...@@ -15,6 +15,7 @@ import com.ydl.webview.NewH5Activity ...@@ -15,6 +15,7 @@ import com.ydl.webview.NewH5Activity
import com.ydl.ydl_image.config.SimpleImageOpConfiger import com.ydl.ydl_image.config.SimpleImageOpConfiger
import com.ydl.ydl_image.module.GlideApp import com.ydl.ydl_image.module.GlideApp
import com.ydl.ydlcommon.base.config.HttpConfig import com.ydl.ydlcommon.base.config.HttpConfig
import com.ydl.ydlcommon.data.PlatformDataManager
import com.ydl.ydlcommon.router.IYDLRouterConstant import com.ydl.ydlcommon.router.IYDLRouterConstant
import com.ydl.ydlcommon.utils.BuryPointUtils import com.ydl.ydlcommon.utils.BuryPointUtils
import com.ydl.ydlcommon.utils.URLUtils import com.ydl.ydlcommon.utils.URLUtils
...@@ -50,6 +51,8 @@ class ExpertSearchAdapter( ...@@ -50,6 +51,8 @@ class ExpertSearchAdapter(
const val EMPTY_VIEW = 2 const val EMPTY_VIEW = 2
} }
private val ffrom = PlatformDataManager.getRam().getChannelName()
//记录当前选择主题的id //记录当前选择主题的id
var cateId: String? = null var cateId: String? = null
...@@ -66,6 +69,10 @@ class ExpertSearchAdapter( ...@@ -66,6 +69,10 @@ class ExpertSearchAdapter(
@SuppressLint("SetTextI18n") @SuppressLint("SetTextI18n")
override fun onBindViewHolder(holder: RecyclerView.ViewHolder?, position: Int) { override fun onBindViewHolder(holder: RecyclerView.ViewHolder?, position: Int) {
if (holder is NormalViewHolder) { if (holder is NormalViewHolder) {
val isFromXinliZiXunHuawei =
!TextUtils.isEmpty(ffrom) && ffrom.startsWith("ATK_7") && ffrom.endsWith("huawei")
val itemBean = listData[position] val itemBean = listData[position]
//头像 //头像
val headConfig = SimpleImageOpConfiger() val headConfig = SimpleImageOpConfiger()
...@@ -283,6 +290,19 @@ class ExpertSearchAdapter( ...@@ -283,6 +290,19 @@ 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.tvPriceContent.visibility = View.GONE
holder.tvChat.text="咨询"
}
} else if (holder is FooterViewHolder) { } else if (holder is FooterViewHolder) {
if (hasMore) { if (hasMore) {
holder.itemView.visibility = View.VISIBLE holder.itemView.visibility = View.VISIBLE
...@@ -340,6 +360,8 @@ class ExpertSearchAdapter( ...@@ -340,6 +360,8 @@ class ExpertSearchAdapter(
val imgServiceFree = itemView.imgServiceFree!! val imgServiceFree = itemView.imgServiceFree!!
//新驻图标 //新驻图标
val imgNewEnter = itemView.imgNewEnter!! val imgNewEnter = itemView.imgNewEnter!!
//荣誉标签
val ll_honor_layout = itemView.ll_honor_layout!!
//好评率 //好评率
val ll_feedbackRate = itemView.ll_feedbackRate!! val ll_feedbackRate = itemView.ll_feedbackRate!!
//xxx人点评 //xxx人点评
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="@dimen/platform_dp_13" android:paddingLeft="@dimen/platform_dp_13"
android:paddingRight="@dimen/platform_dp_15" android:paddingRight="@dimen/platform_dp_15"
android:paddingBottom="@dimen/platform_dp_8" android:paddingBottom="@dimen/platform_dp_8">
xmlns:app="http://schemas.android.com/apk/res-auto">
<!--头像--> <!--头像-->
<LinearLayout <LinearLayout
android:id="@+id/cvHead" android:id="@+id/cvHead"
...@@ -15,18 +15,19 @@ ...@@ -15,18 +15,19 @@
android:layout_marginTop="@dimen/platform_dp_15" android:layout_marginTop="@dimen/platform_dp_15"
android:background="@drawable/consultant_bg_radius_line_gray_05" android:background="@drawable/consultant_bg_radius_line_gray_05"
android:orientation="vertical"> android:orientation="vertical">
<android.support.v7.widget.CardView <android.support.v7.widget.CardView
android:layout_width="92dp" android:layout_width="92dp"
android:layout_height="114dp" android:layout_height="114dp"
app:cardElevation="0px" app:cardCornerRadius="4dp"
app:cardCornerRadius="4dp"> app:cardElevation="0px">
<ImageView <ImageView
android:id="@+id/imgHead" android:id="@+id/imgHead"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@drawable/consultant_avatar_def_circle" android:src="@drawable/consultant_avatar_def_circle" />
/>
</android.support.v7.widget.CardView> </android.support.v7.widget.CardView>
</LinearLayout> </LinearLayout>
...@@ -34,67 +35,70 @@ ...@@ -34,67 +35,70 @@
android:id="@+id/imgHead_online" android:id="@+id/imgHead_online"
android:layout_width="62dp" android:layout_width="62dp"
android:layout_height="14dp" android:layout_height="14dp"
android:layout_alignBottom="@+id/cvHead"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:layout_alignBottom="@+id/cvHead" android:visibility="gone"
app:srcCompat="@drawable/consultant_online_yue" app:srcCompat="@drawable/consultant_online_yue"
tools:visibility="visible" tools:visibility="visible" />
android:visibility="gone"/>
<ImageView <ImageView
android:id="@+id/imgHead_online_server" android:id="@+id/imgHead_online_server"
android:layout_width="41dp" android:layout_width="41dp"
android:layout_height="14dp" android:layout_height="14dp"
android:layout_alignBottom="@+id/cvHead"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:layout_alignBottom="@+id/cvHead" android:visibility="gone"
app:srcCompat="@drawable/consultant_online_server" app:srcCompat="@drawable/consultant_online_server"
tools:visibility="visible" tools:visibility="visible" />
android:visibility="gone"/>
<!--咨询师姓名--> <!--咨询师姓名-->
<TextView <TextView
android:id="@+id/tvName" android:id="@+id/tvName"
android:layout_toRightOf="@+id/cvHead"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/platform_dp_12"
android:layout_marginLeft="@dimen/platform_dp_12"
android:textSize="@dimen/platform_dp_18"
android:textColor="@color/platform_color_242424"
android:layout_marginStart="@dimen/platform_dp_12" android:layout_marginStart="@dimen/platform_dp_12"
android:layout_marginLeft="@dimen/platform_dp_12"
android:layout_marginTop="@dimen/platform_dp_12"
android:layout_toEndOf="@+id/cvHead"
android:layout_toRightOf="@+id/cvHead"
android:gravity="center_vertical" android:gravity="center_vertical"
android:textColor="@color/platform_color_242424"
android:textSize="@dimen/platform_dp_18"
android:textStyle="bold" android:textStyle="bold"
tools:ignore="SpUsage" tools:ignore="SpUsage"
tools:text="罗静" tools:text="罗静" />
android:layout_toEndOf="@+id/cvHead" />
<LinearLayout <LinearLayout
android:layout_toRightOf="@+id/tvName" android:id="@+id/ll_honor_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingLeft="8dp"
android:gravity="center_vertical"
android:layout_alignTop="@+id/tvName" android:layout_alignTop="@+id/tvName"
android:layout_alignBottom="@+id/tvName" android:layout_alignBottom="@+id/tvName"
android:layout_marginStart="@dimen/platform_dp_2"
android:layout_toEndOf="@+id/tvName" android:layout_toEndOf="@+id/tvName"
android:layout_marginStart="@dimen/platform_dp_2"> android:layout_toRightOf="@+id/tvName"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="8dp">
<ImageView <ImageView
android:id="@+id/img_fightEpidemicIcon" android:id="@+id/img_fightEpidemicIcon"
android:layout_width="53dp" android:layout_width="53dp"
android:layout_height="@dimen/platform_dp_17" android:layout_height="@dimen/platform_dp_17"
android:layout_marginRight="4dp" android:layout_marginRight="4dp"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:visibility="gone"/> android:visibility="gone" />
<!--活动图标--> <!--活动图标-->
<ImageView <ImageView
android:id="@+id/img_activity" android:id="@+id/img_activity"
android:layout_width="42dp" android:layout_width="42dp"
android:layout_height="12dp" android:layout_height="12dp"
android:layout_marginRight="4dp" android:layout_marginRight="4dp"
android:visibility="gone"/> android:visibility="gone" />
<!--公益图标--> <!--公益图标-->
<ImageView <ImageView
android:id="@+id/imgServiceFree" android:id="@+id/imgServiceFree"
...@@ -118,8 +122,8 @@ ...@@ -118,8 +122,8 @@
android:layout_height="@dimen/platform_dp_12" android:layout_height="@dimen/platform_dp_12"
android:layout_marginRight="4dp" android:layout_marginRight="4dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
tools:background="@drawable/consultant_expert_search_shixi" android:visibility="gone"
android:visibility="gone"/> tools:background="@drawable/consultant_expert_search_shixi" />
</LinearLayout> </LinearLayout>
...@@ -130,37 +134,38 @@ ...@@ -130,37 +134,38 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/tvName" android:layout_below="@+id/tvName"
android:layout_marginLeft="@dimen/platform_dp_12" android:layout_marginLeft="@dimen/platform_dp_12"
android:layout_toRightOf="@+id/cvHead"
android:layout_toEndOf="@+id/cvHead"
android:layout_marginTop="@dimen/platform_dp_4" android:layout_marginTop="@dimen/platform_dp_4"
android:textSize="@dimen/platform_dp_12" android:layout_toEndOf="@+id/cvHead"
android:textColor="@color/platform_color_242424" android:layout_toRightOf="@+id/cvHead"
android:lines="1"
android:ellipsize="end" android:ellipsize="end"
tools:text="一级婚姻家庭咨询师,二级心理咨询师"/> android:lines="1"
android:textColor="@color/platform_color_242424"
android:textSize="@dimen/platform_dp_12"
tools:text="一级婚姻家庭咨询师,二级心理咨询师" />
<!--咨询师标签--> <!--咨询师标签-->
<LinearLayout <LinearLayout
android:id="@+id/ll_tags" android:id="@+id/ll_tags"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/tvName"
android:layout_alignTop="@+id/tvChat" android:layout_alignTop="@+id/tvChat"
android:layout_alignBottom="@+id/tvChat" android:layout_alignBottom="@+id/tvChat"
android:layout_alignLeft="@+id/tvName"
android:layout_toLeftOf="@+id/tvChat" android:layout_toLeftOf="@+id/tvChat"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/ll_zixunOrderNum" android:id="@+id/ll_zixunOrderNum"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/platform_dp_16" android:layout_height="@dimen/platform_dp_16"
android:layout_toRightOf="@+id/cvHead"
android:layout_toEndOf="@+id/cvHead"
android:layout_below="@+id/tvTeamCertifications" android:layout_below="@+id/tvTeamCertifications"
android:layout_marginLeft="@dimen/platform_dp_12"
android:layout_marginStart="@dimen/platform_dp_12" android:layout_marginStart="@dimen/platform_dp_12"
android:layout_marginLeft="@dimen/platform_dp_12"
android:layout_marginTop="@dimen/platform_dp_5" android:layout_marginTop="@dimen/platform_dp_5"
android:layout_toEndOf="@+id/cvHead"
android:layout_toRightOf="@+id/cvHead"
android:orientation="horizontal"> android:orientation="horizontal">
<!--好评率--> <!--好评率-->
<LinearLayout <LinearLayout
...@@ -174,155 +179,162 @@ ...@@ -174,155 +179,162 @@
<!--61234人点评--> <!--61234人点评-->
<TextView <TextView
android:id="@+id/tv_zixunOrderNum" android:id="@+id/tv_zixunOrderNum"
android:layout_marginLeft="@dimen/platform_dp_12"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:textSize="@dimen/platform_dp_12" android:layout_marginLeft="@dimen/platform_dp_12"
android:textColor="@color/platform_color_242424" android:textColor="@color/platform_color_242424"
tools:text="61234" android:textSize="@dimen/platform_dp_12"
android:textStyle="bold"/> android:textStyle="bold"
tools:text="61234" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:textSize="@dimen/platform_dp_12" android:text="条评价"
android:textColor="@color/platform_color_999999" android:textColor="@color/platform_color_999999"
android:text="条评价" /> android:textSize="@dimen/platform_dp_12" />
</LinearLayout> </LinearLayout>
<!--帮助人数--> <!--帮助人数-->
<TextView <TextView
android:id="@+id/tvOrderNumContent" android:id="@+id/tvOrderNumContent"
android:layout_toRightOf="@+id/cvHead" android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/ll_zixunOrderNum" android:layout_below="@+id/ll_zixunOrderNum"
android:layout_marginStart="@dimen/platform_dp_12" android:layout_marginStart="@dimen/platform_dp_12"
android:layout_marginLeft="@dimen/platform_dp_12" android:layout_marginLeft="@dimen/platform_dp_12"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/platform_dp_12"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_toRightOf="@+id/cvHead"
android:text="帮助"
android:textColor="@color/platform_color_999999" android:textColor="@color/platform_color_999999"
tools:ignore="SpUsage" android:textSize="@dimen/platform_dp_12"
android:text="帮助" /> tools:ignore="SpUsage" />
<TextView <TextView
android:id="@+id/tvOrderNum" android:id="@+id/tvOrderNum"
android:layout_toRightOf="@+id/tvOrderNumContent"
android:layout_alignTop="@+id/tvOrderNumContent"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="@dimen/platform_dp_12" android:layout_alignTop="@+id/tvOrderNumContent"
android:layout_marginLeft="1dp" android:layout_marginLeft="1dp"
android:layout_marginRight="1dp" android:layout_marginRight="1dp"
android:layout_toRightOf="@+id/tvOrderNumContent"
android:textColor="@color/platform_color_242424" android:textColor="@color/platform_color_242424"
android:textSize="@dimen/platform_dp_12"
android:textStyle="bold" android:textStyle="bold"
tools:text="2648" tools:ignore="SpUsage"
tools:ignore="SpUsage" /> tools:text="2648" />
<TextView <TextView
android:layout_toRightOf="@+id/tvOrderNum"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignTop="@+id/tvOrderNumContent" android:layout_alignTop="@+id/tvOrderNumContent"
android:textSize="@dimen/platform_dp_12" android:layout_toRightOf="@+id/tvOrderNum"
android:text="人"
android:textColor="@color/platform_color_999999" android:textColor="@color/platform_color_999999"
tools:ignore="SpUsage" android:textSize="@dimen/platform_dp_12"
android:text="人" /> tools:ignore="SpUsage" />
<!--服务时长--> <!--服务时长-->
<TextView <TextView
android:id="@+id/tvSaleDurationForMonthContent" android:id="@+id/tvSaleDurationForMonthContent"
android:layout_toRightOf="@+id/tvOrderNum"
android:layout_alignTop="@+id/tvOrderNumContent"
android:layout_marginLeft="@dimen/platform_dp_20"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="@dimen/platform_dp_12" android:layout_alignTop="@+id/tvOrderNumContent"
android:layout_marginLeft="@dimen/platform_dp_20"
android:layout_toRightOf="@+id/tvOrderNum"
android:text="服务"
android:textColor="@color/platform_color_999999" android:textColor="@color/platform_color_999999"
tools:ignore="SpUsage" android:textSize="@dimen/platform_dp_12"
android:text="服务" /> tools:ignore="SpUsage" />
<TextView <TextView
android:id="@+id/tvSaleDurationForMonth" android:id="@+id/tvSaleDurationForMonth"
android:layout_toRightOf="@+id/tvSaleDurationForMonthContent"
android:layout_alignTop="@+id/tvOrderNumContent"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="@dimen/platform_dp_12" android:layout_alignTop="@+id/tvOrderNumContent"
android:layout_marginLeft="1dp" android:layout_marginLeft="1dp"
android:layout_marginRight="1dp" android:layout_marginRight="1dp"
android:layout_toRightOf="@+id/tvSaleDurationForMonthContent"
android:gravity="center"
android:textColor="@color/platform_color_242424" android:textColor="@color/platform_color_242424"
android:textSize="@dimen/platform_dp_12"
android:textStyle="bold" android:textStyle="bold"
android:gravity="center" tools:ignore="SpUsage"
tools:text="134" tools:text="134" />
tools:ignore="SpUsage" />
<TextView <TextView
android:layout_toRightOf="@+id/tvSaleDurationForMonth"
android:layout_alignTop="@+id/tvOrderNumContent"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="@dimen/platform_dp_12" android:layout_alignTop="@+id/tvOrderNumContent"
android:layout_toRightOf="@+id/tvSaleDurationForMonth"
android:text="小时"
android:textColor="@color/platform_color_999999" android:textColor="@color/platform_color_999999"
tools:ignore="SpUsage" android:textSize="@dimen/platform_dp_12"
android:text="小时" /> tools:ignore="SpUsage" />
<TextView <TextView
android:id="@+id/people_in_question" android:id="@+id/people_in_question"
android:layout_alignTop="@+id/tvOrderNumContent"
android:layout_alignParentRight="true"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="@dimen/platform_dp_12" android:layout_alignTop="@+id/tvOrderNumContent"
android:layout_alignParentRight="true"
android:textColor="@color/platform_color_FF5040" android:textColor="@color/platform_color_FF5040"
android:textSize="@dimen/platform_dp_12"
android:visibility="gone"
tools:ignore="SpUsage" tools:ignore="SpUsage"
tools:text="多人在问询" tools:text="多人在问询"
android:visibility="gone" tools:visibility="visible" />
tools:visibility="visible"/>
<TextView <TextView
android:id="@+id/tv_money_s"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignTop="@+id/tvPrice" android:layout_alignTop="@+id/tvPrice"
android:layout_marginTop="3dp"
android:layout_marginRight="1dp"
android:layout_toLeftOf="@+id/tvPrice" android:layout_toLeftOf="@+id/tvPrice"
android:text="¥"
android:textColor="#FF5040" android:textColor="#FF5040"
android:textSize="@dimen/platform_dp_11" android:textSize="@dimen/platform_dp_11"
tools:ignore="SpUsage"
android:layout_marginTop="3dp"
android:textStyle="bold" android:textStyle="bold"
android:layout_marginRight="1dp" tools:ignore="SpUsage" />
android:text="¥" />
<TextView <TextView
android:id="@+id/tvPrice" android:id="@+id/tvPrice"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignTop="@+id/tvName" android:layout_alignTop="@+id/tvName"
android:layout_toLeftOf="@+id/tvPriceContent" android:layout_toLeftOf="@+id/tvPriceContent"
android:fontFamily="@font/platform_din_bold"
android:textColor="#FF5040" android:textColor="#FF5040"
android:textSize="@dimen/platform_dp_20" android:textSize="@dimen/platform_dp_20"
android:fontFamily="@font/platform_din_bold"
tools:text="250" /> tools:text="250" />
<TextView <TextView
android:id="@+id/tvPriceContent" android:id="@+id/tvPriceContent"
android:layout_alignParentRight="true"
android:layout_alignBottom="@+id/tvPrice"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="#FF5040" android:layout_alignBottom="@+id/tvPrice"
android:textSize="@dimen/platform_dp_11" android:layout_alignParentRight="true"
android:layout_marginLeft="1dp"
android:layout_marginBottom="2.5dp" android:layout_marginBottom="2.5dp"
android:text="起" android:text="起"
android:layout_marginLeft="1dp" /> android:textColor="#FF5040"
android:textSize="@dimen/platform_dp_11" />
<TextView <TextView
android:id="@+id/tvCity" android:id="@+id/tvCity"
android:layout_below="@+id/tvName"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/platform_dp_4" android:layout_below="@+id/tvName"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
tools:text="浙江.杭州" android:layout_marginTop="@dimen/platform_dp_4"
android:gravity="right" android:gravity="right"
android:textColor="@color/platform_color_999999" android:textColor="@color/platform_color_999999"
android:textSize="@dimen/platform_dp_12"/> android:textSize="@dimen/platform_dp_12"
tools:text="浙江.杭州" />
<!--<View--> <!--<View-->
<!--android:id="@+id/vLine"--> <!--android:id="@+id/vLine"-->
<!--android:layout_below="@+id/tvPrice"--> <!--android:layout_below="@+id/tvPrice"-->
...@@ -336,11 +348,10 @@ ...@@ -336,11 +348,10 @@
<!--服务套餐--> <!--服务套餐-->
<LinearLayout <LinearLayout
android:id="@+id/ll_products" android:id="@+id/ll_products"
android:layout_below="@+id/vLine"
android:layout_marginLeft="104dp"
android:layout_marginStart="104dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="104dp"
android:layout_marginLeft="104dp"
android:layout_marginTop="@dimen/platform_dp_5" android:layout_marginTop="@dimen/platform_dp_5"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone"> android:visibility="gone">
...@@ -353,43 +364,45 @@ ...@@ -353,43 +364,45 @@
android:layout_height="@dimen/platform_dp_24" android:layout_height="@dimen/platform_dp_24"
android:layout_alignBottom="@+id/cvHead" android:layout_alignBottom="@+id/cvHead"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:gravity="center"
android:textSize="@dimen/platform_dp_13"
android:textStyle="bold"
android:background="@drawable/consultant_expert_search_chat" android:background="@drawable/consultant_expert_search_chat"
android:gravity="center"
android:text="私聊"
android:textColor="@color/consultant_confirm_text_color" android:textColor="@color/consultant_confirm_text_color"
android:text="私聊"/> android:textSize="@dimen/platform_dp_13"
android:textStyle="bold" />
<!--描述--> <!--描述-->
<RelativeLayout <RelativeLayout
android:id="@+id/group_desc" android:id="@+id/group_desc"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/platform_dp_10"
android:layout_below="@+id/tvChat" android:layout_below="@+id/tvChat"
android:layout_toRightOf="@+id/cvHead"
android:layout_marginLeft="@dimen/platform_dp_15" android:layout_marginLeft="@dimen/platform_dp_15"
android:visibility="gone" android:layout_marginTop="@dimen/platform_dp_10"
android:background="@drawable/consultant_bg_radius_gray_2"> android:layout_toRightOf="@+id/cvHead"
android:background="@drawable/consultant_bg_radius_gray_2"
android:visibility="gone">
<ImageView <ImageView
android:layout_width="12dp" android:layout_width="12dp"
android:layout_height="11dp" android:layout_height="11dp"
android:layout_marginTop="@dimen/platform_dp_6"
android:layout_marginLeft="@dimen/platform_dp_8" android:layout_marginLeft="@dimen/platform_dp_8"
android:src="@drawable/consultant_bg_item_desc"/> android:layout_marginTop="@dimen/platform_dp_6"
android:src="@drawable/consultant_bg_item_desc" />
<TextView <TextView
android:id="@+id/tvDesc" android:id="@+id/tvDesc"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="end"
android:layout_marginLeft="12dp" android:layout_marginLeft="12dp"
android:layout_marginRight="12dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginRight="12dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:ellipsize="end"
android:maxLines="2" android:maxLines="2"
tools:text="的客人能够黄偶尔烦人呢日工俄日给你额鞥你让个汇入你哦个人会儿个黄胡蓉呢你个人给哦 而归黑人更换二给"
android:textColor="@color/platform_color_999999" android:textColor="@color/platform_color_999999"
android:textSize="@dimen/platform_dp_11"/> android:textSize="@dimen/platform_dp_11"
tools:text="的客人能够黄偶尔烦人呢日工俄日给你额鞥你让个汇入你哦个人会儿个黄胡蓉呢你个人给哦 而归黑人更换二给" />
</RelativeLayout> </RelativeLayout>
</RelativeLayout> </RelativeLayout>
...@@ -6,7 +6,7 @@ import android.text.TextUtils ...@@ -6,7 +6,7 @@ import android.text.TextUtils
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import com.ydl.ydlcommon.data.PlatformDataManager.getRam import com.ydl.ydlcommon.data.PlatformDataManager
import com.yidianling.home.R import com.yidianling.home.R
import com.yidianling.home.constract.YdlHomeViewHolderConstract import com.yidianling.home.constract.YdlHomeViewHolderConstract
import com.yidianling.home.event.HomeImpl import com.yidianling.home.event.HomeImpl
...@@ -29,6 +29,7 @@ class YdlHomeAdapter( ...@@ -29,6 +29,7 @@ class YdlHomeAdapter(
private var list: ArrayList<HomePagerDataBean> private var list: ArrayList<HomePagerDataBean>
) : RecyclerView.Adapter<RecyclerView.ViewHolder>() { ) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
private val ffrom = PlatformDataManager.getRam().getChannelName()
private val mInflater: LayoutInflater = LayoutInflater.from(mContext) private val mInflater: LayoutInflater = LayoutInflater.from(mContext)
/** /**
* 倾述item的position * 倾述item的position
...@@ -151,6 +152,11 @@ class YdlHomeAdapter( ...@@ -151,6 +152,11 @@ class YdlHomeAdapter(
} }
//倾诉*排解模块 //倾诉*排解模块
is HomeConfideViewHolder -> { is HomeConfideViewHolder -> {
if (!TextUtils.isEmpty(ffrom) && ffrom.endsWith("huawei")) {
val parm = holder.itemView.layoutParams
parm.height = 0
holder.itemView.layoutParams = parm
} else {
holder.confideViewView.setTitle( holder.confideViewView.setTitle(
list[position].headerBean?.listenCategoryDate, list[position].headerBean?.listenCategoryDate,
confideSelectPosition confideSelectPosition
...@@ -158,14 +164,19 @@ class YdlHomeAdapter( ...@@ -158,14 +164,19 @@ class YdlHomeAdapter(
holder.confideViewView.setConfideExpertInfoView(list[position].confideBean?.body) holder.confideViewView.setConfideExpertInfoView(list[position].confideBean?.body)
confidePosition = position confidePosition = position
} }
}
//课程*成长模块 //课程*成长模块
is HomeCourseViewHolder -> { 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 -> { is HomeAssuageGriefViewHolder -> {
val ffrom =
getRam().getChannelName()
if (!TextUtils.isEmpty(ffrom) && ffrom.endsWith("huawei")) { if (!TextUtils.isEmpty(ffrom) && ffrom.endsWith("huawei")) {
val parm = holder.itemView.layoutParams val parm = holder.itemView.layoutParams
parm.height = 0 parm.height = 0
...@@ -180,6 +191,12 @@ class YdlHomeAdapter( ...@@ -180,6 +191,12 @@ class YdlHomeAdapter(
} }
//咨询模块 //咨询模块
is HomeConsultViewHolder -> { 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( holder.consultView.setTitle(
list[position].headerBean?.consultCategoryData, list[position].headerBean?.consultCategoryData,
consultSelectPosition consultSelectPosition
...@@ -190,6 +207,7 @@ class YdlHomeAdapter( ...@@ -190,6 +207,7 @@ class YdlHomeAdapter(
) )
consultPosition = position consultPosition = position
} }
}
//测试模块 //测试模块
is HomeTestViewHolder -> { is HomeTestViewHolder -> {
holder.testView.initData(list[position].testListBean) holder.testView.initData(list[position].testListBean)
......
...@@ -61,6 +61,9 @@ class HomeButtonBannerView(private val mContext: Context, private var homeEvent: ...@@ -61,6 +61,9 @@ class HomeButtonBannerView(private val mContext: Context, private var homeEvent:
val ffrom = PlatformDataManager.getRam().getChannelName() val ffrom = PlatformDataManager.getRam().getChannelName()
if (!TextUtils.isEmpty(ffrom) && ffrom.endsWith("huawei")) { if (!TextUtils.isEmpty(ffrom) && ffrom.endsWith("huawei")) {
homeModuleButtonBannerThird.visibility=View.GONE
homeModuleButtonBannerSecond.visibility=View.GONE
homeModuleButtonBannerFirst.background = homeModuleButtonBannerFirst.background =
resources.getDrawable(R.drawable.home_dcotor_bt_bg_huawei) resources.getDrawable(R.drawable.home_dcotor_bt_bg_huawei)
homeModuleButtonBannerSecond.background = homeModuleButtonBannerSecond.background =
...@@ -101,10 +104,17 @@ class HomeButtonBannerView(private val mContext: Context, private var homeEvent: ...@@ -101,10 +104,17 @@ class HomeButtonBannerView(private val mContext: Context, private var homeEvent:
homeCategory: List<HomeHeaderBean.AskCategoryDataBean>? homeCategory: List<HomeHeaderBean.AskCategoryDataBean>?
) { ) {
setRealTextView(homeSaleData) setRealTextView(homeSaleData)
homeEvent?.let { home_category_view.setEvent(it) };
val ffrom = PlatformDataManager.getRam().getChannelName()
if (!TextUtils.isEmpty(ffrom) && ffrom.endsWith("huawei")) {
home_category_view.visibility = View.GONE
} else {
homeEvent?.let { home_category_view.setEvent(it) }
home_category_view.initData(homeCategory) home_category_view.initData(homeCategory)
} }
}
/** /**
* 初始化实时测评状态View * 初始化实时测评状态View
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment