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 d876d6c3e2..cb30b64017 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
@@ -9,6 +9,7 @@ import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.WindowManager;
+import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
@@ -44,17 +45,17 @@ public class LaucherShareDialog implements View.OnClickListener {
private boolean isShown = false;
- private TextView tvBlock;
- private TextView tvTrafficCheck;
- private TextView tvClosure;
- private TextView tvNeedHelp;
+ private ImageView ivBlock;
+ private ImageView ivTrafficCheck;
+ private ImageView ivClosure;
+ private ImageView ivNeedHelp;
- private TextView tvAccident;
- private TextView tvRealTimeTraffic;
- private TextView tvStagnantWater;
- private TextView tvRoadIcy;
- private TextView tvDenseFog;
- private TextView tvConstruction;
+ private ImageView ivAccident;
+ private ImageView ivRealTimeTraffic;
+ private ImageView ivStagnantWater;
+ private ImageView ivRoadIcy;
+ private ImageView ivDenseFog;
+ private ImageView ivConstruction;
private Context mContext;
private IMogoAnalytics mAnalytics;
@@ -82,39 +83,39 @@ public class LaucherShareDialog implements View.OnClickListener {
});
- tvBlock = body.findViewById(R.id.tvBlock);
- tvTrafficCheck = body.findViewById(R.id.tvTrafficCheck);
- tvClosure = body.findViewById(R.id.tvClosure);
- tvNeedHelp = body.findViewById(R.id.tvSeekHelp);
+ ivBlock = body.findViewById(R.id.ivBlock);
+ ivTrafficCheck = body.findViewById(R.id.ivTrafficCheck);
+ ivClosure = body.findViewById(R.id.ivClosure);
+ ivNeedHelp = body.findViewById(R.id.ivSeekHelp);
- 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);
+ ivAccident = body.findViewById(R.id.ivAccident);
+ ivRealTimeTraffic = body.findViewById(R.id.ivRealTimeTraffic);
+ ivStagnantWater = body.findViewById(R.id.ivStagnantWater);
+ ivRoadIcy = body.findViewById(R.id.ivRoadIcy);
+ ivDenseFog = body.findViewById(R.id.ivDenseFog);
+ ivConstruction = body.findViewById(R.id.ivConstruction);
}
private void initListener() {
- tvBlock.setOnClickListener(this);
- tvNeedHelp.setOnClickListener(this);
- tvTrafficCheck.setOnClickListener(this);
- tvClosure.setOnClickListener(this);
+ ivBlock.setOnClickListener(this);
+ ivNeedHelp.setOnClickListener(this);
+ ivTrafficCheck.setOnClickListener(this);
+ ivClosure.setOnClickListener(this);
- tvAccident.setOnClickListener(this);
- tvRealTimeTraffic.setOnClickListener(this);
- tvStagnantWater.setOnClickListener(this);
- tvRoadIcy.setOnClickListener(this);
- tvDenseFog.setOnClickListener(this);
- tvConstruction.setOnClickListener(this);
+ ivAccident.setOnClickListener(this);
+ ivRealTimeTraffic.setOnClickListener(this);
+ ivStagnantWater.setOnClickListener(this);
+ ivRoadIcy.setOnClickListener(this);
+ ivDenseFog.setOnClickListener(this);
+ ivConstruction.setOnClickListener(this);
}
@Override
public void onClick(View view) {
int id = view.getId();
Logger.d(TAG, "onClick: " + id);
- if (id == R.id.tvBlock) {
+ if (id == R.id.ivBlock) {
//拥堵
traceTanluData("1");
sendShareReceiver(ShareConstants.TYPE_BLOCK);
@@ -128,43 +129,43 @@ public class LaucherShareDialog implements View.OnClickListener {
mContext.startActivity(intent);
traceTypeData("2");
dismiss();
- } else if (id == R.id.tvTrafficCheck) {
+ } else if (id == R.id.ivTrafficCheck) {
//交通检查
traceData("1");
sendShareReceiver(ShareConstants.TYPE_TRAFFIC_CHECK);
traceTypeData("3");
dismiss();
- } else if (id == R.id.tvClosure) {
+ } else if (id == R.id.ivClosure) {
//封路
traceData("1");
sendShareReceiver(ShareConstants.TYPE_CLOSURE);
traceTypeData("4");
dismiss();
- } else if (id == R.id.tvSeekHelp) {
+ } else if (id == R.id.ivSeekHelp) {
// 故障求助
SeekHelpManager.INSTANCE.seekHelp(mContext,seekListener,true);
dismiss();
- } else if (id == R.id.tvAccident) {
+ } else if (id == R.id.ivAccident) {
// 事故
sendShareReceiver(ShareConstants.TYPE_ACCIDENT);
dismiss();
- } else if (id == R.id.tvConstruction) {
+ } else if (id == R.id.ivConstruction) {
// 道路施工
sendShareReceiver(ShareConstants.TYPE_ROAD_CONSTRUCTION);
dismiss();
- } else if (id == R.id.tvRealTimeTraffic) {
+ } else if (id == R.id.ivRealTimeTraffic) {
// 实时路况
sendShareReceiver(ShareConstants.TYPE_REAL_TIME_TRAFFIC);
dismiss();
- } else if (id == R.id.tvStagnantWater) {
+ } else if (id == R.id.ivStagnantWater) {
// 道路积水
sendShareReceiver(ShareConstants.TYPE_STAGNANT_WATER);
dismiss();
- } else if (id == R.id.tvRoadIcy) {
+ } else if (id == R.id.ivRoadIcy) {
// 道路结冰
sendShareReceiver(ShareConstants.TYPE_ROAD_ICY);
dismiss();
- } else if (id == R.id.tvDenseFog) {
+ } else if (id == R.id.ivDenseFog) {
// 浓雾
sendShareReceiver(ShareConstants.TYPE_DENSE_FOG);
dismiss();
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
index 9dd6d425c9..25a48d3421 100644
Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_accident.png 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 b504cffe87..84938b8857 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
index 6a16103d0e..191880b2b9 100644
Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_dense_fog.png 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
index 7defe6986d..87f712f8c7 100644
Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_real_time_traffic.png 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 d20dacee3a..57e9e67c75 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
index 3c2ba1225c..f41703de30 100644
Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_construction.png 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
index 53585d40d1..3ff45f0ed0 100644
Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_icy.png 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 30f26921aa..4f6774eae8 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
index f125b9f22e..32224d0816 100644
Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_stagnant_water.png 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 1b5af5fe54..e27aa13c0a 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
index cfcb9eb87f..5a3fbe67df 100644
Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_accident.png 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 0a54b48bad..e13c42513d 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
index 160cdee6a6..85ab743696 100644
Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_dense_fog.png 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
index d9434fe5f1..049d213148 100644
Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_real_time_traffic.png 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 a050e2b61c..1e25f9439b 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
index 4b82b87aa7..56f1d320ab 100644
Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_construction.png 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
index 9edf8ac119..b360bb4960 100644
Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_icy.png 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 6ac62048b6..79ee716a3f 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
index de26656f73..60bcfd519d 100644
Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_stagnant_water.png 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 a4660d5e0b..776f73a59c 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/module_share_btn_bg.xml b/modules/mogo-module-share/src/main/res/drawable/module_share_btn_bg.xml
new file mode 100644
index 0000000000..e3dfb32cd0
--- /dev/null
+++ b/modules/mogo-module-share/src/main/res/drawable/module_share_btn_bg.xml
@@ -0,0 +1,9 @@
+
+
+ -
+
+
+
+
+
+
\ 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 d88e11d825..a5e5a4a94f 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
@@ -31,138 +31,239 @@
app:layout_constraintStart_toStartOf="@+id/vBg"
app:layout_constraintTop_toTopOf="@+id/vBg" />
+
+
+ android:layout_marginTop="@dimen/dp_30"
+ android:text="拥堵"
+ android:textColor="#fff"
+ android:textSize="@dimen/dp_32"
+ app:layout_constraintHorizontal_chainStyle="spread_inside"
+ app:layout_constraintLeft_toLeftOf="@+id/vBg"
+ app:layout_constraintRight_toLeftOf="@+id/tvTrafficCheck"
+ app:layout_constraintTop_toBottomOf="@+id/ivBlock" />
+
+
+
+ app:layout_constraintTop_toTopOf="@+id/tvBlock" />
+
+
+
+ app:layout_constraintTop_toTopOf="@+id/tvBlock" />
+
+
+
+ app:layout_constraintTop_toTopOf="@+id/tvBlock" />
+
+
+
+ app:layout_constraintTop_toTopOf="@+id/tvBlock" />
+
+
+
+ android:text="实时路况"
+ android:textColor="#fff"
+ android:textSize="@dimen/dp_32"
+ app:layout_constraintLeft_toLeftOf="@+id/ivRealTimeTraffic"
+ app:layout_constraintRight_toRightOf="@+id/ivRealTimeTraffic"
+ app:layout_constraintTop_toBottomOf="@+id/ivRealTimeTraffic" />
+
+ app:layout_constraintRight_toRightOf="@+id/tvTrafficCheck"
+ app:layout_constraintTop_toTopOf="@id/tvRealTimeTraffic"/>
+
+ app:layout_constraintRight_toRightOf="@+id/tvClosure"
+ app:layout_constraintTop_toTopOf="@+id/tvSeekHelp"/>
+
+ android:text="道路积冰"
+ android:textColor="#fff"
+ android:textSize="@dimen/dp_32"
+ app:layout_constraintLeft_toLeftOf="@+id/tvAccident"
+ app:layout_constraintRight_toRightOf="@+id/tvAccident"
+ app:layout_constraintTop_toTopOf="@+id/tvStagnantWater"/>
+
+ android:text="浓雾"
+ android:textColor="#fff"
+ android:textSize="@dimen/dp_32"
+ app:layout_constraintLeft_toLeftOf="@+id/tvConstruction"
+ app:layout_constraintRight_toRightOf="@+id/tvConstruction"
+ app:layout_constraintTop_toTopOf="@+id/tvRoadIcy"/>
\ No newline at end of file