Merge branch 'new_dev_4.3.91BUG修复' into new_dev_4.3.91

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

@@ -21,9 +21,9 @@ import java.util.List;
 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_NEW_TEST;//配置未上传到maven库
-//    public static String appEnv = YDLConstants.ENV_PROD;
+    public static String appEnv = YDLConstants.ENV_PROD;
     @Override
     public void injectAppLifecycle(@NotNull Context context, @NotNull List<IAppLifecycles> lifecycles) {
         lifecycles.add(new DemoAppLifecycles());

m-dynamic/src/main/java/com/yidianling/dynamic/event/dynamicFocusEvent.kt

+package com.yidianling.dynamic.event
+
+data class dynamicFocusEvent (
+    var focusState:String
+)
\ No newline at end of file

m-dynamic/src/main/java/com/yidianling/dynamic/members/MembersActivity.java

@@ -42,6 +42,7 @@ import com.yidianling.dynamic.common.net.DynamicApiUtils;
 import com.yidianling.dynamic.dialog.CancelFocusDialog;
 import com.yidianling.dynamic.event.BlackEvent;
 import com.yidianling.dynamic.event.LoginStateEvent;
+import com.yidianling.dynamic.event.dynamicFocusEvent;
 import com.yidianling.dynamic.model.Command;
 import com.yidianling.dynamic.model.MemberInfoBean;
 import com.yidianling.dynamic.router.DynamicIn;
@@ -433,7 +434,9 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
     /**
      *
      */
+    @SuppressLint("CheckResult")
     private void Focus() {
+
         showProgressDialog("");
         Command.FocusCmd cmd = new Command.FocusCmd(mem_id, "1");
         DynamicApiUtils.focus(cmd)
@@ -450,6 +453,7 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
                             fans_count = (fans_counti + 1) + "";
                             members_top_user_fensi_num_tv.setText("粉丝 " + fans_count);
                             focus_state = "1";
+                            EventBus.getDefault().post(new dynamicFocusEvent(focus_state));
                             Drawable drawable = getResources().getDrawable(R.drawable.dynamic_ic_expand);
                             drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
                             members_top_user_focus_ortion_tv.setCompoundDrawablePadding(20);
@@ -461,6 +465,7 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
                             fans_count = (fans_counti - 1) + "";
                             members_top_user_fensi_num_tv.setText("粉丝 " + fans_count);
                             focus_state = "2";
+                            EventBus.getDefault().post(new dynamicFocusEvent(focus_state));
                             members_top_user_focus_ortion_tv.setCompoundDrawables(null, null, null, null);
                             members_top_user_focus_ortion_tv.setText("+ 关注");
                             members_top_user_focus_ortion_tv.setTextColor(getResources().getColor(R.color.dynamic_white));

m-dynamic/src/main/java/com/yidianling/dynamic/topic/topicDetail/TopicDetailActivity.java

@@ -290,6 +290,11 @@ public class TopicDetailActivity extends BaseMvpActivity<TopicDetailView, TopicD
         totalMembers = 0;
         topicId = getIntent().getStringExtra("topic_id");
         isSplash = getIntent().getBooleanExtra("isSplash", false);
+        Bundle bundle = getIntent().getBundleExtra("bundle");
+        if (bundle != null) {
+            topicId = bundle.getString("topic_id", "44");
+            isSplash = bundle.getBoolean("isSplash", false);
+        }
         adapter = new TopicDetailMemberAdapter(this);
         mFragments = new Fragment[]{TrendListInFragment.newInstance("1", topicId, "default", "0"),
                 TrendListInFragment.newInstance("2", topicId, "default", "0")};

m-dynamic/src/main/java/com/yidianling/dynamic/trendsDetail/TrendsDetailActivity.java

@@ -24,6 +24,7 @@ import android.text.Html;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.text.style.ImageSpan;
+import android.util.EventLog;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
@@ -72,6 +73,8 @@ import com.yidianling.dynamic.R2;
 import com.yidianling.dynamic.common.browsePictures.BrowsePicturesActivity2;
 import com.yidianling.dynamic.common.emoji.EmoticonPickerView;
 import com.yidianling.dynamic.common.emoji.IEmoticonSelectedListener;
+import com.yidianling.dynamic.event.LoginStateEvent;
+import com.yidianling.dynamic.event.dynamicFocusEvent;
 import com.yidianling.dynamic.members.MembersActivity;
 import com.yidianling.dynamic.model.CommentBean;
 import com.yidianling.dynamic.model.Reply;
@@ -95,6 +98,7 @@ import java.util.concurrent.TimeUnit;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
+import de.greenrobot.event.EventBus;
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
@@ -374,6 +378,7 @@ public class TrendsDetailActivity extends BaseMvpActivity<ITrendsDetailView, ITr
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        EventBus.getDefault().register(this);
         setContentView(R.layout.dynamic_activity_trend_details);
         ButterKnife.bind(this);
         initDatas();
@@ -1451,8 +1456,18 @@ public class TrendsDetailActivity extends BaseMvpActivity<ITrendsDetailView, ITr
         if (subscribe != null) {
             subscribe.dispose();
         }
+        EventBus.getDefault().unregister(this);
+    }
+    public void onEvent(dynamicFocusEvent event) {
+        // 1已关注 2关注
+        if (event.getFocusState().equals("1")){
+            tvGuanzhu.setVisibility(GONE);
+            tvGuanzhu.setText("已关注");
+        }else{
+            tvGuanzhu.setVisibility(VISIBLE);
+            tvGuanzhu.setText("关注");
+        }
     }
-
     @NonNull
     @Override
     public ITrendsDetailPresenterImpl createPresenter() {

m-home/src/main/java/com/yidianling/home/event/HomeBaseImpl.kt

@@ -4,10 +4,10 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
-import androidx.recyclerview.widget.RecyclerView
 import android.text.TextUtils
 import android.view.View
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.RecyclerView
 import com.alibaba.android.arouter.launcher.ARouter
 import com.ydl.media.audio.AudioPlayer
 import com.ydl.media.audio.model.Music
@@ -23,6 +23,7 @@ import com.ydl.ydlcommon.base.config.HttpConfig
 import com.ydl.ydlcommon.bean.ShareData
 import com.ydl.ydlcommon.data.PlatformRamImpl
 import com.ydl.ydlcommon.modular.ModularServiceManager
+import com.ydl.ydlcommon.modular.ModularServiceManager.provide
 import com.ydl.ydlcommon.router.IYDLRouterConstant
 import com.ydl.ydlcommon.utils.LogUtil
 import com.ydl.ydlcommon.utils.Utils
@@ -110,6 +111,16 @@ open class HomeBaseImpl : IHomeBaseEvent {
         mHomeView!!.getConsultData(type.id.toString(), selectPosition)
     }
 
+    override fun jumpToTopicDetail(topic_id: String) {
+        val bundle = Bundle()
+        bundle.putString("topic_id", topic_id)
+        bundle.putBoolean("isSplash", false)
+        //动态详情
+        ARouter.getInstance().build("/topic/detail")
+            .withBundle("bundle", bundle)
+            .navigation()
+    }
+
 
     private var headerView: View? = null
     var mContext: Context? = null

m-home/src/main/java/com/yidianling/home/event/IHomeBaseEvent.kt

@@ -185,4 +185,10 @@ interface IHomeBaseEvent {
      * @param selectPosition 选中的position
      */
     fun getConsultData(type: HomeHeaderBean.ConsultCategoryDateBean, selectPosition: Int)
+
+    /*
+    * 跳转话题详情
+    *
+    * */
+    fun jumpToTopicDetail(topic_id:String)
 }
\ No newline at end of file

m-home/src/ydl/java/com/yidianling/home/ui/view/HomeAssuageGriefItemView.kt

@@ -67,7 +67,10 @@ class HomeAssuageGriefItemView(private val mContext: Context, private var homeEv
         homeModuleAssuageGriefViewTag.text = bean?.askTag
         homeModuleAssuageGriefViewCommentsCount.text = bean?.commentsCount.toString()
         homeModuleAssuageGriefViewZanCount.text = bean?.zanCount.toString()
-
+        ll_topic_detail.setOnClickListener {
+            //跳转话题详情
+            homeEvent?.jumpToTopicDetail(bean.topicId.toString())
+        }
 
         /**
          * 点赞

m-home/src/ydl/res/layout/home_assuage_grief_item_view.xml

@@ -187,6 +187,7 @@
                 android:background="@drawable/home_assuage_grief_item_view_tab_back"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
+                android:id="@+id/ll_topic_detail"
                 android:paddingLeft="@dimen/platform_dp_7"
                 android:paddingTop="@dimen/platform_dp_4"
                 android:paddingRight="@dimen/platform_dp_7"