From 17abb0864a48c588623c333b272eaafd0dd2ce92 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Thu, 13 Aug 2020 10:31:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AF=BC=E8=88=AA=E5=85=A5?= =?UTF-8?q?=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驾驶 + 切换辅助驾驶