merge
This commit is contained in:
@@ -7,13 +7,7 @@ package com.mogo.module.extensions;
|
||||
* 描述
|
||||
*/
|
||||
public class ExtensionsModuleConst {
|
||||
|
||||
/**
|
||||
* 快捷操作入口:定位、
|
||||
*/
|
||||
public static final String PATH_ENTRANCE = "/extension/entrance";
|
||||
|
||||
|
||||
|
||||
public static final String TYPE = "extension";
|
||||
|
||||
public static final String TYPE_ENTRANCE = "entrance";
|
||||
|
||||
@@ -3,6 +3,7 @@ package com.mogo.module.extensions.entrance;
|
||||
import android.content.Intent;
|
||||
import android.graphics.Rect;
|
||||
import android.os.Bundle;
|
||||
import android.os.Debug;
|
||||
import android.os.Handler;
|
||||
import android.text.TextUtils;
|
||||
import android.util.TypedValue;
|
||||
@@ -48,6 +49,7 @@ import com.mogo.module.extensions.R;
|
||||
import com.mogo.module.extensions.navi.NaviInfoView;
|
||||
import com.mogo.module.extensions.userinfo.UserInfo;
|
||||
import com.mogo.module.extensions.utils.EntranceViewHolder;
|
||||
import com.mogo.module.extensions.utils.NoMapTopViewShaderHelper;
|
||||
import com.mogo.module.extensions.utils.TopViewAnimHelper;
|
||||
import com.mogo.module.extensions.utils.TopViewNoLinkageAnimHelper;
|
||||
import com.mogo.module.share.manager.ServiceApisManager;
|
||||
@@ -203,6 +205,8 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
|
||||
seekHelpGroup = findViewById(R.id.module_ext_id_seek_help_notice_group);
|
||||
seekHelpNum = findViewById(R.id.module_ext_id_seek_help_notice_number);
|
||||
|
||||
NoMapTopViewShaderHelper.getInstance().initShaderView(findViewById(R.id.module_ext_id_top_container_shader));
|
||||
|
||||
mUploadRoadCondition = findViewById(R.id.module_entrance_id_upload_road_condition);
|
||||
mUpload = findViewById(R.id.module_entrance_id_upload);
|
||||
mUploading = findViewById(R.id.module_entrance_id_uploading);
|
||||
@@ -396,6 +400,14 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
|
||||
|
||||
debugTopView();
|
||||
|
||||
if (!DebugConfig.isMapBased()) {
|
||||
// 不基于地图的版本需要隐藏一些按钮
|
||||
mMove2CurrentLocation.setVisibility(View.GONE);
|
||||
mWeatherContainer.setVisibility(View.GONE);
|
||||
mMsgContainer.setVisibility(View.GONE);
|
||||
mUserHeadImg.setVisibility(View.GONE);
|
||||
}
|
||||
|
||||
isShowGuide = SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()).getBoolean(getSpGuide(), false);
|
||||
Logger.d(TAG, " isShowGuide = " + isShowGuide + " --isGreaterThanOneDay = " + isGreaterThanOneDay());
|
||||
if (isShowGuide && isGreaterThanOneDay()) {
|
||||
@@ -620,6 +632,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
|
||||
TopViewAnimHelper.getInstance().clear();
|
||||
TopViewNoLinkageAnimHelper.getInstance().removeAllView();
|
||||
TopViewNoLinkageAnimHelper.getInstance().clear();
|
||||
NoMapTopViewShaderHelper.getInstance().release();
|
||||
EntranceViewHolder.getInstance().release();
|
||||
}
|
||||
|
||||
@@ -661,6 +674,9 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
|
||||
|
||||
@Override
|
||||
public void onStartNavi() {
|
||||
if (!DebugConfig.isMapBased()) {
|
||||
return;
|
||||
}
|
||||
TopViewAnimHelper.getInstance().showNaviView();
|
||||
mMApUIController.changeMapMode(mCameraMode.isSelected() ? EnumMapUI.NorthUP_2D :
|
||||
EnumMapUI.CarUp_2D);
|
||||
@@ -678,21 +694,25 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
|
||||
mCameraMode.setVisibility(View.VISIBLE);
|
||||
}
|
||||
mApis.getAnalyticsApi().track("Navigation_begin", new HashMap<>());
|
||||
if ( DebugConfig.isSupportedSearchDestinationOnlineCarList() ) {
|
||||
mOnlineCarEntrance.setVisibility( View.VISIBLE );
|
||||
} else {
|
||||
mOnlineCarEntrance.setVisibility( View.GONE );
|
||||
}
|
||||
// 目的地车友的显示隐藏控制准备迁移到TopViewAnimHelper中
|
||||
// if ( DebugConfig.isSupportedSearchDestinationOnlineCarList() ) {
|
||||
// mOnlineCarEntrance.setVisibility( View.VISIBLE );
|
||||
// } else {
|
||||
// mOnlineCarEntrance.setVisibility( View.GONE );
|
||||
// }
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onStopNavi() {
|
||||
if (!DebugConfig.isMapBased()) {
|
||||
return;
|
||||
}
|
||||
TopViewAnimHelper.getInstance().hideNaviView();
|
||||
mExitNavi.setVisibility(View.GONE);
|
||||
mMApUIController.changeMapMode(EnumMapUI.NorthUP_2D);
|
||||
mDisplayOverview.setVisibility(View.GONE);
|
||||
mCameraMode.setVisibility(View.GONE);
|
||||
mOnlineCarEntrance.setVisibility( View.GONE );
|
||||
// mOnlineCarEntrance.setVisibility( View.GONE );
|
||||
MapCenterPointStrategy.setMapCenterPointByScene(mMApUIController, Scene.AIMLESS);
|
||||
}
|
||||
|
||||
@@ -767,6 +787,9 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
|
||||
|
||||
@Override
|
||||
public void renderWeatherInfo(String temp, String desc, int iconId) {
|
||||
if (!DebugConfig.isMapBased()) {
|
||||
return;
|
||||
}
|
||||
boolean hidden = false;
|
||||
if (iconId != 0) {
|
||||
mWeatherIcon.setImageResource(iconId);
|
||||
@@ -783,6 +806,9 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
|
||||
|
||||
@Override
|
||||
public void renderMsgInfo(boolean hasMsg, int amount) {
|
||||
if (!DebugConfig.isMapBased()) {
|
||||
return;
|
||||
}
|
||||
mMsgContainer.setVisibility(hasMsg ? View.VISIBLE : View.GONE);
|
||||
mMsgCounter.setText(amount > MAX_DISPLAY_MSG_AMOUNT ?
|
||||
getString(R.string.module_ext_str_dots) : String.valueOf(amount));
|
||||
@@ -790,6 +816,9 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
|
||||
|
||||
@Override
|
||||
public void renderUserInfo(UserInfo userInfo) {
|
||||
if (!DebugConfig.isMapBased()) {
|
||||
return;
|
||||
}
|
||||
if (userInfo != null) {
|
||||
Logger.d(TAG, "renderUserInfo: " + userInfo);
|
||||
RequestOptions options =
|
||||
|
||||
@@ -7,6 +7,7 @@ import androidx.annotation.NonNull;
|
||||
import androidx.lifecycle.LifecycleOwner;
|
||||
|
||||
import com.alibaba.android.arouter.launcher.ARouter;
|
||||
import com.mogo.commons.debug.DebugConfig;
|
||||
import com.mogo.commons.mvp.Presenter;
|
||||
import com.mogo.commons.network.Utils;
|
||||
import com.mogo.module.common.MogoApisHandler;
|
||||
@@ -18,12 +19,10 @@ import com.mogo.module.extensions.net.UserInfoNetApiServices;
|
||||
import com.mogo.module.extensions.userinfo.UserInfo;
|
||||
import com.mogo.module.extensions.userinfo.UserInfoConstant;
|
||||
import com.mogo.module.extensions.userinfo.UserInfoResponse;
|
||||
import com.mogo.module.extensions.utils.ExtensionsConfig;
|
||||
import com.mogo.module.extensions.weather.Phenomena;
|
||||
import com.mogo.module.extensions.weather.WeatherCallback;
|
||||
import com.mogo.module.extensions.weather.WeatherInfo;
|
||||
import com.mogo.module.extensions.weather.WeatherModel;
|
||||
import com.mogo.service.IMogoServiceApis;
|
||||
import com.mogo.service.MogoServicePaths;
|
||||
import com.mogo.service.network.IMogoNetwork;
|
||||
import com.mogo.service.statusmanager.IMogoMsgCenter;
|
||||
@@ -103,7 +102,7 @@ public class EntrancePresenter extends Presenter<EntranceView> implements Weathe
|
||||
if (userInfo != null) {
|
||||
mView.renderUserInfo(userInfo);
|
||||
}
|
||||
if(ExtensionsConfig.needRequestUserInfo()){
|
||||
if( DebugConfig.isNeedRequestUserInfo()){
|
||||
// 相当于每次onResume都会请求一下个人信息,目的是能够相对及时的同步手机端的个人信息修改
|
||||
requestUserInfo();
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@ import com.mogo.map.listener.IMogoMapListener;
|
||||
import com.mogo.map.location.IMogoLocationListener;
|
||||
import com.mogo.map.marker.IMogoMarkerClickListener;
|
||||
import com.mogo.map.navi.IMogoNaviListener;
|
||||
import com.mogo.module.extensions.ExtensionsModuleConst;
|
||||
import com.mogo.module.common.MogoModulePaths;
|
||||
import com.mogo.service.module.IMogoModuleLifecycle;
|
||||
import com.mogo.service.module.IMogoModuleProvider;
|
||||
import com.mogo.service.module.ModuleType;
|
||||
@@ -23,7 +23,7 @@ import com.mogo.service.module.ModuleType;
|
||||
* <p>
|
||||
* 描述
|
||||
*/
|
||||
@Route( path = ExtensionsModuleConst.PATH_ENTRANCE )
|
||||
@Route( path = MogoModulePaths.PATH_ENTRANCE )
|
||||
public class EntranceProvider implements IMogoModuleProvider {
|
||||
|
||||
EntranceFragment mFragment;
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
package com.mogo.module.extensions.utils;
|
||||
|
||||
/**
|
||||
* 个性化config
|
||||
*
|
||||
* @author tongchenfei
|
||||
*/
|
||||
public class ExtensionsConfig {
|
||||
public static final String NEED_REQUEST_USER_INFO = "NEED_REQUEST_USER_INFO";
|
||||
|
||||
private static boolean needRequestUserInfo = false;
|
||||
|
||||
public static boolean needRequestUserInfo() {
|
||||
return needRequestUserInfo;
|
||||
}
|
||||
|
||||
public static void setNeedRequestUserInfo(boolean needRequestUserInfo) {
|
||||
ExtensionsConfig.needRequestUserInfo = needRequestUserInfo;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,62 @@
|
||||
package com.mogo.module.extensions.utils;
|
||||
|
||||
import android.view.View;
|
||||
|
||||
import com.mogo.commons.debug.DebugConfig;
|
||||
import com.mogo.utils.logger.Logger;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
public class NoMapTopViewShaderHelper {
|
||||
private static final String TAG = "NoMapTopViewShaderHelper";
|
||||
private static final NoMapTopViewShaderHelper ourInstance = new NoMapTopViewShaderHelper();
|
||||
|
||||
public static NoMapTopViewShaderHelper getInstance() {
|
||||
return ourInstance;
|
||||
}
|
||||
|
||||
private NoMapTopViewShaderHelper() {
|
||||
}
|
||||
|
||||
private View shader;
|
||||
private int showCount = 0;
|
||||
|
||||
public void initShaderView(View shader) {
|
||||
this.shader = shader;
|
||||
}
|
||||
|
||||
public void showShader(){
|
||||
if (this.shader == null) {
|
||||
Logger.e(TAG, "shader view is null!");
|
||||
return;
|
||||
}
|
||||
if (DebugConfig.isMapBased()) {
|
||||
Logger.d(TAG, "基于地图版本不加shader");
|
||||
return;
|
||||
}
|
||||
if (showCount == 0) {
|
||||
shader.setVisibility(View.VISIBLE);
|
||||
}
|
||||
showCount++;
|
||||
}
|
||||
|
||||
public void hideShader(){
|
||||
if (this.shader == null) {
|
||||
Logger.e(TAG, "shader view is null!");
|
||||
return;
|
||||
}
|
||||
if (DebugConfig.isMapBased()) {
|
||||
Logger.d(TAG, "基于地图版本不加shader");
|
||||
return;
|
||||
}
|
||||
if (showCount == 1) {
|
||||
shader.setVisibility(View.GONE);
|
||||
}
|
||||
showCount--;
|
||||
}
|
||||
|
||||
public void release(){
|
||||
shader = null;
|
||||
}
|
||||
}
|
||||
@@ -17,6 +17,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
|
||||
import androidx.constraintlayout.widget.ConstraintSet;
|
||||
import androidx.constraintlayout.widget.Group;
|
||||
|
||||
import com.mogo.commons.debug.DebugConfig;
|
||||
import com.mogo.map.uicontroller.IMogoMapUIController;
|
||||
import com.mogo.module.common.MogoApisHandler;
|
||||
import com.mogo.module.common.map.MapCenterPointStrategy;
|
||||
@@ -51,6 +52,8 @@ public class TopViewAnimHelper {
|
||||
private TextView tvTurnInfo;
|
||||
private TopView topContainer;
|
||||
|
||||
private TextView tvDestinationOnlineCar;
|
||||
|
||||
private ConstraintSet constraintSet;
|
||||
private Transition transition;
|
||||
private TextView cameraMode;
|
||||
@@ -98,6 +101,7 @@ public class TopViewAnimHelper {
|
||||
topContainer = rootView.findViewById(R.id.module_entrance_id_top_container);
|
||||
tvNextDistanceUnit = rootView.findViewById(R.id.module_map_id_navi_next_info_distance_unit);
|
||||
tvTurnInfo = rootView.findViewById(R.id.module_map_id_navi_next_info_turn_info);
|
||||
tvDestinationOnlineCar = rootView.findViewById(R.id.module_ext_id_destination_online_car);
|
||||
|
||||
topContainer.setSlideListener(this::startLatestTopOutAnim);
|
||||
|
||||
@@ -374,6 +378,8 @@ public class TopViewAnimHelper {
|
||||
arriveTimeGroup.setVisibility(View.GONE);
|
||||
}
|
||||
|
||||
NoMapTopViewShaderHelper.getInstance().showShader();
|
||||
|
||||
constraintSet.clone(topMotionLayout);
|
||||
|
||||
constraintSet.clear(R.id.module_entrance_id_top_container,
|
||||
@@ -417,6 +423,16 @@ public class TopViewAnimHelper {
|
||||
tvNextDistanceUnit.setTextSize(TypedValue.COMPLEX_UNIT_PX,
|
||||
getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_unit_textSize_small));
|
||||
|
||||
// 改变目的地车友的约束
|
||||
constraintSet.clear(tvDestinationOnlineCar.getId(),ConstraintSet.LEFT);
|
||||
constraintSet.clear(tvDestinationOnlineCar.getId(),ConstraintSet.TOP);
|
||||
constraintSet.connect(tvDestinationOnlineCar.getId(),
|
||||
ConstraintSet.BOTTOM, naviBg.getId(), ConstraintSet.BOTTOM,
|
||||
(int) getDimen(R.dimen.module_ext_navi_small_margin_bottom));
|
||||
|
||||
constraintSet.connect(tvDestinationOnlineCar.getId(),
|
||||
ConstraintSet.RIGHT, naviBg.getId(), ConstraintSet.RIGHT,
|
||||
(int) getDimen(R.dimen.module_ext_navi_small_margin_right));
|
||||
}
|
||||
constraintSet.applyTo(topMotionLayout);
|
||||
ivTurnIcon.getLayoutParams().height =
|
||||
@@ -425,6 +441,10 @@ public class TopViewAnimHelper {
|
||||
(int) getDimen(R.dimen.module_ext_navi_info_panel_turn_icon_small_width);
|
||||
naviBg.getLayoutParams().height =
|
||||
(int) topMotionLayout.getContext().getResources().getDimension(R.dimen.module_ext_navi_info_panel_small_height);
|
||||
|
||||
tvDestinationOnlineCar.getLayoutParams().height =
|
||||
(int) getDimen(R.dimen.module_ext_button_height_small);
|
||||
tvDestinationOnlineCar.setBackgroundResource(R.drawable.module_ext_dw_navi_info_panel_small_bkg);
|
||||
int scene = 0;
|
||||
if (naviBg.getVisibility() == View.VISIBLE) {
|
||||
scene = Scene.NAVI_WITH_ROAD_EVENT;
|
||||
@@ -473,8 +493,10 @@ public class TopViewAnimHelper {
|
||||
arriveTimeGroup.setVisibility(View.VISIBLE);
|
||||
tvNextDistance.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_textSize));
|
||||
tvNextDistanceUnit.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_unit_textSize));
|
||||
|
||||
}
|
||||
|
||||
NoMapTopViewShaderHelper.getInstance().hideShader();
|
||||
|
||||
constraintSet.clone(topMotionLayout);
|
||||
|
||||
constraintSet.clear(R.id.module_entrance_id_top_container, ConstraintSet.TOP);
|
||||
@@ -504,6 +526,14 @@ public class TopViewAnimHelper {
|
||||
ConstraintSet.TOP, 0);
|
||||
constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.BOTTOM,
|
||||
naviBg.getId(), ConstraintSet.BOTTOM, 0);
|
||||
|
||||
constraintSet.clear(tvDestinationOnlineCar.getId(),ConstraintSet.RIGHT);
|
||||
constraintSet.clear(tvDestinationOnlineCar.getId(),ConstraintSet.BOTTOM);
|
||||
constraintSet.connect(tvDestinationOnlineCar.getId(), ConstraintSet.LEFT,
|
||||
naviBg.getId(), ConstraintSet.LEFT);
|
||||
constraintSet.connect(tvDestinationOnlineCar.getId(), ConstraintSet.TOP,
|
||||
naviBg.getId(), ConstraintSet.BOTTOM,
|
||||
(int) getDimen(R.dimen.module_ext_camera_button_marginTop));
|
||||
}
|
||||
constraintSet.applyTo(topMotionLayout);
|
||||
|
||||
@@ -513,6 +543,10 @@ public class TopViewAnimHelper {
|
||||
(int) getDimen(R.dimen.module_ext_navi_info_panel_turn_icon_width);
|
||||
naviBg.getLayoutParams().height =
|
||||
(int) topMotionLayout.getContext().getResources().getDimension(R.dimen.module_ext_navi_info_panel_height);
|
||||
|
||||
tvDestinationOnlineCar.getLayoutParams().height =
|
||||
(int) getDimen(R.dimen.module_ext_button_height);
|
||||
tvDestinationOnlineCar.setBackgroundResource(R.drawable.module_ext_dw_navi_info_panel_bkg);
|
||||
int scene = 0;
|
||||
if (naviBg.getVisibility() == View.VISIBLE) {
|
||||
scene = Scene.NAVI;
|
||||
@@ -541,6 +575,10 @@ public class TopViewAnimHelper {
|
||||
tvNextDistance.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_textSize));
|
||||
tvNextDistanceUnit.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_unit_textSize));
|
||||
|
||||
tvDestinationOnlineCar.getLayoutParams().height =
|
||||
(int) getDimen(R.dimen.module_ext_button_height);
|
||||
tvDestinationOnlineCar.setBackgroundResource(R.drawable.module_ext_dw_navi_info_panel_bkg);
|
||||
|
||||
// 调整约束
|
||||
constraintSet.clone(topMotionLayout);
|
||||
constraintSet.clear(tvNextDistance.getId(), ConstraintSet.BOTTOM);
|
||||
@@ -567,6 +605,16 @@ public class TopViewAnimHelper {
|
||||
ConstraintSet.TOP, 0);
|
||||
constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.BOTTOM,
|
||||
naviBg.getId(), ConstraintSet.BOTTOM, 0);
|
||||
|
||||
// 目的地车友
|
||||
constraintSet.clear(tvDestinationOnlineCar.getId(),ConstraintSet.RIGHT);
|
||||
constraintSet.clear(tvDestinationOnlineCar.getId(),ConstraintSet.BOTTOM);
|
||||
constraintSet.connect(tvDestinationOnlineCar.getId(), ConstraintSet.LEFT,
|
||||
naviBg.getId(), ConstraintSet.LEFT);
|
||||
constraintSet.connect(tvDestinationOnlineCar.getId(), ConstraintSet.TOP,
|
||||
naviBg.getId(), ConstraintSet.BOTTOM,
|
||||
(int) getDimen(R.dimen.module_ext_camera_button_marginTop));
|
||||
|
||||
constraintSet.applyTo(topMotionLayout);
|
||||
scene = Scene.NAVI_WITH_ROAD_EVENT;
|
||||
} else {
|
||||
@@ -575,6 +623,10 @@ public class TopViewAnimHelper {
|
||||
arriveTimeGroup.setVisibility(View.GONE);
|
||||
tvNextDistance.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_textSize_small));
|
||||
tvNextDistanceUnit.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_unit_textSize_small));
|
||||
|
||||
tvDestinationOnlineCar.getLayoutParams().height =
|
||||
(int) getDimen(R.dimen.module_ext_button_height_small);
|
||||
tvDestinationOnlineCar.setBackgroundResource(R.drawable.module_ext_dw_navi_info_panel_small_bkg);
|
||||
// 调整约束
|
||||
constraintSet.clone(topMotionLayout);
|
||||
constraintSet.connect(tvNextDistance.getId(), ConstraintSet.BOTTOM,
|
||||
@@ -596,6 +648,17 @@ public class TopViewAnimHelper {
|
||||
constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.BOTTOM,
|
||||
naviBg.getId(), ConstraintSet.BOTTOM,
|
||||
(int) getDimen(R.dimen.module_ext_navi_info_turn_icon_margin_bottom));
|
||||
|
||||
// 目的地车友
|
||||
constraintSet.clear(tvDestinationOnlineCar.getId(),ConstraintSet.LEFT);
|
||||
constraintSet.clear(tvDestinationOnlineCar.getId(),ConstraintSet.TOP);
|
||||
constraintSet.connect(tvDestinationOnlineCar.getId(),
|
||||
ConstraintSet.BOTTOM, naviBg.getId(), ConstraintSet.BOTTOM,
|
||||
(int) getDimen(R.dimen.module_ext_navi_small_margin_bottom));
|
||||
constraintSet.connect(tvDestinationOnlineCar.getId(),
|
||||
ConstraintSet.RIGHT, naviBg.getId(), ConstraintSet.RIGHT,
|
||||
(int) getDimen(R.dimen.module_ext_navi_small_margin_right));
|
||||
|
||||
constraintSet.applyTo(topMotionLayout);
|
||||
scene = Scene.NAVI;
|
||||
}
|
||||
@@ -680,6 +743,9 @@ public class TopViewAnimHelper {
|
||||
naviBg.setVisibility(visibility);
|
||||
tvNextDistanceUnit.setVisibility(visibility);
|
||||
tvTurnInfo.setVisibility(visibility);
|
||||
if(DebugConfig.isSupportedSearchDestinationOnlineCarList()) {
|
||||
tvDestinationOnlineCar.setVisibility(visibility);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -15,6 +15,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
|
||||
import androidx.constraintlayout.widget.ConstraintSet;
|
||||
import androidx.constraintlayout.widget.Group;
|
||||
|
||||
import com.mogo.commons.debug.DebugConfig;
|
||||
import com.mogo.map.uicontroller.IMogoMapUIController;
|
||||
import com.mogo.module.common.MogoApisHandler;
|
||||
import com.mogo.module.common.map.MapCenterPointStrategy;
|
||||
@@ -362,6 +363,9 @@ public class TopViewNoLinkageAnimHelper {
|
||||
}
|
||||
topContainerNoLinkage.setChildAddedListener(child -> {
|
||||
topContainerNoLinkage.setChildAddedListener(null);
|
||||
|
||||
NoMapTopViewShaderHelper.getInstance().showShader();
|
||||
|
||||
constraintSet.clone(topMotionLayout);
|
||||
|
||||
constraintSet.clear(R.id.module_entrance_id_top_container_no_linkage,
|
||||
@@ -370,7 +374,6 @@ public class TopViewNoLinkageAnimHelper {
|
||||
R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP);
|
||||
TransitionManager.beginDelayedTransition(topMotionLayout, transition);
|
||||
checkCameraModePosition(false);
|
||||
|
||||
constraintSet.applyTo(topMotionLayout);
|
||||
|
||||
int scene = Scene.AIMLESS_WITH_ROAD_EVENT;
|
||||
@@ -405,6 +408,7 @@ public class TopViewNoLinkageAnimHelper {
|
||||
statusListenerMap.get(view).beforeViewRemoveAnim(view);
|
||||
}
|
||||
isTopViewOut = true;
|
||||
NoMapTopViewShaderHelper.getInstance().hideShader();
|
||||
constraintSet.clone(topMotionLayout);
|
||||
|
||||
constraintSet.clear(R.id.module_entrance_id_top_container_no_linkage, ConstraintSet.TOP);
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 2.4 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.8 KiB |
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item>
|
||||
<shape>
|
||||
<corners android:radius="@dimen/module_ext_navi_small_corner" />
|
||||
<solid android:color="#28BBC3FF" />
|
||||
</shape>
|
||||
</item>
|
||||
</selector>
|
||||
@@ -1,207 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<animation-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00000"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00001"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00002"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00003"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00004"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00005"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00006"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00007"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00008"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00009"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00010"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00011"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00012"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00013"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00014"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00015"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00016"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00017"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00018"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00019"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00020"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00021"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00022"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00023"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00024"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00025"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00026"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00027"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00028"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00029"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00030"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00031"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00032"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00033"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00034"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00035"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00036"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00037"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00038"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00039"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00040"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00041"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00042"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00043"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00044"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00045"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00046"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00047"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00048"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00049"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00050"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00051"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00052"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00053"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00054"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00055"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00056"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00057"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00058"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00059"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00060"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00061"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00062"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00063"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00064"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00065"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00066"
|
||||
android:duration="100" />
|
||||
<item
|
||||
android:drawable="@drawable/mogo_tts_icon_00067"
|
||||
android:duration="100" />
|
||||
</animation-list>
|
||||
@@ -9,18 +9,120 @@
|
||||
<include
|
||||
layout="@layout/module_ext_layout_extensions"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"/>
|
||||
android:layout_height="wrap_content" />
|
||||
|
||||
<include
|
||||
layout="@layout/module_ext_include_seeking_help_notice"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
|
||||
<ImageButton
|
||||
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_shadow_bkg"
|
||||
android:scaleType="centerInside"
|
||||
android:src="@drawable/module_map_ic_move2_current_location"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintRight_toRightOf="parent" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/module_entrance_id_buttons_container"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="@dimen/module_common_shadow_width_pos"
|
||||
android:layout_marginBottom="@dimen/module_common_shadow_width_pos"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintLeft_toLeftOf="parent">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/module_entrance_id_button1"
|
||||
android:layout_width="@dimen/module_ext_operation_panel_width"
|
||||
android:layout_height="@dimen/module_ext_operation_panel_width"
|
||||
android:background="@drawable/v2x_cancel_help"
|
||||
android:gravity="center"
|
||||
android:padding="0dp"
|
||||
android:text="前方\n实况"
|
||||
android:textColor="@color/module_commons_FFF_333"
|
||||
android:textSize="@dimen/v2x_cancel_help_text_size"
|
||||
android:textStyle="bold"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/module_entrance_id_button2"
|
||||
android:layout_width="@dimen/module_ext_operation_panel_width"
|
||||
android:layout_height="@dimen/module_ext_operation_panel_width"
|
||||
android:layout_marginTop="@dimen/module_entrance_id_button_marginTop"
|
||||
android:background="@drawable/v2x_cancel_help"
|
||||
android:gravity="center"
|
||||
android:padding="0dp"
|
||||
android:text="取消\n求助"
|
||||
android:textColor="@color/module_commons_FFF_333"
|
||||
android:textSize="@dimen/v2x_cancel_help_text_size"
|
||||
android:textStyle="bold"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/module_entrance_id_exit_navi"
|
||||
android:layout_width="@dimen/module_ext_navi_exit_width"
|
||||
android:layout_height="@dimen/module_ext_navi_exit_height"
|
||||
android:layout_marginTop="@dimen/module_entrance_id_button_marginTop"
|
||||
android:background="@drawable/module_ext_dw_common_corner_bkg"
|
||||
android:gravity="center"
|
||||
android:text="@string/module_ext_str_exit_navi"
|
||||
android:textColor="@color/module_commons_FFF_333"
|
||||
android:textSize="@dimen/module_ext_navi_exit_textSize"
|
||||
android:textStyle="bold"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible" />
|
||||
|
||||
<FrameLayout
|
||||
android:id="@+id/module_entrance_id_upload_road_condition"
|
||||
android:layout_width="@dimen/module_ext_operation_panel_share_width"
|
||||
android:layout_height="@dimen/module_ext_operation_panel_share_height"
|
||||
android:layout_marginLeft="@dimen/dp_8"
|
||||
android:layout_marginTop="@dimen/module_entrance_id_button_marginTop"
|
||||
android:background="@drawable/module_ext_dw_upload_road_condition_bkg">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/module_entrance_id_upload"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:gravity="center"
|
||||
android:text="@string/module_map_str_upload_road_condition"
|
||||
android:textColor="#FFFFFF"
|
||||
android:textSize="@dimen/module_ext_operation_panel_share_textSize"
|
||||
android:textStyle="bold"
|
||||
tools:visibility="gone" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/module_entrance_id_uploading"
|
||||
android:layout_width="@dimen/module_entrance_id_uploading_width"
|
||||
android:layout_height="@dimen/module_entrance_id_uploading_height"
|
||||
android:layout_gravity="center"
|
||||
android:gravity="center"
|
||||
android:scaleType="fitCenter"
|
||||
android:src="@drawable/module_ext_ic_uploading_00010"
|
||||
android:textColor="#FFFFFF"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible" />
|
||||
</FrameLayout>
|
||||
</LinearLayout>
|
||||
|
||||
<FrameLayout
|
||||
android:id="@+id/module_ext_id_top_container_shader"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="#7f000000"
|
||||
android:visibility="gone" />
|
||||
|
||||
<include
|
||||
layout="@layout/include_navi_info_panle"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
/>
|
||||
android:layout_height="wrap_content" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/module_ext_id_north"
|
||||
@@ -46,25 +148,23 @@
|
||||
android:id="@+id/module_ext_id_destination_online_car"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="@dimen/module_ext_button_height"
|
||||
android:layout_marginLeft="@dimen/module_common_shadow_width_pos"
|
||||
android:layout_marginTop="@dimen/module_ext_camera_button_marginTop"
|
||||
android:background="@drawable/module_ext_dw_navi_info_panel_bkg"
|
||||
android:drawableLeft="@drawable/module_ext_destination_online_car_dw"
|
||||
android:drawablePadding="@dimen/module_ext_destination_online_car_drawablePadding"
|
||||
android:gravity="center_vertical"
|
||||
android:paddingLeft="@dimen/module_ext_destination_online_car_paddingLeft"
|
||||
android:paddingRight="@dimen/module_ext_destination_online_car_paddingRight"
|
||||
android:text="@string/module_ext_destination_online_car_text"
|
||||
android:visibility="gone"
|
||||
android:textColor="@color/module_ext_color_voice_text"
|
||||
android:textSize="@dimen/module_ext_north_textSize"
|
||||
android:textStyle="bold"
|
||||
android:paddingRight="@dimen/module_ext_destination_online_car_paddingRight"
|
||||
android:layout_marginLeft="@dimen/module_common_shadow_width_pos"
|
||||
android:paddingLeft="@dimen/module_ext_destination_online_car_paddingLeft"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/module_map_id_navi_bg"
|
||||
app:layout_goneMarginTop="@dimen/module_ext_north_goneMarginTop"
|
||||
tools:visibility="visible" />
|
||||
|
||||
|
||||
<!--关联别的控件的头部容器-->
|
||||
<com.mogo.module.extensions.navi.TopView
|
||||
android:id="@+id/module_entrance_id_top_container"
|
||||
@@ -91,12 +191,12 @@
|
||||
android:id="@+id/module_ext_id_display_overview"
|
||||
android:layout_width="@dimen/module_ext_button_width"
|
||||
android:layout_height="@dimen/module_ext_button_height"
|
||||
android:layout_marginLeft="@dimen/module_common_shadow_width_pos"
|
||||
android:layout_marginTop="@dimen/module_ext_camera_button_marginTop"
|
||||
android:background="@drawable/module_ext_dw_common_corner_bkg"
|
||||
android:gravity="center_horizontal"
|
||||
android:orientation="vertical"
|
||||
android:visibility="gone"
|
||||
android:layout_marginLeft="@dimen/module_common_shadow_width_pos"
|
||||
app:layout_constraintLeft_toLeftOf="@+id/module_map_id_navi_bg"
|
||||
app:layout_constraintTop_toBottomOf="@+id/module_map_id_navi_bg"
|
||||
tools:visibility="gone">
|
||||
@@ -119,99 +219,6 @@
|
||||
android:textStyle="bold" />
|
||||
</LinearLayout>
|
||||
|
||||
<ImageButton
|
||||
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_shadow_bkg"
|
||||
android:scaleType="centerInside"
|
||||
android:src="@drawable/module_map_ic_move2_current_location"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintRight_toRightOf="parent" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/module_entrance_id_buttons_container"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:layout_marginLeft="@dimen/module_common_shadow_width_pos"
|
||||
android:layout_marginBottom="@dimen/module_common_shadow_width_pos"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintLeft_toLeftOf="parent">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/module_entrance_id_button1"
|
||||
android:layout_width="@dimen/module_ext_navi_exit_width"
|
||||
android:layout_height="@dimen/module_ext_navi_exit_height"
|
||||
android:background="@drawable/module_ext_dw_common_corner_bkg"
|
||||
android:gravity="center"
|
||||
android:text="前方\n实况"
|
||||
android:textColor="@color/module_commons_FFF_333"
|
||||
android:textSize="@dimen/v2x_cancel_help_text_size"
|
||||
android:textStyle="bold"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/module_entrance_id_button2"
|
||||
android:layout_width="@dimen/module_ext_navi_exit_width"
|
||||
android:layout_height="@dimen/module_ext_navi_exit_height"
|
||||
android:layout_marginTop="@dimen/module_entrance_id_button_marginTop"
|
||||
android:background="@drawable/module_ext_dw_common_corner_bkg"
|
||||
android:gravity="center"
|
||||
android:text="取消\n求助"
|
||||
android:textColor="@color/module_commons_FFF_333"
|
||||
android:textSize="@dimen/v2x_cancel_help_text_size"
|
||||
android:textStyle="bold"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/module_entrance_id_exit_navi"
|
||||
android:layout_width="@dimen/module_ext_navi_exit_width"
|
||||
android:layout_height="@dimen/module_ext_navi_exit_height"
|
||||
android:layout_marginTop="@dimen/module_entrance_id_button_marginTop"
|
||||
android:background="@drawable/module_ext_dw_common_corner_bkg"
|
||||
android:gravity="center"
|
||||
android:text="@string/module_ext_str_exit_navi"
|
||||
android:textColor="#FFFFFF"
|
||||
android:textSize="@dimen/module_ext_navi_exit_textSize"
|
||||
android:textStyle="bold"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible" />
|
||||
|
||||
<FrameLayout
|
||||
android:id="@+id/module_entrance_id_upload_road_condition"
|
||||
android:layout_marginTop="@dimen/module_entrance_id_button_marginTop"
|
||||
android:layout_width="@dimen/module_ext_operation_panel_share_width"
|
||||
android:layout_height="@dimen/module_ext_operation_panel_share_height"
|
||||
android:background="@drawable/module_ext_dw_upload_road_condition_bkg">
|
||||
<TextView
|
||||
android:id="@+id/module_entrance_id_upload"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:gravity="center"
|
||||
android:text="@string/module_map_str_upload_road_condition"
|
||||
android:textColor="#FFFFFF"
|
||||
android:textSize="@dimen/module_ext_operation_panel_share_textSize"
|
||||
android:textStyle="bold"
|
||||
tools:visibility="gone" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/module_entrance_id_uploading"
|
||||
android:layout_width="@dimen/module_entrance_id_uploading_width"
|
||||
android:layout_height="@dimen/module_entrance_id_uploading_height"
|
||||
android:layout_gravity="center"
|
||||
android:gravity="center"
|
||||
android:scaleType="fitCenter"
|
||||
android:src="@drawable/module_ext_ic_uploading_00010"
|
||||
android:textColor="#FFFFFF"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible" />
|
||||
</FrameLayout>
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
<Button
|
||||
android:id="@+id/btnDebugCtrlTopView"
|
||||
android:layout_width="wrap_content"
|
||||
@@ -265,6 +272,7 @@
|
||||
android:textSize="20sp"
|
||||
app:layout_constraintBottom_toTopOf="@id/btnShowTextTip"
|
||||
app:layout_constraintLeft_toLeftOf="parent" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/btnShowDrawableTipNoSize"
|
||||
android:layout_width="wrap_content"
|
||||
|
||||
@@ -132,6 +132,7 @@
|
||||
<dimen name="module_ext_common_corner">30px</dimen>
|
||||
<dimen name="module_ext_button_width">120px</dimen>
|
||||
<dimen name="module_ext_button_height">120px</dimen>
|
||||
<dimen name="module_ext_button_height_small">80px</dimen>
|
||||
<dimen name="module_ext_camera_button_marginTop">10px</dimen>
|
||||
<dimen name="module_ext_display_overview_textSize">22px</dimen>
|
||||
<dimen name="module_ext_display_overview_textSize_large">28px</dimen>
|
||||
|
||||
@@ -138,6 +138,7 @@
|
||||
<dimen name="module_ext_north_goneMarginTop">142px</dimen>
|
||||
<dimen name="module_ext_button_width">66px</dimen>
|
||||
<dimen name="module_ext_button_height">66px</dimen>
|
||||
<dimen name="module_ext_button_height_small">44px</dimen>
|
||||
<dimen name="module_ext_camera_button_marginTop">10px</dimen>
|
||||
<dimen name="module_ext_display_overview_textSize">12px</dimen>
|
||||
<dimen name="module_ext_display_overview_textSize_large">14px</dimen>
|
||||
@@ -173,4 +174,8 @@
|
||||
<dimen name="module_ext_seek_help_notice_number_text_size">22px</dimen>
|
||||
<dimen name="module_ext_seek_help_notice_bg_margin_top">16px</dimen>
|
||||
|
||||
|
||||
<dimen name="module_ext_navi_small_corner">11px</dimen>
|
||||
<dimen name="module_ext_navi_small_margin_bottom">11px</dimen>
|
||||
<dimen name="module_ext_navi_small_margin_right">10px</dimen>
|
||||
</resources>
|
||||
Reference in New Issue
Block a user