wait

OCH/mogo-och-common-module/build.gradle

@@ -64,6 +64,7 @@ dependencies {
         implementation rootProject.ext.dependencies.mogo_core_data
         implementation rootProject.ext.dependencies.mogo_core_function_call
         implementation rootProject.ext.dependencies.mogo_core_function_v2x
+        implementation rootProject.ext.dependencies.mogo_core_function_hmi
     }else {
         implementation project(":core:mogo-core-utils")
         implementation project(":foudations:mogo-commons")
@@ -71,6 +72,7 @@ dependencies {
         implementation project(':core:mogo-core-data')
         implementation project(':core:mogo-core-function-call')
         implementation project(':core:function-impl:mogo-core-function-v2x')
+        implementation project(':core:function-impl:mogo-core-function-hmi')
     }
 
     implementation project(':libraries:mogo-adas')

OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/OCHCommitDialog.kt

@@ -9,7 +9,7 @@ import com.mogo.och.common.module.R
 /**
  * 带有title, tip,confirm,cancel的dialog
  */
-class OCHCommitDialog: com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog, LifecycleObserver {
+class OCHCommitDialog: BaseFloatDialog, LifecycleObserver {
 
     private var commonConfirm : TextView? = null
     private var commonCancel : TextView? = null

core/function-impl/mogo-core-function-autopilot/build.gradle

@@ -66,7 +66,6 @@ dependencies {
         implementation project(':libraries:mogo-adas')
     } else {
         implementation project(':modules:mogo-module-common')
-        implementation project(':modules:mogo-module-service')
 
         implementation project(':core:mogo-core-data')
         implementation project(':core:mogo-core-utils')

core/function-impl/mogo-core-function-chat/build.gradle

@@ -70,7 +70,6 @@ dependencies {
         implementation rootProject.ext.dependencies.mogo_core_res
     } else {
         implementation project(':modules:mogo-module-common')
-        implementation project(':modules:mogo-module-service')
         implementation project(':core:mogo-core-data')
         implementation project(':core:mogo-core-utils')
         implementation project(':core:mogo-core-function-api')

core/function-impl/mogo-core-function-check/build.gradle

@@ -70,7 +70,6 @@ dependencies {
         implementation project(':services:mogo-service-api')
 
         implementation project(':modules:mogo-module-common')
-        implementation project(':modules:mogo-module-service')
         //implementation project(':modules:mogo-module-carchattingprovider')
 
         implementation project(':core:mogo-core-data')

core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckDialog.java

@@ -1,7 +1,10 @@
 package com.mogo.eagle.core.function.check.view;
 
+import android.app.Dialog;
 import android.content.Context;
+import android.os.Build;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -9,7 +12,6 @@ import androidx.annotation.NonNull;
 
 import com.mogo.eagle.core.function.call.check.CallerCheckManager;
 import com.mogo.eagle.core.function.check.R;
-import com.mogo.module.common.dialog.BaseFloatDialog;
 
 /**
  * @author liujing
@@ -17,13 +19,21 @@ import com.mogo.module.common.dialog.BaseFloatDialog;
  * 第一版本为添加长时间未检测的提示框,因为逻辑冲突,二期需求与产品确认,UI公用
  * @since: 7/30/21
  */
-public class CheckDialog extends BaseFloatDialog {
+public class CheckDialog extends Dialog {
 
     private boolean showWarning;
     private Context mContext;
 
     public CheckDialog(@NonNull Context context, boolean hasError) {
-        super(context);
+        super(context,R.style.CheckInfoDialogStyle);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            getWindow().setType(WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY);
+        } else {
+            getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
+        }
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN
+                | WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION
+                | WindowManager.LayoutParams.FLAG_LOCAL_FOCUS_MODE);
         mContext = context;
         showWarning = hasError;
         initView();

core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckInfoListDialog.java

@@ -1,6 +1,9 @@
 package com.mogo.eagle.core.function.check.view;
 
+import android.app.Dialog;
 import android.content.Context;
+import android.os.Build;
+import android.view.WindowManager;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -9,7 +12,6 @@ import androidx.recyclerview.widget.GridLayoutManager;
 import com.mogo.eagle.core.function.check.R;
 import com.mogo.eagle.core.function.check.model.CheckItemInfo;
 import com.mogo.eagle.core.function.check.net.CheckResultData;
-import com.mogo.module.common.dialog.BaseFloatDialog;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -19,7 +21,7 @@ import java.util.List;
  * @description 检测指标详情弹框
  * @since: 9/22/21
  */
-public class CheckInfoListDialog extends BaseFloatDialog {
+public class CheckInfoListDialog extends Dialog {
 
     private static final String TAG = "CheckInfoListDialog";
     private CheckInfoRecyclerView mRecyclerView;
@@ -28,10 +30,18 @@ public class CheckInfoListDialog extends BaseFloatDialog {
     private int span;
     private String mStyle;
     private CheckResultData mCheckResultData;
-    private List<CheckResultData.CheckListItem> result = new ArrayList<>();
+    private final List<CheckResultData.CheckListItem> result = new ArrayList<>();
 
     public CheckInfoListDialog(@NonNull Context context, String style, CheckResultData checkResultData) {
-        super(context);
+        super(context,R.style.CheckInfoDialogStyle);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            getWindow().setType(WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY);
+        } else {
+            getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
+        }
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN
+                | WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION
+                | WindowManager.LayoutParams.FLAG_LOCAL_FOCUS_MODE);
         mContext = context;
         mStyle = style;
         mCheckResultData = checkResultData;

core/function-impl/mogo-core-function-check/src/main/res/layout/check_hardware.xml

@@ -46,7 +46,7 @@
         android:gravity="center"
         android:text="角激光"
         android:textColor="@android:color/white"
-        android:textSize="@dimen/dp_32"
+        android:textSize="@dimen/dp_42"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
     <!--车辆模型-->
@@ -78,7 +78,7 @@
             android:gravity="center"
             android:text="Pad"
             android:textColor="@android:color/white"
-            android:textSize="@dimen/dp_32" />
+            android:textSize="@dimen/dp_42" />
         <!--前摄像头3-->
         <TextView
             android:id="@+id/camera_front_txt"
@@ -90,7 +90,7 @@
             android:gravity="center"
             android:text="摄像头"
             android:textColor="@android:color/white"
-            android:textSize="@dimen/dp_32" />
+            android:textSize="@dimen/dp_42" />
 
         <LinearLayout
             android:id="@+id/camera"
@@ -164,7 +164,7 @@
             android:gravity="center"
             android:text="主激光"
             android:textColor="@android:color/white"
-            android:textSize="@dimen/dp_32" />
+            android:textSize="@dimen/dp_42" />
         <!--RTK-->
         <ImageView
             android:id="@+id/rtk"
@@ -185,7 +185,7 @@
             android:gravity="center"
             android:text="RTK"
             android:textColor="@android:color/white"
-            android:textSize="@dimen/dp_32" />
+            android:textSize="@dimen/dp_42" />
         <!--摄像头-后1-->
         <ImageView
             android:id="@+id/camera_begind"
@@ -206,7 +206,7 @@
             android:gravity="center"
             android:text="摄像头"
             android:textColor="@android:color/white"
-            android:textSize="@dimen/dp_32" />
+            android:textSize="@dimen/dp_42" />
         <!--路由器-->
         <ImageView
             android:id="@+id/luyouqi"
@@ -227,7 +227,7 @@
             android:gravity="center"
             android:text="路由器"
             android:textColor="@android:color/white"
-            android:textSize="@dimen/dp_32" />
+            android:textSize="@dimen/dp_42" />
 
         <!--OBU-->
         <ImageView
@@ -252,7 +252,7 @@
         android:gravity="center"
         android:text="角激光"
         android:textColor="@android:color/white"
-        android:textSize="@dimen/dp_32"
+        android:textSize="@dimen/dp_42"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/check_image" />
     <!--OBU文案-->
@@ -266,14 +266,14 @@
         android:gravity="center"
         android:text="OBU"
         android:textColor="@android:color/white"
-        android:textSize="@dimen/dp_32"
+        android:textSize="@dimen/dp_42"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
         android:id="@+id/error_tip"
-        android:layout_width="@dimen/dp_32"
-        android:layout_height="@dimen/dp_32"
+        android:layout_width="@dimen/dp_42"
+        android:layout_height="@dimen/dp_42"
         android:layout_marginLeft="@dimen/dp_907"
         android:layout_marginTop="@dimen/dp_177"
         android:background="@drawable/check_little_btn"
@@ -293,8 +293,8 @@
 
     <ImageView
         android:id="@+id/error_tip_green"
-        android:layout_width="@dimen/dp_32"
-        android:layout_height="@dimen/dp_32"
+        android:layout_width="@dimen/dp_42"
+        android:layout_height="@dimen/dp_42"
         android:layout_marginLeft="@dimen/dp_160"
         android:layout_marginTop="88dp"
         android:background="@drawable/check_little_btn_green"

core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_title_item.xml

@@ -13,7 +13,7 @@
         android:background="@drawable/check_top_item_no_line_shape"
         android:gravity="left"
         android:paddingLeft="@dimen/dp_40"
-        android:paddingTop="@dimen/dp_32"
+        android:paddingTop="@dimen/dp_42"
         android:text="模块名称"
         android:textColor="#FFF"
         android:textSize="@dimen/dp_38"
@@ -30,7 +30,7 @@
         android:layout_height="match_parent"
         android:background="@drawable/check_top_item_left_shape"
         android:paddingLeft="@dimen/dp_40"
-        android:paddingTop="@dimen/dp_32"
+        android:paddingTop="@dimen/dp_42"
         android:text="运行状态"
         android:textColor="#FFF"
         android:textSize="@dimen/dp_38"
@@ -47,7 +47,7 @@
         android:layout_height="match_parent"
         android:background="@drawable/check_top_item_left_shape"
         android:paddingLeft="@dimen/dp_40"
-        android:paddingTop="@dimen/dp_32"
+        android:paddingTop="@dimen/dp_42"
         android:text="模块名称"
         android:textColor="#FFF"
         android:textSize="@dimen/dp_38"
@@ -64,7 +64,7 @@
         android:layout_height="match_parent"
         android:background="@drawable/check_top_item_left_shape"
         android:paddingLeft="@dimen/dp_40"
-        android:paddingTop="@dimen/dp_32"
+        android:paddingTop="@dimen/dp_42"
         android:text="运行状态"
         android:textColor="#FFF"
         android:textSize="@dimen/dp_38"

core/function-impl/mogo-core-function-check/src/main/res/values/styles.xml

@@ -8,4 +8,19 @@
         <item name="android:progressDrawable">@drawable/check_progress</item>
         <item name="android:listDivider">@drawable/check_item_left_shape</item>
     </style>
+
+    <style name="CheckInfoDialogStyle" parent="@android:style/Theme.Dialog">
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:backgroundDimAmount">0.6</item>
+        <item name="android:backgroundDimEnabled">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:fullBright">@android:color/transparent</item>
+        <item name="android:fullDark">@android:color/transparent</item>
+        <item name="android:topBright">@android:color/transparent</item>
+        <item name="android:topDark">@android:color/transparent</item>
+        <item name="android:borderlessButtonStyle">@android:color/transparent</item>
+    </style>
 </resources>

core/function-impl/mogo-core-function-dispatch/src/main/java/com/zhjt/dispatch/DispatchBaseDialog.java

@@ -1,16 +1,26 @@
 package com.zhjt.dispatch;
 
+import android.app.Dialog;
 import android.content.Context;
+import android.os.Build;
+import android.view.WindowManager;
 
 import androidx.annotation.NonNull;
 
 import com.mogo.eagle.core.data.dispatch.DispatchAdasAutoPilotLocReceiverBean;
-import com.mogo.module.common.dialog.BaseFloatDialog;
 
-public abstract class DispatchBaseDialog extends BaseFloatDialog {
+public abstract class DispatchBaseDialog extends Dialog {
 
     public DispatchBaseDialog(@NonNull Context context) {
-        super(context);
+        super(context,R.style.Base_AlertDialog_AppCompat);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            getWindow().setType(WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY);
+        } else {
+            getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
+        }
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN
+                | WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION
+                | WindowManager.LayoutParams.FLAG_LOCAL_FOCUS_MODE);
     }
 
     public abstract void addIDispatchRemindListener(IDispatchRemindClickListener listener);

core/function-impl/mogo-core-function-dispatch/src/main/res/values/styles.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="BaseFloatDialogStyle" parent="@android:style/Theme.Dialog">
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:backgroundDimAmount">0.6</item>
+        <item name="android:backgroundDimEnabled">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:fullBright">@android:color/transparent</item>
+        <item name="android:fullDark">@android:color/transparent</item>
+        <item name="android:topBright">@android:color/transparent</item>
+        <item name="android:topDark">@android:color/transparent</item>
+        <item name="android:borderlessButtonStyle">@android:color/transparent</item>
+    </style>
+
+</resources>

core/function-impl/mogo-core-function-hmi/build.gradle

@@ -114,7 +114,6 @@ dependencies {
         api project(':services:mogo-service-api')
         api project(':services:mogo-service')
 
-        api project(':modules:mogo-module-service')
         api project(':libraries:mogo-map')
         api project(':test:crashreport-upgrade')
 //        api project(':test:crashreport-bugly')

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt

@@ -98,7 +98,6 @@ import com.mogo.eagle.core.utilcode.reminder.api.impl.*
 import com.mogo.eagle.core.utilcode.util.*
 import com.mogo.eagle.core.utilcode.util.TimeUtils.millis2String
 import com.mogo.map.MogoMap
-import com.mogo.module.common.enums.*
 import com.zhidao.support.adas.high.common.MogoReport.Code.Error.EMAP.*
 import com.zhjt.mogo_core_function_devatools.badcase.consts.BadCaseConfig
 import com.zhjt.service_biz.BizConfig

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/PerspectiveSwitchView.kt

@@ -1,15 +1,13 @@
 package com.mogo.eagle.core.function.hmi.ui.widget
 
-import android.content.*
-import android.util.*
-import android.view.*
-import android.widget.*
-import com.mogo.commons.*
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.FrameLayout
 import com.mogo.eagle.core.function.hmi.R
-import com.mogo.eagle.core.function.v2x.events.scenario.scene.airoad.*
-import com.mogo.map.*
-import com.mogo.map.uicontroller.*
-import com.mogo.module.common.constants.*
+import com.mogo.map.MogoMapUIController
+import com.mogo.map.uicontroller.VisualAngleMode
 import kotlinx.android.synthetic.main.view_perspective_switch.view.*
 
 /**
@@ -34,17 +32,20 @@ class PerspectiveSwitchView @JvmOverloads constructor(
         if (MogoMapUIController.getInstance().currentMapVisualAngle.isLongSight) {
 //            MogoMarkerManager.getInstance(AbsMogoApplication.getApp())
 //                .visibleAllMarkers()
-            MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null)
+            MogoMapUIController.getInstance()
+                .changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null)
             textSwitch.setText(R.string.module_map_model_normal)
         } else if (MogoMapUIController.getInstance().currentMapVisualAngle.isMediumSight) {
 //            MogoMarkerManager.getInstance(AbsMogoApplication.getApp())
 //                .inVisibleWithoutMarkers(DataTypes.TYPE_MARKER_ADAS)
-            MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null)
+            MogoMapUIController.getInstance()
+                .changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null)
             textSwitch.setText(R.string.module_map_model_faster)
         } else {
 //            MogoMarkerManager.getInstance(AbsMogoApplication.getApp())
 //                .visibleAllMarkers()
-            MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null)
+            MogoMapUIController.getInstance()
+                .changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null)
             textSwitch.setText(R.string.module_map_model_normal)
         }
     }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/cards/MogoModulesHandler.java

@@ -22,7 +22,6 @@ public interface MogoModulesHandler {
      * 加载基本服务模块，需要不启动页面就能运行
      * <p>
      * 1. v2x
-     * 2. mogo-module-service
      */
     void loadBaseModule();
 

core/function-impl/mogo-core-function-map/build.gradle

@@ -94,7 +94,6 @@ dependencies {
         implementation project(":libraries:mogo-map")
         implementation project(":libraries:mogo-map-api")
         implementation project(':libraries:mogo-adas')
-        implementation project(':modules:mogo-module-service')
     }
 }
 

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/MogoMarkerServiceImpl.java

@@ -6,9 +6,9 @@ import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.data.map.entity.MarkerShowEntity;
 import com.mogo.eagle.core.data.traffic.TrafficData;
 import com.mogo.eagle.core.function.api.map.marker.IMogoMarkerService;
-import com.mogo.eagle.core.function.impl.marker.MarkerDrawer;
-import com.mogo.eagle.core.function.impl.marker.TrafficMarkerDrawer;
-import com.mogo.eagle.core.function.impl.marker.V2XWarnDataDrawer;
+import com.mogo.eagle.core.function.impl.marker.drawer.MarkerDrawer;
+import com.mogo.eagle.core.function.impl.marker.drawer.TrafficMarkerDrawer;
+import com.mogo.eagle.core.function.impl.marker.drawer.V2XWarnDataDrawer;
 import com.mogo.map.marker.IMogoMarker;
 
 

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/BaseDrawer.java

@@ -1,10 +1,11 @@
-package com.mogo.eagle.core.function.impl.marker;
+package com.mogo.eagle.core.function.impl.marker.drawer;
 
 
 import android.content.Context;
 
 import com.mogo.commons.AbsMogoApplication;
-import com.mogo.module.common.R;
+import com.mogo.eagle.core.function.impl.marker.AdasRecognizedType;
+import com.mogo.eagle.core.function.map.R;
 
 /**
  * @author congtaowang

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/MarkerDrawer.java

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.impl.marker;
+package com.mogo.eagle.core.function.impl.marker.drawer;
 
 import android.text.TextUtils;
 
@@ -11,6 +11,10 @@ import com.mogo.eagle.core.data.map.entity.MarkerNoveltyInfo;
 import com.mogo.eagle.core.data.map.entity.MarkerOnlineCar;
 import com.mogo.eagle.core.data.map.entity.MarkerShareMusic;
 import com.mogo.eagle.core.data.map.entity.MarkerShowEntity;
+import com.mogo.eagle.core.function.impl.marker.view.EmptyMarkerView;
+import com.mogo.eagle.core.function.impl.marker.view.IMarkerView;
+import com.mogo.eagle.core.function.impl.marker.view.MapMarkerAdapter;
+import com.mogo.eagle.core.function.impl.marker.view.OnlineCarMarkerView;
 import com.mogo.map.MogoMarkerManager;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.IMogoMarkerClickListener;

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/TrafficMarkerDrawer.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.impl.marker
+package com.mogo.eagle.core.function.impl.marker.drawer
 
 import android.annotation.SuppressLint
 import android.content.Context

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/V2XWarnDataDrawer.java

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.impl.marker;
+package com.mogo.eagle.core.function.impl.marker.drawer;
 
 import static com.mogo.eagle.core.data.constants.DataTypes.TYPE_MARKER_CLOUD_STOP_LINE_DATA;
 import static com.mogo.eagle.core.data.constants.DataTypes.TYPE_MARKER_CLOUD_WARN_DATA;
@@ -6,6 +6,8 @@ import static com.mogo.eagle.core.data.constants.DataTypes.TYPE_MARKER_CLOUD_WAR
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.data.map.entity.MarkerLocation;
 import com.mogo.eagle.core.data.map.entity.MarkerShowEntity;
+import com.mogo.eagle.core.function.impl.marker.view.IMarkerView;
+import com.mogo.eagle.core.function.impl.marker.view.MapMarkerAdapter;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.map.MogoMarkerManager;
 import com.mogo.map.marker.IMogoMarker;

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/EmptyMarkerView.java

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.impl.marker;
+package com.mogo.eagle.core.function.impl.marker.view;
 
 import android.content.Context;
 import android.util.AttributeSet;

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/IMarkerView.java

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.impl.marker;
+package com.mogo.eagle.core.function.impl.marker.view;
 
 import android.graphics.Bitmap;
 import android.view.View;

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/MapCameraInfoView.java

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.impl.marker;
+package com.mogo.eagle.core.function.impl.marker.view;
 
 import android.content.Context;
 import android.util.AttributeSet;

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/MapMarkerAdapter.java

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.impl.marker;
+package com.mogo.eagle.core.function.impl.marker.view;
 
 import static com.mogo.commons.module.ServiceConst.CARD_TYPE_USER_DATA;
 

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/MapMarkerBaseView.java

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.impl.marker;
+package com.mogo.eagle.core.function.impl.marker.view;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -12,15 +12,15 @@ import android.widget.LinearLayout;
 import androidx.annotation.Nullable;
 
 import com.mogo.eagle.core.data.map.entity.MarkerShowEntity;
+import com.mogo.eagle.core.function.map.R;
 import com.mogo.eagle.core.utilcode.mogo.glide.GlideImageLoader;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.eagle.core.utilcode.util.ViewUtils;
 import com.mogo.eagle.core.utilcode.util.WindowUtils;
-import com.mogo.map.marker.IMogoMarker;
-import com.mogo.map.marker.MogoMarkerOptions;
-import com.mogo.module.common.R;
 import com.mogo.eagle.core.utilcode.mogo.imageloader.IMogoImageLoaderListener;
 import com.mogo.eagle.core.utilcode.mogo.imageloader.MogoImageView;
+import com.mogo.map.marker.IMogoMarker;
+import com.mogo.map.marker.MogoMarkerOptions;
 
 /**
  * author : donghongyu

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/MapMarkerView.java

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.impl.marker;
+package com.mogo.eagle.core.function.impl.marker.view;
 
 import static com.mogo.commons.module.ServiceConst.CARD_TYPE_ROAD_CONDITION;
 

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/OnlineCarMarkerView.java

@@ -1,12 +1,12 @@
-package com.mogo.eagle.core.function.impl.marker;
+package com.mogo.eagle.core.function.impl.marker.view;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.view.View;
 
 import com.mogo.commons.AbsMogoApplication;
+import com.mogo.eagle.core.function.map.R;
 import com.mogo.map.marker.IMogoMarker;
-import com.mogo.module.common.R;
 
 import java.lang.ref.SoftReference;
 import java.util.HashMap;

core/function-impl/mogo-core-function-map/src/main/res/layout/modudle_services_marker_layout.xml

@@ -20,7 +20,7 @@
             android:layout_width="@dimen/dp_60"
             android:layout_height="@dimen/dp_60"
             android:layout_gravity="center"
-            android:layout_marginBottom="@dimen/module_service_marker_bubble_icon_marginBottom"
+            android:layout_marginBottom="@dimen/dp_4"
             tools:src="@drawable/icon_map_marker_road_block_up2" />
 
     </FrameLayout>

core/function-impl/mogo-core-function-map/src/main/res/layout/modudle_services_marker_vr_layout.xml

@@ -17,10 +17,10 @@
 
         <com.mogo.eagle.core.utilcode.mogo.imageloader.MogoImageView
             android:id="@+id/ivIcon"
-            android:layout_width="@dimen/module_service_marker_bubble_icon_vr_width"
-            android:layout_height="@dimen/module_service_marker_bubble_icon_vr_height"
+            android:layout_width="@dimen/dp_35"
+            android:layout_height="@dimen/dp_35"
             android:layout_gravity="center"
-            android:layout_marginBottom="@dimen/module_service_marker_bubble_icon_marginBottom"
+            android:layout_marginBottom="@dimen/dp_4"
             tools:src="@drawable/icon_map_marker_road_block_up2" />
 
     </FrameLayout>

core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/CameraLiveNoticeHelper.java

@@ -1,182 +0,0 @@
-package com.mogo.eagle.core.function.live;
-
-import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_MONITOR;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.text.TextUtils;
-
-import com.mogo.cloud.socket.entity.SocketDownData;
-import com.mogo.commons.AbsMogoApplication;
-import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
-import com.mogo.eagle.core.function.monitoring.R;
-import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
-import com.mogo.map.marker.IMogoMarker;
-import com.mogo.map.marker.IMogoMarkerClickListener;
-import com.mogo.map.marker.MogoMarkerOptions;
-import com.mogo.module.common.MogoApisHandler;
-import com.mogo.realtime.api.MoGoAiCloudRealTime;
-import com.mogo.realtime.socket.IMogoCloudOnMsgListener;
-
-
-/**
- * vr模式下，摄像头消息 CameraLiveNoticeHelper
- */
-public class CameraLiveNoticeHelper implements IMogoCloudOnMsgListener {
-    private static final String TAG = "CameraLiveNoticeHelper";
-    private Context mContext;
-    private static IMogoMarker mMogoMarker;
-    private SocketDownData.CloudRoadDataProto mCloudRoadData;
-    private volatile boolean isVrMode;
-    private volatile boolean isVrModeMarker;
-    private volatile String mCurrentUuid;
-
-
-    public void init(Context context) {
-        mContext = context;
-
-        MoGoAiCloudRealTime.registerOnMsgListener(this);
-        MogoApisHandler.getInstance().getApis().getRegisterCenterApi().registerMogoMarkerClickListener(PushDataType.TYPE_PUSH_CAMERA_DATA, new IMogoMarkerClickListener() {
-            @Override
-            public boolean onMarkerClicked(IMogoMarker marker) {
-                //点击的marker的具体数据
-                if (mCloudRoadData != null && !TextUtils.isEmpty(mCloudRoadData.getRtmpUrl())) {
-                    CameraLiveManager.getInstance().init(mCloudRoadData);
-                } else {
-                    TipToast.shortTip("直播流地址为空");
-                }
-                return false;
-            }
-        });
-
-    }
-
-    public void release() {
-        MoGoAiCloudRealTime.unRegisterOnMsgListener(this);
-        MogoApisHandler.getInstance().getApis().getRegisterCenterApi().unregisterMogoMarkerClickListener(PushDataType.TYPE_PUSH_CAMERA_DATA);
-        mCloudRoadData = null;
-        mContext = null;
-    }
-
-    /**
-     * PushRoadConditionDrawer
-     * vr模式
-     *
-     * @param roadData 道路数据
-     */
-    private void addVrCameraMarker(SocketDownData.CloudRoadDataProto roadData) {
-        CallerLogger.INSTANCE.e(M_MONITOR + TAG, "addVrCameraMarker --lat = " + roadData.getLat() + "--lon =" + roadData.getLon() + "--uuid = " + roadData.getUuid() + "---rtmpUrl =" + roadData.getRtmpUrl());
-        if (!TextUtils.isEmpty(roadData.getRtmpUrl())) {
-            removeCameraMarker();
-            MogoMarkerOptions options = new MogoMarkerOptions()
-                    .data(roadData)
-                    .latitude(roadData.getLat())
-                    .longitude(roadData.getLon());
-            options.anchor(0.5f, 0.5f);
-
-            Bitmap bitmap = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.icon_space, null);
-            options.icon(bitmap);
-            mMogoMarker = CallerMapUIServiceManager.INSTANCE.getMarkerManager(mContext)
-                    .addMarker(PushDataType.TYPE_PUSH_CAMERA_DATA, options);
-            if (mMogoMarker != null) {
-                mMogoMarker.setInfoWindowAdapter(new CameraWindow3DAdapter(AbsMogoApplication.getApp(), options));
-                mMogoMarker.showInfoWindow();
-                mMogoMarker.setOwner(PushDataType.TYPE_PUSH_CAMERA_DATA);
-            }
-        }
-    }
-
-    /**
-     * 普通模式
-     *
-     * @param roadData 道路数据
-     */
-    private void addNormalCameraMarker(SocketDownData.CloudRoadDataProto roadData) {
-        CallerLogger.INSTANCE.d(M_MONITOR + TAG, "addNormalCameraMarker  --lat = " + roadData.getLat() + " --lon =" + roadData.getLon() + "--uuid = " + roadData.getUuid() + "---rtmpUrl =" + roadData.getRtmpUrl());
-        if (!TextUtils.isEmpty(roadData.getRtmpUrl())) {
-            removeCameraMarker();
-            if (mMogoMarker != null) {
-                mMogoMarker.hideInfoWindow();
-            }
-            MogoMarkerOptions options = new MogoMarkerOptions()
-                    .data(roadData)
-                    .latitude(roadData.getLat())
-                    .longitude(roadData.getLon());
-            options.anchor(0.5f, 0.5f);
-
-            Bitmap bitmap = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.module_camera_normal_traffic, null);
-            options.icon(bitmap);
-            mMogoMarker = CallerMapUIServiceManager.INSTANCE.getMarkerManager(mContext)
-                    .addMarker(PushDataType.TYPE_PUSH_CAMERA_DATA, options);
-            if (mMogoMarker != null) {
-                mMogoMarker.setOwner(PushDataType.TYPE_PUSH_CAMERA_DATA);
-            }
-        }
-    }
-
-    private void removeCameraMarker() {
-        if (mMogoMarker != null) {
-            mMogoMarker.remove();
-        }
-    }
-
-    private void renderMarker(SocketDownData.LauncherSnapshotProto obj) {
-        if (obj != null) {
-            if (obj.getCamera() != null && !TextUtils.isEmpty(obj.getCamera().getRtmpUrl())) {
-                mCloudRoadData = obj.getCamera();
-                CallerLogger.INSTANCE.d(M_MONITOR + TAG, "onMsgReceived getRtmpUrl = " + mCloudRoadData.getRtmpUrl() + "--- isVrMode = " + isVrMode + " ---isVrModeMarker = " + isVrModeMarker + ">>>>mCurrentUuid = " + mCurrentUuid + ">>>mCloudRoadData.getUuid() = " + mCloudRoadData.getUuid());
-                if (TextUtils.equals(mCurrentUuid, mCloudRoadData.getUuid())) {
-                    if (isVrMode == isVrModeMarker) {
-                        // do nothing.
-                        CallerLogger.INSTANCE.d(M_MONITOR + TAG, "-------------1------------");
-                    } else {
-                        if (isVrMode) {
-                            CallerLogger.INSTANCE.d(M_MONITOR + TAG, "-------------2------------");
-                            addVrCameraMarker(mCloudRoadData);
-                            isVrModeMarker = true;
-                        } else {
-                            CallerLogger.INSTANCE.d(M_MONITOR + TAG, "-------------3------------");
-                            addNormalCameraMarker(mCloudRoadData);
-                            isVrModeMarker = false;
-                        }
-                    }
-                } else {
-                    mCurrentUuid = mCloudRoadData.getUuid();
-                    // 是否需要延迟
-                    if (isVrMode) {
-                        CallerLogger.INSTANCE.d(M_MONITOR + TAG, "-------------4------------");
-                        addVrCameraMarker(mCloudRoadData);
-                        isVrModeMarker = true;
-                    } else {
-                        CallerLogger.INSTANCE.d(M_MONITOR + TAG, "-------------5------------");
-                        addNormalCameraMarker(mCloudRoadData);
-                        isVrModeMarker = false;
-                    }
-                }
-            } else {
-                //删除marker
-                if (obj.getCamera() != null) {
-                    CallerLogger.INSTANCE.e(M_MONITOR + TAG, "onMsgReceived RtmpUrl() = " + obj.getCamera().getRtmpUrl());
-                } else {
-                    CallerLogger.INSTANCE.e(M_MONITOR + TAG, "obj.getCamera() == null ----------- ");
-                }
-                removeCameraMarker();
-            }
-        } else {
-            CallerLogger.INSTANCE.e(M_MONITOR + TAG, "onMsgReceived  obj == null ");
-        }
-    }
-
-    @Override
-    public void onMsgSend(long id) {
-        // CallerLogger.INSTANCEger.d(M_MONITOR + TAG, "onMsgSend id : " + id);
-    }
-
-    @Override
-    public void onMsgReceived(SocketDownData.LauncherSnapshotProto mogoSnapshotSetData) {
-        renderMarker(mogoSnapshotSetData);
-    }
-
-}

core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/live/CameraWindow3DAdapter.java

@@ -1,29 +0,0 @@
-package com.mogo.eagle.core.function.live;
-
-import android.content.Context;
-import android.view.View;
-
-import com.mogo.map.marker.IMogoInfoWindowAdapter;
-import com.mogo.map.marker.IMogoMarker;
-import com.mogo.map.marker.MogoMarkerOptions;
-import com.mogo.module.common.drawer.marker.MapCameraInfoView;
-
-/**
- * @author lixiaopeng
- * @since 2020/12/16
- * 描述
- */
-public class CameraWindow3DAdapter implements IMogoInfoWindowAdapter {
-    private Context mContext;
-    private MogoMarkerOptions mOptions;
-
-    public CameraWindow3DAdapter(Context context, MogoMarkerOptions options) {
-        this.mContext = context;
-        this.mOptions = options;
-    }
-
-    @Override
-    public View getInfoWindow(IMogoMarker marker) {
-        return new MapCameraInfoView(mContext, mOptions);
-    }
-}

core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt

@@ -796,7 +796,6 @@ class MogoPrivateObuManager private constructor() {
      *
      * @param appId    使用WarningTypeEnum获取icon、提示内容、tts内容
      *
-     * @see com.mogo.module.common.enums.EventTypeEnum
      */
     private fun handleSdkObu(
         appId: Int,

core/function-impl/mogo-core-function-v2x/build.gradle

@@ -65,7 +65,6 @@ dependencies {
     } else {
         implementation project(":foudations:mogo-commons")
         implementation project(':modules:mogo-module-common')
-        implementation project(':modules:mogo-module-service')
         implementation project(':core:mogo-core-data')
         implementation project(':core:mogo-core-utils')
         implementation project(':core:mogo-core-function-api')

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/airoad/AiRoadMarker.kt

@@ -25,7 +25,6 @@ import com.mogo.eagle.core.utilcode.kotlin.*
 import com.mogo.eagle.core.utilcode.mogo.logger.*
 import com.mogo.map.*
 import com.mogo.map.overlay.*
-import com.mogo.module.common.utils.*
 import io.netty.util.internal.*
 import java.lang.Runnable
 import java.util.*

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XAiRoadEventMarker.kt

@@ -12,7 +12,6 @@ import com.mogo.map.*
 import com.mogo.map.R.raw
 import com.mogo.map.marker.*
 import com.mogo.map.overlay.*
-import com.mogo.module.common.utils.*
 import java.util.*
 import java.util.concurrent.atomic.*
 import kotlin.Pair

core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_event_detail.xml

@@ -244,7 +244,7 @@
                 android:paddingLeft="@dimen/dp_40"
                 android:paddingRight="@dimen/dp_40"
                 android:textColor="@color/v2x_white"
-                android:textSize="@dimen/dp_32" />
+                android:textSize="@dimen/dp_42" />
 
             <ImageView
                 android:id="@+id/iv_play"

core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_event_ugc.xml

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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="@drawable/v2x_alert_window_bg"
-    android:paddingEnd="@dimen/dp_62">
-
-    <ImageView
-        android:id="@+id/ivEventTypeIcon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginEnd="@dimen/dp_31"
-        android:src="@drawable/v_to_x_event_ugc_fenglu"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/tvEventUgcTitle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_10"
-        android:layout_marginEnd="@dimen/dp_50"
-        android:textColor="@color/v2x_FFF_333"
-        android:textSize="@dimen/module_v2x_event_help_title_text_size"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="@+id/ivEventTypeIcon"
-        app:layout_constraintEnd_toStartOf="@+id/ivEventReportTrue"
-        app:layout_constraintStart_toEndOf="@id/ivEventTypeIcon"
-        app:layout_constraintTop_toTopOf="@+id/ivEventTypeIcon"
-        app:layout_constraintVertical_chainStyle="packed"
-        tools:text="你刚路过的路段堵不堵？您可以直接对我说拥赌、或者不堵。" />
-
-
-    <ImageView
-        android:id="@+id/ivEventReportTrue"
-        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/v2x_selector_icon_report_true"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/ivEventReportErr"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageView
-        android:id="@+id/ivEventReportErr"
-        android:layout_width="@dimen/module_v2x_event_button_size"
-        android:layout_height="@dimen/module_v2x_event_button_size"
-        android:src="@drawable/v2x_selector_icon_report_err"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_scennario_history.xml

@@ -78,7 +78,7 @@
         android:paddingBottom="@dimen/dp_3"
         android:text="待评价"
         android:textColor="#ffffff"
-        android:textSize="@dimen/panel_list_item_title_size"
+        android:textSize="@dimen/dp_26"
         app:layout_constraintBottom_toBottomOf="@+id/tagEventType"
         app:layout_constraintStart_toEndOf="@+id/tagEventType"
         app:layout_constraintTop_toTopOf="@+id/tagEventType" />

core/function-impl/mogo-core-function-v2x/src/main/res/layout/window_simple_obu_event_detail_vr.xml

@@ -2,16 +2,16 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
-    android:layout_height="@dimen/module_v2x_brake_tip_height"
+    android:layout_height="@dimen/dp_186"
     android:layout_marginTop="@dimen/dp_20"
     android:layout_gravity="center_horizontal"
     android:background="@drawable/v2x_front_warning_bg">
 <!--    @dimen/module_v2x_brake_tip_width-->
     <ImageView
         android:id="@+id/ivObuTypeIcon"
-        android:layout_width="@dimen/module_v2x_brake_image_width"
-        android:layout_height="@dimen/module_v2x_brake_image_width"
-        android:layout_marginStart="@dimen/module_v2x_brake_image_margin_left"
+        android:layout_width="@dimen/dp_120"
+        android:layout_height="@dimen/dp_120"
+        android:layout_marginStart="@dimen/dp_37"
         android:src="@drawable/icon_warning_v2x_emergency_brake"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
@@ -41,12 +41,12 @@
         android:id="@+id/tvObuDesc"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/module_v2x_brake_image_margin_right"
+        android:layout_marginLeft="@dimen/dp_20"
         android:layout_marginTop="@dimen/dp_10"
         android:text="前车急刹"
         android:textColor="@color/v2x_white"
-        android:textSize="@dimen/dp_32"
-        android:paddingRight="@dimen/module_v2x_brake_image_margin_left"
+        android:textSize="@dimen/dp_42"
+        android:paddingRight="@dimen/dp_37"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="@+id/tvObuType"
         app:layout_constraintTop_toBottomOf="@+id/tvObuType" />

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/marker/IMogoMarkerService.java

@@ -10,7 +10,7 @@ import com.mogo.map.marker.IMogoMarker;
 public interface IMogoMarkerService {
 
     /**
-     * @param object instance of com.mogo.module.common.entity.MarkerShowEntity
+     * @param object
      * @return
      */
     @Nullable

modules.txt

@@ -21,7 +21,6 @@
 :test:crashreport-noop
 :test:crashreport-upgrade
 :core:function-impl:mogo-core-function-obu-mogo
-:modules:mogo-module-service
 :core:function-impl:mogo-core-function-check
 :services:mogo-service
 :core:function-impl:mogo-core-function-autopilot

modules/mogo-module-common/build.gradle

@@ -16,7 +16,6 @@ android {
         versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION")
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles 'consumer-rules.pro'
 
         //ARouter apt 参数
         kapt {
@@ -30,7 +29,6 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
 

modules/mogo-module-common/consumer-rules.pro

@@ -1 +0,0 @@
-#-----CommonModule-----

modules/mogo-module-common/proguard-rules.pro

@@ -1,23 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
-
-#-----CommonModule-----