From 17abb0864a48c588623c333b272eaafd0dd2ce92 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Thu, 13 Aug 2020 10:31:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E5=85=A5=E5=8F=A3UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/service/intent/EmptyIntentHandler.java | 2 +- .../mogo/module/widgets/AutoNaviIntentHandler.java | 12 ++++++++++++ .../res/drawable/module_widgets_app_entrance_bkg.xml | 9 --------- .../main/res/layout/module_widgets_app_entrance.xml | 5 +++-- .../src/main/res/values-ldpi/dimens.xml | 4 ++-- .../src/main/res/values-mdpi/dimens.xml | 4 ++-- .../src/main/res/values/strings.xml | 2 +- 7 files changed, 21 insertions(+), 17 deletions(-) delete mode 100644 modules/mogo-module-widgets/src/main/res/drawable/module_widgets_app_entrance_bkg.xml diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/EmptyIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/EmptyIntentHandler.java index 64d6edd24a..270dcf35d3 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/EmptyIntentHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/EmptyIntentHandler.java @@ -17,6 +17,6 @@ public class EmptyIntentHandler implements IntentHandler { @Override public void handle( Context context, Intent intent ) { - Logger.w( TAG, "空实现." ); + Logger.w( TAG, "空实现. %s", intent.getAction() ); } } diff --git a/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/AutoNaviIntentHandler.java b/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/AutoNaviIntentHandler.java index 3773c41930..77f525cb39 100644 --- a/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/AutoNaviIntentHandler.java +++ b/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/AutoNaviIntentHandler.java @@ -8,10 +8,14 @@ import android.view.WindowManager; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; import com.mogo.module.common.wm.WindowManagerView; +import com.mogo.utils.CommonUtils; import com.mogo.utils.LaunchUtils; import com.mogo.utils.ResourcesHelper; import com.mogo.utils.logger.Logger; +import java.util.HashMap; +import java.util.Map; + public /** * @author congtaowang @@ -40,6 +44,7 @@ class AutoNaviIntentHandler { } private WindowManagerView mWindowManagerView; + private Map< String, Object > mProperties = new HashMap<>(); public synchronized void release() { sInstance = null; @@ -95,6 +100,12 @@ class AutoNaviIntentHandler { } else { LaunchUtils.launchByPkg( context, "com.mogo.launcher.app" ); } + if ( mProperties.isEmpty() ) { + mProperties.put( "appname", CommonUtils.getAppName( context ) ); + mProperties.put( "appversion", CommonUtils.getVersionName( context ) ); + mProperties.put( "from", 9 ); + } + MogoWidgetManger.getInstance().getApis().getAnalyticsApi().track( "appenterfront", mProperties ); } catch ( Exception e ) { Logger.e( TAG, e, "error." ); } @@ -102,6 +113,7 @@ class AutoNaviIntentHandler { } try { mWindowManagerView.show(); + MogoWidgetManger.getInstance().getApis().getAnalyticsApi().track( "NAVI_button_show", null ); } catch ( Exception e ) { Logger.e( TAG, e, "error." ); } diff --git a/modules/mogo-module-widgets/src/main/res/drawable/module_widgets_app_entrance_bkg.xml b/modules/mogo-module-widgets/src/main/res/drawable/module_widgets_app_entrance_bkg.xml deleted file mode 100644 index b46cff52de..0000000000 --- a/modules/mogo-module-widgets/src/main/res/drawable/module_widgets_app_entrance_bkg.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/modules/mogo-module-widgets/src/main/res/layout/module_widgets_app_entrance.xml b/modules/mogo-module-widgets/src/main/res/layout/module_widgets_app_entrance.xml index cacbb2a8e2..5ea9b7fe2a 100644 --- a/modules/mogo-module-widgets/src/main/res/layout/module_widgets_app_entrance.xml +++ b/modules/mogo-module-widgets/src/main/res/layout/module_widgets_app_entrance.xml @@ -3,11 +3,12 @@ android:id="@+id/module_widgets_app_entrance_root" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/module_widgets_app_entrance_bkg" + android:background="@drawable/module_widgets_app_entrance_img_bkg" + android:gravity="center" android:orientation="vertical"> 20px 15px 2px - 112px - 929px + 505px + 501px 10px 15px 71px diff --git a/modules/mogo-module-widgets/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-widgets/src/main/res/values-mdpi/dimens.xml index 3aa8cdc5a8..bbd70cad6e 100644 --- a/modules/mogo-module-widgets/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-widgets/src/main/res/values-mdpi/dimens.xml @@ -3,8 +3,8 @@ 20px 15px 2px - 112px - 929px + 505px + 501px 10px 15px 71px diff --git a/modules/mogo-module-widgets/src/main/res/values/strings.xml b/modules/mogo-module-widgets/src/main/res/values/strings.xml index 717eefe1fe..d824f729d5 100644 --- a/modules/mogo-module-widgets/src/main/res/values/strings.xml +++ b/modules/mogo-module-widgets/src/main/res/values/strings.xml @@ -1,4 +1,4 @@ mogo-module-service - 辅助\n驾驶 + 切换辅助驾驶 From b731d815c8ad11c098c59de688232fb26f6b443c Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Thu, 13 Aug 2020 10:32:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module_widgets_app_entrance_img_bkg.png | Bin 0 -> 1432 bytes .../module_widgets_app_entrance_img_bkg.png | Bin 0 -> 1432 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modules/mogo-module-widgets/src/main/res/drawable-ldpi/module_widgets_app_entrance_img_bkg.png create mode 100644 modules/mogo-module-widgets/src/main/res/drawable/module_widgets_app_entrance_img_bkg.png diff --git a/modules/mogo-module-widgets/src/main/res/drawable-ldpi/module_widgets_app_entrance_img_bkg.png b/modules/mogo-module-widgets/src/main/res/drawable-ldpi/module_widgets_app_entrance_img_bkg.png new file mode 100644 index 0000000000000000000000000000000000000000..0af1eeda0184e2205a394d4ab336c5f49231a21f GIT binary patch literal 1432 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 mEIaab?&YKR9ekC)VfzO*A5ys&CVMde0000