Merge branch 'feature/v3' of…

Merge branch 'feature/v3' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/v3

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

@@ -44,16 +44,16 @@ ext {
             //第三步 若干
 
             "m-confide"       : "0.0.41.3",
-            "m-consultant"    : "0.0.51.13",
+            "m-consultant"    : "0.0.51.14",
             "m-fm"            : "0.0.23.5",
-            "m-user"          : "0.0.41.2",
+            "m-user"          : "0.0.41.3",
             "m-home"          : "0.0.6.26",
             "m-im"            : "0.0.3.10",
             "m-dynamic"       : "0.0.1.7",
 
-            "m-muse"          : "0.0.20.7",
-            "m-tests"         : "0.0.15.7",
-            "m-course"        : "0.0.34.7",
+            "m-muse"          : "0.0.20.8",
+            "m-tests"         : "0.0.15.8",
+            "m-course"        : "0.0.34.10",
 
             //-------------- 业务模块 API 层 --------------
             "m-audioim-api"   : "0.0.5",
@@ -73,7 +73,7 @@ ext {
             "ydl-platform"    : "0.0.29.4",
             //第二步 若干
 
-            "ydl-webview"     : "0.0.28.13",
+            "ydl-webview"     : "0.0.28.14",
             "ydl-media"       : "0.0.14.5",
             "ydl-pay"         : "0.0.11.6",
             "m-audioim"       : "0.0.40.5",
@@ -82,8 +82,9 @@ ext {
             "router"          : "0.0.1",
             "ydl-net"         : "0.0.3.1",
             "ydl-utils"       : "0.0.3",
-            "ydl-flutter-base": "0.0.5.20",
+            "ydl-flutter-base": "0.0.5.21",
     ]
+    
 
     ydlCompileVersion = [
             // -------------- 业务模块 --------------
@@ -128,7 +129,7 @@ ext {
             "router"          : "0.0.1",
             "ydl-net"         : "0.0.3.1",
             "ydl-utils"       : "0.0.3",
-            "ydl-flutter-base": "0.0.5.20",
+            "ydl-flutter-base": "0.0.5.21",
     ]
 
     dependencies = [
@@ -266,7 +267,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.16.7@aar", //flutter aar
+            "ydl-flutter"                  : "com.ydl:ydl-flutter:0.0.16.8@aar", //flutter aar
             "ydl-flutter-sp"               : "com.ydl:ydl-flutter-sp:0.0.2@aar", //flutter 缓存 aar
 
             //基础组件 <<--- 先发这个，发完改这里的版本号

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

 package com.yidianling.course;
 
+import android.os.Bundle;
 import android.support.v4.app.Fragment;
+
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.ydl.ydlcommon.base.BaseActivity;
+import com.ydl.ydlcommon.utils.StatusBarUtils;
+
+import org.jetbrains.annotations.Nullable;
 
 /**
  * 课程首页Activity（心理课程）
@@ -11,6 +16,13 @@ import com.ydl.ydlcommon.base.BaseActivity;
 public class CourseActivity extends BaseActivity {
 
     @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        StatusBarUtils.Companion.setTransparentForImageView(this, null);
+        StatusBarUtils.Companion.statusBarLightMode(this);
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
     protected int layoutResId() {
         return R.layout.activity_course;
     }

m-course/src/main/java/com/yidianling/course/FlutterCourseHomeFragment.kt

@@ -38,6 +38,7 @@ import java.util.*
  */
 class FlutterCourseHomeFragment : BaseFlutterFragment() {
 
+
     private var hasRequestCoupon = false
     private var dialog: CourseCouponDialog? = null
 

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()
     }

ydl-webview/src/main/java/com/ydl/webview/NewH5Activity.java

@@ -27,7 +27,6 @@ import com.alibaba.android.arouter.launcher.ARouter;
 import com.tencent.smtt.export.external.interfaces.JsResult;
 import com.tencent.smtt.export.external.interfaces.SslError;
 import com.tencent.smtt.export.external.interfaces.SslErrorHandler;
-import com.tencent.smtt.sdk.CookieManager;
 import com.tencent.smtt.sdk.CookieSyncManager;
 import com.tencent.smtt.sdk.WebChromeClient;
 import com.tencent.smtt.sdk.WebSettings;
@@ -1102,7 +1101,7 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
         super.finish();
         CookieSyncManager.createInstance(this);
         CookieSyncManager.getInstance().startSync();
-        CookieManager.getInstance().removeSessionCookie();
+    //CookieManager.getInstance().removeSessionCookie();
     }
 
     private void openImageChooserActivity() {