From f19841feb25e00b6c7f22a78d02578574b391caa Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Tue, 1 Mar 2022 16:51:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[Bus/Taxi=20-d=20v2.5.4]=20bus/taxi=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=87=E7=BA=A7=E6=8F=90=E7=A4=BA=E5=B0=8F?= =?UTF-8?q?=E7=BA=A2=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/bus/fragment/BaseOchBusTabFragment.java | 7 ++++++- .../res/drawable/bus_setting_tip_red_cir_bg.xml | 12 ++++++++++++ .../src/main/res/layout/bus_base_fragment.xml | 17 +++++++++++++---- .../och/taxi/ui/BaseOchTaxiTabFragment.java | 12 +++++++----- .../drawable/taxi_setting_tip_red_cir_bg.xml | 12 ++++++++++++ .../src/main/res/layout/taxi_base_fragment.xml | 16 +++++++++++++--- .../main/res/values-xhdpi-2560x1440/dimens.xml | 4 ++-- 7 files changed, 65 insertions(+), 15 deletions(-) create mode 100644 OCH/mogo-och-bus/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml create mode 100644 OCH/mogo-och-taxi/src/main/res/drawable/taxi_setting_tip_red_cir_bg.xml diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java index 5423cd0db1..827f80602b 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java @@ -51,13 +51,14 @@ public abstract class BaseOchBusTabFragment { // onHide() return null; }); + + //设置升级小红点提示 默认隐藏 + mUpgradeTipIv = findViewById(R.id.module_och_bus_upgrade_red_tip); + CallerHmiManager.INSTANCE.registerUpgradeTipsCallback(() -> mUpgradeTipIv); } /** diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml b/OCH/mogo-och-bus/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml new file mode 100644 index 0000000000..0f456d52c7 --- /dev/null +++ b/OCH/mogo-och-bus/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml b/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml index 93bfe40e64..7cf9966090 100644 --- a/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml +++ b/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml @@ -124,7 +124,7 @@ app:layout_constraintBottom_toBottomOf="@+id/bus_switch_model_layout" app:layout_constraintLeft_toRightOf="@+id/bus_switch_model_layout" /> - - + - + { // onHide() return null; }); + //设置升级小红点提示 默认隐藏 + mUpgradeTipIv = findViewById(R.id.module_och_taxi_upgrade_red_tip); + CallerHmiManager.INSTANCE.registerUpgradeTipsCallback(() -> mUpgradeTipIv); + panelView = LayoutInflater.from(getContext()).inflate(getStationPanelViewId(), flStationPanelContainer); ctvAutopilotStatus.setOnClickListener(new OnPreventFastClickListener() { @Override diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_setting_tip_red_cir_bg.xml b/OCH/mogo-och-taxi/src/main/res/drawable/taxi_setting_tip_red_cir_bg.xml new file mode 100644 index 0000000000..64bd6a51e1 --- /dev/null +++ b/OCH/mogo-och-taxi/src/main/res/drawable/taxi_setting_tip_red_cir_bg.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml index cac3a20b7a..c4c1309001 100644 --- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml +++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml @@ -124,7 +124,7 @@ - + - + 460px 140px - 51dp - 51dp + 102px + 102px 83px From 591acbe443081127a458ecafc19bfd9d6d5b640d Mon Sep 17 00:00:00 2001 From: donghongyu Date: Tue, 1 Mar 2022 16:49:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[Change]=20=E6=89=93=E5=BC=80apm=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E7=9B=91=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu (cherry picked from commit 3d404d73c554b264990ad80f8aa4f243017d2fbc) --- .../apm/ApmCrashReportProvider.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java b/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java index 86e15da72e..4b6505de89 100644 --- a/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java +++ b/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java @@ -37,7 +37,7 @@ public class ApmCrashReportProvider implements ITestCrashReportProvider { @Override public void init(Context context) { - Logger.d(TAG, "init"); + Logger.i(TAG, "init……"); initCrash(context); initApmInsight(context); } @@ -56,7 +56,8 @@ public class ApmCrashReportProvider implements ITestCrashReportProvider { } }); crash.config().setChannel("eagle"); - crash.config().setDeviceId(MoGoAiCloudClientConfig.getInstance().getSn());//可选，可以设置自定义did,不设置会使用内部默认的 + //可选，可以设置自定义did,不设置会使用内部默认的 + crash.config().setDeviceId(MoGoAiCloudClientConfig.getInstance().getSn()); String mapSDKVersion = AppUtils.getCustomMapSDKVersion(context); crash.addTags(MAP_SDK_VERSION, mapSDKVersion); // crash.setReportUrl("www.xxx.com"); // 私有化部署：私有化部署才配置上报地址 @@ -80,21 +81,21 @@ public class ApmCrashReportProvider implements ITestCrashReportProvider { //设置分配的appid builder.aid(BYTEAMP_APPID); //是否开启卡顿功能 - builder.blockDetect(false); + builder.blockDetect(true); //是否开启严重卡顿功能 - builder.seriousBlockDetect(false); + builder.seriousBlockDetect(true); //是否开启流畅性和丢帧 - builder.fpsMonitor(false); + builder.fpsMonitor(true); //控制是否打开WebVeiw监控 - builder.enableWebViewMonitor(false); + builder.enableWebViewMonitor(true); //控制是否打开内存监控 - builder.memoryMonitor(false); + builder.memoryMonitor(true); //控制是否打开电量监控 - builder.batteryMonitor(false); + builder.batteryMonitor(true); //是否打印日志，注：线上release版本要配置为false builder.debugMode(true); //支持用户自定义user_id把平台数据和自己用户关联起来，可以不配置 -// builder.userId("user_id"); + builder.userId(MoGoAiCloudClientConfig.getInstance().getSn()); //私有化部署：配置数据上报的域名 （私有化部署才需要配置，内部有默认域名），测试支持设置http://www.xxx.com 默认是https协议 // builder.defaultReportDomain("www.xxx.com"); //设置渠道。1.3.16版本增加接口