diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 663459aa50..0d156937bb 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -3,9 +3,18 @@ + diff --git a/.idea/misc.xml b/.idea/misc.xml index 21e99e2dc0..cd77a1f062 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppsModel.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppsModel.java index 9c429602c9..ca43439031 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppsModel.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppsModel.java @@ -87,7 +87,7 @@ public class AppsModel { continue; } int page = counter++ / AppsConst.TOTAL_SIZE_EACH_PAGE; - if ( !mPagedApps.containsKey( page ) ) { + if ( mPagedApps.get( page ) == null ) { mPagedApps.put( page, new ArrayList<>() ); } String appName = getApplicationName( packageManager, packageInfo ); @@ -131,7 +131,7 @@ public class AppsModel { Drawable appIcon = packageInfo.applicationInfo.loadIcon( packageManager ); AppInfo appInfo = new AppInfo( appName, packageName, versionName, versionCode, appIcon, AppEnumHelper.getCustomizedAppIconResId( packageName ) ); int pageIndex = getPageIndex( packageName, true ); - if ( !mPagedApps.containsKey( pageIndex ) ) { + if ( mPagedApps.get( pageIndex ) == null ) { mPagedApps.put( pageIndex, new ArrayList<>() ); } mPagedApps.get( pageIndex ).add( appInfo ); @@ -205,7 +205,7 @@ public class AppsModel { continue; } int page = counter++ / AppsConst.TOTAL_SIZE_EACH_PAGE + pageIndex; - if ( !mPagedApps.containsKey( page ) ) { + if ( mPagedApps.get( page ) == null ) { mPagedApps.put( page, new ArrayList<>() ); } mPagedApps.get( page ).add( appInfo ); 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 e962718e6c..581046b9c9 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 @@ -83,8 +83,6 @@ android:layout_height="@dimen/module_ext_operation_panel_move2_height" android:background="@drawable/module_ext_shadow_bkg" android:scaleType="centerInside" - android:translationY="@dimen/module_common_shadow_width_pos" - android:translationX="@dimen/module_common_shadow_width_pos" android:src="@drawable/module_map_ic_move2_current_location" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" /> @@ -94,6 +92,7 @@ android:layout_width="@dimen/module_ext_operation_panel_share_width" android:layout_height="@dimen/module_ext_operation_panel_share_height" android:layout_marginBottom="@dimen/module_ext_operation_panel_share_marginBottom" + android:layout_marginEnd="@dimen/module_common_shadow_width_pos" android:background="@drawable/module_ext_dw_upload_road_condition_bkg" app:layout_constraintBottom_toTopOf="@+id/module_entrance_id_move2_current_location" app:layout_constraintRight_toRightOf="@+id/module_entrance_id_move2_current_location" diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml index 703bb00968..f1ac9dc491 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml @@ -13,7 +13,6 @@ android:paddingStart="@dimen/module_ext_weather_container_paddingLeft" android:paddingEnd="@dimen/module_ext_weather_container_paddingRight" android:visibility="invisible" - android:translationY="@dimen/module_common_shadow_width" app:layout_goneMarginLeft="@dimen/module_ext_notice_margin_start" app:layout_constraintTop_toTopOf="parent" app:layout_constraintLeft_toRightOf="@+id/module_ext_id_msg" @@ -43,7 +42,6 @@ android:layout_width="@dimen/module_ext_height" android:layout_height="@dimen/module_ext_height" android:layout_marginStart="@dimen/module_ext_notice_margin_start" - android:translationY="@dimen/module_common_shadow_width" android:layout_marginEnd="@dimen/module_ext_msg_marginRight" android:background="@drawable/module_ext_shadow_bkg" android:visibility="gone" @@ -75,6 +73,8 @@ android:id="@+id/ivUserHeadImg" android:layout_width="@dimen/module_ext_user_avator_size" android:layout_height="@dimen/module_ext_user_avator_size" + android:layout_marginRight="@dimen/module_common_shadow_width_pos" + android:layout_marginTop="@dimen/module_common_shadow_width_pos" android:src="@drawable/model_ext_default_user_head" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml index 8147d1eef6..c06db31dd1 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml @@ -145,7 +145,7 @@ 20px 34px - 165px + 161px 10px 45px 120px diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml index 5e019c6b21..37328f34fd 100644 --- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml @@ -60,7 +60,7 @@ 32px 32px - 82px + 78px 22px 28px @@ -157,5 +157,4 @@ 10px 2px 2px - \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml index 38353f4b23..6f39e995db 100644 --- a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml @@ -20,7 +20,7 @@ 30px 830px 800px - 30px + 20px 30px 340px diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/AnimCircleImageView.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/AnimCircleImageView.java index 6a0a8daab1..ed1e5019be 100644 --- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/AnimCircleImageView.java +++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/AnimCircleImageView.java @@ -17,9 +17,11 @@ import android.util.Log; import android.widget.ImageView; import com.mogo.module.common.utils.CarSeries; +import com.mogo.skin.support.IMogoSkinCompatSupportable; +import com.mogo.skin.support.helper.MogoSkinCompatImageHelperDelegate; @SuppressLint("AppCompatCustomView") -public class AnimCircleImageView extends ImageView { +public class AnimCircleImageView extends ImageView implements IMogoSkinCompatSupportable { Drawable mDrawbleSrc; Context context; Bitmap mBitmapOut; @@ -29,6 +31,8 @@ public class AnimCircleImageView extends ImageView { int diameter; int radius; + MogoSkinCompatImageHelperDelegate imageHelper; + int currentDegree; int savedDegree; boolean isRotateEnable; @@ -47,6 +51,7 @@ public class AnimCircleImageView extends ImageView { public AnimCircleImageView(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); + imageHelper = new MogoSkinCompatImageHelperDelegate(this); this.context = context; init(); } @@ -76,6 +81,7 @@ public class AnimCircleImageView extends ImageView { @Override public void setImageResource(int resId) { super.setImageResource(resId); + imageHelper.setImageResource(resId); mDrawbleSrc = getDrawable(); output = null; } @@ -108,14 +114,17 @@ public class AnimCircleImageView extends ImageView { protected void onDraw(Canvas canvas) { Log.d("AnimCircle", "onDraw===="); try { - if (mDrawbleSrc == null) + if (mDrawbleSrc == null) { return; + } - if (getWidth() == 0 || getHeight() == 0) + if (getWidth() == 0 || getHeight() == 0) { return; + } - if (mDrawbleSrc.getClass() == NinePatchDrawable.class) + if (mDrawbleSrc.getClass() == NinePatchDrawable.class) { return; + } if (output == null) { defaultHeight = getHeight(); @@ -185,10 +194,12 @@ public class AnimCircleImageView extends ImageView { x = mBitmapScaled.getWidth() / 2 - radius; y = mBitmapScaled.getHeight() / 2 - radius; - if (x < 0) + if (x < 0) { x = 0; - if (y < 0) + } + if (y < 0) { y = 0; + } Bitmap mBitmapCropped = Bitmap.createBitmap(mBitmapScaled, x, y, diameter, diameter); return mBitmapCropped; } @@ -200,5 +211,10 @@ public class AnimCircleImageView extends ImageView { public void setDelayMilliseconds(int delayMilliseconds) { this.delayMilliseconds = delayMilliseconds; } + + @Override + public void applySkin() { + imageHelper.applySkin(); + } } diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java index be8aba16ba..6601cca455 100644 --- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java +++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java @@ -202,7 +202,7 @@ public class MediaWindow2 implements IMusicView { com.bumptech.glide.request.RequestOptions options = new com.bumptech.glide.request.RequestOptions() .placeholder(R.drawable.module_media_default_music_img); - GlideApp.with(mContext).applyDefaultRequestOptions(options).load(mMediaInfoData.getMediaImg()).into(mCircleImg); +// GlideApp.with(mContext).applyDefaultRequestOptions(options).load(mMediaInfoData.getMediaImg()).into(mCircleImg); }else{ mCircleImg.setImageResource(R.drawable.module_media_default_music_img); } diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_alert_bg.9.png b/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_alert_bg.9.png new file mode 100644 index 0000000000..32bb1aa442 Binary files /dev/null and b/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_alert_bg.9.png differ diff --git a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_window_alert_bg.9.png b/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_window_alert_bg.9.png new file mode 100644 index 0000000000..32bb1aa442 Binary files /dev/null and b/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_window_alert_bg.9.png differ diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_default_music_img.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_default_music_img.png index 4aab1a19b3..df81e5d06d 100644 Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_default_music_img.png and b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_default_music_img.png differ diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_alert_bg.9.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_alert_bg.9.png new file mode 100644 index 0000000000..6b21dc37ab Binary files /dev/null and b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_alert_bg.9.png differ diff --git a/modules/mogo-module-media/src/main/res/drawable/module_media_window_alert_bg.xml b/modules/mogo-module-media/src/main/res/drawable/module_media_window_alert_bg.xml deleted file mode 100644 index 372926f342..0000000000 --- a/modules/mogo-module-media/src/main/res/drawable/module_media_window_alert_bg.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml index a07744e59d..28189f70a7 100644 --- a/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml @@ -1,6 +1,6 @@ - 881px + 872px 1067px @@ -61,8 +61,8 @@ 4px 6px - 580px - 120px + 600px + 140px 112px 30px 90px diff --git a/modules/mogo-module-media/src/main/res/values/dimens.xml b/modules/mogo-module-media/src/main/res/values/dimens.xml index 372e5babff..7514da155f 100644 --- a/modules/mogo-module-media/src/main/res/values/dimens.xml +++ b/modules/mogo-module-media/src/main/res/values/dimens.xml @@ -1,6 +1,6 @@ - 470px + 462px 573px @@ -61,8 +61,8 @@ 2px 3.2px - 322px - 66.7px + 332px + 76.7px 60px 18px 48px diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java index f9f27f4699..c67414bf1e 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java @@ -204,7 +204,7 @@ public class TanluListWindow extends RelativeLayout implements IMogoMarkerClickL LinearLayoutManager layoutManager = new LinearLayoutManager(mContext, LinearLayoutManager.VERTICAL, false); mLoopRecyclerView.setLayoutManager(layoutManager); - mTanluSlideAdapter = new TanluSlideAdapterNew(mContext, mAnalytics, mTanluModelData, mogoImageloader); + mTanluSlideAdapter = new TanluSlideAdapterNew(mContext, mAnalytics, mTanluModelData, mogoImageloader, mMogoRegisterCenter); mLoopRecyclerView.setAdapter(mTanluSlideAdapter); //保证滑动单页显示 diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java index 3cea0b5b49..de39f21bd8 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java @@ -5,6 +5,7 @@ import android.animation.AnimatorInflater; import android.animation.AnimatorSet; import android.content.Context; import android.text.TextUtils; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -18,6 +19,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.mogo.commons.debug.DebugConfig; +import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.module.common.entity.MarkerExploreWay; import com.mogo.module.common.glide.SkinAbleBitmapTarget; import com.mogo.module.tanlu.R; @@ -30,9 +32,13 @@ import com.mogo.module.tanlu.model.event.StartPlayInfo; import com.mogo.module.tanlu.model.event.VoiceControlUpInfo; import com.mogo.module.tanlu.util.ChartUtil; import com.mogo.module.tanlu.video.SimpleCoverVideoPlayer; +import com.mogo.module.tanlu.view.RoundLayout; +import com.mogo.service.adas.IMogoADASControlStatusChangedListener; import com.mogo.service.analytics.IMogoAnalytics; import com.mogo.service.imageloader.IMogoImageloader; import com.mogo.service.imageloader.MogoImageView; +import com.mogo.service.module.IMogoRegisterCenter; +import com.mogo.skin.support.SkinMode; import com.mogo.utils.TipToast; import com.mogo.utils.logger.Logger; import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder; @@ -57,7 +63,7 @@ import static com.mogo.module.tanlu.util.Utils.handleDistance; * @description * @since 2020/3/11 */ -public class TanluSlideAdapterNew extends RecyclerView.Adapter { +public class TanluSlideAdapterNew extends RecyclerView.Adapter implements IMogoADASControlStatusChangedListener { private List markerExploreWayList = new ArrayList<>(); private static final String TAG = "TanluSlideAdapterNew"; private Context mContext; @@ -74,6 +80,7 @@ public class TanluSlideAdapterNew extends RecyclerView.Adapter list = new HashMap<>(); - public TanluSlideAdapterNew(Context context, IMogoAnalytics analytics, TanluModelData tanluModelData, IMogoImageloader mogoImageloader) { + public TanluSlideAdapterNew(Context context, IMogoAnalytics analytics, TanluModelData tanluModelData, IMogoImageloader mogoImageloader, + IMogoRegisterCenter mogoRegisterCenter) { this.mContext = context; this.mAnalytics = analytics; this.mTanluModelData = tanluModelData; this.mogoImageloader = mogoImageloader; + mogoRegisterCenter.registerADASControlStatusChangedListener( TAG, this ); + EventBus.getDefault().register(this); } @@ -121,6 +131,7 @@ public class TanluSlideAdapterNew extends RecyclerView.Adapter "); + mRoundLayout.setBackgroundResource(R.drawable.shape_tanlu_top_bg); + break; + + case Type_Light: + Log.d("liyz", "Type_Light ---------> "); + mRoundLayout.setBackgroundResource(R.drawable.shape_tanlu_top_bg_light); + break; + } + } + + @Override + public void onCarStatusChanged(boolean visible) { + + } } diff --git a/modules/mogo-module-tanlu/src/main/res/drawable/shape_tanlu_top_bg_light.xml b/modules/mogo-module-tanlu/src/main/res/drawable/shape_tanlu_top_bg_light.xml new file mode 100644 index 0000000000..4eba256888 --- /dev/null +++ b/modules/mogo-module-tanlu/src/main/res/drawable/shape_tanlu_top_bg_light.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_alert_window_bg.xml b/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_alert_window_bg.xml new file mode 100644 index 0000000000..7ae04a2bed --- /dev/null +++ b/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_alert_window_bg.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml index 622a231939..d814bc3f20 100644 --- a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml +++ b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml @@ -2,8 +2,9 @@ + android:layout_height="wrap_content"> + + android:background="@drawable/tanlu_alert_window_bg"> - \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml index 2daeba4505..7716b8ccc7 100644 --- a/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml @@ -78,6 +78,7 @@ 642px 186px + 176px 250px 172px 45px @@ -92,7 +93,7 @@ 28px 56px - 3px + 6px 16px \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml index 35ac4ea9c3..4062891c80 100644 --- a/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -78,13 +78,14 @@ 1233px 326px + 306px 480px - 280px + 290px 80px 19px 12px - 12px + 24px 30px 9px 27px @@ -92,7 +93,7 @@ 50px 90px - 6px + 10px 30px diff --git a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml index 205767293e..88af7354b4 100644 --- a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml @@ -77,22 +77,23 @@ 1060px - 326px + 330px + 306px 421px - 280px + 290px 80px 19px - 5px - 0px - 30px + 13px + 24px + 15px 9px 27px 46px 50px 98px - 6px + 10px 30px diff --git a/modules/mogo-module-tanlu/src/main/res/values/colors.xml b/modules/mogo-module-tanlu/src/main/res/values/colors.xml index a552d06283..1a0324e0cc 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/colors.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/colors.xml @@ -52,5 +52,6 @@ #5E6079 #3F4057 #555A75 + #F5F5F5 diff --git a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml index 2daeba4505..7716b8ccc7 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml @@ -78,6 +78,7 @@ 642px 186px + 176px 250px 172px 45px @@ -92,7 +93,7 @@ 28px 56px - 3px + 6px 16px \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java index 961a08bc2a..d4095a09f9 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java @@ -141,10 +141,11 @@ public class V2XShareEventsFragment extends MvpFragment 0) { Object data = dataArrayList.get(dataArrayList.size() - 1); - if (data instanceof V2XShareEventLoadMoreItem || data instanceof V2XShareEventLoadMoreItem) { + if (data instanceof V2XShareEventLoadMoreItem) { dataArrayList.remove(dataArrayList.size() - 1); } } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java index c706acbe91..8d6bb0e529 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java @@ -47,11 +47,6 @@ public class V2XShareNetworkModel { @Override public void subscribe(ObservableEmitter emitter) throws Exception { - try { - getShareIndex(callback); - } catch (Exception e) { - e.printStackTrace(); - } emitter.onNext("1"); emitter.onComplete(); } @@ -60,16 +55,10 @@ public class V2XShareNetworkModel { Observable listObservable = Observable.create(new ObservableOnSubscribe() { @Override public void subscribe(ObservableEmitter emitter) throws Exception { - try { - getShareEventList(page, size, callback); - } catch (Exception e) { - e.printStackTrace(); - } emitter.onNext("2"); emitter.onComplete(); } }); - indexObservable.flatMap(new Function>() { @Override public ObservableSource apply(String s) throws Exception { @@ -82,12 +71,20 @@ public class V2XShareNetworkModel { @Override public void onSubscribe(Disposable d) { - + try { + getShareIndex(callback); + } catch (Exception e) { + e.printStackTrace(); + } } @Override public void onNext(Object o) { - + try { + getShareEventList(page, size, callback); + } catch (Exception e) { + e.printStackTrace(); + } } @Override @@ -135,7 +132,7 @@ public class V2XShareNetworkModel { @Override public void onError(Throwable e) { super.onError(e); - if (callback != null){ + if (callback != null) { callback.onFail("网络异常，点击刷新重试"); } } @@ -179,7 +176,7 @@ public class V2XShareNetworkModel { @Override public void onError(Throwable e) { super.onError(e); - if (callback != null){ + if (callback != null) { callback.onFail("网络异常，点击刷新重试"); } } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/V2XAnimationManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/V2XAnimationManager.java index 67c87bea4d..94a760dd65 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/V2XAnimationManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/V2XAnimationManager.java @@ -18,15 +18,15 @@ public class V2XAnimationManager implements Animation { private final static int MSG_LOOP = 3004; private long INTERVAL = 100L; - private Handler mHandler = new Handler( Looper.getMainLooper() ) { + private Handler mHandler = new Handler(Looper.getMainLooper()) { @Override - public void handleMessage( Message msg ) { - super.handleMessage( msg ); - switch ( msg.what ) { + public void handleMessage(Message msg) { + super.handleMessage(msg); + switch (msg.what) { case MSG_LOOP: - if ( isStarted ) { + if (isStarted) { // targetImageView.setImageResource( AnimationResources.loadingRes[mStartIndex++ % AnimationResources.loadingRes.length] ); - mHandler.sendEmptyMessageDelayed( MSG_LOOP, INTERVAL ); + mHandler.sendEmptyMessageDelayed(MSG_LOOP, INTERVAL); } break; } @@ -43,20 +43,26 @@ public class V2XAnimationManager implements Animation { @Override synchronized public void start() { isStarted = true; - mHandler.sendEmptyMessage( MSG_LOOP ); - targetImageView.setVisibility(View.VISIBLE); + mHandler.sendEmptyMessage(MSG_LOOP); + if (targetImageView != null) { + targetImageView.setVisibility(View.VISIBLE); + } } @Override synchronized public void stop() { isStarted = false; - mHandler.removeMessages( MSG_LOOP ); - targetImageView.setVisibility(View.INVISIBLE); + mHandler.removeMessages(MSG_LOOP); + if (targetImageView != null) { + targetImageView.setVisibility(View.INVISIBLE); + } } - public void soptWithError(){ + public void soptWithError() { stop(); - targetImageView.setVisibility(View.VISIBLE); + if (targetImageView != null) { + targetImageView.setVisibility(View.VISIBLE); + } } public void release() { diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java index c3f59a81fb..99a6cbbad7 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java @@ -34,8 +34,8 @@ public class V2XNetworkLoadingView extends RelativeLayout { LayoutInflater.from(context).inflate(R.layout.v2x_network_loading_item, this); initView(); /* - 添加动画图片资源 - */ + 添加动画图片资源 + * */ setLoadingImage(AnimationResources.loadingRes); } diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_surrounding_bottom_bg.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_surrounding_bottom_bg.png index ef5069632f..30690aeb2e 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_surrounding_bottom_bg.png and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_surrounding_bottom_bg.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_surrounding_bottom_bg.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_surrounding_bottom_bg.png index ef5069632f..30690aeb2e 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_surrounding_bottom_bg.png and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_surrounding_bottom_bg.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_bg.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_bg.xml index 028445d592..c771e691e5 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_bg.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_bg.xml @@ -1,11 +1,38 @@ - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml index eec94400ed..37ac4f3d26 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml @@ -5,9 +5,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/v2x_alert_window_bg" - android:paddingStart="@dimen/dp_15" - android:paddingTop="@dimen/dp_15" - android:paddingBottom="@dimen/dp_15" + android:padding="@dimen/dp_25" app:roundLayoutRadius="@dimen/dp_30"> @@ -127,7 +125,6 @@ android:layout_marginTop="@dimen/dp_10" android:gravity="center" android:orientation="horizontal" - app:layout_constraintBottom_toBottomOf="@+id/rlRoadEventImg" app:layout_constraintStart_toEndOf="@+id/rlRoadEventImg" app:layout_constraintTop_toBottomOf="@+id/ivEventDistanceLogo"> @@ -136,7 +133,7 @@ android:layout_width="@dimen/module_v2x_event_button_size_detail" android:layout_height="@dimen/module_v2x_event_button_size_detail" android:layout_marginLeft="@dimen/dp_10" - android:padding="@dimen/dp_10" + android:padding="@dimen/dp_15" android:src="@drawable/selector_live_btn" android:visibility="gone" app:layout_constraintStart_toStartOf="parent" @@ -147,7 +144,7 @@ android:id="@+id/ivEventReportTrue" android:layout_width="@dimen/module_v2x_event_button_size_detail" android:layout_height="@dimen/module_v2x_event_button_size_detail" - android:padding="@dimen/dp_10" + android:padding="@dimen/dp_15" android:scaleType="fitXY" android:src="@drawable/icon_report_true" android:visibility="gone" @@ -160,7 +157,7 @@ android:id="@+id/ivEventReportErr" android:layout_width="@dimen/module_v2x_event_button_size_detail" android:layout_height="@dimen/module_v2x_event_button_size_detail" - android:padding="@dimen/dp_10" + android:padding="@dimen/dp_15" android:src="@drawable/icon_report_err" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@+id/ivEventLive" @@ -172,7 +169,7 @@ android:id="@+id/ivEventCallChart" android:layout_width="@dimen/module_v2x_event_button_size_detail" android:layout_height="@dimen/module_v2x_event_button_size_detail" - android:padding="@dimen/dp_10" + android:padding="@dimen/dp_15" android:src="@drawable/selector_talk_btn" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@+id/ivEventLive" @@ -184,7 +181,7 @@ android:id="@+id/ivEventEventNav" android:layout_width="@dimen/module_v2x_event_button_size_detail" android:layout_height="@dimen/module_v2x_event_button_size_detail" - android:padding="@dimen/dp_10" + android:padding="@dimen/dp_15" android:src="@drawable/selector_nav_btn" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@+id/ivEventLive" @@ -196,7 +193,7 @@ android:id="@+id/ivEventZan" android:layout_width="@dimen/module_v2x_event_button_size_detail" android:layout_height="@dimen/module_v2x_event_button_size_detail" - android:padding="@dimen/dp_10" + android:padding="@dimen/dp_15" android:src="@drawable/v2x_event_icon_zan" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@+id/ivEventLive" diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml index 073241387f..05b199f00a 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml @@ -4,10 +4,12 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/rlContent" android:layout_width="match_parent" - android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground" + android:layout_height="wrap_content" android:background="@drawable/v2x_alert_window_bg" - android:paddingStart="@dimen/dp_40" - android:paddingEnd="@dimen/dp_40" + android:paddingStart="@dimen/dp_62" + android:paddingTop="@dimen/dp_42" + android:paddingEnd="@dimen/dp_62" + android:paddingBottom="@dimen/dp_42" app:roundLayoutRadius="@dimen/dp_40"> + android:background="@drawable/v2x_alert_window_bg" + android:padding="@dimen/dp_25"> + android:paddingStart="@dimen/dp_62" + android:paddingTop="@dimen/dp_42" + android:paddingEnd="@dimen/dp_62" + android:paddingBottom="@dimen/dp_42"> - + app:roundLayoutRadius="@dimen/dp_30"> + + + - + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/loading_imageview" />