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

Merge remote-tracking branch 'origin/qa_light' into qa_light

Browse Source 
# Conflicts:
#	modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml
This commit is contained in:
tongchenfei
2020-09-16 20:43:27 +08:00
parent 31dadd76ce 749b721720
commit bb18f36028
127 changed files with 380 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
</project>

2
gradle.properties
View File

@@ -65,7 +65,7 @@ MOGO_BASE_SERVICES_SDK_VERSION = 1.2.1.22
# 探路
MOGO_MODULE_TANLU_VERSION=1.3.1.24
# 车聊聊
CARCHATTING_VERSION=1.5.3
CARCHATTING_VERSION=1.6.3
# 车聊聊接口
CARCHATTINGPROVIDER_VERSION=1.3.4
# 视频引导

68
libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
View File

@@ -4,6 +4,7 @@ import android.content.Intent
import android.util.Log
import com.google.gson.Gson
import com.mogo.commons.AbsMogoApplication
import com.mogo.utils.TipToast
import com.zhidao.cosupload.DbPriorityConfig
import com.zhidao.cosupload.callback.CosStatusCallback
import com.zhidao.cosupload.manager.CosUploadManagerImpl
@@ -142,20 +143,18 @@ class CosStatusController : CosStatusCallback {
val locationStr: String = Gson().toJson(locationInfo)
Log.d(TAG, "locationStr = " + locationStr)
//如果失败，需要提示失败弹框
if (locationInfo.address.isNullOrEmpty() || locationInfo.cityName.isNullOrEmpty() || locationInfo.cityCode.isNullOrEmpty()
|| locationInfo.latitude == 0.0 || locationInfo.areaName.isNullOrEmpty() || locationInfo.street.isNullOrEmpty()
|| locationInfo.areaCode.isNullOrEmpty() || locationInfo.provinceName.isNullOrEmpty()
) {
if (entity?.isCustom && mFromType != UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO) {
sendGetInfoFailedReceiver("100")
}
} else {
//分享成功，并打点，如果是上报拥堵，需要takeVideo
LatLngStickyEventBus.getInstance()
.postSticky(GetImageSuccessEvent(downloadUrl, mType))
//上传录像以及缩略图成功
sendInformation(INFO_TYPE_VIDEO, videoAndThumbMap)
}
// if (locationInfo.address.isNullOrEmpty() || locationInfo.cityName.isNullOrEmpty() || locationInfo.cityCode.isNullOrEmpty()
// || locationInfo.latitude == 0.0 || locationInfo.areaName.isNullOrEmpty() || locationInfo.street.isNullOrEmpty()
// || locationInfo.areaCode.isNullOrEmpty() || locationInfo.provinceName.isNullOrEmpty()
// ) {
// if (entity?.isCustom && mFromType != UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO) {
// sendGetInfoFailedReceiver("100")
// }
// } else {
//上传录像以及缩略图成功
sendInformation(INFO_TYPE_VIDEO, videoAndThumbMap)
// }
} else {
trackUploadCos(5)
}
@@ -204,20 +203,37 @@ class CosStatusController : CosStatusCallback {
//开始上传
entity?.isCustom?.let {
mainServiceHttpModel.sendInformationMessage(
type = type,
url = map,
isCustom = it,
poiType = poiType,
mainInfoId = mainInfoId,
longitude = longitude,
latitude = latitude
) { success ->
CosCallbackMapController.unregisterCallbacks(map)
CosCallbackMapController.mainService?.let {
CosCallbackMapController.mainService?.sendCustomResult(success)
type = type,
url = map,
isCustom = it,
poiType = poiType,
mainInfoId = mainInfoId,
longitude = longitude,
latitude = latitude
) { success ->
CosCallbackMapController.unregisterCallbacks(map)
CosCallbackMapController.mainService?.let {
CosCallbackMapController.mainService?.sendCustomResult(success)
}
Log.d(TAG, "type = $type ----success = $success")
if (success) {
//分享成功，并打点，如果是上报拥堵，需要takeVideo
if (type == INFO_TYPE_VIDEO) {
try {
LatLngStickyEventBus.getInstance()
.postSticky(GetImageSuccessEvent("", poiType))
} catch (e: java.lang.Exception) {
e.printStackTrace()
}
}
} else {
if (type == INFO_TYPE_VIDEO) {
TipToast.shortTip("分享失败，请检查网络")
}
}
}
}
}
}
override fun onProgress(localPath: String?, progress: Float) {

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

@@ -1053,5 +1053,6 @@
<dimen name="sp_42">42px</dimen>
<dimen name="sp_48">48px</dimen>
<dimen name="module_common_shadow_width">-10px</dimen>
<dimen name="module_common_shadow_width_pos">10px</dimen>
</resources>

1
modules/mogo-module-common/src/main/res/values/dimens.xml
View File

@@ -1044,4 +1044,5 @@
<dimen name="sp_42">22.9688px</dimen>
<dimen name="sp_48">26.2500px</dimen>
<dimen name="module_common_shadow_width">-8px</dimen>
<dimen name="module_common_shadow_width_pos">8px</dimen>
</resources>

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

@@ -81,8 +81,10 @@
android:id="@+id/module_entrance_id_move2_current_location"
android:layout_width="@dimen/module_ext_operation_panel_width"
android:layout_height="@dimen/module_ext_operation_panel_move2_height"
android:background="@drawable/module_ext_dw_common_corner_bkg"
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" />

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

@@ -71,8 +71,8 @@
<ImageView
android:id="@+id/ivUserHeadImg"
android:layout_width="@dimen/module_ext_height"
android:layout_height="@dimen/module_ext_height"
android:layout_width="@dimen/module_ext_user_avator_size"
android:layout_height="@dimen/module_ext_user_avator_size"
android:src="@drawable/model_ext_default_user_head"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"

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

@@ -1,4 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="module_ext_msg_counter_margin">26px</dimen>
<dimen name="module_ext_user_avator_size">66px</dimen>
<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>

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

@@ -30,17 +30,17 @@
<dimen name="module_ext_navi_panel_marginLeft">32px</dimen>
<dimen name="module_ext_navi_panel_marginTop">2px</dimen>
<dimen name="module_ext_operation_panel_width">120px</dimen>
<dimen name="module_ext_operation_panel_width">140px</dimen>
<dimen name="module_ext_operation_panel_marginRight">32px</dimen>
<dimen name="module_ext_operation_panel_marginBottom">60px</dimen>
<dimen name="module_ext_operation_panel_vr_height">92px</dimen>
<dimen name="module_ext_operation_panel_vr_textSize">24px</dimen>
<dimen name="module_ext_operation_panel_divider_width">48px</dimen>
<dimen name="module_ext_operation_panel_divider_height">2px</dimen>
<dimen name="module_ext_operation_panel_move2_height">120px</dimen>
<dimen name="module_ext_operation_panel_share_width">120px</dimen>
<dimen name="module_ext_operation_panel_move2_height">140px</dimen>
<dimen name="module_ext_operation_panel_share_width">140px</dimen>
<dimen name="module_ext_operation_panel_share_height">120px</dimen>
<dimen name="module_ext_operation_panel_share_marginBottom">30px</dimen>
<dimen name="module_ext_operation_panel_share_marginBottom">20px</dimen>
<dimen name="module_ext_operation_panel_share_textSize">30px</dimen>
<dimen name="module_ext_operation_panel_share_goneMarginBottom">32px</dimen>
<dimen name="module_ext_operation_panel_share_goneMarginRight">32px</dimen>
@@ -146,4 +146,8 @@
<dimen name="module_ext_top_over_navi_height">40px</dimen>
<dimen name="module_ext_msg_counter_margin">45px</dimen>
<dimen name="module_ext_user_avator_size">120px</dimen>
<dimen name="module_ext_layout_padding">30px</dimen>
<dimen name="module_ext_layout_paddingRight">20px</dimen>
<dimen name="module_ext_layout_paddingBottom">20px</dimen>
</resources>

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

@@ -30,17 +30,17 @@
<dimen name="module_ext_navi_panel_marginLeft">32px</dimen>
<dimen name="module_ext_navi_panel_marginTop">2px</dimen>
<dimen name="module_ext_operation_panel_width">120px</dimen>
<dimen name="module_ext_operation_panel_width">140px</dimen>
<dimen name="module_ext_operation_panel_marginRight">32px</dimen>
<dimen name="module_ext_operation_panel_marginBottom">60px</dimen>
<dimen name="module_ext_operation_panel_vr_height">92px</dimen>
<dimen name="module_ext_operation_panel_vr_textSize">24px</dimen>
<dimen name="module_ext_operation_panel_divider_width">48px</dimen>
<dimen name="module_ext_operation_panel_divider_height">2px</dimen>
<dimen name="module_ext_operation_panel_move2_height">120px</dimen>
<dimen name="module_ext_operation_panel_move2_height">140px</dimen>
<dimen name="module_ext_operation_panel_share_width">120px</dimen>
<dimen name="module_ext_operation_panel_share_height">120px</dimen>
<dimen name="module_ext_operation_panel_share_marginBottom">30px</dimen>
<dimen name="module_ext_operation_panel_share_marginBottom">20px</dimen>
<dimen name="module_ext_operation_panel_share_textSize">30px</dimen>
<dimen name="module_ext_operation_panel_share_goneMarginBottom">32px</dimen>
<dimen name="module_ext_operation_panel_share_goneMarginRight">32px</dimen>
@@ -145,7 +145,11 @@
<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">175px</dimen>
<dimen name="module_ext_weather_margin_start">30px</dimen>
<dimen name="module_ext_notice_margin_start">165px</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>
<dimen name="module_ext_layout_padding">30px</dimen>
<dimen name="module_ext_layout_paddingRight">20px</dimen>
<dimen name="module_ext_layout_paddingBottom">20px</dimen>
</resources>

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

@@ -30,17 +30,17 @@
<dimen name="module_ext_navi_panel_marginLeft">20px</dimen>
<dimen name="module_ext_navi_panel_marginTop">1px</dimen>
<dimen name="module_ext_operation_panel_width">66px</dimen>
<dimen name="module_ext_operation_panel_width">82px</dimen>
<dimen name="module_ext_operation_panel_marginRight">20px</dimen>
<dimen name="module_ext_operation_panel_marginBottom">34.5px</dimen>
<dimen name="module_ext_operation_panel_vr_height">58px</dimen>
<dimen name="module_ext_operation_panel_vr_textSize">17px</dimen>
<dimen name="module_ext_operation_panel_divider_width">31.4px</dimen>
<dimen name="module_ext_operation_panel_divider_height">1.2px</dimen>
<dimen name="module_ext_operation_panel_move2_height">66px</dimen>
<dimen name="module_ext_operation_panel_move2_height">82px</dimen>
<dimen name="module_ext_operation_panel_share_width">66px</dimen>
<dimen name="module_ext_operation_panel_share_height">66px</dimen>
<dimen name="module_ext_operation_panel_share_marginBottom">16px</dimen>
<dimen name="module_ext_operation_panel_share_marginBottom">8px</dimen>
<dimen name="module_ext_operation_panel_share_textSize">16px</dimen>
<dimen name="module_ext_operation_panel_share_goneMarginBottom">34.5px</dimen>
<dimen name="module_ext_operation_panel_share_goneMarginRight">20px</dimen>
@@ -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">90px</dimen>
<dimen name="module_ext_notice_margin_start">82px</dimen>
<dimen name="module_ext_voice_textSize">22px</dimen>
<dimen name="module_ext_time_textSize">28px</dimen>
@@ -151,7 +151,11 @@
<dimen name="module_ext_display_overview_icon_marginTop">10px</dimen>
<dimen name="module_ext_top_over_navi_height">19px</dimen>
<dimen name="module_ext_weather_margin_start">16px</dimen>
<dimen name="module_ext_weather_margin_start">0px</dimen>
<dimen name="module_ext_msg_counter_margin">26px</dimen>
<dimen name="module_ext_user_avator_size">66px</dimen>
<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>

12
modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
View File

@@ -48,6 +48,12 @@
android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft"
android:padding="@dimen/module_main_entrance_fragment_container_padding" />
<!-- 浮层-->
<FrameLayout
android:id="@+id/module_main_id_floating_view"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<FrameLayout
android:id="@+id/module_main_id_event_panel_fragment_container"
android:layout_width="match_parent"
@@ -61,12 +67,6 @@
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft"/>
<!-- 浮层-->
<FrameLayout
android:id="@+id/module_main_id_floating_view"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<FrameLayout
android:id="@+id/module_main_id_search_fragment"
android:layout_width="match_parent"

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

@@ -66,7 +66,7 @@ public class TanluSlideAdapterNew extends RecyclerView.Adapter<TanluSlideViewHol
private TextView mDistanceTv;
private TextView mTimeTv;
private SimpleCoverVideoPlayer simpleCoverVideoPlayer;
private ImageView autoZoomInImageView;
private MogoImageView autoZoomInImageView;
private MogoImageView mHeadImage;
private ImageView mChatImage;
private ImageView mLikeImage;
@@ -330,19 +330,18 @@ public class TanluSlideAdapterNew extends RecyclerView.Adapter<TanluSlideViewHol
simpleCoverVideoPlayer.setVisibility(GONE);
autoZoomInImageView.setVisibility(View.VISIBLE);
//加载图片
RequestOptions requestOptions = new RequestOptions()
.placeholder(R.drawable.tanlu_normal_image)
.error(R.drawable.tanlu_normal_image);
// RequestOptions requestOptions = new RequestOptions()
// .placeholder(R.drawable.tanlu_normal_image)
// .error(R.drawable.tanlu_normal_image);
//
// Glide.with(mContext)
// .asBitmap()
// .load(mImageUrl)
// .apply(requestOptions)
// .into(autoZoomInImageView);
// .into(new SkinAbleBitmapTarget(autoZoomInImageView, requestOptions));
mogoImageloader.displayImage(mImageUrl, autoZoomInImageView);
Glide.with(mContext)
.asBitmap()
.load(mImageUrl)
.apply(requestOptions)
.into(new SkinAbleBitmapTarget(autoZoomInImageView, requestOptions));
}
traceVideoPlayStatusData();
@@ -372,14 +371,16 @@ public class TanluSlideAdapterNew extends RecyclerView.Adapter<TanluSlideViewHol
autoZoomInImageView.setVisibility(View.VISIBLE);
Logger.d(TAG, "refreshPhotoData imageUrl = " + imageUrl);
//加载图片
RequestOptions requestOptions = new RequestOptions()
.placeholder(R.drawable.tanlu_normal_image)
.error(R.drawable.tanlu_normal_image);
Glide.with(mContext)
.asBitmap()
.load(imageUrl)
.apply(requestOptions)
.into(new SkinAbleBitmapTarget(autoZoomInImageView, requestOptions));
// RequestOptions requestOptions = new RequestOptions()
// .placeholder(R.drawable.tanlu_normal_image)
// .error(R.drawable.tanlu_normal_image);
// Glide.with(mContext)
// .asBitmap()
// .load(imageUrl)
// .apply(requestOptions)
// .into(new SkinAbleBitmapTarget(autoZoomInImageView, requestOptions));
mogoImageloader.displayImage(imageUrl, autoZoomInImageView);
}
@@ -468,19 +469,19 @@ public class TanluSlideAdapterNew extends RecyclerView.Adapter<TanluSlideViewHol
typeName = "封路";
break;
case TanluConstants.TANLU_ROAD_CONSTRUCTION:
typeName = "道路施工";
typeName = "施工";
break;
case TanluConstants.TANLU_ROAD_CONGESTION_COMPAT:
typeName = "道路拥堵";
typeName = "拥堵";
break;
case TanluConstants.TANLU_ROAD_PONDING:
typeName = "道路积水";
break;
case TanluConstants.TANLU_ROAD_ICING:
typeName = "路面结冰";
typeName = "道路结冰";
break;
case TanluConstants.TANLU_ROAD_HEAVY_FOG:
typeName = "出现浓雾";
typeName = "浓雾";
break;
case TanluConstants.TANLU_ROAD_ACCIDENT:
typeName = "交通事故";

