diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java
index 41e6ccc4fa..602fcf46f3 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java
@@ -23,6 +23,7 @@ import com.mogo.service.intent.IMogoIntentManager;
import com.mogo.service.statusmanager.IMogoStatusManager;
import com.mogo.utils.logger.Logger;
+import org.json.JSONException;
import org.json.JSONObject;
import java.util.HashMap;
@@ -198,8 +199,19 @@ public class EntrancePresenter extends Presenter< EntranceView > {
if ( mIMogoAuthorizeModuleManager.needAuthorize( AUTHORIZE_TYPE_LAUNCHER_SHARE ) ) {
mIMogoAuthorizeModuleManager.invokeAuthorization( AUTHORIZE_TYPE_LAUNCHER_SHARE );
} else {
- uploadRoadCondition();
- Log.d( TAG, "mogoIntentListener 分享路况 唤醒 ----> " );
+ JSONObject jsonObject = null;
+ try {
+ jsonObject = new JSONObject( data );
+ String typeString = jsonObject.get( "obj" ).toString();
+ Logger.d(TAG, "mogiIntentListener 准备上报拥堵： " + typeString);
+ if("拥堵".equals(typeString)) {
+ uploadRoadCondition();
+ Log.d(TAG, "mogoIntentListener 上报拥堵 唤醒 ----> ");
+ }
+ } catch (JSONException e) {
+ e.printStackTrace();
+ }
+
}
} else if ( intentStr.equals( ExtensionsModuleConst.SHARE_DIALOG_CLOSE ) ) { //关闭分享框 唤醒
if ( mIMogoAuthorizeModuleManager.needAuthorize( AUTHORIZE_TYPE_LAUNCHER_SHARE ) ) {
diff --git a/modules/mogo-module-share/build.gradle b/modules/mogo-module-share/build.gradle
index 41c1cbc2ec..e355181036 100644
--- a/modules/mogo-module-share/build.gradle
+++ b/modules/mogo-module-share/build.gradle
@@ -34,6 +34,7 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation rootProject.ext.dependencies.kotlinstdlibjdk7
implementation rootProject.ext.dependencies.androidxappcompat
+ implementation rootProject.ext.dependencies.androidxrecyclerview
implementation rootProject.ext.dependencies.androidxccorektx
implementation rootProject.ext.dependencies.androidxconstraintlayout
implementation rootProject.ext.dependencies.arouter
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareVoiceCmdReceiver.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareVoiceCmdReceiver.kt
index 5a0d662a84..6c4593b685 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareVoiceCmdReceiver.kt
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareVoiceCmdReceiver.kt
@@ -4,22 +4,57 @@ import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import com.mogo.module.share.constant.ShareConstants
-import com.mogo.module.share.constant.ShareConstants.VOICE_CMD_PUB_TROUBLE_HELP
+import com.mogo.module.share.constant.ShareConstants.*
+import com.mogo.module.share.manager.UploadHelper
import com.mogo.utils.logger.Logger
+import org.json.JSONObject
/**
* 用于接收唤醒词指令，现在只接收 com.zhidao.speech.awake.notify 这一条广播
*/
class ShareVoiceCmdReceiver : BroadcastReceiver() {
+ private val TAG = "ShareVoiceCmdReceiver"
override fun onReceive(context: Context, intent: Intent) {
// 接收唤醒词指令
- val command = intent.getStringExtra("command")
- Logger.d("ShareCmdReceiver", "收到唤醒词指令: $command")
- if (command == VOICE_CMD_PUB_TROUBLE_HELP) {
- // 开启服务，准备上报求助
- val seekHelp = Intent(context, VoiceCmdService::class.java)
- seekHelp.putExtra(ShareConstants.VOICE_CMD_SERVICE_EVENT_KEY, ShareConstants.VOICE_CMD_SERVICE_SEEK_HELP)
- context.startService(seekHelp)
+ val command = intent.getStringExtra("command")?:""
+ Logger.d(TAG, "收到唤醒词指令: $command")
+ when (command) {
+ VOICE_CMD_PUB_TROUBLE_HELP -> {
+ // 开启服务，准备上报求助
+ val seekHelp = Intent(context, VoiceCmdService::class.java)
+ seekHelp.putExtra(ShareConstants.VOICE_CMD_SERVICE_EVENT_KEY, ShareConstants.VOICE_CMD_SERVICE_SEEK_HELP)
+ context.startService(seekHelp)
+ }
+ VOICE_CMD_GO_TO_SHARE ->{
+ val ob = JSONObject(intent.getStringExtra("data") ?: "").opt("ob")
+ Logger.d(TAG, "ob: $ob")
+ when (ob) {
+ "积水"->{
+ UploadHelper.upload(context, TYPE_STAGNANT_WATER)
+ }
+ "积冰"->{
+ UploadHelper.upload(context, TYPE_ROAD_ICY)
+ }
+ "雾"->{
+ UploadHelper.upload(context, TYPE_DENSE_FOG)
+ }
+ "交通事故"->{
+ UploadHelper.upload(context, TYPE_ACCIDENT)
+ }
+ "施工"->{
+ UploadHelper.upload(context, TYPE_ROAD_CONSTRUCTION)
+ }
+ }
+ }
+ VOICE_CMD_PUB_ROAD_CONDITION->{
+ val ob = JSONObject(intent.getStringExtra("data") ?: "").opt("obj")
+ Logger.d(TAG, "ob: $ob")
+ if(ob == "路况") {
+ // 上报实时路况
+ Logger.d(TAG, "分享框准备触发上报实时路况")
+ UploadHelper.upload(context, TYPE_REAL_TIME_TRAFFIC)
+ }
+ }
}
}
}
\ No newline at end of file
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/ShareConstants.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/ShareConstants.java
index a0134b5feb..36fd5aeb72 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/ShareConstants.java
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/ShareConstants.java
@@ -19,5 +19,23 @@ public class ShareConstants {
public static final String VOICE_CMD_SERVICE_EVENT_KEY = "type";
public static final int VOICE_CMD_SERVICE_SEEK_HELP = 1;
+ // 此处只记录了事故、实时路况、道路积水、道路结冰、浓雾,至于拥堵、交通检查和封路是在extention模块里面管理
public static final String VOICE_CMD_PUB_TROUBLE_HELP = "com.zhidao.auxiliaryDriving.pubTroubleHelp";
+ public static final String VOICE_CMD_GO_TO_SHARE = "com.zhidao.share";
+ /**
+ * 这个是实时路况，不是拥堵，拥堵放在了extention模块里面处理
+ */
+ public static final String VOICE_CMD_PUB_ROAD_CONDITION = "com.zhidao.pathfinder.report" +
+ ".roadCondition";
+
+ public static final String TYPE_BLOCK = "1";
+ public static final String TYPE_TRAFFIC_CHECK = "2";
+ public static final String TYPE_CLOSURE = "3";
+ public static final String TYPE_ACCIDENT = "10013";
+ public static final String TYPE_REAL_TIME_TRAFFIC = "10015";
+ public static final String TYPE_SEEK_HELP = "6";
+ public static final String TYPE_STAGNANT_WATER = "10008";
+ public static final String TYPE_ROAD_ICY = "10011";
+ public static final String TYPE_DENSE_FOG = "10010";
+ public static final String TYPE_ROAD_CONSTRUCTION = "10006";
}
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java
index 6337780fac..1e19c2da2f 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java
@@ -20,6 +20,7 @@ import com.mogo.module.share.ShareControl;
import com.mogo.module.share.constant.ShareConstants;
import com.mogo.module.share.manager.ISeekHelpListener;
import com.mogo.module.share.manager.SeekHelpManager;
+import com.mogo.module.share.manager.UploadHelper;
import com.mogo.service.IMogoServiceApis;
import com.mogo.service.MogoServicePaths;
import com.mogo.service.analytics.IMogoAnalytics;
@@ -47,12 +48,19 @@ public class LaucherShareDialog implements View.OnClickListener {
private TextView tvTrafficCheck;
private TextView tvClosure;
private TextView tvNeedHelp;
+
+ private TextView tvAccident;
+ private TextView tvRealTimeTraffic;
+ private TextView tvStagnantWater;
+ private TextView tvRoadIcy;
+ private TextView tvDenseFog;
+ private TextView tvConstruction;
+
private Context mContext;
private IMogoAnalytics mAnalytics;
private IMogoStatusManager mStatusManager;
private IMogoServiceApis mApis;
-
private WindowManager windowManager;
public LaucherShareDialog(@NonNull Context context) {
@@ -72,19 +80,34 @@ public class LaucherShareDialog implements View.OnClickListener {
dismiss();
}
});
+
+
tvBlock = body.findViewById(R.id.tvBlock);
tvTrafficCheck = body.findViewById(R.id.tvTrafficCheck);
tvClosure = body.findViewById(R.id.tvClosure);
- tvNeedHelp = body.findViewById(R.id.tvNeedHelp);
+ tvNeedHelp = body.findViewById(R.id.tvSeekHelp);
+
+ tvAccident = body.findViewById(R.id.tvAccident);
+ tvRealTimeTraffic = body.findViewById(R.id.tvRealTimeTraffic);
+ tvStagnantWater = body.findViewById(R.id.tvStagnantWater);
+ tvRoadIcy = body.findViewById(R.id.tvRoadIcy);
+ tvDenseFog = body.findViewById(R.id.tvDenseFog);
+ tvConstruction = body.findViewById(R.id.tvConstruction);
}
private void initListener() {
-
tvBlock.setOnClickListener(this);
tvNeedHelp.setOnClickListener(this);
tvTrafficCheck.setOnClickListener(this);
tvClosure.setOnClickListener(this);
+
+ tvAccident.setOnClickListener(this);
+ tvRealTimeTraffic.setOnClickListener(this);
+ tvStagnantWater.setOnClickListener(this);
+ tvRoadIcy.setOnClickListener(this);
+ tvDenseFog.setOnClickListener(this);
+ tvConstruction.setOnClickListener(this);
}
@Override
@@ -117,9 +140,27 @@ public class LaucherShareDialog implements View.OnClickListener {
sendShareReceiver("3");
traceTypeData("4");
dismiss();
- } else if (id == R.id.tvNeedHelp) {
+ } else if (id == R.id.tvSeekHelp) {
// 故障求助
SeekHelpManager.INSTANCE.seekHelp(mContext,seekListener,true);
+ } else if (id == R.id.tvAccident) {
+ // 事故
+ sendShareReceiver(ShareConstants.TYPE_ACCIDENT);
+ } else if (id == R.id.tvConstruction) {
+ // 道路施工
+ sendShareReceiver(ShareConstants.TYPE_ROAD_CONSTRUCTION);
+ } else if (id == R.id.tvRealTimeTraffic) {
+ // 实时路况
+ sendShareReceiver(ShareConstants.TYPE_REAL_TIME_TRAFFIC);
+ } else if (id == R.id.tvStagnantWater) {
+ // 道路积水
+ sendShareReceiver(ShareConstants.TYPE_STAGNANT_WATER);
+ } else if (id == R.id.tvRoadIcy) {
+ // 道路结冰
+ sendShareReceiver(ShareConstants.TYPE_ROAD_ICY);
+ } else if (id == R.id.tvDenseFog) {
+ // 浓雾
+ sendShareReceiver(ShareConstants.TYPE_DENSE_FOG);
}
}
@@ -144,15 +185,7 @@ public class LaucherShareDialog implements View.OnClickListener {
* 发送广播 1拥堵，2交通检查，3封路
*/
private void sendShareReceiver(String type) {
- mStatusManager.setUploadingStatus("CARD_TYPE_ROAD_CONDITION", true);
-
- Logger.d("LaucherShareDialog", "LaucherShareDialog sendShareReceiver ---->");
- Intent intent = new Intent();
- intent.setAction("com.zhidao.roadcondition.share");
- intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
- intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
- intent.putExtra("type", type);
- mContext.sendBroadcast(intent);
+ UploadHelper.INSTANCE.upload(mContext, type);
}
/**
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt
new file mode 100644
index 0000000000..906c291da8
--- /dev/null
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt
@@ -0,0 +1,23 @@
+package com.mogo.module.share.manager
+
+import android.content.Context
+import android.content.Intent
+import com.mogo.module.share.ShareControl
+import com.mogo.module.share.dialog.LaucherShareDialog
+import com.mogo.utils.logger.Logger
+
+/**
+ * 上报工具类
+ */
+object UploadHelper {
+ fun upload(context:Context, type: String) {
+ ShareControl.getInstance(context).mogoServiceApis.statusManagerApi.setUploadingStatus("CARD_TYPE_ROAD_CONDITION", true)
+ Logger.d("UploadHelper", "upload ----> $type")
+ val intent = Intent()
+ intent.action = "com.zhidao.roadcondition.share"
+ intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND)
+ intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
+ intent.putExtra("type", type)
+ context.sendBroadcast(intent)
+ }
+}
\ No newline at end of file
diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_accident.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_accident.png
new file mode 100644
index 0000000000..9dd6d425c9
Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_accident.png differ
diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_block_up.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_block_up.png
index d2f7197cce..b504cffe87 100644
Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_block_up.png and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_block_up.png differ
diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_dense_fog.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_dense_fog.png
new file mode 100644
index 0000000000..6a16103d0e
Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_dense_fog.png differ
diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_real_time_traffic.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_real_time_traffic.png
new file mode 100644
index 0000000000..7defe6986d
Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_real_time_traffic.png differ
diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_closure.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_closure.png
index f6e8d2b499..d20dacee3a 100644
Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_closure.png and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_closure.png differ
diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_construction.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_construction.png
new file mode 100644
index 0000000000..3c2ba1225c
Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_construction.png differ
diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_icy.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_icy.png
new file mode 100644
index 0000000000..53585d40d1
Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_icy.png differ
diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_seek_help.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_seek_help.png
index c87f75fd0d..30f26921aa 100644
Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_seek_help.png and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_seek_help.png differ
diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_stagnant_water.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_stagnant_water.png
new file mode 100644
index 0000000000..f125b9f22e
Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_stagnant_water.png differ
diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_traffic_check.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_traffic_check.png
index 737a4c75a8..1b5af5fe54 100644
Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_traffic_check.png and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_traffic_check.png differ
diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_accident.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_accident.png
new file mode 100644
index 0000000000..cfcb9eb87f
Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_accident.png differ
diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_block_up.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_block_up.png
index 0d33d14d6c..0a54b48bad 100644
Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_block_up.png and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_block_up.png differ
diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_dense_fog.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_dense_fog.png
new file mode 100644
index 0000000000..160cdee6a6
Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_dense_fog.png differ
diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_real_time_traffic.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_real_time_traffic.png
new file mode 100644
index 0000000000..d9434fe5f1
Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_real_time_traffic.png differ
diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_closure.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_closure.png
index 0356075b5d..a050e2b61c 100644
Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_closure.png and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_closure.png differ
diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_construction.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_construction.png
new file mode 100644
index 0000000000..4b82b87aa7
Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_construction.png differ
diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_icy.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_icy.png
new file mode 100644
index 0000000000..9edf8ac119
Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_icy.png differ
diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_seek_help.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_seek_help.png
index 018f787003..6ac62048b6 100644
Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_seek_help.png and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_seek_help.png differ
diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_stagnant_water.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_stagnant_water.png
new file mode 100644
index 0000000000..de26656f73
Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_stagnant_water.png differ
diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_traffic_check.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_traffic_check.png
index d9139b14e3..a4660d5e0b 100644
Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_traffic_check.png and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_traffic_check.png differ
diff --git a/modules/mogo-module-share/src/main/res/drawable/shape_bg_222533_20px.xml b/modules/mogo-module-share/src/main/res/drawable/shape_bg_222533_20px.xml
index 0fa61ad26e..1b1f5226d5 100644
--- a/modules/mogo-module-share/src/main/res/drawable/shape_bg_222533_20px.xml
+++ b/modules/mogo-module-share/src/main/res/drawable/shape_bg_222533_20px.xml
@@ -1,5 +1,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-share/src/main/res/layout/item_share_btn.xml b/modules/mogo-module-share/src/main/res/layout/item_share_btn.xml
new file mode 100644
index 0000000000..c732a3e2e5
--- /dev/null
+++ b/modules/mogo-module-share/src/main/res/layout/item_share_btn.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml
index 7c4e60d6bc..d88e11d825 100644
--- a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml
+++ b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml
@@ -36,77 +36,133 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableTop="@drawable/share_block_up"
- android:drawablePadding="@dimen/share_module_tv_margin_top"
- android:gravity="center"
- android:text="上报拥堵"
+ android:text="拥堵"
+ android:textSize="@dimen/dp_32"
+ android:textColor="#fff"
app:layout_constraintHorizontal_chainStyle="spread_inside"
- android:layout_marginStart="@dimen/dp_76"
- android:textColor="@color/white"
- android:textSize="@dimen/share_module_item"
- android:textStyle="bold"
- android:layout_marginTop="@dimen/dp_64"
- app:layout_constraintLeft_toLeftOf="@+id/vBg"
+ android:gravity="center"
+ app:layout_constraintTop_toBottomOf="@+id/btn_share_title"
app:layout_constraintRight_toLeftOf="@+id/tvTrafficCheck"
- app:layout_constraintTop_toBottomOf="@+id/btn_share_title" />
-
+ app:layout_constraintLeft_toLeftOf="@+id/vBg"
+ android:layout_marginStart="@dimen/dp_116"
+ android:layout_marginTop="@dimen/dp_78"
+ android:drawablePadding="@dimen/dp_30" />
-
+ android:drawablePadding="@dimen/dp_30" />
-
+ app:layout_constraintRight_toLeftOf="@+id/tvAccident"
+ android:textColor="#fff"
+ android:gravity="center"
+ android:drawablePadding="@dimen/dp_30" />
+
+
+
-
-
+ app:layout_constraintTop_toBottomOf="@+id/tvTrafficCheck"
+ app:layout_constraintLeft_toLeftOf="@+id/tvTrafficCheck"
+ android:layout_marginTop="@dimen/dp_62"
+ android:drawablePadding="@dimen/dp_30" />
+ android:drawableTop="@drawable/share_stagnant_water"
+ android:text="道路积水"
+ android:textSize="@dimen/dp_32"
+ android:textColor="#fff"
+ android:gravity="center"
+ app:layout_constraintTop_toBottomOf="@+id/tvClosure"
+ app:layout_constraintLeft_toLeftOf="@+id/tvClosure"
+ android:layout_marginTop="@dimen/dp_62"
+ android:drawablePadding="@dimen/dp_30" />
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-share/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-share/src/main/res/values-ldpi/dimens.xml
index d28bf549bd..e74470a9b8 100644
--- a/modules/mogo-module-share/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-share/src/main/res/values-ldpi/dimens.xml
@@ -1,8 +1,8 @@
- 693px
- 320px
+ 776px
+ 428px
34px
43px
100px
diff --git a/modules/mogo-module-share/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-share/src/main/res/values-xhdpi/dimens.xml
index ba3a919930..c50ed40d1e 100644
--- a/modules/mogo-module-share/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-share/src/main/res/values-xhdpi/dimens.xml
@@ -1,7 +1,7 @@
- 1300px
- 600px
+ 1464px
+ 808px
64px
80px
200px