diff --git a/modules/mogo-module-common/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-common/src/main/res/values-ldpi/dimens.xml index 1e7b7a3622..5ead382602 100644 --- a/modules/mogo-module-common/src/main/res/values-ldpi/dimens.xml +++ b/modules/mogo-module-common/src/main/res/values-ldpi/dimens.xml @@ -1013,6 +1013,8 @@ 498.5000px 499.0000px 499.5000px + 650.0000px + 3.0000px 3.5000px 4.0000px diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml index 969c397a02..d56caf71d6 100644 --- a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml @@ -1016,6 +1016,7 @@ 997px 998px 999px + 1300px diff --git a/modules/mogo-module-common/src/main/res/values/dimens.xml b/modules/mogo-module-common/src/main/res/values/dimens.xml index 969c397a02..d56caf71d6 100644 --- a/modules/mogo-module-common/src/main/res/values/dimens.xml +++ b/modules/mogo-module-common/src/main/res/values/dimens.xml @@ -1016,6 +1016,7 @@ 997px 998px 999px + 1300px 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 4d3ad002d3..45a61266fc 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 @@ -5,11 +5,10 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.view.View; -import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.NonNull; - import com.mogo.module.share.R; import com.mogo.utils.logger.Logger; @@ -21,7 +20,10 @@ import com.mogo.utils.logger.Logger; */ public class LaucherShareDialog extends Dialog implements View.OnClickListener { private TextView txtOk; - private ImageView mBackImage; + private RelativeLayout mBlockLayout; + private RelativeLayout mOilPriceLayout; + private RelativeLayout mTrafficCheckLayout; + private RelativeLayout mRoadClosureLayout; private Context mContext; @@ -44,22 +46,38 @@ public class LaucherShareDialog extends Dialog implements View.OnClickListener { private void initView() { setContentView(R.layout.launcher_dialog_share); txtOk = findViewById(R.id.btn_share_title); - mBackImage = findViewById(R.id.btn_back); + mBlockLayout = findViewById(R.id.btn_block_layout); + mOilPriceLayout = findViewById(R.id.oil_price_layout); + mTrafficCheckLayout = findViewById(R.id.traffic_check_layout); + mRoadClosureLayout = findViewById(R.id.road_closure_layout); } - private void initListener() { - mBackImage.setOnClickListener(this); + private void initListener() { + mBlockLayout.setOnClickListener(this); + mOilPriceLayout.setOnClickListener(this); + mTrafficCheckLayout.setOnClickListener(this); + mRoadClosureLayout.setOnClickListener(this); } @Override public void onClick(View view) { int id = view.getId(); - if (id == R.id.btn_back) { + if (id == R.id.btn_block_layout) { sendShareReceiver(); - dismiss(); + } else if (id == R.id.oil_price_layout) { + //TODO + + } else if (id == R.id.traffic_check_layout) { + //TODO + + } else if (id == R.id.road_closure_layout) { + //TODO + } + + dismiss(); } /** @@ -70,6 +88,7 @@ public class LaucherShareDialog extends Dialog implements View.OnClickListener { Intent intent = new Intent(); intent.setAction("com.zhidao.roadcondition.share"); intent.putExtra("type", "1"); + intent.putExtra("keyWords", "xx"); mContext.sendBroadcast(intent); } diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/main_video_play_btn_normal.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/main_video_play_btn_normal.png deleted file mode 100644 index 7db2e805ee..0000000000 Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/main_video_play_btn_normal.png and /dev/null 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 new file mode 100644 index 0000000000..aa80dfe42f Binary files /dev/null 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_oil_price.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_oil_price.png new file mode 100644 index 0000000000..2d3321bbdc Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_oil_price.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 new file mode 100644 index 0000000000..7726fc04d4 Binary files /dev/null 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_traffic_check.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_traffic_check.png new file mode 100644 index 0000000000..18e28e06f7 Binary files /dev/null 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 new file mode 100644 index 0000000000..0fa61ad26e --- /dev/null +++ b/modules/mogo-module-share/src/main/res/drawable/shape_bg_222533_20px.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share.xml b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share.xml index 0e191c8292..2d9b08d3c1 100644 --- a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share.xml +++ b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share.xml @@ -1,41 +1,144 @@ + android:layout_width="@dimen/dp_1300" + android:layout_height="@dimen/dp_600" + android:background="@drawable/shape_bg_222533_20px"> - + android:textSize="@dimen/dp_40" /> + android:layout_height="match_parent" + android:layout_below="@+id/btn_share_title" + android:layout_centerHorizontal="true" + android:layout_marginTop="@dimen/dp_64"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file diff --git a/modules/mogo-module-share/src/main/res/values/colors.xml b/modules/mogo-module-share/src/main/res/values/colors.xml index 0081f334bf..ebf7824990 100644 --- a/modules/mogo-module-share/src/main/res/values/colors.xml +++ b/modules/mogo-module-share/src/main/res/values/colors.xml @@ -7,6 +7,7 @@ #FF1B1B #FFFFFF #80FFFFFF + #99FFFFFF #F8F8F8 #333333 #DADAE2 @@ -14,5 +15,6 @@ #99191C25 #666666 #999999 + #000000 diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java index cf785b7158..ad854fb698 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java @@ -229,7 +229,7 @@ public class TanluCardViewFragment extends MvpFragment> */ private void handleRoadLineMessage() { mMogoSocketManager = (IMogoSocketManager) ARouter.getInstance().build(MogoServicePaths.PATH_SOCKET_MANAGER).navigation(); - mMogoSocketManager.registerOnMessageListener(1, new IMogoOnMessageListener() { + mMogoSocketManager.registerOnMessageListener(401005, new IMogoOnMessageListener() { @Override public Class target() { return MarkerResponse.class; @@ -237,14 +237,13 @@ public class TanluCardViewFragment extends MvpFragment> @Override public void onMsgReceived(MarkerResponse obj) { - Logger.e(TAG, "onMsgReceived obj= " + obj); + Logger.e(TAG, "handleRoadLineMessage onMsgReceived obj= " + obj); getRoadLineData(); } }); } /** - * TODO * * @param view */