2
modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt
View File

@@ -58,7 +58,7 @@ class SimpleCoverVideoPlayer : StandardGSYVideoPlayer {
fun loadCoverImage(url: String, mContext: Context) {
//加载图片
val requestOptions = RequestOptions()
.placeholder(R.drawable.tanlu_normal_image)
// .placeholder(R.drawable.tanlu_normal_image)
.error(R.drawable.tanlu_normal_image)
Glide.with(mContext).asBitmap()
.load(url)

36
modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/view/RoundLayout.java
View File

@@ -8,7 +8,11 @@ import android.graphics.RectF;
import android.util.AttributeSet;
import android.widget.RelativeLayout;
import androidx.annotation.DrawableRes;
import com.mogo.module.tanlu.R;
import com.mogo.skin.support.IMogoSkinCompatSupportable;
import com.mogo.skin.support.helper.MogoSkinCompatBackgroundHelperDelegate;
/**
* author : donghongyu
@@ -17,29 +21,34 @@ import com.mogo.module.tanlu.R;
* desc :
* version: 1.0
*/
public class RoundLayout extends RelativeLayout {
public class RoundLayout extends RelativeLayout implements IMogoSkinCompatSupportable {
private float roundLayoutRadius = 14f;
private Path roundPath;
private RectF rectF;
private MogoSkinCompatBackgroundHelperDelegate mBackgroundTintHelper;
public RoundLayout(Context context) {
this(context, null);
}
public RoundLayout(Context context, AttributeSet attrs, int defStyleAttr) {
this(context, attrs);
public RoundLayout(Context context, AttributeSet attrs) {
this(context, attrs, 0);
}
public RoundLayout(Context context, AttributeSet attrs) {
super(context, attrs);
public RoundLayout(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.RoundLayout);
roundLayoutRadius = typedArray.getDimensionPixelSize(R.styleable.RoundLayout_roundLayoutRadius, (int) roundLayoutRadius);
typedArray.recycle();
init();
mBackgroundTintHelper = new MogoSkinCompatBackgroundHelperDelegate(this);
mBackgroundTintHelper.loadFromAttributes(attrs, defStyleAttr);
}
private void init() {
setWillNotDraw(false);//如果你继承的是ViewGroup,注意此行,否则draw方法是不会回调的;
roundPath = new Path();
@@ -58,6 +67,15 @@ public class RoundLayout extends RelativeLayout {
postInvalidate();
}
@Override
public void setBackgroundResource(@DrawableRes int resId) {
super.setBackgroundResource(resId);
if (mBackgroundTintHelper != null) {
mBackgroundTintHelper.onSetBackgroundResource(resId);
}
}
@Override
protected void onLayout(boolean changed, int l, int t, int r, int b) {
super.onLayout(changed, l, t, r, b);
@@ -72,5 +90,13 @@ public class RoundLayout extends RelativeLayout {
}
super.draw(canvas);
}
@Override
public void applySkin() {
if (mBackgroundTintHelper != null) {
mBackgroundTintHelper.applySkin();
}
}
}

BIN
modules/mogo-module-tanlu/src/main/res/drawable-ldpi/tanlu_default_black_logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.0 KiB

BIN
modules/mogo-module-tanlu/src/main/res/drawable-ldpi/tanlu_icon_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
modules/mogo-module-tanlu/src/main/res/drawable-mdpi/tanlu_default_black_logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.0 KiB

BIN
modules/mogo-module-tanlu/src/main/res/drawable-mdpi/tanlu_icon_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
modules/mogo-module-tanlu/src/main/res/drawable-xhdpi-1920x1000/tanlu_icon_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
modules/mogo-module-tanlu/src/main/res/drawable-xhdpi-1920x1000/tanlu_top_bg.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/tanlu_default_black_logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/tanlu_icon_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

6
modules/mogo-module-tanlu/src/main/res/drawable/shape_tanlu_top_bg.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_F5F5"/>
</shape>

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

@@ -2,29 +2,17 @@
<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"
xmlns:tools="http://schemas.android.com/tools"
android:background="@drawable/tanlu_gradual_change_bg">
<!--视频播放器和图片播放器-->
<!-- <RelativeLayout-->
<!-- android:id="@+id/media_layout"-->
<!-- android:layout_width="@dimen/tanlu_module_card_video_width"-->
<!-- android:layout_height="match_parent"-->
<!-- android:layout_marginTop="@dimen/tanlu_module_card_margin_left"-->
<!-- android:layout_marginBottom="@dimen/tanlu_module_card_margin_left"-->
<!-- android:layout_marginRight="@dimen/tanlu_module_margin_right"-->
<!-- android:layout_marginLeft="@dimen/tanlu_module_card_margin_left">-->
android:layout_height="@dimen/tanlu_module_card_height">
<!-- 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"
android:layout_height="match_parent"
android:layout_height="@dimen/tanlu_module_card_video_height"
android:layout_marginLeft="@dimen/tanlu_module_card_margin_left"
android:layout_marginTop="@dimen/tanlu_module_card_margin_left"
android:layout_marginRight="@dimen/tanlu_module_margin_right"
android:layout_marginBottom="@dimen/tanlu_module_card_margin_left"
android:background="@drawable/tanlu_gradual_change_bg">
android:background="@drawable/shape_tanlu_top_bg">
<com.mogo.module.tanlu.video.SimpleCoverVideoPlayer
android:id="@+id/video_player_main"
@@ -33,16 +21,23 @@
android:layout_centerInParent="true"
android:visibility="gone" />
<ImageView
<com.mogo.service.imageloader.MogoImageView
android:id="@+id/tanlu_photo_imageView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerVertical="true"
android:src="@drawable/tanlu_normal_image"
android:scaleType="fitXY" />
</com.mogo.module.tanlu.view.RoundLayout>
android:scaleType="center"
app:miv_failureHolder="@drawable/tanlu_icon_logo"
app:miv_overlayImageId="@drawable/tanlu_icon_logo"
app:miv_placeHolder="@drawable/tanlu_icon_logo" />
<!-- </RelativeLayout>-->
<!-- <ImageView-->
<!-- android:id="@+id/tanlu_photo_imageView"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:layout_centerVertical="true"-->
<!-- android:src="@drawable/tanlu_normal_image"-->
<!-- android:scaleType="fitXY" />-->
</com.mogo.module.tanlu.view.RoundLayout>
<!--右侧数据-->
<RelativeLayout
@@ -141,16 +136,16 @@
android:layout_width="@dimen/tanlu_image_size"
android:layout_height="@dimen/tanlu_image_size"
android:layout_marginRight="@dimen/tanlu_module_margin_left"
android:visibility="gone"
android:src="@drawable/selector_chat_btn" />
android:src="@drawable/selector_chat_btn"
android:visibility="gone" />
<LinearLayout
android:id="@+id/tanlu_like_layout"
android:layout_width="@dimen/tanlu_image_size"
android:layout_height="@dimen/tanlu_image_size"
android:layout_toRightOf="@+id/tanlu_chat_imageView"
android:background="@drawable/icon_heart_like_bg"
android:gravity="center"
android:layout_toRightOf="@+id/tanlu_chat_imageView">
android:gravity="center">
<ImageView
android:id="@+id/tanlu_like_imageView"
@@ -164,8 +159,8 @@
android:id="@+id/tanlu_close_imageView"
android:layout_width="@dimen/tanlu_module_close_height"
android:layout_height="@dimen/tanlu_module_close_height"
android:layout_centerInParent="true"
android:layout_alignParentRight="true"
android:layout_centerInParent="true"
android:layout_marginRight="@dimen/tanlu_module_margin_right"
android:src="@drawable/selector_btn_close" />

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

@@ -1,14 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
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/tanlu_module_card_height"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:background="@drawable/tanlu_gradual_change_bg">
android:background="@drawable/tanlu_top_bg">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/tanlu_rloop_recycleview"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent"
/>
<!-- tools:listitem="@layout/tanlu_item_main_media_recycler_new"-->
</RelativeLayout>

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

@@ -77,14 +77,14 @@
<!--new-->
<dimen name="tanlu_module_card_width">642px</dimen>
<dimen name="tanlu_module_card_height">170px</dimen>
<dimen name="tanlu_module_card_video_width">234px</dimen>
<dimen name="tanlu_module_card_video_height">156px</dimen>
<dimen name="tanlu_module_card_height">186px</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>
<dimen name="tanlu_module_card_margin_top">13px</dimen>
<dimen name="tanlu_module_card_margin_left">8px</dimen>
<dimen name="tanlu_module_margin_right">13px</dimen>
<dimen name="tanlu_module_margin_right">7px</dimen>
<dimen name="tanlu_module_margin_left">17px</dimen>
<dimen name="tanlu_module_margin_top">3px</dimen>
<dimen name="tanlu_module_mavi_height">18px</dimen>

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

@@ -77,14 +77,14 @@
<!--new-->
<dimen name="tanlu_module_card_width">1233px</dimen>
<dimen name="tanlu_module_card_height">300px</dimen>
<dimen name="tanlu_module_card_height">326px</dimen>
<dimen name="tanlu_module_card_video_width">480px</dimen>
<dimen name="tanlu_module_card_video_height">270px</dimen>
<dimen name="tanlu_module_card_video_height">280px</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">13px</dimen>
<dimen name="tanlu_module_margin_right">23px</dimen>
<dimen name="tanlu_module_card_margin_left">12px</dimen>
<dimen name="tanlu_module_margin_right">12px</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>

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

@@ -77,14 +77,14 @@
<!--new-->
<dimen name="tanlu_module_card_width">1060px</dimen>
<dimen name="tanlu_module_card_height">306px</dimen>
<dimen name="tanlu_module_card_height">326px</dimen>
<dimen name="tanlu_module_card_video_width">421px</dimen>
<dimen name="tanlu_module_card_video_height">280px</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">13px</dimen>
<dimen name="tanlu_module_margin_right">23px</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_margin_top">9px</dimen>
<dimen name="tanlu_module_mavi_height">27px</dimen>

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

@@ -51,5 +51,6 @@
<color name="tanlu_dialog_bt_right_color">#50526E</color>
<color name="tanlu_top_bg_startcolor">#5E6079</color>
<color name="tanlu_top_bg_endcolor">#3F4057</color>
<color name="tanlu_555A_F5F5">#555A75</color>
</resources>

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

@@ -77,14 +77,14 @@
<!--new-->
<dimen name="tanlu_module_card_width">642px</dimen>
<dimen name="tanlu_module_card_height">194px</dimen>
<dimen name="tanlu_module_card_video_width">266px</dimen>
<dimen name="tanlu_module_card_video_height">194px</dimen>
<dimen name="tanlu_module_card_height">186px</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>
<dimen name="tanlu_module_card_margin_top">13px</dimen>
<dimen name="tanlu_module_card_margin_left">8px</dimen>
<dimen name="tanlu_module_margin_right">13px</dimen>
<dimen name="tanlu_module_margin_right">7px</dimen>
<dimen name="tanlu_module_margin_left">17px</dimen>
<dimen name="tanlu_module_margin_top">3px</dimen>
<dimen name="tanlu_module_mavi_height">18px</dimen>

7
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/SpacesItemDecoration.java
View File

@@ -20,13 +20,6 @@ public class SpacesItemDecoration extends RecyclerView.ItemDecoration {
@Override
public void getItemOffsets(Rect outRect, View view,
RecyclerView parent, RecyclerView.State state) {
outRect.left = space;
outRect.right = space;
outRect.bottom = space;
// Add top margin only for the first item to avoid double space between items
if (parent.getChildPosition(view) == 0) {
outRect.top = space;
}
}
}

8
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java
View File

@@ -191,10 +191,10 @@ public class V2XSurroundingAdapter extends RecyclerView.Adapter<V2XSurroundingVi
typeName = "封路";
break;
case MarkerPoiTypeEnum.FOURS_ICE:
typeName = "路面结冰";
typeName = "道路结冰";
break;
case MarkerPoiTypeEnum.FOURS_FOG:
typeName = "出现浓雾";
typeName = "浓雾";
break;
case MarkerPoiTypeEnum.TRAFFIC_CHECK:
typeName = "交通检查";
@@ -203,10 +203,10 @@ public class V2XSurroundingAdapter extends RecyclerView.Adapter<V2XSurroundingVi
typeName = "交通事故";
break;
case MarkerPoiTypeEnum.FOURS_BLOCK_UP:
typeName = "道路拥堵";
typeName = "拥堵";
break;
case MarkerPoiTypeEnum.FOURS_ROAD_WORK:
typeName = "道路施工";
typeName = "施工";
break;
case MarkerPoiTypeEnum.FOURS_PONDING:
typeName = "道路积水";

16
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
View File

@@ -1,6 +1,7 @@
package com.mogo.module.v2x.fragment
import android.content.Intent
import android.graphics.Typeface
import android.view.View
import android.widget.ImageView
import android.widget.RadioButton
@@ -123,14 +124,29 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
mRgTabSelect?.setOnCheckedChangeListener { group, checkedId ->
when (checkedId) {
R.id.rbScenarioHistory -> {
// 更改选中是否加粗
mRbScenarioHistory?.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
mRbSurroundingEvent?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
mRbShareEvents?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
TrackUtils.trackV2xHistoryEvent(2)
mVpEventPanel?.setCurrentItem(0, false)
}
R.id.rbSurroundingEvent -> {
// 更改选中是否加粗
mRbScenarioHistory?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
mRbSurroundingEvent?.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
mRbShareEvents?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
TrackUtils.trackV2xHistoryEvent(3)
mVpEventPanel?.setCurrentItem(1, false)
}
R.id.rbShareEvents -> {
// 更改选中是否加粗
mRbScenarioHistory?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
mRbSurroundingEvent?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
mRbShareEvents?.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
TrackUtils.trackV2xHistoryEvent(4)
mVpEventPanel?.setCurrentItem(2, false)
}

52
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/AnimationResources.java
View File

@@ -5,32 +5,32 @@ import com.mogo.module.v2x.R;
public class AnimationResources {
public static final int loadingRes[] = {
R.drawable.v_to_x_loading_car0000,
R.drawable.v_to_x_loading_car0002,
R.drawable.v_to_x_loading_car0004,
R.drawable.v_to_x_loading_car0006,
R.drawable.v_to_x_loading_car0008,
R.drawable.v_to_x_loading_car0010,
R.drawable.v_to_x_loading_car0012,
R.drawable.v_to_x_loading_car0014,
R.drawable.v_to_x_loading_car0016,
R.drawable.v_to_x_loading_car0018,
R.drawable.v_to_x_loading_car0020,
R.drawable.v_to_x_loading_car0022,
R.drawable.v_to_x_loading_car0024,
R.drawable.v_to_x_loading_car0025,
R.drawable.v_to_x_loading_car0027,
R.drawable.v_to_x_loading_car0029,
R.drawable.v_to_x_loading_car0031,
R.drawable.v_to_x_loading_car0033,
R.drawable.v_to_x_loading_car0035,
R.drawable.v_to_x_loading_car0037,
R.drawable.v_to_x_loading_car0039,
R.drawable.v_to_x_loading_car0041,
R.drawable.v_to_x_loading_car0043,
R.drawable.v_to_x_loading_car0045,
R.drawable.v_to_x_loading_car0047,
R.drawable.v_to_x_loading_car0048,
// R.drawable.v_to_x_loading_car0000,
// R.drawable.v_to_x_loading_car0002,
// R.drawable.v_to_x_loading_car0004,
// R.drawable.v_to_x_loading_car0006,
// R.drawable.v_to_x_loading_car0008,
// R.drawable.v_to_x_loading_car0010,
// R.drawable.v_to_x_loading_car0012,
// R.drawable.v_to_x_loading_car0014,
// R.drawable.v_to_x_loading_car0016,
// R.drawable.v_to_x_loading_car0018,
// R.drawable.v_to_x_loading_car0020,
// R.drawable.v_to_x_loading_car0022,
// R.drawable.v_to_x_loading_car0024,
// R.drawable.v_to_x_loading_car0025,
// R.drawable.v_to_x_loading_car0027,
// R.drawable.v_to_x_loading_car0029,
// R.drawable.v_to_x_loading_car0031,
// R.drawable.v_to_x_loading_car0033,
// R.drawable.v_to_x_loading_car0035,
// R.drawable.v_to_x_loading_car0037,
// R.drawable.v_to_x_loading_car0039,
// R.drawable.v_to_x_loading_car0041,
// R.drawable.v_to_x_loading_car0043,
// R.drawable.v_to_x_loading_car0045,
// R.drawable.v_to_x_loading_car0047,
// R.drawable.v_to_x_loading_car0048,
};
}

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

@@ -1,63 +1,65 @@
package com.mogo.module.v2x.utils.animation;
import android.graphics.drawable.AnimationDrawable;
import android.util.Log;
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
import android.view.View;
import android.widget.ImageView;
import com.mogo.utils.ThreadPoolService;
import com.mogo.utils.UiThreadHandler;
import android.widget.ProgressBar;
public class V2XAnimationManager implements Animation {
private static final String TAG = "V2XAnimationManager";
private ImageView targetImageView;
private Animation delegate;
private ProgressBar targetImageView;
private boolean isStarted = false;
public void animationWithTarget(ImageView imageView, int[] resources, int duration) {
targetImageView = imageView;
ThreadPoolService.execute(() -> {
final AnimationDrawable drawable = new AnimationDrawable();
for (int i = 0; i < resources.length; i++) {
drawable.setOneShot(false);
drawable.addFrame(targetImageView.getResources().getDrawable(resources[i]), duration);
private int mStartIndex = 0;
private final static int MSG_LOOP = 3004;
private long INTERVAL = 100L;
private Handler mHandler = new Handler( Looper.getMainLooper() ) {
@Override
public void handleMessage( Message msg ) {
super.handleMessage( msg );
switch ( msg.what ) {
case MSG_LOOP:
if ( isStarted ) {
// targetImageView.setImageResource( AnimationResources.loadingRes[mStartIndex++ % AnimationResources.loadingRes.length] );
mHandler.sendEmptyMessageDelayed( MSG_LOOP, INTERVAL );
}
break;
}
UiThreadHandler.post(() -> {
targetImageView.setBackground(drawable);
delegate = new DelegateDrawable(drawable);
start();
});
});
}
};
public void animationWithTarget(ProgressBar imageView, int[] resources, int duration) {
targetImageView = imageView;
INTERVAL = duration;
start();
}
@Override
synchronized public void start() {
if (delegate != null && !isStarted) {
targetImageView.setVisibility(View.VISIBLE);
isStarted = true;
delegate.start();
}
isStarted = true;
mHandler.sendEmptyMessage( MSG_LOOP );
targetImageView.setVisibility(View.VISIBLE);
}
@Override
synchronized public void stop() {
if (delegate != null && isStarted) {
isStarted = false;
delegate.stop();
targetImageView.setVisibility(View.INVISIBLE);
}
isStarted = false;
mHandler.removeMessages( MSG_LOOP );
targetImageView.setVisibility(View.INVISIBLE);
}
public void soptWithError(){
if (delegate != null && isStarted) {
isStarted = false;
delegate.stop();
}
stop();
targetImageView.setVisibility(View.VISIBLE);
}
public void release() {
delegate = null;
stop();
}
}

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

@@ -6,6 +6,7 @@ import android.view.LayoutInflater;
import android.view.View;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.RelativeLayout;
import android.widget.TextView;
@@ -17,7 +18,7 @@ import com.mogo.module.v2x.utils.animation.V2XAnimationManager;
public class V2XNetworkLoadingView extends RelativeLayout {
private ImageView loadView;
private ProgressBar loadView;
private TextView textView;
private V2XAnimationManager v2XAnimationManager;
public Button refresButton;
@@ -32,6 +33,9 @@ public class V2XNetworkLoadingView extends RelativeLayout {
super(context, attrs);
LayoutInflater.from(context).inflate(R.layout.v2x_network_loading_item, this);
initView();
/*
添加动画图片资源
*/
setLoadingImage(AnimationResources.loadingRes);
}

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_shadow_bg.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 588 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 659 B

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0000.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.5 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0002.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.4 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0004.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.4 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0006.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.5 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0008.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.5 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0010.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.5 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0012.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.7 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0014.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.7 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0016.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.7 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0018.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.7 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0020.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.7 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0022.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.7 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0024.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.7 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0025.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.6 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0027.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.7 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0029.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.7 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0031.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.7 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0033.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.7 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0035.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.7 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0037.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.7 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0039.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.5 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0041.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.5 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0043.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.4 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0045.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.3 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0047.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.4 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0048.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.4 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_shadow_bg.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 588 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 659 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

2
modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml
View File

@@ -1,7 +1,7 @@
<?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_11"/>
<corners android:radius="@dimen/dp_24"/>
<gradient
android:startColor="#5E6079"
android:endColor="#3F4057"

3
modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_list_item.xml
View File

@@ -2,6 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#1F2131"/>
<corners android:radius="@dimen/dp_24"/>
<corners android:radius="@dimen/dp_30"/>
</shape>

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

@@ -1,7 +1,7 @@
<?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_40" />
<corners android:radius="@dimen/dp_30" />
<gradient
android:angle="135"
android:endColor="#3F4057"

2
modules/mogo-module-v2x/src/main/res/drawable/v2x_panel_color_bg.xml
View File

@@ -3,5 +3,5 @@
<gradient
android:startColor="#10121E"
android:endColor="#10121E"/>
<corners android:radius="28.8px"/>
<corners android:radius="@dimen/dp_40"/>
</shape>

2
modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="12px"/>
<corners android:radius="@dimen/dp_28"/>
<gradient
android:angle="270"
android:startColor="@android:color/transparent"

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

@@ -8,7 +8,7 @@
android:paddingStart="@dimen/dp_15"
android:paddingTop="@dimen/dp_15"
android:paddingBottom="@dimen/dp_15"
app:roundLayoutRadius="@dimen/dp_40">
app:roundLayoutRadius="@dimen/dp_30">
<com.mogo.module.v2x.view.RoundLayout
android:id="@+id/rlRoadEventImg"
@@ -18,7 +18,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:roundLayoutRadius="@dimen/dp_40">
app:roundLayoutRadius="@dimen/dp_30">
<com.mogo.service.imageloader.MogoImageView
android:id="@+id/ivEventImg"

9
modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_load_more.xml
View File

@@ -2,17 +2,18 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="40px"
android:paddingTop="40px">
android:paddingTop="@dimen/dp_40"
android:paddingBottom="@dimen/dp_40">
<Button
android:id="@+id/event_share_load_status"
android:layout_width="@dimen/v2x_share_btn_width"
android:layout_height="wrap_content"
android:paddingTop="12px"
android:paddingBottom="12px"
android:layout_centerInParent="true"
android:background="@drawable/v2xt_dw_common_corner_bkg_light"
android:gravity="center"
android:paddingTop="@dimen/dp_12"
android:paddingBottom="@dimen/dp_12"
android:text="查看更早记录"
android:textColor="#FFFFFF"
android:textSize="@dimen/dp_34" />

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

@@ -14,7 +14,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:roundLayoutRadius="@dimen/dp_40" />
app:roundLayoutRadius="@dimen/dp_30" />
<com.mogo.service.imageloader.MogoImageView
android:id="@+id/ivReportHead"

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

@@ -13,7 +13,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:roundLayoutRadius="@dimen/dp_40">
app:roundLayoutRadius="@dimen/dp_30">
<com.mogo.service.imageloader.MogoImageView
android:id="@+id/ivImg"

3
modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml
View File

@@ -5,9 +5,6 @@
android:id="@+id/rlContent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10px"
android:layout_marginRight="10px"
android:layout_marginBottom="14px"
android:background="@drawable/bg_v2x_event_list_item">
<TextView

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

@@ -4,9 +4,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10px"
android:layout_marginRight="10px"
android:layout_marginBottom="14px"
android:background="@drawable/bg_v2x_event_list_item">
<TextView
@@ -86,11 +83,11 @@
android:id="@+id/tvFaultHelpEventTime"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_24"
android:alpha="0.59"
android:textColor="@color/v2x_FFF_999"
android:textSize="@dimen/dp_29"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginBottom="@dimen/dp_24"
app:layout_constraintStart_toStartOf="@+id/tvFaultHelpName"
app:layout_constraintTop_toBottomOf="@id/tvFaultHelpName"
tools:text="15:30发布求助信息" />

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

@@ -22,14 +22,16 @@
android:layout_marginLeft="@dimen/module_v2x_surrounding_margin_left"
android:text="周围5公里，共15条交通信息"
android:textColor="@color/v2x_white"
android:layout_marginBottom="2px"
android:textSize="@dimen/module_v2x_surrounding_top_textsize" />
<!-- android:layout_centerInParent="true"-->
<TextView
android:id="@+id/tv_top_refresh"
android:layout_width="@dimen/module_v2x_surrounding_top_bt_width"
android:layout_height="@dimen/module_v2x_surrounding_top_bt_height"
android:layout_alignParentRight="true"
android:layout_centerInParent="true"
android:layout_alignParentBottom="true"
android:layout_marginRight="@dimen/module_v2x_surrounding_margin_left"
android:background="@drawable/bg_v2x_refresh"
android:gravity="center"

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

@@ -9,11 +9,11 @@
android:scaleType="fitXY"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<!-- android:src="@drawable/mogo_image_nongwu_nor"-->
<!-- android:src="@drawable/mogo_image_nongwu_nor" bg_v2x_event_surrounding_item_bottom-->
<RelativeLayout
android:layout_alignParentBottom="true"
android:background="@drawable/bg_v2x_event_surrounding_item_bottom"
android:background="@drawable/v2x_surrounding_bottom_bg"
android:layout_width="match_parent"
android:layout_height="@dimen/module_v2x_surrounding_item_bottom">

47
modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
View File

@@ -13,10 +13,11 @@
<RadioGroup
android:id="@+id/rgTabSelect"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_125"
android:layout_height="@dimen/module_v2x_panel_tab_height"
android:gravity="center_vertical"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
@@ -27,17 +28,17 @@
android:button="@null"
android:checked="true"
android:gravity="center"
android:paddingStart="@dimen/dp_40"
android:paddingEnd="@dimen/dp_40"
android:paddingStart="@dimen/dp_48"
android:paddingEnd="@dimen/dp_35"
android:text="出行动态"
android:textColor="@color/radiobutton_textcolor"
android:textSize="@dimen/dp_40"
android:textSize="@dimen/dp_36"
android:textStyle="bold" />
<View
android:layout_width="0.5px"
android:layout_width="1px"
android:layout_height="@dimen/dp_42"
android:background="#757575" />
android:background="#CE757575" />
<RadioButton
android:id="@+id/rbSurroundingEvent"
@@ -45,17 +46,16 @@
android:layout_height="match_parent"
android:button="@null"
android:gravity="center"
android:paddingStart="@dimen/dp_40"
android:paddingEnd="@dimen/dp_40"
android:paddingStart="@dimen/dp_35"
android:paddingEnd="@dimen/dp_35"
android:text="周边事件"
android:textColor="@color/radiobutton_textcolor"
android:textSize="@dimen/dp_40"
android:textStyle="bold" />
android:textSize="@dimen/dp_36" />
<View
android:layout_width="0.5px"
android:layout_width="1px"
android:layout_height="@dimen/dp_42"
android:background="#757575" />
android:background="#CE757575" />
<RadioButton
android:id="@+id/rbShareEvents"
@@ -63,12 +63,11 @@
android:layout_height="match_parent"
android:button="@null"
android:gravity="center"
android:paddingStart="@dimen/dp_40"
android:paddingEnd="@dimen/dp_40"
android:paddingStart="@dimen/dp_35"
android:paddingEnd="@dimen/dp_35"
android:text="我的分享"
android:textColor="@color/radiobutton_textcolor"
android:textSize="@dimen/dp_40"
android:textStyle="bold" />
android:textSize="@dimen/dp_36" />
</RadioGroup>
<androidx.viewpager2.widget.ViewPager2
@@ -85,18 +84,18 @@
<ImageView
android:id="@+id/btnHidePanels"
android:layout_width="@dimen/dp_88"
android:layout_height="@dimen/dp_88"
android:layout_marginRight="28px"
android:layout_width="@dimen/dp_79"
android:layout_height="@dimen/dp_79"
android:layout_marginRight="@dimen/dp_50"
android:background="@drawable/v2x_panel_close"
app:layout_constraintBottom_toBottomOf="@+id/rgTabSelect"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@+id/rgTabSelect" />
<!-- <View-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="58px"-->
<!-- android:background="@drawable/v2x_shadow_shape_view"-->
<!-- app:layout_constraintBottom_toBottomOf="parent" />-->
<!-- <View-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="58px"-->
<!-- android:background="@drawable/v2x_shadow_shape_view"-->
<!-- app:layout_constraintBottom_toBottomOf="parent" />-->
</androidx.constraintlayout.widget.ConstraintLayout>

10
modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_scenario_history.xml
View File

@@ -13,27 +13,27 @@
tools:visibility="visible" />
<LinearLayout
android:orientation="vertical"
android:id="@+id/clHistoryList"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingStart="@dimen/dp_48"
android:paddingEnd="@dimen/dp_48">
<TextView
android:id="@+id/tvMessage"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="@dimen/dp_60"
android:paddingBottom="@dimen/dp_27"
android:text="今日出行遇到的交通事件"
android:textColor="@color/v2x_FFF_333"
android:textSize="@dimen/dp_36"
android:textStyle="bold"
app:layout_scrollFlags="scroll|enterAlways" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_27"
android:overScrollMode="never"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:listitem="@layout/item_v2x_illegal_parking" />

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

@@ -27,8 +27,9 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/share_empty_btn_padding">
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/share_empty_btn_padding"
android:paddingBottom="@dimen/dp_10">
<Button
android:id="@+id/share_event_button"
@@ -38,6 +39,7 @@
android:layout_toLeftOf="@id/center"
android:background="@drawable/v2x_bkg_dark_light_same"
android:clickable="true"
android:gravity="center"
android:onClick="shareEventAction"
android:text="去分享"
android:textColor="@color/v2x_FFF_333"
@@ -55,6 +57,7 @@
android:layout_height="@dimen/v2x_share_btn_height"
android:layout_toRightOf="@id/center"
android:background="@drawable/v2xt_dw_common_corner_bkg_light"
android:gravity="center"
android:text="刷新"
android:textColor="#FFFFFF"
android:textSize="@dimen/dp_32" />

6
modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
View File

@@ -13,7 +13,7 @@
android:id="@+id/road_case_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="20px"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_24"
android:background="@drawable/bg_v2x_event_type_read"
android:gravity="center"
@@ -76,7 +76,7 @@
android:layout_toLeftOf="@id/road_case_uselful"
android:ellipsize="end"
android:gravity="left"
android:layout_marginTop="@dimen/dp_24"
android:layout_marginTop="@dimen/dp_12"
android:lines="1"
android:text="东城区北三环附近维多欧美"
android:textColor="@color/v2x_FFF_333"
@@ -88,7 +88,7 @@
android:layout_height="wrap_content"
android:layout_below="@id/road_case_address"
android:layout_alignLeft="@id/road_case_style"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_3"
android:layout_marginBottom="@dimen/dp_24"
android:alpha="0.5"
android:gravity="left"

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

@@ -2,24 +2,23 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/loading_liner_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
<ProgressBar
android:id="@+id/loading_imageview"
android:layout_width="@dimen/v2x_loading_ani_width"
android:layout_height="@dimen/v2x_loading_ani_width"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="60px"
android:background="@drawable/v_to_x_loading_car0000"
android:indeterminateTint="#256BFF"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintVertical_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.5" />
<TextView
android:id="@+id/loading_text"
@@ -29,9 +28,9 @@
android:layout_centerHorizontal="true"
android:layout_gravity="top|center"
android:alpha="0.7"
android:paddingTop="14px"
android:paddingTop="@dimen/dp_14"
android:text="正在获取信息…"
android:textColor="#FFFFFF"
android:textColor="@color/v2x_FFF_666"
android:textSize="@dimen/dp_34"
app:layout_constraintBottom_toBottomOf="@+id/loading_imageview"
app:layout_constraintEnd_toEndOf="parent"
@@ -46,6 +45,7 @@
android:layout_gravity="top|center"
android:layout_marginTop="@dimen/shaer_refresh_padding"
android:background="@drawable/v2xt_dw_common_corner_bkg_light"
android:gravity="center"
android:text="刷新"
android:textColor="#FFFFFF"
android:textSize="@dimen/dp_32"

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

@@ -39,10 +39,10 @@
<dimen name="module_v2x_surrounding_empty_bt_width">150px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_height">48px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_margin_top">32px</dimen>
<dimen name="module_v2x_surrounding_root_margin_left">10px</dimen>
<dimen name="module_v2x_surrounding_margin_left">10px</dimen>
<dimen name="module_v2x_surrounding_root_margin_left">28px</dimen>
<dimen name="module_v2x_surrounding_margin_left">28px</dimen>
<dimen name="module_v2x_surrounding_empty_image_height">190px</dimen>
<dimen name="module_v2x_surrounding_item_height">173px</dimen>
<dimen name="module_v2x_surrounding_item_height">170px</dimen>
<dimen name="module_v2x_surrounding_item_bottom">43px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_image_height">26px</dimen>
<dimen name="module_v2x_surrounding_item_marigin_left">12px</dimen>
@@ -60,7 +60,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">200px</dimen>
<dimen name="v2x_loading_ani_width">100px</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>
@@ -73,5 +73,7 @@
<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>
</resources>

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

@@ -23,7 +23,7 @@
<dimen name="module_v2x_history_event_icon_size">80px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_size">10px</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>
@@ -36,8 +36,8 @@
<dimen name="module_v2x_surrounding_empty_bt_width">270px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_height">86px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_margin_top">58px</dimen>
<dimen name="module_v2x_surrounding_root_margin_left">10px</dimen>
<dimen name="module_v2x_surrounding_margin_left">10px</dimen>
<dimen name="module_v2x_surrounding_root_margin_left">48px</dimen>
<dimen name="module_v2x_surrounding_margin_left">48px</dimen>
<dimen name="module_v2x_surrounding_empty_image_height">349px</dimen>
<dimen name="module_v2x_surrounding_item_height">306px</dimen>
<dimen name="module_v2x_surrounding_item_bottom">77px</dimen>
@@ -54,7 +54,8 @@
<dimen name="module_v2x_surrounding_item_bottom_right_textsize">28px</dimen>
<dimen name="module_v2x_des_index_width">16px</dimen>
<dimen name="module_v2x_des_index_height">42px</dimen>
<dimen name="module_v2x_panel_cor">16px</dimen>
<dimen name="module_v2x_panel_width">120px</dimen>
<dimen name="module_v2x_panel_tab_height">158px</dimen>
</resources>

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

@@ -24,7 +24,7 @@
<dimen name="module_v2x_history_event_icon_size">80px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_size">10px</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>
@@ -37,8 +37,8 @@
<dimen name="module_v2x_surrounding_empty_bt_width">270px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_height">86px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_margin_top">58px</dimen>
<dimen name="module_v2x_surrounding_root_margin_left">10px</dimen>
<dimen name="module_v2x_surrounding_margin_left">10px</dimen>
<dimen name="module_v2x_surrounding_root_margin_left">48px</dimen>
<dimen name="module_v2x_surrounding_margin_left">48px</dimen>
<dimen name="module_v2x_surrounding_empty_image_height">349px</dimen>
<dimen name="module_v2x_surrounding_item_height">306px</dimen>
<dimen name="module_v2x_surrounding_item_bottom">77px</dimen>
@@ -58,7 +58,7 @@
<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">400px</dimen>
<dimen name="v2x_loading_ani_width">200px</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>
@@ -72,5 +72,7 @@
<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>
</resources>

3
modules/mogo-module-v2x/src/main/res/values/colors.xml
View File

@@ -9,7 +9,7 @@
<color name="transparent_white_30">#B3FFFFFF</color>
<color name="surrounding_item_bottom_color">#1F2131</color>
<color name="panel_shadow_shape_color">#10121E</color>
<color name="share_event_no_more_color">#99FFFFFF</color>
<color name="share_event_no_more_color">#4BFFFFFF</color>
<color name="v2x_FFF_999">#FFFFFF</color>
<color name="v2x_FFF_333">#FFFFFF</color>
<color name="v2x_ff6163_333">#ff616381</color>
@@ -18,5 +18,4 @@
<color name="v2x_000_FFF">#000000</color>
<color name="v2x_FFF_2896FF">#FFF</color>
</resources>

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

@@ -39,10 +39,10 @@
<dimen name="module_v2x_surrounding_empty_bt_width">150px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_height">48px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_margin_top">32px</dimen>
<dimen name="module_v2x_surrounding_root_margin_left">10px</dimen>
<dimen name="module_v2x_surrounding_margin_left">10px</dimen>
<dimen name="module_v2x_surrounding_root_margin_left">28px</dimen>
<dimen name="module_v2x_surrounding_margin_left">28px</dimen>
<dimen name="module_v2x_surrounding_empty_image_height">190px</dimen>
<dimen name="module_v2x_surrounding_item_height">173px</dimen>
<dimen name="module_v2x_surrounding_item_height">170px</dimen>
<dimen name="module_v2x_surrounding_item_bottom">43px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_image_height">26px</dimen>
<dimen name="module_v2x_surrounding_item_marigin_left">12px</dimen>
@@ -60,7 +60,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">200px</dimen>
<dimen name="v2x_loading_ani_width">100px</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>
@@ -74,5 +74,7 @@
<dimen name="v2x_panel_btn_translationY">-8px</dimen>
<dimen name="module_v2x_panel_tab_height">84px</dimen>
</resources>

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

Some files were not shown because too many files have changed in this diff Show More