yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'qa_light' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into qa_light

Browse Source
This commit is contained in:
unknown
2020-09-17 17:02:37 +08:00
parent 156e877ad4 c535338e4c
commit 81eedef25c
81 changed files with 373 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
.idea/codeStyles/Project.xml generated
View File

@@ -3,9 +3,18 @@
<JetCodeStyleSettings>
<option name="PACKAGES_TO_USE_STAR_IMPORTS">
<value>
<package name="java.util" withSubpackages="false" static="false" />
<package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
<package name="io.ktor" withSubpackages="true" static="false" />
<package name="java.util" alias="false" withSubpackages="false" />
<package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
<package name="io.ktor" alias="false" withSubpackages="true" />
</value>
</option>
<option name="PACKAGES_IMPORT_LAYOUT">
<value>
<package name="" alias="false" withSubpackages="true" />
<package name="java" alias="false" withSubpackages="true" />
<package name="javax" alias="false" withSubpackages="true" />
<package name="kotlin" alias="false" withSubpackages="true" />
<package name="" alias="true" withSubpackages="true" />
</value>
</option>
</JetCodeStyleSettings>

2
.idea/misc.xml generated
View File

@@ -4,7 +4,7 @@
<asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
<groovy codeStyle="LEGACY" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
</project>

6
modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppsModel.java
View File

@@ -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 );

3
modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
View File

@@ -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"

4
modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml
View File

@@ -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"

2
modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
View File

@@ -145,7 +145,7 @@
<dimen name="module_ext_display_overview_icon_marginTop">20px</dimen>
<dimen name="module_ext_top_over_navi_height">34px</dimen>
<dimen name="module_ext_notice_margin_start">165px</dimen>
<dimen name="module_ext_notice_margin_start">161px</dimen>
<dimen name="module_ext_weather_margin_start">10px</dimen>
<dimen name="module_ext_msg_counter_margin">45px</dimen>
<dimen name="module_ext_user_avator_size">120px</dimen>

3
modules/mogo-module-extensions/src/main/res/values/dimens.xml
View File

@@ -60,7 +60,7 @@
<dimen name="module_ext_paddingRight">32px</dimen>
<dimen name="module_ext_paddingLeft">32px</dimen>
<dimen name="module_ext_notice_margin_start">82px</dimen>
<dimen name="module_ext_notice_margin_start">78px</dimen>
<dimen name="module_ext_voice_textSize">22px</dimen>
<dimen name="module_ext_time_textSize">28px</dimen>
@@ -157,5 +157,4 @@
<dimen name="module_ext_layout_padding">10px</dimen>
<dimen name="module_ext_layout_paddingRight">2px</dimen>
<dimen name="module_ext_layout_paddingBottom">2px</dimen>
</resources>

2
modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml
View File

@@ -20,7 +20,7 @@
<dimen name="module_main_header_fragment_container_marginTop">30px</dimen>
<dimen name="module_main_header_fragment_container_marginLeft">830px</dimen>
<dimen name="module_main_id_entrance_fragment_container_marginLeft">800px</dimen>
<dimen name="module_main_entrance_fragment_container_padding">30px</dimen>
<dimen name="module_main_entrance_fragment_container_padding">20px</dimen>
<dimen name="module_main_entrance_fragment_container_padding_top">30px</dimen>
<dimen name="module_main_id_left_panel_fragment_container_width">340px</dimen>

28
modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/AnimCircleImageView.java
View File

@@ -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();
}
}

2
modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
View File

@@ -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);
}

BIN
modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_alert_bg.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 588 B

BIN
modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_window_alert_bg.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 588 B

BIN
modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_default_music_img.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_alert_bg.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

14
modules/mogo-module-media/src/main/res/drawable/module_media_window_alert_bg.xml
View File

@@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:angle="180"
android:startColor="#5E6079"
android:endColor="#3F4057"
android:type="linear" />
<corners
android:bottomLeftRadius="@dimen/module_media_window_corner"
android:bottomRightRadius="@dimen/module_media_window_corner"
android:topLeftRadius="@dimen/module_media_window_corner"
android:topRightRadius="@dimen/module_media_window_corner" />
</shape>

6
modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="module_media_music_state_location">881px</dimen>
<dimen name="module_media_music_state_location">872px</dimen>
<dimen name="module_media_music_state_location_x">1067px</dimen>
<!-- lcc start-->
@@ -61,8 +61,8 @@
<dimen name="module_media_share_fragment_tv2_margin_top">4px</dimen>
<dimen name="module_media_share_fragment_img_radius">6px</dimen>
<dimen name="module_media_pop_window_width">580px</dimen>
<dimen name="module_media_pop_window_height">120px</dimen>
<dimen name="module_media_pop_window_width">600px</dimen>
<dimen name="module_media_pop_window_height">140px</dimen>
<dimen name="module_media_pop_window_inner_height">112px</dimen>
<dimen name="module_media_pop_window_inner_padding">30px</dimen>
<dimen name="module_media_pop_window_anim_img_size">90px</dimen>

