merge

app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java

@@ -21,7 +21,7 @@ public final class DemoGlobalConfig implements IConfigModule {
     String APP_DOMAIN = "https://api.github.com/";
     //        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_PROD;
 
     @Override
     public void injectAppLifecycle(@NotNull Context context, @NotNull List<IAppLifecycles> lifecycles) {

config.gradle

@@ -48,8 +48,8 @@ ext {
             "m-fm"            : "0.0.23.4",
             "m-user"          : "0.0.41.1",
             "m-home"          : "0.0.6.25",
-            "m-im"            : "0.0.3.7",
-            "m-dynamic"       : "0.0.1.5",
+            "m-im"            : "0.0.3.8",
+            "m-dynamic"       : "0.0.1.6",
 
             "m-muse"          : "0.0.20.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.*
 class TrendsListFragment : BaseLazyFragment(), ITrendsListView,
     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 eachPageDataNum = 20
 
@@ -117,7 +106,8 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView,
     //置顶帖Header View
     private val recommendTopHeaderView: View
         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)
             mRecommendTopAdapter = RecommendTopAdapter<TrendsListBean.ExtData>(activity)
             mRecommendTopRcv = view.findViewById<View>(R.id.recy_top) as RecyclerView
@@ -141,7 +131,8 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView,
             val view: View
             if (trends_rcv != null) {
                 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 {
                 view = LayoutInflater.from(activity).inflate(R.layout.dynamic_progress_item, null)
             }
@@ -152,9 +143,7 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView,
     val isNeedLogin: Boolean
         get() {
             tab = arguments.getInt("tab")
-            return if (tab == 3) {
-                true
-            } else false
+            return tab == 3
         }
 
     private val lastId: Int
@@ -173,7 +162,7 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView,
         }
 
 
-    override fun afterViewCreated(savedInstanceState: Bundle) {
+    override fun afterViewCreated(savedInstanceState: Bundle?) {
         isPrepared = true      //View创建完成
         lazyLoad()
     }

m-im/src/main/java/com/yidianling/im/ui/adapter/MsgListAdapter.java

@@ -125,15 +125,13 @@ public class MsgListAdapter extends CommonAdapter<MsgData> {
                                     ToastHelper.Companion.show(msg);
                                 }
                             });
-                    return;//如果是动态消息则到此结束，其它消息类型走下面流程
-                }
-                ((BaseActivity) context).showProgressDialog("正在中转");
+                    //如果是动态消息则到此结束，其它消息类型走下面流程
+                }else {
                     Disposable di = httpHelper.getMsgDetail(new MsgDetailParam(mDataList.get(position).id))
                             .compose(RxUtils.applySchedulers(lifecycleable))
                             .compose(RxUtils.resultData())
                             .subscribe(msgDetail -> {
                                 mDataList.get(position).is_read = 2;
-                            ((BaseActivity) context).dismissProgressDialog();
                                 EventBus.getDefault().post(new UpdateTabUnreadNumEvent());
                                 switch (msgDetail.type) {
                                     case 1:
@@ -182,6 +180,9 @@ public class MsgListAdapter extends CommonAdapter<MsgData> {
                                     ToastHelper.Companion.show(msg);
                                 }
                             });
+
+                }
+
             }
         });
         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 {
         //和助理私聊时的常用语逻辑
         rl_common_question_enter = rootView.findViewById(R.id.rl_common_question);
         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) {
             rl_common_question_enter.setOnClickListener(v -> {
@@ -506,7 +506,7 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
             if (TextUtils.equals(userChatStatus, "true")) {
                 messageListPanel = new MessageListPanelEx(container, rootView, anchor, false, true);
                 SharedPreferencesEditor.putString(chatStatusKey, "true");
-            }else {
+            } else {
                 messageListPanel = new MessageListPanelEx(container, rootView, anchor, false, false);
             }
         } else {
@@ -849,4 +849,5 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
                 .subscribe(resp -> {
                 }, throwable -> {
                 });
-    }}
+    }
+}