Merge remote-tracking branch 'origin/dev_1.1.9' into dev_1.1.9

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 {

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

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

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

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: