From 97a363338a476ecce3f48a5329721be43a6e77dc Mon Sep 17 00:00:00 2001 From: jiaguofeng Date: Thu, 22 Oct 2020 20:55:31 +0800 Subject: [PATCH 1/6] fix marker click --- libraries/map-custom/build.gradle | 2 +- .../src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index 8bf9bfe3fc..89e65c3172 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -55,7 +55,7 @@ dependencies { implementation project(':foudations:mogo-commons') } - implementation 'com.zhidaoauto.machine:map:1.0.0-online-9' + implementation 'com.zhidaoauto.machine:map:1.0.0-online-11' } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java index 98f4faf9ec..dc7e2d659f 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java @@ -240,7 +240,7 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca @Override public void setTrafficEnabled(boolean visible) { if (checkAMapView()) { - mMapView.getMapAutoViewHelper().setTraffic(visible); +// mMapView.getMapAutoViewHelper().setTraffic(visible); } } From 90e6e998e070a3ae60d249c5d9df33183d6e1754 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Fri, 23 Oct 2020 14:40:15 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=A8=E5=B1=80vr?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- .../service/statusmanager/IMogoStatusManager.java | 13 +++++++++++++ .../service/statusmanager/StatusDescriptor.java | 6 +++++- .../impl/statusmanager/MogoStatusManager.java | 10 ++++++++++ 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 2db9aab721..47f1a4e1d4 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStatusManager.java b/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStatusManager.java index 5b3257652f..00b528d062 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStatusManager.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStatusManager.java @@ -10,6 +10,12 @@ import com.alibaba.android.arouter.facade.template.IProvider; */ public interface IMogoStatusManager extends IProvider { + /** + * 是否在vr模式 + * @return true - 在vr模式 false - 不在vr模式 + */ + boolean isVrMode(); + /** * 小智语音 UI 是否在展示 * @@ -110,6 +116,13 @@ public interface IMogoStatusManager extends IProvider { */ boolean isMainPageLaunched(); + /** + * 设置vrMode状态 + * @param tag 业务类型 + * @param vrMode true - 在vr模式 false 不在vr模式 + */ + void setVrMode(String tag, boolean vrMode); + /** * 设置小智语音UI状态 * diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/StatusDescriptor.java b/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/StatusDescriptor.java index 2acf766c45..b937757810 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/StatusDescriptor.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/StatusDescriptor.java @@ -78,5 +78,9 @@ public enum StatusDescriptor { /** * 是否已经进入过主页 */ - MAIN_PAGE_CREATED; + MAIN_PAGE_CREATED, + /** + * 是否已经进入vr模式 + */ + VR_MODE } diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java b/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java index 43eb1b4769..a3eb6f93f2 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java @@ -49,6 +49,11 @@ public class MogoStatusManager implements IMogoStatusManager { return get_bool_val( StatusDescriptor.VOICE_UI ); } + @Override + public boolean isVrMode() { + return get_bool_val(StatusDescriptor.VR_MODE); + } + @Override public boolean isADASShow() { return get_bool_val( StatusDescriptor.ADAS_UI ); @@ -127,6 +132,11 @@ public class MogoStatusManager implements IMogoStatusManager { return val == null ? false : val; } + @Override + public void setVrMode(String tag, boolean vrMode) { + doSetStatus(tag, StatusDescriptor.VR_MODE, vrMode); + } + @Override public void setVoiceUIShow( String tag, boolean show ) { doSetStatus( tag, StatusDescriptor.VOICE_UI, show ); From c944d8245f6b27baab8093642a33c62e68bcd862 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Wed, 21 Oct 2020 10:53:11 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E4=BA=AB?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=92=8C=E4=BA=8B=E4=BB=B6=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/module/extensions/utils/EntranceViewHolder.java | 2 ++ .../src/main/res/values-xhdpi/dimens.xml | 2 +- modules/mogo-module-main/src/main/res/values/dimens.xml | 2 +- .../mogo/module/v2x/fragment/V2XEventPanelFragment.kt | 9 ++++++++- .../mogo-module-v2x/src/main/res/values-ldpi/dimens.xml | 3 +++ .../mogo-module-v2x/src/main/res/values-mdpi/dimens.xml | 4 ++++ .../src/main/res/values-xhdpi-1920x1000/dimens.xml | 2 ++ .../mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml | 4 ++++ modules/mogo-module-v2x/src/main/res/values/dimens.xml | 3 +++ 9 files changed, 28 insertions(+), 3 deletions(-) diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/EntranceViewHolder.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/EntranceViewHolder.java index 7e8670189e..da48584d37 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/EntranceViewHolder.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/EntranceViewHolder.java @@ -1,5 +1,6 @@ package com.mogo.module.extensions.utils; +import android.graphics.Color; import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; @@ -90,6 +91,7 @@ public class EntranceViewHolder { View v = wrapper.getView(); v.setLayoutParams(params); rootViewGroup.addView(v, 0); +// rootViewGroup.setBackgroundColor(Color.WHITE); } public void removeBottomLayerView(View view) { diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml index 125e839721..2fec4e02b2 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml @@ -145,7 +145,7 @@ 20px 34px - 161px + 10px 10px 45px 120px diff --git a/modules/mogo-module-main/src/main/res/values/dimens.xml b/modules/mogo-module-main/src/main/res/values/dimens.xml index 707ac832c0..86cd80d7b8 100644 --- a/modules/mogo-module-main/src/main/res/values/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values/dimens.xml @@ -26,6 +26,6 @@ 16px 658px 8px - 2px + 8px \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt index 0e5f343eb1..1680b06794 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt @@ -10,6 +10,7 @@ import androidx.constraintlayout.widget.ConstraintLayout import androidx.fragment.app.Fragment import androidx.viewpager2.widget.ViewPager2 import com.google.android.material.tabs.TabLayoutMediator +import com.mogo.commons.debug.DebugConfig import com.mogo.commons.mvp.MvpFragment import com.mogo.module.v2x.R import com.mogo.module.v2x.V2XConst.MODULE_NAME @@ -177,8 +178,14 @@ class V2XEventPanelFragment : MvpFragment19px + 572px + 480px + 384px diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml index 17684331f1..3af13f8c79 100644 --- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml @@ -100,4 +100,8 @@ 19px + 574px + 480px + 384px + diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml index 4d5042d290..e82f40ef3b 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -82,4 +82,6 @@ 34px + 940px + 701px diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml index df3fadb8fd..2b05633768 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml @@ -98,4 +98,8 @@ 34px + 940px + 940px + 701px + diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml index 4a0b8c8856..3c9bfb22a6 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -91,4 +91,7 @@ 34px + 574px + 480px + 384px From e05e9aa5427dcf0662e3e49803c1bc9eca901db3 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Fri, 23 Oct 2020 18:49:43 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9topview=E5=9C=A8vr?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B8=8B=E7=9A=84=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../independent/MainIndependentActivity.java | 2 +- .../main/launcher/MainLauncherActivity.java | 24 ++++++++- .../src/main/res/values/dimens.xml | 5 ++ .../extensions/entrance/EntranceFragment.java | 50 +++++++++++++++++-- .../res/layout/include_navi_info_panle.xml | 2 +- .../res/layout/module_ext_layout_entrance.xml | 36 +++++++++++-- .../src/main/res/values-xhdpi/dimens.xml | 3 +- .../src/main/res/values/dimens.xml | 5 ++ .../v2x/fragment/V2XEventPanelFragment.kt | 25 +++++++++- .../v2x/listener/V2XLocationListener.java | 6 +++ 10 files changed, 144 insertions(+), 14 deletions(-) create mode 100644 main-extensions/mogo-module-main-launcher/src/main/res/values/dimens.xml diff --git a/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java b/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java index 53b3136c4a..7d19201968 100644 --- a/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java +++ b/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java @@ -37,7 +37,7 @@ public class MainIndependentActivity extends MainActivity { // 事件面板 FrameLayout.LayoutParams eventPanelParams = ( ( FrameLayout.LayoutParams ) mEventPanel.getLayoutParams() ); eventPanelParams.leftMargin = getResources().getDimensionPixelSize( R.dimen.module_main_entrance_fragment_container_marginLeft ); - mEntrance.setLayoutParams( eventPanelParams ); + mEventPanel.setLayoutParams( eventPanelParams ); // 事件面板 FrameLayout.LayoutParams historyMessagePanelParams = ( ( FrameLayout.LayoutParams ) mEventPanel.getLayoutParams() ); diff --git a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java index 872b5f804f..f952d51835 100644 --- a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java +++ b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java @@ -5,6 +5,7 @@ import android.os.Bundle; import android.os.Process; import android.text.TextUtils; import android.view.View; +import android.widget.FrameLayout; import androidx.annotation.Nullable; @@ -13,6 +14,8 @@ import com.mogo.module.extensions.utils.ExtensionsConfig; import com.mogo.module.main.MainActivity; import com.mogo.module.main.cards.MogoModulesManager; import com.mogo.service.intent.IMogoIntentListener; +import com.mogo.service.statusmanager.IMogoStatusChangedListener; +import com.mogo.service.statusmanager.StatusDescriptor; import com.mogo.utils.logger.Logger; /** @@ -20,13 +23,15 @@ import com.mogo.utils.logger.Logger; * * @author tongchenfei */ -public class MainLauncherActivity extends MainActivity implements IMogoIntentListener { - +public class MainLauncherActivity extends MainActivity implements IMogoIntentListener, IMogoStatusChangedListener { + private static final String TAG = "MainLauncherActivity"; protected boolean mIsHomeKeyDown = false; @Override protected void onCreate( @Nullable Bundle savedInstanceState ) { super.onCreate( savedInstanceState ); ExtensionsConfig.setNeedRequestUserInfo( true ); + mServiceApis.getStatusManagerApi().registerStatusChangedListener(TAG, + StatusDescriptor.VR_MODE, this); } @Override @@ -89,6 +94,8 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis @Override protected void onDestroy() { super.onDestroy(); + mServiceApis.getStatusManagerApi().unregisterStatusChangedListener(TAG, + StatusDescriptor.VR_MODE, this); try { // acc off 之后会出现进程还在，但是页面被杀的情况，这个直接杀掉进程，然后让整个进程重启 Process.killProcess( Process.myPid() ); @@ -110,4 +117,17 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis sendBroadcast( intent ); Logger.d( TAG, "send msg to AI Voice" ); } + + @Override + public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) { + if (isTrue) { + FrameLayout.LayoutParams entranceParams = ( ( FrameLayout.LayoutParams ) mEntrance.getLayoutParams() ); + entranceParams.leftMargin = getResources().getDimensionPixelSize( R.dimen.module_main_entrance_fragment_container_marginLeft_in_vr_mode ); + mEntrance.setLayoutParams( entranceParams ); + }else{ + FrameLayout.LayoutParams entranceParams = ( ( FrameLayout.LayoutParams ) mEntrance.getLayoutParams() ); + entranceParams.leftMargin = getResources().getDimensionPixelSize( R.dimen.module_main_entrance_fragment_container_marginLeft_out_vr_mode ); + mEntrance.setLayoutParams( entranceParams ); + } + } } diff --git a/main-extensions/mogo-module-main-launcher/src/main/res/values/dimens.xml b/main-extensions/mogo-module-main-launcher/src/main/res/values/dimens.xml new file mode 100644 index 0000000000..79e190ca2d --- /dev/null +++ b/main-extensions/mogo-module-main-launcher/src/main/res/values/dimens.xml @@ -0,0 +1,5 @@ + + + 204px + 800px + \ No newline at end of file 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 7ec1345d38..0472822c92 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 @@ -79,6 +79,7 @@ import java.util.Random; import static com.mogo.module.common.utils.SPConst.getSPGuideRecord; import static com.mogo.module.common.utils.SPConst.getSpGuide; +import static com.mogo.module.extensions.ExtensionsModuleConst.TYPE_ENTRANCE; import static com.mogo.module.share.constant.ShareConstants.KEY_CLICK_SHARE_BUTTON; import static com.mogo.module.share.constant.ShareConstants.KEY_CLICK_SHARE_TIME; import static com.mogo.module.share.constant.ShareConstants.KEY_SERVER_SHOW_DAY_COUNT; @@ -170,6 +171,8 @@ public class EntranceFragment extends MvpFragment{ + // 进入vr模式 + enterVrMode(); + }); + + tvExitVrMode = findViewById(R.id.module_ext_exit_vr_mode); + tvExitVrMode.setOnClickListener((v)->{ + // 退出vr模式 + exitVrMode(); + }); dealWeatherContainer(); @@ -394,6 +408,28 @@ public class EntranceFragment extends MvpFragment