Merge remote-tracking branch 'origin/qa_1.1.6' into dev

# Conflicts: # modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java
2020-10-10 09:49:49 +08:00
parent a42b102984 b2cd8c4ca9
commit e9c17b9e52
3 changed files with 19 additions and 1 deletions
--- 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
@@ -539,7 +539,10 @@ public class TanluSlideAdapterNew extends RecyclerView.Adapter<TanluSlideViewHol

    @Override
    public void onMapUiModeChanged(EnumMapUI mapUI) {
-        switch (mapUI) {
+        if ( mRoundLayout == null ) {
+            return;
+        }
+        switch ( mapUI ) {
            case Type_Night:
                Log.d("liyz", "Type_Night ---------> ");
                mRoundLayout.setBackgroundResource(R.drawable.shape_tanlu_top_bg);