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

app/build.gradle

@@ -81,6 +81,7 @@ dependencies {
         api rootProject.ext.dependencies.mogocommons
         implementation rootProject.ext.dependencies.modulecommon
         implementation rootProject.ext.dependencies.moduletanlu
+        implementation rootProject.ext.dependencies.modulesearch
     } else {
         implementation project(':modules:mogo-module-main')
         implementation project(':foudations:mogo-commons')

app/src/main/res/values/colors.xml

@@ -3,4 +3,7 @@
     <color name="colorPrimary">#008577</color>
     <color name="colorPrimaryDark">#00574B</color>
     <color name="colorAccent">#D81B60</color>
+
+
+    <color name="app_window_background">#1C1C1C</color>
 </resources>

app/src/main/res/values/styles.xml

@@ -14,7 +14,7 @@
         <item name="android:windowEnterAnimation">@null</item>
         <item name="android:windowExitAnimation">@null</item>
         <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowBackground">@color/app_window_background</item>
         <item name="android:windowTranslucentNavigation">false</item>
         <item name="android:windowAnimationStyle">@style/Animation</item>
     </style>

config.gradle

@@ -101,6 +101,7 @@ ext {
             // 在线车辆
             moduleonlinecar          : "com.mogo.module:module-onlinecar:${MOGO_MODULE_ONLINECAR_VERSION}",
             modulemedia              : "com.mogo.module:module-media:${MOGO_MODULE_MEDIA_VERSION}",
+            modulesearch              : "com.mogo.module:module-search:${MOGO_MODULE_SEARCH_VERSION}",
 
             // 长链
             socketsdk                : 'com.zhidao.socketsdk:socketsdk:2.1.0',

foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java

@@ -20,13 +20,17 @@ import com.zhidao.account.sdk.AccountClientManager;
 import com.zhidao.account.sdk.callback.TicketInfoCallback;
 import com.zhidao.account.sdk.network.NetEnvironManager;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.security.SecureRandom;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 
+import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
 
 /**
  * @author congtaowang
@@ -86,6 +90,17 @@ public class AbsMogoApplication extends Application {
         NetConfig.instance().setSignaturePrefix( Constants.SIGN_PREFIX )
                 .setPublicParams( ParamsUtil.getStaticParams() )
                 .setHostnameVerifier( new AllAllowedHostnameVerifier() )
+                .addNetworkInterceptor( new Interceptor() {
+                    @Override
+                    public Response intercept( Chain chain ) throws IOException {
+                        Request original = chain.request();
+                        Request request = original.newBuilder()
+                                .header( "token", SpStorage.getTicket() )
+                                .method( original.method(), original.body() )
+                                .build();
+                        return chain.proceed( request );
+                    }
+                } )
                 .setLoggable( DebugConfig.isDebug() );
     }
 
@@ -103,11 +118,12 @@ public class AbsMogoApplication extends Application {
     }
 
     private static void initAccountSdk() {
-        AccountClientManager.init( sApp, NetEnvironManager.QA, NetEnvironManager.OS_2C, "os2.0-launcher" );
+        AccountClientManager.init( sApp, DebugConfig.getNetMode(), NetEnvironManager.OS_2C, "os2.0-launcher" );
         AccountClientManager.getTicket( new TicketInfoCallback() {
             @Override
             public void onSuccess( String ticket ) {
                 SpStorage.setTicket( ticket );
+                Logger.w( TAG, "request ticket success" );
             }
 
             @Override

foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java

@@ -33,6 +33,13 @@ public class AIAssist implements VoiceClient.VoiceCmdCallBack {
     }
 
     public synchronized void release() {
+        if ( mCmdMap != null && !mCmdMap.isEmpty() && mVoiceClient != null ) {
+            for ( String cmd : mCmdMap.keySet() ) {
+                mVoiceClient.unRegisterCustomWakeupCmd( cmd );
+            }
+        }
+        mVoiceMap.clear();
+        mVoiceClient.release();
         sInstance = null;
     }
 
@@ -204,7 +211,7 @@ public class AIAssist implements VoiceClient.VoiceCmdCallBack {
         callBacks.remove( callBack );
     }
 
-    public static void startAssistant(Context context) {
+    public static void startAssistant( Context context ) {
         final Intent intent = new Intent();
         intent.setFlags( Intent.FLAG_INCLUDE_STOPPED_PACKAGES );
         intent.setAction( "pvetec.intent.action.txz.switch" );

gradle.properties

@@ -50,5 +50,6 @@ CARCHATTINGPROVIDER_VERSION=1.0.0-SNAPSHOT
 MOGO_MODULE_ONLINECAR_VERSION=1.0.0-SNAPSHOT
 MOGO_MODULE_MEDIA_VERSION=1.0.0-SNAPSHOT
 MOGO_MODULE_PUSH_VERSION=1.0.0-SNAPSHOT
+MOGO_MODULE_SEARCH_VERSION=1.0.0-SNAPSHOT
 
 

libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java

@@ -95,10 +95,6 @@ public class AMapNaviViewWrapper implements IMogoMapView,
                 options.setTrafficLayerEnabled( false );
                 // 设置导航界面是否显示路线全览按钮。
                 options.setRouteListButtonShow( false );
-                // 设置起点位图，须在画路前设置
-//                options.setStartPointBitmap( BitmapFactory.decodeResource( getContext().getResources(), R.drawable.ic_current_location_cursor ) );
-                // 设置终点位图，须在画路前设置
-//                options.setEndPointBitmap( BitmapFactory.decodeResource( getContext().getResources(), R.drawable.ic_search_choice_point ) );
                 // 设置导航状态下屏幕是否一直开启。
                 options.setScreenAlwaysBright( true );
                 // 设置交通播报是否打开（只适用于驾车导航，需要联网）。

modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps.xml

@@ -49,7 +49,7 @@
             android:layout_marginBottom="@dimen/module_apps_indicator_marginBottom"
             app:lineWidth="@dimen/module_apps_indicator_width"
             app:selectedColor="#ffffffff"
-            app:strokeWidth="@dimen/module_apps_indicator_heigt"
+            app:strokeWidth="@dimen/module_apps_indicator_height"
             app:unselectedColor="#33ffffff" />
 
         <ProgressBar

modules/mogo-module-apps/src/main/res/values-ldpi/dimens.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="module_apps_pager_marginTop">117px</dimen>
-    <dimen name="module_apps_indicator_heigt">2.7px</dimen>
+    <dimen name="module_apps_indicator_height">2.7px</dimen>
     <dimen name="module_apps_indicator_width">16px</dimen>
     <dimen name="module_apps_indicator_marginBottom">54.9px</dimen>
     <dimen name="module_apps_navigation_icon_width">64px</dimen>