Merge remote-tracking branch 'origin/dev' into dev

app/src/em4/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:sharedUserId="android.uid.system"
     package="com.mogo.launcher">
+<!--    android:sharedUserId="android.uid.system"-->
 </manifest>

libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt

@@ -159,7 +159,7 @@ class CosStatusController : CosStatusCallback {
             }
         } else {
             //上传图片成功, 如果是上报路况，直接上传，TODO
-            Log.d(TAG, "uploadCosCompleted 分享成功 ----mType = $mType")
+            Log.d(TAG, "uploadCosCompleted 分享成功 ---- mType = $mType")
 //            if (mType.equals("1") || mType.equals("-1")) {
             sendInformationDirectly(
                     INFO_TYPE_IMG,

modules/mogo-module-apps/src/main/res/layout/module_apps_item_app.xml

@@ -20,6 +20,6 @@
         android:layout_marginTop="@dimen/module_apps_app_name_marginTop"
         android:gravity="center"
         android:maxLines="2"
-        android:textColor="#FFFFFF"
+        android:textColor="@color/module_apps_id_app_name_textColor"
         android:textSize="@dimen/module_apps_app_name_textSize" />
 </LinearLayout>

modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml

@@ -21,8 +21,8 @@
     <dimen name="module_apps_all_icon_width">94px</dimen>
     <dimen name="module_apps_all_icon_height">94px</dimen>
 
-    <dimen name="module_apps_navigator_icon_width">140px</dimen>
-    <dimen name="module_apps_navigator_icon_height">140px</dimen>
+    <dimen name="module_apps_navigator_icon_width">160px</dimen>
+    <dimen name="module_apps_navigator_icon_height">160px</dimen>
     <dimen name="module_apps_navigator_icon_divider">30px</dimen>
     <dimen name="module_apps_voice_icon_width">100px</dimen>
     <dimen name="module_apps_voice_icon_height">100px</dimen>

modules/mogo-module-apps/src/main/res/values/colors.xml

@@ -16,6 +16,7 @@
 
     <color name="bg_common">#080625</color>
     <color name="txt_blue">#3E7FFC</color>
-    <color name="module_app_page_bkg_color">#0C0C0C</color>
+    <color name="module_app_page_bkg_color">#E6000000</color>
+    <color name="module_apps_id_app_name_textColor">#FFFFFF</color>
 
 </resources>

modules/mogo-module-apps/src/main/res/values/dimens.xml

@@ -24,6 +24,6 @@
     <dimen name="module_apps_navigator_icon_width">78px</dimen>
     <dimen name="module_apps_navigator_icon_height">78px</dimen>
     <dimen name="module_apps_navigator_icon_divider">17px</dimen>
-    <dimen name="module_apps_voice_icon_width">60px</dimen>
-    <dimen name="module_apps_voice_icon_height">60px</dimen>
+    <dimen name="module_apps_voice_icon_width">55px</dimen>
+    <dimen name="module_apps_voice_icon_height">55px</dimen>
 </resources>

modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java

@@ -46,6 +46,7 @@ import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.service.analytics.IMogoAnalytics;
 import com.mogo.service.entrance.ButtonIndex;
+import com.mogo.service.fragmentmanager.IFragmentProvider;
 import com.mogo.service.fragmentmanager.IMogoFragmentManager;
 import com.mogo.service.intent.IMogoIntentListener;
 import com.mogo.service.map.IMogoMapService;
@@ -295,7 +296,12 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
         mMsgContainer = findViewById(R.id.module_ext_id_msg);
 
         mMsgContainer.setOnClickListener(view -> {
-            ARouter.getInstance().build("/push/ui/message").navigation(getContext());
+            try {
+                IFragmentProvider provider = (IFragmentProvider)ARouter.getInstance().build("/push/ui/message").navigation(getContext());
+                provider.createFragment( getActivity(), mMogoFragmentManager.getMessageHistoryContainerId(), null );
+            } catch( Exception e ){
+
+            }
         });
         mMsgCounter = findViewById(R.id.module_ext_id_msg_counter);
         mUserHeadImg.setOnClickListener(view -> {

modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java

@@ -61,6 +61,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
     protected View mApps;
     protected View mEntrance;
     protected View mEventPanel;
+    protected View mHistoryMessagePanel;
     protected FrameLayout mFloatingLayout;
     protected View mCoverUpLayout;
     protected FrameLayout mLeftPanelLayout;
@@ -84,6 +85,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
         mLeftShadowFrame = findViewById( R.id.module_main_id_map_left_shadow_frame );
         mCoverUpLayout = findViewById( R.id.module_main_id_cover_up );
         mLeftPanelLayout = findViewById( R.id.module_main_id_left_panel_fragment_container );
+        mHistoryMessagePanel = findViewById( R.id.module_main_id_message_history_fragment_container );
 
         // 避免事件穿透导致地图被滑动
         mLeftShadowFrame.setOnClickListener( view -> {
@@ -166,6 +168,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
 
         mMogoFragmentManager = mServiceApis.getFragmentManagerApi();
         mMogoFragmentManager.init( this, R.id.module_main_id_search_fragment );
+        mMogoFragmentManager.initMessageHistoryContainerId( R.id.module_main_id_message_history_fragment_container );
         mMogoFragmentManager.registerMainFragmentStackTransactionListener( ( size ) -> {
             if ( size == 0 ) {
                 showLayout();

modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml

@@ -55,6 +55,12 @@
         android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft"
         android:padding="@dimen/module_main_entrance_fragment_container_padding" />
 
+    <FrameLayout
+        android:id="@+id/module_main_id_message_history_fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft"/>
+
     <!-- 浮层-->
     <FrameLayout
         android:id="@+id/module_main_id_floating_view"

modules/mogo-module-main/src/main/res/values-xhdpi-1920x1000/dimens.xml

@@ -16,7 +16,7 @@
     <dimen name="cards_container_shadow_dp_margin_top">599px</dimen>
 
     <dimen name="module_main_apps_fragment_container_width">200px</dimen>
-    <dimen name="module_main_apps_fragment_container_padding">30px</dimen>
+    <dimen name="module_main_apps_fragment_container_padding">20px</dimen>
     <dimen name="module_main_header_fragment_container_marginTop">30px</dimen>
     <dimen name="module_main_header_fragment_container_marginLeft">830px</dimen>
     <dimen name="module_main_id_entrance_fragment_container_marginLeft">590px</dimen>

modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml

@@ -16,7 +16,7 @@
     <dimen name="cards_container_shadow_dp_margin_top">599px</dimen>
 
     <dimen name="module_main_apps_fragment_container_width">200px</dimen>
-    <dimen name="module_main_apps_fragment_container_padding">30px</dimen>
+    <dimen name="module_main_apps_fragment_container_padding">20px</dimen>
     <dimen name="module_main_header_fragment_container_marginTop">30px</dimen>
     <dimen name="module_main_header_fragment_container_marginLeft">830px</dimen>
     <dimen name="module_main_id_entrance_fragment_container_marginLeft">800px</dimen>

modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java

@@ -277,6 +277,9 @@ public class MapPresenter extends Presenter< MapView > implements
         for ( String cmd : VoiceConstants.sUnUnRegisterCmds ) {
             mMogoIntentManager.registerIntentListener( cmd, this );
         }
+        for ( Map.Entry< String, String[] > entry : VoiceConstants.sUnRegisterVoiceCmds.entrySet() ) {
+            AIAssist.getInstance( getContext() ).registerUnWakeupCommand( entry.getKey(), entry.getValue(), this );
+        }
 
         initBroadcast();
         mCustomVoiceCommandHandler = new MapControlCommandHandler();
@@ -313,6 +316,13 @@ public class MapPresenter extends Presenter< MapView > implements
         }
         mRegisterCenter.unregisterMogoNaviListener( TAG );
         mRegisterCenter.unregisterADASControlStatusChangedListener( TAG );
+
+        for ( String cmd : VoiceConstants.sUnUnRegisterCmds ) {
+            mMogoIntentManager.unregisterIntentListener( cmd, this );
+        }
+        for ( Map.Entry< String, String[] > entry : VoiceConstants.sUnRegisterVoiceCmds.entrySet() ) {
+            AIAssist.getInstance( getContext() ).unregisterUnWakeupCommand( entry.getKey(), this );
+        }
     }
 
     private void registerVoiceCmd() {
@@ -365,4 +375,5 @@ public class MapPresenter extends Presenter< MapView > implements
     public void onStopNavi() {
         MapBroadCastHelper.getInstance( getContext() ).stopNavi();
     }
+
 }

modules/mogo-module-map/src/main/java/com/mogo/module/map/VoiceConstants.java

@@ -158,8 +158,13 @@ public class VoiceConstants {
     public static final String CMD_MAP_SPEAK_REMAIN_UN_WAKEUP = "CMD_MAP_SPEAK_REMAIN_UN_WAKEUP";
     public static final String[] CMD_MAP_SPEAK_REMAIN_TRIGGER_WORDS = {"还有多久", "多久到", "还有多远"};
 
+    // 免唤醒
     public static final Map< String, String[] > sVoiceCmds = new HashMap<>();
+    // 不注销的免唤醒
+    public static final Map< String, String[] > sUnRegisterVoiceCmds = new HashMap<>();
+    // 唤醒
     public static final List< String > sCmds = new ArrayList<>();
+    // 不注销的唤醒
     public static final List< String > sUnUnRegisterCmds = new ArrayList<>();
 
     static {
@@ -168,9 +173,6 @@ public class VoiceConstants {
         sVoiceCmds.put( VoiceConstants.CMD_MAP_ZOOM_OUT_UN_WAKEUP, VoiceConstants.CMD_MAP_ZOOM_OUT_TRIGGER_WORDS );
         //sVoiceCmds.put( VoiceConstants.CMD_MAP_2D_UN_WAKEUP, VoiceConstants.CMD_MAP_2D_TRIGGER_WORDS );
         //sVoiceCmds.put( VoiceConstants.CMD_MAP_3D_UN_WAKEUP, VoiceConstants.CMD_MAP_3D_TRIGGER_WORDS );
-        sVoiceCmds.put( VoiceConstants.CMD_MAP_DAY_TIME_MODE_UN_WAKEUP, VoiceConstants.CMD_MAP_DAY_TIME_MODE_TRIGGER_WORDS );
-        sVoiceCmds.put( VoiceConstants.CMD_MAP_NIGHT_MODE_UN_WAKEUP, VoiceConstants.CMD_MAP_NIGHT_MODE_TRIGGER_WORDS );
-        sVoiceCmds.put( VoiceConstants.CMD_MAP_AUTO_LIGHT_NIGHT_MODE_UN_WAKEUP, VoiceConstants.CMD_MAP_AUTO_LIGHT_NIGHT_MODE_TRIGGER_WORDS );
         sVoiceCmds.put( VoiceConstants.CMD_MAP_TRAFFIC_MODE_UN_WAKEUP, VoiceConstants.CMD_MAP_TRAFFIC_MODE_TRIGGER_WORDS );
         sVoiceCmds.put( VoiceConstants.CMD_MAP_UN_TRAFFIC_MODE_UN_WAKEUP, VoiceConstants.CMD_MAP_UN_TRAFFIC_MODE_TRIGGER_WORDS );
         //sVoiceCmds.put( VoiceConstants.CMD_MAP_DISPLAY_OVERVIEW_MODE_UN_WAKEUP, VoiceConstants.CMD_MAP_DISPLAY_OVERVIEW_MODE_TRIGGER_WORDS );
@@ -185,16 +187,18 @@ public class VoiceConstants {
         sVoiceCmds.put( VoiceConstants.CMD_MAP_SPEAK_DETAIL_MODE_UN_WAKEUP, VoiceConstants.CMD_MAP_SPEAK_DETAIL_MODE_TRIGGER_WORDS );
         sVoiceCmds.put( VoiceConstants.CMD_MAP_SPEAK_DRAFT_MODE_UN_WAKEUP, VoiceConstants.CMD_MAP_SPEAK_DRAFT_MODE_TRIGGER_WORDS );
         //sVoiceCmds.put( VoiceConstants.CMD_MAP_SPEAK_REMAIN_UN_WAKEUP, VoiceConstants.CMD_MAP_SPEAK_REMAIN_TRIGGER_WORDS );
+
+        sUnRegisterVoiceCmds.put( VoiceConstants.CMD_MAP_DAY_TIME_MODE_UN_WAKEUP, VoiceConstants.CMD_MAP_DAY_TIME_MODE_TRIGGER_WORDS );
+        sUnRegisterVoiceCmds.put( VoiceConstants.CMD_MAP_NIGHT_MODE_UN_WAKEUP, VoiceConstants.CMD_MAP_NIGHT_MODE_TRIGGER_WORDS );
+        sUnRegisterVoiceCmds.put( VoiceConstants.CMD_MAP_AUTO_LIGHT_NIGHT_MODE_UN_WAKEUP, VoiceConstants.CMD_MAP_AUTO_LIGHT_NIGHT_MODE_TRIGGER_WORDS );
+
         // 唤醒
         sCmds.add( VoiceConstants.CMD_MAP_ZOOM_IN );
         sCmds.add( VoiceConstants.CMD_MAP_ZOOM_OUT );
         sCmds.add( VoiceConstants.CMD_MAP_2D );
         sCmds.add( VoiceConstants.CMD_MAP_3D );
-        sCmds.add( VoiceConstants.CMD_MAP_DAY_TIME_MODE );
-        sCmds.add( VoiceConstants.CMD_MAP_NIGHT_MODE );
         sCmds.add( VoiceConstants.CMD_MAP_TRAFFIC_MODE );
         sCmds.add( VoiceConstants.CMD_MAP_UN_TRAFFIC_MODE );
-        sCmds.add( VoiceConstants.CMD_MAP_AUTO_LIGHT_NIGHT_MODE );
         sCmds.add( VoiceConstants.CMD_MAP_CAR_UP_MODE );
         sCmds.add( VoiceConstants.CMD_MAP_NORTH_UP_MODE );
         sCmds.add( VoiceConstants.CMD_MAP_STOP_NAVI_MODE );
@@ -206,5 +210,8 @@ public class VoiceConstants {
         sUnUnRegisterCmds.add( VoiceConstants.CMD_MAP_CONTINUE_NAVI_MODE );
         sUnUnRegisterCmds.add( VoiceConstants.CMD_MAP_DISPLAY_OVERVIEW_MODE );
         sUnUnRegisterCmds.add( VoiceConstants.CMD_MAP_HISTORY );
+        sUnUnRegisterCmds.add( VoiceConstants.CMD_MAP_DAY_TIME_MODE );
+        sUnUnRegisterCmds.add( VoiceConstants.CMD_MAP_NIGHT_MODE );
+        sUnUnRegisterCmds.add( VoiceConstants.CMD_MAP_AUTO_LIGHT_NIGHT_MODE );
     }
 }

modules/mogo-module-push-noop/build.gradle

@@ -43,14 +43,14 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     // 小智语音，免唤醒词等服务
-    compileOnly rootProject.ext.dependencies.mogoserviceapi
-    compileOnly rootProject.ext.dependencies.arouter
+    implementation rootProject.ext.dependencies.arouter
     kapt rootProject.ext.dependencies.aroutercompiler
-
     if( Boolean.valueOf(RELEASE) ){
         implementation rootProject.ext.dependencies.modulepushbase
+        implementation rootProject.ext.dependencies.mogoserviceapi
     } else {
         implementation project(":modules:mogo-module-push-base")
+        implementation project(':services:mogo-service-api')
     }
 }
 

modules/mogo-module-push/src/main/AndroidManifest.xml

@@ -4,14 +4,4 @@
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
-    <application>
-        <activity
-            android:name=".activity.PushMessageActivity"
-            android:theme="@style/ModulePushMessageTheme">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-            </intent-filter>
-        </activity>
-    </application>
-
 </manifest>

modules/mogo-module-push/src/main/java/com/mogo/module/push/PushHistoryUiProvider.java

@@ -0,0 +1,39 @@
+package com.mogo.module.push;
+
+import android.content.Context;
+import android.os.Bundle;
+
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+
+import com.alibaba.android.arouter.facade.annotation.Route;
+import com.mogo.module.push.base.PushUIConstants;
+import com.mogo.module.push.fragment.MessageHistoryFragment;
+import com.mogo.service.fragmentmanager.IFragmentProvider;
+
+public
+/**
+ * @author congtaowang
+ * @since 2020/9/1
+ *
+ * 描述
+ */
+@Route( path = PushUIConstants.Push_MESSAGE_ACTIVITY_PATH )
+class PushHistoryUiProvider implements IFragmentProvider {
+
+    @Override
+    public Fragment createFragment( FragmentActivity activity, int containerId, Bundle date ) {
+        Fragment fragment = new MessageHistoryFragment();
+        activity.getSupportFragmentManager()
+                .beginTransaction()
+                .add( containerId, fragment, PushUIConstants.Push_MESSAGE_ACTIVITY_PATH )
+                .show( fragment )
+                .commitNowAllowingStateLoss();
+        return fragment;
+    }
+
+    @Override
+    public void init( Context context ) {
+
+    }
+}

modules/mogo-module-push/src/main/java/com/mogo/module/push/activity/PushMessageActivity.kt

@@ -1,126 +0,0 @@
-package com.mogo.module.push.activity
-
-import android.content.Intent
-import android.os.Bundle
-import android.view.View
-import androidx.appcompat.app.AppCompatActivity
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.mogo.module.push.Config
-import com.mogo.module.push.R
-import com.mogo.module.push.adapter.PushMessageAdapter
-import com.mogo.module.push.base.PushUIConstants
-import com.mogo.module.push.model.PushBean
-import com.mogo.module.push.repository.PushRepository
-import com.mogo.module.push.utils.AnalyticsUtils
-import com.mogo.module.push.utils.HandlerUtils
-import com.mogo.module.push.utils.startClearAnimator
-import com.mogo.module.push.view.PushItemAnimator
-import com.mogo.module.push.view.SwipeItemLayout
-import com.mogo.module.push.view.getApis
-import com.mogo.module.push.viewmodel.MessageViewModel
-import com.mogo.service.intent.IMogoIntentListener
-import com.mogo.utils.UiThreadHandler
-import com.mogo.utils.logger.Logger
-import kotlinx.android.synthetic.main.module_push_message_activity.*
-
-@Route(path = PushUIConstants.Push_MESSAGE_ACTIVITY_PATH)
-class PushMessageActivity : AppCompatActivity(), IMogoIntentListener {
-    private lateinit var viewModel: MessageViewModel
-    private var adapter = PushMessageAdapter()
-    private var clearing = false
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-//        window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
-        setContentView(R.layout.module_push_message_activity)
-        AnalyticsUtils.track(Config.NEWS_HISTORY_OPEN)
-        module_push_activity_close.setOnClickListener {
-            AnalyticsUtils.track(Config.NEWS_HISTORY_CLOSE)
-            finish()
-        }
-        module_push_activity_clear.setOnClickListener {
-            AnalyticsUtils.track(Config.NEWS_HISTORY_ALL_CLEAR)
-            if (!clearing) {
-                clearing = true
-                startClearAnimator(module_push_activity_recycler_view) {
-                    viewModel.deleteAll()
-                    clearing = false
-                }
-            }
-        }
-        adapter.deletePushBean = object : PushMessageAdapter.PushAdapterListener {
-            override fun lastItemShow(show: Boolean) {
-                if (!show && !clearing) {
-                    val size = viewModel.list?.size ?: 0
-                    if (size > 0 && size < module_push_activity_recycler_view.childCount) {
-                        return
-                    }
-                }
-                module_push_activity_clear.visibility =
-                        if (show) View.VISIBLE else View.GONE
-            }
-
-            override fun deleteBean(bean: PushBean, action: Boolean) {
-                if (clearing) return
-                viewModel.delete(bean)
-                if (action) {
-                    AnalyticsUtils.track(Config.NEWS_HISTORY_ONE_CLICK, "title", bean.title)
-                    finish()
-                } else {
-                    AnalyticsUtils.track(Config.NEWS_HISTORY_ONE_CLEAR, "title", bean.title)
-                    adapter.removeItem(bean)
-                    if (adapter.datas?.size ?: 0 == 0) {
-                        module_push_activity_not_data.visibility = View.VISIBLE
-                    }
-                    updateHistoryMessageCount()
-                }
-            }
-        }
-        module_push_activity_recycler_view.layoutManager = LinearLayoutManager(this)
-        module_push_activity_recycler_view.adapter = adapter
-        module_push_activity_recycler_view.itemAnimator = PushItemAnimator()
-        module_push_activity_recycler_view.addOnItemTouchListener(
-                SwipeItemLayout.OnSwipeItemTouchListener(this)
-        )
-        viewModel = MessageViewModel(object :
-                MessageViewModel.MessageListChange {
-            override fun messageListChange(list: MutableList<PushBean>?) {
-                runOnUiThread {
-                    var size = list?.size ?: 0
-                    adapter.datas = list
-                    module_push_activity_not_data.visibility = if (size > 0) View.GONE else View.VISIBLE
-                    updateHistoryMessageCount()
-                }
-            }
-        })
-
-        getApis(this).intentManagerApi.registerIntentListener(Intent.ACTION_CLOSE_SYSTEM_DIALOGS, this)
-    }
-
-    private fun updateHistoryMessageCount(){
-        HandlerUtils.mBgHandler.post{
-            var count = PushRepository.pushRepository.pushBeanDao.getAllCount()
-            UiThreadHandler.post {
-                module_push_activity_title.text = if (count > 0) "历史消息（${count}）" else "历史消息"
-            }
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        adapter.notifyDataSetChanged()
-    }
-
-    override fun onIntentReceived(intentStr: String?, intent: Intent?) {
-        if (Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(intentStr)) {
-            Logger.d("PushMessageActivity", "close by home key.")
-            finish()
-        }
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        getApis(this).intentManagerApi.unregisterIntentListener(Intent.ACTION_CLOSE_SYSTEM_DIALOGS, this)
-    }
-}

modules/mogo-module-push/src/main/java/com/mogo/module/push/adapter/PushMessageAdapter.kt

@@ -45,7 +45,7 @@ class PushMessageAdapter : RecyclerView.Adapter<PushMessageAdapter.MessageViewHo
             val position = it.indexOf(bean)
             if (position >= 0) {
                 it.removeAt(position)
-                notifyItemRemoved(position)
+                notifyDataSetChanged()
             }
             if (itemCount == 0) {
                 deletePushBean.lastItemShow(false)

modules/mogo-module-push/src/main/java/com/mogo/module/push/fragment/MessageHistoryFragment.java

@@ -0,0 +1,192 @@
+package com.mogo.module.push.fragment;
+
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.mogo.commons.AbsMogoApplication;
+import com.mogo.commons.analytics.AnalyticsUtils;
+import com.mogo.commons.mvp.MvpFragment;
+import com.mogo.module.push.Config;
+import com.mogo.module.push.R;
+import com.mogo.module.push.adapter.PushMessageAdapter;
+import com.mogo.module.push.model.PushBean;
+import com.mogo.module.push.repository.PushRepository;
+import com.mogo.module.push.utils.AnimatorUtilsKt;
+import com.mogo.module.push.utils.HandlerUtils;
+import com.mogo.module.push.view.GlobalToolsKt;
+import com.mogo.module.push.view.PushItemAnimator;
+import com.mogo.module.push.view.SwipeItemLayout;
+import com.mogo.module.push.viewmodel.MessageViewModel;
+import com.mogo.service.statusmanager.IMogoMsgCenterListener;
+import com.mogo.utils.UiThreadHandler;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public
+/**
+ * @author congtaowang
+ * @since 2020/9/1
+ *
+ * 描述
+ */
+class MessageHistoryFragment extends MvpFragment< MessageHistoryView, MessageHistoryPresenter > implements MessageHistoryView, IMogoMsgCenterListener {
+
+    private static final String TAG = "MessageHistoryFragment";
+
+    private View mClear;
+    private RecyclerView mHistoryList;
+    private TextView mTitle;
+    private View mEmptyPlaceHolder;
+    private View mClose;
+
+    private boolean mClearing = false;
+    private PushMessageAdapter mAdapter = new PushMessageAdapter();
+    private MessageViewModel mViewModel;
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.module_push_message_hisotry_fragment;
+    }
+
+    @Override
+    protected void initViews() {
+        mClear = findViewById( R.id.module_push_id_clear );
+        mHistoryList = findViewById( R.id.module_push_id_recycler_view );
+        mTitle = findViewById( R.id.module_push_id_title );
+        mEmptyPlaceHolder = findViewById( R.id.module_push_id_not_data );
+        mClose = findViewById( R.id.module_push_id_close );
+
+        AnalyticsUtils.track( Config.NEWS_HISTORY_OPEN, null );
+        mClose.setOnClickListener( view -> {
+            exitSelf();
+        } );
+        mClear.setOnClickListener( view -> {
+            AnalyticsUtils.track( Config.NEWS_HISTORY_ALL_CLEAR, null );
+            if ( !mClearing ) {
+                mClearing = true;
+                AnimatorUtilsKt.startClearAnimator(
+                        mHistoryList,
+                        () -> {
+                            mViewModel.deleteAll();
+                            mClearing = false;
+                        }
+                );
+            }
+        } );
+        mAdapter.deletePushBean = new PushMessageAdapter.PushAdapterListener() {
+            @Override
+            public void deleteBean( @NotNull PushBean bean, boolean action ) {
+                if ( mClearing ) {
+                    return;
+                }
+                mViewModel.delete( bean );
+                if ( action ) {
+                    Map< String, Object > prop = new HashMap<>();
+                    prop.put( "title", bean.getTitle() );
+                    AnalyticsUtils.track( Config.NEWS_HISTORY_ONE_CLICK, prop );
+                    exitSelf();
+                } else {
+                    AnalyticsUtils.track( Config.NEWS_HISTORY_ONE_CLEAR, null );
+                    mAdapter.removeItem( bean );
+                    if ( mAdapter.getItemCount() == 0 ) {
+                        mEmptyPlaceHolder.setVisibility( View.VISIBLE );
+                    }
+                    updateHistoryMessageCount();
+                }
+            }
+
+            @Override
+            public void lastItemShow( boolean show ) {
+                if ( !show && !mClearing ) {
+                    if ( mViewModel.getList() != null ) {
+                        int size = mViewModel.getList().size();
+                        if ( size > 0 && size < mHistoryList.getChildCount() ) {
+                            return;
+                        }
+                    }
+                }
+                mClear.setVisibility( show ? View.VISIBLE : View.GONE );
+            }
+        };
+        mViewModel = new MessageViewModel( list -> {
+            UiThreadHandler.post( () -> {
+                int size = list == null ? 0 : list.size();
+                mAdapter.setDatas( list );
+                mEmptyPlaceHolder.setVisibility( size > 0 ? View.GONE : View.VISIBLE );
+                updateHistoryMessageCount();
+            } );
+        } );
+
+        mHistoryList.setLayoutManager( new LinearLayoutManager( AbsMogoApplication.getApp() ) );
+        mHistoryList.setAdapter( mAdapter );
+        mHistoryList.setItemAnimator( new PushItemAnimator() );
+        mHistoryList.addOnItemTouchListener( new SwipeItemLayout.OnSwipeItemTouchListener( getContext() ) );
+
+        mRootView.setOnClickListener( view -> {
+        } );
+        GlobalToolsKt.getApis( getContext() ).getMsgCenterApi().registerMsgCenterListener( this );
+    }
+
+    private void exitSelf() {
+        try {
+            getActivity().getSupportFragmentManager().beginTransaction()
+                    .remove( this )
+                    .commitNowAllowingStateLoss();
+        } catch ( Exception e ) {
+            e.printStackTrace();
+        }
+    }
+
+    private void updateHistoryMessageCount() {
+        HandlerUtils.INSTANCE.getMBgHandler().post( () -> {
+            int count = 0;
+            try {
+                count = PushRepository.Companion.getPushRepository().getPushBeanDao().getAllCount();
+            } catch ( Exception e ) {
+                count = 0;
+            }
+            renderHistoryMessageCount( count );
+        } );
+    }
+
+    private void renderHistoryMessageCount( int count ) {
+        UiThreadHandler.post( () -> {
+            try {
+                mTitle.setText( count > 0 ? "历史消息(" + count + ")" : "历史消息" );
+            } catch ( Exception e ) {
+                e.printStackTrace();
+            }
+        } );
+    }
+
+    @Override
+    public void onMsgChanged( boolean hasMsg, int amount ) {
+        HandlerUtils.INSTANCE.getMBgHandler().post( () -> {
+            mViewModel.setList( PushRepository.Companion.getPushRepository().getAll() );
+        } );
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+    }
+
+    @NonNull
+    @Override
+    protected MessageHistoryPresenter createPresenter() {
+        return new MessageHistoryPresenter( this );
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        GlobalToolsKt.getApis( getContext() ).getMsgCenterApi().unregisterMsgCenterListener( this );
+    }
+}

modules/mogo-module-push/src/main/java/com/mogo/module/push/fragment/MessageHistoryPresenter.java

@@ -0,0 +1,17 @@
+package com.mogo.module.push.fragment;
+
+import com.mogo.commons.mvp.Presenter;
+
+public
+/**
+ * @author congtaowang
+ * @since 2020/9/1
+ *
+ * 描述
+ */
+class MessageHistoryPresenter extends Presenter< MessageHistoryView > {
+
+    public MessageHistoryPresenter( MessageHistoryView view ) {
+        super( view );
+    }
+}

modules/mogo-module-push/src/main/java/com/mogo/module/push/fragment/MessageHistoryView.java

@@ -0,0 +1,13 @@
+package com.mogo.module.push.fragment;
+
+import com.mogo.commons.mvp.IView;
+
+public
+/**
+ * @author congtaowang
+ * @since 2020/9/1
+ *
+ * 描述
+ */
+interface MessageHistoryView extends IView {
+}

modules/mogo-module-push/src/main/java/com/mogo/module/push/repository/PushRepository.kt

@@ -85,6 +85,12 @@ class PushRepository(mContext: Context) {
                         }
                         pushBeanQueue.offer(bean)
                     }
+                    if ( bean != null) {
+                        HandlerUtils.mBgHandler.post {
+                            pushBeanDao.insertAll(bean)
+                            updateMsgNum()
+                        }
+                    }
                     startIterate()
                 }
             })
@@ -158,13 +164,6 @@ class PushRepository(mContext: Context) {
     }
 
     fun iterateNext(needSave: Boolean = false) {
-        if (needSave && pushViewModel.pushBean != null) {
-            val bean = pushViewModel.pushBean!!
-            HandlerUtils.mBgHandler.post {
-                pushBeanDao.insertAll(bean)
-                updateMsgNum()
-            }
-        }
         try {
             val nextBean = pushBeanQueue.peek()
             if (nextBean == null) {

modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/AnimatorUtils.kt

@@ -4,8 +4,11 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.get
 import androidx.core.view.isNotEmpty
+import com.mogo.utils.logger.Logger
 
-fun startClearAnimator(root: ViewGroup, method: () -> Unit) {
+val TAG: String = "AnimatorUtils.kt"
+
+fun startClearAnimator(root: ViewGroup, runnable: Runnable) {
     if (root.isNotEmpty()) {
         var view: View
         var size = root.childCount - 1
@@ -13,13 +16,19 @@ fun startClearAnimator(root: ViewGroup, method: () -> Unit) {
             view = root[i]
             view.animate().translationX(-view.width.toFloat()).apply {
                 if (i == 0) {
-                    withEndAction(method)
+                    try {
+                        withEndAction(runnable)
+                    } catch (e: Exception) {
+                        Logger.e(TAG, e, "startClearAnimator->withEndAction")
+                    }
                 }
                 duration = 200
                 startDelay = 100 * (size - i).toLong()
             }
         }
     } else {
-        method()
+        runnable?.apply {
+            run()
+        }
     }
 }

modules/mogo-module-push/src/main/res/drawable/module_push_message_background.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="#FA36374A"/>
+    <solid android:color="#F710121E"/>
+    <corners android:radius="@dimen/module_push_panel_corner"/>
 </shape>

modules/mogo-module-push/src/main/res/drawable/module_push_recycler_item_background.xml

@@ -2,8 +2,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <corners android:radius="@dimen/module_push_button_margin_top" />
-    <solid android:color="#242736" />
+    <corners android:radius="@dimen/module_push_panel_item_corner" />
+    <solid android:color="#1F2131" />
     <!--  <gradient
           android:angle="-90"
           android:endColor="#2F3047"

modules/mogo-module-push/src/main/res/layout/module_push_message_hisotry_fragment.xml

@@ -1,57 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:layout_marginTop="@dimen/module_push_panel_marginTop"
+    android:layout_marginBottom="@dimen/module_push_panel_marginBottom"
+    android:layout_marginRight="@dimen/module_push_panel_marginRight"
+    android:layout_marginLeft="@dimen/module_push_panel_marginRight"
+    android:paddingLeft="@dimen/module_push_panel_paddingLeft"
+    android:paddingRight="@dimen/module_push_panel_paddingLeft"
+    android:background="@drawable/module_push_message_background"
     android:layout_gravity="center_vertical">
 
     <TextView
-        android:id="@+id/module_push_activity_title"
+        android:id="@+id/module_push_id_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
         android:layout_marginTop="@dimen/module_push_activity_title_margin_top"
-        android:text="历史消息（2）"
-        android:textColor="#FFFFFFFF"
+        android:text="历史消息"
+        android:textColor="@color/module_push_panel_title_textColor"
         android:textSize="@dimen/module_push_activity_title_text_size" />
 
     <ImageView
-        android:id="@+id/module_push_activity_close"
-        android:layout_width="@dimen/module_push_margin_start"
-        android:layout_height="@dimen/module_push_margin_start"
+        android:id="@+id/module_push_id_close"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_gravity="end"
         android:layout_marginTop="@dimen/module_push_activity_close_margin_top"
-        android:layout_marginEnd="@dimen/module_push_activity_close_margin_end"
-        android:padding="@dimen/module_push_activity_close_padding"
         android:src="@drawable/module_push_close" />
 
     <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/module_push_activity_recycler_view"
+        android:id="@+id/module_push_id_recycler_view"
         android:layout_width="match_parent"
+        android:overScrollMode="never"
         android:layout_height="match_parent"
-        android:layout_marginTop="@dimen/module_push_activity_recycler_view_margin_top"
-        android:layout_marginEnd="@dimen/module_push_activity_close_margin_end" />
+        android:layout_marginTop="@dimen/module_push_activity_recycler_view_margin_top" />
 
     <TextView
-        android:id="@+id/module_push_activity_not_data"
+        android:id="@+id/module_push_id_not_data"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:gravity="center"
-        android:text="暂无消息"
-        android:textColor="@android:color/white"
+        android:text="@string/module_push_str_not_data"
+        android:textColor="@color/module_push_panel_title_textColor"
         android:textSize="@dimen/module_push_activity_not_data_text_size" />
 
     <TextView
-        android:id="@+id/module_push_activity_clear"
+        android:id="@+id/module_push_id_clear"
         android:layout_width="@dimen/module_push_content_only_height"
         android:layout_height="@dimen/module_push_button_height"
         android:layout_gravity="bottom|center_horizontal"
         android:layout_marginBottom="@dimen/module_push_activity_clear_margin_bottom"
-        android:background="@drawable/module_push_activity_clear_bg"
+        android:background="@drawable/module_push_clear_bg"
         android:gravity="center"
-        android:text="清空历史消息"
-        android:textColor="@android:color/white"
+        android:text="@string/module_push_str_clear"
+        android:textColor="@color/module_push_panel_title_textColor"
         android:textSize="@dimen/module_push_title_text_size"
-        android:visibility="gone" />
+        android:visibility="gone"
+        tools:visibility="visible" />
 
 </FrameLayout>

modules/mogo-module-push/src/main/res/layout/module_push_message_item.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.mogo.module.push.view.SwipeItemLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:paddingBottom="@dimen/module_push_content_only_line_space">
+    android:paddingBottom="@dimen/module_push_panel_paddingBottom">
 
     <FrameLayout
         android:layout_width="match_parent"
@@ -14,7 +15,6 @@
             android:id="@+id/module_push_item_click"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginStart="@dimen/module_push_activity_close_margin_end"
             android:background="@drawable/module_push_recycler_item_background">
 
             <com.mogo.service.imageloader.MogoImageView
@@ -22,6 +22,7 @@
                 android:layout_width="@dimen/module_push_message_app_icon_size"
                 android:layout_height="@dimen/module_push_message_app_icon_size"
                 android:layout_marginStart="@dimen/module_push_message_margin_start"
+                android:visibility="gone"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -32,15 +33,15 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/module_push_image_margin_top"
                 android:layout_marginTop="@dimen/module_push_item_title_margin_top"
-                android:layout_marginBottom="@dimen/module_push_item_title_margin_bottom"
                 android:ellipsize="end"
                 android:gravity="left"
                 android:maxLines="1"
                 android:text="push title"
-                android:textColor="@android:color/white"
+                android:textColor="@color/module_push_item_title_textColor"
                 android:textSize="@dimen/module_push_title_text_size"
-                app:layout_constraintBottom_toTopOf="@+id/module_push_item_content"
+                android:textStyle="bold"
                 app:layout_constraintLeft_toRightOf="@+id/module_push_item_app_icon"
+                app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintWidth_max="@dimen/module_push_item_content_width"
                 app:layout_goneMarginBottom="@dimen/module_push_item_title_gone_margin_bottom" />
 
@@ -49,20 +50,19 @@
                 android:layout_width="@dimen/module_push_item_content_width"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/module_push_item_content_margin_end"
-                android:layout_marginBottom="@dimen/module_push_item_content_margin_bottom"
                 android:ellipsize="end"
                 android:gravity="left"
                 android:maxLines="1"
-                android:text="发现系统新版本，共140.3M。部分功能优化，建议下载升级。"
-                android:textColor="#80FFFFFF"
+                android:textColor="@color/module_push_item_content_textColor"
                 android:textSize="@dimen/module_push_item_content_text_size"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="@+id/module_push_item_title" />
+                app:layout_constraintStart_toStartOf="@+id/module_push_item_title"
+                app:layout_constraintTop_toBottomOf="@+id/module_push_item_title"
+                tools:text="发现系统新版本，共140.3M。部分功能优化，建议下载升级。" />
 
             <com.mogo.service.imageloader.MogoImageView
                 android:id="@+id/module_push_item_image"
-                android:layout_width="@dimen/module_push_message_item_image_size"
-                android:layout_height="@dimen/module_push_message_item_image_size"
+                android:layout_width="@dimen/module_push_item_image_width"
+                android:layout_height="@dimen/module_push_item_image_height"
                 android:layout_marginEnd="@dimen/module_push_message_item_image_margin_end"
                 android:scaleType="centerCrop"
                 app:layout_constraintBottom_toBottomOf="parent"
@@ -75,15 +75,14 @@
                 android:id="@+id/module_push_item_time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/module_push_image_margin_top"
+                android:layout_marginTop="@dimen/module_push_item_time_textSize"
                 android:layout_marginEnd="@dimen/module_push_image_margin_top"
-                android:gravity="right"
                 android:maxLines="1"
-                android:text="3:20"
-                android:textColor="#80FFFFFF"
+                android:textColor="@color/module_push_item_time_textColor"
                 android:textSize="@dimen/module_push_massage_time_text_size"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintLeft_toLeftOf="@+id/module_push_item_content"
+                app:layout_constraintTop_toBottomOf="@+id/module_push_item_content"
+                tools:text="3:20" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </FrameLayout>
 
@@ -99,8 +98,8 @@
             android:layout_marginStart="@dimen/module_push_button_margin_top"
             android:background="@drawable/module_push_recycler_item_background"
             android:gravity="center"
-            android:text="清除"
-            android:textColor="@android:color/white"
+            android:text="@string/module_push_str_delete"
+            android:textColor="@color/module_push_item_title_textColor"
             android:textSize="@dimen/module_push_title_text_size" />
     </FrameLayout>
 </com.mogo.module.push.view.SwipeItemLayout>

modules/mogo-module-push/src/main/res/values-ldpi/dimens.xml

@@ -14,7 +14,7 @@
     <dimen name="module_push_timer_margin_top">18px</dimen>
     <dimen name="module_push_image_width">320px</dimen>
     <dimen name="module_push_image_height">180px</dimen>
-    <dimen name="module_push_image_margin_top">21px</dimen>
+    <dimen name="module_push_image_margin_top">16px</dimen>
     <dimen name="module_push_content_only_width">320px</dimen>
     <dimen name="module_push_content_only_height">160px</dimen>
     <dimen name="module_push_content_only_line_space">9px</dimen>
@@ -23,26 +23,26 @@
     <dimen name="module_push_button_height">48px</dimen>
     <dimen name="module_push_button_margin_top">10px</dimen>
     <dimen name="module_push_button_margin_bottom">14px</dimen>
-    <dimen name="module_push_activity_title_margin_top">35px</dimen>
+    <dimen name="module_push_activity_title_margin_top">28px</dimen>
     <dimen name="module_push_activity_title_text_size">20px</dimen>
-    <dimen name="module_push_activity_close_margin_top">29px</dimen>
+    <dimen name="module_push_activity_close_margin_top">20px</dimen>
     <dimen name="module_push_activity_close_margin_end">90px</dimen>
     <dimen name="module_push_activity_close_padding">5px</dimen>
-    <dimen name="module_push_activity_recycler_view_margin_top">92px</dimen>
+    <dimen name="module_push_activity_recycler_view_margin_top">84px</dimen>
     <dimen name="module_push_activity_not_data_text_size">38px</dimen>
     <dimen name="module_push_activity_clear_margin_bottom">36px</dimen>
-    <dimen name="module_push_message_item_height">106px</dimen>
+    <dimen name="module_push_message_item_height">100px</dimen>
     <dimen name="module_push_message_app_icon_size">64px</dimen>
     <dimen name="module_push_message_margin_start">24px</dimen>
-    <dimen name="module_push_item_title_margin_top">25px</dimen>
+    <dimen name="module_push_item_title_margin_top">16px</dimen>
     <dimen name="module_push_item_title_gone_margin_bottom">44px</dimen>
     <dimen name="module_push_item_title_margin_bottom">2px</dimen>
     <dimen name="module_push_item_content_margin_end">20px</dimen>
     <dimen name="module_push_item_content_margin_bottom">27px</dimen>
     <dimen name="module_push_item_content_text_size">16px</dimen>
     <dimen name="module_push_message_item_image_size">64px</dimen>
-    <dimen name="module_push_message_item_image_margin_end">100px</dimen>
-    <dimen name="module_push_massage_time_text_size">14px</dimen>
+    <dimen name="module_push_message_item_image_margin_end">8px</dimen>
+    <dimen name="module_push_massage_time_text_size">16px</dimen>
 
     <dimen name="module_push_image_margin_bottom">22px</dimen>
     <dimen name="module_push_button_radius">27px</dimen>
@@ -50,7 +50,7 @@
     <dimen name="module_push_timer_thickness">1.5px</dimen>
     <dimen name="module_push_clear_bg_radius">24px</dimen>
     <dimen name="module_push_image_radius">10px</dimen>
-    <dimen name="module_push_item_image_radius">4px</dimen>
+    <dimen name="module_push_item_image_radius">8px</dimen>
     <dimen name="module_push_item_content_width">560px</dimen>
     <dimen name="module_push_ui_height">194px</dimen>
     <dimen name="module_push_ui_image_width">266px</dimen>
@@ -87,4 +87,14 @@
     <dimen name="module_push_item_minHeight_vertical">310px</dimen>
     <dimen name="module_push_item_maxHeight_vertical">350px</dimen>
     <dimen name="module_push_content_paddingBottom_vertical">60px</dimen>
+    <dimen name="module_push_panel_marginTop">16px</dimen>
+    <dimen name="module_push_panel_marginBottom">16px</dimen>
+    <dimen name="module_push_panel_marginRight">16px</dimen>
+    <dimen name="module_push_panel_paddingLeft">28px</dimen>
+    <dimen name="module_push_panel_paddingBottom">16px</dimen>
+    <dimen name="module_push_panel_corner">16px</dimen>
+    <dimen name="module_push_panel_item_corner">12px</dimen>
+    <dimen name="module_push_item_time_textSize">5px</dimen>
+    <dimen name="module_push_item_image_width">118px</dimen>
+    <dimen name="module_push_item_image_height">86px</dimen>
 </resources>

modules/mogo-module-push/src/main/res/values-mdpi/dimens.xml

@@ -14,7 +14,7 @@
     <dimen name="module_push_timer_margin_top">18px</dimen>
     <dimen name="module_push_image_width">320px</dimen>
     <dimen name="module_push_image_height">180px</dimen>
-    <dimen name="module_push_image_margin_top">21px</dimen>
+    <dimen name="module_push_image_margin_top">16px</dimen>
     <dimen name="module_push_content_only_width">320px</dimen>
     <dimen name="module_push_content_only_height">160px</dimen>
     <dimen name="module_push_content_only_line_space">9px</dimen>
@@ -23,26 +23,26 @@
     <dimen name="module_push_button_height">48px</dimen>
     <dimen name="module_push_button_margin_top">10px</dimen>
     <dimen name="module_push_button_margin_bottom">14px</dimen>
-    <dimen name="module_push_activity_title_margin_top">35px</dimen>
+    <dimen name="module_push_activity_title_margin_top">28px</dimen>
     <dimen name="module_push_activity_title_text_size">20px</dimen>
-    <dimen name="module_push_activity_close_margin_top">29px</dimen>
+    <dimen name="module_push_activity_close_margin_top">20px</dimen>
     <dimen name="module_push_activity_close_margin_end">90px</dimen>
     <dimen name="module_push_activity_close_padding">5px</dimen>
-    <dimen name="module_push_activity_recycler_view_margin_top">92px</dimen>
+    <dimen name="module_push_activity_recycler_view_margin_top">84px</dimen>
     <dimen name="module_push_activity_not_data_text_size">38px</dimen>
     <dimen name="module_push_activity_clear_margin_bottom">36px</dimen>
-    <dimen name="module_push_message_item_height">106px</dimen>
+    <dimen name="module_push_message_item_height">100px</dimen>
     <dimen name="module_push_message_app_icon_size">64px</dimen>
     <dimen name="module_push_message_margin_start">24px</dimen>
-    <dimen name="module_push_item_title_margin_top">25px</dimen>
+    <dimen name="module_push_item_title_margin_top">16px</dimen>
     <dimen name="module_push_item_title_gone_margin_bottom">44px</dimen>
     <dimen name="module_push_item_title_margin_bottom">2px</dimen>
     <dimen name="module_push_item_content_margin_end">20px</dimen>
     <dimen name="module_push_item_content_margin_bottom">27px</dimen>
     <dimen name="module_push_item_content_text_size">16px</dimen>
     <dimen name="module_push_message_item_image_size">64px</dimen>
-    <dimen name="module_push_message_item_image_margin_end">100px</dimen>
-    <dimen name="module_push_massage_time_text_size">14px</dimen>
+    <dimen name="module_push_message_item_image_margin_end">8px</dimen>
+    <dimen name="module_push_massage_time_text_size">16px</dimen>
 
     <dimen name="module_push_image_margin_bottom">22px</dimen>
     <dimen name="module_push_button_radius">27px</dimen>
@@ -50,7 +50,7 @@
     <dimen name="module_push_timer_thickness">1.5px</dimen>
     <dimen name="module_push_clear_bg_radius">24px</dimen>
     <dimen name="module_push_image_radius">10px</dimen>
-    <dimen name="module_push_item_image_radius">4px</dimen>
+    <dimen name="module_push_item_image_radius">8px</dimen>
     <dimen name="module_push_item_content_width">560px</dimen>
     <dimen name="module_push_ui_height">194px</dimen>
     <dimen name="module_push_ui_image_width">266px</dimen>
@@ -87,4 +87,14 @@
     <dimen name="module_push_item_minHeight_vertical">310px</dimen>
     <dimen name="module_push_item_maxHeight_vertical">350px</dimen>
     <dimen name="module_push_content_paddingBottom_vertical">60px</dimen>
+    <dimen name="module_push_panel_marginTop">16px</dimen>
+    <dimen name="module_push_panel_marginBottom">16px</dimen>
+    <dimen name="module_push_panel_marginRight">16px</dimen>
+    <dimen name="module_push_panel_paddingLeft">28px</dimen>
+    <dimen name="module_push_panel_paddingBottom">16px</dimen>
+    <dimen name="module_push_panel_corner">16px</dimen>
+    <dimen name="module_push_panel_item_corner">12px</dimen>
+    <dimen name="module_push_item_time_textSize">5px</dimen>
+    <dimen name="module_push_item_image_width">118px</dimen>
+    <dimen name="module_push_item_image_height">86px</dimen>
 </resources>

modules/mogo-module-push/src/main/res/values-xhdpi/dimens.xml

@@ -14,7 +14,7 @@
     <dimen name="module_push_timer_margin_top">34px</dimen>
     <dimen name="module_push_image_width">600px</dimen>
     <dimen name="module_push_image_height">338px</dimen>
-    <dimen name="module_push_image_margin_top">40px</dimen>
+    <dimen name="module_push_image_margin_top">30px</dimen>
     <dimen name="module_push_content_only_width">605px</dimen>
     <dimen name="module_push_content_only_height">300px</dimen>
     <dimen name="module_push_content_only_line_space">16px</dimen>
@@ -23,34 +23,34 @@
     <dimen name="module_push_button_height">90px</dimen>
     <dimen name="module_push_button_margin_top">20px</dimen>
     <dimen name="module_push_button_margin_bottom">26px</dimen>
-    <dimen name="module_push_activity_title_margin_top">66px</dimen>
-    <dimen name="module_push_activity_title_text_size">38px</dimen>
-    <dimen name="module_push_activity_close_margin_top">54px</dimen>
+    <dimen name="module_push_activity_title_margin_top">50px</dimen>
+    <dimen name="module_push_activity_title_text_size">36px</dimen>
+    <dimen name="module_push_activity_close_margin_top">36px</dimen>
     <dimen name="module_push_activity_close_margin_end">160px</dimen>
     <dimen name="module_push_activity_close_padding">10px</dimen>
-    <dimen name="module_push_activity_recycler_view_margin_top">173px</dimen>
+    <dimen name="module_push_activity_recycler_view_margin_top">151px</dimen>
     <dimen name="module_push_activity_not_data_text_size">72px</dimen>
     <dimen name="module_push_activity_clear_margin_bottom">68px</dimen>
-    <dimen name="module_push_message_item_height">200px</dimen>
+    <dimen name="module_push_message_item_height">180px</dimen>
     <dimen name="module_push_message_app_icon_size">120px</dimen>
     <dimen name="module_push_message_margin_start">50px</dimen>
-    <dimen name="module_push_item_title_margin_top">43px</dimen>
+    <dimen name="module_push_item_title_margin_top">22px</dimen>
     <dimen name="module_push_item_title_margin_bottom">6px</dimen>
     <dimen name="module_push_item_title_gone_margin_bottom">84px</dimen>
 
     <dimen name="module_push_item_content_margin_end">40px</dimen>
     <dimen name="module_push_item_content_margin_bottom">52px</dimen>
-    <dimen name="module_push_item_content_text_size">30px</dimen>
+    <dimen name="module_push_item_content_text_size">28px</dimen>
     <dimen name="module_push_message_item_image_size">120px</dimen>
-    <dimen name="module_push_message_item_image_margin_end">180px</dimen>
-    <dimen name="module_push_massage_time_text_size">34px</dimen>
+    <dimen name="module_push_message_item_image_margin_end">11px</dimen>
+    <dimen name="module_push_massage_time_text_size">26px</dimen>
     <dimen name="module_push_image_margin_bottom">42px</dimen>
     <dimen name="module_push_button_radius">51px</dimen>
     <dimen name="module_push_timer_inner_radius">27px</dimen>
     <dimen name="module_push_timer_thickness">3px</dimen>
     <dimen name="module_push_clear_bg_radius">45px</dimen>
     <dimen name="module_push_image_radius">20px</dimen>
-    <dimen name="module_push_item_image_radius">8px</dimen>
+    <dimen name="module_push_item_image_radius">16px</dimen>
     <dimen name="module_push_item_content_width">1000px</dimen>
     <dimen name="module_push_ui_height">350px</dimen>
     <dimen name="module_push_ui_image_width">480px</dimen>
@@ -87,4 +87,14 @@
     <dimen name="module_push_item_minHeight_vertical">618px</dimen>
     <dimen name="module_push_item_maxHeight_vertical">350px</dimen>
     <dimen name="module_push_content_paddingBottom_vertical">120px</dimen>
+    <dimen name="module_push_panel_marginTop">30px</dimen>
+    <dimen name="module_push_panel_marginBottom">30px</dimen>
+    <dimen name="module_push_panel_marginRight">30px</dimen>
+    <dimen name="module_push_panel_paddingLeft">50px</dimen>
+    <dimen name="module_push_panel_paddingBottom">28px</dimen>
+    <dimen name="module_push_panel_corner">29px</dimen>
+    <dimen name="module_push_panel_item_corner">22px</dimen>
+    <dimen name="module_push_item_time_textSize">11px</dimen>
+    <dimen name="module_push_item_image_width">212px</dimen>
+    <dimen name="module_push_item_image_height">154px</dimen>
 </resources>

modules/mogo-module-push/src/main/res/values/colors.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="module_push_panel_title_textColor">#FFFFFFFF</color>
+    <color name="module_push_item_title_textColor">#FFFFFF</color>
+    <color name="module_push_item_content_textColor">#B2FFFFFF</color>
+    <color name="module_push_item_time_textColor">#999999</color>
+</resources>

modules/mogo-module-push/src/main/res/values/dimens.xml

@@ -14,7 +14,7 @@
     <dimen name="module_push_timer_margin_top">18px</dimen>
     <dimen name="module_push_image_width">320px</dimen>
     <dimen name="module_push_image_height">180px</dimen>
-    <dimen name="module_push_image_margin_top">21px</dimen>
+    <dimen name="module_push_image_margin_top">16px</dimen>
     <dimen name="module_push_content_only_width">320px</dimen>
     <dimen name="module_push_content_only_height">160px</dimen>
     <dimen name="module_push_content_only_line_space">9px</dimen>
@@ -23,26 +23,26 @@
     <dimen name="module_push_button_height">48px</dimen>
     <dimen name="module_push_button_margin_top">10px</dimen>
     <dimen name="module_push_button_margin_bottom">14px</dimen>
-    <dimen name="module_push_activity_title_margin_top">35px</dimen>
+    <dimen name="module_push_activity_title_margin_top">50px</dimen>
     <dimen name="module_push_activity_title_text_size">20px</dimen>
-    <dimen name="module_push_activity_close_margin_top">29px</dimen>
+    <dimen name="module_push_activity_close_margin_top">20px</dimen>
     <dimen name="module_push_activity_close_margin_end">90px</dimen>
     <dimen name="module_push_activity_close_padding">5px</dimen>
-    <dimen name="module_push_activity_recycler_view_margin_top">92px</dimen>
+    <dimen name="module_push_activity_recycler_view_margin_top">84px</dimen>
     <dimen name="module_push_activity_not_data_text_size">38px</dimen>
     <dimen name="module_push_activity_clear_margin_bottom">36px</dimen>
-    <dimen name="module_push_message_item_height">106px</dimen>
+    <dimen name="module_push_message_item_height">100px</dimen>
     <dimen name="module_push_message_app_icon_size">64px</dimen>
     <dimen name="module_push_message_margin_start">24px</dimen>
-    <dimen name="module_push_item_title_margin_top">25px</dimen>
+    <dimen name="module_push_item_title_margin_top">16px</dimen>
     <dimen name="module_push_item_title_gone_margin_bottom">44px</dimen>
     <dimen name="module_push_item_title_margin_bottom">2px</dimen>
     <dimen name="module_push_item_content_margin_end">20px</dimen>
     <dimen name="module_push_item_content_margin_bottom">27px</dimen>
     <dimen name="module_push_item_content_text_size">16px</dimen>
     <dimen name="module_push_message_item_image_size">64px</dimen>
-    <dimen name="module_push_message_item_image_margin_end">100px</dimen>
-    <dimen name="module_push_massage_time_text_size">14px</dimen>
+    <dimen name="module_push_message_item_image_margin_end">8px</dimen>
+    <dimen name="module_push_massage_time_text_size">16px</dimen>
 
     <dimen name="module_push_image_margin_bottom">22px</dimen>
     <dimen name="module_push_button_radius">27px</dimen>
@@ -50,7 +50,7 @@
     <dimen name="module_push_timer_thickness">1.5px</dimen>
     <dimen name="module_push_clear_bg_radius">24px</dimen>
     <dimen name="module_push_image_radius">10px</dimen>
-    <dimen name="module_push_item_image_radius">4px</dimen>
+    <dimen name="module_push_item_image_radius">8px</dimen>
     <dimen name="module_push_item_content_width">560px</dimen>
     <dimen name="module_push_ui_height">194px</dimen>
     <dimen name="module_push_ui_image_width">266px</dimen>
@@ -87,4 +87,14 @@
     <dimen name="module_push_item_minHeight_vertical">310px</dimen>
     <dimen name="module_push_item_maxHeight_vertical">350px</dimen>
     <dimen name="module_push_content_paddingBottom_vertical">60px</dimen>
+    <dimen name="module_push_panel_marginTop">16px</dimen>
+    <dimen name="module_push_panel_marginBottom">16px</dimen>
+    <dimen name="module_push_panel_marginRight">16px</dimen>
+    <dimen name="module_push_panel_paddingLeft">28px</dimen>
+    <dimen name="module_push_panel_paddingBottom">16px</dimen>
+    <dimen name="module_push_panel_corner">16px</dimen>
+    <dimen name="module_push_panel_item_corner">12px</dimen>
+    <dimen name="module_push_item_time_textSize">5px</dimen>
+    <dimen name="module_push_item_image_width">118px</dimen>
+    <dimen name="module_push_item_image_height">86px</dimen>
 </resources>

modules/mogo-module-push/src/main/res/values/strings.xml

@@ -1,3 +1,6 @@
 <resources>
     <string name="app_name">mogo-module-push</string>
+    <string name="module_push_str_delete">清除</string>
+    <string name="module_push_str_clear">清空历史消息</string>
+    <string name="module_push_str_not_data">暂无消息</string>
 </resources>

modules/mogo-module-push/src/main/res/values/styles.xml

@@ -4,6 +4,6 @@
         <!-- Customize your theme here. -->
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
-        <item name="android:windowBackground">@drawable/module_push_message_activity_background</item>
+        <item name="android:windowBackground">@drawable/module_push_message_background</item>
     </style>
 </resources>

modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt

@@ -149,13 +149,13 @@ class NaviSettingFragment : BaseFragment(), OnCheckedChangeListener {
             SettingManager.mapType = checkedId
             when (checkedId) {
                 R.id.rb_navi_day -> {
-                    SearchApisHolder.getUiControllerApis().changeMapMode(EnumMapUI.Type_Light)
+                    SearchApisHolder.getApis().adasControllerApi.changeAdasControlMode(EnumMapUI.Type_Light)
                 }
                 R.id.rb_navi_night -> {
-                    SearchApisHolder.getUiControllerApis().changeMapMode(EnumMapUI.Type_Night)
+                    SearchApisHolder.getApis().adasControllerApi.changeAdasControlMode(EnumMapUI.Type_Night)
                 }
                 R.id.rb_navi_auto -> {
-                    SearchApisHolder.getUiControllerApis().changeMapMode(EnumMapUI.Type_AUTO_LIGHT_Night)
+                    SearchApisHolder.getApis().adasControllerApi.changeAdasControlMode(EnumMapUI.Type_AUTO_LIGHT_Night)
                 }
             }
         }

modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java

@@ -52,7 +52,7 @@ public class MapMarkerInfoView extends MapMarkerBaseView {
     }
 
     protected void initView( Context context ) {
-        LayoutInflater.from( context ).inflate( R.layout.view_map_marker_info, this );
+        LayoutInflater.from( context ).inflate( R.layout.modudle_services_marker_layout_info, this );
         ivUserHead = findViewById( R.id.ivUserHead );
         ivIcon = findViewById( R.id.ivIcon );
         clMarkerContent = findViewById( R.id.clMarkerContent );

modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java

@@ -36,6 +36,7 @@ import com.mogo.module.service.utils.ViewUtils;
 import com.mogo.service.adas.IMogoADASControlStatusChangedListener;
 import com.mogo.service.connection.IMogoOnMessageListener;
 import com.mogo.service.module.IMogoBizActionDoneListener;
+import com.mogo.utils.AppUtils;
 import com.mogo.utils.ResourcesHelper;
 import com.mogo.utils.ThreadPoolService;
 import com.mogo.utils.UiThreadHandler;
@@ -959,7 +960,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
         switch ( mapUI ) {
             case Type_Light:
             case Type_Night:
-                if ( !MarkerServiceHandler.getApis().getStatusManagerApi().isMainPageOnResume() ) {
+                if ( !AppUtils.isAppForeground( mContext ) ) {
                     return;
                 }
                 if ( mLastDataResult != null ) {

modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java

@@ -3,7 +3,6 @@ package com.mogo.module.service.marker;
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
-import android.widget.ImageView;
 
 import androidx.annotation.Nullable;
 
@@ -43,7 +42,7 @@ public class MapMarkerView extends MapMarkerBaseView {
     }
 
     protected void initView( Context context ) {
-        LayoutInflater.from( context ).inflate( R.layout.view_map_marker, this );
+        LayoutInflater.from( context ).inflate( R.layout.modudle_services_marker_layout, this );
         ivIcon = findViewById( R.id.ivIcon );
         ivCar = findViewById( R.id.ivCar );
     }

modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/UserDataMarkerInfoWindowAdapter.java

@@ -8,7 +8,6 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.alibaba.android.arouter.launcher.ARouter;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.network.SubscribeImpl;
 import com.mogo.map.marker.IMogoInfoWindowAdapter;
@@ -22,7 +21,6 @@ import com.mogo.module.service.R;
 import com.mogo.module.service.network.RefreshApiService;
 import com.mogo.module.service.network.RefreshModel;
 import com.mogo.module.service.network.bean.DemoUserInfoEntity;
-import com.mogo.service.MogoServicePaths;
 import com.mogo.service.imageloader.MogoImageView;
 import com.mogo.service.network.IMogoNetwork;
 import com.mogo.utils.UiThreadHandler;
@@ -92,7 +90,7 @@ public class UserDataMarkerInfoWindowAdapter implements IMogoInfoWindowAdapter {
         }
 
         if ( mInfoWindowView == null ) {
-            mInfoWindowView = LayoutInflater.from( mContext ).inflate( R.layout.view_map_data_user_info_window, null );
+            mInfoWindowView = LayoutInflater.from( mContext ).inflate( R.layout.modudle_services_marker_info_window_layout, null );
             mContentContainer = mInfoWindowView.findViewById( R.id.module_service_id_marker_content );
             mUserHeader = mInfoWindowView.findViewById( R.id.module_service_id_user_header );
             mContent = mInfoWindowView.findViewById( R.id.module_service_id_content );

modules/mogo-module-service/src/main/res/layout/modudle_services_marker_layout.xml

@@ -12,7 +12,7 @@
     <FrameLayout
         android:id="@+id/clMarkerTopView"
         android:layout_width="@dimen/module_service_marker_bubble_width"
-        android:background="@drawable/bg_map_marker_dark"
+        android:background="@drawable/module_services_marker_bkg"
         android:layout_height="@dimen/module_service_marker_bubble_height">
 
         <ImageView

modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_refresh.xml

@@ -4,6 +4,6 @@
     <corners android:radius="@dimen/module_v2x_surrounding_refresh_bt_radius" />
 
     <gradient
-        android:endColor="#256BFF"
-        android:startColor="#5CC1FF" />
+        android:endColor="#5CC1FF"
+        android:startColor="#256BFF" />
 </shape>

modules/mogo-module-v2x/src/main/res/drawable/v2x_panel_color_bg.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:startColor="#10121E"
+        android:endColor="#10121E"/>
+    <corners android:radius="28.8px"/>
+</shape>

modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml

@@ -3,6 +3,6 @@
     <gradient
         android:angle="270"
         android:startColor="@android:color/transparent"
-        android:endColor="#10121E"/>
+        android:endColor="@color/panel_shadow_shape_color"/>
 
 </shape>

modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml

@@ -25,7 +25,7 @@
         android:layout_marginStart="@dimen/dp_32"
         android:layout_marginEnd="@dimen/dp_32"
         android:text="没有更多记录了"
-        android:textColor="#99FFFFFF"
+        android:textColor="@color/share_event_no_more_color"
         android:textSize="@dimen/dp_26"
         app:layout_constraintEnd_toStartOf="@+id/viewLinEnd"
         app:layout_constraintStart_toEndOf="@+id/viewLinStart"

modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml

@@ -1,110 +1,120 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.mogo.module.v2x.view.RoundConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground"
-    android:background="@drawable/v2x_alert_window_bg"
-    android:paddingStart="@dimen/dp_40"
-    android:paddingEnd="@dimen/dp_40"
-    app:roundLayoutRadius="@dimen/dp_40">
+    android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground">
 
-    <TextView
-        android:id="@+id/tvImgTextContent"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginStart="@dimen/dp_10"
-        android:layout_marginTop="@dimen/dp_40"
-        android:layout_marginEnd="@dimen/dp_7"
-        android:background="@drawable/bg_v2x_event_type_orange"
-        android:gravity="center_vertical"
-        android:paddingStart="@dimen/dp_23"
-        android:paddingTop="@dimen/dp_5"
-        android:paddingEnd="@dimen/dp_23"
-        android:paddingBottom="@dimen/dp_5"
-        android:text="求助信息"
-        android:textColor="@android:color/white"
-        android:textSize="@dimen/dp_24"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_chainStyle="packed" />
+    <androidx.cardview.widget.CardView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:cardBackgroundColor="@color/share_event_item_bg_color"
+        app:cardCornerRadius="@dimen/dp_40"
+        app:layout_constraintTop_toTopOf="parent">
 
-    <com.mogo.service.imageloader.MogoImageView
-        android:id="@+id/ivFaultHelpHead"
-        android:layout_width="@dimen/dp_75"
-        android:layout_height="@dimen/dp_75"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginTop="@dimen/dp_21"
-        android:layout_marginEnd="@dimen/dp_31"
-        app:layout_constraintEnd_toEndOf="@+id/rlRoadEventList"
-        app:layout_constraintStart_toStartOf="@+id/tvImgTextContent"
-        app:layout_constraintTop_toBottomOf="@+id/tvImgTextContent"
-        app:miv_borderColor="#4cffffff"
-        app:miv_failureHolder="@drawable/icon_default_user_head"
-        app:miv_overlayImageId="@drawable/icon_default_user_head"
-        app:miv_placeHolder="@drawable/icon_default_user_head"
-        app:miv_shape="circle"
-        app:miv_shapeBorderWidth="@dimen/dp_4" />
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
 
-    <TextView
-        android:id="@+id/tvFaultHelpName"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_10"
-        android:textColor="@android:color/white"
-        android:textSize="@dimen/dp_28"
-        android:textStyle="bold"
-        app:layout_constraintStart_toEndOf="@id/ivFaultHelpHead"
-        app:layout_constraintTop_toTopOf="@+id/ivFaultHelpHead"
-        app:layout_constraintVertical_chainStyle="packed"
-        app:layout_goneMarginStart="@dimen/dp_22"
-        tools:text="车主昵称" />
+            <TextView
+                android:id="@+id/tvImgTextContent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginStart="@dimen/module_v2x_surrounding_item_bottom_image_height"
+                android:layout_marginTop="@dimen/dp_40"
+                android:layout_marginEnd="@dimen/dp_7"
+                android:background="@drawable/bg_v2x_event_type_orange"
+                android:gravity="center_vertical"
+                android:paddingStart="@dimen/dp_23"
+                android:paddingTop="@dimen/dp_5"
+                android:paddingEnd="@dimen/dp_23"
+                android:paddingBottom="@dimen/dp_5"
+                android:text="求助信息"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/dp_24"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_chainStyle="packed" />
 
-    <TextView
-        android:id="@+id/tvFaultHelpEventTime"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:alpha="0.59"
-        android:textColor="@android:color/white"
-        android:textSize="@dimen/dp_26"
-        app:layout_constraintStart_toStartOf="@id/tvFaultHelpName"
-        app:layout_constraintTop_toBottomOf="@id/tvFaultHelpName"
-        tools:text="15:30发布求助信息" />
+            <com.mogo.service.imageloader.MogoImageView
+                android:id="@+id/ivFaultHelpHead"
+                android:layout_width="@dimen/dp_75"
+                android:layout_height="@dimen/dp_75"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentBottom="true"
+                android:layout_marginTop="@dimen/dp_21"
+                android:layout_marginEnd="@dimen/dp_31"
+                app:layout_constraintEnd_toEndOf="@+id/rlRoadEventList"
+                app:layout_constraintStart_toStartOf="@+id/tvImgTextContent"
+                app:layout_constraintTop_toBottomOf="@+id/tvImgTextContent"
+                app:miv_borderColor="#4cffffff"
+                app:miv_failureHolder="@drawable/icon_default_user_head"
+                app:miv_overlayImageId="@drawable/icon_default_user_head"
+                app:miv_placeHolder="@drawable/icon_default_user_head"
+                app:miv_shape="circle"
+                app:miv_shapeBorderWidth="@dimen/dp_4" />
 
-    <TextView
-        android:id="@+id/tvFaultHelpDistance"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/dp_30"
-        android:gravity="center_vertical"
-        android:textColor="#FFF"
-        android:textSize="@dimen/dp_80"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="@+id/ivFaultHelpEventCall"
-        app:layout_constraintEnd_toStartOf="@+id/ivFaultHelpEventCall"
-        app:layout_constraintTop_toTopOf="@+id/ivFaultHelpEventCall"
-        tools:text="300M" />
+            <TextView
+                android:id="@+id/tvFaultHelpName"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_10"
+                android:textColor="@color/v2x_FFF_333_white"
+                android:textSize="@dimen/dp_28"
+                android:textStyle="bold"
+                app:layout_constraintStart_toEndOf="@id/ivFaultHelpHead"
+                app:layout_constraintTop_toTopOf="@+id/ivFaultHelpHead"
+                app:layout_constraintVertical_chainStyle="packed"
+                app:layout_goneMarginStart="@dimen/dp_22"
+                tools:text="车主昵称" />
 
-    <ImageView
-        android:id="@+id/ivFaultHelpEventCall"
-        android:layout_width="@dimen/module_v2x_event_button_size"
-        android:layout_height="@dimen/module_v2x_event_button_size"
-        android:layout_marginEnd="@dimen/dp_40"
-        android:src="@drawable/selector_talk_btn"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/ivFaultHelpEventNavi"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible" />
+            <TextView
+                android:id="@+id/tvFaultHelpEventTime"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:alpha="0.59"
+                android:textColor="@color/v2x_FFF_999_white"
+                android:textSize="@dimen/dp_26"
+                app:layout_constraintStart_toStartOf="@id/tvFaultHelpName"
+                app:layout_constraintTop_toBottomOf="@id/tvFaultHelpName"
+                tools:text="15:30发布求助信息" />
 
-    <ImageView
-        android:id="@+id/ivFaultHelpEventNavi"
-        android:layout_width="@dimen/module_v2x_event_button_size"
-        android:layout_height="@dimen/module_v2x_event_button_size"
-        android:src="@drawable/selector_nav_btn"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-</com.mogo.module.v2x.view.RoundConstraintLayout>
+            <TextView
+                android:id="@+id/tvFaultHelpDistance"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/dp_30"
+                android:gravity="center_vertical"
+                android:textColor="@color/v2x_FFF_333_white"
+                android:textSize="@dimen/dp_80"
+                android:textStyle="bold"
+                app:layout_constraintBottom_toBottomOf="@+id/ivFaultHelpEventCall"
+                app:layout_constraintEnd_toStartOf="@+id/ivFaultHelpEventCall"
+                app:layout_constraintTop_toTopOf="@+id/ivFaultHelpEventCall"
+                tools:text="300M" />
+
+            <ImageView
+                android:id="@+id/ivFaultHelpEventCall"
+                android:layout_width="@dimen/module_v2x_event_button_size"
+                android:layout_height="@dimen/module_v2x_event_button_size"
+                android:layout_marginEnd="@dimen/dp_40"
+                android:src="@drawable/selector_talk_btn"
+                android:visibility="gone"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/ivFaultHelpEventNavi"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:visibility="visible" />
+
+            <ImageView
+                android:id="@+id/ivFaultHelpEventNavi"
+                android:layout_width="@dimen/module_v2x_event_button_size"
+                android:layout_height="@dimen/module_v2x_event_button_size"
+                android:layout_marginRight="26px"
+                android:src="@drawable/selector_nav_btn"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.cardview.widget.CardView>
+</androidx.constraintlayout.widget.ConstraintLayout>

modules/mogo-module-v2x/src/main/res/layout/item_v2x_road_live_car_detail.xml

@@ -6,45 +6,52 @@
     android:layout_width="match_parent"
     android:layout_height="@dimen/module_v2x_event_window_height">
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rvRoadEventList"
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:overScrollMode="never"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:listitem="@layout/item_v2x_live_video" />
+        android:layout_height="match_parent"
+        app:cardBackgroundColor="#FFFFFF"
+        app:cardCornerRadius="12px"
+        app:layout_constraintTop_toTopOf="parent">
 
-    <TextView
-        android:id="@+id/tvEventStubClose"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/dp_25"
-        android:layout_marginTop="@dimen/dp_20"
-        android:background="@drawable/bg_count_down"
-        android:paddingLeft="@dimen/dp_12"
-        android:paddingTop="@dimen/dp_3"
-        android:paddingRight="@dimen/dp_12"
-        android:paddingBottom="@dimen/dp_3"
-        android:text="30s"
-        android:textColor="#FFFFFF"
-        android:textSize="@dimen/dp_30"
-        app:layout_constraintStart_toStartOf="@+id/rvRoadEventList"
-        app:layout_constraintTop_toTopOf="@+id/rvRoadEventList" />
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rvRoadEventList"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:overScrollMode="never"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:listitem="@layout/item_v2x_live_video" />
 
-    <ImageView
-        android:layout_width="@dimen/dp_130"
-        android:layout_height="@dimen/dp_46"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="@dimen/dp_28"
-        android:layout_marginEnd="@dimen/dp_28"
-        android:src="@drawable/v2x_icon_event_live_top"
-        app:layout_constraintEnd_toEndOf="@+id/rvRoadEventList"
-        app:layout_constraintTop_toTopOf="@+id/rvRoadEventList" />
+        <TextView
+            android:id="@+id/tvEventStubClose"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_25"
+            android:layout_marginTop="@dimen/dp_20"
+            android:background="@drawable/bg_count_down"
+            android:paddingLeft="@dimen/dp_12"
+            android:paddingTop="@dimen/dp_3"
+            android:paddingRight="@dimen/dp_12"
+            android:paddingBottom="@dimen/dp_3"
+            android:text="30s"
+            android:textColor="#FFFFFF"
+            android:textSize="@dimen/dp_30"
+            app:layout_constraintStart_toStartOf="@+id/rvRoadEventList"
+            app:layout_constraintTop_toTopOf="@+id/rvRoadEventList" />
 
+        <ImageView
+            android:layout_width="@dimen/dp_130"
+            android:layout_height="@dimen/dp_46"
+            android:layout_alignParentEnd="true"
+            android:layout_marginTop="@dimen/dp_28"
+            android:layout_marginEnd="@dimen/dp_28"
+            android:src="@drawable/v2x_icon_event_live_top"
+            app:layout_constraintEnd_toEndOf="@+id/rvRoadEventList"
+            app:layout_constraintTop_toTopOf="@+id/rvRoadEventList" />
+    </androidx.cardview.widget.CardView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml

@@ -1,105 +1,123 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.mogo.module.v2x.view.RoundConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/rlContent"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="#1F2131"
-    android:paddingStart="@dimen/dp_40"
-    android:paddingEnd="@dimen/dp_40"
-    app:roundLayoutRadius="@dimen/dp_30">
+    android:layout_marginLeft="10px"
+    android:layout_marginRight="10px"
+    android:layout_marginBottom="14px">
 
-    <TextView
-        android:id="@+id/tagEventType"
-        android:layout_width="wrap_content"
+    <androidx.cardview.widget.CardView
+        android:id="@+id/road_case_history_card_view"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/dp_20"
-        android:layout_marginTop="@dimen/dp_24"
-        android:background="@drawable/bg_v2x_event_type_read"
-        android:gravity="center"
-        android:paddingLeft="@dimen/dp_10"
-        android:paddingTop="@dimen/dp_3"
-        android:paddingRight="@dimen/dp_10"
-        android:paddingBottom="@dimen/dp_3"
-        android:text="违章停车"
-        android:textColor="#ffffff"
-        android:textSize="@dimen/dp_28"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:cardBackgroundColor="@color/share_event_item_bg_color"
+        app:cardCornerRadius="12px"
+        app:layout_constraintTop_toTopOf="parent">
 
-    <TextView
-        android:id="@+id/tagEventEvaluate"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_24"
-        android:background="@drawable/bg_v2x_event_type_gray"
-        android:gravity="center"
-        android:paddingLeft="@dimen/dp_10"
-        android:paddingTop="@dimen/dp_3"
-        android:paddingRight="@dimen/dp_10"
-        android:paddingBottom="@dimen/dp_3"
-        android:text="待评价"
-        android:textColor="#ffffff"
-        android:textSize="@dimen/dp_28"
-        app:layout_constraintBottom_toBottomOf="@+id/tagEventType"
-        app:layout_constraintStart_toEndOf="@+id/tagEventType"
-        app:layout_constraintTop_toTopOf="@+id/tagEventType" />
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-    <ImageView
-        android:id="@+id/ivIconP"
-        android:layout_width="@dimen/module_v2x_history_event_icon_size"
-        android:layout_height="@dimen/module_v2x_history_event_icon_size"
-        android:layout_marginEnd="@dimen/dp_16"
-        android:src="@drawable/icon_illegal_parking"
-        app:layout_constraintTop_toBottomOf="@+id/tagEventType"
-        app:layout_constraintTop_toTopOf="@+id/tvAddress" />
+            <TextView
+                android:id="@+id/tagEventType"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_24"
+                android:layout_marginTop="@dimen/dp_24"
+                android:background="@drawable/bg_v2x_event_type_read"
+                android:gravity="center"
+                android:paddingLeft="@dimen/dp_10"
+                android:paddingTop="@dimen/dp_3"
+                android:paddingRight="@dimen/dp_10"
+                android:paddingBottom="@dimen/dp_3"
+                android:text="违章停车"
+                android:textColor="#ffffff"
+                android:textSize="@dimen/dp_28"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:id="@+id/tvAddress"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_24"
-        android:layout_marginRight="@dimen/dp_30"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:textColor="#FFFFFF"
-        android:textSize="@dimen/dp_34"
-        app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingLike"
-        app:layout_constraintStart_toEndOf="@+id/ivIconP"
-        app:layout_constraintTop_toBottomOf="@+id/tagEventType"
-        tools:text="小黄庄北街与北三环辅路交叉口小黄庄北街与北三环辅路交叉口" />
+            <TextView
+                android:id="@+id/tagEventEvaluate"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_24"
+                android:background="@drawable/bg_v2x_event_type_gray"
+                android:gravity="center"
+                android:paddingLeft="@dimen/dp_10"
+                android:paddingTop="@dimen/dp_3"
+                android:paddingRight="@dimen/dp_10"
+                android:paddingBottom="@dimen/dp_3"
+                android:text="待评价"
+                android:textColor="#ffffff"
+                android:textSize="@dimen/dp_28"
+                app:layout_constraintBottom_toBottomOf="@+id/tagEventType"
+                app:layout_constraintStart_toEndOf="@+id/tagEventType"
+                app:layout_constraintTop_toTopOf="@+id/tagEventType" />
 
-    <TextView
-        android:id="@+id/tvIllegalNum"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_10"
-        android:layout_marginBottom="@dimen/dp_24"
-        android:alpha="0.6"
-        android:gravity="center_vertical"
-        android:textColor="#FFFFFF"
-        android:textSize="@dimen/dp_30"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="@+id/tvAddress"
-        app:layout_constraintStart_toStartOf="@+id/tvAddress"
-        app:layout_constraintTop_toBottomOf="@+id/tvAddress"
-        tools:text="违章人数：10人" />
+            <ImageView
+                android:id="@+id/ivIconP"
+                android:layout_width="@dimen/module_v2x_history_event_icon_size"
+                android:layout_height="@dimen/module_v2x_history_event_icon_size"
+                android:layout_marginStart="@dimen/dp_24"
+                android:layout_marginEnd="@dimen/dp_16"
+                android:src="@drawable/icon_illegal_parking"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tagEventType"
+                app:layout_constraintTop_toTopOf="@+id/tvAddress" />
 
-    <com.mogo.module.v2x.view.HeartLikeView
-        android:id="@+id/llIllegalParkingLike"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/dp_40"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingUnLike"
-        app:layout_constraintTop_toTopOf="parent" />
+            <TextView
+                android:id="@+id/tvAddress"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_24"
+                android:layout_marginTop="@dimen/dp_24"
+                android:layout_marginRight="@dimen/dp_30"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textColor="#FFFFFF"
+                android:textSize="@dimen/dp_34"
+                app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingLike"
+                app:layout_constraintStart_toEndOf="@+id/ivIconP"
+                app:layout_constraintTop_toBottomOf="@+id/tagEventType"
+                tools:text="小黄庄北街与北三环辅路交叉口小黄庄北街与北三环辅路交叉口" />
 
-    <com.mogo.module.v2x.view.HeartUnLikeView
-        android:id="@+id/llIllegalParkingUnLike"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+            <TextView
+                android:id="@+id/tvIllegalNum"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_10"
+                android:layout_marginBottom="@dimen/dp_24"
+                android:alpha="0.6"
+                android:gravity="center_vertical"
+                android:textColor="#FFFFFF"
+                android:textSize="@dimen/dp_30"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="@+id/tvAddress"
+                app:layout_constraintStart_toStartOf="@+id/tvAddress"
+                app:layout_constraintTop_toBottomOf="@+id/tvAddress"
+                tools:text="违章人数：10人" />
 
-</com.mogo.module.v2x.view.RoundConstraintLayout>
+            <com.mogo.module.v2x.view.HeartLikeView
+                android:id="@+id/llIllegalParkingLike"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/dp_40"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingUnLike"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <com.mogo.module.v2x.view.HeartUnLikeView
+                android:id="@+id/llIllegalParkingUnLike"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                android:layout_marginRight="26px"/>
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.cardview.widget.CardView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml

@@ -1,132 +1,147 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.mogo.module.v2x.view.RoundConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="#1F2131"
-    android:paddingStart="@dimen/dp_40"
-    android:paddingEnd="@dimen/dp_40"
-    app:roundLayoutRadius="@dimen/dp_40">
+    android:layout_marginLeft="10px"
+    android:layout_marginRight="10px"
+    android:layout_marginBottom="14px">
 
-    <TextView
-        android:id="@+id/tagEventType"
-        android:layout_width="wrap_content"
+    <androidx.cardview.widget.CardView
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/dp_20"
-        android:layout_marginTop="@dimen/dp_24"
-        android:background="@drawable/bg_v2x_event_type_orange"
-        android:gravity="center"
-        android:paddingLeft="@dimen/dp_10"
-        android:paddingTop="@dimen/dp_3"
-        android:paddingRight="@dimen/dp_10"
-        android:paddingBottom="@dimen/dp_3"
-        android:text="求助信息"
-        android:textColor="#ffffff"
-        android:textSize="@dimen/dp_28"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:cardBackgroundColor="@color/share_event_item_bg_color"
+        app:cardCornerRadius="12px"
+        app:layout_constraintTop_toTopOf="parent">
 
-    <TextView
-        android:id="@+id/tagEventEvaluate"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_24"
-        android:background="@drawable/bg_v2x_event_type_gray"
-        android:gravity="center"
-        android:paddingLeft="@dimen/dp_10"
-        android:paddingTop="@dimen/dp_3"
-        android:paddingRight="@dimen/dp_10"
-        android:paddingBottom="@dimen/dp_3"
-        android:text="待援助"
-        android:textColor="#ffffff"
-        android:textSize="@dimen/dp_28"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@+id/tagEventType"
-        app:layout_constraintStart_toEndOf="@+id/tagEventType"
-        app:layout_constraintTop_toTopOf="@+id/tagEventType"
-        tools:visibility="visible" />
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-    <com.mogo.service.imageloader.MogoImageView
-        android:id="@+id/ivFaultHelpHead"
-        android:layout_width="@dimen/module_v2x_history_event_icon_size"
-        android:layout_height="@dimen/module_v2x_history_event_icon_size"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginTop="@dimen/dp_21"
-        android:layout_marginEnd="@dimen/dp_31"
-        app:layout_constraintBottom_toBottomOf="@+id/tvFaultHelpEventTime"
-        app:layout_constraintEnd_toEndOf="@+id/rlRoadEventList"
-        app:layout_constraintStart_toStartOf="@+id/tagEventType"
-        app:layout_constraintTop_toBottomOf="@+id/tagEventType"
-        app:miv_borderColor="#4cffffff"
-        app:miv_failureHolder="@drawable/icon_default_user_head"
-        app:miv_overlayImageId="@drawable/icon_default_user_head"
-        app:miv_placeHolder="@drawable/icon_default_user_head"
-        app:miv_shape="circle"
-        app:miv_shapeBorderWidth="@dimen/dp_4" />
+            <TextView
+                android:id="@+id/tagEventType"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_20"
+                android:layout_marginTop="@dimen/dp_24"
+                android:background="@drawable/bg_v2x_event_type_orange"
+                android:gravity="center"
+                android:paddingLeft="@dimen/dp_10"
+                android:paddingTop="@dimen/dp_3"
+                android:paddingRight="@dimen/dp_10"
+                android:paddingBottom="@dimen/dp_3"
+                android:text="求助信息"
+                android:textColor="#ffffff"
+                android:textSize="@dimen/dp_28"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:id="@+id/tvFaultHelpName"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_10"
-        android:layout_marginEnd="@dimen/dp_30"
-        android:textColor="@android:color/white"
-        android:textSize="@dimen/dp_33"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toStartOf="@+id/tvFaultHelpDistance"
-        app:layout_constraintStart_toEndOf="@id/ivFaultHelpHead"
-        app:layout_constraintTop_toTopOf="@+id/ivFaultHelpHead"
-        app:layout_constraintVertical_chainStyle="packed"
-        app:layout_goneMarginStart="@dimen/dp_22"
-        tools:text="车主昵称" />
+            <TextView
+                android:id="@+id/tagEventEvaluate"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_24"
+                android:background="@drawable/bg_v2x_event_type_gray"
+                android:gravity="center"
+                android:paddingLeft="@dimen/dp_10"
+                android:paddingTop="@dimen/dp_3"
+                android:paddingRight="@dimen/dp_10"
+                android:paddingBottom="@dimen/dp_3"
+                android:text="待援助"
+                android:textColor="#ffffff"
+                android:textSize="@dimen/dp_28"
+                android:visibility="gone"
+                app:layout_constraintBottom_toBottomOf="@+id/tagEventType"
+                app:layout_constraintStart_toEndOf="@+id/tagEventType"
+                app:layout_constraintTop_toTopOf="@+id/tagEventType"
+                tools:visibility="visible" />
 
-    <TextView
-        android:id="@+id/tvFaultHelpEventTime"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_5"
-        android:layout_marginEnd="@dimen/dp_30"
-        android:layout_marginBottom="@dimen/dp_24"
-        android:alpha="0.59"
-        android:textColor="@android:color/white"
-        android:textSize="@dimen/dp_29"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/tvFaultHelpDistance"
-        app:layout_constraintStart_toStartOf="@id/tvFaultHelpName"
-        app:layout_constraintTop_toBottomOf="@id/tvFaultHelpName"
-        tools:text="15:30发布求助信息" />
+            <com.mogo.service.imageloader.MogoImageView
+                android:id="@+id/ivFaultHelpHead"
+                android:layout_width="@dimen/module_v2x_history_event_icon_size"
+                android:layout_height="@dimen/module_v2x_history_event_icon_size"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentBottom="true"
+                android:layout_marginTop="@dimen/dp_21"
+                android:layout_marginEnd="@dimen/dp_31"
+                app:layout_constraintBottom_toBottomOf="@+id/tvFaultHelpEventTime"
+                app:layout_constraintEnd_toEndOf="@+id/rlRoadEventList"
+                app:layout_constraintStart_toStartOf="@+id/tagEventType"
+                app:layout_constraintTop_toBottomOf="@+id/tagEventType"
+                app:miv_borderColor="#4cffffff"
+                app:miv_failureHolder="@drawable/icon_default_user_head"
+                app:miv_overlayImageId="@drawable/icon_default_user_head"
+                app:miv_placeHolder="@drawable/icon_default_user_head"
+                app:miv_shape="circle"
+                app:miv_shapeBorderWidth="@dimen/dp_4" />
 
-    <TextView
-        android:id="@+id/tvFaultHelpDistance"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/dp_30"
-        android:gravity="center_vertical"
-        android:textColor="#FFF"
-        android:textSize="@dimen/dp_80"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="@+id/tvFaultHelpEventTime"
-        app:layout_constraintEnd_toStartOf="@+id/ivFaultHelpEventCall"
-        app:layout_constraintStart_toEndOf="@+id/tvFaultHelpEventTime"
-        tools:text="300M" />
+            <TextView
+                android:id="@+id/tvFaultHelpName"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_10"
+                android:layout_marginEnd="@dimen/dp_30"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/dp_33"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toStartOf="@+id/tvFaultHelpDistance"
+                app:layout_constraintStart_toEndOf="@id/ivFaultHelpHead"
+                app:layout_constraintTop_toTopOf="@+id/ivFaultHelpHead"
+                app:layout_constraintVertical_chainStyle="packed"
+                app:layout_goneMarginStart="@dimen/dp_22"
+                tools:text="车主昵称" />
 
-    <ImageView
-        android:id="@+id/ivFaultHelpEventCall"
-        android:layout_width="@dimen/module_v2x_event_button_size"
-        android:layout_height="@dimen/module_v2x_event_button_size"
-        android:layout_marginEnd="@dimen/dp_40"
-        android:src="@drawable/selector_talk_btn"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/ivFaultHelpEventNavi"
-        app:layout_constraintTop_toTopOf="parent" />
+            <TextView
+                android:id="@+id/tvFaultHelpEventTime"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_5"
+                android:layout_marginEnd="@dimen/dp_30"
+                android:layout_marginBottom="@dimen/dp_24"
+                android:alpha="0.59"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/dp_29"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/tvFaultHelpDistance"
+                app:layout_constraintStart_toStartOf="@id/tvFaultHelpName"
+                app:layout_constraintTop_toBottomOf="@id/tvFaultHelpName"
+                tools:text="15:30发布求助信息" />
 
-    <ImageView
-        android:id="@+id/ivFaultHelpEventNavi"
-        android:layout_width="@dimen/module_v2x_event_button_size"
-        android:layout_height="@dimen/module_v2x_event_button_size"
-        android:src="@drawable/selector_nav_btn"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-</com.mogo.module.v2x.view.RoundConstraintLayout>
+            <TextView
+                android:id="@+id/tvFaultHelpDistance"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/dp_30"
+                android:gravity="center_vertical"
+                android:textColor="#FFF"
+                android:textSize="@dimen/dp_80"
+                android:textStyle="bold"
+                app:layout_constraintBottom_toBottomOf="@+id/tvFaultHelpEventTime"
+                app:layout_constraintEnd_toStartOf="@+id/ivFaultHelpEventCall"
+                app:layout_constraintStart_toEndOf="@+id/tvFaultHelpEventTime"
+                tools:text="300M" />
+
+            <ImageView
+                android:id="@+id/ivFaultHelpEventCall"
+                android:layout_width="@dimen/module_v2x_event_button_size"
+                android:layout_height="@dimen/module_v2x_event_button_size"
+                android:layout_marginEnd="@dimen/dp_40"
+                android:src="@drawable/selector_talk_btn"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/ivFaultHelpEventNavi"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <ImageView
+                android:id="@+id/ivFaultHelpEventNavi"
+                android:layout_width="@dimen/module_v2x_event_button_size"
+                android:layout_height="@dimen/module_v2x_event_button_size"
+                android:src="@drawable/selector_nav_btn"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                android:layout_marginRight="26px"/>
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.cardview.widget.CardView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml

@@ -4,8 +4,8 @@
     android:id="@+id/clPanelContainer"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/bg_v2x_event_surrounding_item">
-
+>
+<!--    android:background="@drawable/bg_v2x_event_surrounding_item"-->
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -23,7 +23,7 @@
                 android:gravity="top"
                 android:layout_marginLeft="@dimen/module_v2x_surrounding_margin_left"
                 android:text="周围5公里，共15条交通信息"
-                android:textColor="@color/white"
+                android:textColor="@color/v2x_white"
                 android:textSize="@dimen/module_v2x_surrounding_top_textsize" />
 
             <TextView
@@ -36,7 +36,7 @@
                 android:background="@drawable/bg_v2x_refresh"
                 android:gravity="center"
                 android:text="@string/v2x_surrounding_refresh"
-                android:textColor="@color/white"
+                android:textColor="@color/v2x_item_white"
                 android:textSize="@dimen/module_v2x_surrounding_top_textsize"
                 android:textStyle="bold" />
         </RelativeLayout>
@@ -111,7 +111,7 @@
                     android:background="@drawable/bg_v2x_go_to_share"
                     android:gravity="center"
                     android:text="@string/v2x_surrounding_go_to_share"
-                    android:textColor="@color/white"
+                    android:textColor="@color/v2x_white"
                     android:textSize="@dimen/module_v2x_surrounding_top_textsize"
                     android:textStyle="bold" />
 
@@ -126,7 +126,7 @@
                     android:background="@drawable/bg_v2x_refresh"
                     android:gravity="center"
                     android:text="@string/v2x_surrounding_refresh"
-                    android:textColor="@color/white"
+                    android:textColor="@color/v2x_white_refresh"
                     android:textSize="@dimen/module_v2x_surrounding_top_textsize"
                     android:textStyle="bold" />
             </RelativeLayout>

modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml

@@ -34,7 +34,7 @@
             android:layout_toRightOf="@+id/iv_event_type"
             android:layout_marginLeft="@dimen/module_v2x_surrounding_item_marigin_bottom_left"
             android:textSize="@dimen/module_v2x_surrounding_item_bottom_left_textsize"
-            android:textColor="@color/white"
+            android:textColor="@color/v2x_item_white"
             android:text="求助" />
 
         <TextView

modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml

@@ -1,100 +1,109 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.mogo.module.v2x.view.RoundConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/clPanelContainer"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#10121E"
     android:clickable="true"
-    android:paddingStart="@dimen/dp_30"
-    android:paddingEnd="@dimen/dp_30"
     android:visibility="gone"
-    app:roundLayoutRadius="@dimen/dp_40"
     tools:visibility="visible">
 
-    <RadioGroup
-        android:id="@+id/rgTabSelect"
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_154"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
+        android:layout_height="match_parent"
+        app:cardBackgroundColor="@color/panel_shadow_shape_color"
+        app:cardCornerRadius="16px">
 
-        <RadioButton
-            android:id="@+id/rbScenarioHistory"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:button="@null"
-            android:checked="true"
-            android:gravity="center"
-            android:paddingStart="@dimen/dp_40"
-            android:paddingEnd="@dimen/dp_40"
-            android:text="出行动态"
-            android:textColor="@color/radiobutton_textcolor"
-            android:textSize="@dimen/dp_40"
-            android:textStyle="bold" />
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
 
-        <View
-            android:layout_width="2dp"
-            android:layout_height="@dimen/dp_42"
-            android:background="#757575" />
+            <RadioGroup
+                android:id="@+id/rgTabSelect"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_154"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
 
-        <RadioButton
-            android:id="@+id/rbSurroundingEvent"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:button="@null"
-            android:gravity="center"
-            android:paddingStart="@dimen/dp_40"
-            android:paddingEnd="@dimen/dp_40"
-            android:text="周边事件"
-            android:textColor="@color/radiobutton_textcolor"
-            android:textSize="@dimen/dp_40"
-            android:textStyle="bold" />
+                <RadioButton
+                    android:id="@+id/rbScenarioHistory"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:button="@null"
+                    android:checked="true"
+                    android:gravity="center"
+                    android:paddingStart="@dimen/dp_40"
+                    android:paddingEnd="@dimen/dp_40"
+                    android:text="出行动态"
+                    android:textColor="@color/radiobutton_textcolor"
+                    android:textSize="@dimen/dp_40"
+                    android:textStyle="bold" />
 
-        <View
-            android:layout_width="2dp"
-            android:layout_height="@dimen/dp_42"
-            android:background="#757575" />
+                <View
+                    android:layout_width="0.5px"
+                    android:layout_height="@dimen/dp_42"
+                    android:background="#757575" />
 
-        <RadioButton
-            android:id="@+id/rbShareEvents"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:button="@null"
-            android:gravity="center"
-            android:paddingStart="@dimen/dp_40"
-            android:paddingEnd="@dimen/dp_40"
-            android:text="我的分享"
-            android:textColor="@color/radiobutton_textcolor"
-            android:textSize="@dimen/dp_40"
-            android:textStyle="bold" />
-    </RadioGroup>
+                <RadioButton
+                    android:id="@+id/rbSurroundingEvent"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:button="@null"
+                    android:gravity="center"
+                    android:paddingStart="@dimen/dp_40"
+                    android:paddingEnd="@dimen/dp_40"
+                    android:text="周边事件"
+                    android:textColor="@color/radiobutton_textcolor"
+                    android:textSize="@dimen/dp_40"
+                    android:textStyle="bold" />
 
-    <androidx.viewpager2.widget.ViewPager2
-        android:id="@+id/vpEventPanel"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:nestedScrollingEnabled="false"
-        android:overScrollMode="never"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/rgTabSelect" />
+                <View
+                    android:layout_width="0.5px"
+                    android:layout_height="@dimen/dp_42"
+                    android:background="#757575" />
 
-    <ImageView
-        android:id="@+id/btnHidePanels"
-        android:layout_width="@dimen/dp_88"
-        android:layout_height="@dimen/dp_88"
-        android:background="@drawable/icon_window_close"
-        app:layout_constraintBottom_toBottomOf="@+id/rgTabSelect"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/rgTabSelect" />
+                <RadioButton
+                    android:id="@+id/rbShareEvents"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:button="@null"
+                    android:gravity="center"
+                    android:paddingStart="@dimen/dp_40"
+                    android:paddingEnd="@dimen/dp_40"
+                    android:text="我的分享"
+                    android:textColor="@color/radiobutton_textcolor"
+                    android:textSize="@dimen/dp_40"
+                    android:textStyle="bold" />
+            </RadioGroup>
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="60px"
-        android:background="@drawable/v2x_shadow_shape_view"
-        app:layout_constraintBottom_toBottomOf="parent" />
+            <androidx.viewpager2.widget.ViewPager2
+                android:id="@+id/vpEventPanel"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:nestedScrollingEnabled="false"
+                android:overScrollMode="never"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/rgTabSelect" />
 
-</com.mogo.module.v2x.view.RoundConstraintLayout>
+            <ImageView
+                android:id="@+id/btnHidePanels"
+                android:layout_width="@dimen/dp_88"
+                android:layout_height="@dimen/dp_88"
+                android:layout_marginRight="28px"
+                android:background="@drawable/icon_window_close"
+                app:layout_constraintBottom_toBottomOf="@+id/rgTabSelect"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/rgTabSelect" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="58px"
+                android:background="@drawable/v2x_shadow_shape_view"
+                app:layout_constraintBottom_toBottomOf="parent" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.cardview.widget.CardView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>