Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0

modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java

@@ -1,6 +1,5 @@
 package com.mogo.module.extensions.entrance;
 
-import android.graphics.BitmapFactory;
 import android.os.Bundle;
 import android.view.MotionEvent;
 import android.view.View;
@@ -11,15 +10,12 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
 import com.alibaba.android.arouter.launcher.ARouter;
-import com.mogo.commons.analytics.AnalyticsUtils;
 import com.mogo.commons.mvp.MvpFragment;
-import com.mogo.commons.storage.SpStorage;
 import com.mogo.map.MogoLatLng;
 import com.mogo.map.listener.IMogoMapListener;
 import com.mogo.map.location.IMogoLocationClient;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.map.marker.IMogoMarkerManager;
-import com.mogo.map.marker.MogoMarkerOptions;
 import com.mogo.map.model.MogoPoi;
 import com.mogo.map.navi.IMogoNavi;
 import com.mogo.map.navi.IMogoNaviListener;
@@ -33,7 +29,6 @@ import com.mogo.module.extensions.R;
 import com.mogo.module.extensions.dialog.NaviNoticeDialog;
 import com.mogo.module.extensions.navi.NaviInfoView;
 import com.mogo.module.share.ShareControl;
-import com.mogo.module.share.dialog.LaucherShareDialog;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.service.fragmentmanager.FragmentDescriptor;
 import com.mogo.service.fragmentmanager.IMogoFragmentManager;
@@ -41,10 +36,6 @@ import com.mogo.service.map.IMogoMapService;
 import com.mogo.service.module.IMogoAddressManager;
 import com.mogo.service.module.IMogoModuleProvider;
 import com.mogo.service.module.IMogoRegisterCenter;
-import com.mogo.service.windowview.IMogoWindowManager;
-import com.mogo.utils.TipToast;
-
-import java.util.HashMap;
 
 /**
  * @author congtaowang
@@ -101,6 +92,7 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent
     protected void initViews() {
         mMogoFragmentManager = ( IMogoFragmentManager ) ARouter.getInstance().build( MogoServicePaths.PATH_FRAGMENT_MANAGER ).navigation();
         mMogoAddressManager = ( IMogoAddressManager ) ARouter.getInstance().build( MogoServicePaths.PATH_ADDRESS_MANAGER ).navigation();
+
         mCommonAddress = findViewById( R.id.module_entrance_id_common_address );
 
         mSearch = findViewById( R.id.module_entrance_id_search );
@@ -154,7 +146,6 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent
         mSpeedLimit = findViewById( R.id.module_entrance_id_speed_limit_container );
         mSpeedLimitValue = findViewById( R.id.module_entrance_id_speed_limit_value );
         mSpeedLimitUnit = findViewById( R.id.module_entrance_id_speed_limit_unit );
-
     }
 
     @NonNull

modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java

@@ -259,6 +259,7 @@ public class MogoServiceProvider implements IMogoModuleProvider,
         mIntentManager.registerIntentListener( Intent.ACTION_POWER_CONNECTED, this );
         mIntentManager.registerIntentListener( Intent.ACTION_POWER_DISCONNECTED, this );
         mIntentManager.registerIntentListener( MogoReceiver.ACTION_NWD_ACC, this );
+        mIntentManager.registerIntentListener( MogoReceiver.ACTION_VOICE_UI, this );
     }
 
     private void registerAIReceiver( Context context ) {
@@ -285,6 +286,8 @@ public class MogoServiceProvider implements IMogoModuleProvider,
         // acc On
         filter.addAction( Intent.ACTION_POWER_CONNECTED );
         filter.addAction( Intent.ACTION_POWER_DISCONNECTED );
+        // 小智语音
+        filter.addAction( MogoReceiver.ACTION_VOICE_UI );
         try {
             context.getApplicationContext().registerReceiver( mAIAssistReceiver, filter );
             Logger.i( TAG, "register voice receiver." );
@@ -612,6 +615,13 @@ public class MogoServiceProvider implements IMogoModuleProvider,
         } else if ( MogoReceiver.ACTION_NWD_ACC.equals( command ) ) {
             int state = intent.getByteExtra( MogoReceiver.PARAM_ACC_STATUS, ( byte ) 0 );
             mStatusManager.setAccStatus( getModuleName(), state == 1 );
+        } else if ( MogoReceiver.ACTION_VOICE_UI.equals( command ) ) {
+            String val = intent.getStringExtra( MogoReceiver.PARRAM_WAKE_STATUS );
+            if ( TextUtils.equals( val, MogoReceiver.VALUE_DISMISS ) ) {
+                mStatusManager.setVoiceUIShow( TAG, false );
+            } else if ( TextUtils.equals( val, MogoReceiver.VALUE_SHOW ) ) {
+                mStatusManager.setVoiceUIShow( TAG, true );
+            }
         }
     }
 

modules/mogo-module-service/src/main/java/com/mogo/module/service/receiver/MogoReceiver.java

@@ -40,6 +40,12 @@ public class MogoReceiver extends BroadcastReceiver {
     // 诺威达 acc 状态
     public static final String PARAM_ACC_STATUS = "extra_mcu_state";
 
+    // 小智语音唤醒UI
+    public static final String ACTION_VOICE_UI = "com.zhidao.xiaozhi.wake.status";
+    public static final String PARRAM_WAKE_STATUS = "WAKE_STATUS";
+    public static final String VALUE_DISMISS = "dismiss";
+    public static final String VALUE_SHOW = "show";
+
     private IMogoIntentManager mMogoIntentManager;
 
     public MogoReceiver( Context context ) {