Merge remote-tracking branch 'origin/dev_MogoAP_eagle-1030_211020_8.0.14' into dev_MogoAP_eagle-1030_211020_8.0.14

.idea/gradle.xml

@@ -4,10 +4,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
+        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="corretto-1.8" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -83,6 +82,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/misc.xml

@@ -76,7 +76,7 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="16" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java

@@ -19,7 +19,7 @@ import com.mogo.eagle.core.data.notice.NoticeValue;
 import com.mogo.eagle.core.function.api.notice.NoticeNetCallBack;
 import com.mogo.eagle.core.function.call.notice.CallerNoticeManager;
 import com.mogo.eagle.core.function.hmi.R;
-import com.mogo.eagle.core.widget.media.video.NoticeSmallVideoPlayer;
+import com.mogo.eagle.core.widget.media.video.NoticeSimpleSmallVideoPlayer;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.dialog.BaseFloatDialog;
 import com.mogo.service.imageloader.MogoImageView;
@@ -42,7 +42,7 @@ public class NoticeTrafficDialog extends BaseFloatDialog {
     private String TAG = "AINotice";
     private Context mContext;
     private RecyclerView mRecyclerView;
-    private NoticeSmallVideoPlayer mVideoPlayer;
+    private NoticeSimpleSmallVideoPlayer mVideoPlayer;
     private NoticeTrafficStylePushData mPushData;
     private ImageView close;
     private ImageView playImageView;

core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_traffic_police.xml

@@ -31,7 +31,7 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
     <!--图/视频-->
-    <com.mogo.eagle.core.widget.media.video.NoticeSmallVideoPlayer
+    <com.mogo.eagle.core.widget.media.video.NoticeSimpleSmallVideoPlayer
         android:id="@+id/video_player"
         android:layout_width="0dp"
         android:layout_height="@dimen/notice_traffic_acc_image_height"

core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/NoticeSimpleSmallVideoPlayer.kt

@@ -22,7 +22,7 @@ import com.shuyu.gsyvideoplayer.video.base.GSYVideoViewBridge
  *
  * 视频播放器，ui定制
  */
-class NoticeSmallVideoPlayer : StandardGSYVideoPlayer {
+class NoticeSimpleSmallVideoPlayer : StandardGSYVideoPlayer {
 
     companion object {
         const val PLAY_EVT_PLAY_LOADING = 1000
@@ -61,7 +61,7 @@ class NoticeSmallVideoPlayer : StandardGSYVideoPlayer {
     }
 
     override fun getLayoutId(): Int {
-        return R.layout.item_small_notice_video
+        return R.layout.item_notice_video_small
     }
 
     override fun getGSYVideoManager(): GSYVideoViewBridge {