From 47b81cc7e13e617285bd5a161f3839d442b529eb Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Fri, 18 Dec 2020 16:12:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/values-xhdpi/dimens.xml | 4 + .../src/main/res/values/dimens.xml | 4 + .../extensions/entrance/EntranceFragment.java | 411 ++++++++---------- 3 files changed, 190 insertions(+), 229 deletions(-) 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 96ca04697b..1f8f71e5f9 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 @@ -1116,4 +1116,8 @@ 60px 22.5px + 360px + 63px + 96px + 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 0950acfa9d..d64511c300 100644 --- a/modules/mogo-module-common/src/main/res/values/dimens.xml +++ b/modules/mogo-module-common/src/main/res/values/dimens.xml @@ -1107,4 +1107,8 @@ 17px 60px 12.5px + + 36px + 53px + 194px diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index baefe740bc..8ae5668217 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -12,8 +12,8 @@ import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; import android.widget.Button; -import android.widget.ImageButton; import android.widget.EditText; +import android.widget.ImageButton; import android.widget.ImageView; import android.widget.RadioButton; import android.widget.TextView; @@ -186,11 +186,10 @@ public class EntranceFragment extends MvpFragment { - mApis.getSearchManagerApi().goSettings(); - return true; - }); - - mUploadRoadCondition.setOnLongClickListener(view -> { - mApis.getMogoMonitorApi().getMogoMonitorLog().showLogDebugDialog(); - return true; - }); - - mUserHeadImg.setOnLongClickListener(view ->{ - if (groupFix.getVisibility() == View.VISIBLE) { - groupFix.setVisibility(View.GONE); - }else{ - groupFix.setVisibility(View.VISIBLE); - } - return true; - }); - } - groupFix = findViewById(R.id.groupFix); ConstraintLayout rootView = findViewById(R.id.module_entrance_id_top_motion_layout); @@ -333,48 +257,10 @@ public class EntranceFragment extends MvpFragment { - dlg.dismiss(); - mMogoNavi.stopNavi(); - }) - .setCancelButton(R.string.module_commons_button_cancel, - (dlg, which) -> { - dlg.dismiss(); - }) - .setContent(R.string.module_commons_exit_navi_content) - .build() - .show(); - } else { - MapCenterPointStrategy.setMapCenterPointByScene(mMApUIController, Scene.NAVI); - mMApUIController.recoverLockMode(); - } - } - } - }); - mCameraMode = findViewById(R.id.module_ext_id_north); - mCameraMode.setOnClickListener(new OnPreventFastClickListener() { - @Override - public void onClickImpl(View v) { - if (mCameraMode.isSelected()) { - mMApUIController.changeMapMode(EnumMapUI.CarUp_2D); - } else { - mMApUIController.changeMapMode(EnumMapUI.NorthUP_2D); - } - } - }); - - mApis.getIntentManagerApi().registerIntentListener(AUTONAVI_STANDARD_BROADCAST_RECV, this); MogoEntranceButtons.save(ButtonIndex.BUTTON1, findViewById(R.id.module_entrance_id_button1)); MogoEntranceButtons.save(ButtonIndex.BUTTON2, findViewById(R.id.module_entrance_id_button2)); - mDisplayOverviewBounds = new Rect( ResourcesHelper.getDimensionPixelSize(getContext(), R.dimen.module_map_display_overview_left_margin), @@ -389,63 +275,49 @@ public class EntranceFragment extends MvpFragment properties = new HashMap<>(); - properties.put("type", 3); - ServiceApisManager.serviceApis.getAnalyticsApi().track("Launcher_APP_Icon", - properties); - } catch (Exception e) { - Logger.e(TAG, e, "打开个人中心Exception"); - } - } - }); + mUploadButtonAnimatorController = new UploadButtonAnimatorController(mUploading, mUpload, + mStatusManager); + tvEnterVrMode = findViewById(R.id.module_ext_enter_vr_mode); + tvExitVrMode = findViewById(R.id.module_ext_exit_vr_mode); + + tvEnterVrMode.setOnClickListener(clickListener); + tvExitVrMode.setOnClickListener(clickListener); + mMsgContainer.setOnClickListener(clickListener); + mUserHeadImg.setOnClickListener(clickListener); + mMove2CurrentLocation.setOnClickListener(clickListener); + mDisplayOverview.setOnClickListener(clickListener); + mExitNavi.setOnClickListener(clickListener); + mCameraMode.setOnClickListener(clickListener); groupUserHead.setVisibility(DebugConfig.isLauncher() ? View.VISIBLE : View.GONE); - mUploadButtonAnimatorController = new UploadButtonAnimatorController(mUploading, mUpload, - mStatusManager); + if (DebugConfig.isDebug()) { + mMove2CurrentLocation.setOnLongClickListener(view -> { + mApis.getSearchManagerApi().goSettings(); + return true; + }); - tvEnterVrMode = findViewById(R.id.module_ext_enter_vr_mode); - tvEnterVrMode.setOnClickListener((v)->{ - // 进入vr模式 - mMApUIController.changeMapMode( EnumMapUI.Type_VR ); - }); + mUploadRoadCondition.setOnLongClickListener(view -> { + mApis.getMogoMonitorApi().getMogoMonitorLog().showLogDebugDialog(); + return true; + }); - tvExitVrMode = findViewById(R.id.module_ext_exit_vr_mode); - tvExitVrMode.setOnClickListener((v)->{ - // 退出vr模式 - mMApUIController.changeMapMode( EnumMapUI.CarUp_2D ); - }); + mUserHeadImg.setOnLongClickListener(view -> { + if (groupFix.getVisibility() == View.VISIBLE) { + groupFix.setVisibility(View.GONE); + } else { + groupFix.setVisibility(View.VISIBLE); + } + return true; + }); + } dealWeatherContainer(); @@ -459,40 +331,9 @@ public class EntranceFragment extends MvpFragment{ - try { - String times = etTimes.getText().toString().trim(); - int fixTime = Integer.parseInt(times); - Logger.d(TAG, "修改上报时间间隔： " + times + " fixTime: " + fixTime); - if(fixTime > 0) { - Intent intent = new Intent("com.mogo.launcher.action.FIX_UPLOAT_DELAY"); - intent.putExtra("fixTime", fixTime); - getContext().sendBroadcast(intent); - TipToast.tip("已经发送修改广播"); - }else{ - TipToast.tip("fixTime为0，不发送广播"); - } - } catch (Exception e) { - TipToast.tip("fixTime异常"); - e.printStackTrace(); - } - }); + findViewById(R.id.btnFix).setOnClickListener(clickListener); - debugPanel.setOnClickListener(view -> { - if (SystemClock.elapsedRealtime() - lastDebugPanelClickTime > 1000) { - debugPanelClickCount = 1; - }else{ - debugPanelClickCount++; - } - - lastDebugPanelClickTime = SystemClock.elapsedRealtime(); - - if (debugPanelClickCount == 10) { - // show panel - debugPanelGroup.setVisibility(View.VISIBLE); - } - - }); + findViewById(R.id.debugPanel).setOnClickListener(clickListener); initDebugPanel(); @@ -504,7 +345,7 @@ public class EntranceFragment extends MvpFragment { - return !mMogoNavi.isNaviing(); - }); + , () -> !mMogoNavi.isNaviing()); if (CustomNaviInterrupter.getInstance().interrupt()) { mDisplayOverview.setVisibility(View.GONE); mCameraMode.setVisibility(View.GONE); @@ -897,12 +734,6 @@ public class EntranceFragment extends MvpFragment()); - // 目的地车友的显示隐藏控制准备迁移到TopViewAnimHelper中 -// if ( DebugConfig.isSupportedSearchDestinationOnlineCarList() ) { -// mOnlineCarEntrance.setVisibility( View.VISIBLE ); -// } else { -// mOnlineCarEntrance.setVisibility( View.GONE ); -// } } @Override @@ -915,15 +746,11 @@ public class EntranceFragment extends MvpFragment