diff --git a/gradle.properties b/gradle.properties index 821e403f79..39d4c3a7f2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -66,7 +66,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.1 # v2x -MOGO_MODULE_V2X_VERSION=1.0.3.3-SNAPSHOT +MOGO_MODULE_V2X_VERSION=1.0.3.6 # 媒体卡片 MOGO_MODULE_MEDIA_VERSION=1.0.4.3 # 推送 diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index ff987c2e05..93a8a6d4ed 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -8,6 +8,7 @@ import android.os.Message; import android.util.Log; import android.view.MotionEvent; import android.view.View; +import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.DrawableRes; @@ -82,7 +83,9 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent private View mHome; private View mCompany; - private TextView mUploadRoadCondition; + private View mUploadRoadCondition; + private TextView mUpload; + private ImageView mUploading; private View mVRMode; private View mMove2CurrentLocation; @@ -119,21 +122,52 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent @DrawableRes private int[] mUploadingFrameRes = { - R.drawable.amap_route_color_texture_0_arrow, - R.drawable.amap_route_color_texture_1_arrow, - R.drawable.amap_route_color_texture_2_arrow, - R.drawable.amap_route_color_texture_3_arrow, - R.drawable.amap_route_color_texture_4_arrow, - R.drawable.amap_route_color_texture_5_arrow, - R.drawable.amap_route_color_texture_6_arrow, - R.drawable.amap_route_color_texture_7_arrow, - R.drawable.amap_route_color_texture_8_arrow, - R.drawable.amap_route_color_texture_9_arrow, + R.drawable.module_ext_ic_uploading_00000, + R.drawable.module_ext_ic_uploading_00001, + R.drawable.module_ext_ic_uploading_00002, + R.drawable.module_ext_ic_uploading_00003, + R.drawable.module_ext_ic_uploading_00004, + R.drawable.module_ext_ic_uploading_00005, + R.drawable.module_ext_ic_uploading_00006, + R.drawable.module_ext_ic_uploading_00007, + R.drawable.module_ext_ic_uploading_00008, + R.drawable.module_ext_ic_uploading_00009, + R.drawable.module_ext_ic_uploading_00010, + R.drawable.module_ext_ic_uploading_00011, + R.drawable.module_ext_ic_uploading_00012, + R.drawable.module_ext_ic_uploading_00013, + R.drawable.module_ext_ic_uploading_00014, + R.drawable.module_ext_ic_uploading_00015, + R.drawable.module_ext_ic_uploading_00016, + R.drawable.module_ext_ic_uploading_00017, + R.drawable.module_ext_ic_uploading_00018, + R.drawable.module_ext_ic_uploading_00019, + R.drawable.module_ext_ic_uploading_00020, + R.drawable.module_ext_ic_uploading_00021, + R.drawable.module_ext_ic_uploading_00022, + R.drawable.module_ext_ic_uploading_00023, + R.drawable.module_ext_ic_uploading_00024, + R.drawable.module_ext_ic_uploading_00025, + R.drawable.module_ext_ic_uploading_00026, + R.drawable.module_ext_ic_uploading_00027, + R.drawable.module_ext_ic_uploading_00028, + R.drawable.module_ext_ic_uploading_00029, + R.drawable.module_ext_ic_uploading_00030, + R.drawable.module_ext_ic_uploading_00031, + R.drawable.module_ext_ic_uploading_00032, + R.drawable.module_ext_ic_uploading_00033, + R.drawable.module_ext_ic_uploading_00034, + R.drawable.module_ext_ic_uploading_00035, + R.drawable.module_ext_ic_uploading_00036, + R.drawable.module_ext_ic_uploading_00037, + R.drawable.module_ext_ic_uploading_00038, + R.drawable.module_ext_ic_uploading_00039, + R.drawable.module_ext_ic_uploading_00040 }; private int mCurrentUploadFrame = 0; private Handler mUploadFrameAnimHandler; public static final int MSG_FRAME_ANIM = 307; - public static final long TIME_FRAME_INTERVAL_TIME = 200; + public static final long TIME_FRAME_INTERVAL_TIME = 80; @Override protected int getLayoutId() { @@ -174,6 +208,8 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent } ); mUploadRoadCondition = findViewById( R.id.module_entrance_id_upload_road_condition ); + mUpload = findViewById( R.id.module_entrance_id_upload ); + mUploading = findViewById( R.id.module_entrance_id_uploading ); mUploadRoadCondition.setOnClickListener( view -> { isClickShare = true; if ( mIMogoAuthorizeModuleManager.needAuthorize( AUTHORIZE_TYPE_LAUNCHER_SHARE ) ) { @@ -472,11 +508,14 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent } if ( descriptor == StatusDescriptor.UPLOADING ) { if ( isTrue ) { + mUploading.setVisibility( View.VISIBLE ); + mUpload.setVisibility( View.GONE ); doFrameAnimOnUploadButton(); } else { + mCurrentUploadFrame = 0; mUploadFrameAnimHandler.removeMessages( MSG_FRAME_ANIM ); - mUploadRoadCondition.setText( R.string.module_map_str_upload_road_condition ); - mUploadRoadCondition.setBackgroundResource( R.drawable.module_ext_dw_upload_road_condition_bkg ); + mUploading.setVisibility( View.GONE ); + mUpload.setVisibility( View.VISIBLE ); } } } @@ -489,17 +528,24 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent super.handleMessage( msg ); if ( msg.what == MSG_FRAME_ANIM ) { if ( mUploadingFrameRes == null || mUploadingFrameRes.length == 0 ) { + if ( mUploading != null ) { + mUploading.setVisibility( View.GONE ); + } + if ( mUpload != null ) { + mUpload.setVisibility( View.VISIBLE ); + } return; } if ( !mMogoStatusManager.isUploading() ) { mCurrentUploadFrame = 0; - if ( mUploadRoadCondition != null ) { - mUploadRoadCondition.setText( R.string.module_map_str_upload_road_condition ); - mUploadRoadCondition.setBackgroundResource( R.drawable.module_ext_dw_upload_road_condition_bkg ); - } return; } - mUploadRoadCondition.setBackgroundResource( mUploadingFrameRes[mCurrentUploadFrame++ % mUploadingFrameRes.length] ); + if ( mUploading != null ) { + if ( mCurrentUploadFrame == mUploadingFrameRes.length ) { + mCurrentUploadFrame = 12; + } + mUploading.setImageResource( mUploadingFrameRes[mCurrentUploadFrame++%mUploadingFrameRes.length] ); + } mUploadFrameAnimHandler.sendEmptyMessageDelayed( MSG_FRAME_ANIM, TIME_FRAME_INTERVAL_TIME ); } } diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00000.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00000.png new file mode 100755 index 0000000000..767a0daae1 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00000.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00001.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00001.png new file mode 100755 index 0000000000..a42e41b5db Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00001.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00002.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00002.png new file mode 100755 index 0000000000..feb52311e6 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00002.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00003.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00003.png new file mode 100755 index 0000000000..02d90c866a Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00003.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00004.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00004.png new file mode 100755 index 0000000000..2c44d8dff0 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00004.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00005.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00005.png new file mode 100755 index 0000000000..9de4dea89f Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00005.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00006.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00006.png new file mode 100755 index 0000000000..7196982ec9 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00006.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00007.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00007.png new file mode 100755 index 0000000000..59ca169573 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00007.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00008.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00008.png new file mode 100755 index 0000000000..097ba24307 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00008.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00009.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00009.png new file mode 100755 index 0000000000..5cc7f33552 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00009.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00010.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00010.png new file mode 100755 index 0000000000..7e4ef678af Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00010.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00011.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00011.png new file mode 100755 index 0000000000..e8cf54cbbc Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00011.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00012.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00012.png new file mode 100755 index 0000000000..0b72c9764d Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00012.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00013.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00013.png new file mode 100755 index 0000000000..618fbf72af Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00013.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00014.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00014.png new file mode 100755 index 0000000000..65f2ae53ce Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00014.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00015.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00015.png new file mode 100755 index 0000000000..8e7b97f13d Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00015.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00016.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00016.png new file mode 100755 index 0000000000..21d2111b0a Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00016.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00017.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00017.png new file mode 100755 index 0000000000..d7136954cc Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00017.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00018.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00018.png new file mode 100755 index 0000000000..b58a5f1aa9 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00018.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00019.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00019.png new file mode 100755 index 0000000000..30311edfae Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00019.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00020.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00020.png new file mode 100755 index 0000000000..853e2b3000 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00020.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00021.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00021.png new file mode 100755 index 0000000000..cfde8452ac Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00021.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00022.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00022.png new file mode 100755 index 0000000000..c629066c85 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00022.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00023.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00023.png new file mode 100755 index 0000000000..bc0ea2d023 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00023.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00024.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00024.png new file mode 100755 index 0000000000..8f6f222034 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00024.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00025.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00025.png new file mode 100755 index 0000000000..b09b1c3b96 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00025.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00026.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00026.png new file mode 100755 index 0000000000..b5ef21355c Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00026.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00027.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00027.png new file mode 100755 index 0000000000..13aab52111 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00027.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00028.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00028.png new file mode 100755 index 0000000000..c2e853d2a4 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00028.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00029.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00029.png new file mode 100755 index 0000000000..6125a094d4 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00029.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00030.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00030.png new file mode 100755 index 0000000000..062f90c18a Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00030.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00031.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00031.png new file mode 100755 index 0000000000..dce2426df9 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00031.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00032.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00032.png new file mode 100755 index 0000000000..d8846dea07 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00032.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00033.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00033.png new file mode 100755 index 0000000000..36a0d5ccf7 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00033.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00034.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00034.png new file mode 100755 index 0000000000..f075e6f138 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00034.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00035.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00035.png new file mode 100755 index 0000000000..c10d7976ce Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00035.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00036.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00036.png new file mode 100755 index 0000000000..321a6baff0 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00036.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00037.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00037.png new file mode 100755 index 0000000000..d0aeb46f52 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00037.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00038.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00038.png new file mode 100755 index 0000000000..689999c833 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00038.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00039.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00039.png new file mode 100755 index 0000000000..ae919cc4d8 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00039.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00040.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00040.png new file mode 100755 index 0000000000..33059a422a Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_uploading_00040.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00000.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00000.png new file mode 100755 index 0000000000..bf90653042 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00000.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00001.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00001.png new file mode 100755 index 0000000000..e7f59bba82 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00001.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00002.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00002.png new file mode 100755 index 0000000000..e7484815dd Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00002.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00003.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00003.png new file mode 100755 index 0000000000..23e05162f3 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00003.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00004.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00004.png new file mode 100755 index 0000000000..426e5d87fa Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00004.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00005.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00005.png new file mode 100755 index 0000000000..35710444af Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00005.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00006.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00006.png new file mode 100755 index 0000000000..4fdd8412d7 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00006.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00007.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00007.png new file mode 100755 index 0000000000..bf0e1639c9 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00007.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00008.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00008.png new file mode 100755 index 0000000000..3bf0fd645c Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00008.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00009.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00009.png new file mode 100755 index 0000000000..150af8181a Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00009.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00010.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00010.png new file mode 100755 index 0000000000..1cbf60fa82 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00010.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00011.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00011.png new file mode 100755 index 0000000000..1314781ec1 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00011.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00012.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00012.png new file mode 100755 index 0000000000..ad5ae7b2ad Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00012.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00013.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00013.png new file mode 100755 index 0000000000..5eb1f39f54 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00013.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00014.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00014.png new file mode 100755 index 0000000000..e60c535dc7 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00014.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00015.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00015.png new file mode 100755 index 0000000000..ea0afe381f Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00015.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00016.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00016.png new file mode 100755 index 0000000000..3cee9ff9af Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00016.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00017.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00017.png new file mode 100755 index 0000000000..7cd4c671b7 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00017.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00018.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00018.png new file mode 100755 index 0000000000..1690e4229c Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00018.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00019.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00019.png new file mode 100755 index 0000000000..f47489e733 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00019.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00020.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00020.png new file mode 100755 index 0000000000..0c9bfb1681 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00020.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00021.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00021.png new file mode 100755 index 0000000000..2dd8c9d81f Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00021.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00022.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00022.png new file mode 100755 index 0000000000..1de34da823 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00022.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00023.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00023.png new file mode 100755 index 0000000000..b11e82192c Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00023.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00024.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00024.png new file mode 100755 index 0000000000..6a012d3b19 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00024.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00025.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00025.png new file mode 100755 index 0000000000..4692719d27 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00025.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00026.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00026.png new file mode 100755 index 0000000000..9d0d1eccc1 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00026.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00027.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00027.png new file mode 100755 index 0000000000..939008c6a3 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00027.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00028.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00028.png new file mode 100755 index 0000000000..dbdd995434 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00028.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00029.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00029.png new file mode 100755 index 0000000000..5c440b540f Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00029.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00030.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00030.png new file mode 100755 index 0000000000..3de70dc4b5 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00030.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00031.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00031.png new file mode 100755 index 0000000000..63c8fd21a6 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00031.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00032.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00032.png new file mode 100755 index 0000000000..23ece79d66 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00032.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00033.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00033.png new file mode 100755 index 0000000000..07dff143d6 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00033.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00034.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00034.png new file mode 100755 index 0000000000..2cd8aec809 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00034.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00035.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00035.png new file mode 100755 index 0000000000..c9a85c91ad Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00035.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00036.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00036.png new file mode 100755 index 0000000000..47801f8697 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00036.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00037.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00037.png new file mode 100755 index 0000000000..3fdb83809c Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00037.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00038.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00038.png new file mode 100755 index 0000000000..0e93f3cc10 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00038.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00039.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00039.png new file mode 100755 index 0000000000..89fa263065 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00039.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00040.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00040.png new file mode 100755 index 0000000000..44f6e29055 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_uploading_00040.png differ diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml index 4dac1458fd..16f4130c0c 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml @@ -179,20 +179,36 @@ - + app:layout_goneMarginRight="@dimen/module_ext_operation_panel_share_goneMarginRight" + android:layout_width="@dimen/module_ext_operation_panel_share_width" + android:layout_marginBottom="@dimen/module_ext_operation_panel_share_marginBottom" + android:layout_height="@dimen/module_ext_operation_panel_share_height"> + + + { public MainPresenter( MainView view ) { super( view ); mCardStartShowTime = System.currentTimeMillis(); + SchemeIntent.getInstance().init( getContext(), mView.getApis() ); } @Override @@ -141,7 +142,6 @@ public class MainPresenter extends Presenter< MainView > { } public void handleSchemeIntent( Intent intent ) { - SchemeIntent.getInstance().init( getContext(), mView.getApis() ); SchemeIntent.getInstance().handle( intent ); } } diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java index 020753e13c..81185341b8 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java @@ -3,13 +3,19 @@ package com.mogo.module.main; import android.content.Context; import android.content.Intent; import android.net.Uri; +import android.text.TextUtils; import com.mogo.map.MogoLatLng; import com.mogo.module.common.ModuleNames; import com.mogo.module.main.livedata.CardInfo; import com.mogo.module.main.livedata.CardSwitchLiveData; import com.mogo.service.IMogoServiceApis; +import com.mogo.service.intent.IMogoIntentListener; +import com.mogo.service.intent.IMogoIntentManager; +import com.mogo.service.statusmanager.IMogoStatusChangedListener; +import com.mogo.service.statusmanager.StatusDescriptor; import com.mogo.utils.TipToast; +import com.mogo.utils.UiThreadHandler; import com.mogo.utils.logger.Logger; /** @@ -20,7 +26,7 @@ import com.mogo.utils.logger.Logger; *

