yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'qa_light' into dev

Browse Source
This commit is contained in:
wangcongtao
2020-09-15 09:50:21 +08:00
parent c80cacc578 154ac337c2
commit c2b6a18896
9 changed files with 51 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
View File

@@ -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() );

9
modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java
View File

@@ -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();

1
modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt
View File

@@ -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)

10
modules/mogo-module-tanlu/src/main/res/drawable/tanlu_gradual_change_bg.xml
View File

@@ -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>

2
modules/mogo-module-tanlu/src/main/res/values/colors.xml
View File

@@ -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>