new update 1.4.641

I made some changes, just read!
KashaMalaga · May 16, 2015 · 34c0fb7 · 34c0fb7
1 parent 5724c33
commit 34c0fb7
Show file tree

Hide file tree

Showing 7,445 changed files with 407,824 additions and 386,944 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
diff --git a/apktool.yml b/apktool.yml
@@ -1,22 +1,22 @@
 version: 2.0.0-RC3
-apkFileName: 小米运动_1.4.152_1025.apk
+apkFileName: 小米运动_1.4.641_1058.apk
 isFrameworkApk: false
 usesFramework:
   ids:
   - 1
 sdkInfo:
-  minSdkVersion: '18'
+  minSdkVersion: '15'
   targetSdkVersion: '18'
 packageInfo:
   forced-package-id: '127'
 versionInfo:
-  versionCode: '1025'
-  versionName: 1.4.152
+  versionCode: '1058'
+  versionName: 1.4.641
 compressionType: false
 unknownFiles:
   push_version: '0'
+  com/sina/weibo/sdk/net/cacert_cn.cer: '8'
+  com/sina/weibo/sdk/net/cacert_com.cer: '8'
   org/achartengine/image/zoom-1.png: '8'
   org/achartengine/image/zoom_in.png: '8'
   org/achartengine/image/zoom_out.png: '8'
-  com/sina/weibo/sdk/net/cacert_cn.cer: '8'
-  com/sina/weibo/sdk/net/cacert_com.cer: '8'
diff --git a/assets/AZURE.png b/assets/AZURE.png
diff --git a/assets/BLUE.png b/assets/BLUE.png
diff --git a/assets/CYAN.png b/assets/CYAN.png
diff --git a/assets/GREEN.png b/assets/GREEN.png
diff --git a/assets/LineRound.pvr b/assets/LineRound.pvr
diff --git a/assets/MAGENTA.png b/assets/MAGENTA.png
diff --git a/assets/Mili.fw b/assets/Mili.fw
diff --git a/assets/ORANGE.png b/assets/ORANGE.png
diff --git a/assets/RED.png b/assets/RED.png
diff --git a/assets/ROSE.png b/assets/ROSE.png
diff --git a/assets/VIOLET.png b/assets/VIOLET.png
diff --git a/assets/YELLOW.png b/assets/YELLOW.png
diff --git a/assets/amap_bus.png b/assets/amap_bus.png
diff --git a/assets/amap_car.png b/assets/amap_car.png
diff --git a/assets/amap_end.png b/assets/amap_end.png
diff --git a/assets/amap_man.png b/assets/amap_man.png
diff --git a/assets/amap_start.png b/assets/amap_start.png
diff --git a/assets/ap.data b/assets/ap.data
diff --git a/assets/ap1.data b/assets/ap1.data
diff --git a/assets/apl.data b/assets/apl.data
diff --git a/assets/apl1.data b/assets/apl1.data
diff --git a/assets/background.9.png b/assets/background.9.png
diff --git a/assets/bk.pvr b/assets/bk.pvr
diff --git a/assets/bk_night.pvr b/assets/bk_night.pvr
diff --git a/assets/bumping.ogg b/assets/bumping.ogg
diff --git a/assets/bumping_tone.ogg b/assets/bumping_tone.ogg
diff --git a/assets/bumping_tone_great.ogg b/assets/bumping_tone_great.ogg
diff --git a/assets/bumping_tone_pitch.ogg b/assets/bumping_tone_pitch.ogg
diff --git a/assets/bumping_tone_well_done.ogg b/assets/bumping_tone_well_done.ogg
diff --git a/assets/buttonNegt.png b/assets/buttonNegt.png
diff --git a/assets/buttonPost.png b/assets/buttonPost.png
diff --git a/assets/button_green.9.png b/assets/button_green.9.png
diff --git a/assets/button_red.9.png b/assets/button_red.9.png
diff --git a/assets/com.tencent.open.config.json b/assets/com.tencent.open.config.json
diff --git a/assets/com.tencent.plus.bar.png b/assets/com.tencent.plus.bar.png
diff --git a/assets/com.tencent.plus.blue_disable.png b/assets/com.tencent.plus.blue_disable.png
diff --git a/assets/com.tencent.plus.blue_down.png b/assets/com.tencent.plus.blue_down.png
diff --git a/assets/com.tencent.plus.blue_normal.png b/assets/com.tencent.plus.blue_normal.png
diff --git a/assets/com.tencent.plus.gray_disable.png b/assets/com.tencent.plus.gray_disable.png
diff --git a/assets/com.tencent.plus.gray_down.png b/assets/com.tencent.plus.gray_down.png
diff --git a/assets/com.tencent.plus.gray_normal.png b/assets/com.tencent.plus.gray_normal.png
diff --git a/assets/com.tencent.plus.ic_error.png b/assets/com.tencent.plus.ic_error.png
diff --git a/assets/com.tencent.plus.ic_success.png b/assets/com.tencent.plus.ic_success.png
diff --git a/assets/com.tencent.plus.logo.png b/assets/com.tencent.plus.logo.png
diff --git a/assets/config.json b/assets/config.json
@@ -2,54 +2,54 @@
     "global":false,
 
     "partner" : {
-        "enable":true,
-        "loadEnable" : true,
+        "enable": true,
+        "loadEnable" : false,
         "healthLinkEnable" : false,
         "QQHealthEnable":false,
 		"WeiboHealthEnable" : false
     },
 
     "runner" : {
-        "enable" : true,
-        "runnerGroupEnnable" : true
+        "enable" : false,
+        "runnerGroupEnnable" : false
     },
 
