diff --git a/.idea/gradle.xml b/.idea/gradle.xml index cfc605c98e..5974cf305a 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -16,6 +16,7 @@ diff --git a/app/build.gradle b/app/build.gradle index aa047e7434..3309333674 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -203,7 +203,7 @@ android { // 分享时是否隐藏 adas buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' // 是否需要实时上报坐标 - buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'false' + buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' } // 同上 em4 { @@ -229,7 +229,7 @@ android { // 分享时是否隐藏 adas buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' // 是否需要实时上报坐标 - buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'false' + buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' } // e系列-2+32，对标D系列2+32，采用独立app的形式 em3 { @@ -255,7 +255,7 @@ android { // 分享时是否隐藏 adas buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' // 是否需要实时上报坐标 - buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'false' + buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' } // e系列-1+16，对标D系列1+16，采用独立app形式 em1 { @@ -333,7 +333,7 @@ android { // 分享时是否隐藏 adas buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'true' // 是否需要实时上报坐标 - buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'false' + buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' } // d系列 2 + 32 d80x { @@ -359,7 +359,7 @@ android { // 分享时是否隐藏 adas buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'true' // 是否需要实时上报坐标 - buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'false' + buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' } // d系列 1+16 版本 d82x { diff --git a/app/functions/httpdns.gradle b/app/functions/httpdns.gradle index 326008a36f..176938bc92 100644 --- a/app/functions/httpdns.gradle +++ b/app/functions/httpdns.gradle @@ -8,7 +8,7 @@ project.dependencies { d8xxImplementation rootProject.ext.dependencies.httpdnsnoop d80xImplementation rootProject.ext.dependencies.httpdnsnoop em4Implementation rootProject.ext.dependencies.httpdnsnoop - e8xxImplementation rootProject.ext.dependencies.httpdnsnoop + e8xxImplementation rootProject.ext.dependencies.httpdnstencent f8xxImplementation rootProject.ext.dependencies.httpdnstencent f80xImplementation rootProject.ext.dependencies.httpdnstencent f8AmapImplementation rootProject.ext.dependencies.httpdnstencent @@ -20,7 +20,7 @@ project.dependencies { d8xxImplementation project(':foudations:httpdns-noop') d80xImplementation project(':foudations:httpdns-noop') em4Implementation project(':foudations:httpdns-noop') - e8xxImplementation project(':foudations:httpdns-noop') + e8xxImplementation project(':foudations:httpdns-tencent') f8xxImplementation project(':foudations:httpdns-tencent') f80xImplementation project(':foudations:httpdns-tencent') f8AmapImplementation project(':foudations:httpdns-tencent') diff --git a/app2/src/main/java/com/freedom/app2/MainActivity.java b/app2/src/main/java/com/freedom/app2/MainActivity.java index 0edc964aba..1ce74a702f 100644 --- a/app2/src/main/java/com/freedom/app2/MainActivity.java +++ b/app2/src/main/java/com/freedom/app2/MainActivity.java @@ -10,6 +10,7 @@ import androidx.appcompat.app.AppCompatActivity; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.network.SubscribeImpl; +import com.mogo.httpdns.HttpDnsConst; import com.mogo.httpdns.IHttpDnsCallback; import com.mogo.httpdns.IMogoHttpDns; import com.mogo.httpdns.MogoHttpDnsHandler; @@ -76,7 +77,7 @@ public class MainActivity extends AppCompatActivity { WorkThreadHandler.getInstance().post( new Runnable() { @Override public void run() { - httpDns.getHttpDnsIp( "dnstest.zhidaozhixing.com", false, new IHttpDnsCallback() { + httpDns.getHttpDnsIp( "dnstest.zhidaozhixing.com", HttpDnsConst.HTTP_DNS_ADDRESS_TYPE_HTTP, false, new IHttpDnsCallback() { @Override public void onParsed( @Nullable String ip ) { StringBuilder sb = new StringBuilder( "httpDns ip:\n" ); @@ -100,7 +101,7 @@ public class MainActivity extends AppCompatActivity { WorkThreadHandler.getInstance().post( new Runnable() { @Override public void run() { - httpDns.getHttpDnsIp( "dzt-city.zhidaozhixing.com", false, new IHttpDnsCallback() { + httpDns.getHttpDnsIp( "dzt-city.zhidaozhixing.com", HttpDnsConst.HTTP_DNS_ADDRESS_TYPE_HTTP, false, new IHttpDnsCallback() { @Override public void onParsed( @Nullable String ip ) { StringBuilder sb = new StringBuilder( "httpDns ip:\n" ); @@ -121,7 +122,7 @@ public class MainActivity extends AppCompatActivity { private void renderResponse( ResponseBody body ) { StringBuilder sb = new StringBuilder( "httpDns ip:\n" ); - String ip = httpDns.getCachedHttpDnsIps( "dnstest.zhidaozhixing.com" ); + String ip = httpDns.getCachedHttpDnsIps( "dnstest.zhidaozhixing.com", HttpDnsConst.HTTP_DNS_ADDRESS_TYPE_HTTP ); sb.append( ip ).append( "\n" ); sb.append( "\nserverIp: \n" ).append( body.result.serverIp ).append( "\n" ); content.setText( sb.toString() ); diff --git a/config.gradle b/config.gradle index 3e22b033e4..8fe1a4d1ca 100644 --- a/config.gradle +++ b/config.gradle @@ -217,12 +217,13 @@ ext { ttszhi : "com.mogo.tts:tts-zhi:${TTS_ZHI_VERSION}", ttsnoop : "com.mogo.tts:tts-noop:${TTS_NOOP_VERSION}", - mogomodulemachinevision : "com.mogo.module:module-machine-vision:${MOGO_MODULES_MVISION_VERSION}", +// mogomodulemachinevision : "com.mogo.module:module-machine-vision:${MOGO_MODULES_MVISION_VERSION}", httpdnsbase : "com.mogo.httpdns:httpdns-base:${HTTPDNS_BASE_VERSION}", httpdnsnoop : "com.mogo.httpdns:httpdns-noop:${HTTPDNS_NOOP_VERSION}", httpdnstencent : "com.mogo.httpdns:httpdns-tencent:${HTTPDNS_TENCENT_VERSION}", + httpdnsmogo : "com.mogo.httpdns:httpdns-mogo:${HTTPDNS_MOGO_VERSION}", ] } \ No newline at end of file diff --git a/foudations/httpdns-base/src/main/java/com/mogo/httpdns/HttpDnsConst.java b/foudations/httpdns-base/src/main/java/com/mogo/httpdns/HttpDnsConst.java index 659bab3929..a934a7db1c 100644 --- a/foudations/httpdns-base/src/main/java/com/mogo/httpdns/HttpDnsConst.java +++ b/foudations/httpdns-base/src/main/java/com/mogo/httpdns/HttpDnsConst.java @@ -14,4 +14,8 @@ class HttpDnsConst { @Keep public static final String PATH = "/httpdns/api"; + + public static final int HTTP_DNS_ADDRESS_TYPE_HTTP = 0; + public static final int HTTP_DNS_ADDRESS_TYPE_WS = 1; + public static final int HTTP_DNS_ADDRESS_TYPE_IM = 2; } diff --git a/foudations/httpdns-base/src/main/java/com/mogo/httpdns/IMogoHttpDns.java b/foudations/httpdns-base/src/main/java/com/mogo/httpdns/IMogoHttpDns.java index 63369d0ac8..725d63cc72 100644 --- a/foudations/httpdns-base/src/main/java/com/mogo/httpdns/IMogoHttpDns.java +++ b/foudations/httpdns-base/src/main/java/com/mogo/httpdns/IMogoHttpDns.java @@ -27,36 +27,72 @@ interface IMogoHttpDns extends IProvider { @Nullable HttpDns dns(); +// /** +// * 获取缓存中的 dns ip地址 +// * +// * @param host +// * @return +// */ +// @Nullable +// String getCachedHttpDnsIps( String host ); + /** - * 获取缓存中的 dns ip地址 - * - * @param host + * 获取缓存中的dns ip地址 + * @param host domain + * @param type 类型 * @return */ - @Nullable - String getCachedHttpDnsIps( String host ); + @Keep + String getCachedHttpDnsIps(String host, int type); +// +// /** +// * dns 解析 +// * +// * @param host 域名 +// * @param useCache 是否使用缓存，是 - 如果没有缓存，则解析新地址、否 - 解析新地址，并将新地址缓存 +// * @param callback +// */ +// void getHttpDnsIp( String host, boolean useCache, IHttpDnsCallback callback ); /** - * dns 解析 - * - * @param host 域名 - * @param useCache 是否使用缓存，是 - 如果没有缓存，则解析新地址、否 - 解析新地址，并将新地址缓存 + * dns解析 + * @param host + * @param type + * @param useCache * @param callback */ - void getHttpDnsIp( String host, boolean useCache, IHttpDnsCallback callback ); + @Keep + void getHttpDnsIp(String host, int type, boolean useCache, IHttpDnsCallback callback); + +// /** +// * 监听 ttl 回调 +// * +// * @param host 域名 +// * @param callback +// */ +// void addHttpDnsTtlCallback( String host, IHttpDnsTtlCallback callback ); /** - * 监听 ttl 回调 - * - * @param host 域名 + * 监听ttl回调 + * @param host + * @param type * @param callback */ - void addHttpDnsTtlCallback( String host, IHttpDnsTtlCallback callback ); + @Keep + void addHttpDnsTtlCallback(String host, int type, IHttpDnsTtlCallback callback); + +// /** +// * 注销 ttl 回调 +// * +// * @param host 域名 +// */ +// void removeHttpDnsTtlCallback( String host ); /** - * 注销 ttl 回调 - * - * @param host 域名 + * 注销ttl回调 + * @param host + * @param type */ - void removeHttpDnsTtlCallback( String host ); + @Keep + void removeHttpDnsTtlCallback(String host,int type); } diff --git a/foudations/httpdns-base/src/main/java/com/mogo/httpdns/MogoHttpDnsHandler.java b/foudations/httpdns-base/src/main/java/com/mogo/httpdns/MogoHttpDnsHandler.java index c2c979db8d..dd25cecb0b 100644 --- a/foudations/httpdns-base/src/main/java/com/mogo/httpdns/MogoHttpDnsHandler.java +++ b/foudations/httpdns-base/src/main/java/com/mogo/httpdns/MogoHttpDnsHandler.java @@ -14,6 +14,10 @@ public @Keep class MogoHttpDnsHandler { + private MogoHttpDnsHandler(){ + + } + private static IMogoHttpDns sHttpDns; public static IMogoHttpDns getHttpDnsApi() { diff --git a/foudations/httpdns-mogo/.gitignore b/foudations/httpdns-mogo/.gitignore new file mode 100644 index 0000000000..42afabfd2a --- /dev/null +++ b/foudations/httpdns-mogo/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/foudations/httpdns-mogo/build.gradle b/foudations/httpdns-mogo/build.gradle new file mode 100644 index 0000000000..af8c7c97be --- /dev/null +++ b/foudations/httpdns-mogo/build.gradle @@ -0,0 +1,48 @@ +apply plugin: 'com.android.library' + +android { + compileSdkVersion rootProject.ext.android.compileSdkVersion + // buildToolsVersion rootProject.ext.android.buildToolsVersion + defaultConfig { + minSdkVersion rootProject.ext.android.minSdkVersion + targetSdkVersion rootProject.ext.android.targetSdkVersion + versionCode Integer.valueOf(VERSION_CODE) + versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION") + + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles "consumer-rules.pro" + + javaCompileOptions { + annotationProcessorOptions { + arguments = [AROUTER_MODULE_NAME: project.getName()] + } + } + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + implementation fileTree(dir: "libs", include: ["*.jar"]) + implementation rootProject.ext.dependencies.arouter + annotationProcessor rootProject.ext.dependencies.aroutercompiler + implementation 'com.mogo.httpdns:httpdns-helper:1.0.6' + + if (Boolean.valueOf(RELEASE)) { + implementation rootProject.ext.dependencies.httpdnsbase + implementation rootProject.ext.dependencies.mogocommons + implementation rootProject.ext.dependencies.modulecommon + } else { + implementation project(':foudations:httpdns-base') + implementation project(':foudations:mogo-commons') + implementation project(':modules:mogo-module-common') + } +} + +apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() \ No newline at end of file diff --git a/foudations/httpdns-mogo/consumer-rules.pro b/foudations/httpdns-mogo/consumer-rules.pro new file mode 100644 index 0000000000..e69de29bb2 diff --git a/foudations/httpdns-mogo/gradle.properties b/foudations/httpdns-mogo/gradle.properties new file mode 100644 index 0000000000..112b45a237 --- /dev/null +++ b/foudations/httpdns-mogo/gradle.properties @@ -0,0 +1,3 @@ +GROUP=com.mogo.httpdns +POM_ARTIFACT_ID=httpdns-mogo +VERSION_CODE=1 \ No newline at end of file diff --git a/foudations/httpdns-mogo/proguard-rules.pro b/foudations/httpdns-mogo/proguard-rules.pro new file mode 100644 index 0000000000..481bb43481 --- /dev/null +++ b/foudations/httpdns-mogo/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/foudations/httpdns-mogo/src/androidTest/java/com/mogo/httpdns/mogo/ExampleInstrumentedTest.java b/foudations/httpdns-mogo/src/androidTest/java/com/mogo/httpdns/mogo/ExampleInstrumentedTest.java new file mode 100644 index 0000000000..6221400f44 --- /dev/null +++ b/foudations/httpdns-mogo/src/androidTest/java/com/mogo/httpdns/mogo/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package com.mogo.httpdns.mogo; + +import android.content.Context; + +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); + assertEquals("com.mogo.httpdns.mogo.test", appContext.getPackageName()); + } +} \ No newline at end of file diff --git a/foudations/httpdns-mogo/src/main/AndroidManifest.xml b/foudations/httpdns-mogo/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..b1c58ca282 --- /dev/null +++ b/foudations/httpdns-mogo/src/main/AndroidManifest.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/foudations/httpdns-mogo/src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java b/foudations/httpdns-mogo/src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java new file mode 100644 index 0000000000..e7b7ab75d9 --- /dev/null +++ b/foudations/httpdns-mogo/src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java @@ -0,0 +1,118 @@ +package com.mogo.httpdns.mogo; + +import android.content.Context; +import android.text.TextUtils; +import android.util.ArrayMap; + +import androidx.annotation.Nullable; + +import com.alibaba.android.arouter.facade.annotation.Route; +import com.mogo.commons.network.Utils; +import com.mogo.httpdns.HttpDnsConst; +import com.mogo.httpdns.IHttpDnsCallback; +import com.mogo.httpdns.IHttpDnsTtlCallback; +import com.mogo.httpdns.IMogoHttpDns; +import com.mogo.httpdnshelper.sdk.HttpDnsHelper; +import com.mogo.httpdnshelper.sdk.bean.HttpDnsSimpleLocation; +import com.mogo.httpdnshelper.sdk.listener.IHttpDnsCurrentLocation; +import com.mogo.httpdnshelper.sdk.listener.OnAddressChangedListener; +import com.mogo.map.location.MogoLocation; +import com.mogo.module.common.MogoApisHandler; +import com.mogo.utils.logger.Logger; +import com.mogo.utils.network.HttpDns; + +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; + +import static com.mogo.httpdns.HttpDnsConst.HTTP_DNS_ADDRESS_TYPE_HTTP; + +@Route(path = HttpDnsConst.PATH) +public class MogoHttpDns implements IMogoHttpDns, HttpDns, OnAddressChangedListener { + private HttpDnsHelper httpDnsHelper; + + @Nullable + @Override + public HttpDns dns() { + return this; + } + + @Override + public String getCachedHttpDnsIps(String host, int type) { + return httpDnsHelper.getHttpDnsCachedAddress(type, host); + } + + @Override + public void getHttpDnsIp(String host, int type, boolean useCache, IHttpDnsCallback callback) { + if (useCache) { + String address = httpDnsHelper.getHttpDnsCachedAddress(type, host); + if (address != null) { + callback.onParsed(address); + } else { + callback.onParsed(httpDnsHelper.getHttpDnsAddress(type, host)); + } + } else { + callback.onParsed(httpDnsHelper.getHttpDnsAddress(type, host)); + } + } + + private final Map ttlCallbackMap = new ArrayMap<>(); + + @Override + public void addHttpDnsTtlCallback(String host, int type, IHttpDnsTtlCallback callback) { + ttlCallbackMap.put(type + "-" + host, callback); + + } + + @Override + public void removeHttpDnsTtlCallback(String host, int type) { + ttlCallbackMap.remove(type + "-" + host); + } + + @Override + public void init(final Context context) { + httpDnsHelper = new HttpDnsHelper.Builder().setContext(context).setSn(Utils.getSn()).setShowDebugLog(true).setLoopCheckDelay(15 * 60 * 1000).setCurrentLocation(new IHttpDnsCurrentLocation() { + @org.jetbrains.annotations.Nullable + @Override + public HttpDnsSimpleLocation getCurrentLocation() { + MogoLocation last = MogoApisHandler.getInstance().getApis().getMapServiceApi().getSingletonLocationClient(context).getLastKnowLocation(); + if (last != null) { + return new HttpDnsSimpleLocation(last.getCityCode(), last.getLatitude(), last.getLongitude()); + } + return null; + } + }).build(); + httpDnsHelper.setAddressChangedListener(this); + } + + @Override + public List lookup(String hostname) throws UnknownHostException { + String cacheIp = httpDnsHelper.getHttpDnsCachedAddress(HTTP_DNS_ADDRESS_TYPE_HTTP, hostname); + if (cacheIp == null || TextUtils.isEmpty(cacheIp)) { + return Collections.emptyList(); + } + String[] info = cacheIp.split(":"); + if (info.length > 1) { + return Arrays.asList(InetAddress.getAllByName(info[0])); + } else { + return Arrays.asList(InetAddress.getAllByName(cacheIp)); + } + } + + @Override + public void onAddressChanged(@org.jetbrains.annotations.Nullable Map map) { + if (map != null) { + for (String key : map.keySet()) { + IHttpDnsTtlCallback callback = ttlCallbackMap.get(key); + if (callback != null) { + callback.onTtl(); + }else{ + Logger.d("MogoHttpDns", "callback is null: " + key); + } + } + } + } +} diff --git a/foudations/httpdns-mogo/src/test/java/com/mogo/httpdns/mogo/ExampleUnitTest.java b/foudations/httpdns-mogo/src/test/java/com/mogo/httpdns/mogo/ExampleUnitTest.java new file mode 100644 index 0000000000..bd65eb4339 --- /dev/null +++ b/foudations/httpdns-mogo/src/test/java/com/mogo/httpdns/mogo/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package com.mogo.httpdns.mogo; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/foudations/httpdns-noop/src/main/java/com/mogo/httpdns/noop/HttpDnsNoop.java b/foudations/httpdns-noop/src/main/java/com/mogo/httpdns/noop/HttpDnsNoop.java index 9aed264e16..fdf50007aa 100644 --- a/foudations/httpdns-noop/src/main/java/com/mogo/httpdns/noop/HttpDnsNoop.java +++ b/foudations/httpdns-noop/src/main/java/com/mogo/httpdns/noop/HttpDnsNoop.java @@ -25,24 +25,24 @@ class HttpDnsNoop implements IMogoHttpDns { } @Override - public String getCachedHttpDnsIps( String host ) { + public String getCachedHttpDnsIps( String host,int type ) { return null; } @Override - public void getHttpDnsIp( String host, boolean useCache, IHttpDnsCallback callback ) { + public void getHttpDnsIp( String host,int type, boolean useCache, IHttpDnsCallback callback ) { if ( callback != null ) { callback.onParsed( null ); } } @Override - public void addHttpDnsTtlCallback( String host, IHttpDnsTtlCallback callback ) { + public void addHttpDnsTtlCallback( String host,int type, IHttpDnsTtlCallback callback ) { } @Override - public void removeHttpDnsTtlCallback( String host ) { + public void removeHttpDnsTtlCallback( String host,int type ) { } diff --git a/foudations/httpdns-tencent/src/main/java/com/mogo/httpdns/tencent/TencentHttpDns.java b/foudations/httpdns-tencent/src/main/java/com/mogo/httpdns/tencent/TencentHttpDns.java index b975630e8f..ea659d4f4b 100644 --- a/foudations/httpdns-tencent/src/main/java/com/mogo/httpdns/tencent/TencentHttpDns.java +++ b/foudations/httpdns-tencent/src/main/java/com/mogo/httpdns/tencent/TencentHttpDns.java @@ -3,6 +3,8 @@ package com.mogo.httpdns.tencent; import android.content.Context; import android.text.TextUtils; +import androidx.annotation.Keep; + import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.commons.debug.DebugConfig; import com.mogo.httpdns.HttpDnsConst; @@ -19,8 +21,11 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import static com.mogo.httpdns.HttpDnsConst.HTTP_DNS_ADDRESS_TYPE_IM; +import static com.mogo.httpdns.HttpDnsConst.HTTP_DNS_ADDRESS_TYPE_WS; + public -/** +/* * @author congtaowang * @since 2020/11/18 * @@ -50,8 +55,13 @@ class TencentHttpDns implements IMogoHttpDns, HttpDns { } @Override - public String getCachedHttpDnsIps( String host ) { - return HttpDnsIpsCache.getHttpDnsIps( host ); + public String getCachedHttpDnsIps( String host,int type ) { + String ip = HttpDnsIpsCache.getHttpDnsIps(host); + if (ip == null) { + return null; + } else { + return tailPort(ip, type); + } } private String getCacheOrParseIpIfNecessary( String host ) { @@ -66,7 +76,7 @@ class TencentHttpDns implements IMogoHttpDns, HttpDns { } @Override - public void getHttpDnsIp( String host, boolean useCache, IHttpDnsCallback callback ) { + public void getHttpDnsIp( String host,int type, boolean useCache, IHttpDnsCallback callback ) { String cacheIp = null; if ( useCache ) { cacheIp = getCacheOrParseIpIfNecessary( host ); @@ -78,7 +88,7 @@ class TencentHttpDns implements IMogoHttpDns, HttpDns { } if ( !TextUtils.isEmpty( cacheIp ) ) { if ( callback != null ) { - callback.onParsed( cacheIp ); + callback.onParsed( tailPort(cacheIp,type) ); return; } } @@ -88,15 +98,16 @@ class TencentHttpDns implements IMogoHttpDns, HttpDns { } @Override - public void addHttpDnsTtlCallback( String host, IHttpDnsTtlCallback callback ) { + public void addHttpDnsTtlCallback( String host,int type, IHttpDnsTtlCallback callback ) { HttpDnsIpsCache.addHttpDnsTtlCallback( host, callback ); } @Override - public void removeHttpDnsTtlCallback( String host ) { + public void removeHttpDnsTtlCallback( String host,int type ) { HttpDnsIpsCache.removeHttpDnsTtlCallback( host ); } + @Keep @Override public void init( Context context ) { if ( sInited ) { @@ -113,4 +124,15 @@ class TencentHttpDns implements IMogoHttpDns, HttpDns { HttpDnsIpsCache.loopDnsParse(); sInited = true; } + + private String tailPort(String ip, int type) { + switch (type) { + case HTTP_DNS_ADDRESS_TYPE_WS: + return ip + ":4004"; + case HTTP_DNS_ADDRESS_TYPE_IM: + return ip + ":4002"; + default: + return ip; + } + } } diff --git a/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/BaseServicesConstants.java b/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/BaseServicesConstants.java index 5d4c38a17a..927c8ef250 100644 --- a/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/BaseServicesConstants.java +++ b/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/BaseServicesConstants.java @@ -1,16 +1,19 @@ package com.mogo.base.services; -public -/** +import androidx.annotation.Keep; + +public abstract +/* * @author congtaowang * @since 2020/7/23 * * 描述 */ -interface BaseServicesConstants { +class BaseServicesConstants { /** * 建立长链的通道ID */ - String SOCKET_CHANNEL_ID = "dataCrawler"; + @Keep + public static final String SOCKET_CHANNEL_ID = "dataCrawler"; } diff --git a/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/passport/PassportManager.java b/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/passport/PassportManager.java index 5a9c740370..183e633722 100644 --- a/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/passport/PassportManager.java +++ b/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/passport/PassportManager.java @@ -16,7 +16,7 @@ import com.zhidao.tcloginsdk.model.TokenData; import com.zhidao.tcloginsdk.network.LoginCallback; public -/** +/* * @author congtaowang * @since 2020/7/16 * diff --git a/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/socket/SocketManager.java b/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/socket/SocketManager.java index 4a1454a060..fc97fc9fb4 100644 --- a/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/socket/SocketManager.java +++ b/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/socket/SocketManager.java @@ -174,7 +174,7 @@ class SocketManager implements IMogoSocketManager, Callback { Logger.w( TAG, "msgType %d is exist.", msgType ); } if ( !mListeners.containsKey( msgType ) ) { - mListeners.put( msgType, new ArrayList< IMogoOnMessageListener >() ); + mListeners.put( msgType, new ArrayList<>() ); } mListeners.get( msgType ).add( listener ); } diff --git a/foudations/mogo-base-websocket-sdk/consumer-rules.pro b/foudations/mogo-base-websocket-sdk/consumer-rules.pro index e69de29bb2..54ff53d0c7 100644 --- a/foudations/mogo-base-websocket-sdk/consumer-rules.pro +++ b/foudations/mogo-base-websocket-sdk/consumer-rules.pro @@ -0,0 +1,2 @@ +-keep class com.mogo.base.websocket.WebSocketData{*;} +-keep class com.mogo.base.websocket.WebSocketShakeHandsData{*;} \ No newline at end of file diff --git a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketConstant.java b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketConstant.java index c828e0b1d8..f0e5ec13b7 100644 --- a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketConstant.java +++ b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketConstant.java @@ -1,21 +1,30 @@ package com.mogo.base.websocket; +import androidx.annotation.Keep; + import com.mogo.commons.debug.DebugConfig; +@Keep public class WebSocketConstant { private static final String HOST_DEV = "ws://62.234.196.121"; private static final String HOST_QA = "ws://62.234.196.121"; private static final String HOST_DEMO = "ws://62.234.196.121"; + @Keep private static final String HOST_RELEASE = "ws://62.234.196.121"; -// private static final String PORT = ":14001/ws"; - public static final String PORT = ":4004/ws"; + // private static final String PORT = ":14001/ws"; + @Keep + public static final String PATH = "/ws"; + @Keep + public static final String PORT = ":4004"+PATH; + @Keep public static final String PROTOCOL = "ws://"; private static final String DOMAIN_DEV = "dzt-city.zhidaozhixing.com"; private static final String DOMAIN_QA = "dzt-city.zhidaozhixing.com"; private static final String DOMAIN_DEMO = "dzt-city.zhidaozhixing.com"; + @Keep private static final String DOMAIN_RELEASE = "dzt-city.zhidaozhixing.com"; public static String getSocketServer() { diff --git a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketDnsManager.java b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketDnsManager.java index 52b33f2d5c..a7f94f87b9 100644 --- a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketDnsManager.java +++ b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketDnsManager.java @@ -1,6 +1,7 @@ package com.mogo.base.websocket; import com.alibaba.android.arouter.launcher.ARouter; +import com.mogo.httpdns.HttpDnsConst; import com.mogo.httpdns.IMogoHttpDns; import com.mogo.utils.ThreadPoolService; import com.mogo.utils.logger.Logger; @@ -27,22 +28,22 @@ public class WebSocketDnsManager { public void getHttpDnsIp(WebSocketDns webSocketDns) { this.webSocketDns = webSocketDns; IMogoHttpDns mogoHttpDns = ARouter.getInstance().navigation(IMogoHttpDns.class); - ThreadPoolService.execute(() -> mogoHttpDns.getHttpDnsIp(WebSocketConstant.getDomain(), false, ip -> { + ThreadPoolService.execute(() -> mogoHttpDns.getHttpDnsIp(WebSocketConstant.getDomain(), HttpDnsConst.HTTP_DNS_ADDRESS_TYPE_WS,false, ip -> { Logger.d(TAG, "getHttpDnsIp ip : " + ip + " , 得到Dns IP,准备回调 初始化webSocket"); this.cacheIp = ip; this.webSocketDns.getDnsIp((cacheIp != null ? - WebSocketConstant.PROTOCOL + ip + WebSocketConstant.PORT : + WebSocketConstant.PROTOCOL + ip + WebSocketConstant.PATH : WebSocketConstant.getSocketServer() + WebSocketConstant.PORT)); })); - mogoHttpDns.addHttpDnsTtlCallback(WebSocketConstant.getDomain(), () -> { + mogoHttpDns.addHttpDnsTtlCallback(WebSocketConstant.getDomain(), HttpDnsConst.HTTP_DNS_ADDRESS_TYPE_WS, () -> { Logger.d(TAG, "ttl callBack ,ready to getCache Dns IP"); - String dnsCacheIp = mogoHttpDns.getCachedHttpDnsIps(WebSocketConstant.getDomain()); + String dnsCacheIp = mogoHttpDns.getCachedHttpDnsIps(WebSocketConstant.getDomain(),HttpDnsConst.HTTP_DNS_ADDRESS_TYPE_WS); if (dnsCacheIp == null) { return; } Logger.d(TAG, "获取缓存Dns IP : " + dnsCacheIp + " , 原缓存 IP ： " + cacheIp); if (cacheIp != null && !cacheIp.equals(dnsCacheIp)) { - this.webSocketDns.ttlIp(dnsCacheIp + WebSocketConstant.PORT); + this.webSocketDns.ttlIp(dnsCacheIp + WebSocketConstant.PATH); } }); } diff --git a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketHandlerThread.java b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketHandlerThread.java index 4343842f8c..67ecca8032 100644 --- a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketHandlerThread.java +++ b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketHandlerThread.java @@ -27,7 +27,7 @@ public class WebSocketHandlerThread extends HandlerThread { super.handleMessage(msg); if (msg.what == MSG_SEND) { Logger.d(tag, "WebSocketHandlerThread handleMessage = " + msg.obj.toString()); - SocketClient.getInstance().getClientProxy().sendMessage(msg.obj.toString()); + WebSocketInstanceHolder.getClientProxy().sendMessage(msg.obj.toString()); } } }; diff --git a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketInstanceHolder.java b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketInstanceHolder.java new file mode 100644 index 0000000000..4f2acf7a85 --- /dev/null +++ b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketInstanceHolder.java @@ -0,0 +1,26 @@ +package com.mogo.base.websocket; + +import com.mogo.websocket.SocketClient; + +public +/** + * @author congtaowang + * @since 2020/12/24 + * + * 描述 + */ +class WebSocketInstanceHolder { + + private volatile static SocketClient sClient; + + public static SocketClient getClientProxy() { + if ( sClient == null ) { + synchronized ( WebSocketInstanceHolder.class ) { + if ( sClient == null ) { + sClient = new SocketClient(); + } + } + } + return sClient; + } +} diff --git a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java index eafa6edacf..5e110bb8ea 100644 --- a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java +++ b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java @@ -5,8 +5,6 @@ import android.os.SystemClock; import androidx.annotation.Keep; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.mogo.commons.network.Utils; import com.mogo.map.location.MogoLocation; import com.mogo.module.common.MogoApisHandler; @@ -17,7 +15,6 @@ import com.mogo.utils.logger.Logger; import com.mogo.utils.network.utils.GsonUtil; import com.mogo.websocket.ISocketMsgCallBack; import com.mogo.websocket.ISocketMsgSetting; -import com.mogo.websocket.SocketClient; import java.util.ArrayList; import java.util.Iterator; @@ -28,7 +25,6 @@ import java.util.concurrent.ConcurrentHashMap; import static com.mogo.service.connection.WebSocketMsgType.MSG_TYPE_ACK; import static com.mogo.service.connection.WebSocketMsgType.MSG_TYPE_DOWNLINK_CAR_DATA; -@Keep public class WebSocketManager implements IMogoWebSocketManager, ISocketMsgSetting, ISocketMsgCallBack { @@ -82,8 +78,8 @@ public class WebSocketManager implements IMogoWebSocketManager, ISocketMsgSettin @Override public void ttlIp(String url) { Logger.d(TAG,"ttlIp url : " + url); - SocketClient.getInstance().getClientProxy().stop(); - SocketClient.getInstance().getClientProxy().disConnect(); + WebSocketInstanceHolder.getClientProxy().stop(); + WebSocketInstanceHolder.getClientProxy().disConnect(); Logger.d(TAG,"ready to re initWebSocket : " + url); initWebSocket(url); } @@ -91,10 +87,10 @@ public class WebSocketManager implements IMogoWebSocketManager, ISocketMsgSettin } private void initWebSocket(String ip){ - SocketClient.getInstance().getClientProxy().initSocketServer(ip); - SocketClient.getInstance().getClientProxy().getMessageSettings(this); - SocketClient.getInstance().getClientProxy().addISocketMsgCallBack(this); - SocketClient.getInstance().getClientProxy().startConnect(); + WebSocketInstanceHolder.getClientProxy().initSocketServer(ip); + WebSocketInstanceHolder.getClientProxy().getMessageSettings(this); + WebSocketInstanceHolder.getClientProxy().addISocketMsgCallBack(this); + WebSocketInstanceHolder.getClientProxy().startConnect(); } @Override @@ -224,8 +220,8 @@ public class WebSocketManager implements IMogoWebSocketManager, ISocketMsgSettin @Override public void onConnectClose() { Logger.d(TAG, "websocket ready to reconnect"); - SocketClient.getInstance().getClientProxy().stop(); - SocketClient.getInstance().getClientProxy().reConnect(); + WebSocketInstanceHolder.getClientProxy().stop(); + WebSocketInstanceHolder.getClientProxy().reConnect(); } @Override diff --git a/foudations/mogo-commons/consumer-rules.pro b/foudations/mogo-commons/consumer-rules.pro index e4e113ccaf..4a2c88a6b9 100644 --- a/foudations/mogo-commons/consumer-rules.pro +++ b/foudations/mogo-commons/consumer-rules.pro @@ -1,5 +1,5 @@ #-----Foundation-Commons----- --keep class com.mogo.commons.data.BaseData.*{*;} +-keep class com.mogo.commons.data.BaseData{*;} -keep class com.mogo.commons.voice.VoiceIntentTrack -keep class com.mogo.commons.voice.VoiceTrack -keep class com.mogo.commons.voice.VoicePreemptType diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/analytics/AnalyticsUtils.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/analytics/AnalyticsUtils.java index e457421552..b1f3cdafc5 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/analytics/AnalyticsUtils.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/analytics/AnalyticsUtils.java @@ -2,6 +2,8 @@ package com.mogo.commons.analytics; import android.content.Context; +import androidx.annotation.Keep; + import com.elegant.analytics.Analytics; import com.elegant.analytics.AnalyticsConfig; import com.elegant.analytics.IAnalyticsParamsProvider; @@ -20,6 +22,7 @@ import java.util.Map; */ public class AnalyticsUtils { + @Keep public static void init( Context context ) { // 1 - debug 近实时上报，积累一条埋点上报，或者积累3秒上报一次。 // 2 - 本地缓存，聚合上报，积累30条埋点上报，或者积累60秒上报一次。 diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/layoutinflater/OriginalLayoutInflater.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/layoutinflater/OriginalLayoutInflater.java new file mode 100644 index 0000000000..7c9a9fc496 --- /dev/null +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/layoutinflater/OriginalLayoutInflater.java @@ -0,0 +1,32 @@ +package com.mogo.commons.layoutinflater; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.LayoutRes; + +public +/** + * @author congtaowang + * @since 2020/12/23 + * + * 系统实现的布局加载 + */ +class OriginalLayoutInflater { + + private static LayoutInflater sLayoutInflater; + + public static void init( Context context ) { + sLayoutInflater = LayoutInflater.from( context ).cloneInContext( context ); + } + + public static View inflate( @LayoutRes int layoutId, ViewGroup container, boolean attachToRoot ) { + return sLayoutInflater.inflate( layoutId, container, attachToRoot ); + } + + public static View inflate( @LayoutRes int layoutId, ViewGroup container ) { + return sLayoutInflater.inflate( layoutId, container, container != null ); + } +} diff --git a/gradle.properties b/gradle.properties index 5977d55cae..29181c377e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -129,20 +129,21 @@ TTS_ZHI_VERSION=2.0.12 TTS_NOOP_VERSION=2.0.12 # 自研地图 MAP_CUSTOM_VERSION=2.0.12 -MOGO_MODULES_MVISION_VERSION=2.0.12 +#MOGO_MODULES_MVISION_VERSION=2.0.12 MOGO_MODULES_SMALL_MAP=1.0.0 # httpdns HTTPDNS_TENCENT_VERSION = 2.0.12 +HTTPDNS_MOGO_VERSION=2.0.12 HTTPDNS_BASE_VERSION = 2.0.12 HTTPDNS_NOOP_VERSION = 2.0.12 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=2.2.35 +CARCHATTING_VERSION=2.2.42 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.8 # websocket -WEBSOCKET_VERSION=1.1.2 +WEBSOCKET_VERSION=1.1.7 # loglib LOGLIB_VERSION = 1.0.4 diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index ebd597f443..b4e3a6729c 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -67,7 +67,8 @@ dependencies { implementation project(':foudations:mogo-commons') } - implementation 'com.zhidaoauto.machine:map:1.0.0-vr-7.4.4' + implementation 'com.zhidaoauto.machine:map:1.0.0-vr-7.5.3' +// implementation 'com.zhidaoauto.machine:map:1.0.0-vr-7.4.5-log-1' } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java index 6f2926e740..09633693d8 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java @@ -62,7 +62,8 @@ public class AMapViewWrapper implements IMogoMapView, OnMapClickListener, OnMapTouchListener, OnMarkClickListener, - OnMapStyleListener { + OnMapStyleListener, + MapStyleController.IMapStyleAutoChangedListener { private static final String TAG = "AMapViewWrapper"; private final MapAutoView mMapView; @@ -92,10 +93,15 @@ public class AMapViewWrapper implements IMogoMapView, if ( DebugConfig.isDebug() ) { GpsTester.getInstance().init( mMapView ); } + initViews(); initListeners(); this.mIMap = new AMapWrapper( this.mMapView.getMapAutoViewHelper(), this.mMapView, this ); } + private void initViews() { + + } + private void initMapView() { if ( mMapView == null ) { return; @@ -307,6 +313,7 @@ public class AMapViewWrapper implements IMogoMapView, if ( ui == null ) { return; } + Logger.d( TAG, "ui = %s", ui ); if ( checkAMapView() ) { switch ( ui ) { case CarUp_2D: @@ -684,6 +691,7 @@ public class AMapViewWrapper implements IMogoMapView, } NaviClient.getInstance( getContext() ).syncCarLocation( sysLocation ); + MapStyleController.getInstance().onLocationChanged( location, this ); } @Override @@ -797,4 +805,21 @@ public class AMapViewWrapper implements IMogoMapView, public void testGpsData() { GpsTester.getInstance().testGpsData(); } + + @Override + public void onStyleAutoChanged( boolean isVrMode ) { + if ( isVrMode ) { + if ( mCurrentUI != EnumMapUI.Type_VR ) { + changeZoom( 20 ); + changeMapMode( EnumMapUI.Type_VR ); + Logger.d( TAG, "自动切换为vr模式" ); + } + } else { + if ( mCurrentUI == EnumMapUI.Type_VR ) { + changeZoom( 16 ); + changeMapMode( EnumMapUI.Type_Night ); + Logger.d( TAG, "自动切换为2D模式" ); + } + } + } } diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java index 4e9a9a7885..2dd9320480 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java @@ -95,8 +95,6 @@ class CustomMapApiBuilder implements IMogoMapApiBuilder { .setDebugMode( true ) .setCoordinateType( MapParams.COORDINATETYPE_GCJ02 ) .setPerspectiveMode( MapParams.MAP_PERSPECTIVE_2D ) - .setStyleDir( "sdcard/shmdata_asset/mogo_style" ) - .setCachePath( "sdcard/tiles" ) .setZoom( 16 ) .setPointToCenter( 0.734375f, 0.5f ) .setStyleMode( MapParams.MAP_STYLE_NIGHT ), NavParams.Companion.init() ); diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/MapStyleController.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/MapStyleController.java new file mode 100644 index 0000000000..4a081d996f --- /dev/null +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/MapStyleController.java @@ -0,0 +1,108 @@ +package com.mogo.map.impl.custom; + + +import com.zhidaoauto.map.sdk.open.location.MogoLocation; + +import java.util.ArrayList; +import java.util.List; + +public +/** + * @author congtaowang + * @since 2020/12/25 + * + * 地图样式控制 + */ +class MapStyleController { + + + private static volatile MapStyleController sInstance; + + private boolean mIsInVrMode = false; + + private List< VrAreaFilter > mVrAreaFilters = new ArrayList<>(); + + private MapStyleController() { + mVrAreaFilters.add( new ShunYiArea() ); + } + + public static MapStyleController getInstance() { + if ( sInstance == null ) { + synchronized ( MapStyleController.class ) { + if ( sInstance == null ) { + sInstance = new MapStyleController(); + } + } + } + return sInstance; + } + + public synchronized void release() { + sInstance = null; + } + + private Object readResolve() { + // 阻止反序列化，必须实现 Serializable 接口 + return sInstance; + } + + public void onLocationChanged( MogoLocation location, IMapStyleAutoChangedListener listener ) { + if ( location == null ) { + return; + } + + boolean isInVrMode = false; + for ( VrAreaFilter vrAreaFilter : mVrAreaFilters ) { + if ( vrAreaFilter == null ) { + continue; + } + isInVrMode |= vrAreaFilter.isVrArea( location ); + if ( isInVrMode ) { + break; + } + } + if ( isInVrMode ) { + if ( !mIsInVrMode ) { + // 第一次进入 vr 区域，自动变为 vr 模式 + mIsInVrMode = true; + if ( listener != null ) { + listener.onStyleAutoChanged( true ); + } + } + } else { + if ( mIsInVrMode ) { + // 驶出 vr 区域，自动变为 2d 模式 + mIsInVrMode = false; + if ( listener != null ) { + listener.onStyleAutoChanged( false ); + } + } + } + } + + public interface IMapStyleAutoChangedListener { + void onStyleAutoChanged( boolean isVrMode ); + } + + public interface VrAreaFilter { + boolean isVrArea( MogoLocation location ); + } + + public static class ShunYiArea implements VrAreaFilter { + + // 顺义一期高精地图范围（目前圈定了一个矩形区域，认为都是高精地图区域） + private final double leftBottomLat = 40.18728; + private final double leftBottomLon = 116.71194; + private final double rightTopLat = 40.20671; + private final double rightTopLon = 116.74804; + + @Override + public boolean isVrArea( MogoLocation location ) { + if ( location == null ) { + return false; + } + return location.getLat() > leftBottomLat && location.getLon() > leftBottomLon + && location.getLat() < rightTopLat && location.getLon() < rightTopLon; + } + } +} diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/location/GpsTester.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/location/GpsTester.java index c21716e56b..67c2b8c6e4 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/location/GpsTester.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/location/GpsTester.java @@ -74,8 +74,8 @@ class GpsTester { break; case 2: try { - readOneLineGpsDataAndSet2Map(); - sendEmptyMessageDelayed( 2, 0 ); + long time = readOneLineGpsDataAndSet2Map(); + sendEmptyMessageDelayed( 2, time ); } catch ( Exception e ) { e.printStackTrace(); } @@ -112,7 +112,6 @@ class GpsTester { if ( TextUtils.isEmpty( line ) ) { return 0; } - int count = 0; long duration = 3; @@ -154,7 +153,6 @@ class GpsTester { step++; if ( step >= 50 ) { step = 0; - count++; long realDuration = mogoLocation.getDuration() + 75; realDuration = realDuration / 4; diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/ObjectUtils.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/ObjectUtils.java index 2639322021..29574c7749 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/ObjectUtils.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/ObjectUtils.java @@ -72,8 +72,8 @@ public class ObjectUtils { MarkerOptions markerOptions = new MarkerOptions() .position(new LonLatPoint(opt.getLongitude(), opt.getLatitude())) .anchor(opt.getU(), opt.getV()) -// .icons( descriptors ) -// .period( opt.getPeriod() ) + .icons( descriptors ) + .period( opt.getPeriod() ) .rotateAngle(opt.getRotate()) .setFlat(opt.isFlat()) .visible(opt.isVisible()) diff --git a/main-extensions/mogo-module-main-launcher/build.gradle b/main-extensions/mogo-module-main-launcher/build.gradle index 4b878becc8..7d208f4876 100644 --- a/main-extensions/mogo-module-main-launcher/build.gradle +++ b/main-extensions/mogo-module-main-launcher/build.gradle @@ -42,10 +42,8 @@ dependencies { annotationProcessor rootProject.ext.dependencies.aroutercompiler if (Boolean.valueOf(RELEASE)) { api rootProject.ext.dependencies.modulemain - api rootProject.ext.dependencies.moduleapps } else { api project(":modules:mogo-module-main") - api project(':modules:mogo-module-apps') } } diff --git a/modules/mogo-module-apps/build.gradle b/modules/mogo-module-apps/build.gradle index fa04f473f9..36fc6a07e3 100644 --- a/modules/mogo-module-apps/build.gradle +++ b/modules/mogo-module-apps/build.gradle @@ -34,6 +34,9 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } + sourceSets { + main.res.srcDirs = ['src/main/res', 'src/main/res-voice-icon'] + } } dependencies { diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java index 5b70818cc9..b2cfb35812 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java @@ -44,6 +44,7 @@ public class AppNavigatorFragment extends MvpFragment< AppNavigatorView, AppNavi private RecyclerView mNavigatorAppsList; private AppIndicatorAdapter mAppIndicatorAdapter; + private ImageView mAIAssistBkg; private ImageView mAIAssist; private View mAIAssistContainer; private AnimWrapper mAnim; @@ -71,13 +72,14 @@ public class AppNavigatorFragment extends MvpFragment< AppNavigatorView, AppNavi mNavigatorAppsList.setAdapter( mAppIndicatorAdapter ); mAIAssistContainer = findViewById( R.id.module_apps_id_ai_assist_container ); + mAIAssistBkg = findViewById( R.id.module_apps_id_ai_assist_bkg ); mAIAssist = findViewById( R.id.module_apps_id_ai_assist ); - mAnim = new AnimWrapper( mAIAssist ); + mAnim = new AnimWrapper( mAIAssist, mAIAssistBkg ); boolean naviStatus = AppServiceHandler.getApis().getMapServiceApi().getNavi( getContext() ).isNaviing(); -// if ( naviStatus ) { -// setCurrentXiaoZhiEmoji( AnimRes.EmojiType.Navigation ); -// } + if ( naviStatus ) { + setCurrentXiaoZhiEmoji( AnimRes.EmojiType.Navigation ); + } mAIAssist.setOnClickListener( new OnAiAssistClickListener() ); mAIAssistContainer.setOnClickListener( view -> { @@ -109,12 +111,12 @@ public class AppNavigatorFragment extends MvpFragment< AppNavigatorView, AppNavi @Override public void setCurrentXiaoZhiEmoji( AnimRes.EmojiType type ) { -// boolean started = mAnim.isStarted(); -// mAnim.stop(); -// mAnim.setCurrentAnim( type ); -// if ( started ) { -// mAnim.start(); -// } + boolean started = mAnim.isStarted(); + mAnim.stop(); + mAnim.setCurrentAnim( type ); + if ( started ) { + mAnim.start(); + } } @Override diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/anim/AnimRes.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/anim/AnimRes.java index 8a2a6f10de..e5b8316cf7 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/anim/AnimRes.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/anim/AnimRes.java @@ -18,83 +18,502 @@ public class AnimRes { } public static final int sNavigation[] = { - + R.drawable.ic_navi_00000, + R.drawable.ic_navi_00001, + R.drawable.ic_navi_00002, + R.drawable.ic_navi_00003, + R.drawable.ic_navi_00004, + R.drawable.ic_navi_00005, + R.drawable.ic_navi_00006, + R.drawable.ic_navi_00007, + R.drawable.ic_navi_00008, + R.drawable.ic_navi_00009, + R.drawable.ic_navi_00010, + R.drawable.ic_navi_00011, + R.drawable.ic_navi_00012, + R.drawable.ic_navi_00013, + R.drawable.ic_navi_00014, + R.drawable.ic_navi_00015, + R.drawable.ic_navi_00016, + R.drawable.ic_navi_00017, + R.drawable.ic_navi_00018, + R.drawable.ic_navi_00019, + R.drawable.ic_navi_00020, + R.drawable.ic_navi_00021, + R.drawable.ic_navi_00022, + R.drawable.ic_navi_00023, + R.drawable.ic_navi_00024, + R.drawable.ic_navi_00025, + R.drawable.ic_navi_00026, + R.drawable.ic_navi_00027, + R.drawable.ic_navi_00028, + R.drawable.ic_navi_00029, + R.drawable.ic_navi_00030, + R.drawable.ic_navi_00031, + R.drawable.ic_navi_00032, + R.drawable.ic_navi_00033, + R.drawable.ic_navi_00034, + R.drawable.ic_navi_00035 }; public static final int sMusic[] = { - + R.drawable.ic_music_00000, + R.drawable.ic_music_00001, + R.drawable.ic_music_00002, + R.drawable.ic_music_00003, + R.drawable.ic_music_00004, + R.drawable.ic_music_00005, + R.drawable.ic_music_00006, + R.drawable.ic_music_00007, + R.drawable.ic_music_00008, + R.drawable.ic_music_00009, + R.drawable.ic_music_00010, + R.drawable.ic_music_00011, + R.drawable.ic_music_00012, + R.drawable.ic_music_00013, + R.drawable.ic_music_00014, + R.drawable.ic_music_00015, + R.drawable.ic_music_00016, + R.drawable.ic_music_00017, + R.drawable.ic_music_00018, + R.drawable.ic_music_00019, + R.drawable.ic_music_00020, + R.drawable.ic_music_00021, + R.drawable.ic_music_00022, + R.drawable.ic_music_00023, + R.drawable.ic_music_00024, + R.drawable.ic_music_00025 }; - public static final int sAll[][] = new int[][]{{ - R.drawable.mogo_tts_icon_00000, - R.drawable.mogo_tts_icon_00001, - R.drawable.mogo_tts_icon_00002, - R.drawable.mogo_tts_icon_00003, - R.drawable.mogo_tts_icon_00004, - R.drawable.mogo_tts_icon_00005, - R.drawable.mogo_tts_icon_00006, - R.drawable.mogo_tts_icon_00007, - R.drawable.mogo_tts_icon_00008, - R.drawable.mogo_tts_icon_00009, - R.drawable.mogo_tts_icon_00010, - R.drawable.mogo_tts_icon_00011, - R.drawable.mogo_tts_icon_00012, - R.drawable.mogo_tts_icon_00013, - R.drawable.mogo_tts_icon_00014, - R.drawable.mogo_tts_icon_00015, - R.drawable.mogo_tts_icon_00016, - R.drawable.mogo_tts_icon_00017, - R.drawable.mogo_tts_icon_00018, - R.drawable.mogo_tts_icon_00019, - R.drawable.mogo_tts_icon_00020, - R.drawable.mogo_tts_icon_00021, - R.drawable.mogo_tts_icon_00022, - R.drawable.mogo_tts_icon_00023, - R.drawable.mogo_tts_icon_00024, - R.drawable.mogo_tts_icon_00025, - R.drawable.mogo_tts_icon_00026, - R.drawable.mogo_tts_icon_00027, - R.drawable.mogo_tts_icon_00028, - R.drawable.mogo_tts_icon_00029, - R.drawable.mogo_tts_icon_00030, - R.drawable.mogo_tts_icon_00031, - R.drawable.mogo_tts_icon_00032, - R.drawable.mogo_tts_icon_00033, - R.drawable.mogo_tts_icon_00034, - R.drawable.mogo_tts_icon_00035, - R.drawable.mogo_tts_icon_00036, - R.drawable.mogo_tts_icon_00037, - R.drawable.mogo_tts_icon_00038, - R.drawable.mogo_tts_icon_00039, - R.drawable.mogo_tts_icon_00040, - R.drawable.mogo_tts_icon_00041, - R.drawable.mogo_tts_icon_00042, - R.drawable.mogo_tts_icon_00043, - R.drawable.mogo_tts_icon_00044, - R.drawable.mogo_tts_icon_00045, - R.drawable.mogo_tts_icon_00046, - R.drawable.mogo_tts_icon_00047, - R.drawable.mogo_tts_icon_00048, - R.drawable.mogo_tts_icon_00049, - R.drawable.mogo_tts_icon_00050, - R.drawable.mogo_tts_icon_00051, - R.drawable.mogo_tts_icon_00052, - R.drawable.mogo_tts_icon_00053, - R.drawable.mogo_tts_icon_00054, - R.drawable.mogo_tts_icon_00055, - R.drawable.mogo_tts_icon_00056, - R.drawable.mogo_tts_icon_00057, - R.drawable.mogo_tts_icon_00058, - R.drawable.mogo_tts_icon_00059, - R.drawable.mogo_tts_icon_00060, - R.drawable.mogo_tts_icon_00061, - R.drawable.mogo_tts_icon_00062, - R.drawable.mogo_tts_icon_00063, - R.drawable.mogo_tts_icon_00064, - R.drawable.mogo_tts_icon_00065, - R.drawable.mogo_tts_icon_00066, - R.drawable.mogo_tts_icon_00067 - }}; + public static final int sBlink[] = { + R.drawable.ic_blink_00000, + R.drawable.ic_blink_00001, + R.drawable.ic_blink_00002, + R.drawable.ic_blink_00003, + R.drawable.ic_blink_00004, + R.drawable.ic_blink_00005, + R.drawable.ic_blink_00006, + R.drawable.ic_blink_00007, + R.drawable.ic_blink_00008, + R.drawable.ic_blink_00009, + R.drawable.ic_blink_00010, + R.drawable.ic_blink_00011, + R.drawable.ic_blink_00012, + R.drawable.ic_blink_00013, + R.drawable.ic_blink_00014, + R.drawable.ic_blink_00015, + R.drawable.ic_blink_00016, + R.drawable.ic_blink_00017, + R.drawable.ic_blink_00018, + R.drawable.ic_blink_00019, + R.drawable.ic_blink_00020, + R.drawable.ic_blink_00021, + R.drawable.ic_blink_00022, + R.drawable.ic_blink_00023, + R.drawable.ic_blink_00024, + R.drawable.ic_blink_00025, + R.drawable.ic_blink_00026, + R.drawable.ic_blink_00027, + R.drawable.ic_blink_00028, + R.drawable.ic_blink_00029, + R.drawable.ic_blink_00030, + R.drawable.ic_blink_00031, + R.drawable.ic_blink_00032, + R.drawable.ic_blink_00033, + R.drawable.ic_blink_00034, + R.drawable.ic_blink_00035 + }; + + public static final int sDaily[] = { + R.drawable.ic_daily_00000, + R.drawable.ic_daily_00001, + R.drawable.ic_daily_00002, + R.drawable.ic_daily_00003, + R.drawable.ic_daily_00004, + R.drawable.ic_daily_00005, + R.drawable.ic_daily_00006, + R.drawable.ic_daily_00007, + R.drawable.ic_daily_00008, + R.drawable.ic_daily_00009, + R.drawable.ic_daily_00010, + R.drawable.ic_daily_00011, + R.drawable.ic_daily_00012, + R.drawable.ic_daily_00013, + R.drawable.ic_daily_00014, + R.drawable.ic_daily_00015, + R.drawable.ic_daily_00016, + R.drawable.ic_daily_00017, + R.drawable.ic_daily_00018, + R.drawable.ic_daily_00019, + R.drawable.ic_daily_00020, + R.drawable.ic_daily_00021, + R.drawable.ic_daily_00022, + R.drawable.ic_daily_00023, + R.drawable.ic_daily_00024, + R.drawable.ic_daily_00025, + R.drawable.ic_daily_00026, + R.drawable.ic_daily_00027, + R.drawable.ic_daily_00028, + R.drawable.ic_daily_00029, + R.drawable.ic_daily_00030, + R.drawable.ic_daily_00031, + R.drawable.ic_daily_00032, + R.drawable.ic_daily_00033, + R.drawable.ic_daily_00034, + R.drawable.ic_daily_00035, + R.drawable.ic_daily_00036, + R.drawable.ic_daily_00037, + R.drawable.ic_daily_00038, + R.drawable.ic_daily_00039, + R.drawable.ic_daily_00040, + R.drawable.ic_daily_00041, + R.drawable.ic_daily_00042 + }; + + public static final int sHappy1[] = { + R.drawable.ic_happy1_00000, + R.drawable.ic_happy1_00001, + R.drawable.ic_happy1_00002, + R.drawable.ic_happy1_00003, + R.drawable.ic_happy1_00004, + R.drawable.ic_happy1_00005, + R.drawable.ic_happy1_00006, + R.drawable.ic_happy1_00007, + R.drawable.ic_happy1_00008, + R.drawable.ic_happy1_00009, + R.drawable.ic_happy1_00010, + R.drawable.ic_happy1_00011, + R.drawable.ic_happy1_00012, + R.drawable.ic_happy1_00013, + R.drawable.ic_happy1_00014, + R.drawable.ic_happy1_00015, + R.drawable.ic_happy1_00016, + R.drawable.ic_happy1_00017, + R.drawable.ic_happy1_00018, + R.drawable.ic_happy1_00019, + R.drawable.ic_happy1_00020, + R.drawable.ic_happy1_00021, + R.drawable.ic_happy1_00022, + R.drawable.ic_happy1_00023, + R.drawable.ic_happy1_00024, + R.drawable.ic_happy1_00025, + R.drawable.ic_happy1_00026, + R.drawable.ic_happy1_00027, + R.drawable.ic_happy1_00028 + }; + + public static final int sHappy2[] = { + R.drawable.ic_happy2_00000, + R.drawable.ic_happy2_00001, + R.drawable.ic_happy2_00002, + R.drawable.ic_happy2_00003, + R.drawable.ic_happy2_00004, + R.drawable.ic_happy2_00005, + R.drawable.ic_happy2_00006, + R.drawable.ic_happy2_00007, + R.drawable.ic_happy2_00008, + R.drawable.ic_happy2_00009, + R.drawable.ic_happy2_00010, + R.drawable.ic_happy2_00011, + R.drawable.ic_happy2_00012, + R.drawable.ic_happy2_00013, + R.drawable.ic_happy2_00014, + R.drawable.ic_happy2_00015, + R.drawable.ic_happy2_00016, + R.drawable.ic_happy2_00017, + R.drawable.ic_happy2_00018, + R.drawable.ic_happy2_00019, + R.drawable.ic_happy2_00020, + R.drawable.ic_happy2_00021 + }; + + public static final int sOverlook[] = { + R.drawable.ic_overlooking_00000, + R.drawable.ic_overlooking_00001, + R.drawable.ic_overlooking_00002, + R.drawable.ic_overlooking_00003, + R.drawable.ic_overlooking_00004, + R.drawable.ic_overlooking_00005, + R.drawable.ic_overlooking_00006, + R.drawable.ic_overlooking_00007, + R.drawable.ic_overlooking_00008, + R.drawable.ic_overlooking_00009, + R.drawable.ic_overlooking_00010, + R.drawable.ic_overlooking_00011, + R.drawable.ic_overlooking_00012, + R.drawable.ic_overlooking_00013, + R.drawable.ic_overlooking_00014, + R.drawable.ic_overlooking_00015, + R.drawable.ic_overlooking_00016, + R.drawable.ic_overlooking_00017, + R.drawable.ic_overlooking_00018, + R.drawable.ic_overlooking_00019, + R.drawable.ic_overlooking_00020, + R.drawable.ic_overlooking_00021, + R.drawable.ic_overlooking_00022, + R.drawable.ic_overlooking_00023, + R.drawable.ic_overlooking_00024, + R.drawable.ic_overlooking_00025, + R.drawable.ic_overlooking_00026, + R.drawable.ic_overlooking_00027, + R.drawable.ic_overlooking_00028, + R.drawable.ic_overlooking_00029, + R.drawable.ic_overlooking_00030, + R.drawable.ic_overlooking_00031, + R.drawable.ic_overlooking_00032, + R.drawable.ic_overlooking_00033, + R.drawable.ic_overlooking_00034, + R.drawable.ic_overlooking_00035, + R.drawable.ic_overlooking_00036, + R.drawable.ic_overlooking_00037, + R.drawable.ic_overlooking_00038, + R.drawable.ic_overlooking_00039, + R.drawable.ic_overlooking_00040, + R.drawable.ic_overlooking_00041, + R.drawable.ic_overlooking_00042, + R.drawable.ic_overlooking_00043, + R.drawable.ic_overlooking_00044, + R.drawable.ic_overlooking_00045, + R.drawable.ic_overlooking_00046, + R.drawable.ic_overlooking_00047, + R.drawable.ic_overlooking_00048, + R.drawable.ic_overlooking_00049, + R.drawable.ic_overlooking_00050, + R.drawable.ic_overlooking_00051, + R.drawable.ic_overlooking_00052, + R.drawable.ic_overlooking_00053, + R.drawable.ic_overlooking_00054, + R.drawable.ic_overlooking_00055, + R.drawable.ic_overlooking_00056, + R.drawable.ic_overlooking_00057, + R.drawable.ic_overlooking_00058, + R.drawable.ic_overlooking_00059, + R.drawable.ic_overlooking_00060, + R.drawable.ic_overlooking_00061, + R.drawable.ic_overlooking_00062, + R.drawable.ic_overlooking_00063, + R.drawable.ic_overlooking_00064, + R.drawable.ic_overlooking_00065, + R.drawable.ic_overlooking_00066, + R.drawable.ic_overlooking_00067, + R.drawable.ic_overlooking_00068, + R.drawable.ic_overlooking_00069, + R.drawable.ic_overlooking_00070, + R.drawable.ic_overlooking_00071, + R.drawable.ic_overlooking_00072, + R.drawable.ic_overlooking_00073, + R.drawable.ic_overlooking_00074, + R.drawable.ic_overlooking_00075, + R.drawable.ic_overlooking_00076, + R.drawable.ic_overlooking_00077, + R.drawable.ic_overlooking_00078, + R.drawable.ic_overlooking_00079 + }; + + public static final int sReading[] = { + R.drawable.ic_reading_00000, + R.drawable.ic_reading_00001, + R.drawable.ic_reading_00002, + R.drawable.ic_reading_00003, + R.drawable.ic_reading_00004, + R.drawable.ic_reading_00005, + R.drawable.ic_reading_00006, + R.drawable.ic_reading_00007, + R.drawable.ic_reading_00008, + R.drawable.ic_reading_00009, + R.drawable.ic_reading_00010, + R.drawable.ic_reading_00011, + R.drawable.ic_reading_00012, + R.drawable.ic_reading_00013, + R.drawable.ic_reading_00014, + R.drawable.ic_reading_00015, + R.drawable.ic_reading_00016, + R.drawable.ic_reading_00017, + R.drawable.ic_reading_00018, + R.drawable.ic_reading_00019, + R.drawable.ic_reading_00020, + R.drawable.ic_reading_00021, + R.drawable.ic_reading_00022, + R.drawable.ic_reading_00023, + R.drawable.ic_reading_00024, + R.drawable.ic_reading_00025, + R.drawable.ic_reading_00026, + R.drawable.ic_reading_00027, + R.drawable.ic_reading_00028, + R.drawable.ic_reading_00029, + R.drawable.ic_reading_00030, + R.drawable.ic_reading_00031, + R.drawable.ic_reading_00032, + R.drawable.ic_reading_00033, + R.drawable.ic_reading_00034, + R.drawable.ic_reading_00035, + R.drawable.ic_reading_00036, + R.drawable.ic_reading_00037, + R.drawable.ic_reading_00038, + R.drawable.ic_reading_00039, + R.drawable.ic_reading_00040, + R.drawable.ic_reading_00041, + R.drawable.ic_reading_00042, + R.drawable.ic_reading_00043, + R.drawable.ic_reading_00044, + R.drawable.ic_reading_00045, + R.drawable.ic_reading_00046, + R.drawable.ic_reading_00047, + R.drawable.ic_reading_00048, + R.drawable.ic_reading_00049, + R.drawable.ic_reading_00050, + R.drawable.ic_reading_00051, + R.drawable.ic_reading_00052, + R.drawable.ic_reading_00053, + R.drawable.ic_reading_00054, + R.drawable.ic_reading_00055, + R.drawable.ic_reading_00056, + R.drawable.ic_reading_00057, + R.drawable.ic_reading_00058, + R.drawable.ic_reading_00059, + R.drawable.ic_reading_00060, + R.drawable.ic_reading_00061, + R.drawable.ic_reading_00062, + R.drawable.ic_reading_00063, + R.drawable.ic_reading_00064, + R.drawable.ic_reading_00065, + R.drawable.ic_reading_00066, + R.drawable.ic_reading_00067, + R.drawable.ic_reading_00068, + R.drawable.ic_reading_00069, + R.drawable.ic_reading_00070, + R.drawable.ic_reading_00071, + R.drawable.ic_reading_00072, + R.drawable.ic_reading_00073, + R.drawable.ic_reading_00074, + R.drawable.ic_reading_00075, + R.drawable.ic_reading_00076, + R.drawable.ic_reading_00077, + R.drawable.ic_reading_00078, + R.drawable.ic_reading_00079, + R.drawable.ic_reading_00080, + R.drawable.ic_reading_00081, + R.drawable.ic_reading_00082, + R.drawable.ic_reading_00083, + R.drawable.ic_reading_00084, + R.drawable.ic_reading_00085, + R.drawable.ic_reading_00086, + R.drawable.ic_reading_00087, + R.drawable.ic_reading_00088, + R.drawable.ic_reading_00089, + R.drawable.ic_reading_00090, + R.drawable.ic_reading_00091 + }; + + public static final int[] sRunning = { + R.drawable.ic_running_00000, + R.drawable.ic_running_00001, + R.drawable.ic_running_00002, + R.drawable.ic_running_00003, + R.drawable.ic_running_00004, + R.drawable.ic_running_00005, + R.drawable.ic_running_00006, + R.drawable.ic_running_00007, + R.drawable.ic_running_00008, + R.drawable.ic_running_00009, + R.drawable.ic_running_00010, + R.drawable.ic_running_00011, + R.drawable.ic_running_00012, + R.drawable.ic_running_00013, + R.drawable.ic_running_00014, + R.drawable.ic_running_00015, + R.drawable.ic_running_00016, + R.drawable.ic_running_00017, + R.drawable.ic_running_00018, + R.drawable.ic_running_00019, + R.drawable.ic_running_00020, + R.drawable.ic_running_00021, + R.drawable.ic_running_00022, + R.drawable.ic_running_00023, + R.drawable.ic_running_00024, + R.drawable.ic_running_00025, + R.drawable.ic_running_00026, + R.drawable.ic_running_00027, + R.drawable.ic_running_00028, + R.drawable.ic_running_00029, + R.drawable.ic_running_00030, + R.drawable.ic_running_00031, + R.drawable.ic_running_00032, + R.drawable.ic_running_00033, + R.drawable.ic_running_00034, + R.drawable.ic_running_00035, + R.drawable.ic_running_00036 + }; + + public static final int sSleep[] = { + R.drawable.ic_sleep_00000, + R.drawable.ic_sleep_00001, + R.drawable.ic_sleep_00002, + R.drawable.ic_sleep_00003, + R.drawable.ic_sleep_00004, + R.drawable.ic_sleep_00005, + R.drawable.ic_sleep_00006, + R.drawable.ic_sleep_00007, + R.drawable.ic_sleep_00008, + R.drawable.ic_sleep_00009, + R.drawable.ic_sleep_00010, + R.drawable.ic_sleep_00011, + R.drawable.ic_sleep_00012, + R.drawable.ic_sleep_00013, + R.drawable.ic_sleep_00014, + R.drawable.ic_sleep_00015, + R.drawable.ic_sleep_00016, + R.drawable.ic_sleep_00017, + R.drawable.ic_sleep_00018, + R.drawable.ic_sleep_00019, + R.drawable.ic_sleep_00020, + R.drawable.ic_sleep_00021, + R.drawable.ic_sleep_00022, + R.drawable.ic_sleep_00023, + R.drawable.ic_sleep_00024, + R.drawable.ic_sleep_00025, + R.drawable.ic_sleep_00026, + R.drawable.ic_sleep_00027, + R.drawable.ic_sleep_00028, + R.drawable.ic_sleep_00029, + R.drawable.ic_sleep_00030, + R.drawable.ic_sleep_00031, + R.drawable.ic_sleep_00032, + R.drawable.ic_sleep_00033, + R.drawable.ic_sleep_00034, + R.drawable.ic_sleep_00035, + R.drawable.ic_sleep_00036, + R.drawable.ic_sleep_00037, + R.drawable.ic_sleep_00038, + R.drawable.ic_sleep_00039, + R.drawable.ic_sleep_00040, + R.drawable.ic_sleep_00041 + }; + + public static final int sAll[][] = new int[][]{ + sOverlook, + sBlink, + sDaily, + sHappy1, + sReading, + sRunning, + sHappy2, + sSleep + }; + + // 需要循环的点 + public static final int sKeyPoint[] = { + 0, + 0, + 0, + 0, + 47, + 26, + 0, + 0 + }; + + public static final int sKeyPointOfNavigation = 16; public static int sRes[] = sAll[0]; } diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/anim/AnimWrapper.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/anim/AnimWrapper.java index 97356c4102..03af6bcb7d 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/anim/AnimWrapper.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/anim/AnimWrapper.java @@ -1,5 +1,6 @@ package com.mogo.module.apps.anim; +import android.view.View; import android.widget.ImageView; import com.mogo.module.common.utils.CarSeries; @@ -17,8 +18,9 @@ public class AnimWrapper implements Anim { private Anim mDelegate; private boolean mIsStarted = false; - public AnimWrapper( ImageView target ) { + public AnimWrapper( ImageView target, ImageView bkg ) { if ( CarSeries.isF8xxSeries() ) { + bkg.setVisibility( View.VISIBLE ); mDelegate = new OthersAnim( target ); } else { mDelegate = new KitkatAnim( target ); diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/anim/OthersAnim.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/anim/OthersAnim.java index e649a7f5ba..18fafcd58a 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/anim/OthersAnim.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/anim/OthersAnim.java @@ -17,12 +17,13 @@ public class OthersAnim implements Anim { private final static int MSG_LOOP = 3003; public static final int MSG_CHANGE = 3004; - public static final long INTERVAL = 100L; + public static final long INTERVAL = 50L; private boolean mStarted = false; private ImageView mImageView; private int mEmojiIndex = 0; + private int mKeyPoint = 0; private Handler mHandler = new Handler( Looper.getMainLooper() ) { @Override @@ -34,6 +35,9 @@ public class OthersAnim implements Anim { if ( AnimRes.sRes.length == 0 ) { return; } + if ( mStartIndex >= AnimRes.sRes.length - 1 ) { + mStartIndex = mKeyPoint; + } mImageView.setImageResource( AnimRes.sRes[mStartIndex++ % AnimRes.sRes.length] ); mHandler.sendEmptyMessageDelayed( MSG_LOOP, INTERVAL ); } @@ -44,6 +48,7 @@ public class OthersAnim implements Anim { stop(); mEmojiIndex++; AnimRes.sRes = AnimRes.sAll[mEmojiIndex % AnimRes.sAll.length]; + mKeyPoint = AnimRes.sKeyPoint[mEmojiIndex % AnimRes.sKeyPoint.length]; mStartIndex = 0; if ( start ) { start(); @@ -70,7 +75,7 @@ public class OthersAnim implements Anim { } mStarted = true; mHandler.sendEmptyMessage( MSG_LOOP ); -// mHandler.sendEmptyMessageDelayed( MSG_CHANGE, 60 * 1_000L ); + mHandler.sendEmptyMessageDelayed( MSG_CHANGE, 30 * 1_000L ); } @Override @@ -89,10 +94,12 @@ public class OthersAnim implements Anim { switch ( type ) { case Navigation: mStartIndex = 0; + mKeyPoint = AnimRes.sKeyPointOfNavigation; AnimRes.sRes = AnimRes.sNavigation; break; case Music: mStartIndex = 0; + mKeyPoint = 0; AnimRes.sRes = AnimRes.sMusic; break; case Others: diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00000.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00000.png new file mode 100755 index 0000000000..652f6cf1d0 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00000.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00001.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00001.png new file mode 100755 index 0000000000..c9841c6eb7 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00001.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00002.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00002.png new file mode 100755 index 0000000000..f95e683880 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00002.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00003.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00003.png new file mode 100755 index 0000000000..0b7acf7c4b Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00003.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00004.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00004.png new file mode 100755 index 0000000000..468039b09b Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00004.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00005.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00005.png new file mode 100755 index 0000000000..8f2d2fd57d Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00005.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00006.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00006.png new file mode 100755 index 0000000000..a32305c57c Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00006.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00007.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00007.png new file mode 100755 index 0000000000..2fece497bd Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00007.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00008.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00008.png new file mode 100755 index 0000000000..d1f4d7ca0f Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00008.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00009.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00009.png new file mode 100755 index 0000000000..f1149b679b Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00009.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00010.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00010.png new file mode 100755 index 0000000000..b4feaeaed4 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00010.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00011.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00011.png new file mode 100755 index 0000000000..943c6de034 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00011.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00012.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00012.png new file mode 100755 index 0000000000..25277d5290 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00012.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00013.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00013.png new file mode 100755 index 0000000000..725f18f5c3 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00013.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00014.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00014.png new file mode 100755 index 0000000000..3d337db374 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00014.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00015.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00015.png new file mode 100755 index 0000000000..9a58fa3519 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00015.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00016.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00016.png new file mode 100755 index 0000000000..39f72457b7 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00016.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00017.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00017.png new file mode 100755 index 0000000000..1276140a13 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00017.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00018.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00018.png new file mode 100755 index 0000000000..41c1b471f4 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00018.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00019.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00019.png new file mode 100755 index 0000000000..85efa6c333 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00019.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00020.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00020.png new file mode 100755 index 0000000000..5b89b0247a Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00020.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00021.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00021.png new file mode 100755 index 0000000000..2c4b5fbdb3 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00021.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00022.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00022.png new file mode 100755 index 0000000000..6836cbe13f Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00022.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00023.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00023.png new file mode 100755 index 0000000000..2704f30faa Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00023.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00024.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00024.png new file mode 100755 index 0000000000..0469ea6a03 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00024.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00025.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00025.png new file mode 100755 index 0000000000..be9c1bf896 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00025.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00026.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00026.png new file mode 100755 index 0000000000..a68ba1d6a1 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00026.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00027.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00027.png new file mode 100755 index 0000000000..f27c8c3a7e Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00027.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00028.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00028.png new file mode 100755 index 0000000000..bef0288583 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00028.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00029.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00029.png new file mode 100755 index 0000000000..53329ab006 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00029.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00030.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00030.png new file mode 100755 index 0000000000..703bf19389 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00030.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00031.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00031.png new file mode 100755 index 0000000000..50a59e0fc2 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00031.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00032.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00032.png new file mode 100755 index 0000000000..3f54aaf6b7 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00032.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00033.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00033.png new file mode 100755 index 0000000000..075c87fc19 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00033.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00034.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00034.png new file mode 100755 index 0000000000..5fe168c691 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00034.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00035.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00035.png new file mode 100755 index 0000000000..8d6fdcc68d Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_blink_00035.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00000.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00000.png new file mode 100755 index 0000000000..7efb6db302 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00000.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00001.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00001.png new file mode 100755 index 0000000000..3caa9d5e3e Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00001.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00002.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00002.png new file mode 100755 index 0000000000..4767b45ccd Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00002.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00003.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00003.png new file mode 100755 index 0000000000..bd64848082 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00003.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00004.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00004.png new file mode 100755 index 0000000000..fb4fc3d8e4 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00004.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00005.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00005.png new file mode 100755 index 0000000000..59dc5740c8 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00005.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00006.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00006.png new file mode 100755 index 0000000000..33c588d82b Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00006.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00007.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00007.png new file mode 100755 index 0000000000..5d3d777bfa Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00007.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00008.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00008.png new file mode 100755 index 0000000000..14565ba301 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00008.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00009.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00009.png new file mode 100755 index 0000000000..cdde48c750 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00009.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00010.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00010.png new file mode 100755 index 0000000000..2ac337f1e4 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00010.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00011.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00011.png new file mode 100755 index 0000000000..a598971141 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00011.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00012.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00012.png new file mode 100755 index 0000000000..86e2d4bfe7 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00012.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00013.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00013.png new file mode 100755 index 0000000000..e0dbc66313 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00013.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00014.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00014.png new file mode 100755 index 0000000000..67eec123ce Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00014.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00015.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00015.png new file mode 100755 index 0000000000..b3dc6a3327 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00015.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00016.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00016.png new file mode 100755 index 0000000000..53883d0ed3 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00016.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00017.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00017.png new file mode 100755 index 0000000000..32d2000638 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00017.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00018.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00018.png new file mode 100755 index 0000000000..a385115eab Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00018.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00019.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00019.png new file mode 100755 index 0000000000..bfd24e8886 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00019.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00020.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00020.png new file mode 100755 index 0000000000..1a0d3b2726 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00020.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00021.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00021.png new file mode 100755 index 0000000000..a65526909a Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00021.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00022.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00022.png new file mode 100755 index 0000000000..98abcc7945 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00022.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00023.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00023.png new file mode 100755 index 0000000000..e1d8c3efc0 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00023.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00024.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00024.png new file mode 100755 index 0000000000..144e1769e8 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00024.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00025.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00025.png new file mode 100755 index 0000000000..537abc4b06 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00025.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00026.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00026.png new file mode 100755 index 0000000000..2ef8e3f0a9 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00026.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00027.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00027.png new file mode 100755 index 0000000000..71d11ff5dc Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00027.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00028.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00028.png new file mode 100755 index 0000000000..11022a0f3f Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00028.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00029.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00029.png new file mode 100755 index 0000000000..138455c8f8 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00029.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00030.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00030.png new file mode 100755 index 0000000000..870b3417df Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00030.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00031.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00031.png new file mode 100755 index 0000000000..08b69b291d Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00031.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00032.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00032.png new file mode 100755 index 0000000000..c0defb2cd0 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00032.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00033.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00033.png new file mode 100755 index 0000000000..6d60932027 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00033.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00034.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00034.png new file mode 100755 index 0000000000..5c1a720184 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00034.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00035.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00035.png new file mode 100755 index 0000000000..07bde6b3bc Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00035.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00036.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00036.png new file mode 100755 index 0000000000..8792441b5b Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00036.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00037.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00037.png new file mode 100755 index 0000000000..3ba1736009 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00037.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00038.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00038.png new file mode 100755 index 0000000000..051b5125c9 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00038.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00039.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00039.png new file mode 100755 index 0000000000..ef25044825 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00039.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00040.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00040.png new file mode 100755 index 0000000000..4a1940b825 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00040.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00041.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00041.png new file mode 100755 index 0000000000..a4a056f9d0 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00041.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00042.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00042.png new file mode 100755 index 0000000000..5d35b92349 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_daily_00042.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00000.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00000.png new file mode 100755 index 0000000000..a2be364289 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00000.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00001.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00001.png new file mode 100755 index 0000000000..9f8cb899c3 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00001.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00002.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00002.png new file mode 100755 index 0000000000..ee79ff71b6 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00002.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00003.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00003.png new file mode 100755 index 0000000000..906eca63b2 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00003.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00004.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00004.png new file mode 100755 index 0000000000..df57c90358 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00004.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00005.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00005.png new file mode 100755 index 0000000000..d2c935fa4b Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00005.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00006.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00006.png new file mode 100755 index 0000000000..b3cf32b2bb Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00006.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00007.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00007.png new file mode 100755 index 0000000000..bbe4856056 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00007.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00008.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00008.png new file mode 100755 index 0000000000..7eab8a09a5 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00008.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00009.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00009.png new file mode 100755 index 0000000000..ac6c5aecfe Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00009.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00010.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00010.png new file mode 100755 index 0000000000..b5e5beb991 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00010.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00011.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00011.png new file mode 100755 index 0000000000..d9305f539f Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00011.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00012.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00012.png new file mode 100755 index 0000000000..c98c20fd84 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00012.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00013.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00013.png new file mode 100755 index 0000000000..7ae4f4dcca Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00013.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00014.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00014.png new file mode 100755 index 0000000000..f3623fb358 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00014.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00015.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00015.png new file mode 100755 index 0000000000..15f966b2fb Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00015.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00016.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00016.png new file mode 100755 index 0000000000..4fdb8fb868 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00016.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00017.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00017.png new file mode 100755 index 0000000000..80b1dcbc36 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00017.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00018.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00018.png new file mode 100755 index 0000000000..eeb361183b Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00018.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00019.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00019.png new file mode 100755 index 0000000000..7258889df0 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00019.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00020.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00020.png new file mode 100755 index 0000000000..4eb85e0276 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00020.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00021.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00021.png new file mode 100755 index 0000000000..020819278d Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00021.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00022.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00022.png new file mode 100755 index 0000000000..a3196f73ea Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00022.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00023.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00023.png new file mode 100755 index 0000000000..b0cd970ea0 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00023.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00024.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00024.png new file mode 100755 index 0000000000..1e5106d7bf Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00024.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00025.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00025.png new file mode 100755 index 0000000000..aa44c54394 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00025.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00026.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00026.png new file mode 100755 index 0000000000..f071ea4658 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00026.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00027.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00027.png new file mode 100755 index 0000000000..904984b70c Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00027.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00028.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00028.png new file mode 100755 index 0000000000..fc3a408dbc Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy1_00028.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00000.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00000.png new file mode 100755 index 0000000000..16ae96a39d Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00000.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00001.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00001.png new file mode 100755 index 0000000000..ba9646469d Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00001.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00002.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00002.png new file mode 100755 index 0000000000..4134d8848b Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00002.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00003.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00003.png new file mode 100755 index 0000000000..11eaebe661 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00003.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00004.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00004.png new file mode 100755 index 0000000000..f218280c83 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00004.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00005.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00005.png new file mode 100755 index 0000000000..aea8d5b2e0 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00005.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00006.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00006.png new file mode 100755 index 0000000000..b2db4ebdf3 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00006.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00007.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00007.png new file mode 100755 index 0000000000..a5a2bef652 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00007.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00008.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00008.png new file mode 100755 index 0000000000..5cb4d5cb76 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00008.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00009.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00009.png new file mode 100755 index 0000000000..8c5b16341c Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00009.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00010.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00010.png new file mode 100755 index 0000000000..9385a760f4 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00010.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00011.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00011.png new file mode 100755 index 0000000000..4130fee60e Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00011.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00012.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00012.png new file mode 100755 index 0000000000..3cbe041b0f Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00012.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00013.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00013.png new file mode 100755 index 0000000000..514fa4da53 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00013.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00014.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00014.png new file mode 100755 index 0000000000..704931dc23 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00014.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00015.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00015.png new file mode 100755 index 0000000000..5df6a1a655 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00015.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00016.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00016.png new file mode 100755 index 0000000000..3ce3ea62e0 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00016.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00017.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00017.png new file mode 100755 index 0000000000..2743dc4ae6 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00017.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00018.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00018.png new file mode 100755 index 0000000000..50e15a0ccb Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00018.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00019.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00019.png new file mode 100755 index 0000000000..5d3ef5b324 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00019.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00020.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00020.png new file mode 100755 index 0000000000..60106d59eb Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00020.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00021.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00021.png new file mode 100755 index 0000000000..b9c119c847 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_happy2_00021.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00000.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00000.png new file mode 100755 index 0000000000..f7985ab6b0 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00000.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00001.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00001.png new file mode 100755 index 0000000000..f5b2ed2349 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00001.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00002.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00002.png new file mode 100755 index 0000000000..cca6c7b198 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00002.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00003.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00003.png new file mode 100755 index 0000000000..5931847d01 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00003.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00004.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00004.png new file mode 100755 index 0000000000..2e34f49467 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00004.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00005.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00005.png new file mode 100755 index 0000000000..36e4a4a7d9 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00005.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00006.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00006.png new file mode 100755 index 0000000000..3667efff44 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00006.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00007.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00007.png new file mode 100755 index 0000000000..d0597d8f3f Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00007.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00008.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00008.png new file mode 100755 index 0000000000..32a0473104 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00008.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00009.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00009.png new file mode 100755 index 0000000000..1bfaa297ba Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00009.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00010.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00010.png new file mode 100755 index 0000000000..8e131238bd Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00010.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00011.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00011.png new file mode 100755 index 0000000000..24cf43fc94 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00011.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00012.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00012.png new file mode 100755 index 0000000000..b06ed3310f Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00012.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00013.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00013.png new file mode 100755 index 0000000000..7a13e8d2da Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00013.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00014.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00014.png new file mode 100755 index 0000000000..6e6ae9d698 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00014.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00015.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00015.png new file mode 100755 index 0000000000..ab50046366 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00015.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00016.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00016.png new file mode 100755 index 0000000000..60c25e83a9 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00016.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00017.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00017.png new file mode 100755 index 0000000000..f752202e34 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00017.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00018.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00018.png new file mode 100755 index 0000000000..55cc541092 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00018.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00019.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00019.png new file mode 100755 index 0000000000..887bece7d5 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00019.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00020.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00020.png new file mode 100755 index 0000000000..67a0c033c7 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00020.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00021.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00021.png new file mode 100755 index 0000000000..e78d48b6c0 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00021.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00022.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00022.png new file mode 100755 index 0000000000..6504c5504e Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00022.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00023.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00023.png new file mode 100755 index 0000000000..f017819f41 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00023.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00024.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00024.png new file mode 100755 index 0000000000..805958c727 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00024.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00025.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00025.png new file mode 100755 index 0000000000..aff2ec82b1 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_music_00025.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00000.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00000.png new file mode 100755 index 0000000000..ffffe4beab Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00000.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00001.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00001.png new file mode 100755 index 0000000000..5bc0315f13 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00001.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00002.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00002.png new file mode 100755 index 0000000000..7a4c8b934e Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00002.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00003.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00003.png new file mode 100755 index 0000000000..e2b3d1733e Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00003.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00004.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00004.png new file mode 100755 index 0000000000..a3b2a8aef0 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00004.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00005.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00005.png new file mode 100755 index 0000000000..0731c1d183 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00005.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00006.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00006.png new file mode 100755 index 0000000000..59c6005bf8 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00006.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00007.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00007.png new file mode 100755 index 0000000000..d3fe0c0e5a Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00007.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00008.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00008.png new file mode 100755 index 0000000000..0e3dd6c3fc Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00008.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00009.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00009.png new file mode 100755 index 0000000000..dfaa242784 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00009.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00010.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00010.png new file mode 100755 index 0000000000..91c4ed24ba Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00010.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00011.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00011.png new file mode 100755 index 0000000000..777871d295 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00011.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00012.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00012.png new file mode 100755 index 0000000000..526d962250 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00012.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00013.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00013.png new file mode 100755 index 0000000000..31d622dbe9 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00013.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00014.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00014.png new file mode 100755 index 0000000000..ea2b803fa9 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00014.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00015.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00015.png new file mode 100755 index 0000000000..e9763faf5c Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00015.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00016.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00016.png new file mode 100755 index 0000000000..cea6750579 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00016.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00017.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00017.png new file mode 100755 index 0000000000..723da0cb47 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00017.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00018.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00018.png new file mode 100755 index 0000000000..0e1f51ec09 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00018.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00019.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00019.png new file mode 100755 index 0000000000..0a237ee8f2 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00019.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00020.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00020.png new file mode 100755 index 0000000000..3e44eab183 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00020.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00021.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00021.png new file mode 100755 index 0000000000..f1459ea8fd Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00021.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00022.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00022.png new file mode 100755 index 0000000000..8b978e67d9 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00022.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00023.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00023.png new file mode 100755 index 0000000000..3e44ffac94 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00023.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00024.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00024.png new file mode 100755 index 0000000000..2e1af2f207 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00024.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00025.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00025.png new file mode 100755 index 0000000000..7a9d92e788 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00025.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00026.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00026.png new file mode 100755 index 0000000000..222f7bf06c Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00026.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00027.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00027.png new file mode 100755 index 0000000000..017cd31293 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00027.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00028.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00028.png new file mode 100755 index 0000000000..3d1d58ce17 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00028.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00029.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00029.png new file mode 100755 index 0000000000..dabfc5f106 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00029.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00030.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00030.png new file mode 100755 index 0000000000..466adf6c7d Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00030.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00031.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00031.png new file mode 100755 index 0000000000..51f2d816d3 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00031.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00032.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00032.png new file mode 100755 index 0000000000..b4678e2e64 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00032.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00033.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00033.png new file mode 100755 index 0000000000..11219bf2c5 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00033.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00034.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00034.png new file mode 100755 index 0000000000..11219bf2c5 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00034.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00035.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00035.png new file mode 100755 index 0000000000..11219bf2c5 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_navi_00035.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00000.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00000.png new file mode 100755 index 0000000000..245c75497b Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00000.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00001.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00001.png new file mode 100755 index 0000000000..e76c38a251 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00001.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00002.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00002.png new file mode 100755 index 0000000000..3f8375fd2c Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00002.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00003.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00003.png new file mode 100755 index 0000000000..82f2f24875 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00003.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00004.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00004.png new file mode 100755 index 0000000000..b3942e8f0b Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00004.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00005.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00005.png new file mode 100755 index 0000000000..65f3fa8fcf Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00005.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00006.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00006.png new file mode 100755 index 0000000000..2890d5bee9 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00006.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00007.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00007.png new file mode 100755 index 0000000000..4d59ab54d7 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00007.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00008.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00008.png new file mode 100755 index 0000000000..5d8234d650 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00008.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00009.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00009.png new file mode 100755 index 0000000000..e53e4b8049 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00009.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00010.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00010.png new file mode 100755 index 0000000000..3f49436010 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00010.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00011.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00011.png new file mode 100755 index 0000000000..01cd684c3f Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00011.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00012.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00012.png new file mode 100755 index 0000000000..99bf1d13a8 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00012.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00013.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00013.png new file mode 100755 index 0000000000..6467506720 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00013.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00014.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00014.png new file mode 100755 index 0000000000..d47409fd99 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00014.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00015.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00015.png new file mode 100755 index 0000000000..f0735d1fe9 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00015.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00016.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00016.png new file mode 100755 index 0000000000..e4517057a6 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00016.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00017.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00017.png new file mode 100755 index 0000000000..b47f2aaf09 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00017.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00018.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00018.png new file mode 100755 index 0000000000..c23352f1ec Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00018.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00019.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00019.png new file mode 100755 index 0000000000..54edce647e Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00019.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00020.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00020.png new file mode 100755 index 0000000000..cb66e34f4e Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00020.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00021.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00021.png new file mode 100755 index 0000000000..163fb40e4a Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00021.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00022.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00022.png new file mode 100755 index 0000000000..159d8c2b46 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00022.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00023.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00023.png new file mode 100755 index 0000000000..8cffade34f Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00023.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00024.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00024.png new file mode 100755 index 0000000000..2caf5bc911 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00024.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00025.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00025.png new file mode 100755 index 0000000000..9f338643ef Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00025.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00026.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00026.png new file mode 100755 index 0000000000..115d08f231 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00026.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00027.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00027.png new file mode 100755 index 0000000000..a48f986a5d Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00027.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00028.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00028.png new file mode 100755 index 0000000000..bfb2f193ea Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00028.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00029.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00029.png new file mode 100755 index 0000000000..9b52e5703e Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00029.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00030.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00030.png new file mode 100755 index 0000000000..e0e60d3f9e Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00030.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00031.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00031.png new file mode 100755 index 0000000000..ec2ffde009 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00031.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00032.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00032.png new file mode 100755 index 0000000000..b4f146814a Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00032.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00033.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00033.png new file mode 100755 index 0000000000..a37977c833 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00033.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00034.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00034.png new file mode 100755 index 0000000000..a1bf07dae0 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00034.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00035.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00035.png new file mode 100755 index 0000000000..c945a937c8 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00035.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00036.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00036.png new file mode 100755 index 0000000000..ef53759644 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00036.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00037.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00037.png new file mode 100755 index 0000000000..8be7c41b4f Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00037.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00038.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00038.png new file mode 100755 index 0000000000..0ec41a9596 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00038.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00039.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00039.png new file mode 100755 index 0000000000..0c7aa674d3 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00039.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00040.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00040.png new file mode 100755 index 0000000000..e3367ecc71 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00040.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00041.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00041.png new file mode 100755 index 0000000000..8b68deaea0 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00041.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00042.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00042.png new file mode 100755 index 0000000000..206b376a2d Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00042.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00043.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00043.png new file mode 100755 index 0000000000..a0f9efcc7e Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00043.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00044.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00044.png new file mode 100755 index 0000000000..ad76442b25 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00044.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00045.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00045.png new file mode 100755 index 0000000000..d976fa55bd Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00045.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00046.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00046.png new file mode 100755 index 0000000000..f68bf9a4ec Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00046.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00047.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00047.png new file mode 100755 index 0000000000..1208b902a2 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00047.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00048.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00048.png new file mode 100755 index 0000000000..354f45c624 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00048.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00049.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00049.png new file mode 100755 index 0000000000..06185c2878 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00049.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00050.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00050.png new file mode 100755 index 0000000000..37d119085c Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00050.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00051.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00051.png new file mode 100755 index 0000000000..d2a2527994 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00051.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00052.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00052.png new file mode 100755 index 0000000000..5a37f49597 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00052.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00053.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00053.png new file mode 100755 index 0000000000..4bffb1c5b8 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00053.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00054.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00054.png new file mode 100755 index 0000000000..0687d46feb Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00054.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00055.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00055.png new file mode 100755 index 0000000000..1d355ceeac Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00055.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00056.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00056.png new file mode 100755 index 0000000000..8b87f1196d Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00056.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00057.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00057.png new file mode 100755 index 0000000000..2e95101d2a Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00057.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00058.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00058.png new file mode 100755 index 0000000000..cb393f822f Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00058.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00059.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00059.png new file mode 100755 index 0000000000..6a56dac185 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00059.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00060.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00060.png new file mode 100755 index 0000000000..dfacb2dc38 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00060.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00061.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00061.png new file mode 100755 index 0000000000..f3b77d8407 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00061.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00062.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00062.png new file mode 100755 index 0000000000..2be550cb48 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00062.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00063.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00063.png new file mode 100755 index 0000000000..2ad11064cf Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00063.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00064.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00064.png new file mode 100755 index 0000000000..ab9db63ab5 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00064.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00065.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00065.png new file mode 100755 index 0000000000..1bec649e9c Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00065.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00066.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00066.png new file mode 100755 index 0000000000..a19ce6ee3d Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00066.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00067.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00067.png new file mode 100755 index 0000000000..7739e8616a Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00067.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00068.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00068.png new file mode 100755 index 0000000000..befff3a3ba Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00068.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00069.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00069.png new file mode 100755 index 0000000000..6aeb8422bb Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00069.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00070.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00070.png new file mode 100755 index 0000000000..7833096a16 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00070.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00071.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00071.png new file mode 100755 index 0000000000..af74e7f340 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00071.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00072.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00072.png new file mode 100755 index 0000000000..93572c5fdb Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00072.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00073.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00073.png new file mode 100755 index 0000000000..9d36c12a0c Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00073.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00074.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00074.png new file mode 100755 index 0000000000..772cc19a87 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00074.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00075.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00075.png new file mode 100755 index 0000000000..245c75497b Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00075.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00076.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00076.png new file mode 100755 index 0000000000..31e5636fcb Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00076.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00077.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00077.png new file mode 100755 index 0000000000..13490cd532 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00077.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00078.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00078.png new file mode 100755 index 0000000000..253cff7293 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00078.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00079.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00079.png new file mode 100755 index 0000000000..a7c4b59713 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_overlooking_00079.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00000.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00000.png new file mode 100755 index 0000000000..f1687804ae Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00000.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00001.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00001.png new file mode 100755 index 0000000000..ab67814f16 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00001.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00002.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00002.png new file mode 100755 index 0000000000..f2138a04df Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00002.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00003.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00003.png new file mode 100755 index 0000000000..e615cbff2c Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00003.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00004.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00004.png new file mode 100755 index 0000000000..7c637be252 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00004.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00005.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00005.png new file mode 100755 index 0000000000..a0040a6889 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00005.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00006.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00006.png new file mode 100755 index 0000000000..1e646eee40 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00006.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00007.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00007.png new file mode 100755 index 0000000000..0b27774352 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00007.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00008.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00008.png new file mode 100755 index 0000000000..d279636500 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00008.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00009.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00009.png new file mode 100755 index 0000000000..77bad5c69b Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00009.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00010.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00010.png new file mode 100755 index 0000000000..95d4e5a6f0 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00010.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00011.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00011.png new file mode 100755 index 0000000000..f8c961d678 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00011.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00012.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00012.png new file mode 100755 index 0000000000..fa440195a8 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00012.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00013.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00013.png new file mode 100755 index 0000000000..032ca9018e Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00013.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00014.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00014.png new file mode 100755 index 0000000000..ad0f7aceaf Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00014.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00015.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00015.png new file mode 100755 index 0000000000..88d0b9d201 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00015.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00016.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00016.png new file mode 100755 index 0000000000..d3b7b2687d Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00016.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00017.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00017.png new file mode 100755 index 0000000000..0d471762d3 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00017.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00018.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00018.png new file mode 100755 index 0000000000..47c7e649a0 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00018.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00019.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00019.png new file mode 100755 index 0000000000..714c01bd47 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00019.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00020.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00020.png new file mode 100755 index 0000000000..a73d017cd7 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00020.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00021.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00021.png new file mode 100755 index 0000000000..c9bc2e9305 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00021.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00022.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00022.png new file mode 100755 index 0000000000..9a42fd79e1 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00022.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00023.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00023.png new file mode 100755 index 0000000000..39dd9fd2de Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00023.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00024.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00024.png new file mode 100755 index 0000000000..462f6252f1 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00024.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00025.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00025.png new file mode 100755 index 0000000000..a6b60d8030 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00025.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00026.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00026.png new file mode 100755 index 0000000000..f6daac60a6 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00026.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00027.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00027.png new file mode 100755 index 0000000000..8a3ac13464 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00027.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00028.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00028.png new file mode 100755 index 0000000000..4984904595 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00028.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00029.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00029.png new file mode 100755 index 0000000000..c36ea2cd05 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00029.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00030.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00030.png new file mode 100755 index 0000000000..df771315f2 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00030.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00031.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00031.png new file mode 100755 index 0000000000..cce87031c3 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00031.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00032.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00032.png new file mode 100755 index 0000000000..f655023f01 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00032.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00033.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00033.png new file mode 100755 index 0000000000..717a533631 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00033.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00034.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00034.png new file mode 100755 index 0000000000..db62ffead6 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00034.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00035.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00035.png new file mode 100755 index 0000000000..6a67dd7f1f Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00035.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00036.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00036.png new file mode 100755 index 0000000000..062a036a07 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00036.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00037.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00037.png new file mode 100755 index 0000000000..e59b283cd2 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00037.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00038.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00038.png new file mode 100755 index 0000000000..cb7c4d3a70 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00038.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00039.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00039.png new file mode 100755 index 0000000000..0ab4d49279 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00039.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00040.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00040.png new file mode 100755 index 0000000000..931acc068e Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00040.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00041.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00041.png new file mode 100755 index 0000000000..b5e6cc5097 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00041.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00042.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00042.png new file mode 100755 index 0000000000..24b0d9848d Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00042.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00043.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00043.png new file mode 100755 index 0000000000..9e6670e4b6 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00043.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00044.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00044.png new file mode 100755 index 0000000000..47a656883a Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00044.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00045.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00045.png new file mode 100755 index 0000000000..38ca707cdf Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00045.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00046.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00046.png new file mode 100755 index 0000000000..9de07ca26d Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00046.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00047.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00047.png new file mode 100755 index 0000000000..217e8c9e35 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00047.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00048.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00048.png new file mode 100755 index 0000000000..5725a22c93 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00048.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00049.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00049.png new file mode 100755 index 0000000000..bad5491eb1 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00049.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00050.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00050.png new file mode 100755 index 0000000000..aa4a4616a7 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00050.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00051.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00051.png new file mode 100755 index 0000000000..71a958cb04 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00051.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00052.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00052.png new file mode 100755 index 0000000000..273c9df3e4 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00052.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00053.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00053.png new file mode 100755 index 0000000000..8dc830675a Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00053.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00054.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00054.png new file mode 100755 index 0000000000..ed306fc483 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00054.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00055.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00055.png new file mode 100755 index 0000000000..ca8a06e6f8 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00055.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00056.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00056.png new file mode 100755 index 0000000000..c11998e7c6 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00056.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00057.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00057.png new file mode 100755 index 0000000000..f2b29ecad1 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00057.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00058.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00058.png new file mode 100755 index 0000000000..0de3ed2d85 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00058.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00059.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00059.png new file mode 100755 index 0000000000..1bd0691072 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00059.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00060.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00060.png new file mode 100755 index 0000000000..914f4098ba Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00060.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00061.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00061.png new file mode 100755 index 0000000000..914f4098ba Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00061.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00062.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00062.png new file mode 100755 index 0000000000..914f4098ba Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00062.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00063.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00063.png new file mode 100755 index 0000000000..914f4098ba Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00063.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00064.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00064.png new file mode 100755 index 0000000000..914f4098ba Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00064.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00065.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00065.png new file mode 100755 index 0000000000..914f4098ba Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00065.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00066.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00066.png new file mode 100755 index 0000000000..914f4098ba Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00066.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00067.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00067.png new file mode 100755 index 0000000000..914f4098ba Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00067.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00068.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00068.png new file mode 100755 index 0000000000..914f4098ba Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00068.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00069.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00069.png new file mode 100755 index 0000000000..914f4098ba Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00069.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00070.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00070.png new file mode 100755 index 0000000000..914f4098ba Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00070.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00071.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00071.png new file mode 100755 index 0000000000..914f4098ba Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00071.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00072.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00072.png new file mode 100755 index 0000000000..914f4098ba Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00072.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00073.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00073.png new file mode 100755 index 0000000000..d01f60963d Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00073.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00074.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00074.png new file mode 100755 index 0000000000..a4dc15b7e1 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00074.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00075.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00075.png new file mode 100755 index 0000000000..f902c984cf Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00075.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00076.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00076.png new file mode 100755 index 0000000000..becd080c5a Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00076.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00077.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00077.png new file mode 100755 index 0000000000..39c137bf3b Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00077.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00078.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00078.png new file mode 100755 index 0000000000..a7717e9312 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00078.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00079.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00079.png new file mode 100755 index 0000000000..c3b9dbb734 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00079.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00080.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00080.png new file mode 100755 index 0000000000..011de1f5aa Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00080.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00081.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00081.png new file mode 100755 index 0000000000..ffd28428ba Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00081.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00082.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00082.png new file mode 100755 index 0000000000..277f1d9fce Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00082.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00083.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00083.png new file mode 100755 index 0000000000..13d61c85b6 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00083.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00084.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00084.png new file mode 100755 index 0000000000..40ccd418d3 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00084.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00085.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00085.png new file mode 100755 index 0000000000..42ac3c6398 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00085.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00086.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00086.png new file mode 100755 index 0000000000..9858ae2714 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00086.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00087.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00087.png new file mode 100755 index 0000000000..044386f9d4 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00087.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00088.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00088.png new file mode 100755 index 0000000000..683ff0fb36 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00088.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00089.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00089.png new file mode 100755 index 0000000000..4c5f9e3805 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00089.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00090.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00090.png new file mode 100755 index 0000000000..4c5f9e3805 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00090.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00091.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00091.png new file mode 100755 index 0000000000..4c5f9e3805 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_reading_00091.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00000.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00000.png new file mode 100755 index 0000000000..e5788b5e99 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00000.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00001.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00001.png new file mode 100755 index 0000000000..5bf3209436 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00001.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00002.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00002.png new file mode 100755 index 0000000000..15d0807c74 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00002.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00003.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00003.png new file mode 100755 index 0000000000..1b0b39144e Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00003.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00004.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00004.png new file mode 100755 index 0000000000..50d3d4220d Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00004.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00005.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00005.png new file mode 100755 index 0000000000..82076a321b Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00005.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00006.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00006.png new file mode 100755 index 0000000000..fefd525e31 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00006.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00007.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00007.png new file mode 100755 index 0000000000..614ec46718 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00007.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00008.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00008.png new file mode 100755 index 0000000000..24fc83a984 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00008.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00009.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00009.png new file mode 100755 index 0000000000..7e72de1df4 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00009.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00010.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00010.png new file mode 100755 index 0000000000..6cb1ce1d38 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00010.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00011.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00011.png new file mode 100755 index 0000000000..81bd0a582c Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00011.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00012.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00012.png new file mode 100755 index 0000000000..38287fa1d6 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00012.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00013.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00013.png new file mode 100755 index 0000000000..2ba59ee819 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00013.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00014.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00014.png new file mode 100755 index 0000000000..791de12ace Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00014.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00015.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00015.png new file mode 100755 index 0000000000..c35c2ff71b Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00015.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00016.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00016.png new file mode 100755 index 0000000000..1f78bc5ae5 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00016.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00017.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00017.png new file mode 100755 index 0000000000..725ea4e8fa Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00017.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00018.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00018.png new file mode 100755 index 0000000000..790cac59ee Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00018.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00019.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00019.png new file mode 100755 index 0000000000..1462c3730a Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00019.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00020.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00020.png new file mode 100755 index 0000000000..c582421ed6 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00020.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00021.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00021.png new file mode 100755 index 0000000000..57e711f7bd Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00021.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00022.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00022.png new file mode 100755 index 0000000000..82dfdad6c7 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00022.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00023.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00023.png new file mode 100755 index 0000000000..6e9bdc439c Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00023.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00024.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00024.png new file mode 100755 index 0000000000..6ab10c2634 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00024.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00025.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00025.png new file mode 100755 index 0000000000..1da503edeb Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00025.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00026.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00026.png new file mode 100755 index 0000000000..f052b413c9 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00026.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00027.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00027.png new file mode 100755 index 0000000000..a631a033b4 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00027.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00028.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00028.png new file mode 100755 index 0000000000..cfcd090b9a Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00028.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00029.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00029.png new file mode 100755 index 0000000000..f39f565e4f Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00029.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00030.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00030.png new file mode 100755 index 0000000000..227a59dd6d Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00030.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00031.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00031.png new file mode 100755 index 0000000000..ae81ce4e36 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00031.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00032.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00032.png new file mode 100755 index 0000000000..6f167e7f40 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00032.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00033.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00033.png new file mode 100755 index 0000000000..eb0cfd122e Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00033.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00034.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00034.png new file mode 100755 index 0000000000..7bd472ce43 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00034.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00035.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00035.png new file mode 100755 index 0000000000..5fe8698a55 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00035.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00036.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00036.png new file mode 100755 index 0000000000..063e26f9d3 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_running_00036.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00000.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00000.png new file mode 100755 index 0000000000..5bef118460 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00000.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00001.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00001.png new file mode 100755 index 0000000000..4bde08676e Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00001.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00002.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00002.png new file mode 100755 index 0000000000..f8a20c452a Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00002.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00003.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00003.png new file mode 100755 index 0000000000..8267c3cea8 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00003.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00004.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00004.png new file mode 100755 index 0000000000..aa22cdfc58 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00004.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00005.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00005.png new file mode 100755 index 0000000000..c3114bc492 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00005.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00006.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00006.png new file mode 100755 index 0000000000..8ab8b6d3e1 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00006.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00007.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00007.png new file mode 100755 index 0000000000..4b4a2178cc Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00007.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00008.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00008.png new file mode 100755 index 0000000000..a4d9f34cf6 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00008.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00009.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00009.png new file mode 100755 index 0000000000..e3e3a6d998 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00009.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00010.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00010.png new file mode 100755 index 0000000000..8f89cb743b Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00010.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00011.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00011.png new file mode 100755 index 0000000000..0cf9e536d0 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00011.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00012.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00012.png new file mode 100755 index 0000000000..64f179f9d9 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00012.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00013.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00013.png new file mode 100755 index 0000000000..e420d2d46f Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00013.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00014.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00014.png new file mode 100755 index 0000000000..1cc78cae88 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00014.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00015.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00015.png new file mode 100755 index 0000000000..401c3e5d1e Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00015.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00016.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00016.png new file mode 100755 index 0000000000..95368c275b Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00016.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00017.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00017.png new file mode 100755 index 0000000000..4aab1d4a3d Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00017.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00018.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00018.png new file mode 100755 index 0000000000..4a20127143 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00018.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00019.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00019.png new file mode 100755 index 0000000000..85297a0517 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00019.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00020.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00020.png new file mode 100755 index 0000000000..8e5db7a270 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00020.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00021.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00021.png new file mode 100755 index 0000000000..1a60526fd9 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00021.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00022.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00022.png new file mode 100755 index 0000000000..7288c3def6 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00022.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00023.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00023.png new file mode 100755 index 0000000000..998b5f1c50 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00023.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00024.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00024.png new file mode 100755 index 0000000000..2d438e790d Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00024.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00025.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00025.png new file mode 100755 index 0000000000..241fbe98df Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00025.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00026.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00026.png new file mode 100755 index 0000000000..7d22591f72 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00026.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00027.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00027.png new file mode 100755 index 0000000000..05b2842bc4 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00027.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00028.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00028.png new file mode 100755 index 0000000000..865843aad1 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00028.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00029.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00029.png new file mode 100755 index 0000000000..015c2d4869 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00029.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00030.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00030.png new file mode 100755 index 0000000000..eac483e7d0 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00030.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00031.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00031.png new file mode 100755 index 0000000000..06ca05cd36 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00031.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00032.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00032.png new file mode 100755 index 0000000000..065102e18b Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00032.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00033.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00033.png new file mode 100755 index 0000000000..0e02a90645 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00033.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00034.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00034.png new file mode 100755 index 0000000000..718233f6f0 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00034.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00035.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00035.png new file mode 100755 index 0000000000..f64decb761 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00035.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00036.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00036.png new file mode 100755 index 0000000000..0c332bcea6 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00036.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00037.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00037.png new file mode 100755 index 0000000000..9ea5cabbb1 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00037.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00038.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00038.png new file mode 100755 index 0000000000..ef115229ba Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00038.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00039.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00039.png new file mode 100755 index 0000000000..476738925a Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00039.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00040.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00040.png new file mode 100755 index 0000000000..2d322e49dc Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00040.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00041.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00041.png new file mode 100755 index 0000000000..4408e2f4fa Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/ic_sleep_00041.png differ diff --git a/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/mogo_tts_icon_bkg.png b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/mogo_tts_icon_bkg.png new file mode 100644 index 0000000000..e7686ba759 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res-voice-icon/drawable-xhdpi/mogo_tts_icon_bkg.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00001.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00001.png deleted file mode 100644 index 759b133363..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00001.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00002.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00002.png deleted file mode 100644 index 2acc31fd75..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00002.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00003.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00003.png deleted file mode 100644 index fcd2de6ab0..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00003.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00004.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00004.png deleted file mode 100644 index 0185747f28..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00004.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00005.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00005.png deleted file mode 100644 index 133e230955..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00005.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00006.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00006.png deleted file mode 100644 index 01a2614deb..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00006.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00007.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00007.png deleted file mode 100644 index 21b59f46d2..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00007.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00008.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00008.png deleted file mode 100644 index c0fb4687d6..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00008.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00009.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00009.png deleted file mode 100644 index 636d45d153..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00009.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00010.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00010.png deleted file mode 100644 index 4c84c50a6a..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00010.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00011.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00011.png deleted file mode 100644 index 27c7cd20ca..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00011.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00012.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00012.png deleted file mode 100644 index a7ccf5f35f..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00012.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00013.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00013.png deleted file mode 100644 index a2d6aec518..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00013.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00014.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00014.png deleted file mode 100644 index 65ead253fb..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00014.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00015.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00015.png deleted file mode 100644 index 4a565bdcb2..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00015.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00016.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00016.png deleted file mode 100644 index a752fa5f60..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00016.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00017.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00017.png deleted file mode 100644 index 0c089db1a0..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00017.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00018.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00018.png deleted file mode 100644 index 496de625bd..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00018.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00019.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00019.png deleted file mode 100644 index a805ad75aa..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00019.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00020.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00020.png deleted file mode 100644 index 656ab722d4..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00020.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00021.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00021.png deleted file mode 100644 index 73e02f07b1..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00021.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00022.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00022.png deleted file mode 100644 index 04fd01e5a9..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00022.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00023.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00023.png deleted file mode 100644 index 2b42ab31ec..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00023.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00024.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00024.png deleted file mode 100644 index f25ca2c8e8..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00024.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00025.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00025.png deleted file mode 100644 index 2cb7d768da..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00025.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00026.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00026.png deleted file mode 100644 index a30ed348b5..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00026.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00027.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00027.png deleted file mode 100644 index 37977fdbcd..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00027.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00028.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00028.png deleted file mode 100644 index c461373d86..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00028.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00029.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00029.png deleted file mode 100644 index 6eb46799ee..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00029.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00030.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00030.png deleted file mode 100644 index c874c287ae..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00030.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00031.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00031.png deleted file mode 100644 index fd1ee80c15..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00031.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00032.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00032.png deleted file mode 100644 index f89fdb368d..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00032.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00033.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00033.png deleted file mode 100644 index d199137e5b..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00033.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00034.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00034.png deleted file mode 100644 index 5e612da15b..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00034.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00035.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00035.png deleted file mode 100644 index bf394dbcd3..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00035.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00036.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00036.png deleted file mode 100644 index ca5ad37df8..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00036.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00037.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00037.png deleted file mode 100644 index 76bc2391e8..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00037.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00038.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00038.png deleted file mode 100644 index d9a2049f96..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00038.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00039.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00039.png deleted file mode 100644 index 3a46da466e..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00039.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00040.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00040.png deleted file mode 100644 index f89b0d748c..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00040.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00041.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00041.png deleted file mode 100644 index 41ba5ebe7b..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00041.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00042.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00042.png deleted file mode 100644 index a99b80df64..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00042.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00043.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00043.png deleted file mode 100644 index 75cbaec133..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00043.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00044.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00044.png deleted file mode 100644 index 95caadf725..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00044.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00045.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00045.png deleted file mode 100644 index 935cb08383..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00045.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00046.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00046.png deleted file mode 100644 index 54ad3719dc..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00046.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00047.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00047.png deleted file mode 100644 index e7c4c6dd7d..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00047.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00048.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00048.png deleted file mode 100644 index 358b8b442b..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00048.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00049.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00049.png deleted file mode 100644 index 83c7946a1d..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00049.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00050.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00050.png deleted file mode 100644 index ff7a6cfbaa..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00050.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00051.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00051.png deleted file mode 100644 index 52c81af36b..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00051.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00052.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00052.png deleted file mode 100644 index 6c22bb0827..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00052.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00053.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00053.png deleted file mode 100644 index df233a72ab..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00053.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00054.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00054.png deleted file mode 100644 index ee9eaf6588..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00054.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00055.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00055.png deleted file mode 100644 index f3f6bfdfe3..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00055.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00056.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00056.png deleted file mode 100644 index a4460ef16c..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00056.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00057.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00057.png deleted file mode 100644 index 23e1fa00b6..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00057.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00058.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00058.png deleted file mode 100644 index 1331514201..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00058.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00059.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00059.png deleted file mode 100644 index a897f3750b..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00059.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00060.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00060.png deleted file mode 100644 index ab92e11b21..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00060.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00061.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00061.png deleted file mode 100644 index aa8a1a7628..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00061.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00062.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00062.png deleted file mode 100644 index 0aad924d12..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00062.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00063.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00063.png deleted file mode 100644 index a166e7fe19..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00063.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00064.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00064.png deleted file mode 100644 index 46a47ead66..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00064.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00065.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00065.png deleted file mode 100644 index 52c9430792..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00065.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00066.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00066.png deleted file mode 100644 index 04d556923b..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00066.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00067.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00067.png deleted file mode 100644 index b7dab9a929..0000000000 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/mogo_tts_icon_00067.png and /dev/null differ diff --git a/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps_navigator.xml b/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps_navigator.xml index ea8e2d1cc6..6a769b332c 100644 --- a/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps_navigator.xml +++ b/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps_navigator.xml @@ -5,7 +5,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent"> - + + - + 160px 160px 10px - 100px - 100px + 160px + 160px \ No newline at end of file diff --git a/modules/mogo-module-authorize/consumer-rules.pro b/modules/mogo-module-authorize/consumer-rules.pro index 5668c1b3ca..551d2e9258 100644 --- a/modules/mogo-module-authorize/consumer-rules.pro +++ b/modules/mogo-module-authorize/consumer-rules.pro @@ -1,2 +1,2 @@ #-----AuthorizeModule----- --keep class com.mogo.module.authorize.module.bean.**{*;} \ No newline at end of file +-keep class com.mogo.module.authorize.module.bean.*{*;} \ No newline at end of file diff --git a/modules/mogo-module-common/build.gradle b/modules/mogo-module-common/build.gradle index 0ba83c66f7..99e827b866 100644 --- a/modules/mogo-module-common/build.gradle +++ b/modules/mogo-module-common/build.gradle @@ -34,7 +34,6 @@ dependencies { implementation rootProject.ext.dependencies.androidxconstraintlayout implementation rootProject.ext.dependencies.arouter implementation rootProject.ext.dependencies.callchatprovider - implementation "com.mogo.httpdns:httpdns-helper:1.0.1" if (Boolean.valueOf(RELEASE)) { api rootProject.ext.dependencies.mogomap api rootProject.ext.dependencies.mogomapapi diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java index 000b8ddc32..c3e9f0b981 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java @@ -92,6 +92,7 @@ class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClickListen MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager( AbsMogoApplication.getApp() ).removeMarkers( DataTypes.TYPE_MARKER_CLOUD_DATA ); return; } + filterData( data.getAllList() ); List< CloudRoadData > allDatumsList = new ArrayList<>(); allDatumsList.addAll( data.getAllList() ); // allDatumsList.addAll( data.getNearList() ); @@ -158,7 +159,7 @@ class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClickListen List< MogoLatLng > points = new ArrayList<>(); points.add( new MogoLatLng( lastPosition.lat, lastPosition.lon ) ); points.add( new MogoLatLng( target.lat, target.lon ) ); - marker.startSmoothInMs( points, 500L ); + marker.startSmoothInMs( points, SystemClock.elapsedRealtime() - mLastReceiveTime ); } } else { marker.setRotateAngle( 360 - ( float ) cloudRoadData.getHeading() ); @@ -170,6 +171,29 @@ class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClickListen } } + /** + * vr 模式下显示合并数据，否则只显示上报位置的车辆 + * + * @param dataList + */ + private void filterData( List< CloudRoadData > dataList ) { + if ( dataList == null || dataList.isEmpty() ) { + return; + } + if ( MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode() ) { + return; + } + List< CloudRoadData > newList = new ArrayList<>(); + for ( CloudRoadData cloudRoadData : dataList ) { + if ( cloudRoadData.getFromType() != CloudRoadData.FROM_MY_LOCATION ) { + continue; + } + newList.add( cloudRoadData ); + } + dataList.clear(); + dataList.addAll( newList ); + } + private void bindClickListener( IMogoMarker marker ) { if ( marker == null || marker.isDestroyed() ) { return; diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/marker/MapMarkerView.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/marker/MapMarkerView.java index 4d4eecb5e8..694414bf7b 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/marker/MapMarkerView.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/marker/MapMarkerView.java @@ -24,7 +24,8 @@ import com.mogo.utils.logger.Logger; * desc : 地图Marker图标 * version: 1.0 */ -public class MapMarkerView extends MapMarkerBaseView { +public class +MapMarkerView extends MapMarkerBaseView { private String TAG = "MapMarkerView"; private FrameLayout clMarkerTopView; diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/MogoHttpDnsUtil.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/MogoHttpDnsUtil.java deleted file mode 100644 index 348442bc14..0000000000 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/MogoHttpDnsUtil.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.mogo.module.common.utils; - -import android.content.Context; - -import com.mogo.commons.network.Utils; -import com.mogo.httpdnshelper.sdk.HttpDnsHelper; -import com.mogo.httpdnshelper.sdk.IHttpDnsConfig; -import com.mogo.httpdnshelper.sdk.bean.HttpDnsSimpleLocation; -import com.mogo.map.location.MogoLocation; -import com.mogo.module.common.MogoApisHandler; - -import org.jetbrains.annotations.NotNull; - -/** - * MogoHttpDnsHelper包装类 - * - * @author tongchenfei - */ -public class MogoHttpDnsUtil { - private MogoHttpDnsUtil(){ - - } - private final static MogoHttpDnsUtil INSTANCE = new MogoHttpDnsUtil(); - public static MogoHttpDnsUtil getInstance(){ - return INSTANCE; - } - - public void init(Context context){ - HttpDnsHelper.INSTANCE.init(context, new IHttpDnsConfig() { - @NotNull - @Override - public HttpDnsSimpleLocation getCurrentLocation() { - MogoLocation last = MogoApisHandler.getInstance().getApis().getMapServiceApi().getSingletonLocationClient(context).getLastKnowLocation(); - if(last!=null){ - return new HttpDnsSimpleLocation(last.getCityCode(), last.getLatitude(), last.getLongitude()); - } - return null; - } - - @Override - public boolean showDebugLog() { - return true; - } - - @NotNull - @Override - public String getSn() { - return Utils.getSn(); - } - }); - } - - public String getHttpAddress(){ - return HttpDnsHelper.INSTANCE.getHttpDnsAddress(HttpDnsHelper.HTTP_DNS_TYPE_HTTP); - } - - public String getWsAddress(){ - return HttpDnsHelper.INSTANCE.getHttpDnsAddress(HttpDnsHelper.HTTP_DNS_TYPE_WS); - } - - public void release(){ - HttpDnsHelper.INSTANCE.release(); - } -} 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 47db3a0b5a..850cef0236 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 @@ -1265,7 +1265,9 @@ public class EntranceFragment extends MvpFragment 1000) { + long diff = SystemClock.elapsedRealtime() - lastDebugPanelClickTime; + Logger.d("DebugPanel", "diff: " + diff); + if (diff > 3000) { debugPanelClickCount = 1; } else { debugPanelClickCount++; 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 e23dc28f2f..8fba0ea186 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 @@ -3,14 +3,11 @@ package com.mogo.module.main; import android.content.Intent; import android.os.Bundle; import android.util.Log; -import android.view.LayoutInflater; import android.view.View; import android.widget.FrameLayout; -import com.alibaba.android.arouter.launcher.ARouter; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.core.view.LayoutInflaterCompat; import com.mogo.commons.context.ContextHolderUtil; import com.mogo.commons.debug.DebugConfig; @@ -18,8 +15,6 @@ import com.mogo.commons.mvp.MvpActivity; import com.mogo.commons.voice.AIAssist; import com.mogo.map.location.IMogoLocationListener; import com.mogo.map.location.MogoLocation; -import com.mogo.map.marker.IMogoMarker; -import com.mogo.map.marker.IMogoMarkerClickListener; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.api.CallChatApi; @@ -35,7 +30,6 @@ import com.mogo.service.module.IMogoModuleProvider; import com.mogo.service.statusmanager.IMogoStatusManager; import com.mogo.skin.support.SkinMode; import com.mogo.utils.NetworkUtils; -import com.mogo.utils.UiThreadHandler; import com.mogo.utils.logger.Logger; import com.zhidao.adasconfig.api.AdasConfigApiController; import com.zhidao.adasconfig.common.log.LoggerController; @@ -43,9 +37,6 @@ import com.zhidao.autopilot.support.api.AutopilotServiceManage; import java.util.List; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - /** * @author congtaowang * @since 2019-12-23 @@ -54,7 +45,6 @@ import androidx.annotation.Nullable; */ public class MainActivity extends MvpActivity< MainView, MainPresenter > implements MainView, IMogoLocationListener, - IMogoMarkerClickListener, IMogoADASControlStatusChangedListener { protected static final String TAG = MainActivity.class.getSimpleName(); @@ -118,7 +108,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme mServiceApis.getOnlineCarPanelApi().initContainer( R.id.module_main_id_message_history_fragment_container, this ); if ( CallChatApi.getInstance().getApiProvider() != null ) { - CallChatApi.getInstance().getApiProvider().initVehicleTeamContainer("init", R.id.module_main_id_message_history_fragment_container, this); + CallChatApi.getInstance().getApiProvider().initVehicleTeamContainer( "init", R.id.module_main_id_message_history_fragment_container, this ); } } @@ -139,10 +129,10 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme @Override protected void onCreate( @Nullable Bundle savedInstanceState ) { super.onCreate( savedInstanceState ); - ContextHolderUtil.holdContext(this); + ContextHolderUtil.holdContext( this ); mPresenter.postLoadModuleMsg(); - NetworkUtils.listenNetStrength(this); + NetworkUtils.listenNetStrength( this ); } private void init() { @@ -170,7 +160,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme mServiceApis.getMapServiceApi().getHostListenerRegister().registerHostMapListener( EventDispatchCenter.getInstance() ); mServiceApis.getMapServiceApi().getHostListenerRegister().registerHostNaviListener( EventDispatchCenter.getInstance() ); mServiceApis.getMapServiceApi().getHostListenerRegister().registerHostAimlessModeListener( EventDispatchCenter.getInstance() ); - mServiceApis.getMapServiceApi().getHostListenerRegister().registerMarkerClickListener( this ); + mServiceApis.getMapServiceApi().getHostListenerRegister().registerMarkerClickListener( EventDispatchCenter.getInstance() ); } } @@ -182,6 +172,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme EventDispatchCenter.getInstance().setMapLoadedCallback( () -> { Logger.d( TAG, "map loaded." + Thread.currentThread().getName() ); resetMapCenterPoint(); + resetMapUiStyle(); loadOthersModules(); Log.i( "timer", "cost " + ( System.currentTimeMillis() - start ) + "ms" ); } ); @@ -203,6 +194,11 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme } + private void resetMapUiStyle(){ + final EnumMapUI mapUI = MogoApisHandler.getInstance().getApis().getAdasControllerApi().getCurrentSkinMode(); + mServiceApis.getMapServiceApi().getMapUIController().changeMapMode( mapUI ); + } + private void resetMapCenterPoint() { // 右移地图中心点 MapCenterPointStrategy.init(); @@ -266,12 +262,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme EventDispatchCenter.getInstance().onLocationChanged( location ); } - @Override - public boolean onMarkerClicked( IMogoMarker marker ) { - EventDispatchCenter.getInstance().onMarkerClicked( marker ); - return false; - } - @Override public void onMapUiModeChanged( EnumMapUI mapUI ) { switch ( mapUI ) { diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/service/MogoMainService.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/service/MogoMainService.java index 8651848b93..214d81ea08 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/service/MogoMainService.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/service/MogoMainService.java @@ -12,7 +12,6 @@ import com.mogo.map.location.IMogoLocationClient; import com.mogo.map.location.IMogoLocationListener; import com.mogo.map.location.MogoLocation; import com.mogo.module.common.MogoApisHandler; -import com.mogo.module.common.utils.MogoHttpDnsUtil; import com.mogo.module.main.EventDispatchCenter; import com.mogo.module.main.cards.MogoModulesManager; import com.mogo.module.main.delaycheck.DelayCheckUtil; @@ -53,8 +52,6 @@ class MogoMainService extends Service implements IMogoLocationListener { // 开启延时检测 DelayCheckUtil delayCheckUtil = new DelayCheckUtil(this); delayCheckUtil.waitingForCheck(); - - MogoHttpDnsUtil.getInstance().init(this); } @Nullable @@ -111,6 +108,5 @@ class MogoMainService extends Service implements IMogoLocationListener { mLocationClient = null; } mServiceApis = null; - MogoHttpDnsUtil.getInstance().release(); } } diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java index 626d665366..9940ca26a2 100644 --- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java +++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java @@ -154,10 +154,6 @@ public class MapFragment extends MvpFragment< MapView, MapPresenter > implements if ( mMogoMap.getUIController() != null ) { mMogoMap.getUIController().changeMapMode( EnumMapUI.CarUp_2D ); } - - - final EnumMapUI mapUI = MogoApisHandler.getInstance().getApis().getAdasControllerApi().getCurrentSkinMode(); - getUIController().changeMapMode( mapUI ); } } diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/CircleNumberProgress.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/CircleNumberProgress.java index ecd1fa5405..bfda00bc62 100644 --- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/CircleNumberProgress.java +++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/CircleNumberProgress.java @@ -3,10 +3,13 @@ package com.mogo.module.media.widget; import android.content.Context; import android.content.res.TypedArray; import android.graphics.Canvas; +import android.graphics.Color; +import android.graphics.Matrix; import android.graphics.Paint; import android.graphics.Path; import android.graphics.Rect; import android.graphics.RectF; +import android.graphics.SweepGradient; import android.util.AttributeSet; import android.view.View; @@ -78,7 +81,7 @@ public class CircleNumberProgress extends View { //中间圆的背景颜色 默认为浅紫色 paintUndoneColor = typedArray.getColor(R.styleable.PercentageRing_circleBackground, 0xffafb4db); //外圆环的颜色 默认为深紫色 - paintDoneColor = typedArray.getColor(R.styleable.PercentageRing_ringColor, 0xff6950a1); +// paintDoneColor = typedArray.getColor(R.styleable.PercentageRing_ringColor, Color.parseColor("#e6fffff")); // 构造器中初始化数据 initData(); @@ -100,17 +103,20 @@ public class CircleNumberProgress extends View { paintUndone.setStyle(Paint.Style.STROKE); // 已经完成进度条的画笔的属性 - paintDone.setColor(paintDoneColor); +// paintDone.setColor(paintDoneColor); paintDone.setStrokeWidth(paintProgressWidthPx); paintDone.setAntiAlias(true); paintDone.setStyle(Paint.Style.STROKE); - // 文字的画笔的属性 -// paintText.setColor(paintTextColor); -// paintText.setTextSize(paintTextSizePx); -// paintText.setAntiAlias(true); -// paintText.setStyle(Paint.Style.STROKE); -// paintText.setTypeface(Typeface.DEFAULT_BOLD); + float[] pos = {0f, 0.5f, 1.0f}; + SweepGradient linearGradient = new SweepGradient((getMeasuredWidth() - 40)/2,(getMeasuredHeight() - 40)/2, + new int[]{Color.parseColor("#ffffff"), Color.parseColor("#B3ffffff"), Color.parseColor("#ffffff")}, pos); + +// SweepGradient linearGradient = new SweepGradient((getMeasuredWidth() -40)/2,(getMeasuredHeight() - 40)/2,new int[]{Color.GREEN, Color.RED, Color.YELLOW, Color.WHITE, Color.BLUE}, pos); + Matrix matrix = new Matrix(); + matrix.setRotate(180, getMeasuredWidth()/2, getMeasuredHeight()/2); + linearGradient.setLocalMatrix(matrix); + paintDone.setShader(linearGradient); } @@ -147,7 +153,6 @@ public class CircleNumberProgress extends View { // 比较文字高度和圆环宽度，如果文字高度较大，那么文字将突破圆环，否则，圆环会把文字包裹在内部 Rect rect = new Rect(); -// paintText.getTextBounds("100%", 0, "100%".length(), rect); int textHeight = rect.height(); // 得到圆环的中间半径（外径和内径平均值） @@ -156,14 +161,6 @@ public class CircleNumberProgress extends View { rectF.top = viewCenterY - radiusArc; rectF.right = viewCenterX + radiusArc; rectF.bottom = viewCenterY + radiusArc; - - // 文字所依赖路径圆弧的半径 - radiusText = radiusArc - textHeight / 2; - rectF2.left = viewCenterX - radiusText; - rectF2.top = viewCenterY - radiusText; - rectF2.right = viewCenterX + radiusText; - rectF2.bottom = viewCenterY + radiusText; - } @Override @@ -176,37 +173,6 @@ public class CircleNumberProgress extends View { // 画已经完成进度的圆弧 从-90度开始，即从圆环顶部开始 canvas.drawArc(rectF, -90, progress / 100.0f * 360, false, paintDone); - // 为文字所在路径添加一段圆弧轨迹，进度为0%-9%时应该最短，进度为10%-99%时应该边长，进度为100%时应该最长 - // 这样才能保证文字和圆弧的进度一致，不会出现超前或者滞后的情况 - - // 要画的文字 - String text = progress + "%"; - - // 存储字符所有字符所占宽度的数组 - float[] widths = new float[text.length()]; - - // 得到所有字符所占的宽度 -// paintText.getTextWidths(text, 0, text.length(), widths); - - // 所有字符所占宽度之和 - float textWidth = 0; - for (float f : widths) { - textWidth += f; - } - - // 根据长度得到路径对应的扫过的角度 - // width = sweepAngle * 2 * π * R / 360 ; sweepAngle = width * 360 / 2 / - // π / R - float sweepAngle = (float) (textWidth * 360 / 2 / Math.PI / radiusText); - - // 添加路径 - path.addArc(rectF2, progress * 3.6f - 90.0f - sweepAngle / 2.0f, sweepAngle); - - // 绘制进度的文字 -// canvas.drawTextOnPath(text, path, 0, 0, paintText); - - // 重置路径 - path.reset(); } /** diff --git a/modules/mogo-module-media/src/main/res/layout/module_media_music_window_alert_layout_new.xml b/modules/mogo-module-media/src/main/res/layout/module_media_music_window_alert_layout_new.xml index 9766ec9ffb..2469ea2ba7 100644 --- a/modules/mogo-module-media/src/main/res/layout/module_media_music_window_alert_layout_new.xml +++ b/modules/mogo-module-media/src/main/res/layout/module_media_music_window_alert_layout_new.xml @@ -12,9 +12,9 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintRight_toRightOf="parent" app:circleBackground="@color/modules_media_music_bg_color" - app:ringColor="@color/modules_media_music_circle_color" android:layout_width="match_parent" android:layout_height="match_parent" /> + diff --git a/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/crashwarn/CrashWarningProvider.kt b/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/crashwarn/CrashWarningProvider.kt index 1e8e831acb..3338f6bddf 100644 --- a/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/crashwarn/CrashWarningProvider.kt +++ b/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/crashwarn/CrashWarningProvider.kt @@ -17,7 +17,7 @@ import com.zhidao.manager.ts.TsThreshold * @author tongchenfei */ @Route(path = MogoServicePaths.PATH_CRASH_WARNING) -class CrashWarningProvider:IMogoCrashWarnProvider { +class CrashWarningProvider:IMogoCrashWarnProvider { companion object{ const val TAG = "CrashWarningProvider" } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java index 25460261f1..bcfe822ff2 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java @@ -555,6 +555,8 @@ public class MogoServices implements IMogoMapListener, MapMarkerManager.getInstance().syncLocation( latLng.lon, latLng.lat ); + Logger.d( TAG, "zoom = %s", zoom ); + if ( mIsCameraInited ) { mLastZoomLevel = zoom; mLastCustomRefreshCenterLocation = latLng; diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java index 1fed0baacf..321bcbf68a 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java @@ -46,6 +46,7 @@ import java.util.List; public class MockIntentHandler implements IntentHandler { private static final String TAG = "MockIntentHandler"; + private IMogoMarker centerMarker; @Override public void handle( Context context, Intent intent ) { @@ -364,6 +365,24 @@ public class MockIntentHandler implements IntentHandler { MogoApisHandler.getInstance().getApis().getMapFrameControllerApi().changeTo2dMode(); } break; + case 35: + MogoApisHandler.getInstance().getApis().getMapServiceApi().getMapUIController().testGpsData(); + break; + case 36: + MogoLatLng center = MogoApisHandler.getInstance().getApis() + .getMapServiceApi().getMapUIController() + .getWindowCenterLocation(); + centerMarker = MogoApisHandler.getInstance().getApis() + .getMapServiceApi().getMarkerManager( context ) + .addMarker( TAG, new MogoMarkerOptions() + .position( center ) + .icon( BitmapFactory.decodeResource( context.getResources(), R.drawable.bg_map_marker_red ) ) ); + break; + case 37: + if ( centerMarker != null ) { + centerMarker.destroy(); + } + break; } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelFragment.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelFragment.java index 4fbe490aaf..731c17122b 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelFragment.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelFragment.java @@ -170,7 +170,7 @@ public class OnlineCarPanelFragment extends MvpFragment< IOnlineCarPanelView, On @Override public void removeSelf() { - MarkerServiceHandler.getApis().getOnlineCarPanelApi().hidePanel(); + MogoApisHandler.getInstance().getApis().getOnlineCarPanelApi().hidePanel(); } @Override diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/uploadintime/SnapshotUploadInTime.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/uploadintime/SnapshotUploadInTime.java index 8a07f5d1c4..5409333c6c 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/uploadintime/SnapshotUploadInTime.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/uploadintime/SnapshotUploadInTime.java @@ -12,6 +12,7 @@ import com.mogo.module.service.websocket.OnePerSecondSendContent; import com.mogo.service.adas.entity.ADASRecognizedResult; import com.mogo.service.connection.IMogoOnWebSocketMessageListener; import com.mogo.service.connection.WebSocketMsgType; +import com.mogo.utils.logger.Logger; import java.util.ArrayList; import java.util.List; @@ -104,6 +105,7 @@ class SnapshotUploadInTime implements MogoRTKLocation.RTKLocationListener { if ( content.self == null && ( content.adas == null || content.adas.isEmpty() ) ) { + Logger.d( TAG, "no information 2 sent" ); return; } diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt index 8786930973..1688aa94e5 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt @@ -132,7 +132,6 @@ class BlockStrategy(private val context: Context, private val apis: IMogoService var latLonFromDistance: MogoLatLng? = null val p = TanluUploadParams(IMogoTanluProvider.TYPE_BLOCK, IMogoTanluProvider.UPLOAD_FROM_STRATEGY_BLOCK_AUTO) - // 到达时间限制，上报速度，数据清空 if (stopFlag < STOP_FLAG_THRESHOLD) { // 停车标志位小于阈值，判定不是停车，计算平均值，进行上报 diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java index 8b61879c5f..f269856f7b 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java @@ -2,9 +2,12 @@ package com.mogo.module.v2x.adapter.holder; import android.content.Context; import android.content.Intent; +import android.graphics.drawable.Drawable; import android.text.TextUtils; import android.util.Log; +import android.view.Gravity; import android.view.LayoutInflater; +import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; @@ -13,6 +16,7 @@ import android.widget.TextView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.mogo.commons.debug.DebugConfig; +import com.mogo.module.common.animation.BezierAnimationView; import com.mogo.module.common.entity.MarkerExploreWay; import com.mogo.module.common.entity.MarkerUserInfo; import com.mogo.module.common.entity.V2XEventShowEntity; @@ -76,6 +80,8 @@ public class V2XRoadEventVH extends V2XBaseViewHolder { private ImageView ivEventReportErr; private HeartLikeView ivEventZan; + private ViewGroup mViewGroup; + // 上传事件的用户信息 private MarkerUserInfo mUserInfo; @@ -148,6 +154,7 @@ public class V2XRoadEventVH extends V2XBaseViewHolder { LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.item_v2x_event_detail, viewGroup, false) , v2XWindow); mContext = viewGroup.getContext(); + mViewGroup = viewGroup; init(itemView); // 设置视图状态监听 itemView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() { @@ -305,7 +312,7 @@ public class V2XRoadEventVH extends V2XBaseViewHolder { e.printStackTrace(); } } - + /* * 展示事件的图片/视频资源 * */ diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java index ef7ce042d4..d42c409a80 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java @@ -111,19 +111,19 @@ public class V2XAlarmServer { } // 进行提醒 if (!isAlreadyAlert) { - Logger.w(MODULE_NAME, "V2X预警--车辆与事件信息：" + - "\n事件详情ID：" + v2XRoadEventEntity.getNoveltyInfo().getInfoId() + - "\n事件详情：" + GsonUtil.jsonFromObject(v2XRoadEventEntity.getNoveltyInfo()) + - "\n距离：" + v2XRoadEventEntity.getDistance() + "米" + - "\n是否已经提醒：" + isAlreadyAlert + - "\n当前车辆-经度：" + currentLocation.getLongitude() + - "\n当前车辆-经度：" + currentLocation.getLatitude() + - "\n当前车辆-角度：" + currentLocation.getBearing() + - "\n道路事件-经度：" + eventLocation.getLon() + - "\n道路事件-经度：" + eventLocation.getLat() + - "\n道路事件-角度：" + eventLocation.getAngle() + - "\n夹角角度：" + eventAngle + " 度" - ); +// Logger.w(MODULE_NAME, "V2X预警--车辆与事件信息：" + +// "\n事件详情ID：" + v2XRoadEventEntity.getNoveltyInfo().getInfoId() + +// "\n事件详情：" + GsonUtil.jsonFromObject(v2XRoadEventEntity.getNoveltyInfo()) + +// "\n距离：" + v2XRoadEventEntity.getDistance() + "米" + +// "\n是否已经提醒：" + isAlreadyAlert + +// "\n当前车辆-经度：" + currentLocation.getLongitude() + +// "\n当前车辆-经度：" + currentLocation.getLatitude() + +// "\n当前车辆-角度：" + currentLocation.getBearing() + +// "\n道路事件-经度：" + eventLocation.getLon() + +// "\n道路事件-经度：" + eventLocation.getLat() + +// "\n道路事件-角度：" + eventLocation.getAngle() + +// "\n夹角角度：" + eventAngle + " 度" +// ); mAlertRoadEventList.put(v2XRoadEventEntity, TimeUtils.getNowString()); return v2XRoadEventEntity; } @@ -141,13 +141,13 @@ public class V2XAlarmServer { // ); } } else { - Logger.w(MODULE_NAME, - "V2X预警--车头方向与事件方向角度不一致：" + - "\n事件详情：" + v2XRoadEventEntity.getNoveltyInfo().getInfoId() + - "\n车头方向： " + carBearing + - "\n事件方向：" + eventBearing + - "\n角度差值：" + diffAngle - ); +// Logger.w(MODULE_NAME, +// "V2X预警--车头方向与事件方向角度不一致：" + +// "\n事件详情：" + v2XRoadEventEntity.getNoveltyInfo().getInfoId() + +// "\n车头方向： " + carBearing + +// "\n事件方向：" + eventBearing + +// "\n角度差值：" + diffAngle +// ); } } else { // Logger.w(MODULE_NAME, "V2X预警--车辆距离事件距离大于500米了：" + @@ -156,10 +156,10 @@ public class V2XAlarmServer { // ); } } else { - Logger.e(MODULE_NAME, - "V2X预警--道路事件没有角度信息" + - "\n事件详情：" + v2XRoadEventEntity.getNoveltyInfo().getInfoId() - ); +// Logger.e(MODULE_NAME, +// "V2X预警--道路事件没有角度信息" + +// "\n事件详情：" + v2XRoadEventEntity.getNoveltyInfo().getInfoId() +// ); } } } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java index ddba430565..6bcd120cee 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java @@ -60,6 +60,7 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager { private static CopyOnWriteArraySet mV2XRoadEventEntityArrayList = new CopyOnWriteArraySet<>(); // 上次的道路事件的预警Marker private static IMogoMarker mAlarmInfoMarker; + @Override public void drawableLastAllPOI() { //Logger.w(MODULE_NAME, "V2X---绘制上一次的POI，回调给Launcher底层逻辑让其进行绘制"); @@ -257,19 +258,20 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager { .longitude(roadEventEntity.getLocation().getLon()); optionsRipple.anchor(0.5f, 0.5f); - // 由于性能问题，D车机不使用事件扩散动画 + //由于性能问题，D车机不使用事件扩散动画 + //showInfoWindow只支持添加单个marker,不支持帧动画 if (!CarSeries.isF8xxSeries()) { optionsRipple.icon(V2XMarkerAdapter.getV2XRoadEventViewPng(context, roadEventEntity)); + if (V2XServiceManager.getMoGoStatusManager().isVrMode()) { + mAlarmInfoMarker = MarkerDrawer.getInstance().drawMapMarkerImpl(markerShowEntity, MarkerDrawer.MARKER_Z_INDEX_HIGH, null); + mAlarmInfoMarker.setInfoWindowAdapter(new RoadConditionInfoWindow3DAdapter(markerShowEntity, AbsMogoApplication.getApp(), mAlarmInfoMarker.getMogoMarkerOptions())); + mAlarmInfoMarker.showInfoWindow(); + } else { + mAlarmInfoMarker = V2XServiceManager.getMarkerManager().addMarker(V2X_EVENT_ALARM_POI, optionsRipple); + } } else { optionsRipple.icons(V2XMarkerAdapter.getV2XRoadEventViewGif(context, roadEventEntity)); - optionsRipple.period(1); - } - if (V2XServiceManager.getMoGoStatusManager().isVrMode()) { - mAlarmInfoMarker = MarkerDrawer.getInstance().drawMapMarkerImpl(markerShowEntity, MarkerDrawer.MARKER_Z_INDEX_HIGH, null); - mAlarmInfoMarker.setInfoWindowAdapter(new RoadConditionInfoWindow3DAdapter(markerShowEntity, AbsMogoApplication.getApp(), mAlarmInfoMarker.getMogoMarkerOptions())); - mAlarmInfoMarker.showInfoWindow(); - } else{ -// optionsRipple.icon(V2XMarkerAdapter.getV2XRoadEventViewPng(context, roadEventEntity)); + optionsRipple.period(100); mAlarmInfoMarker = V2XServiceManager.getMarkerManager().addMarker(V2X_EVENT_ALARM_POI, optionsRipple); } // 当前Marker设置为最上面 diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml index 2e010d7624..c4f2fd14aa 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml @@ -187,7 +187,7 @@ app:layout_constraintBottom_toBottomOf="@+id/ivEventLive" app:layout_constraintStart_toEndOf="@id/ivEventEventNav" app:layout_goneMarginLeft="@dimen/dp_10" - tools:visibility="visible" /> + tools:visibility="visible"/> @@ -198,8 +198,8 @@ android:layout_marginStart="@dimen/dp_15" android:layout_marginTop="@dimen/dp_5" android:layout_marginBottom="4dp" - android:maxLines="2" - android:textColor="@color/v2x_FFF_333" + android:maxLines="1" + android:textColor="#FFFFFF" android:textSize="@dimen/dp_40" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml index df06979f90..40dd6507ab 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml @@ -59,7 +59,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_15" - android:textColor="@color/v2x_FFF_333" + android:textColor="#FFFFFF" android:textSize="@dimen/dp_40" android:textStyle="bold" app:layout_constraintStart_toEndOf="@id/ivFaultHelpHead" @@ -73,7 +73,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:alpha="0.59" - android:textColor="@color/v2x_FFF_999" + android:textColor="#FFFFFF" android:textSize="@dimen/dp_24" app:layout_constraintStart_toStartOf="@id/tvFaultHelpName" app:layout_constraintTop_toBottomOf="@id/tvFaultHelpName" @@ -87,7 +87,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/dp_42" android:gravity="center_vertical" - android:textColor="@color/v2x_FFF_333" + android:textColor="#FFFFFF" android:textSize="@dimen/dp_70" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="@+id/ivFaultHelpEventCall" diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/AdasObjectUtils.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/AdasObjectUtils.java index a606a556bb..23dbe9b389 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/AdasObjectUtils.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/AdasObjectUtils.java @@ -55,7 +55,7 @@ class AdasObjectUtils { recognizedResults.add( result ); } } catch ( Exception e ) { - e.printStackTrace(); + } } return recognizedResults; @@ -65,8 +65,13 @@ class AdasObjectUtils { if ( rectBean == null ) { return null; } + if( rectBean.getLat() < 1){ + return null; + } ADASRecognizedResult result = new ADASRecognizedResult(); result.uuid = rectBean.getUuid(); + + double amapCoord[] = CoordinateUtils.transformFromWGSToGCJ( rectBean.getLat(), rectBean.getLon() ); if ( amapCoord != null ) { result.lat = amapCoord[0]; diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java index 0844bfe629..f82bf29011 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java @@ -57,6 +57,7 @@ import java.util.List; import java.util.Map; import io.reactivex.schedulers.Schedulers; + import java.util.concurrent.CopyOnWriteArrayList; import static com.mogo.module.common.utils.SPConst.getSpGuide; @@ -85,7 +86,7 @@ public class MogoADASController implements IMogoADASController { private IMogoStatusManager mStatusManager = SingletonsHolder.get( IMogoStatusManager.class ); private boolean mIsReleased = true; - private List adasDataCallbackList = new ArrayList<>(); + private List< IMogoAdasDataCallback > adasDataCallbackList = new ArrayList<>(); private IAutopolitDataCallBack mAutopolitDataCallBack; @@ -113,6 +114,10 @@ public class MogoADASController implements IMogoADASController { // 物体识别返回 // Logger.d( TAG, "onRectData = %s", rectInfo.toString() ); mLastFrameData = rectInfo; + // 仅在 vr 模式下显示 adas 识别车辆 + if ( !MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode() ) { + return; + } handleAdasRecognizedData( rectInfo ); } @@ -210,7 +215,7 @@ public class MogoADASController implements IMogoADASController { @Override public void showADAS() { - if( DebugConfig.isNeedLoadGuideModule() ){ + if ( DebugConfig.isNeedLoadGuideModule() ) { if ( !SharedPrefsMgr.getInstance( AbsMogoApplication.getApp() ).getBoolean( getSpGuide(), false ) ) { return; } @@ -272,13 +277,13 @@ public class MogoADASController implements IMogoADASController { @Override public void requestGetCarModelListInfo() { - if (DebugConfig.isMapBased()) { - Logger.d(TAG, "requestGetCarModelListInfo"); + if ( DebugConfig.isMapBased() ) { + Logger.d( TAG, "requestGetCarModelListInfo" ); // 向adas发送车模list - String carModelList = SharedPrefsMgr.getInstance(context).getString( - "CAR_MODEL_LIST", ""); - if (carModelList != null && !carModelList.isEmpty()) { - AutopilotServiceManage.getInstance().settingCarModelListInfo(carModelList); + String carModelList = SharedPrefsMgr.getInstance( context ).getString( + "CAR_MODEL_LIST", "" ); + if ( carModelList != null && !carModelList.isEmpty() ) { + AutopilotServiceManage.getInstance().settingCarModelListInfo( carModelList ); } // 此处进行网络请求，请求成功后再通知一次adas requestCarModelList(); @@ -368,6 +373,7 @@ public class MogoADASController implements IMogoADASController { } private Context context; + @Override public void init( Context context ) { AutopilotServiceManage.getInstance().init( context ); @@ -464,40 +470,40 @@ public class MogoADASController implements IMogoADASController { private String currentSn = TEST_SN; private void requestCarModelList() { - Map params = new HashMap<>(8); - params.put("sn", Utils.getSn()); + Map< String, String > params = new HashMap<>( 8 ); + params.put( "sn", Utils.getSn() ); // currentSn = useTestSn ? TEST_SN : Utils.getSn(); // params.put("sn", currentSn); - MogoApisHandler.getInstance().getApis().getNetworkApi().create(CarModelInfoNetApiServices.class, CarModelInfoNetApiServices.getBaseUrl()). - requestCarModelList(params). - subscribeOn(Schedulers.io()). - observeOn(Schedulers.io()). - subscribe(new SubscribeImpl(RequestOptions.create(context)) { + MogoApisHandler.getInstance().getApis().getNetworkApi().create( CarModelInfoNetApiServices.class, CarModelInfoNetApiServices.getBaseUrl() ). + requestCarModelList( params ). + subscribeOn( Schedulers.io() ). + observeOn( Schedulers.io() ). + subscribe( new SubscribeImpl< CarModelListResponse >( RequestOptions.create( context ) ) { @Override - public void onSuccess(CarModelListResponse o) { - super.onSuccess(o); - Logger.d(TAG, "请求车模列表成功: " + o); + public void onSuccess( CarModelListResponse o ) { + super.onSuccess( o ); + Logger.d( TAG, "请求车模列表成功: " + o ); // 保存到sp中 - String value = GsonUtil.jsonFromObject(o.getResult()); - SharedPrefsMgr.getInstance(context).putString("CAR_MODEL_LIST", - value); - if(value != null && !value.isEmpty()){ - AutopilotServiceManage.getInstance().settingCarModelListInfo(value); + String value = GsonUtil.jsonFromObject( o.getResult() ); + SharedPrefsMgr.getInstance( context ).putString( "CAR_MODEL_LIST", + value ); + if ( value != null && !value.isEmpty() ) { + AutopilotServiceManage.getInstance().settingCarModelListInfo( value ); } } @Override - public void onError(Throwable e) { - super.onError(e); - Logger.e(TAG, e, "请求自车模型失败"); + public void onError( Throwable e ) { + super.onError( e ); + Logger.e( TAG, e, "请求自车模型失败" ); } @Override - public void onError(String message, int code) { - super.onError(message, code); - Logger.e(TAG, "请求自车模型失败: " + message); + public void onError( String message, int code ) { + super.onError( message, code ); + Logger.e( TAG, "请求自车模型失败: " + message ); } - }); + } ); } @@ -547,8 +553,13 @@ public class MogoADASController implements IMogoADASController { @Override public List< ADASRecognizedResult > getLastADASRecognizedResult() { RectInfo rectInfo = mLastFrameData; - List< ADASRecognizedResult > recognizedResultList = AdasObjectUtils.fromAdasObject( rectInfo ); - return recognizedResultList; + List< ADASRecognizedResult > recognizedResultList = null; + try { + recognizedResultList = AdasObjectUtils.fromAdasObject( rectInfo ); + return recognizedResultList; + } catch ( Exception e ) { + return null; + } } @Override diff --git a/settings.gradle b/settings.gradle index 968adef80f..2cc68fa093 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,9 +1,10 @@ +include ':foudations:httpdns-mogo' include ':modules:mogo-module-smp' include ':app2' include ':foudations:httpdns-base' include ':foudations:httpdns-tencent' include ':foudations:httpdns-noop' -include ':modules:mogo-modules-mvision' +//include ':modules:mogo-modules-mvision' include ':foudations:mogo-base-websocket-sdk' include ':tts:tts-base' include ':tts:tts-di'