* 导航：adb shell am start -d "mogo://launcher/main/switch2?type=navi'&'lon=116.327007'&'lat=39.977639" */ -public class SchemeIntent { +public class SchemeIntent implements IMogoStatusChangedListener { private static final String TAG = "SchemeIntent"; @@ -29,6 +35,8 @@ public class SchemeIntent { private IMogoServiceApis mApis; private Context mContext; + private Intent mNextIntent; + private SchemeIntent() { // private constructor } @@ -44,6 +52,7 @@ public class SchemeIntent { public void init( Context context, IMogoServiceApis apis ) { mContext = context; mApis = apis; + mApis.getStatusManagerApi().registerStatusChangedListener( TAG, StatusDescriptor.MAIN_PAGE_RESUME, this ); } private Object readResolve() { @@ -60,15 +69,28 @@ public class SchemeIntent { if ( path == null || path.isEmpty() ) { return; } + + if ( !mApis.getStatusManagerApi().isMainPageOnResume() ) { + mNextIntent = intent; + mApis.getLauncherApi().backToLauncher( mContext ); + return; + } + switch ( path ) { case "/main/switch2": handleSwitch2Action( target ); break; } + + + mNextIntent = null; } private void handleSwitch2Action( Uri target ) { String type = target.getQueryParameter( "type" ); + if ( TextUtils.isEmpty( type ) ) { + return; + } switch ( type ) { case ModuleNames.CARD_TYPE_BUSINESS_OPERATION: case ModuleNames.CARD_TYPE_CARS_CHATTING: @@ -110,4 +132,16 @@ public class SchemeIntent { Logger.e( TAG, e, "error." ); } } + + @Override + public void onStatusChanged( StatusDescriptor descriptor, boolean isTrue ) { + if ( descriptor == StatusDescriptor.MAIN_PAGE_RESUME ) { + if ( isTrue ) { + // 保证回到桌面后在开始该规划路线。 + UiThreadHandler.postDelayed( () -> { + handle( mNextIntent ); + }, 2_000L ); + } + } + } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java index 8c9a26d8fe..7b7331392f 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java @@ -199,6 +199,8 @@ public class MogoServices implements IMogoMapListener, */ private void invokeAutoRefresh() { if ( mStatusManager.isSearchUIShow() || mStatusManager.isADASShow() ) { + mStatusManager.setUserInteractionStatus( TAG, true, false ); + mUiController.recoverLockMode(); return; } mStatusManager.setUserInteractionStatus( ServiceConst.TYPE, true, false ); @@ -345,6 +347,9 @@ public class MogoServices implements IMogoMapListener, Logger.i( TAG, "刷新半径 = %s, 点 = %s, zoomLevel = %s, amount = %s", ro.mRadius, ro.mLonLat, mLastZoomLevel, ro.mAmount ); } + } else if( msg.what == ServiceConst.MSG_LOCK_CAR ){ + mStatusManager.setUserInteractionStatus( TAG, true, false ); + mUiController.recoverLockMode(); } } }; @@ -465,7 +470,10 @@ public class MogoServices implements IMogoMapListener, @Override public void onLockMap( boolean isLock ) { - + mThreadHandler.removeMessages( ServiceConst.MSG_LOCK_CAR ); + if ( !isLock ) { + mThreadHandler.sendEmptyMessageDelayed( ServiceConst.MSG_LOCK_CAR, ServiceConst.DEFAULT_AUTO_REFRESH_WHEN_INTERRUPT ); + } } @Override diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/ServiceConst.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/ServiceConst.java index 967f8e7155..304c284b98 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/ServiceConst.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/ServiceConst.java @@ -83,7 +83,7 @@ public class ServiceConst { public static final int DEFAULT_AUTO_REFRESH_DATA_RADIUS = 2_000; /** - * 30 s + * 20 s */ public static final int DEFAULT_AUTO_REFRESH_WHEN_INTERRUPT = 20 * 1_000; @@ -107,6 +107,12 @@ public class ServiceConst { */ public static final int MSG_REQUEST_DATA = 0x201; + /** + * + * 锁车消息 + */ + public static final int MSG_LOCK_CAR = 0x202; + /** * 切换卡片内容-上一个 diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java index 475bab0a0b..356bb2afb1 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java @@ -3,6 +3,7 @@ package com.mogo.module.service.intent; import android.content.Context; import android.content.Intent; import android.graphics.Color; +import android.net.Uri; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -64,6 +65,26 @@ public class MockIntentHandler implements IntentHandler { boolean status1 = intent.getBooleanExtra( "status", false ); MarkerServiceHandler.getMogoStatusManager().setUploadingStatus( TAG, status1 ); break; + case 7: + TextView button11 = MarkerServiceHandler.getApis().getEntranceButtonController().getButton( ButtonIndex.BUTTON1 ); + if ( button11 != null ) { + button11.setVisibility( View.VISIBLE ); + button11.setBackgroundColor( Color.RED ); + button11.setOnClickListener( view -> { + Intent intent1 = new Intent( ); + intent1.setAction( Intent.ACTION_VIEW ); + intent1.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK ); + intent1.setData( Uri.parse("wechathelper://com.zhidao.wechathelper/main/transform?type=navi&lon=116.327007&lat=39.977639&from=os2.0") ); + try { + view.setOnClickListener( null ); + view.getContext().startActivity( intent1 ); + } catch ( Exception e ) { + e.printStackTrace(); + } + view.setVisibility( View.GONE ); + } ); + } + break; } } }