-    "relation" : {
+    "mall" : {
         "enable" : false
     },
-    "mall" : {
-        "enable" : true
+    "relation" : {
+        "enable" : false
     },
-
     "upgrade" : {
-        "miUpgrade" : true
+        "miUpgrade" : false
     },
 
     "weather" : {
-        "enable" : true
-    },
-
-    "lab" : {
-        "enableSportVote" : false,
-        "enableActionTag" : true
+        "enable" : false
     },
 
     "push" : {
-        "enable" : true
+        "enable" : false
     },
 
     "weight" : {
-        "enable" : true
+        "enable" : false
     }, 
 
     "log" : {
-        "umengEnable" : true,
+        "umengEnable" : false,
         "debugLogEnable": false,
         "fileLogEnable" : true
     },
 
     "bluetooth" : {
         "sensorWhiteListEnable" : true,
-        "connectedBroadcastEnable" :true
+        "connectedBroadcastEnable" :false
+    },
+
+    "lab" : {
+        "enable" : true,
+        "enableSportVote" : false,
+        "enableActionTag" : false
     }
 }
diff --git a/assets/dash.pvr b/assets/dash.pvr
diff --git a/assets/drawable-hdpi/common_button_white.9.png b/assets/drawable-hdpi/common_button_white.9.png
diff --git a/assets/drawable-hdpi/common_button_white_highlighted.9.png b/assets/drawable-hdpi/common_button_white_highlighted.9.png
diff --git a/assets/drawable-hdpi/ic_com_sina_weibo_sdk_close.png b/assets/drawable-hdpi/ic_com_sina_weibo_sdk_close.png
diff --git a/assets/drawable-hdpi/ic_com_sina_weibo_sdk_weibo_logo.png b/assets/drawable-hdpi/ic_com_sina_weibo_sdk_weibo_logo.png
diff --git a/assets/drawable-hdpi/timeline_relationship_icon_addattention.png b/assets/drawable-hdpi/timeline_relationship_icon_addattention.png
diff --git a/assets/drawable-hdpi/timeline_relationship_icon_attention.png b/assets/drawable-hdpi/timeline_relationship_icon_attention.png
diff --git a/assets/drawable-hdpi/weibosdk_common_button_alpha.9.png b/assets/drawable-hdpi/weibosdk_common_button_alpha.9.png
diff --git a/assets/drawable-hdpi/weibosdk_common_button_alpha_highlighted.9.png b/assets/drawable-hdpi/weibosdk_common_button_alpha_highlighted.9.png
diff --git a/assets/drawable-hdpi/weibosdk_common_shadow_top.9.png b/assets/drawable-hdpi/weibosdk_common_shadow_top.9.png
diff --git a/assets/drawable-hdpi/weibosdk_empty_failed.png b/assets/drawable-hdpi/weibosdk_empty_failed.png
diff --git a/assets/drawable-hdpi/weibosdk_navigationbar_background.9.png b/assets/drawable-hdpi/weibosdk_navigationbar_background.9.png
diff --git a/assets/drawable-ldpi/ic_com_sina_weibo_sdk_close.png b/assets/drawable-ldpi/ic_com_sina_weibo_sdk_close.png
diff --git a/assets/drawable-ldpi/ic_com_sina_weibo_sdk_weibo_logo.png b/assets/drawable-ldpi/ic_com_sina_weibo_sdk_weibo_logo.png
diff --git a/assets/drawable-mdpi/ic_com_sina_weibo_sdk_close.png b/assets/drawable-mdpi/ic_com_sina_weibo_sdk_close.png
diff --git a/assets/drawable-mdpi/ic_com_sina_weibo_sdk_weibo_logo.png b/assets/drawable-mdpi/ic_com_sina_weibo_sdk_weibo_logo.png
diff --git a/assets/drawable-xhdpi/common_button_white.9.png b/assets/drawable-xhdpi/common_button_white.9.png
diff --git a/assets/drawable-xhdpi/common_button_white_highlighted.9.png b/assets/drawable-xhdpi/common_button_white_highlighted.9.png
diff --git a/assets/drawable-xhdpi/ic_com_sina_weibo_sdk_close.png b/assets/drawable-xhdpi/ic_com_sina_weibo_sdk_close.png
diff --git a/assets/drawable-xhdpi/ic_com_sina_weibo_sdk_weibo_logo.png b/assets/drawable-xhdpi/ic_com_sina_weibo_sdk_weibo_logo.png
diff --git a/assets/drawable-xhdpi/timeline_icon_add_friends.png b/assets/drawable-xhdpi/timeline_icon_add_friends.png
diff --git a/assets/drawable-xhdpi/timeline_icon_attention.png b/assets/drawable-xhdpi/timeline_icon_attention.png
diff --git a/assets/drawable-xhdpi/weibosdk_common_button_alpha.9.png b/assets/drawable-xhdpi/weibosdk_common_button_alpha.9.png
diff --git a/assets/drawable-xhdpi/weibosdk_common_button_alpha_highlighted.9.png b/assets/drawable-xhdpi/weibosdk_common_button_alpha_highlighted.9.png
diff --git a/assets/drawable-xhdpi/weibosdk_common_shadow_top.9.png b/assets/drawable-xhdpi/weibosdk_common_shadow_top.9.png
diff --git a/assets/drawable-xhdpi/weibosdk_empty_failed.png b/assets/drawable-xhdpi/weibosdk_empty_failed.png
diff --git a/assets/drawable-xhdpi/weibosdk_navigationbar_background.9.png b/assets/drawable-xhdpi/weibosdk_navigationbar_background.9.png
diff --git a/assets/drawable-xxhdpi/ic_com_sina_weibo_sdk_close.png b/assets/drawable-xxhdpi/ic_com_sina_weibo_sdk_close.png
diff --git a/assets/drawable/sdk_weibo_logo.png b/assets/drawable/sdk_weibo_logo.png
diff --git a/assets/drawable/weibosdk_dialog_bg.9.png b/assets/drawable/weibosdk_dialog_bg.9.png
diff --git a/assets/event_national_day_signup_share.jpg b/assets/event_national_day_signup_share.jpg
diff --git a/assets/fonts/MIUI/MIUI-Bold.ttf b/assets/fonts/MIUI/MIUI-Bold.ttf
diff --git a/assets/fonts/MIUI/MIUI-Light.ttf b/assets/fonts/MIUI/MIUI-Light.ttf
diff --git a/assets/fonts/MIUI/MIUI-Normal.ttf b/assets/fonts/MIUI/MIUI-Normal.ttf
diff --git a/assets/fonts/watermark_data_view_bold.otf b/assets/fonts/watermark_data_view_bold.otf
diff --git a/assets/icn.data b/assets/icn.data
diff --git a/assets/icn_h.data b/assets/icn_h.data
diff --git a/assets/icn_h_night.data b/assets/icn_h_night.data
diff --git a/assets/icn_night.data b/assets/icn_night.data
diff --git a/assets/icon.pvr b/assets/icon.pvr
diff --git a/assets/infowindow_bg.9.png b/assets/infowindow_bg.9.png
diff --git a/assets/lineDashTexture.png b/assets/lineDashTexture.png
diff --git a/assets/lineTexture.png b/assets/lineTexture.png
diff --git a/assets/location_map_gps_3d.png b/assets/location_map_gps_3d.png
diff --git a/assets/location_map_gps_locked.png b/assets/location_map_gps_locked.png
diff --git a/assets/location_pressed.png b/assets/location_pressed.png
diff --git a/assets/location_public_key.der b/assets/location_public_key.der
diff --git a/assets/location_selected.png b/assets/location_selected.png
diff --git a/assets/location_unselected.png b/assets/location_unselected.png
diff --git a/assets/lua/localization.lua b/assets/lua/localization.lua
@@ -49,7 +49,7 @@ localization_table = {
     { 'zh_TW', localization_zh_rTW_table},
     { 'zh_HK', localization_zh_rTW_table},
     { 'hi' , localization_hi_rIN_table},
-    { 'bn_IN' , localization_bn_rIN_table},
+    { 'es_ES' , localization_es_rES_table},
     { 'kn_IN' , localization_kn_rIN_table},
     { 'ml_IN' , localization_ml_rIN_table},
     { 'ta_IN' , localization_ta_rIN_table},
@@ -94,7 +94,7 @@ function getString(string_locale)
     str = g_curTable[string_locale];
 
     if (str == nil) then
-        str = localization_English_table[string_locale]
+        str = localization_en_table[string_locale]
     end
     return str
 end

diff --git a/assets/lua/localization_bn_in.lua b/assets/lua/localization_bn_in.lua
diff --git a/assets/lua/localization_de_de.lua b/assets/lua/localization_de_de.lua
@@ -104,6 +104,7 @@ localization_de_rDE_table = {
 
     ---------------Weight scale -------------------
     welcome_use_weight_scale = "Hi there!",
+    welcome_use_weight_scale_info = "Learn more about scale",
     welcome_use_weight_scale_not_bind = "Tap to bind scale",
     welcome_use_mi_health="Hi there!",
 
@@ -113,42 +114,4 @@ localization_de_rDE_table = {
     am_format="%sAM",
     pm_format="%sPM",
 
-    --=============================================
-    --===== 不要翻译的内容记载在下面====================
-    --=============================================
-
-    --=================== Game ====================
-    game_register="国庆七天日行万步, 赢取小米手机4",
-    game_not_register_info="分享微博赢取微博大奖",
-    game_register_info="已成功报名, 倒计时%s天",
-    game_playing="国庆七天日行万步, 第%s天挑战中",
-    game_playing_done="国庆七天日行万步, 第%s天达成",
-    game_playing_lastday="最后一天即将完成日行万步挑战, 加油",
-    game_playing_lastday_done="恭喜, 国庆七天日行万步挑战成功",
-    game_playing_bonus_info="中将结果将在%s月%s日揭晓",
-    click_to_show_result="点击查看活动进展",
-    game_fail_title_ytd="很遗憾, 昨天未达成10000步",
-    game_fail_title="很遗憾, %s月%s日未达成10000步",
-    game_failed_title="国庆七天日行万步",
-    game_fail_info="继续关注活动, 分享微博赢取微博大奖",
-
-    game_bonus_hit="恭喜你成为“国庆七天日行万步”获奖者",
-    game_bonus_hit_info="点击查看中奖结果",
-    game_bonus_miss="国庆七天日行万步, 中奖结果已经揭晓",
-    game_bonus_miss_info="快去看看哪些人中奖了吧",
-    game_bonus_open="中奖结果将在%s月%s日揭晓, 敬请关注",
-    game_bonus_open_tomorrow="中奖结果将在明天揭晓, 敬请关注",
-    game_bonus_open_today="中奖结果将在今天揭晓, 敬请关注",
-
-    share_to_content_for_event="“国庆七天日行万步得小米手机4”活动火热报名中，没有手环? 转发此微博即有机会赢取手环F码，点击链接查看活动详情。",
-    game_share_to_registered="我报名参加了“日行万步得小米手机4”的活动，你愿意站在一旁默默祝福我还是一起来参加呢？离活动开始只剩%s天了, 快来报名吧",
-    game_share_to_finished="今天10000步目标顺利完成",
-    game_share_to_not_finished="向着10000步前进",
-    game_share_to_failed="没想到呀，我居然挑战失败了",
-    game_share_to_success="挑战成功！一共走了%s步",
-    game_share_to_hit_bonus="一个不小心中奖了，快来围观给我点赞吧",
-    game_share_to_not_hit_bonus="没有抽中，就当是给下次中奖攒人品了",
-    less_than_one="小于1",
-
-
 }
diff --git a/assets/lua/localization_en.lua b/assets/lua/localization_en.lua
@@ -9,24 +9,24 @@ localization_en_table = {
 
     },
 
-    ok='OK',
+    ok="OK",
 
-    hour='hrs',
-    minute='min',
-    month='month',
-    day='day',
+    hour="hrs",
+    minute=" min",
+    month="month",
+    day="day",
     step="steps",
-    km='km',
-    mile='miles',
-    minute_format='%d min',
-    hour_minute_format='%dh %dm',
-    hour_format='%d hrs',
+    km=" km",
+    mile=" miles",
+    minute_format="%d min",
+    hour_minute_format="%dh %dm",
+    hour_format="%d hrs",
 
     welcome_use="Welcome",
-    last_week_walked_format='You walked %d steps last week.',
-    last_week_walked_info_format='Walked %s, burned %dcal.',
-    last_month_walked_format='You walked %d steps last month.',
-    last_month_walked_info_format='Walked %s, burned %dcal.',
+    last_week_walked_format="You walked %d steps last week.",
+    last_week_walked_info_format="Walked %s, burned %d cal.",
+    last_month_walked_format="You walked %d steps last month.",
+    last_month_walked_info_format="Walked %s, burned %d cal.",
 
     get_over_format=", about %d grams of fat",
     click_to_get_help="Learn more about Mi Band",
@@ -64,21 +64,21 @@ localization_en_table = {
     manual_fail_ytd_title = "You ended your streak yesterday.",
     manual_fail_ytd_subtitle = "Streak was %d long.",
 
-    active_time_format_0="%dm",
-    active_time_format_1="%dh",
-    active_time_format_2="%dh %dm",
+    active_time_format_0="%d m",
+    active_time_format_1="%d h",
+    active_time_format_2="%d h %d m",
     activie_run_format_0="Ran %s. Great job!",
     activie_run_format_1="Ran %s. You're doing great!",
     activie_run_format_2="Ran %s.",
     activie_run_consumed="Burned %dcal. %s",
 
-    get_distance_format="about %dm.",
-    get_distance_format_british="%dfeet",
+    get_distance_format="about %d m.",
+    get_distance_format_british="%d feet",
     activity_walk_format="%s Walked %d steps, %s",
-    activity_walk_consumed_format="Burned %dcal %s.",
+    activity_walk_consumed_format="Burned %d cal %s.",
     activity_rope_skipping_format="%s jumped rope %d times",
     activity_situp_format="%s %d sit-ups",
-    activity_consumed_format="Burned %dcal %s",
+    activity_consumed_format="Burned %d cal %s",
     activity_activity_format="%s Worked out for %s, %s",
     activity_activity_format_run="%s Worked out for %s, ran %s",
     last_night_sleeped_good_format="You slept for %s last night.",