Skip to content

Y
YDL-Component-Medical
Commit 7781a8ff by 严久程
Options

导医跳转区分入口

parent 1d7f4464
Showing with 76 additions and 69 deletions
config.gradle
......@@ -6,17 +6,17 @@ ext {
// -------------- 业务模块 --------------
//第三步 若干
"m-confide" : "0.0.48.74",
"m-consultant" : "0.0.59.30",
"m-consultant" : "0.0.59.31",
"m-fm" : "0.0.30.00",
"m-user" : "0.0.60.22",
"m-home" : "0.0.22.20",
"m-im" : "0.0.18.15",
"m-dynamic" : "0.0.7.9",
"m-dynamic" : "0.0.7.13",
"m-article" : "0.0.0.6",
"m-muse" : "0.0.28.20",
"m-tests" : "0.0.24.10",
"m-course" : "0.0.42.8",
"m-course" : "0.0.42.9",
//-------------- 业务模块 API 层 --------------
"m-audioim-api" : "0.0.6",
......@@ -40,7 +40,7 @@ ext {
"ydl-media" : "0.0.21.6",
"ydl-pay" : "0.0.18.9",
"m-audioim" : "0.0.49.29.7",
"ydl-flutter-base": "0.0.14.18",
"ydl-flutter-base": "0.0.14.19",
//以下 几乎不会动
"router" : "0.0.1",
......@@ -121,7 +121,7 @@ ext {
"ydl-media" : "0.0.21.6",
"ydl-pay" : "0.0.18.9",
"m-audioim" : "0.0.49.29.7",
"ydl-flutter-base": "0.0.14.18",
"ydl-flutter-base": "0.0.14.19",
//以下 几乎不会动
"router" : "0.0.1",
......@@ -269,7 +269,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.22@aar", //flutter aar
"ydl-flutter" : "com.ydl:ydl-flutter:0.0.24@aar", //flutter aar
"ydl-flutter-sp" : "com.ydl:ydl-flutter-sp:0.0.2@aar", //flutter 缓存 aar
//基础组件 <<--- 先发这个，发完改这里的版本号
......
m-consultant/src/main/java/com/yidianling/consultant/modular/singlton/ConsultAssistantDialogUtils.kt
......@@ -287,7 +287,7 @@ class ConsultAssistantDialogUtils private constructor() {
fun getConsultAssistantUid(activity: Activity,location:Int) {
ActionCountUtils.count(ConsultBIConstants.POSITION_DAOYI_ADVERTISEMENT_CLICK, location.toString())
// 请求接口获取咨询助理的uid
SearchApi.getSearchApi().getConsultAssistantUidRequest(1)
SearchApi.getSearchApi().getConsultAssistantUidRequest(location)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(Consumer {
......
m-course/src/main/res/layout/item_course_new_list_view.xml
......@@ -244,6 +244,7 @@
tools:visibility="visible"
app:pa_borderRadius="8dp"
app:pa_type="pa_round"
android:layout_marginStart="2dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/iv_head"
/>
......
m-dynamic/src/main/java/com/yidianling/dynamic/model/Command.java
......@@ -203,7 +203,7 @@ public class Command {
public int page;
public String topicId;//默认0,话题id:用于获取话题详情的动态
public String id;//列表最后一条帖子的id（用于后台定位）
public int dyEntrance;
public TrendListCmd(String tab, int page, String topic_id, String last_id) {
this.tab = tab;
this.page = page;
......
m-dynamic/src/main/java/com/yidianling/dynamic/trendList/TrendsListInteractor.java
......@@ -113,6 +113,9 @@ public class TrendsListInteractor {
public void fetchTrendsInfo(int tab, int page, int topicId, int lastId) {
Command.TrendListCmd request = new Command.TrendListCmd(String.valueOf(tab), page, String.valueOf(topicId), String.valueOf(lastId));
if (tab==2){
request.dyEntrance=1;
}
//获取话题（问答）列表
addSubscription(DynamicApiUtils.fetchTrendList(request)
.compose(RxUtils.resultJavaData())
......
m-dynamic/src/main/java/com/yidianling/dynamic/trendsHome/content/TrendsCotentListAdapter.java
......@@ -19,6 +19,7 @@ import com.ydl.webview.NewH5Activity;
import com.ydl.ydl_image.config.ISimpleImageOpConfig;
import com.ydl.ydl_image.config.SimpleImageOpConfiger;
import com.ydl.ydl_image.manager.YDLImageCacheManager;
import com.ydl.ydl_image.module.GlideApp;
import com.ydl.ydlcommon.modular.ModularServiceManager;
import com.ydl.ydlcommon.utils.MoonUtil;
import com.ydl.ydlcommon.utils.StringUtils;
......@@ -233,10 +234,8 @@ public class TrendsCotentListAdapter extends RecyclerView.Adapter<BaseViewHolder
holder.setVisibility(R.id.nine_grid, View.GONE);
holder.setVisibility(R.id.item_trend_zan_rel, View.GONE);
ImageView guideImage = holder.getView(R.id.iv_assistant_guide_image);
SimpleImageOpConfiger sp = new SimpleImageOpConfiger();
sp.transform = ISimpleImageOpConfig.TRANSFORM_ROUND;
sp.radius =8;
YDLImageCacheManager.showImage(mContext, trend.assistantGuideImg, guideImage, sp);
GlideApp.with(mContext).load( trend.assistantGuideImg).into(guideImage);
} else {
holder.setVisibility(R.id.iv_assistant_guide_image, View.GONE);
holder.setVisibility(R.id.nine_grid, View.VISIBLE);
......
m-dynamic/src/main/res/layout/dynamic_item_trends_content_list.xml
......@@ -6,8 +6,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_marginTop="20dp"
android:layout_marginRight="15dp"
android:background="@color/dynamic_white"
android:elevation="1dp"
android:orientation="vertical">
......@@ -23,8 +23,8 @@
android:id="@+id/item_trend_user_head_iv"
android:layout_width="45dp"
android:layout_height="45dp"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:src="@drawable/dynamic_head_place_hold_pic" />
......@@ -62,9 +62,9 @@
android:text=""
android:textColor="@color/dynamic_text_trend_defult"
android:textSize="10sp"
android:visibility="invisible"
app:layout_constraintLeft_toRightOf="@+id/item_trend_user_head_iv"
app:layout_constraintTop_toBottomOf="@+id/item_trend_user_name_tv"
android:visibility="invisible"/>
app:layout_constraintTop_toBottomOf="@+id/item_trend_user_name_tv" />
<TextView
android:id="@+id/item_trend_souce_tv"
......@@ -84,8 +84,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="15dp"
android:layout_marginRight="10dp"
android:text="标题"
android:textColor="@color/dynamic_text_3d3d3d"
android:textSize="15sp" />
......@@ -95,8 +95,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="15dp"
android:layout_marginRight="10dp"
android:lineSpacingExtra="3dp"
android:text="外交部回应“朝鲜正准备第六次核试验”】有报道称，朝鲜正在准备进行第六次核试验，预计此次核试规模将比上一次增加十几倍。对此，外交部回应表示：中方反对朝鲜核试的立场是明确和一贯的。当前半岛形势高度复杂敏感，任何可能加剧半岛局势紧张的举动都是不可取的。希望相关各方都保持冷静克制，负起自己的责任，不要采取进一步相互刺激和加剧局势紧张的行动。"
android:textColor="@color/dynamic_text_666666"
......@@ -110,76 +110,80 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="15dp" />
android:layout_marginTop="15dp"
android:layout_marginRight="10dp" />
<ImageView
<com.ydl.ydlcommon.view.widgets.RoundImageView
android:id="@+id/iv_assistant_guide_image"
android:layout_width="match_parent"
android:layout_height="90dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="15dp"
android:visibility="gone"
tools:visibility="visible"
android:layout_marginRight="10dp"
android:layout_marginBottom="15dp"
android:layout_height="90dp"/>
android:scaleType="centerCrop"
android:visibility="gone"
app:pa_borderRadius="8dp"
app:pa_type="pa_round"
tools:visibility="visible" />
<!-- Url布局-->
<RelativeLayout
android:id="@+id/item_trend_ad_rel"
android:layout_width="match_parent"
<RelativeLayout
android:id="@+id/item_trend_ad_rel"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginLeft="10dp"
android:layout_marginTop="15dp"
android:layout_marginRight="10dp"
android:background="@drawable/dynamic_trend_ad_bg"
android:visibility="gone"
tools:visibility="visible">
<ImageView
android:id="@+id/item_trend_ad_iv"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="15dp"
android:background="@drawable/dynamic_trend_ad_bg"
android:layout_centerVertical="true"
android:scaleType="centerCrop"
android:src="@drawable/dynamic_default_img" />
<ImageView
android:id="@+id/iv_fm"
android:layout_width="@dimen/platform_dp_22"
android:layout_height="@dimen/platform_dp_22"
android:layout_centerVertical="true"
android:layout_marginLeft="9dp"
android:src="@drawable/dynamic_img_trend_fm_play"
android:visibility="gone"
tools:visibility="visible">
<ImageView
android:id="@+id/item_trend_ad_iv"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerVertical="true"
android:scaleType="centerCrop"
android:src="@drawable/dynamic_default_img" />
<ImageView
android:id="@+id/iv_fm"
android:layout_width="@dimen/platform_dp_22"
android:layout_height="@dimen/platform_dp_22"
android:layout_centerVertical="true"
android:layout_marginLeft="9dp"
android:src="@drawable/dynamic_img_trend_fm_play"
android:visibility="gone"
tools:visibility="visible" />
<TextView
android:id="@+id/item_trend_ad_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="14dp"
android:layout_marginRight="15dp"
android:layout_toRightOf="@+id/item_trend_ad_iv"
android:ellipsize="end"
android:maxLines="2"
android:text="外交部回应“朝鲜正准备第六次核试验”】有报道称，朝鲜正在准备进行第六次核试验，预计"
android:textColor="@color/dynamic_text_666666"
android:textSize="12sp" />
</RelativeLayout>
tools:visibility="visible" />
<TextView
android:id="@+id/item_trend_ad_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="14dp"
android:layout_marginRight="15dp"
android:layout_toRightOf="@+id/item_trend_ad_iv"
android:ellipsize="end"
android:maxLines="2"
android:text="外交部回应“朝鲜正准备第六次核试验”】有报道称，朝鲜正在准备进行第六次核试验，预计"
android:textColor="@color/dynamic_text_666666"
android:textSize="12sp" />
</RelativeLayout>
<!--点赞评论-->
<RelativeLayout
android:id="@+id/item_trend_zan_rel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="15dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
android:layout_marginBottom="15dp"
android:gravity="center">
<TextView
......
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