1. 分享适配同行者语音的免唤醒词

2. 优化分享框ui
3. 优化个人信息展示条件

.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>

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"

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");

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;
     }

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;
     }

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

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 "";
+    }
 }

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"

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 {
     /**
      * 显示分享框
      */