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/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-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/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..7ae04a2bed 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..1174b82693 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"> 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"> + + + + android:layout_height="@dimen/module_v2x_live_window_height"> 170px 250px 190px + 210px 122px @@ -27,6 +28,7 @@ 6px + 150px 550px 200px 200px diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml index 30cb538bad..9bdf15b612 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -4,9 +4,10 @@ 32px 32px - 300px + 330px 450px 390px + 410px 200px @@ -23,6 +24,7 @@ 80px + 310px 15px 550px 200px @@ -51,7 +53,7 @@ 42px 32px 36px - 28px + 30px 16px 42px 120px diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml index 0eeefcea53..f66ced6bbf 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml @@ -4,11 +4,12 @@ 32px 32px - 306px + 330px 450px 390px + 410px - 210px + 234px 147px @@ -24,6 +25,7 @@ 80px + 310px 15px 550px 200px @@ -52,7 +54,7 @@ 42px 32px 36px - 28px + 30px 31.9px 26px 30px diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml index f32aa68013..06cddf5140 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -7,6 +7,7 @@ 170px 250px 190px + 210px 122px @@ -27,6 +28,7 @@ 6px + 170px 550px 200px 200px diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_illegal_parking_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_illegal_parking_light.png index 1b9857e92e..e61f1e21ae 100644 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_illegal_parking_light.png and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_illegal_parking_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_illegal_parking_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_illegal_parking_light.png index a1aa5a8133..1b9857e92e 100644 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_illegal_parking_light.png and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_illegal_parking_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_illegal_parking_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_illegal_parking_light.png index e61f1e21ae..a1aa5a8133 100644 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_illegal_parking_light.png and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_illegal_parking_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml index 3f9bd48cd1..afd05b86dd 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml @@ -1,11 +1,41 @@ - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file