diff --git a/app/build.gradle b/app/build.gradle index 65532a4c2f..eb85ed4ff1 100644 --- a/app/build.gradle +++ b/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') diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 69b22338c6..bd09796588 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -3,4 +3,7 @@ #008577 #00574B #D81B60 + + + #1C1C1C diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 9c9e1a512e..2eead786b7 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -14,7 +14,7 @@ @null @null @null - @android:color/transparent + @color/app_window_background false @style/Animation diff --git a/config.gradle b/config.gradle index c7760b645a..d18358877d 100644 --- a/config.gradle +++ b/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', diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java index a5f406a8ac..9ffd4fe117 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java +++ b/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 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 8fcf202aa0..c9c93cc5b9 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 @@ -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" ); diff --git a/gradle.properties b/gradle.properties index 0fc019f84b..352d189739 100644 --- a/gradle.properties +++ b/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 diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java index f80491fafd..a94702a4fa 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java +++ b/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 ); // 设置交通播报是否打开（只适用于驾车导航，需要联网）。 diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_1.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_1.png new file mode 100755 index 0000000000..0fa0edb0a4 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_1.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_10.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_10.png new file mode 100755 index 0000000000..797b106127 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_10.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_11.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_11.png new file mode 100755 index 0000000000..e54bbd6292 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_11.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_12.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_12.png new file mode 100755 index 0000000000..f93a673421 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_12.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_13.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_13.png new file mode 100755 index 0000000000..bf8d9bc3db Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_13.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_14.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_14.png new file mode 100755 index 0000000000..e7288ac5c2 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_14.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_15.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_15.png new file mode 100755 index 0000000000..9c0c2af8f4 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_15.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_16.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_16.png new file mode 100755 index 0000000000..30cffd20e5 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_16.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_17.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_17.png new file mode 100755 index 0000000000..81ebaa35cd Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_17.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_18.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_18.png new file mode 100755 index 0000000000..8370408b15 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_18.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_19.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_19.png new file mode 100755 index 0000000000..da5648fb9c Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_19.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_2.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_2.png new file mode 100755 index 0000000000..851d6d878e Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_2.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_20.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_20.png new file mode 100755 index 0000000000..79ffe11b10 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_20.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_21.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_21.png new file mode 100755 index 0000000000..9f80ca5181 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_21.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_22.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_22.png new file mode 100755 index 0000000000..403c5ea7e8 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_22.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_23.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_23.png new file mode 100755 index 0000000000..6e1b9f33b8 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_23.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_24.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_24.png new file mode 100755 index 0000000000..060b5e94f0 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_24.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_25.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_25.png new file mode 100755 index 0000000000..7a027897ce Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_25.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_26.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_26.png new file mode 100755 index 0000000000..6806d3457e Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_26.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_27.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_27.png new file mode 100755 index 0000000000..dd1717bd6b Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_27.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_28.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_28.png new file mode 100755 index 0000000000..239b379f3b Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_28.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_4.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_4.png new file mode 100755 index 0000000000..5cf551b141 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_4.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_5.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_5.png new file mode 100755 index 0000000000..70ac563aa4 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_5.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_50.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_50.png new file mode 100755 index 0000000000..4780ef7427 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_50.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_51.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_51.png new file mode 100755 index 0000000000..f6501640a1 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_51.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_52.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_52.png new file mode 100755 index 0000000000..7c8a880609 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_52.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_53.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_53.png new file mode 100755 index 0000000000..4cb5e21820 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_53.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_54.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_54.png new file mode 100755 index 0000000000..37289bbaaf Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_54.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_55.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_55.png new file mode 100755 index 0000000000..e8263cdc1b Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_55.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_56.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_56.png new file mode 100755 index 0000000000..48b91385ad Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_56.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_57.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_57.png new file mode 100755 index 0000000000..080eaece28 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_57.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_58.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_58.png new file mode 100755 index 0000000000..7f7034ff9f Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_58.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_59.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_59.png new file mode 100755 index 0000000000..735392d59d Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_59.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_6.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_6.png new file mode 100755 index 0000000000..ff9757c869 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_6.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_60.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_60.png new file mode 100755 index 0000000000..98c94b3826 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_60.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_61.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_61.png new file mode 100755 index 0000000000..a924085ef8 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_61.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_62.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_62.png new file mode 100755 index 0000000000..c20542f34f Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_62.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_63.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_63.png new file mode 100755 index 0000000000..d408fe0153 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_63.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_64.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_64.png new file mode 100755 index 0000000000..5a9af68c32 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_64.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_65.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_65.png new file mode 100755 index 0000000000..57a7454b4f Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_65.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_66.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_66.png new file mode 100755 index 0000000000..c471bf466a Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_66.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_67.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_67.png new file mode 100755 index 0000000000..22e6178738 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_67.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_68.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_68.png new file mode 100755 index 0000000000..a782cffbd9 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_68.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_69.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_69.png new file mode 100755 index 0000000000..a1545ef55f Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_69.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_7.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_7.png new file mode 100755 index 0000000000..b4a6465ce0 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_7.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_8.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_8.png new file mode 100755 index 0000000000..d19f036aa9 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_8.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_9.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_9.png new file mode 100755 index 0000000000..a2b07ad3d7 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_9.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_10.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_10.png new file mode 100755 index 0000000000..629e98359d Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_10.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_11.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_11.png new file mode 100755 index 0000000000..c0d6528e63 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_11.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_12.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_12.png new file mode 100755 index 0000000000..c14ec9a985 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_12.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_13.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_13.png new file mode 100755 index 0000000000..71bc66ca60 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_13.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_14.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_14.png new file mode 100755 index 0000000000..15e798dcce Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_14.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_15.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_15.png new file mode 100755 index 0000000000..a69e9437f3 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_15.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_16.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_16.png new file mode 100755 index 0000000000..ff948797b4 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_16.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_17.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_17.png new file mode 100755 index 0000000000..8fc3e5d0df Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_17.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_20.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_20.png new file mode 100755 index 0000000000..b6cf203416 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_20.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_21.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_21.png new file mode 100755 index 0000000000..0c55bebb7a Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_21.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_22.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_22.png new file mode 100755 index 0000000000..73f6c6c7ca Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_22.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_23.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_23.png new file mode 100755 index 0000000000..fb4a106126 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_23.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_24.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_24.png new file mode 100755 index 0000000000..a40251e6af Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_24.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_25.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_25.png new file mode 100755 index 0000000000..dba53847bb Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_25.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_26.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_26.png new file mode 100755 index 0000000000..c2ad298a10 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_26.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_27.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_27.png new file mode 100755 index 0000000000..266e5a9a6b Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_27.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_28.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_28.png new file mode 100755 index 0000000000..15259c17eb Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_28.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_30.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_30.png new file mode 100755 index 0000000000..bc76d71ab9 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_30.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_31.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_31.png new file mode 100755 index 0000000000..5e8e8d31fb Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_31.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_32.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_32.png new file mode 100755 index 0000000000..52e2e6a540 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_32.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_33.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_33.png new file mode 100755 index 0000000000..357de360f4 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_33.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_34.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_34.png new file mode 100755 index 0000000000..ef5a9d75b2 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_34.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_35.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_35.png new file mode 100755 index 0000000000..9c0d6b2058 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_35.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_36.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_36.png new file mode 100755 index 0000000000..f99d780e06 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_36.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_37.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_37.png new file mode 100755 index 0000000000..17fff66f7b Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_37.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_38.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_38.png new file mode 100755 index 0000000000..d4464587af Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_38.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_39.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_39.png new file mode 100755 index 0000000000..a7db692ecc Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_39.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_40.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_40.png new file mode 100755 index 0000000000..5cd1176c4d Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_40.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_41.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_41.png new file mode 100755 index 0000000000..89c97b5dc8 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_41.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_42.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_42.png new file mode 100755 index 0000000000..d76fa3a7c6 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_42.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_43.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_43.png new file mode 100755 index 0000000000..15ca9088f1 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_43.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_44.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_44.png new file mode 100755 index 0000000000..fe01e04472 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_44.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_68.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_68.png new file mode 100755 index 0000000000..0d57b42290 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_68.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_84.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_84.png new file mode 100755 index 0000000000..99bdea2e1e Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_84.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_85.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_85.png new file mode 100755 index 0000000000..e85921c9c3 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_85.png differ diff --git a/libraries/mogo-map-api/src/main/res/drawable-ldpi/ic_navi_start.png b/libraries/mogo-map-api/src/main/res/drawable-ldpi/ic_navi_start.png new file mode 100755 index 0000000000..b2efbe3bf6 Binary files /dev/null and b/libraries/mogo-map-api/src/main/res/drawable-ldpi/ic_navi_start.png differ diff --git a/libraries/mogo-map-api/src/main/res/drawable-ldpi/ic_navi_target.png b/libraries/mogo-map-api/src/main/res/drawable-ldpi/ic_navi_target.png new file mode 100755 index 0000000000..7ee0a97750 Binary files /dev/null and b/libraries/mogo-map-api/src/main/res/drawable-ldpi/ic_navi_target.png differ diff --git a/libraries/mogo-map-api/src/main/res/drawable-ldpi/map_api_ic_current_location.png b/libraries/mogo-map-api/src/main/res/drawable-ldpi/map_api_ic_current_location.png new file mode 100755 index 0000000000..70be2a654c Binary files /dev/null and b/libraries/mogo-map-api/src/main/res/drawable-ldpi/map_api_ic_current_location.png differ diff --git a/libraries/mogo-map-api/src/main/res/drawable-xhdpi/ic_back.png b/libraries/mogo-map-api/src/main/res/drawable-xhdpi/ic_back.png deleted file mode 100755 index c77c7bc701..0000000000 Binary files a/libraries/mogo-map-api/src/main/res/drawable-xhdpi/ic_back.png and /dev/null differ diff --git a/libraries/mogo-map-api/src/main/res/drawable-xhdpi/ic_back_dark.png b/libraries/mogo-map-api/src/main/res/drawable-xhdpi/ic_back_dark.png deleted file mode 100755 index f2e0599f2a..0000000000 Binary files a/libraries/mogo-map-api/src/main/res/drawable-xhdpi/ic_back_dark.png and /dev/null differ diff --git a/libraries/mogo-map-api/src/main/res/drawable-xhdpi/ic_current_location_cursor.png b/libraries/mogo-map-api/src/main/res/drawable-xhdpi/ic_current_location_cursor.png deleted file mode 100755 index cebdc6a37a..0000000000 Binary files a/libraries/mogo-map-api/src/main/res/drawable-xhdpi/ic_current_location_cursor.png and /dev/null differ diff --git a/libraries/mogo-map-api/src/main/res/drawable-xhdpi/ic_search_choice_point.png b/libraries/mogo-map-api/src/main/res/drawable-xhdpi/ic_search_choice_point.png deleted file mode 100755 index 9f75ac8e88..0000000000 Binary files a/libraries/mogo-map-api/src/main/res/drawable-xhdpi/ic_search_choice_point.png and /dev/null differ diff --git a/libraries/mogo-map-api/src/main/res/drawable-xhdpi/ic_search_poi_location.png b/libraries/mogo-map-api/src/main/res/drawable-xhdpi/ic_search_poi_location.png deleted file mode 100755 index 484f80efd5..0000000000 Binary files a/libraries/mogo-map-api/src/main/res/drawable-xhdpi/ic_search_poi_location.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps.xml b/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps.xml index 20a38ba132..6370c5abda 100644 --- a/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps.xml +++ b/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" /> 117px - 2.7px + 2.7px 16px 54.9px 64px diff --git a/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml index da464ff5de..0a30fed7cc 100644 --- a/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml @@ -1,12 +1,12 @@ 260px - 5px + 5px 30px 103px 120px 120px - 61px + 60px 60px 32px 32px diff --git a/modules/mogo-module-apps/src/main/res/values/dimens.xml b/modules/mogo-module-apps/src/main/res/values/dimens.xml index da464ff5de..0a30fed7cc 100644 --- a/modules/mogo-module-apps/src/main/res/values/dimens.xml +++ b/modules/mogo-module-apps/src/main/res/values/dimens.xml @@ -1,12 +1,12 @@ 260px - 5px + 5px 30px 103px 120px 120px - 61px + 60px 60px 32px 32px diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/ModuleType.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/ModuleType.java index 9d8995fa9c..5d39c13bfb 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/ModuleType.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/ModuleType.java @@ -27,30 +27,36 @@ public interface ModuleType { /** * APP 列表模块 */ + @Deprecated int TYPE_APP_LIST = 4; /** * 小智语音形象 */ + @Deprecated int TYPE_VOICE = 5; /** * 地图模块 */ + @Deprecated int TYPE_MAP = 6; /** * 导航模块 */ + @Deprecated int TYPE_NAVI = 7; /** * 小智、天气、时间等 */ + @Deprecated int TYPE_EXTENSION = 8; /** * 操作快捷入口 */ + @Deprecated int TYPE_ENTRANCE = 9; } diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/anim/JSurfaceView.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/anim/JSurfaceView.java index 46c005b357..4fb5fb5a95 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/anim/JSurfaceView.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/anim/JSurfaceView.java @@ -3,7 +3,6 @@ package com.mogo.module.extensions.anim; import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; -import android.graphics.BlendMode; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index e9bbd2e69f..404bdcf42b 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -13,6 +13,7 @@ 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; @@ -53,6 +54,8 @@ import java.util.HashMap; */ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresenter > implements EntranceView, IMogoNaviListener, IMogoMapListener { + + private static final String TAG = "EntranceFragment"; private View mSearch; diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/weather/Phenomena.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/weather/Phenomena.java index 8b2f0fca5f..e8b8227a46 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/weather/Phenomena.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/weather/Phenomena.java @@ -11,59 +11,59 @@ import java.util.Map; * @author Lzq */ public enum Phenomena { - Sunny( "00", "晴", "Sunny", R.drawable.ic_sunny ), - Cloudy( "01", "多云", "Cloudy", R.drawable.ic_cloudy ), - Overcast( "02", "阴", "Overcast", R.drawable.ic_overcast ), + Sunny( "00", "晴", "Sunny", R.drawable.module_ext_ic_sunny ), + Cloudy( "01", "多云", "Cloudy", R.drawable.module_ext_ic_cloudy ), + Overcast( "02", "阴", "Overcast", R.drawable.module_ext_ic_overcast ), - Shower( "03", "阵雨", "Shower", R.drawable.ic_shower ), - Thundershower( "04", "雷阵雨", "Thundershower", R.drawable.ic_thundershower ), - ThundershowerWithHail( "05", "雷阵雨伴有冰雹", "Thundershower with hail", R.drawable.ic_thundershower ), - Sleet( "06", "雨夹雪", "Sleet", R.drawable.ic_snow ), - LightRain( "07", "小雨", "Light rain", R.drawable.ic_light_rain ), - ModerateRain( "08", "中雨", "Moderate rain", R.drawable.ic_light_rain ), - HeavyRain( "09", "大雨", "Heavy rain", R.drawable.ic_heavy_rain ), - Storm( "10", "暴雨", "Storm", R.drawable.ic_heavy_rain ), - HeavyStorm( "11", "大暴雨", "Heavy storm", R.drawable.ic_heavy_rain ), - SevereStorm( "12", "特大暴雨", "Severe storm", R.drawable.ic_severe_storm ), + Shower( "03", "阵雨", "Shower", R.drawable.module_ext_ic_shower ), + Thundershower( "04", "雷阵雨", "Thundershower", R.drawable.module_ext_ic_thundershower ), + ThundershowerWithHail( "05", "雷阵雨伴有冰雹", "Thundershower with hail", R.drawable.module_ext_ic_thundershower ), + Sleet( "06", "雨夹雪", "Sleet", R.drawable.module_ext_ic_snow ), + LightRain( "07", "小雨", "Light rain", R.drawable.module_ext_ic_light_rain ), + ModerateRain( "08", "中雨", "Moderate rain", R.drawable.module_ext_ic_light_rain ), + HeavyRain( "09", "大雨", "Heavy rain", R.drawable.module_ext_ic_heavy_rain ), + Storm( "10", "暴雨", "Storm", R.drawable.module_ext_ic_heavy_rain ), + HeavyStorm( "11", "大暴雨", "Heavy storm", R.drawable.module_ext_ic_heavy_rain ), + SevereStorm( "12", "特大暴雨", "Severe storm", R.drawable.module_ext_ic_severe_storm ), - SnowFlurry( "13", "阵雪", "Snow flurry", R.drawable.ic_snow ), - LightSnow( "14", "小雪", "Light snow", R.drawable.ic_snow ), - ModerateSnow( "15", "中雪", "Moderate snow", R.drawable.ic_snow ), - HeavySnow( "16", "大雪", "Heavy snow", R.drawable.ic_snow ), - Snowstorm( "17", "暴雪", "Snowstorm", R.drawable.ic_snow ), + SnowFlurry( "13", "阵雪", "Snow flurry", R.drawable.module_ext_ic_snow ), + LightSnow( "14", "小雪", "Light snow", R.drawable.module_ext_ic_snow ), + ModerateSnow( "15", "中雪", "Moderate snow", R.drawable.module_ext_ic_snow ), + HeavySnow( "16", "大雪", "Heavy snow", R.drawable.module_ext_ic_snow ), + Snowstorm( "17", "暴雪", "Snowstorm", R.drawable.module_ext_ic_snow ), - Foggy( "18", "雾", "Foggy", R.drawable.ic_fog ), - IceRain( "19", "冻雨", "Ice rain", R.drawable.ic_heavy_rain ), - Duststorm( "20", "沙尘暴", "Duststorm", R.drawable.ic_duststorm ), + Foggy( "18", "雾", "Foggy", R.drawable.module_ext_ic_fog ), + IceRain( "19", "冻雨", "Ice rain", R.drawable.module_ext_ic_heavy_rain ), + Duststorm( "20", "沙尘暴", "Duststorm", R.drawable.module_ext_ic_duststorm ), - LightToModerateRain( "21", "小到中雨", "Light to moderate rain", R.drawable.ic_moderate_rain ), - ModerateToHeavyRain( "22", "中到大雨", "Moderate to heavy rain", R.drawable.ic_heavy_rain ), - HeavyRainToStorm( "23", "大到大雨", "Heavy rain to storm", R.drawable.ic_heavy_rain ), - StormToHeavyStorm( "24", "暴雨到大暴雨", "Storm to heavy storm", R.drawable.ic_severe_storm ), - HeavyToSevereStorm( "25", "大暴雨到特大暴雨", "Heavy to severe storm", R.drawable.ic_severe_storm ), + LightToModerateRain( "21", "小到中雨", "Light to moderate rain", R.drawable.module_ext_ic_moderate_rain ), + ModerateToHeavyRain( "22", "中到大雨", "Moderate to heavy rain", R.drawable.module_ext_ic_heavy_rain ), + HeavyRainToStorm( "23", "大到大雨", "Heavy rain to storm", R.drawable.module_ext_ic_heavy_rain ), + StormToHeavyStorm( "24", "暴雨到大暴雨", "Storm to heavy storm", R.drawable.module_ext_ic_severe_storm ), + HeavyToSevereStorm( "25", "大暴雨到特大暴雨", "Heavy to severe storm", R.drawable.module_ext_ic_severe_storm ), - LightToModerateSnow( "26", "小到中雪", "Light to moderate snow", R.drawable.ic_snow ), - ModerateToHeavySnow( "27", "中到大雪", "Moderate to heavy snow", R.drawable.ic_snow ), - HeavySnowToSnowStorm( "28", "大到暴雪", "Heavy snow to snowstorm", R.drawable.ic_snow ), + LightToModerateSnow( "26", "小到中雪", "Light to moderate snow", R.drawable.module_ext_ic_snow ), + ModerateToHeavySnow( "27", "中到大雪", "Moderate to heavy snow", R.drawable.module_ext_ic_snow ), + HeavySnowToSnowStorm( "28", "大到暴雪", "Heavy snow to snowstorm", R.drawable.module_ext_ic_snow ), - Dust( "29", "浮尘", "Dust", R.drawable.ic_dust_sand ), - Sand( "30", "扬沙", "Sand", R.drawable.ic_dust_sand ), - SandStorm( "31", "强沙尘暴", "Sandstorm", R.drawable.ic_duststorm ), + Dust( "29", "浮尘", "Dust", R.drawable.module_ext_ic_dust_sand ), + Sand( "30", "扬沙", "Sand", R.drawable.module_ext_ic_dust_sand ), + SandStorm( "31", "强沙尘暴", "Sandstorm", R.drawable.module_ext_ic_duststorm ), - Densefog( "32", "浓雾", "Dense fog", R.drawable.ic_fog ), - StrongFog( "49", "强浓雾", "Strong fog", R.drawable.ic_fog ), - DenseFog( "57", "大雾", "Dense fog", R.drawable.ic_fog ), - ExtraHeavyFog( "58", "特强浓雾", "Extra heavy fog", R.drawable.ic_fog ), + Densefog( "32", "浓雾", "Dense fog", R.drawable.module_ext_ic_fog ), + StrongFog( "49", "强浓雾", "Strong fog", R.drawable.module_ext_ic_fog ), + DenseFog( "57", "大雾", "Dense fog", R.drawable.module_ext_ic_fog ), + ExtraHeavyFog( "58", "特强浓雾", "Extra heavy fog", R.drawable.module_ext_ic_fog ), - Haze( "53", "霾", "Haze", R.drawable.ic_haze ), - ModerateHaze( "54", "中度霾", "Moderate haze", R.drawable.ic_haze ), - Severehaze( "55", "重度霾", "Severe haze", R.drawable.ic_haze ), - SevereHaze( "56", "严重霾", "Severe haze", R.drawable.ic_haze ), + Haze( "53", "霾", "Haze", R.drawable.module_ext_ic_haze ), + ModerateHaze( "54", "中度霾", "Moderate haze", R.drawable.module_ext_ic_haze ), + Severehaze( "55", "重度霾", "Severe haze", R.drawable.module_ext_ic_haze ), + SevereHaze( "56", "严重霾", "Severe haze", R.drawable.module_ext_ic_haze ), - Unknown( "99", "无", "Unknown", R.drawable.ic_unknown ), + Unknown( "99", "无", "Unknown", R.drawable.module_ext_ic_unknown ), - Rain( "301", "雨", "rain", R.drawable.ic_heavy_rain ), - Snow( "302", "雪", "snow", R.drawable.ic_snow ); + Rain( "301", "雨", "rain", R.drawable.module_ext_ic_heavy_rain ), + Snow( "302", "雪", "snow", R.drawable.module_ext_ic_snow ); public final String id; public final String nameCn; diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_cloudy.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_cloudy.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_cloudy.png rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_cloudy.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_dust_sand.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_dust_sand.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_dust_sand.png rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_dust_sand.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_duststorm.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_duststorm.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_duststorm.png rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_duststorm.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_fog.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_fog.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_fog.png rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_fog.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_haze.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_haze.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_haze.png rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_haze.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_heavy_rain.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_heavy_rain.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_heavy_rain.png rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_heavy_rain.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_light_rain.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_light_rain.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_light_rain.png rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_light_rain.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_message.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_message.png old mode 100644 new mode 100755 index ec0f007df5..09af5d28bd Binary files a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_message.png and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_message.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_moderate_rain.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_moderate_rain.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_moderate_rain.png rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_moderate_rain.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_overcast.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_overcast.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_overcast.png rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_overcast.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_severe_storm.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_severe_storm.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_severe_storm.png rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_severe_storm.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_shower.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_shower.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_shower.png rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_shower.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_snow.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_snow.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_snow.png rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_snow.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_sunny.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_sunny.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_sunny.png rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_sunny.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_thunder.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_thunder.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_thunder.png rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_thunder.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_thundershower.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_thundershower.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_thundershower.png rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_thundershower.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_unknown.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_unknown.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_unknown.png rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_unknown.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_cloudy.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_cloudy.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_cloudy.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_cloudy.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_dust_sand.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_dust_sand.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_dust_sand.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_dust_sand.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_duststorm.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_duststorm.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_duststorm.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_duststorm.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_fog.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_fog.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_fog.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_fog.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_haze.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_haze.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_haze.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_haze.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_heavy_rain.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_heavy_rain.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_heavy_rain.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_heavy_rain.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_light_rain.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_light_rain.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_light_rain.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_light_rain.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_moderate_rain.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_moderate_rain.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_moderate_rain.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_moderate_rain.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_overcast.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_overcast.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_overcast.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_overcast.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_severe_storm.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_severe_storm.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_severe_storm.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_severe_storm.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_shower.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_shower.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_shower.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_shower.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_snow.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_snow.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_snow.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_snow.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_sunny.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_sunny.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_sunny.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_sunny.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_thunder.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_thunder.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_thunder.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_thunder.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_thundershower.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_thundershower.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_thundershower.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_thundershower.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_unknown.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_unknown.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_unknown.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_unknown.png diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml index 7aafa02548..d4824c6446 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml @@ -4,7 +4,6 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="@dimen/module_ext_height" - android:background="@drawable/module_ext_dw_shadow_frame_bkg" android:orientation="vertical" android:paddingLeft="@dimen/module_ext_paddingLeft" android:paddingRight="@dimen/module_ext_paddingRight"> @@ -59,7 +58,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="@dimen/module_ext_weather_marginRight" - android:gravity="bottom" + android:gravity="center" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toLeftOf="@+id/module_ext_id_date" diff --git a/modules/mogo-module-extensions/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-ldpi/dimens.xml index 9f9c7a937f..3c219b149b 100644 --- a/modules/mogo-module-extensions/src/main/res/values-ldpi/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-ldpi/dimens.xml @@ -3,7 +3,7 @@ 58px 18px - 8px + 1px 11.2px 10.8px 17px @@ -11,7 +11,7 @@ 58px 19px - 8px + 1px 64.2px 58px 1px @@ -22,13 +22,13 @@ 96px 96px - 8px + 1px 32px 32px 15px 20px - 8px + 1px 58px 20px @@ -41,7 +41,7 @@ 58px 58px 21px - 14px + 20px 34.5px 20px @@ -53,7 +53,7 @@ 22px - 640px + 64px 32px 32px 64px diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index 769c5d535b..ed6729816a 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -10,6 +10,7 @@ import androidx.viewpager.widget.ViewPager; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.mvp.MvpActivity; +import com.mogo.commons.voice.AIAssist; import com.mogo.map.location.IMogoLocationClient; import com.mogo.map.location.IMogoLocationListener; import com.mogo.map.location.MogoLocation; @@ -18,7 +19,6 @@ import com.mogo.map.marker.IMogoMarkerClickListener; import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.module.common.MogoModule; import com.mogo.module.common.MogoModulePaths; -import com.mogo.module.extensions.ExtensionsModuleConst; import com.mogo.module.main.cards.CardModulesAdapter; import com.mogo.module.main.cards.MogoModulesHandler; import com.mogo.module.main.cards.MogoModulesManager; @@ -31,7 +31,6 @@ import com.mogo.service.MogoServicePaths; import com.mogo.service.analytics.IMogoAnalytics; import com.mogo.service.cardmanager.IMogoCardManager; import com.mogo.service.fragmentmanager.IMogoFragmentManager; -import com.mogo.service.impl.fragmentmanager.FragmentStack; import com.mogo.service.map.IMogoMapService; import com.mogo.service.module.IMogoModuleProvider; import com.mogo.utils.logger.Logger; @@ -66,7 +65,8 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme private View mApps; private View mEntrance; private FrameLayout mFloatingLayout; - private View mShadowFrame; + private View mLeftShadowFrame; + private View mTopShadowFrame; /** * 主模块管控定位，可以向各个模块发送统一定位信息 @@ -104,7 +104,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme mCurrentPosition = position; provider = mCardModulesAdapter.getProvider( mCurrentPosition ); - mMogoModuleHandler.setEnable( provider.getModuleName() ); + mMogoModuleHandler.setModuleEnable( provider.getModuleName() ); if ( !isClickMarker ) { mMogoCardManager.invoke( position, mMogoModuleHandler.getCurrentModuleName() ); } @@ -163,9 +163,9 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme mMogoFragmentManager.init( this, R.id.module_main_id_search_fragment ); mMogoFragmentManager.registerMainFragmentStackTransactionListener( ( size ) -> { if ( size == 0 ) { - show(); + showLayout(); } else if ( size == 1 ) { - hide(); + hideLayout(); } } ); mHeader = findViewById( R.id.module_main_id_header_fragment_container ); @@ -173,38 +173,37 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme mApps = findViewById( R.id.module_main_id_apps_fragment_container ); mEntrance = findViewById( R.id.module_main_id_entrance_fragment_container ); mFloatingLayout = findViewById( R.id.module_main_id_floating_view ); - mShadowFrame = findViewById( R.id.module_main_id_map_shadow_frame ); + mLeftShadowFrame = findViewById( R.id.module_main_id_map_left_shadow_frame ); + mTopShadowFrame = findViewById( R.id.module_main_id_map_top_shadow_frame ); WindowViewHandler.init( mFloatingLayout ); } - private void hide() { + // 隐藏布局 + private void hideLayout() { mHeader.setVisibility( View.GONE ); mCards.setVisibility( View.GONE ); mApps.setVisibility( View.GONE ); mEntrance.setVisibility( View.GONE ); mFloatingLayout.setVisibility( View.GONE ); - mShadowFrame.setVisibility( View.GONE ); + mLeftShadowFrame.setVisibility( View.GONE ); } - private void show() { + // 显示布局 + private void showLayout() { mHeader.setVisibility( View.VISIBLE ); mCards.setVisibility( View.VISIBLE ); mApps.setVisibility( View.VISIBLE ); mEntrance.setVisibility( View.VISIBLE ); mFloatingLayout.setVisibility( View.VISIBLE ); - mShadowFrame.setVisibility( View.VISIBLE ); + mLeftShadowFrame.setVisibility( View.VISIBLE ); } @Override protected void onCreate( @Nullable Bundle savedInstanceState ) { super.onCreate( savedInstanceState ); - MogoModulePaths.addModule( new MogoModule( MogoModulePaths.PATH_MODULE_APPS, MogoModulePaths.PATH_MODULE_APPS ) ); - MogoModulePaths.addModule( new MogoModule( MogoModulePaths.PATH_MODULE_MAP, MogoModulePaths.PATH_MODULE_MAP ) ); MogoModulePaths.addModule( new MogoModule( ServiceConst.PATH_REFRESH_STRATEGY, ServiceConst.PATH_REFRESH_STRATEGY ) ); - MogoModulePaths.addModule( new MogoModule( ExtensionsModuleConst.PATH_EXTENSION, ExtensionsModuleConst.TYPE ) ); - MogoModulePaths.addModule( new MogoModule( ExtensionsModuleConst.PATH_ENTRANCE, ExtensionsModuleConst.TYPE_ENTRANCE ) ); mMogoModuleHandler = new MogoModulesManager( this ); mMogoMapService = ( IMogoMapService ) ARouter.getInstance().build( MogoServicePaths.PATH_SERVICES_MAP ).navigation(); @@ -214,30 +213,43 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme mMogoMapService.getHostListenerRegister().registerMarkerClickListener( this ); } - mMogoMapUIController = mMogoMapService.getMapUIController(); - - mMogoModuleHandler.loadModules(); - mMogoModuleHandler.onMapLoadedCallback( () -> { + mMogoModuleHandler.setMapLoadedCallback( () -> { Logger.d( TAG, "map loaded." + Thread.currentThread().getName() ); - loadModules(); - mShadowFrame.setVisibility( View.VISIBLE ); - mMogoMapUIController.setPointToCenter( 0.66145, 0.590688 ); - } ); - // 加载地图，触发地图加载完毕回调，在初始化其他卡片模块，保证卡片模块可以正确获取地图相关服务。 - mMogoModuleHandler.loadMap( R.id.module_main_id_map_fragment_container ); - mMogoModuleHandler.loadAppsList( R.id.module_main_id_apps_fragment_container ); - mMogoModuleHandler.loadExtensions( R.id.module_main_id_header_fragment_container ); - mMogoModuleHandler.loadEntrances( R.id.module_main_id_entrance_fragment_container ); + // 加载地图，触发地图加载完毕回调，在初始化其他卡片模块，保证卡片模块可以正确获取地图相关服务。 + mMogoModuleHandler.loadModules(); + loadContainerModules(); + loadCardModules(); - mLocationClient = mMogoMapService.getSingletonLocationClient( getApplicationContext() ); - mLocationClient.addLocationListener( this ); - mLocationClient.start(); + // 显示左边遮罩 + mLeftShadowFrame.setVisibility( View.VISIBLE ); + mTopShadowFrame.setVisibility( View.VISIBLE ); + + // 右移地图中心点 + mMogoMapUIController = mMogoMapService.getMapUIController(); + mMogoMapUIController.setPointToCenter( 0.66145, 0.590688 ); + + // 开启定位 + startLocation(); + } ); + mMogoModuleHandler.loadMapModule( R.id.module_main_id_map_fragment_container ); mMogoCardManager = ( IMogoCardManager ) ARouter.getInstance().build( MogoServicePaths.PATH_CARD_MANAGER ).navigation( this ); mAnalytics = ( IMogoAnalytics ) ARouter.getInstance().build( MogoServicePaths.PATH_UTILS_ANALYTICS ).navigation( this ); } - private void loadModules() { + private void startLocation() { + mLocationClient = mMogoMapService.getSingletonLocationClient( getApplicationContext() ); + mLocationClient.addLocationListener( this ); + mLocationClient.start(); + } + + private void loadContainerModules() { + mMogoModuleHandler.loadAppsListModule( R.id.module_main_id_apps_fragment_container ); + mMogoModuleHandler.loadExtensionsModule( R.id.module_main_id_header_fragment_container ); + mMogoModuleHandler.loadEntrancesModule( R.id.module_main_id_entrance_fragment_container ); + } + + private void loadCardModules() { List< IMogoModuleProvider > providers = mMogoModuleHandler.loadCardsModule(); mCardModulesAdapter = new CardModulesAdapter( this, providers ); @@ -268,7 +280,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme isClickMarker = true; switch2( marker.getOwner() ); if ( mMogoModuleHandler != null ) { - mMogoModuleHandler.onMarkerReceive( marker ); + mMogoModuleHandler.onMarkerClicked( marker ); } isClickMarker = false; return false; @@ -291,10 +303,12 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme @Override public void onBackPressed() { - if ( FragmentStack.getInstance().isEmpty() ) { + if ( mMogoFragmentManager.getStackSize() == 0 ) { return; } - FragmentStack.getInstance().pop(); + if ( mMogoFragmentManager != null ) { + mMogoFragmentManager.pop(); + } } @Override @@ -305,10 +319,15 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme mLocationClient.destroy(); } mLocationClient = null; - mMogoMapService = null; if ( mMogoModuleHandler != null ) { mMogoModuleHandler.destroy(); - mMogoModuleHandler = null; } + mMogoModuleHandler = null; + mMogoMapService = null; + mMogoMapUIController = null; + mMogoCardManager = null; + mMogoFragmentManager = null; + + AIAssist.getInstance( this ).release(); } } diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java index 1ca561946f..ad09d2b998 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java @@ -21,10 +21,19 @@ import javax.security.auth.callback.Callback; */ public interface MogoModulesHandler extends IMogoMapListener, IMogoNaviListener, - IMogoLocationListener { + IMogoLocationListener, + IMogoMarkerClickListener { - void onMapLoadedCallback( Runnable callback ); + /** + * 地图加载完成回调 + * + * @param callback + */ + void setMapLoadedCallback( Runnable callback ); + /** + * 加载模块 + */ void loadModules(); /** @@ -39,49 +48,41 @@ public interface MogoModulesHandler extends IMogoMapListener, * * @param containerId 容器id */ - void loadMap( int containerId ); + void loadMapModule( int containerId ); /** * 加载所有应用 * * @param containerId 容器id */ - void loadAppsList( int containerId ); + void loadAppsListModule( int containerId ); /** * 加载头部信息 * * @param containerId */ - void loadExtensions( int containerId ); + void loadExtensionsModule( int containerId ); /** * 加载快捷操作 * * @param containerId */ - void loadEntrances( int containerId ); + void loadEntrancesModule( int containerId ); /** * 设置某一个module可用 * * @param module */ - void setEnable( String module ); + void setModuleEnable( String module ); /** * 销毁 */ void destroy(); - - /** - * 卡片接收到Marker传入数据 - * - * @param marker marker - */ - void onMarkerReceive( IMogoMarker marker ); - /** * 当前卡片名称 * diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java index 6cc2f7d8ee..56be72374f 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java @@ -5,6 +5,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.text.TextUtils; +import android.util.Log; import android.view.MotionEvent; import androidx.fragment.app.Fragment; @@ -23,6 +24,7 @@ import com.mogo.map.navi.MogoTraffic; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.module.common.MogoModule; import com.mogo.module.common.MogoModulePaths; +import com.mogo.module.extensions.ExtensionsModuleConst; import com.mogo.module.main.MainActivity; import com.mogo.module.main.registercenter.MogoRegisterCenterHandler; import com.mogo.service.module.IMogoModuleLifecycle; @@ -36,7 +38,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Set; /** * @author congtaowang @@ -90,7 +91,7 @@ public class MogoModulesManager implements MogoModulesHandler, } @Override - public void onMapLoadedCallback( Runnable callback ) { + public void setMapLoadedCallback( Runnable callback ) { mMapLoadedCallback = callback; } @@ -111,35 +112,27 @@ public class MogoModulesManager implements MogoModulesHandler, } @Override - public void loadMap( int containerId ) { - loadModuleByType( ModuleType.TYPE_MAP, containerId ); + public void loadMapModule( int containerId ) { + IMogoModuleProvider provider = ( IMogoModuleProvider ) ARouter.getInstance().build( MogoModulePaths.PATH_MODULE_MAP ).navigation( getContext() ); + addFragment( provider, containerId ); } @Override - public void loadAppsList( int containerId ) { - loadModuleByType( ModuleType.TYPE_APP_LIST, containerId ); + public void loadAppsListModule( int containerId ) { + IMogoModuleProvider provider = ( IMogoModuleProvider ) ARouter.getInstance().build( MogoModulePaths.PATH_MODULE_APPS ).navigation( getContext() ); + addFragment( provider, containerId ); } @Override - public void loadExtensions( int containerId ) { - loadModuleByType( ModuleType.TYPE_EXTENSION, containerId ); + public void loadExtensionsModule( int containerId ) { + IMogoModuleProvider provider = ( IMogoModuleProvider ) ARouter.getInstance().build( ExtensionsModuleConst.PATH_EXTENSION ).navigation( getContext() ); + addFragment( provider, containerId ); } @Override - public void loadEntrances( int containerId ) { - loadModuleByType( ModuleType.TYPE_ENTRANCE, containerId ); - } - - private void loadModuleByType( int type, int containerId ) { - if ( mModuleProviders.isEmpty() ) { - return; - } - for ( IMogoModuleProvider value : mModuleProviders.values() ) { - if ( value.getType() == type ) { - addFragment( value, containerId ); - return; - } - } + public void loadEntrancesModule( int containerId ) { + IMogoModuleProvider provider = ( IMogoModuleProvider ) ARouter.getInstance().build( ExtensionsModuleConst.PATH_ENTRANCE ).navigation( getContext() ); + addFragment( provider, containerId ); } private IMogoModuleProvider load( String path ) { @@ -162,8 +155,9 @@ public class MogoModulesManager implements MogoModulesHandler, } @Override - public void setEnable( String module ) { + public void setModuleEnable( String module ) { + // 仅操作上一个模块和当前模块 Iterator< IMogoModuleProvider > iterator = mModuleProviders.values().iterator(); int counter = 0; while ( iterator.hasNext() ) { @@ -178,7 +172,9 @@ public class MogoModulesManager implements MogoModulesHandler, final IMogoModuleLifecycle lifecycle = MogoRegisterCenterHandler.getInstance().getLifecycleListener( mEnableModuleName ); if ( lifecycle != null ) { try { + final long start = System.currentTimeMillis(); lifecycle.onDisable(); + Logger.i(TAG, "set %s module disable event cost " + (System.currentTimeMillis() - start) + "ms", mEnableModuleName); } catch ( Exception e ) { Logger.e( TAG, e, "error." ); } @@ -190,7 +186,9 @@ public class MogoModulesManager implements MogoModulesHandler, final IMogoModuleLifecycle lifecycle = MogoRegisterCenterHandler.getInstance().getLifecycleListener( module ); if ( lifecycle != null ) { try { + final long start = System.currentTimeMillis(); lifecycle.onPerform(); + Logger.i(TAG, "set %s module perform event cost " + (System.currentTimeMillis() - start) + "ms", module); } catch ( Exception e ) { Logger.e( TAG, e, "error." ); } @@ -212,20 +210,6 @@ public class MogoModulesManager implements MogoModulesHandler, mMapLoadedCallback.run(); mMapLoadedCallback = null; } - Iterator< IMogoMapListener > iterator = MogoRegisterCenterHandler.getInstance().getMapListeners(); - if ( iterator == null ) { - return; - } - while ( iterator.hasNext() ) { - IMogoMapListener listener = iterator.next(); - if ( listener != null ) { - try { - listener.onMapLoaded(); - } catch ( Exception e ) { - Logger.e( TAG, e, "error." ); - } - } - } } @Override @@ -426,7 +410,6 @@ public class MogoModulesManager implements MogoModulesHandler, } } - @Override public void onCalculateSuccess() { Iterator< IMogoNaviListener > iterator = MogoRegisterCenterHandler.getInstance().getNaviListeners(); @@ -473,7 +456,7 @@ public class MogoModulesManager implements MogoModulesHandler, IMogoNaviListener listener = iterator.next(); if ( listener != null ) { try { - listener.onUpdateTraffic(traffic); + listener.onUpdateTraffic( traffic ); } catch ( Exception e ) { Logger.e( TAG, e, "error." ); } @@ -541,15 +524,16 @@ public class MogoModulesManager implements MogoModulesHandler, } @Override - public void onMarkerReceive( IMogoMarker marker ) { + public boolean onMarkerClicked( IMogoMarker marker ) { IMogoMarkerClickListener listener = MogoRegisterCenterHandler.getInstance().getMarkerListener( marker.getOwner() ); if ( listener != null ) { try { - listener.onMarkerClicked( marker ); + return listener.onMarkerClicked( marker ); } catch ( Exception e ) { Logger.e( TAG, e, "error." ); } } + return false; } @Override diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/VerticalStackTransformer.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/VerticalStackTransformer.java index 425bdc4af9..97ec68e2b7 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/VerticalStackTransformer.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/VerticalStackTransformer.java @@ -4,16 +4,19 @@ import android.content.Context; import android.util.Log; import android.view.View; +import com.mogo.module.main.R; import com.mogo.utils.WindowUtils; public class VerticalStackTransformer extends VerticalBaseTransformer { private Context context; - private int spaceBetweenFirAndSecWith = 5 * 2;//第一张卡片和第二张卡片宽度差 dp单位 - private int spaceBetweenFirAndSecHeight = 5;//第一张卡片和第二张卡片高度差 dp单位 + private int spaceBetweenFirAndSecWith;//第一张卡片和第二张卡片宽度差 + private int spaceBetweenFirAndSecHeight;//第一张卡片和第二张卡片高度差 public VerticalStackTransformer( Context context ) { this.context = context; + spaceBetweenFirAndSecHeight = context.getResources().getDimensionPixelSize( R.dimen.module_main_card_card_shadow_height_div ); + spaceBetweenFirAndSecWith = context.getResources().getDimensionPixelSize( R.dimen.module_main_card_card_shadow_width_div ); } public VerticalStackTransformer( Context context, int spaceBetweenFirAndSecWith, int spaceBetweenFirAndSecHeight ) { @@ -30,7 +33,7 @@ public class VerticalStackTransformer extends VerticalBaseTransformer { //控制停止滑动切换的时候，只有最上面的一张卡片可以点击 page.setClickable( true ); } else { - float scale = ( float ) ( page.getWidth() - WindowUtils.dip2px( context, spaceBetweenFirAndSecWith * position ) ) / ( float ) ( page.getWidth() ); + float scale = ( float ) ( page.getWidth() - spaceBetweenFirAndSecWith * position ) / ( float ) ( page.getWidth() ); //控制下面卡片的可见度 page.setAlpha( 1.0f ); //控制停止滑动切换的时候，只有最上面的一张卡片可以点击 @@ -39,7 +42,7 @@ public class VerticalStackTransformer extends VerticalBaseTransformer { page.setPivotY( page.getHeight() / 2f ); page.setScaleX( scale ); page.setScaleY( scale ); - page.setTranslationY( -page.getHeight() * position + ( page.getHeight() * 0.5f ) * ( 1 - scale ) + WindowUtils.dip2px( context, spaceBetweenFirAndSecHeight ) * position ); + page.setTranslationY( -page.getHeight() * position + ( page.getHeight() * 0.5f ) * ( 1 - scale ) + spaceBetweenFirAndSecHeight * position ); } } } \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/drawable/module_main_dw_left_frame_bkg.xml b/modules/mogo-module-main/src/main/res/drawable/module_main_dw_left_frame_bkg.xml index 64196e581f..b9d160ac66 100644 --- a/modules/mogo-module-main/src/main/res/drawable/module_main_dw_left_frame_bkg.xml +++ b/modules/mogo-module-main/src/main/res/drawable/module_main_dw_left_frame_bkg.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_shadow_frame_bkg.xml b/modules/mogo-module-main/src/main/res/drawable/module_main_dw_top_frame_bkg.xml similarity index 56% rename from modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_shadow_frame_bkg.xml rename to modules/mogo-module-main/src/main/res/drawable/module_main_dw_top_frame_bkg.xml index 234266fcaf..5f95c7f50f 100644 --- a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_shadow_frame_bkg.xml +++ b/modules/mogo-module-main/src/main/res/drawable/module_main_dw_top_frame_bkg.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml index e761f21d4f..23343b9186 100644 --- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml +++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml @@ -14,7 +14,14 @@ app:layout_constraintRight_toRightOf="parent" /> + + + android:layout_marginTop="@dimen/module_main_card_container_marginTop" + android:layout_height="match_parent"> - 720px - 10px - 660px - 60px - 211px - 20px + 384px + 8px + 352px + 370px + 32px + 140.5px + 18px + 20px + 10px + 144px \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml index a707ceedb5..bfcbccdc2b 100644 --- a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml @@ -1,10 +1,14 @@ - + 720px 10px 660px + 690px 60px 211px - 20px + 30px + 30px + 15px + 270px \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/values/colors.xml b/modules/mogo-module-main/src/main/res/values/colors.xml new file mode 100644 index 0000000000..1a06e26bf7 --- /dev/null +++ b/modules/mogo-module-main/src/main/res/values/colors.xml @@ -0,0 +1,4 @@ + + + #1D1D1D + \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/values/dimens.xml b/modules/mogo-module-main/src/main/res/values/dimens.xml index d69bd56a73..6a4570d3cc 100644 --- a/modules/mogo-module-main/src/main/res/values/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values/dimens.xml @@ -1,10 +1,14 @@ - 384px - 8px - 352px - 32px - 140.5px - 20px + 720px + 10px + 660px + 690px + 60px + 211px + 30px + 30px + 15px + 270px \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/values/styles.xml b/modules/mogo-module-main/src/main/res/values/styles.xml index 644c411770..4b9d268b74 100644 --- a/modules/mogo-module-main/src/main/res/values/styles.xml +++ b/modules/mogo-module-main/src/main/res/values/styles.xml @@ -7,7 +7,7 @@ @null @null @null - #1F000000 + @color/module_main_window_background_color false @style/MainAnimation diff --git a/modules/mogo-module-search/build.gradle b/modules/mogo-module-search/build.gradle index cc2624ce99..31d10b703e 100644 --- a/modules/mogo-module-search/build.gradle +++ b/modules/mogo-module-search/build.gradle @@ -77,3 +77,5 @@ dependencies { } implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" } + +apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() diff --git a/modules/mogo-module-search/gradle.properties b/modules/mogo-module-search/gradle.properties index 1e04f0d3e4..00d1dc7d25 100644 --- a/modules/mogo-module-search/gradle.properties +++ b/modules/mogo-module-search/gradle.properties @@ -1,3 +1,3 @@ GROUP=com.mogo.module -POM_ARTIFACT_ID=module-navi +POM_ARTIFACT_ID=module-search VERSION_CODE=1 diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/SearchServiceHolder.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/SearchServiceHolder.kt index a9ca995bba..6b125b6951 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/SearchServiceHolder.kt +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/SearchServiceHolder.kt @@ -1,18 +1,13 @@ package com.mogo.module.navi.constants import android.annotation.SuppressLint -import android.app.StatusBarManager import android.content.Context import androidx.fragment.app.Fragment -import com.alibaba.android.arouter.facade.annotation.Route -import com.alibaba.android.arouter.facade.template.IProvider import com.alibaba.android.arouter.launcher.ARouter -import com.amap.api.services.interfaces.IGeocodeSearch import com.mogo.map.marker.IMogoMarkerManager import com.mogo.map.navi.IMogoNavi import com.mogo.map.search.geo.IMogoGeoSearch import com.mogo.map.uicontroller.IMogoMapUIController -import com.mogo.module.navi.manager.MogoSettingManager import com.mogo.service.MogoServicePaths import com.mogo.service.analytics.IMogoAnalytics import com.mogo.service.fragmentmanager.FragmentDescriptor @@ -20,7 +15,6 @@ import com.mogo.service.fragmentmanager.IMogoFragmentManager import com.mogo.service.map.IMogoMapService import com.mogo.service.module.IMogoRegisterCenter import com.mogo.service.statusmanager.IMogoStatusManager -import kotlin.isInitialized as isInitialized1 /** *@author zyz diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java index 514d584dae..b813426215 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java @@ -466,7 +466,7 @@ public class MogoServiceProvider implements IMogoModuleProvider, } Logger.d( TAG, mAutoRefreshCallback == callback ? "触发自动刷新" : "触发手动刷新" ); Logger.i( TAG, "刷新半径 = %d, 点 = %s", radius, latLng ); - mRefreshModel.refreshData( latLng, radius, callback ); + mRefreshModel.refreshData( latLng, radius, mLastZoomLevel >= 10 ? 5 : 10, callback ); } @Override diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java index 605ba68188..d36fc9713c 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java @@ -52,7 +52,7 @@ public class RefreshModel { } } - public void refreshData(MogoLatLng latLng, int radius, final RefreshCallback callback) { + public void refreshData(MogoLatLng latLng, int radius, int limit, final RefreshCallback callback) { if (mRefreshApiService != null) { final Map query = new ParamsProvider.Builder(mContext).build(); final RefreshBody refreshBody = new RefreshBody(); diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java index e92c76d446..e89b78471c 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java @@ -203,20 +203,16 @@ public class TanluCardViewFragment extends MvpFragment> //地图marker mMogoMapService = (IMogoMapService) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICES_MAP).navigation(getActivity()); mMarkerManager = mMogoMapService.getMarkerManager(getContext()); - //切换卡片操作 iMogoCardManager = (IMogoCardManager) ARouter.getInstance().build(MogoServicePaths.PATH_CARD_MANAGER).navigation(getActivity()); mMogoRegisterCenter = (IMogoRegisterCenter) ARouter.getInstance().build(MogoServicePaths.PATH_REGISTER_CENTER).navigation(getContext()); mMogoRegisterCenter.registerMogoModuleLifecycle(TanluConstants.MODEL_NAME, this); - //唤醒 mogoIntentManager = (IMogoIntentManager) ARouter.getInstance().build(MogoServicePaths.PATH_INTENT_MANAGER).navigation(getContext()); - //地图操作 mMogoMapService = (IMogoMapService) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICES_MAP).navigation(getContext()); mMApUIController = mMogoMapService.getMapUIController(); mGeocodeSearch = new GeocodeSearch(getContext()); - mMogoStatusManager = (IMogoStatusManager) ARouter.getInstance().build(MogoServicePaths.PATH_STATUS_MANAGER).navigation(getContext()); //poi查询 @@ -314,7 +310,7 @@ public class TanluCardViewFragment extends MvpFragment> } /** - * 初始化导航 TODO + * 初始化导航 */ private void initMap() { mMogoRegisterCenter.registerMogoNaviListener(TanluConstants.MODEL_NAME, new IMogoNaviListener() { @@ -328,7 +324,6 @@ public class TanluCardViewFragment extends MvpFragment> @Override public void onNaviInfoUpdate(MogoNaviInfo naviinfo) { - } @Override @@ -339,22 +334,18 @@ public class TanluCardViewFragment extends MvpFragment> @Override public void onStopNavi() { - } @Override public void onCalculateSuccess() { - } @Override public void onoCalculateFailed() { - } @Override - public void onUpdateTraffic( MogoTraffic traffic ) { - + public void onUpdateTraffic(MogoTraffic traffic) { } }); @@ -417,7 +408,6 @@ public class TanluCardViewFragment extends MvpFragment> //唤醒 mogoIntentManager.registerIntentListener(TanluConstants.UPLOAD_ROAD_CONDITION, mogoIntentListener); mogoIntentManager.registerIntentListener(TanluConstants.SPECIFIEDROAD_SEARCH, mogoIntentListener); - mogoIntentManager.registerIntentListener(TanluConstants.PLAY_VIDEO, mogoIntentListener); mogoIntentManager.registerIntentListener(TanluConstants.SHARE_ROAD_CLOSURE, mogoIntentListener); mogoIntentManager.registerIntentListener(TanluConstants.SHARE_TRAFFIC_CHECK, mogoIntentListener); mogoIntentManager.registerIntentListener(TanluConstants.GO_TO_SHARE, mogoIntentListener); @@ -432,7 +422,7 @@ public class TanluCardViewFragment extends MvpFragment> public void onIntentReceived(String intentStr, Intent intent) { String data = intent.getStringExtra("data"); Logger.e(TAG, "唤醒 mogoIntentListener intentStr =" + intentStr + ">>data =" + data); - if (intentStr.equals(TanluConstants.SPECIFIEDROAD_SEARCH)) { //地点堵不堵 ok + if (intentStr.equals(TanluConstants.SPECIFIEDROAD_SEARCH)) { //地点堵不堵 --ok try { JSONObject jsonObject = new JSONObject(data); mKeywords = jsonObject.get("location").toString(); @@ -441,20 +431,17 @@ public class TanluCardViewFragment extends MvpFragment> } catch (Exception e) { e.printStackTrace(); } - } else if (intentStr.equals(TanluConstants.UPLOAD_ROAD_CONDITION)) { //上报路况 免唤醒 ok + } else if (intentStr.equals(TanluConstants.UPLOAD_ROAD_CONDITION)) { //上报路况 免唤醒 --ok sendShareReceiver("1"); Logger.d(TAG, "mogoIntentListener 上报路况 ----> "); - } else if (intentStr.equals(TanluConstants.PLAY_VIDEO)) { //播放视频 免唤醒 - Logger.d(TAG, "mogoIntentListener 播放视频 ----> "); - //TODO - } else if (intentStr.equals(TanluConstants.SHARE_ROAD_CLOSURE)) { //分享封路 + } else if (intentStr.equals(TanluConstants.SHARE_ROAD_CLOSURE)) { //分享封路 --ok sendShareReceiver("3"); Logger.d(TAG, "mogoIntentListener 分享封路 ----> "); - } else if (intentStr.equals(TanluConstants.SHARE_TRAFFIC_CHECK)) { //分享交通检查 + } else if (intentStr.equals(TanluConstants.SHARE_TRAFFIC_CHECK)) { //分享交通检查 --ok sendShareReceiver("2"); Logger.d(TAG, "mogoIntentListener 分享交通检查 ----> "); - } else if (intentStr.equals(TanluConstants.GO_TO_SHARE)) { //我要分享 + } else if (intentStr.equals(TanluConstants.GO_TO_SHARE)) { //我要分享 --ok ShareControl shareControl = new ShareControl(); shareControl.showDialog(getActivity()); Logger.d(TAG, "mogoIntentListener 我要分享 ----> "); @@ -469,8 +456,8 @@ public class TanluCardViewFragment extends MvpFragment> private IMogoVoiceCmdCallBack mogoVoiceListener = new IMogoVoiceCmdCallBack() { @Override public void onCmdSelected(String cmd) { - Logger.e(TAG, "免唤醒 onCmdSelected mogoVoiceListener cmd =" + cmd); - if (cmd.equals(TanluConstants.PLAY_VIDEO)) { + Logger.d(TAG, "免唤醒 onCmdSelected mogoVoiceListener cmd =" + cmd); + if (cmd.equals(TanluConstants.PLAY_VIDEO)) { //播放路况 --ok //TODO } @@ -478,22 +465,18 @@ public class TanluCardViewFragment extends MvpFragment> @Override public void onCmdAction(String speakText) { - Logger.d(TAG, "免唤醒 onCmdAction speakText =" + speakText); } @Override public void onCmdCancel(String speakText) { - Logger.d(TAG, "免唤醒 onCmdCancel speakText =" + speakText); } @Override public void onSpeakEnd(String speakText) { - Logger.e(TAG, "免唤醒 onSpeakEnd speakText =" + speakText); } @Override public void onSpeakSelectTimeOut(String speakText) { - Logger.e(TAG, "免唤醒 onSpeakSelectTimeOut speakText =" + speakText); } }; @@ -678,7 +661,7 @@ public class TanluCardViewFragment extends MvpFragment> } /** - * C位事件,如何获取数据，需要有默认数据 TODO + * C位事件,如何获取数据，需要有默认数据 * 如果只有一个数据，不显示上下切换按钮，没有数据显示空页面 */ @Override @@ -802,7 +785,7 @@ public class TanluCardViewFragment extends MvpFragment> getViewLifecycleOwner().getLifecycle().removeObserver(mPresenter); TanluServiceHandler.getLocationClient().removeLocationListener(this); mMogoRegisterCenter.unregisterMogoNaviListener(TanluConstants.MODEL_NAME); - mogoIntentManager.unregisterIntentListener(MogoReceiver.ACTIION_ADAS ); + mogoIntentManager.unregisterIntentListener(MogoReceiver.ACTIION_ADAS); } /** @@ -813,30 +796,36 @@ public class TanluCardViewFragment extends MvpFragment> @Subscribe(threadMode = ThreadMode.MAIN) public void onMarkerInfo(final MarkerInfo event) { Logger.d(TAG, "onMarkerInfo ------------>"); - if (event.type.equals("1")) { //上报路况 + if (event == null) { + return; + } + + String poiType = ""; + if (event.type.equals("1")) { //上报路况 TODO 修改探路 mMarkerIcon = BitmapFactory.decodeResource(getResources(), R.drawable.tanlu_marker_block_up); - } else if (event.type.equals("2")) { //交通检查 + } else if (event.type.equals("2")) { //交通检查 10002 + poiType = "10002"; mMarkerIcon = BitmapFactory.decodeResource(getResources(), R.drawable.tanlu_marker_traffic_check); - } else if (event.type.equals("3")) { //封路 + } else if (event.type.equals("3")) { //封路 10003 + poiType = "10003"; mMarkerIcon = BitmapFactory.decodeResource(getResources(), R.drawable.tanlu_marker_road_closure); } else { mMarkerIcon = BitmapFactory.decodeResource(getResources(), R.drawable.tanlu_marker_block_up); } - Logger.d(TAG, "onMarkerInfo onCompleted ------>"); + Logger.d(TAG, "onMarkerInfo share onCompleted ------>"); MogoMarkerOptions options = new MogoMarkerOptions() .icon(mMarkerIcon) .latitude(event.lat) .owner(TanluConstants.MODEL_NAME) .longitude(event.lon); IMogoMarker marker = mMarkerManager.addMarker("share_tag", options); //随便传tag，不可点击 - //TODO 请求分享接口 + //请求分享接口 MarkerExploreWay markerExploreWay = markerExploreWayList.get(0); if (markerExploreWay.getUserInfo() != null) { - + uploadShareInfo(poiType, event.imageUrl, markerExploreWay.getUserInfo().getUserName(), + markerExploreWay.getUserInfo().getUserHead()); } - uploadShareInfo(markerExploreWay.getType(), "", markerExploreWay.getUserInfo().getUserName(), - markerExploreWay.getUserInfo().getUserHead()); } @@ -858,7 +847,7 @@ public class TanluCardViewFragment extends MvpFragment> @Override public void onFail(String message, int code) { - Logger.d(TAG, "uploadShareInfo onFail ----->"); + Logger.e(TAG, "uploadShareInfo onFail ----->"); AIAssist.getInstance(getContext()).speakTTSVoice(getString(R.string.tanlu_share_failed), null); } }); @@ -948,7 +937,7 @@ public class TanluCardViewFragment extends MvpFragment> } /** - * 绘制线路 TODO + * 绘制线路 */ private void drawMapLine(List
pointList) { int intervalNum = Utils.getIntervalValue(pointList.size()); @@ -986,6 +975,10 @@ public class TanluCardViewFragment extends MvpFragment> String discription = o.getResult().getDescription(); Logger.d(TAG, "getVoiceControlRoadData discription = " + discription); if (o.getResult().getInformations() != null && o.getResult().getInformations().size() > 0) { + if (markerExploreWayList != null && markerExploreWayList.size() > 0) { + markerExploreWayList.clear(); // + } + //切换到探路卡片 if (!isCurrentPage) { //切换探路卡片 diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/TanluModelData.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/TanluModelData.java index 065d48976a..eec7f7d1b5 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/TanluModelData.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/TanluModelData.java @@ -244,7 +244,7 @@ public class TanluModelData { /** - * 上报交通检查和封路 TODO + * 上报交通检查和封路 */ public void addTrafficCheckInfo(String poiType, String poiImgUrl, String nickname, String headImgUrl, double lat, double lon, String address, final UploadShareCallback callback) { @@ -252,12 +252,11 @@ public class TanluModelData { UploadShareRoadInfo uploadShareRoadInfo = new UploadShareRoadInfo(poiType, poiImgUrl, nickname, headImgUrl, new Center(lat, lon), address); String uploadShareStr = gson.toJson(uploadShareRoadInfo); Logger.d(TAG, "addTrafficCheckInfo sn= " + getSn() + ">> uploadShareStr =" + uploadShareStr); - final Map params = new ParamsProvider.Builder(mContext) .append("sn", Utils.getSn()) .append("data", uploadShareStr) .build(); - mTanluApiService.searchOnLineInformation(params) + mTanluApiService.uploadCheckTrafficInfor(params) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new SubscribeImpl(RequestOptions.create(mContext)) { @@ -278,6 +277,7 @@ public class TanluModelData { @Override public void onError(Throwable e) { super.onError(e); + e.printStackTrace(); Logger.d(TAG, "addTrafficCheckInfo onError ------> e= " + e.getMessage()); } }); diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/event/MarkerInfo.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/event/MarkerInfo.java index 355929a04d..ce9e85c264 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/event/MarkerInfo.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/event/MarkerInfo.java @@ -9,11 +9,11 @@ import java.io.Serializable; */ public class MarkerInfo implements Serializable { public String type; //封路，还是上报 - public String imageUrl; + public String imageUrl; //上传完cos图片 public Long lon; //经度 public Long lat; //纬度 - public MarkerInfo(String type, /*String imageUrl,*/ Long lon, Long lat) { + public MarkerInfo(String type, String imageUrl, Long lon, Long lat) { this.type = type; this.imageUrl = imageUrl; this.lon = lon; diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/receiver/MarkerInfoReceiver.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/receiver/MarkerInfoReceiver.kt index b203816a41..2be3bb5c0f 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/receiver/MarkerInfoReceiver.kt +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/receiver/MarkerInfoReceiver.kt @@ -14,10 +14,12 @@ class MarkerInfoReceiver : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { if (intent.action == "com.zhidao.roadcondition.marker.info"){ var type = intent.getStringExtra("type") + var imageUrl = intent.getStringExtra("imageUrl") var lat = intent.getLongExtra("lat",0) var lon = intent.getLongExtra("lon",0) //经度 - Log.d("MarkerInfoReceiver", "type = $type ---->lat = $lat ---->lon = $lon") - EventBus.getDefault().post(MarkerInfo(type, lon, lat)) + Log.d("MarkerInfoReceiver", "type = $type ---->lat = $lat ---->lon = $lon + " ) + Log.d("MarkerInfoReceiver", "") + EventBus.getDefault().post(MarkerInfo(type, imageUrl,lon, lat)) } } } diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/FullMediaActivity.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/FullMediaActivity.kt index 181f684f32..1bcdab20b4 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/FullMediaActivity.kt +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/FullMediaActivity.kt @@ -3,6 +3,7 @@ package com.mogo.module.tanlu.video import android.app.Activity import android.content.Intent import android.os.Bundle +import android.util.Log import android.view.View import androidx.appcompat.app.AppCompatActivity import com.mogo.module.tanlu.R @@ -102,6 +103,7 @@ class FullMediaActivity : AppCompatActivity(), View.OnClickListener { video_view.onCompletionListener(object : MediaCoverVideoPlayer.CompletionListener { override fun onCompletion() { + Log.d("liyz", "FullMediaActivity ---- onCompletion "); GSYVideoManager.releaseAllVideos() finish() } diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/MediaCoverVideoPlayer.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/MediaCoverVideoPlayer.kt index a02fc9653c..048b2cec82 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/MediaCoverVideoPlayer.kt +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/MediaCoverVideoPlayer.kt @@ -136,15 +136,18 @@ class MediaCoverVideoPlayer : StandardGSYVideoPlayer { } /** - * 多次回调？ TODO + * 多次回调 TODO */ override fun onCompletion() { - Log.d("liyz", "onCompletion --------->") -// completionListener.let { -// it.onCompletion() -// } + super.onCompletion() + Log.d("liyz", "MediaCoverVideoPlayer onCompletion --------->") + completionListener.let { + it.onCompletion() + } } + + override fun onDetachedFromWindow() { super.onDetachedFromWindow() mFullPauseBitmap?.let { @@ -153,7 +156,9 @@ class MediaCoverVideoPlayer : StandardGSYVideoPlayer { } } mFullPauseBitmap = null - Log.d("MediaCoverVideoPlayer", "recycle.") + Log.d("liyz", "recycle.") } + + } \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-ldpi/dimens.xml new file mode 100644 index 0000000000..0d2c4cc409 --- /dev/null +++ b/modules/mogo-module-tanlu/src/main/res/values-ldpi/dimens.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml new file mode 100644 index 0000000000..80da6c1b1b --- /dev/null +++ b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml @@ -0,0 +1,9 @@ + + + + 4px + + 666px + + + \ No newline at end of file diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/module/ModuleType.java b/services/mogo-service-api/src/main/java/com/mogo/service/module/ModuleType.java index f7fb47463f..ae02f4ce15 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/module/ModuleType.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/module/ModuleType.java @@ -27,30 +27,36 @@ public interface ModuleType { /** * APP 列表模块 */ + @Deprecated int TYPE_APP_LIST = 4; /** * 小智语音形象 */ + @Deprecated int TYPE_VOICE = 5; /** * 地图模块 */ + @Deprecated int TYPE_MAP = 6; /** * 导航模块 */ + @Deprecated int TYPE_NAVI = 7; /** * 小智、天气、时间等 */ + @Deprecated int TYPE_EXTENSION = 8; /** * 操作快捷入口 */ + @Deprecated int TYPE_ENTRANCE = 9; } diff --git a/upload.sh b/upload.sh index 7fc06055a3..3ad1ccbd45 100755 --- a/upload.sh +++ b/upload.sh @@ -8,10 +8,11 @@ ./gradlew :libraries:map-amap:clean :libraries:map-amap:uploadArchives ./gradlew :libraries:mogo-map:clean :libraries:mogo-map:uploadArchives ./gradlew :services:mogo-service:clean :services:mogo-service:uploadArchives -./gradlew :modules:mogo-module-common:clean :modules:mogo-module-common:uploadArchives ./gradlew :modules:mogo-module-map:clean :modules:mogo-module-map:uploadArchives ./gradlew :modules:mogo-module-tanlu:clean :modules:mogo-module-tanlu:uploadArchives ./gradlew :modules:mogo-module-apps:clean :modules:mogo-module-apps:uploadArchives ./gradlew :modules:mogo-module-service:clean :modules:mogo-module-service:uploadArchives -./gradlew :modules:mogo-module-extensions:clean :modules:mogo-module-service:uploadArchives +./gradlew :modules:mogo-module-share:clean :modules:mogo-module-share:uploadArchives +./gradlew :modules:mogo-module-extensions:clean :modules:mogo-module-extensions:uploadArchives +./gradlew :modules:mogo-module-search:clean :modules:mogo-module-search:uploadArchives ./gradlew :modules:mogo-module-main:clean :modules:mogo-module-main:uploadArchives