Skip to content

Y
YDL-Component-Medical
Commit b71a0c47 by 徐健
Options

merge

parents 61b21619 d063f14c
Showing with 81 additions and 90 deletions
app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java
...@@ -21,7 +21,7 @@ public final class DemoGlobalConfig implements IConfigModule { ...@@ -21,7 +21,7 @@ public final class DemoGlobalConfig implements IConfigModule {
String APP_DOMAIN = "https://api.github.com/"; String APP_DOMAIN = "https://api.github.com/";
// public static String appEnv = YDLConstants.ENV_AUTO_TEST; // public static String appEnv = YDLConstants.ENV_AUTO_TEST;
// public static String appEnv = YDLConstants.ENV_TEST; // public static String appEnv = YDLConstants.ENV_TEST;
public static String appEnv = YDLConstants.ENV_TEST; public static String appEnv = YDLConstants.ENV_PROD;
@Override @Override
public void injectAppLifecycle(@NotNull Context context, @NotNull List<IAppLifecycles> lifecycles) { public void injectAppLifecycle(@NotNull Context context, @NotNull List<IAppLifecycles> lifecycles) {
......
config.gradle
...@@ -48,8 +48,8 @@ ext { ...@@ -48,8 +48,8 @@ ext {
"m-fm" : "0.0.23.4", "m-fm" : "0.0.23.4",
"m-user" : "0.0.41.1", "m-user" : "0.0.41.1",
"m-home" : "0.0.6.25", "m-home" : "0.0.6.25",
"m-im" : "0.0.3.7", "m-im" : "0.0.3.8",
"m-dynamic" : "0.0.1.5", "m-dynamic" : "0.0.1.6",
"m-muse" : "0.0.20.6", "m-muse" : "0.0.20.6",
"m-tests" : "0.0.15.6", "m-tests" : "0.0.15.6",
......
m-dynamic/src/main/java/com/yidianling/dynamic/trendList/TrendsListFragment.kt
...@@ -54,17 +54,6 @@ import java.util.* ...@@ -54,17 +54,6 @@ import java.util.*
class TrendsListFragment : BaseLazyFragment(), ITrendsListView, class TrendsListFragment : BaseLazyFragment(), ITrendsListView,
SwipeRefreshLayout.OnRefreshListener { SwipeRefreshLayout.OnRefreshListener {
internal var trends_rcv: RecyclerView? = null
internal var trends_lastr_swl: MultiSwipeRefreshLayout? = null
internal var trend_list_no_datas_rel: RelativeLayout? = null
// @BindView(R2.id.trend_last_more_pro_lin)
// LinearLayout loadingDataLin;
internal var cdl: CoordinatorLayout? = null
private val REQUEST_CODE = 1001 private val REQUEST_CODE = 1001
private val eachPageDataNum = 20 private val eachPageDataNum = 20
...@@ -117,7 +106,8 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView, ...@@ -117,7 +106,8 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView,
//置顶帖Header View //置顶帖Header View
private val recommendTopHeaderView: View private val recommendTopHeaderView: View
get() { get() {
val view = LayoutInflater.from(activity).inflate(R.layout.dynamic_item_recommend_top, null) val view =
LayoutInflater.from(activity).inflate(R.layout.dynamic_item_recommend_top, null)
val linearLayoutManager = LinearLayoutManager(activity) val linearLayoutManager = LinearLayoutManager(activity)
mRecommendTopAdapter = RecommendTopAdapter<TrendsListBean.ExtData>(activity) mRecommendTopAdapter = RecommendTopAdapter<TrendsListBean.ExtData>(activity)
mRecommendTopRcv = view.findViewById<View>(R.id.recy_top) as RecyclerView mRecommendTopRcv = view.findViewById<View>(R.id.recy_top) as RecyclerView
...@@ -141,7 +131,8 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView, ...@@ -141,7 +131,8 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView,
val view: View val view: View
if (trends_rcv != null) { if (trends_rcv != null) {
view = view =
LayoutInflater.from(activity).inflate(R.layout.dynamic_progress_item, trends_rcv, false) LayoutInflater.from(activity)
.inflate(R.layout.dynamic_progress_item, trends_rcv, false)
} else { } else {
view = LayoutInflater.from(activity).inflate(R.layout.dynamic_progress_item, null) view = LayoutInflater.from(activity).inflate(R.layout.dynamic_progress_item, null)
} }
...@@ -152,9 +143,7 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView, ...@@ -152,9 +143,7 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView,
val isNeedLogin: Boolean val isNeedLogin: Boolean
get() { get() {
tab = arguments.getInt("tab") tab = arguments.getInt("tab")
return if (tab == 3) { return tab == 3
true
} else false
} }
private val lastId: Int private val lastId: Int
...@@ -173,7 +162,7 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView, ...@@ -173,7 +162,7 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView,
} }
override fun afterViewCreated(savedInstanceState: Bundle) { override fun afterViewCreated(savedInstanceState: Bundle?) {
isPrepared = true //View创建完成 isPrepared = true //View创建完成
lazyLoad() lazyLoad()
} }
...@@ -481,18 +470,18 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView, ...@@ -481,18 +470,18 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView,
} }
fun initClick() { fun initClick() {
recommend_trend_add_iv.setOnClickListener { recommend_trend_add_iv.setOnClickListener {
if (!DynamicIn.isLogin()) { if (!DynamicIn.isLogin()) {
startActivity(DynamicIn.loginWayIntent(activity)) startActivity(DynamicIn.loginWayIntent(activity))
LogUtil.d("start ChooseLoginWayActivity") LogUtil.d("start ChooseLoginWayActivity")
} else { } else {
val intent = Intent(activity.applicationContext, PublishTrendActivity::class.java) val intent = Intent(activity.applicationContext, PublishTrendActivity::class.java)
val bundle = Bundle() val bundle = Bundle()
bundle.putString(DynamicConstants.PUBLISH_TYPE, "default_publish") bundle.putString(DynamicConstants.PUBLISH_TYPE, "default_publish")
intent.putExtra("bundle", bundle) intent.putExtra("bundle", bundle)
startActivity(intent) startActivity(intent)
}
} }
}
image_scroll_top.setOnClickListener { image_scroll_top.setOnClickListener {
scrollToTop() scrollToTop()
......
m-im/src/main/java/com/yidianling/im/ui/adapter/MsgListAdapter.java
...@@ -125,63 +125,64 @@ public class MsgListAdapter extends CommonAdapter<MsgData> { ...@@ -125,63 +125,64 @@ public class MsgListAdapter extends CommonAdapter<MsgData> {
ToastHelper.Companion.show(msg); ToastHelper.Companion.show(msg);
} }
}); });
return;//如果是动态消息则到此结束，其它消息类型走下面流程 //如果是动态消息则到此结束，其它消息类型走下面流程
} }else {
((BaseActivity) context).showProgressDialog("正在中转"); Disposable di = httpHelper.getMsgDetail(new MsgDetailParam(mDataList.get(position).id))
Disposable di = httpHelper.getMsgDetail(new MsgDetailParam(mDataList.get(position).id)) .compose(RxUtils.applySchedulers(lifecycleable))
.compose(RxUtils.applySchedulers(lifecycleable)) .compose(RxUtils.resultData())
.compose(RxUtils.resultData()) .subscribe(msgDetail -> {
.subscribe(msgDetail -> { mDataList.get(position).is_read = 2;
mDataList.get(position).is_read = 2; EventBus.getDefault().post(new UpdateTabUnreadNumEvent());
((BaseActivity) context).dismissProgressDialog(); switch (msgDetail.type) {
EventBus.getDefault().post(new UpdateTabUnreadNumEvent()); case 1:
switch (msgDetail.type) { case 2:
case 1: case 501:
case 2: case 502:
case 501: case 506:
case 502: //预约详情
case 506: H5Params h5Params = new H5Params(ImIn.INSTANCE.getReserveHost() + msgDetail.relation_id1, null);
//预约详情 NewH5Activity.start(context, h5Params);
H5Params h5Params = new H5Params(ImIn.INSTANCE.getReserveHost() + msgDetail.relation_id1, null); break;
NewH5Activity.start(context, h5Params); case 504:
break; case 505:
case 504: //微问诊列表
case 505: H5Params h5Paramswe = new H5Params(ImConstants.Companion.getMY_CHAT(), null);
//微问诊列表 NewH5Activity.start(context, h5Paramswe);
H5Params h5Paramswe = new H5Params(ImConstants.Companion.getMY_CHAT(), null); break;
NewH5Activity.start(context, h5Paramswe); case 507:
break; case 508:
case 507: case 509:
case 508: //预约评价 微问诊评价 倾诉评价
case 509:
//预约评价 微问诊评价 倾诉评价 H5Params h5Paramspi = new H5Params(ImConstants.Companion.getYYPJ() + msgDetail.relation_id1, null);
NewH5Activity.start(context, h5Paramspi);
H5Params h5Paramspi = new H5Params(ImConstants.Companion.getYYPJ() + msgDetail.relation_id1, null); break;
NewH5Activity.start(context, h5Paramspi); case 510:
break; //免费体验详情
case 510: H5Params h5Paramsmi = new H5Params(ImConstants.Companion.getFREEDTAIL() + msgDetail.relation_id1, null);
//免费体验详情 NewH5Activity.start(context, h5Paramsmi);
H5Params h5Paramsmi = new H5Params(ImConstants.Companion.getFREEDTAIL() + msgDetail.relation_id1, null); break;
NewH5Activity.start(context, h5Paramsmi); case 503:
break; case 1001:
case 503: case 1002:
case 1001: case 1004://老板心事心事详情
case 1002: break;
case 1004://老板心事心事详情
break; case 1003:
case 1003:
// ImIn.INSTANCE.MyRedPackActivity(context,null); // ImIn.INSTANCE.MyRedPackActivity(context,null);
ImIn.INSTANCE.myRedPockIntent(context); ImIn.INSTANCE.myRedPockIntent(context);
break; break;
} }
}, new ThrowableConsumer() { }, new ThrowableConsumer() {
@Override @Override
public void accept(@NotNull String msg) { public void accept(@NotNull String msg) {
((BaseActivity) context).dismissProgressDialog(); ((BaseActivity) context).dismissProgressDialog();
ToastHelper.Companion.show(msg); ToastHelper.Companion.show(msg);
} }
}); });
}
} }
}); });
return convertView; return convertView;
......
m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java
...@@ -178,7 +178,7 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy { ...@@ -178,7 +178,7 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
//和助理私聊时的常用语逻辑 //和助理私聊时的常用语逻辑
rl_common_question_enter = rootView.findViewById(R.id.rl_common_question); rl_common_question_enter = rootView.findViewById(R.id.rl_common_question);
fl_question_content = rootView.findViewById(R.id.fl_question_content); fl_question_content = rootView.findViewById(R.id.fl_question_content);
rl_common_question_enter.setVisibility(ActionHandlerStorage.getL(sessionId).getUserType() == 3 ? View.VISIBLE : View.GONE); rl_common_question_enter.setVisibility(ActionHandlerStorage.getL(sessionId) != null && ActionHandlerStorage.getL(sessionId).getUserType() == 3 ? View.VISIBLE : View.GONE);
if (ActionHandlerStorage.getL(sessionId) != null && ActionHandlerStorage.getL(sessionId).getUserType() == 3) { if (ActionHandlerStorage.getL(sessionId) != null && ActionHandlerStorage.getL(sessionId).getUserType() == 3) {
rl_common_question_enter.setOnClickListener(v -> { rl_common_question_enter.setOnClickListener(v -> {
...@@ -506,7 +506,7 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy { ...@@ -506,7 +506,7 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
if (TextUtils.equals(userChatStatus, "true")) { if (TextUtils.equals(userChatStatus, "true")) {
messageListPanel = new MessageListPanelEx(container, rootView, anchor, false, true); messageListPanel = new MessageListPanelEx(container, rootView, anchor, false, true);
SharedPreferencesEditor.putString(chatStatusKey, "true"); SharedPreferencesEditor.putString(chatStatusKey, "true");
}else { } else {
messageListPanel = new MessageListPanelEx(container, rootView, anchor, false, false); messageListPanel = new MessageListPanelEx(container, rootView, anchor, false, false);
} }
} else { } else {
...@@ -849,4 +849,5 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy { ...@@ -849,4 +849,5 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
.subscribe(resp -> { .subscribe(resp -> {
}, throwable -> { }, throwable -> {
}); });
}} }
}
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