diff --git a/.idea/misc.xml b/.idea/misc.xml index cd77a1f062..21e99e2dc0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 57bdb8d90b..5bd254f89a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 # 视频引导 diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt index 290bbba5d7..b552f706b5 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt @@ -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) { diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml index 1770c16984..ca1346e002 100644 --- a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml @@ -1053,5 +1053,6 @@ 42px 48px -10px + 10px diff --git a/modules/mogo-module-common/src/main/res/values/dimens.xml b/modules/mogo-module-common/src/main/res/values/dimens.xml index 1e2c7b1cdc..170c5a430d 100644 --- a/modules/mogo-module-common/src/main/res/values/dimens.xml +++ b/modules/mogo-module-common/src/main/res/values/dimens.xml @@ -1044,4 +1044,5 @@ 22.9688px 26.2500px -8px + 8px diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml index b84ccdcde8..e962718e6c 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml @@ -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" /> diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml index cba8130ee2..86850dc088 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml @@ -71,8 +71,8 @@ 26px + 66px + 10px + 2px + 2px \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml index 0304873cfe..d34d1a739a 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -30,17 +30,17 @@ 32px 2px - 120px + 140px 32px 60px 92px 24px 48px 2px - 120px - 120px + 140px + 140px 120px - 30px + 20px 30px 32px 32px @@ -146,4 +146,8 @@ 40px 45px + 120px + 30px + 20px + 20px \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml index 6e8de9e26f..8147d1eef6 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml @@ -30,17 +30,17 @@ 32px 2px - 120px + 140px 32px 60px 92px 24px 48px 2px - 120px + 140px 120px 120px - 30px + 20px 30px 32px 32px @@ -145,7 +145,11 @@ 20px 34px - 175px - 30px + 165px + 10px 45px + 120px + 30px + 20px + 20px \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml index 2f344bce6f..5e019c6b21 100644 --- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml @@ -30,17 +30,17 @@ 20px 1px - 66px + 82px 20px 34.5px 58px 17px 31.4px 1.2px - 66px + 82px 66px 66px - 16px + 8px 16px 34.5px 20px @@ -60,7 +60,7 @@ 32px 32px - 90px + 82px 22px 28px @@ -151,7 +151,11 @@ 10px 19px - 16px + 0px 26px + 66px + 10px + 2px + 2px \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml index 09f93e15f4..12f90473cd 100644 --- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml +++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml @@ -48,6 +48,12 @@ android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft" android:padding="@dimen/module_main_entrance_fragment_container_padding" /> + + + - - - + + + + + \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml index 1bc521c085..622a231939 100644 --- a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml +++ b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml @@ -2,29 +2,17 @@ - - - - - - - - - - - + android:layout_height="@dimen/tanlu_module_card_height"> + + android:background="@drawable/shape_tanlu_top_bg"> - - + android:scaleType="center" + app:miv_failureHolder="@drawable/tanlu_icon_logo" + app:miv_overlayImageId="@drawable/tanlu_icon_logo" + app:miv_placeHolder="@drawable/tanlu_icon_logo" /> - + + + + + + + + + android:src="@drawable/selector_chat_btn" + android:visibility="gone" /> + android:gravity="center"> diff --git a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_main_media_recycler_new.xml b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_main_media_recycler_new.xml index e4c7898356..6bafcfdbbb 100644 --- a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_main_media_recycler_new.xml +++ b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_main_media_recycler_new.xml @@ -1,14 +1,16 @@ + android:background="@drawable/tanlu_top_bg"> - + android:layout_height="match_parent" + /> + \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml index a1e06f3f9c..2daeba4505 100644 --- a/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml @@ -77,14 +77,14 @@ 642px - 170px - 234px - 156px + 186px + 250px + 172px 45px 13px 8px - 13px + 7px 17px 3px 18px diff --git a/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml index a3ea0c5760..35ac4ea9c3 100644 --- a/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -77,14 +77,14 @@ 1233px - 300px + 326px 480px - 270px + 280px 80px 19px - 13px - 23px + 12px + 12px 30px 9px 27px diff --git a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml index caf019b61c..205767293e 100644 --- a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml @@ -77,14 +77,14 @@ 1060px - 306px + 326px 421px 280px 80px 19px - 13px - 23px + 5px + 0px 30px 9px 27px diff --git a/modules/mogo-module-tanlu/src/main/res/values/colors.xml b/modules/mogo-module-tanlu/src/main/res/values/colors.xml index ff1c78b482..a552d06283 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/colors.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/colors.xml @@ -51,5 +51,6 @@ #50526E #5E6079 #3F4057 + #555A75 diff --git a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml index caa0a414c4..2daeba4505 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml @@ -77,14 +77,14 @@ 642px - 194px - 266px - 194px + 186px + 250px + 172px 45px 13px 8px - 13px + 7px 17px 3px 18px diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/SpacesItemDecoration.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/SpacesItemDecoration.java index 005984f991..f0e2739521 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/SpacesItemDecoration.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/SpacesItemDecoration.java @@ -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; - } } } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java index 82f1820538..80287bf5f9 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java @@ -191,10 +191,10 @@ public class V2XSurroundingAdapter extends RecyclerView.Adapter 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) } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/AnimationResources.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/AnimationResources.java index 7e1a443476..fc6970f275 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/AnimationResources.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/AnimationResources.java @@ -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, }; } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/V2XAnimationManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/V2XAnimationManager.java index c77bea6db8..67c87bea4d 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/V2XAnimationManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/V2XAnimationManager.java @@ -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(); } } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java index a73c2c4ccc..c3f59a81fb 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java @@ -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); } diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/module_v2x_shadow_bkg.9.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/module_v2x_shadow_bkg.9.png new file mode 100644 index 0000000000..e73d76936f Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/module_v2x_shadow_bkg.9.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_shadow_bg.9.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_shadow_bg.9.png index 6ab0b1547c..11049bacf3 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_shadow_bg.9.png and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_shadow_bg.9.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_surrounding_bottom_bg.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_surrounding_bottom_bg.png new file mode 100644 index 0000000000..5a9ca34e56 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_surrounding_bottom_bg.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0000.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0000.jpg deleted file mode 100644 index cc52297fe2..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0000.jpg and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0002.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0002.jpg deleted file mode 100644 index 1c2891a003..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0002.jpg and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0004.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0004.jpg deleted file mode 100644 index 33cc4076b6..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0004.jpg and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0006.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0006.jpg deleted file mode 100644 index 031866594d..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0006.jpg and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0008.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0008.jpg deleted file mode 100644 index 5bae20de40..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0008.jpg and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0010.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0010.jpg deleted file mode 100644 index 28cd979b2b..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0010.jpg and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0012.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0012.jpg deleted file mode 100644 index 2527cd5e8b..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0012.jpg and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0014.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0014.jpg deleted file mode 100644 index 931b9ab3b8..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0014.jpg and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0016.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0016.jpg deleted file mode 100644 index 66f35aae0f..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0016.jpg and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0018.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0018.jpg deleted file mode 100644 index 006cdf3549..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0018.jpg and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0020.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0020.jpg deleted file mode 100644 index abd537c11e..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0020.jpg and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0022.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0022.jpg deleted file mode 100644 index 6c12c96a67..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0022.jpg and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0024.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0024.jpg deleted file mode 100644 index 9b9987ef28..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0024.jpg and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0025.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0025.jpg deleted file mode 100644 index 4c20aaee9a..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0025.jpg and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0027.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0027.jpg deleted file mode 100644 index 3697d21490..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0027.jpg and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0029.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0029.jpg deleted file mode 100644 index aba33759ab..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0029.jpg and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0031.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0031.jpg deleted file mode 100644 index d8a4ac1140..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0031.jpg and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0033.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0033.jpg deleted file mode 100644 index 39dc6d7476..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0033.jpg and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0035.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0035.jpg deleted file mode 100644 index cccc5d1ec8..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0035.jpg and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0037.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0037.jpg deleted file mode 100644 index e0de64c12a..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0037.jpg and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0039.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0039.jpg deleted file mode 100644 index 4a434eaf7a..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0039.jpg and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0041.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0041.jpg deleted file mode 100644 index 19a043e5ac..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0041.jpg and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0043.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0043.jpg deleted file mode 100644 index fab3f819ea..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0043.jpg and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0045.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0045.jpg deleted file mode 100644 index 083b86bb58..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0045.jpg and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0047.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0047.jpg deleted file mode 100644 index 995685a59d..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0047.jpg and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0048.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0048.jpg deleted file mode 100644 index 04338fd473..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_loading_car0048.jpg and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/module_v2x_shadow_bkg.9.png b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/module_v2x_shadow_bkg.9.png new file mode 100644 index 0000000000..e73d76936f Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/module_v2x_shadow_bkg.9.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_shadow_bg.9.png b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_shadow_bg.9.png index 2466405ac2..11049bacf3 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_shadow_bg.9.png and b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_shadow_bg.9.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_surrounding_bottom_bg.png b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_surrounding_bottom_bg.png new file mode 100644 index 0000000000..5a9ca34e56 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_surrounding_bottom_bg.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_surrounding_bottom_bg.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_surrounding_bottom_bg.png new file mode 100644 index 0000000000..ef5069632f Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_surrounding_bottom_bg.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/module_v2x_shadow_bkg.9.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/module_v2x_shadow_bkg.9.png new file mode 100644 index 0000000000..239b9eb114 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/module_v2x_shadow_bkg.9.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png old mode 100644 new mode 100755 index 892b93afaf..bb3e2b1195 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_shadow_bg.9.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_shadow_bg.9.png index 239b9eb114..f5010b2c44 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_shadow_bg.9.png and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_shadow_bg.9.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_surrounding_bottom_bg.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_surrounding_bottom_bg.png new file mode 100644 index 0000000000..ef5069632f Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_surrounding_bottom_bg.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml index a7d161b299..7602d95ba0 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml @@ -1,7 +1,7 @@ - + - - + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_bg.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_bg.xml index 376de58348..028445d592 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_bg.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_bg.xml @@ -1,7 +1,7 @@ - + - + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml index 12e6ec50cf..2b616f3e68 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml @@ -1,6 +1,6 @@ - + + app:roundLayoutRadius="@dimen/dp_30"> + app:roundLayoutRadius="@dimen/dp_30"> + android:paddingTop="@dimen/dp_40" + android:paddingBottom="@dimen/dp_40">