6
modules/mogo-module-media/src/main/res/values/dimens.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="module_media_music_state_location">470px</dimen>
<dimen name="module_media_music_state_location">462px</dimen>
<dimen name="module_media_music_state_location_x">573px</dimen>
<!-- lcc start-->
@@ -61,8 +61,8 @@
<dimen name="module_media_share_fragment_tv2_margin_top">2px</dimen>
<dimen name="module_media_share_fragment_img_radius">3.2px</dimen>
<dimen name="module_media_pop_window_width">322px</dimen>
<dimen name="module_media_pop_window_height">66.7px</dimen>
<dimen name="module_media_pop_window_width">332px</dimen>
<dimen name="module_media_pop_window_height">76.7px</dimen>
<dimen name="module_media_pop_window_inner_height">60px</dimen>
<dimen name="module_media_pop_window_inner_padding">18px</dimen>
<dimen name="module_media_pop_window_anim_img_size">48px</dimen>

2
modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java
View File

@@ -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);
//保证滑动单页显示

34
modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java
View File

@@ -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<TanluSlideViewHolderNew> {
public class TanluSlideAdapterNew extends RecyclerView.Adapter<TanluSlideViewHolderNew> implements IMogoADASControlStatusChangedListener {
private List<MarkerExploreWay> markerExploreWayList = new ArrayList<>();
private static final String TAG = "TanluSlideAdapterNew";
private Context mContext;
@@ -74,6 +80,7 @@ public class TanluSlideAdapterNew extends RecyclerView.Adapter<TanluSlideViewHol
private TextView mTypeTv;
private IMogoImageloader mogoImageloader;
private ImageView mCloseImage;
private RoundLayout mRoundLayout;
//media
private GSYVideoOptionBuilder gsyVideoOptionBuilder = new GSYVideoOptionBuilder();
@@ -87,11 +94,14 @@ public class TanluSlideAdapterNew extends RecyclerView.Adapter<TanluSlideViewHol
private HashMap<Integer, SimpleCoverVideoPlayer> 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<TanluSlideViewHol
mLikeLayout = holder.itemView.findViewById(R.id.tanlu_like_layout);
mTypeTv = holder.itemView.findViewById(R.id.tv_information_type);
mCloseImage = holder.itemView.findViewById(R.id.tanlu_close_imageView);
mRoundLayout = holder.itemView.findViewById(R.id.media_layout);
mCloseImage.setOnClickListener(new View.OnClickListener() {
@Override
@@ -496,5 +507,24 @@ public class TanluSlideAdapterNew extends RecyclerView.Adapter<TanluSlideViewHol
return typeName;
}
@Override
public void onMapUiModeChanged(EnumMapUI mapUI) {
switch ( mapUI ) {
case Type_Night:
Log.d("liyz", "Type_Night ---------> ");
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) {
}
}

6
modules/mogo-module-tanlu/src/main/res/drawable/shape_tanlu_top_bg_light.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<!-- <corners android:radius="4dp"/>-->
<solid android:color="@color/tanlu_555A_F5F5F5"/>
</shape>

38
modules/mogo-module-tanlu/src/main/res/drawable/tanlu_alert_window_bg.xml Normal file
View File

@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 边 -->
<item>
<shape android:shape="rectangle">
<padding
android:bottom="2dp"
android:left="2dp"
android:right="2dp"
android:top="2dp" />
<solid android:color="#00000000" />
<corners android:radius="@dimen/dp_30" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<padding
android:bottom="2dp"
android:left="2dp"
android:right="2dp"
android:top="2dp" />
<solid android:color="#00000000" />
<corners android:radius="@dimen/dp_30" />
</shape>
</item>
<!-- 中心背景 -->
<item>
<shape android:shape="rectangle">
<corners android:radius="@dimen/dp_30" />
<gradient
android:angle="135"
android:endColor="#3F4057"
android:startColor="#5E6079"
android:type="linear"
android:useLevel="true" />
</shape>
</item>
</layer-list>

3
modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml
View File

@@ -2,8 +2,9 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="@dimen/tanlu_module_card_height">
android:layout_height="wrap_content">
<!-- android:background="@drawable/tanlu_gradual_change_bg"-->
<com.mogo.module.tanlu.view.RoundLayout
android:id="@+id/media_layout"
android:layout_width="@dimen/tanlu_module_card_video_width"

6
modules/mogo-module-tanlu/src/main/res/layout/tanlu_main_media_recycler_new.xml
View File

@@ -3,14 +3,14 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="@dimen/tanlu_module_card_height"
android:layout_alignParentRight="true"
android:background="@drawable/tanlu_top_bg">
android:background="@drawable/tanlu_alert_window_bg">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/tanlu_rloop_recycleview"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:listitem="@layout/tanlu_item_main_media_recycler_new"
/>
<!-- tools:listitem="@layout/tanlu_item_main_media_recycler_new"-->
</RelativeLayout>

3
modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml
View File

@@ -78,6 +78,7 @@
<!--new-->
<dimen name="tanlu_module_card_width">642px</dimen>
<dimen name="tanlu_module_card_height">186px</dimen>
<dimen name="tanlu_module_card_inner_height">176px</dimen>
<dimen name="tanlu_module_card_video_width">250px</dimen>
<dimen name="tanlu_module_card_video_height">172px</dimen>
<dimen name="tanlu_module_close_height">45px</dimen>
@@ -92,7 +93,7 @@
<dimen name="tanlu_head_image_size">28px</dimen>
<dimen name="tanlu_image_size">56px</dimen>
<dimen name="tanlu_button_radius_size">3px</dimen>
<dimen name="tanlu_button_radius_size">6px</dimen>
<dimen name="tanlu_normal_image_radius_size">16px</dimen>
</resources>

7
modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml
View File

@@ -78,13 +78,14 @@
<!--new-->
<dimen name="tanlu_module_card_width">1233px</dimen>
<dimen name="tanlu_module_card_height">326px</dimen>
<dimen name="tanlu_module_card_inner_height">306px</dimen>
<dimen name="tanlu_module_card_video_width">480px</dimen>
<dimen name="tanlu_module_card_video_height">280px</dimen>
<dimen name="tanlu_module_card_video_height">290px</dimen>
<dimen name="tanlu_module_close_height">80px</dimen>
<dimen name="tanlu_module_card_margin_top">19px</dimen>
<dimen name="tanlu_module_card_margin_left">12px</dimen>
<dimen name="tanlu_module_margin_right">12px</dimen>
<dimen name="tanlu_module_margin_right">24px</dimen>
<dimen name="tanlu_module_margin_left">30px</dimen>
<dimen name="tanlu_module_margin_top">9px</dimen>
<dimen name="tanlu_module_mavi_height">27px</dimen>
@@ -92,7 +93,7 @@
<dimen name="tanlu_head_image_size">50px</dimen>
<dimen name="tanlu_image_size">90px</dimen>
<dimen name="tanlu_button_radius_size">6px</dimen>
<dimen name="tanlu_button_radius_size">10px</dimen>
<dimen name="tanlu_normal_image_radius_size">30px</dimen>
</resources>

13
modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml
View File

@@ -77,22 +77,23 @@
<!--new-->
<dimen name="tanlu_module_card_width">1060px</dimen>
<dimen name="tanlu_module_card_height">326px</dimen>
<dimen name="tanlu_module_card_height">330px</dimen>
<dimen name="tanlu_module_card_inner_height">306px</dimen>
<dimen name="tanlu_module_card_video_width">421px</dimen>
<dimen name="tanlu_module_card_video_height">280px</dimen>
<dimen name="tanlu_module_card_video_height">290px</dimen>
<dimen name="tanlu_module_close_height">80px</dimen>
<dimen name="tanlu_module_card_margin_top">19px</dimen>
<dimen name="tanlu_module_card_margin_left">5px</dimen>
<dimen name="tanlu_module_margin_right">0px</dimen>
<dimen name="tanlu_module_margin_left">30px</dimen>
<dimen name="tanlu_module_card_margin_left">13px</dimen>
<dimen name="tanlu_module_margin_right">24px</dimen>
<dimen name="tanlu_module_margin_left">15px</dimen>
<dimen name="tanlu_module_margin_top">9px</dimen>
<dimen name="tanlu_module_mavi_height">27px</dimen>
<dimen name="tanlu_module_button_height">46px</dimen>
<dimen name="tanlu_head_image_size">50px</dimen>
<dimen name="tanlu_image_size">98px</dimen>
<dimen name="tanlu_button_radius_size">6px</dimen>
<dimen name="tanlu_button_radius_size">10px</dimen>
<dimen name="tanlu_normal_image_radius_size">30px</dimen>
</resources>

1
modules/mogo-module-tanlu/src/main/res/values/colors.xml
View File

@@ -52,5 +52,6 @@
<color name="tanlu_top_bg_startcolor">#5E6079</color>
<color name="tanlu_top_bg_endcolor">#3F4057</color>
<color name="tanlu_555A_F5F5">#555A75</color>
<color name="tanlu_555A_F5F5F5">#F5F5F5</color>
</resources>

3
modules/mogo-module-tanlu/src/main/res/values/dimens.xml
View File

@@ -78,6 +78,7 @@
<!--new-->
<dimen name="tanlu_module_card_width">642px</dimen>
<dimen name="tanlu_module_card_height">186px</dimen>
<dimen name="tanlu_module_card_inner_height">176px</dimen>
<dimen name="tanlu_module_card_video_width">250px</dimen>
<dimen name="tanlu_module_card_video_height">172px</dimen>
<dimen name="tanlu_module_close_height">45px</dimen>
@@ -92,7 +93,7 @@
<dimen name="tanlu_head_image_size">28px</dimen>
<dimen name="tanlu_image_size">56px</dimen>
<dimen name="tanlu_button_radius_size">3px</dimen>
<dimen name="tanlu_button_radius_size">6px</dimen>
<dimen name="tanlu_normal_image_radius_size">16px</dimen>
</resources>

3
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
View File

@@ -141,10 +141,11 @@ public class V2XShareEventsFragment extends MvpFragment<V2XShareEventsFragment,
//空白
item.setViewType(V2XShareEventItemEnum.ITEM_TYPE_SHARE_EMPTY);
dataArrayList.add(item);
int len = dataArrayList.size();
} else {
if (dataArrayList.size() > 0) {
Object data = dataArrayList.get(dataArrayList.size() - 1);
if (data instanceof V2XShareEventLoadMoreItem || data instanceof V2XShareEventLoadMoreItem) {
if (data instanceof V2XShareEventLoadMoreItem) {
dataArrayList.remove(dataArrayList.size() - 1);
}
}

27
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java
View File

@@ -47,11 +47,6 @@ public class V2XShareNetworkModel {
@Override
public void subscribe(ObservableEmitter<String> emitter) throws Exception {
try {
getShareIndex(callback);
} catch (Exception e) {
e.printStackTrace();
}
emitter.onNext("1");
emitter.onComplete();
}
@@ -60,16 +55,10 @@ public class V2XShareNetworkModel {
Observable<String> listObservable = Observable.create(new ObservableOnSubscribe<String>() {
@Override
public void subscribe(ObservableEmitter<String> emitter) throws Exception {
try {
getShareEventList(page, size, callback);
} catch (Exception e) {
e.printStackTrace();
}
emitter.onNext("2");
emitter.onComplete();
}
});
indexObservable.flatMap(new Function<String, ObservableSource<?>>() {
@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("网络异常，点击刷新重试");
}
}

30
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/V2XAnimationManager.java
View File

@@ -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() {

4
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java
View File

@@ -34,8 +34,8 @@ public class V2XNetworkLoadingView extends RelativeLayout {
LayoutInflater.from(context).inflate(R.layout.v2x_network_loading_item, this);
initView();
/*
添加动画图片资源
*/
添加动画图片资源
* */
setLoadingImage(AnimationResources.loadingRes);
}

BIN
modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_surrounding_bottom_bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_surrounding_bottom_bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

47
modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_bg.xml
View File

@@ -1,11 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="@dimen/dp_30" />
<gradient
android:angle="135"
android:endColor="#3F4057"
android:startColor="#5E6079"
android:type="linear"
android:useLevel="true" />
</shape>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 边 -->
<item>
<shape android:shape="rectangle">
<padding
android:bottom="2dp"
android:left="2dp"
android:right="2dp"
android:top="2dp" />
<solid android:color="#00000000" />
<corners android:radius="@dimen/dp_26" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<padding
android:bottom="2dp"
android:left="2dp"
android:right="2dp"
android:top="2dp" />
<solid android:color="#00000000" />
<corners android:radius="@dimen/dp_26" />
</shape>
</item>
<!-- 中心背景 -->
<item>
<shape android:shape="rectangle">
<corners android:radius="@dimen/dp_26" />
<gradient
android:angle="135"
android:endColor="#3F4057"
android:startColor="#5E6079"
android:type="linear"
android:useLevel="true" />
</shape>
</item>
</layer-list>

19
modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml
View File

@@ -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">
<com.mogo.module.v2x.view.RoundLayout
@@ -67,7 +65,7 @@
android:maxLines="1"
android:textColor="@color/v2x_FFF_333"
android:textSize="@dimen/dp_36"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintEnd_toStartOf="@+id/ivEventHead"
app:layout_constraintStart_toStartOf="@id/tvEventTypeTitle"
app:layout_constraintTop_toBottomOf="@+id/tvEventTypeTitle"
tools:text="东城区北三环中路辅路小黄庄路口" />
@@ -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"

8
modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml
View File

@@ -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">
<ImageView

7
modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
View File

@@ -4,7 +4,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground"
android:background="@drawable/v2x_alert_window_bg">
android:background="@drawable/v2x_alert_window_bg"
android:padding="@dimen/dp_25">
<TextView
android:id="@+id/tvImgTextContent"
@@ -12,7 +13,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="@dimen/module_v2x_surrounding_item_bottom_image_height"
android:layout_marginTop="@dimen/dp_40"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_7"
android:background="@drawable/bg_v2x_event_type_orange"
android:gravity="center_vertical"
@@ -100,7 +101,7 @@
android:id="@+id/ivFaultHelpEventNavi"
android:layout_width="@dimen/module_v2x_event_button_size"
android:layout_height="@dimen/module_v2x_event_button_size"
android:layout_marginRight="26px"
android:layout_marginRight="@dimen/dp_54"
android:src="@drawable/selector_nav_btn"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

8
modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml
View File

@@ -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">
<ImageView
android:id="@+id/ivIconP"

4
modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video.xml
View File

@@ -3,13 +3,13 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/module_v2x_event_window_height"
android:background="@drawable/v2x_alert_window_bg">
<com.mogo.module.v2x.view.V2XLiveGSYVideoView
android:id="@+id/videoPlayer"
android:layout_width="match_parent"
android:layout_height="@dimen/module_v2x_event_window_height"
android:layout_height="@dimen/module_v2x_live_window_height"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

15
modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_event_detail.xml
View File

@@ -15,13 +15,20 @@
app:layout_constraintTop_toTopOf="parent"
app:roundLayoutRadius="@dimen/dp_30">
<com.mogo.service.imageloader.MogoImageView
android:id="@+id/ivImg"
<com.mogo.module.v2x.view.RoundLayout
android:id="@+id/rlRoadEventImg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"
app:actualImageScaleType="fitXY" />
app:roundLayoutRadius="@dimen/dp_30">
<com.mogo.service.imageloader.MogoImageView
android:id="@+id/ivImg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"
app:actualImageScaleType="fitXY" />
</com.mogo.module.v2x.view.RoundLayout>
</com.mogo.module.v2x.view.RoundLayout>
<com.mogo.service.imageloader.MogoImageView

5
modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml
View File

@@ -18,13 +18,12 @@
<TextView
android:id="@+id/tv_brief"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/module_v2x_surrounding_margin_left"
android:text="周围5公里，共15条交通信息"
android:textColor="@color/v2x_white"
android:layout_marginBottom="2px"
android:layout_alignParentTop="true"
android:textSize="@dimen/module_v2x_surrounding_top_textsize" />
<!-- android:layout_centerInParent="true"-->
<TextView
android:id="@+id/tv_top_refresh"

17
modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml
View File

@@ -8,11 +8,11 @@
<ProgressBar
android:id="@+id/loading_imageview"
android:layout_width="@dimen/v2x_loading_ani_width"
android:layout_height="@dimen/v2x_loading_ani_width"
android:layout_width="45dp"
android:layout_height="43dp"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="60px"
android:layout_marginTop="@dimen/v2x_panel_loading_top"
android:indeterminateTint="#256BFF"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -28,13 +28,14 @@
android:layout_centerHorizontal="true"
android:layout_gravity="top|center"
android:alpha="0.7"
android:paddingTop="@dimen/dp_14"
android:text="正在获取信息…"
android:paddingTop="@dimen/dp_25"
android:textColor="@color/v2x_FFF_666"
android:textSize="@dimen/dp_34"
app:layout_constraintBottom_toBottomOf="@+id/loading_imageview"
app:layout_constraintBottom_toTopOf="@+id/refresh_button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loading_imageview" />
<Button
android:id="@+id/refresh_button"
@@ -43,7 +44,7 @@
android:layout_below="@id/loading_text"
android:layout_centerHorizontal="true"
android:layout_gravity="top|center"
android:layout_marginTop="@dimen/shaer_refresh_padding"
android:layout_marginTop="@dimen/dp_40"
android:background="@drawable/v2xt_dw_common_corner_bkg_light"
android:gravity="center"
android:text="刷新"
@@ -51,6 +52,6 @@
android:textSize="@dimen/dp_32"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loading_imageview" />
app:layout_constraintTop_toBottomOf="@+id/loading_text" />
</androidx.constraintlayout.widget.ConstraintLayout>

1
modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml
View File

@@ -6,7 +6,6 @@
android:layout_width="@dimen/module_v2x_panel_width"
android:layout_height="@dimen/module_v2x_panel_width"
android:background="@drawable/module_v2x_shadow_bkg"
android:translationY="@dimen/v2x_panel_btn_translationY"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">

5
modules/mogo-module-v2x/src/main/res/layout/view_video_layout_normal.xml
View File

@@ -3,13 +3,12 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="@dimen/module_v2x_event_window_height"
>
android:layout_height="@dimen/module_v2x_live_window_height">
<com.tencent.rtmp.ui.TXCloudVideoView
android:id="@+id/txcVideoView"
android:layout_width="match_parent"
android:layout_height="@dimen/module_v2x_event_window_height"
android:layout_height="@dimen/module_v2x_live_window_height"
android:gravity="center" />
<androidx.core.widget.ContentLoadingProgressBar

2
modules/mogo-module-v2x/src/main/res/layout/window_animation.xml
View File

@@ -11,7 +11,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_30"
app:roundLayoutRadius="@dimen/dp_40">
app:roundLayoutRadius="@dimen/dp_28">
<com.mogo.module.v2x.view.TextureVideoView
android:id="@+id/vvCarAnimation"

13
modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
View File

@@ -4,11 +4,12 @@
<dimen name="module_v2x_search_marginLeft">18px</dimen>
<dimen name="module_v2x_operation_panel_share_goneMarginRight">20px</dimen>
<dimen name="module_v2x_event_window_height">170px</dimen>
<dimen name="module_v2x_event_window_height">190px</dimen>
<dimen name="module_v2x_event_window_height_ground">250px</dimen>
<dimen name="module_v2x_push_img_height">190px</dimen>
<dimen name="module_v2x_push_img_container_height">210px</dimen>
<dimen name="module_v2x_fatigue_driving_window_height_ground">122px</dimen>
<dimen name="module_v2x_fatigue_driving_window_height_ground">136px</dimen>
<dimen name="module_v2x_event_icon_size">82px</dimen>
@@ -27,11 +28,12 @@
<dimen name="module_v2x_surrounding_item_bottom_size">6px</dimen>
<dimen name="module_v2x_live_window_height">150px</dimen>
<dimen name="module_v2x_map_left">550px</dimen>
<dimen name="module_v2x_map_top">200px</dimen>
<dimen name="module_v2x_map_right">200px</dimen>
<dimen name="module_v2x_map_bottom">100px</dimen>
<dimen name="module_v2x_surrounding_top_height">40px</dimen>
<dimen name="module_v2x_surrounding_top_height">50px</dimen>
<dimen name="module_v2x_surrounding_top_bt_width">90px</dimen>
<dimen name="module_v2x_surrounding_top_bt_height">36px</dimen>
<dimen name="module_v2x_surrounding_empty_iv_margin_top">40px</dimen>
@@ -60,7 +62,7 @@
<dimen name="module_v2x_panel_width">82px</dimen>
<dimen name="module_v2x_panel_icon_cor">16px</dimen>
<dimen name="share_empty_icon_width">117px</dimen>
<dimen name="v2x_loading_ani_width">100px</dimen>
<dimen name="v2x_loading_ani_width">50px</dimen>
<dimen name="v2x_share_btn_width">150px</dimen>
<dimen name="v2x_share_btn_height">48px</dimen>
<dimen name="v2x_index_rating_top">17px</dimen>
@@ -72,8 +74,7 @@
<dimen name="share_index_bottom_padding">15px</dimen>
<dimen name="share_btn_middle_padding">29px</dimen>
<dimen name="v2x_panel_btn_translationY">-8px</dimen>
<dimen name="module_v2x_panel_tab_height">84px</dimen>
<dimen name="v2x_panel_loading_top">120px</dimen>
</resources>

8
modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml
View File

@@ -4,9 +4,10 @@
<dimen name="module_v2x_search_marginLeft">32px</dimen>
<dimen name="module_v2x_operation_panel_share_goneMarginRight">32px</dimen>
<dimen name="module_v2x_event_window_height">300px</dimen>
<dimen name="module_v2x_event_window_height">330px</dimen>
<dimen name="module_v2x_event_window_height_ground">450px</dimen>
<dimen name="module_v2x_push_img_height">390px</dimen>
<dimen name="module_v2x_push_img_container_height">410px</dimen>
<dimen name="module_v2x_fatigue_driving_window_height_ground">200px</dimen>
@@ -23,12 +24,13 @@
<dimen name="module_v2x_history_event_icon_size">80px</dimen>
<dimen name="module_v2x_live_window_height">310px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_size">15px</dimen>
<dimen name="module_v2x_map_left">550px</dimen>
<dimen name="module_v2x_map_top">200px</dimen>
<dimen name="module_v2x_map_right">200px</dimen>
<dimen name="module_v2x_map_bottom">100px</dimen>
<dimen name="module_v2x_surrounding_top_height">80px</dimen>
<dimen name="module_v2x_surrounding_top_height">90px</dimen>
<dimen name="module_v2x_surrounding_top_bt_width">162px</dimen>
<dimen name="module_v2x_surrounding_top_bt_height">64px</dimen>
<dimen name="module_v2x_surrounding_empty_iv_margin_top">80px</dimen>
@@ -51,7 +53,7 @@
<dimen name="module_v2x_surrounding_refresh_bt_radius">42px</dimen>
<dimen name="module_v2x_surrounding_top_textsize">32px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_left_textsize">36px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_right_textsize">28px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_right_textsize">30px</dimen>
<dimen name="module_v2x_des_index_width">16px</dimen>
<dimen name="module_v2x_des_index_height">42px</dimen>
<dimen name="module_v2x_panel_width">120px</dimen>

15
modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
View File

@@ -4,11 +4,12 @@
<dimen name="module_v2x_search_marginLeft">32px</dimen>
<dimen name="module_v2x_operation_panel_share_goneMarginRight">32px</dimen>
<dimen name="module_v2x_event_window_height">306px</dimen>
<dimen name="module_v2x_event_window_height">330px</dimen>
<dimen name="module_v2x_event_window_height_ground">450px</dimen>
<dimen name="module_v2x_push_img_height">390px</dimen>
<dimen name="module_v2x_push_img_container_height">410px</dimen>
<dimen name="module_v2x_fatigue_driving_window_height_ground">210px</dimen>
<dimen name="module_v2x_fatigue_driving_window_height_ground">234px</dimen>
<dimen name="module_v2x_event_icon_size">147px</dimen>
@@ -24,12 +25,13 @@
<dimen name="module_v2x_history_event_icon_size">80px</dimen>
<dimen name="module_v2x_live_window_height">310px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_size">15px</dimen>
<dimen name="module_v2x_map_left">550px</dimen>
<dimen name="module_v2x_map_top">200px</dimen>
<dimen name="module_v2x_map_right">200px</dimen>
<dimen name="module_v2x_map_bottom">100px</dimen>
<dimen name="module_v2x_surrounding_top_height">80px</dimen>
<dimen name="module_v2x_surrounding_top_height">90px</dimen>
<dimen name="module_v2x_surrounding_top_bt_width">162px</dimen>
<dimen name="module_v2x_surrounding_top_bt_height">64px</dimen>
<dimen name="module_v2x_surrounding_empty_iv_margin_top">80px</dimen>
@@ -52,13 +54,13 @@
<dimen name="module_v2x_surrounding_refresh_bt_radius">42px</dimen>
<dimen name="module_v2x_surrounding_top_textsize">32px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_left_textsize">36px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_right_textsize">28px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_right_textsize">30px</dimen>
<dimen name="module_v2x_des_index_width">31.9px</dimen>
<dimen name="module_v2x_des_index_height">26px</dimen>
<dimen name="module_v2x_panel_icon_cor">30px</dimen>
<dimen name="module_v2x_panel_width">140px</dimen>
<dimen name="share_empty_icon_width">219px</dimen>
<dimen name="v2x_loading_ani_width">200px</dimen>
<dimen name="v2x_loading_ani_width">100px</dimen>
<dimen name="v2x_share_btn_width">281px</dimen>
<dimen name="v2x_share_btn_height">90px</dimen>
<dimen name="v2x_index_rating_top">28px</dimen>
@@ -71,8 +73,7 @@
<dimen name="share_btn_middle_padding">54px</dimen>
<dimen name="v2x_panel_btn_translationY">-10px</dimen>
<dimen name="v2x_panel_btn_image_width">114px</dimen>
<dimen name="module_v2x_panel_tab_height">158px</dimen>
<dimen name="v2x_panel_loading_top">300px</dimen>
</resources>

12
modules/mogo-module-v2x/src/main/res/values/dimens.xml
View File

@@ -4,11 +4,12 @@
<dimen name="module_v2x_search_marginLeft">18px</dimen>
<dimen name="module_v2x_operation_panel_share_goneMarginRight">20px</dimen>
<dimen name="module_v2x_event_window_height">170px</dimen>
<dimen name="module_v2x_event_window_height">190px</dimen>
<dimen name="module_v2x_event_window_height_ground">250px</dimen>
<dimen name="module_v2x_push_img_height">190px</dimen>
<dimen name="module_v2x_push_img_container_height">210px</dimen>
<dimen name="module_v2x_fatigue_driving_window_height_ground">122px</dimen>
<dimen name="module_v2x_fatigue_driving_window_height_ground">136px</dimen>
<dimen name="module_v2x_event_icon_size">82px</dimen>
@@ -27,6 +28,7 @@
<dimen name="module_v2x_surrounding_item_bottom_size">6px</dimen>
<dimen name="module_v2x_live_window_height">170px</dimen>
<dimen name="module_v2x_map_left">550px</dimen>
<dimen name="module_v2x_map_top">200px</dimen>
<dimen name="module_v2x_map_right">200px</dimen>
@@ -60,7 +62,7 @@
<dimen name="module_v2x_panel_width">82px</dimen>
<dimen name="module_v2x_panel_icon_cor">16px</dimen>
<dimen name="share_empty_icon_width">117px</dimen>
<dimen name="v2x_loading_ani_width">100px</dimen>
<dimen name="v2x_loading_ani_width">50px</dimen>
<dimen name="v2x_share_btn_width">150px</dimen>
<dimen name="v2x_share_btn_height">48px</dimen>
<dimen name="v2x_index_rating_top">17px</dimen>
@@ -72,9 +74,7 @@
<dimen name="share_index_bottom_padding">15px</dimen>
<dimen name="share_btn_middle_padding">29px</dimen>
<dimen name="v2x_panel_btn_translationY">-8px</dimen>
<dimen name="module_v2x_panel_tab_height">84px</dimen>
<dimen name="v2x_panel_loading_top">120px</dimen>
</resources>

BIN
skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/model_ext_default_user_head_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.8 KiB

BIN
skin/mogo-skin-light/src/main/module-media-res/drawable-ldpi/module_media_window_alert_bg_light.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
skin/mogo-skin-light/src/main/module-media-res/drawable-mdpi/module_media_window_alert_bg_light.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
skin/mogo-skin-light/src/main/module-media-res/drawable-xhdpi/module_media_default_music_img_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
skin/mogo-skin-light/src/main/module-media-res/drawable-xhdpi/module_media_next_song_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 776 B

BIN
skin/mogo-skin-light/src/main/module-media-res/drawable-xhdpi/module_media_window_alert_bg_light.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
skin/mogo-skin-light/src/main/module-media-res/drawable-xhdpi/module_media_window_pop_pause_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
skin/mogo-skin-light/src/main/module-media-res/drawable-xhdpi/module_media_window_pop_play_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 522 B

14
skin/mogo-skin-light/src/main/module-media-res/drawable/module_media_window_alert_bg_light.xml
View File

@@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:angle="180"
android:startColor="#E5F5F5F5"
android:endColor="#FFFFFFFF"
android:type="linear" />
<corners
android:bottomLeftRadius="@dimen/module_media_window_corner"
android:bottomRightRadius="@dimen/module_media_window_corner"
android:topLeftRadius="@dimen/module_media_window_corner"
android:topRightRadius="@dimen/module_media_window_corner" />
</shape>

BIN
skin/mogo-skin-light/src/main/module-share-res/drawable-ldpi/module_share_btn_bg_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
skin/mogo-skin-light/src/main/module-share-res/drawable-mdpi/module_share_btn_bg_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
skin/mogo-skin-light/src/main/module-share-res/drawable-xhdpi/module_share_btn_bg_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.9 KiB

BIN
skin/mogo-skin-light/src/main/module-share-res/drawable-xhdpi/module_share_title_icon_left_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
skin/mogo-skin-light/src/main/module-share-res/drawable-xhdpi/module_share_title_icon_right_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

9
skin/mogo-skin-light/src/main/module-share-res/drawable/module_share_btn_bg_light.xml
View File

@@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="oval">
<size android:width="@dimen/dp_160" android:height="@dimen/dp_160" />
<gradient android:startColor="#F0F0F0" android:endColor="#D7D7D7" android:angle="-45"/>
</shape>
</item>
</selector>

41
skin/mogo-skin-light/src/main/module-tanlu-res/drawable/tanlu_alert_window_bg_light.xml Normal file
View File

@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 边 -->
<item>
<shape android:shape="rectangle">
<padding
android:bottom="2dp"
android:left="2dp"
android:right="2dp"
android:top="2dp" />
<solid android:color="#0DCCCCCC" />
<corners android:radius="@dimen/dp_30" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<padding
android:bottom="2dp"
android:left="2dp"
android:right="2dp"
android:top="2dp" />
<solid android:color="#26CCCCCC" />
<corners android:radius="@dimen/dp_30" />
</shape>
</item>
<!-- 中心背景 -->
<item>
<shape
android:shape="rectangle"
android:useLevel="false">
<!-- 实心 -->
<solid android:color="#ffffff" />
<corners android:radius="@dimen/dp_30" />
<padding
android:bottom="10dp"
android:left="10dp"
android:right="10dp"
android:top="10dp" />
</shape>
</item>
</layer-list>

BIN
skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_illegal_parking_light.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.5 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_illegal_parking_light.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 8.5 KiB

BIN
skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_illegal_parking_light.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 20 KiB

BIN
skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_daolushigong_nor_light.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 704 KiB

After

Width:  |  Height:  |  Size: 318 KiB

BIN
skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_fenglu_nor_light.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 701 KiB

After

Width:  |  Height:  |  Size: 329 KiB

BIN
skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongjiancha_nor_light.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 609 KiB

After

Width:  |  Height:  |  Size: 309 KiB

BIN
skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongshigu_nor_light.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 545 KiB

After

Width:  |  Height:  |  Size: 287 KiB

BIN
skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiebing_nor_light.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 109 KiB

After

Width:  |  Height:  |  Size: 320 KiB

BIN
skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jishui_nor_light.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 847 KiB

After

Width:  |  Height:  |  Size: 328 KiB

BIN
skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_nongwu_nor_light.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 212 KiB

After

Width:  |  Height:  |  Size: 163 KiB

BIN
skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_qiuzhu_nor_light.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 789 KiB

After

Width:  |  Height:  |  Size: 283 KiB

BIN
skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_shishlukuang_nor_light.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 947 KiB

After

Width:  |  Height:  |  Size: 287 KiB

BIN
skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_yongdu_nor_light.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 507 KiB

After

Width:  |  Height:  |  Size: 274 KiB

BIN
skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_close_light.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

47
skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml
View File

@@ -1,11 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="@dimen/dp_30" />
<gradient
android:angle="135"
android:endColor="#FFFFFF"
android:startColor="#F5F5F5"
android:type="linear"
android:useLevel="true" />
</shape>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 边 -->
<item>
<shape android:shape="rectangle">
<padding
android:bottom="2dp"
android:left="2dp"
android:right="2dp"
android:top="2dp" />
<solid android:color="#0DCCCCCC" />
<corners android:radius="@dimen/dp_26" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<padding
android:bottom="2dp"
android:left="2dp"
android:right="2dp"
android:top="2dp" />
<solid android:color="#26CCCCCC" />
<corners android:radius="@dimen/dp_26" />
</shape>
</item>
<!-- 中心背景 -->
<item>
<shape android:shape="rectangle">
<corners android:radius="@dimen/dp_26" />
<gradient
android:angle="135"
android:endColor="#E6F5F5F5"
android:startColor="#FFFFFF"
android:type="linear"
android:useLevel="true" />
</shape>
</item>
</layer-list>