From 64c9c61770aec900e1d9f4e6b7dfa9faf53c7ac9 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Tue, 9 Jun 2020 15:47:07 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E5=88=86=E4=BA=AB=E9=80=82=E9=85=8D?= =?UTF-8?q?=E5=90=8C=E8=A1=8C=E8=80=85=E8=AF=AD=E9=9F=B3=E7=9A=84=E5=85=8D?= =?UTF-8?q?=E5=94=A4=E9=86=92=E8=AF=8D=202.=20=E4=BC=98=E5=8C=96=E5=88=86?= =?UTF-8?q?=E4=BA=AB=E6=A1=86ui=203.=20=E4=BC=98=E5=8C=96=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- app/build.gradle | 6 ++ .../com/mogo/launcher/MogoApplication.java | 3 + .../com/mogo/commons/debug/DebugConfig.java | 8 ++- .../java/com/mogo/commons/voice/AIAssist.java | 3 + .../module/extensions/ExtensionsFragment.java | 4 ++ .../com/mogo/module/share/ShareControl.java | 66 ++++++++++++++++++ .../module_share_title_icon_left.png | Bin 0 -> 1545 bytes .../module_share_title_icon_right.png | Bin 0 -> 1553 bytes .../drawable/module_share_title_icon_left.png | Bin 0 -> 765 bytes .../module_share_title_icon_right.png | Bin 0 -> 767 bytes .../res/layout/launcher_dialog_share_2.xml | 4 +- .../mogo/service/share/IMogoShareManager.java | 4 +- 13 files changed, 94 insertions(+), 6 deletions(-) create mode 100644 modules/mogo-module-share/src/main/res/drawable-xhdpi/module_share_title_icon_left.png create mode 100644 modules/mogo-module-share/src/main/res/drawable-xhdpi/module_share_title_icon_right.png create mode 100644 modules/mogo-module-share/src/main/res/drawable/module_share_title_icon_left.png create mode 100644 modules/mogo-module-share/src/main/res/drawable/module_share_title_icon_right.png diff --git a/.idea/misc.xml b/.idea/misc.xml index 2dc54c489f..707ee6e613 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index d8ebdb280d..c99236b077 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -93,14 +93,20 @@ android { // f系列-分体机全系列，未细分 f8xx{ dimension "product" + // 使用思必驰语音 + buildConfigField 'int', 'AIType','2' } // e系列 e8xx { dimension "product" + // 使用思必驰语音 + buildConfigField 'int', 'AIType','2' } // d系列 d8xx { dimension "product" + // 使用同行者语音 + buildConfigField 'int', 'AIType','1' } qa { dimension "env" diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 5ea39f1189..50d1702b89 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -18,6 +18,7 @@ import com.mogo.module.media.MediaConstants; import com.mogo.module.push.PushUIConstants; import com.mogo.module.tanlu.constant.TanluConstants; import com.mogo.module.v2x.V2XConst; +import com.mogo.service.MogoServicePaths; import com.mogo.service.connection.IMogoSocketManager; import com.mogo.utils.logger.LogLevel; import com.mogo.utils.logger.Logger; @@ -36,6 +37,7 @@ public class MogoApplication extends AbsMogoApplication { public void onCreate() { DebugConfig.setNetMode(BuildConfig.NET_ENV); DebugConfig.setDebug(BuildConfig.DEBUG); + DebugConfig.setAIType(BuildConfig.AIType); super.onCreate(); // Crash 日志收集 final long start = System.currentTimeMillis(); @@ -55,6 +57,7 @@ public class MogoApplication extends AbsMogoApplication { MogoModulePaths.addModule(new MogoModule(TanluConstants.TAG, TanluConstants.MODEL_NAME)); MogoModulePaths.addModule(new MogoModule( V2XConst.PATH_V2X_UI, V2XConst.PATH_V2X_UI)); + MogoModulePaths.addModule(new MogoModule(MogoServicePaths.PATH_SHARE, "ShareControl")); // 暂时去掉推送 // MogoModulePaths.addModule(new MogoModule(PushUIConstants.TAG, PushUIConstants.TAG)); Log.i("timer", "cost " + (System.currentTimeMillis() - start) + "ms"); diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java index 7feeff35ac..216d52d588 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java @@ -1,5 +1,7 @@ package com.mogo.commons.debug; +import com.mogo.utils.logger.Logger; + /** * @author congtaowang * @since 2019-12-23 @@ -113,12 +115,16 @@ public class DebugConfig { /** * 设置使用哪个语音助手 - * @param aiType AI_TYPE_TXZ AI_TYPE_SPEECH + * @param aiType {@link #AI_TYPE_TXZ} {@link #AI_TYPE_SPEECH} */ public static void setAIType(int aiType){ + Logger.d("DebugConfig", "setAiType: " + aiType); sAIType = aiType; } + /** + * 使用哪个语音助手 {@link #AI_TYPE_TXZ} {@link #AI_TYPE_SPEECH} + */ public static int getAIType(){ return sAIType; } diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java index b5ab14af70..655a831c92 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java @@ -380,6 +380,9 @@ public class AIAssist implements VoiceClient.VoiceCmdCallBack, OnTtsListener { if ( isProcessRunning( context, getPackageUid( context, "com.zhidao.speech" ) ) && isProcessRunning( context, getPackageUid( context, "com.zhidao.speech.adapter" ) ) ) { return true; + } else if (isProcessRunning(context, getPackageUid(context, "com.txznet.txz")) && isProcessRunning(context, getPackageUid(context, "com.txznet.adapter"))) { + Logger.d(TAG, "txz is voiceServiceReady"); + return true; } return false; } diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsFragment.java index e5254a81c6..c5914114d4 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsFragment.java @@ -10,6 +10,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.alibaba.android.arouter.launcher.ARouter; +import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.mvp.MvpFragment; import com.mogo.module.extensions.userinfo.UserInfo; import com.mogo.module.extensions.utils.LaunchUtils; @@ -54,6 +55,7 @@ public class ExtensionsFragment extends MvpFragment< ExtensionsView, ExtensionsP mUserHeadImg = findViewById(R.id.ivUserHeadImg); mMsgContainer = findViewById( R.id.module_ext_id_msg ); + mMsgContainer.setOnClickListener( view -> { ARouter.getInstance().build( "/push/ui/message" ).navigation( getContext() ); } ); @@ -65,6 +67,8 @@ public class ExtensionsFragment extends MvpFragment< ExtensionsView, ExtensionsP Logger.e(TAG, e, "打开个人中心Exception"); } }); + + mUserHeadImg.setVisibility(DebugConfig.isLauncher()?View.VISIBLE:View.GONE); } @NonNull diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java index 0b812c91bd..33ab9ac337 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java @@ -2,12 +2,21 @@ package com.mogo.module.share; import android.content.Context; import android.content.Intent; +import android.os.Bundle; +import android.view.View; + +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.voice.AIAssist; import com.mogo.commons.voice.IMogoVoiceCmdCallBack; +import com.mogo.map.listener.IMogoMapListener; +import com.mogo.map.location.IMogoLocationListener; +import com.mogo.map.marker.IMogoMarkerClickListener; +import com.mogo.map.navi.IMogoNaviListener; import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant; import com.mogo.module.authorize.authprovider.invoke.AuthorizeInvokerConstant; import com.mogo.module.authorize.authprovider.module.IMogoAcquireAuthorizeListener; @@ -21,6 +30,7 @@ import com.mogo.module.share.manager.UploadHelper; import com.mogo.service.MogoServicePaths; import com.mogo.service.intent.IMogoIntentListener; import com.mogo.service.intent.IMogoIntentManager; +import com.mogo.service.module.IMogoModuleLifecycle; import com.mogo.service.share.IMogoShareManager; import com.mogo.utils.TipToast; import com.mogo.utils.logger.Logger; @@ -408,4 +418,60 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo stepAfterAuth.setUploadType(uploadType); authorizeModuleManager.invokeAuthorization(AuthorizeInvokerConstant.AUTHORIZE_TYPE_LAUNCHER_SHARE); } + + @Override + public Fragment createFragment(Context context, Bundle data) { + return null; + } + + @Override + public View createView(Context context) { + return null; + } + + @NonNull + @Override + public String getModuleName() { + return "ShareControl"; + } + + @Override + public IMogoModuleLifecycle getCardLifecycle() { + return null; + } + + @Override + public IMogoMapListener getMapListener() { + return null; + } + + @Override + public int getType() { + return 0; + } + + @Override + public IMogoNaviListener getNaviListener() { + return null; + } + + @Override + public IMogoLocationListener getLocationListener() { + return null; + } + + @Override + public IMogoMarkerClickListener getMarkerClickListener() { + return null; + } + + @Override + public String getAppPackage() { + return ""; + } + + @Override + public String getAppName() { + return ""; + } } diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/module_share_title_icon_left.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/module_share_title_icon_left.png new file mode 100644 index 0000000000000000000000000000000000000000..2285d6206017dfc813960c58e3f6444af6ed3abf GIT binary patch literal 1545 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 literal 0 HcmV?d00001 diff --git a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml index c21f932227..290602f73e 100644 --- a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml +++ b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml @@ -25,8 +25,8 @@ android:layout_marginTop="@dimen/share_module_title_margin_top" android:text="我要分享" android:textColor="@color/white" - android:drawableLeft="@drawable/module_share_title_icon" - android:drawableRight="@drawable/module_share_title_icon" + android:drawableLeft="@drawable/module_share_title_icon_left" + android:drawableRight="@drawable/module_share_title_icon_right" android:drawablePadding="@dimen/dp_40" android:textSize="@dimen/share_module_title_content" android:textStyle="bold" diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/share/IMogoShareManager.java b/services/mogo-service-api/src/main/java/com/mogo/service/share/IMogoShareManager.java index 2ed5841ad8..8d16700dfc 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/share/IMogoShareManager.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/share/IMogoShareManager.java @@ -1,12 +1,12 @@ package com.mogo.service.share; -import com.alibaba.android.arouter.facade.template.IProvider; +import com.mogo.service.module.IMogoModuleProvider; /** * 分享框管理接口 * @author tongchenfei */ -public interface IMogoShareManager extends IProvider { +public interface IMogoShareManager extends IMogoModuleProvider { /** * 显示分享框 */