Merge branch 'feature/v2.0.0' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into feature/v2.0.0

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

@@ -38,6 +38,9 @@ import static com.mogo.module.authorize.authprovider.invoke.AuthorizeInvokerCons
  * 描述
  */
 public class EntrancePresenter extends Presenter< EntranceView > {
+    private static final String REPORT_TANLU_BLOCK = "10007";
+    private static final String REPORT_TANLU_TRAFFIC_CHECK = "10002";
+    private static final String REPORT_TANLU_CLOSURE = "10003";
 
     private Context mContext;
     private IMogoAnalytics mAnalytics;
@@ -286,7 +289,7 @@ public class EntrancePresenter extends Presenter< EntranceView > {
         mStatusManager.setUploadingStatus( "CARD_TYPE_ROAD_CONDITION", true );
 
         traceTanluData( "2" );
-        sendShareReceiver( "1" );
+        sendShareReceiver( REPORT_TANLU_BLOCK );
         Logger.d( "EntrancePresenter", "mogoIntentListener 上报路况 ----> " );
         traceTypeData( "1" );
         ShareControl.getInstance( mContext ).dismissDialog();
@@ -294,7 +297,7 @@ public class EntrancePresenter extends Presenter< EntranceView > {
 
     private void uploadTrfficCheck() {
         mStatusManager.setUploadingStatus( "CARD_TYPE_ROAD_CONDITION", true );
-        sendShareReceiver( "2" );
+        sendShareReceiver( REPORT_TANLU_TRAFFIC_CHECK );
         Logger.d( "EntrancePresenter", "mogoIntentListener 分享交通检查 ----> " );
         traceTypeData( "3" );
         ShareControl.getInstance( mContext ).dismissDialog();
@@ -302,7 +305,7 @@ public class EntrancePresenter extends Presenter< EntranceView > {
 
     private void uploadRoadClosed() {
         mStatusManager.setUploadingStatus( "CARD_TYPE_ROAD_CONDITION", true );
-        sendShareReceiver( "3" );
+        sendShareReceiver( REPORT_TANLU_CLOSURE );
         Logger.d( "EntrancePresenter", "mogoIntentListener 分享封路 ----> " );
         traceTypeData( "4" );
         ShareControl.getInstance( mContext ).dismissDialog();
@@ -328,7 +331,7 @@ public class EntrancePresenter extends Presenter< EntranceView > {
     }
 
     /**
-     * 发送广播 1拥堵，2交通检查，3封路
+     * 发送广播 上报路况
      */
     private void sendShareReceiver( String type ) {
         Logger.d( "EntrancePresenter", "TanluCardViewFragment sendShareReceiver ---->" );

modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/ShareConstants.java

@@ -25,12 +25,11 @@ public class ShareConstants {
     /**
      * 这个是实时路况，不是拥堵，拥堵放在了extention模块里面处理
      */
-    public static final String VOICE_CMD_PUB_ROAD_CONDITION = "com.zhidao.pathfinder.report" +
+    public static final String VOICE_CMD_PUB_ROAD_CONDITION = "com.zhidao.pathfinder.report.roadCondition";
-            ".roadCondition";
 
-    public static final String TYPE_BLOCK = "1";
+    public static final String TYPE_BLOCK = "10007";
-    public static final String TYPE_TRAFFIC_CHECK = "2";
+    public static final String TYPE_TRAFFIC_CHECK = "10002";
-    public static final String TYPE_CLOSURE = "3";
+    public static final String TYPE_CLOSURE = "10003";
     public static final String TYPE_ACCIDENT = "10013";
     public static final String TYPE_REAL_TIME_TRAFFIC = "10015";
     public static final String TYPE_SEEK_HELP = "6";

modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java

@@ -117,7 +117,7 @@ public class LaucherShareDialog implements View.OnClickListener {
         if (id == R.id.tvBlock) {
             //拥堵
             traceTanluData("1");
-            sendShareReceiver("1");
+            sendShareReceiver(ShareConstants.TYPE_BLOCK);
             traceTypeData("1");
             dismiss();
         } else if (id == R.id.oil_price_layout) {
@@ -131,36 +131,43 @@ public class LaucherShareDialog implements View.OnClickListener {
         } else if (id == R.id.tvTrafficCheck) {
             //交通检查
             traceData("1");
-            sendShareReceiver("2");
+            sendShareReceiver(ShareConstants.TYPE_TRAFFIC_CHECK);
             traceTypeData("3");
             dismiss();
         } else if (id == R.id.tvClosure) {
             //封路
             traceData("1");
-            sendShareReceiver("3");
+            sendShareReceiver(ShareConstants.TYPE_CLOSURE);
             traceTypeData("4");
             dismiss();
         } else if (id == R.id.tvSeekHelp) {
             // 故障求助
             SeekHelpManager.INSTANCE.seekHelp(mContext,seekListener,true);
+            dismiss();
         } else if (id == R.id.tvAccident) {
             // 事故
             sendShareReceiver(ShareConstants.TYPE_ACCIDENT);
+            dismiss();
         } else if (id == R.id.tvConstruction) {
             // 道路施工
             sendShareReceiver(ShareConstants.TYPE_ROAD_CONSTRUCTION);
+            dismiss();
         } else if (id == R.id.tvRealTimeTraffic) {
             // 实时路况
             sendShareReceiver(ShareConstants.TYPE_REAL_TIME_TRAFFIC);
+            dismiss();
         } else if (id == R.id.tvStagnantWater) {
             // 道路积水
             sendShareReceiver(ShareConstants.TYPE_STAGNANT_WATER);
+            dismiss();
         } else if (id == R.id.tvRoadIcy) {
             // 道路结冰
             sendShareReceiver(ShareConstants.TYPE_ROAD_ICY);
+            dismiss();
         } else if (id == R.id.tvDenseFog) {
             // 浓雾
             sendShareReceiver(ShareConstants.TYPE_DENSE_FOG);
+            dismiss();
         }
 
     }