diff --git a/.idea/misc.xml b/.idea/misc.xml index 21e99e2dc0..cd77a1f062 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index bc9a439f92..656fef5fb5 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -83,7 +83,7 @@ public class MogoApplication extends AbsMogoApplication { MogoModulePaths.addModule( new MogoModule( TanluApiConst.MODULE_PATH, TanluApiConst.MODULE_NAME ) ); MogoModulePaths.addBaseModule( new MogoModule( TanluConstants.TAG, TanluConstants.MODEL_NAME ) ); - MogoModulePaths.addModule( new MogoModule( MogoServicePaths.PATH_SHARE, "ShareControl" ) ); + MogoModulePaths.addBaseModule( new MogoModule( MogoServicePaths.PATH_SHARE, "ShareControl" ) ); MogoModulePaths.addModule( new MogoModule( LeftPanelConst.PATH_NAME, LeftPanelConst.MODULE_NAME ) ); diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/BaseFloatDialog.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/BaseFloatDialog.java index 58eb4cab55..b39f1dfb0c 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/BaseFloatDialog.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/BaseFloatDialog.java @@ -27,7 +27,7 @@ public class BaseFloatDialog extends Dialog { } private void addFlag() { - getWindow().setType(WindowManager.LayoutParams.FIRST_SYSTEM_WINDOW + 10); + getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT); getWindow().addFlags(WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN | WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION | WindowManager.LayoutParams.FLAG_LOCAL_FOCUS_MODE); diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/fragment/GuideFragment.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/fragment/GuideFragment.kt index b08d4375a9..5d4054afdc 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/fragment/GuideFragment.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/fragment/GuideFragment.kt @@ -24,6 +24,7 @@ class GuideFragment : MvpFragment(), GuideC } private var duringTime: Long = 0L + private var recordCount = 0 override fun getLayoutId(): Int { return R.layout.module_guide_fragment @@ -90,15 +91,18 @@ class GuideFragment : MvpFragment(), GuideC } fun closeGuideFragment() { - val recordTime = System.currentTimeMillis() - duringTime - val currentItem = moduleGuideViewPager.currentItem + 1 - AnalyticsUtil.track(INVOKE_TRACK_PLAY_PASS_ID, - hashMapOf(INVOKE_TRACK_PASS_TIME to currentItem - , INVOKE_TRACK_PLAY_TIME to recordTime)) - Logger.d(TAG, "closeGuideFragment -> recordTime : $recordTime , currentItem : $currentItem") + recordCount = moduleGuideViewPager.currentItem + 1 destroy() } + private fun track() { + val recordTime = System.currentTimeMillis() - duringTime + AnalyticsUtil.track(INVOKE_TRACK_PLAY_PASS_ID, + hashMapOf(INVOKE_TRACK_PASS_TIME to recordCount + , INVOKE_TRACK_PLAY_TIME to recordTime)) + Logger.d(TAG, "closeGuideFragment -> recordTime : $recordTime , recordCount : $recordCount") + } + private fun destroy() { speak(context!!, context!!.resources.getString(R.string.module_guide_voice_page_end), object : IMogoVoiceCmdCallBack { override fun onTTSEnd(ttsId: String?, tts: String?) { @@ -119,6 +123,7 @@ class GuideFragment : MvpFragment(), GuideC override fun onDestroy() { super.onDestroy() + track() invokeAuthorize() } } \ No newline at end of file diff --git a/modules/mogo-module-guide/src/main/res/values/strings.xml b/modules/mogo-module-guide/src/main/res/values/strings.xml index 653d0616bf..de95ff4900 100644 --- a/modules/mogo-module-guide/src/main/res/values/strings.xml +++ b/modules/mogo-module-guide/src/main/res/values/strings.xml @@ -6,9 +6,9 @@ 跳过 欢迎使用蘑菇出行，您下次可以直接对我说，打开蘑菇出行来直接进入应用，点击左下方按钮进行摄像头设置 - 左边是道路事件的播报，点击右边地图上的事件标示可以查看事件详情 + 左边是道路事件的播报，点击右边地图上的事件标示可以查看事件详情,或者直接唤醒小智说，中关村附近堵不堵，来查询目的地周围路况 这里是道路信息显示，点击后可查看事件详情 这里是事件汇总，您可以查看您参与的事件和您的分享记录 - 更多设置，在左上角的设置功能中，点击右下角的分享，可以把路况分享给其他车友 + 更多设置，在左上角的设置功能中，点击右下角的分享，可以把路况分享给其他车友,或者直接唤醒小智说，上报路况 我们希望让您的出行更加安全高效，更多功能等着你去发现，快去体验体验吧 diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/GridBtnManager.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/GridBtnManager.kt index 275a0e1b1a..7dd041a33e 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/GridBtnManager.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/GridBtnManager.kt @@ -70,8 +70,10 @@ class GridBtnManager(val context: Context, private val container: GridLayout, pr generateShareButton(FixableButton(poiType = IMogoTanluProvider.TYPE_DENSE_FOG, title = "浓雾")) } else { val btnList = GsonUtil.arrayFromJson(config, FixableButton::class.java) - btnList.forEach { btn -> - generateShareButton(btn) + if(btnList!=null&&btnList.isNotEmpty()) { + btnList.forEach { btn -> + generateShareButton(btn) + } } } } diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java index f9f27f4699..fe3450625c 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java @@ -1086,7 +1086,7 @@ public class TanluListWindow extends RelativeLayout implements IMogoMarkerClickL if (!NetworkUtils.isConnected(getContext())) { //没有网络 TipToast.shortTip("分享失败，请检查网络",new TipDrawable(getResources().getDrawable(R.drawable.module_tanlu_upload_fail))); - } else if(TanluServiceManager.getMogoStatusManager().isMainPageOnResume()) { + } else { float bearing = TanluServiceManager.getLocationClient().getLastKnowLocation().getBearing(); //角度 Logger.d(TAG, "onMarkerInfo event.type = " + event.type + " >>event.lat = " + event.lat + " >>event.lon = " + event.lon + " >>event.imageUrl =" + event.imageUrl); String poiType = event.type; @@ -1095,49 +1095,51 @@ public class TanluListWindow extends RelativeLayout implements IMogoMarkerClickL Logger.d(TAG, "onMarkerInfo share poiType = " + poiType + " --isCumtom = " + isCumtom + " >> getMathRandom = " + getMathRandom() + " >>> bearing = " + bearing + ">>>fromType = " + fromType); if (!fromType.equals("5")) { if (isCumtom && !poiType.equals("0")) { - double lat = TanluServiceManager.getLocationClient().getLastKnowLocation().getLatitude(); - double lon = TanluServiceManager.getLocationClient().getLastKnowLocation().getLongitude(); - Log.d(TAG, "onMarkerInfo lat = " + lat + " >>>> lon = " + lon); - String cityName = TanluServiceManager.getLocationClient().getLastKnowLocation().getCityName(); - String address = TanluServiceManager.getLocationClient().getLastKnowLocation().getAddress(); - MarkerExploreWay markerExploreWay = new MarkerExploreWay(); - markerExploreWay.setCityName(cityName); - markerExploreWay.setPoiType(poiType); - - MarkerLocation markerLocation = new MarkerLocation(); - markerLocation.setLat(lat); - markerLocation.setLon(lon); - markerLocation.setAddress(address); - - MarkerShowEntity markerShowEntity = new MarkerShowEntity(); - markerShowEntity.setBindObj(markerExploreWay); - markerShowEntity.setTextContent(address); - markerShowEntity.setMarkerType(TanluConstants.MODEL_NAME); - markerShowEntity.setMarkerLocation(markerLocation); - + // 不管在不在前台，都要提示分享成功 AIAssist.getInstance(getContext()).speakTTSVoice(( String.format(voiceShareSuccessTts, getMathRandom())), null); - TipToast.shortTip("分享成功",new TipDrawable(getResources().getDrawable(R.drawable.module_tanlu_upload_success))); + TipToast.shortTip("分享成功", new TipDrawable(getResources().getDrawable(R.drawable.module_tanlu_upload_success))); + if(TanluServiceManager.getMogoStatusManager().isMainPageOnResume()) { + double lat = TanluServiceManager.getLocationClient().getLastKnowLocation().getLatitude(); + double lon = TanluServiceManager.getLocationClient().getLastKnowLocation().getLongitude(); + Log.d(TAG, "onMarkerInfo lat = " + lat + " >>>> lon = " + lon); + String cityName = TanluServiceManager.getLocationClient().getLastKnowLocation().getCityName(); + String address = TanluServiceManager.getLocationClient().getLastKnowLocation().getAddress(); + MarkerExploreWay markerExploreWay = new MarkerExploreWay(); + markerExploreWay.setCityName(cityName); + markerExploreWay.setPoiType(poiType); - IMogoMarker mogoMarker = TanluServiceManager.getServiceApis().getMarkerService().drawMarker(markerShowEntity); - mogoMarker.setClickable(false); + MarkerLocation markerLocation = new MarkerLocation(); + markerLocation.setLat(lat); + markerLocation.setLon(lon); + markerLocation.setAddress(address); - //开启动画 - mogoMarker.startScaleAnimationWithAlpha(0, 1.2f, 0, 1.2f, 0f, 1f, 300, new LinearInterpolator(), new OnMarkerAnimationListener() { - @Override - public void onAnimStart() { - Logger.d(TAG, " onAnimStart ---1----> "); - } + MarkerShowEntity markerShowEntity = new MarkerShowEntity(); + markerShowEntity.setBindObj(markerExploreWay); + markerShowEntity.setTextContent(address); + markerShowEntity.setMarkerType(TanluConstants.MODEL_NAME); + markerShowEntity.setMarkerLocation(markerLocation); - @Override - public void onAnimEnd() { - if (mogoMarker.isDestroyed()) { - return; + IMogoMarker mogoMarker = TanluServiceManager.getServiceApis().getMarkerService().drawMarker(markerShowEntity); + mogoMarker.setClickable(false); + + //开启动画 + mogoMarker.startScaleAnimationWithAlpha(0, 1.2f, 0, 1.2f, 0f, 1f, 300, new LinearInterpolator(), new OnMarkerAnimationListener() { + @Override + public void onAnimStart() { + Logger.d(TAG, " onAnimStart ---1----> "); } - mogoMarker.startScaleAnimation(1.2f, 1, 1.2f, 1, 100, new LinearInterpolator(), null); - } - }); + + @Override + public void onAnimEnd() { + if (mogoMarker.isDestroyed()) { + return; + } + mogoMarker.startScaleAnimation(1.2f, 1, 1.2f, 1, 100, new LinearInterpolator(), null); + } + }); + } } else { Logger.e(TAG, "onMarkerInfo share onCompleted poiType = -1 --- else ---->"); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java index a6153eb25d..47dee0a670 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java @@ -55,6 +55,7 @@ public class V2XScenarioHistoryFragment mEmptyView = findViewById(R.id.viewEmpty); mClHistoryList = findViewById(R.id.clHistoryList); mRecyclerView = findViewById(R.id.recyclerView); + mRecyclerView.addItemDecoration(new SpacesItemDecoration((int) getResources().getDimension(R.dimen.share_item_padding))); mV2XScenarioHistoryAdapter = new V2XScenarioHistoryAdapter(mV2XHistoryScenarioData); mRecyclerView.setAdapter(mV2XScenarioHistoryAdapter); mRecyclerView.addItemDecoration(new SpacesItemDecoration(14)); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java index 961a08bc2a..50f9eb4eb3 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java @@ -13,6 +13,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.mogo.commons.mvp.MvpFragment; import com.mogo.module.v2x.R; +import com.mogo.module.v2x.SpacesItemDecoration; import com.mogo.module.v2x.adapter.V2XShareEventAdapter; import com.mogo.module.v2x.entity.panel.V2XShareEventDescription; import com.mogo.module.v2x.entity.panel.V2XShareEventItem; @@ -61,6 +62,7 @@ public class V2XShareEventsFragment extends MvpFragment 0) { Object data = dataArrayList.get(dataArrayList.size() - 1); - if (data instanceof V2XShareEventLoadMoreItem || data instanceof V2XShareEventLoadMoreItem) { + if (data instanceof V2XShareEventLoadMoreItem) { dataArrayList.remove(dataArrayList.size() - 1); } } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java index c706acbe91..8d6bb0e529 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java @@ -47,11 +47,6 @@ public class V2XShareNetworkModel { @Override public void subscribe(ObservableEmitter emitter) throws Exception { - try { - getShareIndex(callback); - } catch (Exception e) { - e.printStackTrace(); - } emitter.onNext("1"); emitter.onComplete(); } @@ -60,16 +55,10 @@ public class V2XShareNetworkModel { Observable listObservable = Observable.create(new ObservableOnSubscribe() { @Override public void subscribe(ObservableEmitter emitter) throws Exception { - try { - getShareEventList(page, size, callback); - } catch (Exception e) { - e.printStackTrace(); - } emitter.onNext("2"); emitter.onComplete(); } }); - indexObservable.flatMap(new Function>() { @Override public ObservableSource apply(String s) throws Exception { @@ -82,12 +71,20 @@ public class V2XShareNetworkModel { @Override public void onSubscribe(Disposable d) { - + try { + getShareIndex(callback); + } catch (Exception e) { + e.printStackTrace(); + } } @Override public void onNext(Object o) { - + try { + getShareEventList(page, size, callback); + } catch (Exception e) { + e.printStackTrace(); + } } @Override @@ -135,7 +132,7 @@ public class V2XShareNetworkModel { @Override public void onError(Throwable e) { super.onError(e); - if (callback != null){ + if (callback != null) { callback.onFail("网络异常，点击刷新重试"); } } @@ -179,7 +176,7 @@ public class V2XShareNetworkModel { @Override public void onError(Throwable e) { super.onError(e); - if (callback != null){ + if (callback != null) { callback.onFail("网络异常，点击刷新重试"); } } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/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..94a760dd65 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/V2XAnimationManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/V2XAnimationManager.java @@ -1,63 +1,71 @@ 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) { + isStarted = true; + mHandler.sendEmptyMessage(MSG_LOOP); + if (targetImageView != null) { targetImageView.setVisibility(View.VISIBLE); - isStarted = true; - delegate.start(); } } @Override synchronized public void stop() { - if (delegate != null && isStarted) { - isStarted = false; - delegate.stop(); + isStarted = false; + mHandler.removeMessages(MSG_LOOP); + if (targetImageView != null) { targetImageView.setVisibility(View.INVISIBLE); } } - public void soptWithError(){ - if (delegate != null && isStarted) { - isStarted = false; - delegate.stop(); + public void soptWithError() { + stop(); + if (targetImageView != null) { + 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..99a6cbbad7 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java @@ -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/loading_image.gif b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/loading_image.gif deleted file mode 100644 index 5e3b79bbed..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/loading_image.gif and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_live_logo.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_live_logo.png index 957c298fd6..b964d6b4ad 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_live_logo.png and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_live_logo.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/v2x_icon_live_logo.png b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_icon_live_logo.png new file mode 100644 index 0000000000..e02a57044f Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_icon_live_logo.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/loading_image.gif b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/loading_image.gif deleted file mode 100644 index 5e3b79bbed..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/loading_image.gif and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_live_logo.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_live_logo.png index dabf25dbbb..5480b6d165 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_live_logo.png and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_live_logo.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/bg_v2x_event_description.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml index a7d161b299..4defbd1354 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/loading_image.gif b/modules/mogo-module-v2x/src/main/res/drawable/loading_image.gif deleted file mode 100644 index 5e3b79bbed..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable/loading_image.gif and /dev/null differ 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 @@ - + @@ -13,7 +13,7 @@ diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml index 7b835f3f95..7e587aa3dc 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml @@ -67,6 +67,7 @@ android:maxLines="1" android:textColor="@color/v2x_FFF_333" android:textSize="@dimen/dp_36" + android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@id/tvEventTypeTitle" app:layout_constraintTop_toBottomOf="@+id/tvEventTypeTitle" @@ -100,7 +101,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_30" android:alpha="0.6" - android:textColor="@color/v2x_FFF_666" + android:textColor="@color/v2x_FFF_999" android:textSize="@dimen/dp_28" app:layout_constraintBottom_toBottomOf="@id/ivEventDistanceLogo" app:layout_constraintStart_toEndOf="@+id/tvEventDistance" diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml index ec8da8c971..a98057f7de 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml @@ -5,7 +5,7 @@ android:id="@+id/rlContent" android:layout_width="match_parent" android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground" - android:background="@drawable/v2x_alert_window_bg" + android:background="@drawable/bg_v2x_event_list_item" android:paddingStart="@dimen/dp_40" android:paddingEnd="@dimen/dp_40"> @@ -31,6 +31,7 @@ android:text="违章停车" android:textColor="#FFFFFF" android:textSize="@dimen/dp_24" + android:textStyle="bold" app:layout_constraintBottom_toTopOf="@+id/tvAddress" app:layout_constraintStart_toEndOf="@+id/ivIconP" app:layout_constraintTop_toTopOf="@+id/ivIconP" /> @@ -39,7 +40,7 @@ android:id="@+id/tvAddress" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/dp_10" + android:layout_marginTop="@dimen/dp_8" android:layout_marginRight="@dimen/dp_30" android:ellipsize="end" android:maxLines="1" @@ -55,12 +56,11 @@ android:id="@+id/tvIllegalNum" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/dp_10" android:layout_marginBottom="@dimen/dp_10" android:alpha="0.6" android:gravity="center_vertical" android:textColor="@color/v2x_FFF_666" - android:textSize="@dimen/dp_30" + android:textSize="@dimen/dp_26" app:layout_constraintEnd_toEndOf="@+id/tvAddress" app:layout_constraintStart_toStartOf="@+id/tagEventType" app:layout_constraintTop_toBottomOf="@+id/tvAddress" diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml index 7bd7a12d7a..ac2ca1c498 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml @@ -68,6 +68,7 @@ android:maxLines="1" android:textColor="@color/v2x_FFF_333" android:textSize="@dimen/dp_34" + android:textStyle="bold" app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingLike" app:layout_constraintStart_toEndOf="@+id/ivIconP" app:layout_constraintTop_toBottomOf="@+id/tagEventType" @@ -77,12 +78,11 @@ android:id="@+id/tvIllegalNum" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/dp_10" android:layout_marginBottom="@dimen/dp_24" android:alpha="0.6" android:gravity="center_vertical" android:textColor="@color/v2x_FFF_666" - android:textSize="@dimen/dp_30" + android:textSize="@dimen/dp_26" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/tvAddress" app:layout_constraintStart_toStartOf="@+id/tvAddress" diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml index 70bb272cf3..ef28dc7598 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml @@ -72,7 +72,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_10" android:layout_marginEnd="@dimen/dp_30" - android:textColor="@android:color/white" + android:textColor="@color/v2x_FFF_333" android:textSize="@dimen/dp_33" android:textStyle="bold" app:layout_constraintEnd_toStartOf="@+id/tvFaultHelpDistance" @@ -87,8 +87,8 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:alpha="0.59" - android:textColor="@android:color/white" - android:textSize="@dimen/dp_29" + android:textColor="@color/v2x_FFF_666" + android:textSize="@dimen/dp_26" app:layout_constraintBottom_toBottomOf="parent" android:layout_marginBottom="@dimen/dp_24" app:layout_constraintStart_toStartOf="@+id/tvFaultHelpName" @@ -101,7 +101,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/dp_30" android:gravity="center_vertical" - android:textColor="#FFF" + android:textColor="@color/v2x_FFF_333" android:textSize="@dimen/dp_80" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="@+id/ivFaultHelpEventCall" diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml index 72367f3873..fc45592eff 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml @@ -13,7 +13,7 @@ @@ -28,7 +28,7 @@ android:paddingEnd="@dimen/dp_40" android:text="出行动态" android:textColor="@color/radiobutton_textcolor" - android:textSize="@dimen/dp_40" + android:textSize="@dimen/dp_36" android:textStyle="bold" /> diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml index b9d812a392..dfcf4e2ab7 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml @@ -11,7 +11,7 @@ diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml index f382cc0a4d..f35d333ec2 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml @@ -40,8 +40,8 @@ android:clickable="true" android:onClick="shareEventAction" android:text="去分享" - android:textColor="#FFFFFF" - android:textSize="@dimen/dp_34" /> + android:textColor="@color/v2x_FFF_333" + android:textSize="@dimen/dp_32" /> + android:textSize="@dimen/dp_32" /> diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml index e85015dc28..49fced883d 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml @@ -6,14 +6,14 @@ android:layout_height="wrap_content" android:layout_marginLeft="20px" android:layout_marginRight="20px" - android:layout_marginBottom="14px" + android:layout_marginBottom="@dimen/dp_14" android:background="@drawable/bg_v2x_event_list_item"> + android:textSize="@dimen/dp_32" /> + android:textSize="@dimen/share_item_text_size" /> \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml b/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml index 209dc2072e..1fde01f37c 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml @@ -7,16 +7,15 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - @@ -29,13 +28,14 @@ android:layout_centerHorizontal="true" android:layout_gravity="top|center" android:alpha="0.7" - android:paddingTop="14px" android:text="正在获取信息…" - android:textColor="#FFFFFF" + android:paddingTop="@dimen/dp_25" + android:textColor="@color/v2x_FFF_666" android:textSize="@dimen/dp_34" - app:layout_constraintBottom_toBottomOf="@+id/loading_imageview" + app:layout_constraintBottom_toTopOf="@+id/refresh_button" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/loading_imageview" />