修改宝贝详情头像显示不对的问题

app/src/main/java/com/sikey/veryfit/ui/avtivity/component/left/BabyDetailActivity.kt

@@ -21,8 +21,8 @@ import androidx.appcompat.widget.Toolbar
 import androidx.lifecycle.lifecycleScope
 import com.android.volley.toolbox.ImageRequest
 import com.sikey.veryfit.R
-import com.sikey.veryfit.app.DataManager
 import com.sikey.veryfit.app.DataManager.Companion.checkLoginResponseAndCurrentChildInfo
+import com.sikey.veryfit.app.DataManager.Companion.instance
 import com.sikey.veryfit.component.log.Logger
 import com.sikey.veryfit.component.network.RequestManager
 import com.sikey.veryfit.component.network.http.ChildService
@@ -123,8 +123,9 @@ class BabyDetailActivity : BaseNoActionBarActivity(),
     }
 
     private fun initData() {
-        val position = intent.getIntExtra(CHILD_INFO, 0)
-        info = DataManager.instance.childTrackInfos?.get(position)
+/*        val position = intent.getIntExtra(CHILD_INFO, 0)
+        info = DataManager.instance.childTrackInfos?.get(position)*/
+        info = instance.currentChildInfo
         loadAvatarFirst()
         info?.let {
             mIsAdmin = it.roleType >= ADMIN

app/src/main/res/values-zh-rCN/strings.xml

@@ -986,11 +986,11 @@
     <string name="go_home">上学</string>
     <string name="dinner">晚餐</string>
     <string name="push_title_new_contact">新联系人</string>
-    <string name="push_content_low_power">%s的手表电量少于%d%%，请及时充电。</string>
-    <string name="push_content_fence_out">宝贝%1$s在%3$s离开了安全区域：%2$s</string>
-    <string name="push_content_contact">%1$s添加了一个新联系人: %2$s</string>
-    <string name="push_content_power_on">%s的手表已开机。</string>
-    <string name="push_content_power_off">%s的手表已关机。</string>
+    <string name="push_content_low_power">宝贝%s的手表电量少于%d%%，请及时充电。</string>
+    <string name="push_content_fence_out">宝贝%1$s在%2$s离开了安全区域：%3$s</string>
+    <string name="push_content_contact">宝贝%1$s添加了一个新联系人: %2$s</string>
+    <string name="push_content_power_on">宝贝%s的手表已开机。</string>
+    <string name="push_content_power_off">宝贝%s的手表已关机。</string>
     <string name="scan_error_title">扫码失败</string>
     <string name="scan_error_content">扫描失败可能是因为您的SIM卡未正确插入卡槽。如果正确插入后仍无法正确扫描代码，请手动设置APN。</string>
     <string name="appelation_verify_error">称呼长度不符合</string>
@@ -1013,7 +1013,7 @@
     <string name="fence_name_too_long">围栏名称不得超过10个字符。</string>
     <string name="fence_area_empty_tip">请设置围栏区域。</string>
     <string name="at_least_one">请至少选择一项</string>
-    <string name="push_content_fence_in">宝贝%1$s在%3$s进入了危险区域：%2$s</string>
+    <string name="push_content_fence_in">宝贝%1$s在%2$s进入了危险区域：%3$s</string>
     <string name="qr_format_error">二维码格式错误</string>
     <string name="confirm_email">请确认您的电子邮件</string>
     <string name="unbind_tips">请先解绑手表。</string>

app/src/main/res/values-zh-rHK/strings.xml

@@ -917,11 +917,11 @@
     <string name="go_home">上學</string>
     <string name="dinner">晚餐</string>
     <string name="push_title_new_contact">新連絡人</string>
-    <string name="push_content_low_power">%s的手錶電量少於%d%%，請及時充電。</string>
-    <string name="push_content_fence_out">寶貝%1$s在%3$s離開了安全區域：%2$s</string>
-    <string name="push_content_contact">%1$s添加了一個新連絡人：%2$s</string>
-    <string name="push_content_power_on">%s的手錶已開機。</string>
-    <string name="push_content_power_off">%s的手錶已關機。</string>
+    <string name="push_content_low_power">寶貝%s的手錶電量少於%d%%，請及時充電。</string>
+    <string name="push_content_fence_out">寶貝%1$s在%2$s離開了安全區域：%3$s</string>
+    <string name="push_content_contact">寶貝%1$s添加了一個新連絡人：%2$s</string>
+    <string name="push_content_power_on">寶貝%s的手錶已開機。</string>
+    <string name="push_content_power_off">寶貝%s的手錶已關機。</string>
     <string name="scan_error_title">掃碼失敗</string>
     <string name="call_name_verify_error">我的名字應該是2-10個字元</string>
     <string name="email">電子郵件</string>
@@ -950,7 +950,7 @@
     <string name="network_status_4">好</string>
     <string name="network_status_5">非常好</string>
     <string name="at_least_one">请至少选择一项</string>
-    <string name="push_content_fence_in">宝贝%1$s在%3$s进入了危险区域：%2$s</string>
+    <string name="push_content_fence_in">宝贝%1$s在%2$s进入了危险区域：%3$s</string>
     <string name="qr_format_error">二维码格式错误</string>
     <string name="delete_alarm">删除闹钟</string>
     <string name="tip_overlay_permission">當前沒有獲取位置相關許可權</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -915,11 +915,11 @@
     <string name="go_home">上學</string>
     <string name="dinner">晚餐</string>
     <string name="push_title_new_contact">新連絡人</string>
-    <string name="push_content_low_power">%s的手錶電量少於%d%%，請及時充電。</string>
-    <string name="push_content_fence_out">寶貝%1$s在%3$s離開了安全區域：%2$s</string>
-    <string name="push_content_contact">%1$s添加了一個新連絡人：%2$s</string>
-    <string name="push_content_power_on">%s的手錶已開機。</string>
-    <string name="push_content_power_off">%s的手錶已關機。</string>
+    <string name="push_content_low_power">寶貝%s的手錶電量少於%d%%，請及時充電。</string>
+    <string name="push_content_fence_out">寶貝%1$s在%2$s離開了安全區域：%3$s</string>
+    <string name="push_content_contact">寶貝%1$s添加了一個新連絡人：%2$s</string>
+    <string name="push_content_power_on">寶貝%s的手錶已開機。</string>
+    <string name="push_content_power_off">寶貝%s的手錶已關機。</string>
     <string name="scan_error_title">掃碼失敗</string>
     <string name="call_name_verify_error">我的名字應該是2-10個字元</string>
     <string name="email">電子郵件</string>
@@ -948,7 +948,7 @@
     <string name="network_status_4">好</string>
     <string name="network_status_5">非常好</string>
     <string name="at_least_one">请至少选择一项</string>
-    <string name="push_content_fence_in">宝贝%1$s在%3$s进入了危险区域：%2$s</string>
+    <string name="push_content_fence_in">宝贝%1$s在%2$s进入了危险区域：%3$s</string>
     <string name="qr_format_error">二维码格式错误</string>
     <string name="delete_alarm">删除闹钟</string>
     <string name="tip_overlay_permission">當前沒有獲取位置相關許可權</string>