修复动态详情返回首页无效问题

app/src/main/AndroidManifest.xml

@@ -28,6 +28,7 @@
         <!-- <activity android:name=".MainActivity"/> -->
         <activity
                 android:name=".MainActivity"
+                android:launchMode="singleTask"
                 android:theme="@style/platform_NoTitleTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/java/com/ydl/component/MainActivity.kt

@@ -11,6 +11,7 @@ import android.net.Uri
 import android.os.IBinder
 import android.provider.Settings
 import android.util.Log
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.alibaba.android.arouter.launcher.ARouter
 import com.tbruyelle.rxpermissions2.RxPermissions
 import com.umeng.analytics.MobclickAgent
@@ -27,7 +28,6 @@ import com.ydl.ydlcommon.router.IYDLRouterConstant
 import com.yidianling.common.tools.ToastUtil
 import com.yidianling.consultant.ExpertSearchActivity.Companion.HOT_SEARCH_DOCTOR_NAME
 import com.yidianling.consultant.api.IConsultantService
-import com.yidianling.dynamic.activity.MyTrendsActivity
 import com.yidianling.fm.api.service.IFMService
 import com.yidianling.tests.home.NewTestHomeActivity
 import kotlinx.android.synthetic.main.activity_main.*
@@ -36,6 +36,7 @@ import kotlinx.android.synthetic.main.activity_main.*
  * Created by haorui on 2019-09-01 .
  * Des:
  */
+@Route(path = "/main/main")
 class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(),
     DemoContract.View {
 
@@ -99,9 +100,7 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
             FragmentContainerActivity.start(this,"NewMultiMessageFragment")
         }
         bt_to_dynamic.setOnClickListener {
-//            FragmentContainerActivity.start(this,"TrendsHomeFragment")
-            val intentm = Intent(this, MyTrendsActivity::class.java)
-            startActivity(intentm)
+            FragmentContainerActivity.start(this,"TrendsHomeFragment")
         }
         bt_to_tests.setOnClickListener {
             startActivity(Intent(this, NewTestHomeActivity::class.java))

config.gradle

 ext {
     kotlin_version = "1.3.21"
-    dev_mode = false
+    dev_mode = true
 
     ydl_app = [
             appName      : "心理咨询壹点灵",

m-course/src/main/AndroidManifest.xml

@@ -10,7 +10,9 @@
         <!--课程首页-->
         <activity
                 android:name=".CourseActivity"
-                android:screenOrientation="portrait" />
+                android:screenOrientation="portrait"
+                android:theme="@style/platform_NoTitleTheme"
+                />
         <activity
                 android:name=".CoursePosterActivity"
                 android:hardwareAccelerated="false"
@@ -43,7 +45,9 @@
                 />
         <activity
                 android:name=".courseNew.mine.MyCourseActivity"
-                android:screenOrientation="portrait" />
+                android:screenOrientation="portrait"
+                android:theme="@style/platform_NoTitleTheme"
+                />
         <activity
                 android:name=".course_special_list.activity.CourseSpecialListActivity"
                 android:screenOrientation="portrait" />

m-course/src/main/java/com/yidianling/course/CourseActivity.java

@@ -3,6 +3,9 @@ package com.yidianling.course;
 import android.support.v4.app.Fragment;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.ydl.ydlcommon.base.BaseActivity;
+import com.ydl.ydlcommon.bean.StatusBarOptions;
+
+import org.jetbrains.annotations.NotNull;
 
 /**
  * 课程首页Activity（心理课程）
@@ -10,6 +13,12 @@ import com.ydl.ydlcommon.base.BaseActivity;
 @Route(path = "/course/home")
 public class CourseActivity extends BaseActivity {
 
+    @NotNull
+    @Override
+    public StatusBarOptions getStatusViewOptions() {
+        return new StatusBarOptions(true,true);
+    }
+
     @Override
     protected int layoutResId() {
         return R.layout.activity_course;

m-course/src/main/java/com/yidianling/course/courseNew/mine/MyCourseActivity.java

@@ -15,12 +15,15 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.ydl.ydlcommon.base.BaseActivity;
+import com.ydl.ydlcommon.bean.StatusBarOptions;
 import com.ydl.ydlcommon.utils.DisplayUtils;
 import com.yidianling.course.CourseListFragment;
 import com.yidianling.course.R;
 import com.yidianling.course.widget.CourseRedPacketView;
 import com.yidianling.course.widget.SearchBarView;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.lang.reflect.Field;
 
 /**
@@ -36,6 +39,11 @@ public class MyCourseActivity extends BaseActivity {
 
     private int tabIndex;
 
+    @NotNull
+    @Override
+    public StatusBarOptions getStatusViewOptions() {
+        return new StatusBarOptions(true,true);
+    }
 
     public static void start(Context context) {
         Intent i = new Intent(context, MyCourseActivity.class);

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

@@ -1135,7 +1135,6 @@ public class TrendsDetailActivity extends BaseMvpActivity<ITrendsDetailView, ITr
         } else if (v.getId() == R.id.image_back) {
             if (isFromSplash) {
                 DynamicIn.INSTANCE.mainIntent(this);
-                finish();
             }
             setResultForActivity();
             this.finish();

m-user/src/main/java/com/yidianling/user/modular_service/AppServiceImpl.kt

@@ -2,7 +2,6 @@ package com.yidianling.user.modular_service
 
 import android.app.Activity
 import android.content.Context
-import android.content.Intent
 import android.os.Bundle
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.alibaba.android.arouter.launcher.ARouter
@@ -13,7 +12,9 @@ import com.yidianling.user.api.service.IAppService
 class AppServiceImpl: IAppService {
 
     override fun mainIntent(activity: Activity) {
-        ARouter.getInstance().build("/main/main").navigation()
+        ARouter.getInstance()
+            .build("/main/main")
+            .navigation()
     }
 
     override fun mainIntent(context: Context, selectTab: Int, animation: Boolean) {
@@ -22,7 +23,6 @@ class AppServiceImpl: IAppService {
         bundle.putBoolean("animation", animation)
 
         ARouter.getInstance().build("/main/main")
-            .withFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
             .withBundle("bundle",bundle)
             .navigation()
     }