Merge branch 'qa_light' into dev

2020-09-15 09:50:21 +08:00
parent c80cacc578 154ac337c2
commit c2b6a18896
9 changed files with 51 additions and 11 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -111,6 +111,8 @@ android {
            buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false'
            // 是否加载引导模块
            buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'false'
+            // 是否支持换肤
+            buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true'
        }
        // f系列-分体机
        f80x {
@@ -127,6 +129,8 @@ android {
            buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false'
            // 是否加载引导模块
            buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'false'
+            // 是否支持换肤
+            buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true'
        }
        // e系列，采用Launcher方案
        e8xx {
@@ -143,6 +147,8 @@ android {
            buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false'
            // 是否加载引导模块
            buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'false'
+            // 是否支持换肤
+            buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true'
        }
        // 同上
        em4 {
@@ -159,6 +165,8 @@ android {
            buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false'
            // 是否加载引导模块
            buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'false'
+            // 是否支持换肤
+            buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true'
        }
        // e系列-2+32，对标D系列2+32，采用独立app的形式
        em3 {
@@ -175,6 +183,8 @@ android {
            buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false'
            // 是否加载引导模块
            buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'false'
+            // 是否支持换肤
+            buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'false'
        }
        // e系列-1+16，对标D系列1+16，采用独立app形式
        em1 {
@@ -191,6 +201,8 @@ android {
            buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false'
            // 是否加载引导模块
            buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'false'
+            // 是否支持换肤
+            buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'false'
        }
        // d系列
        d8xx {
@@ -207,6 +219,8 @@ android {
            buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false'
            // 是否加载引导模块
            buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'true'
+            // 是否支持换肤
+            buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'false'
        }
        // d系列 2 + 32
        d80x {
@@ -223,6 +237,8 @@ android {
            buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false'
            // 是否加载引导模块
            buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'true'
+            // 是否支持换肤
+            buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'false'
        }
        // d系列 1+16 版本
        d82x {
@@ -239,6 +255,8 @@ android {
            buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false'
            // 是否加载引导模块
            buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'true'
+            // 是否支持换肤
+            buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'false'
        }
        // 比亚迪
        bydauto {
@@ -255,6 +273,8 @@ android {
            buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'true'
            // 是否加载引导模块
            buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'false'
+            // 是否支持换肤
+            buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'false'
        }
        qa {
            dimension "env"
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -30,6 +30,7 @@ import com.mogo.test.crashreport.ITestCrashReportProvider;
 import com.mogo.utils.UiThreadHandler;
 import com.mogo.utils.logger.LogLevel;
 import com.mogo.utils.logger.Logger;
+import com.mogo.utils.storage.SharedPrefsMgr;
 import com.squareup.leakcanary.LeakCanary;
 import com.zhidao.boot.persistent.lib.PersistentManager;
 import com.zhidao.mogo.module.left.panel.LeftPanelConst;
@@ -65,6 +66,8 @@ public class MogoApplication extends AbsMogoApplication {

        if ( DebugConfig.isLoadGuideModule() ) {
            MogoModulePaths.addModule( new MogoModule( PATH_GUIDE_FRAGMENT, PATH_GUIDE_MODULE_NAME ) );
+        }else{
+            SharedPrefsMgr.getInstance(this).putBoolean(DebugConfig.getSpGuide(),true);
        }
        MogoModulePaths.addModule( new MogoModule( MogoServicePaths.PATH_AGREEMENT, AuthorizeConstant.PATH_AGREEMENT_MODULE_NAME ) );

@@ -127,6 +130,7 @@ public class MogoApplication extends AbsMogoApplication {
        DebugConfig.setSocketAppId( BuildConfig.SOCKET_APP_ID );
        DebugConfig.setRoadEventAnimated( BuildConfig.ROAD_EVENT_ANIMATED );
        DebugConfig.setLoadGuideModule( BuildConfig.LOAD_GUIDE_MODULE );
+        DebugConfig.setSkinSupported( BuildConfig.IS_SKIN_SUPPORTED );
    }

    @Override
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java
@@ -267,4 +267,14 @@ public class DebugConfig {
    public static String getSpGuide(){
        return SP_GUIDE;
    }
+
+    private static boolean isSkinSupported = false;
+
+    public static void setSkinSupported( boolean isSkinSupported ) {
+        DebugConfig.isSkinSupported = isSkinSupported;
+    }
+
+    public static boolean isSkinSupported() {
+        return isSkinSupported;
+    }
 }
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
@@ -163,7 +163,9 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
 //            obuManager.registerObuDataChangedListener(EventDispatchCenter.getInstance());
 //        }

-        initAdasControlStatusListener();
+        if ( DebugConfig.isSkinSupported() ) {
+            initAdasControlStatusListener();
+        }
        EventDispatchCenter.getInstance().setMapLoadedCallback( () -> {
            Logger.d( TAG, "map loaded." + Thread.currentThread().getName() );

--- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java
+++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java
@@ -332,12 +332,17 @@ public class TanluSlideAdapterNew extends RecyclerView.Adapter<TanluSlideViewHol
            //加载图片
            RequestOptions requestOptions = new RequestOptions()
                    .placeholder(R.drawable.tanlu_normal_image)
-                    .error(R.drawable.tanlu_normal_image)
-                    .fallback(R.drawable.tanlu_normal_image);
+                    .error(R.drawable.tanlu_normal_image);
            Glide.with(mContext)
                    .load(mImageUrl)
                    .apply(requestOptions)
                    .into(autoZoomInImageView);
+
+//            Glide.with(mContext)
+//                    .asBitmap()
+//                    .load(mImageUrl)
+//                    .apply(requestOptions)
+//                    .into(new SkinAbleBitmapTarget(autoZoomInImageView, requestOptions));
        }

        traceVideoPlayStatusData();
--- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt
+++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt
@@ -59,7 +59,6 @@ class SimpleCoverVideoPlayer : StandardGSYVideoPlayer {
        val requestOptions = RequestOptions()
                .placeholder(R.drawable.tanlu_normal_image)
                .error(R.drawable.tanlu_normal_image)
-                .fallback(R.drawable.tanlu_normal_image)
        Glide.with(mContext)
            .load(url)
            .apply(requestOptions)
--- a/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_gradual_change_bg.xml
+++ b/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_gradual_change_bg.xml
@@ -1,15 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><!--<shape xmlns:android="http://schemas.android.com/apk/res/android">-->
-<!--    <solid android:color="#3F4057" />-->
-<!--    <corners android:radius="@dimen/tanlu_normal_image_radius_size" />-->
-<!--</shape>-->
-
+<?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
    android:shape="rectangle">
    <corners android:radius="@dimen/tanlu_normal_image_radius_size" />
    <gradient
        android:angle="135"
-        android:endColor="#3F4057"
-        android:startColor="#5E6079"
+        android:startColor="@color/tanlu_top_bg_startcolor"
+        android:endColor="@color/tanlu_top_bg_endcolor"
        android:type="linear"
        android:useLevel="true" />
 </shape>
--- a/modules/mogo-module-tanlu/src/main/res/values/colors.xml
+++ b/modules/mogo-module-tanlu/src/main/res/values/colors.xml
@@ -49,5 +49,7 @@
    <color name="tanlu_dialog_bt_startcolor">#3E7FFC</color>
    <color name="tanlu_dialog_bt_endcolor">#5CC1FF</color>
    <color name="tanlu_dialog_bt_right_color">#50526E</color>
+    <color name="tanlu_top_bg_startcolor">#5E6079</color>
+    <color name="tanlu_top_bg_endcolor">#3F4057</color>

 </resources>
--- a/skin/mogo-skin-light/src/main/module-tanlu-res/values/colors.xml
+++ b/skin/mogo-skin-light/src/main/module-tanlu-res/values/colors.xml
@@ -11,5 +11,7 @@
    <color name="tanlu_dialog_bt_startcolor_light">#FFFFFF</color>
    <color name="tanlu_dialog_bt_endcolor_light">#FFFFFF</color>
    <color name="tanlu_dialog_bt_right_color_light">#E8E8E8</color>
+    <color name="tanlu_top_bg_startcolor_light">#F5F5F5</color>
+    <color name="tanlu_top_bg_endcolor_light">#FFFFFF</color>

 </resources>