1.宠物默认头像统一调整为一个爪子图标

2.In wifi zone时, 修改GPS 状态为 ”Off“

app/src/main/java/com/abbidot/tracker/base/BaseActivity.kt

@@ -36,6 +36,7 @@ import com.abbidot.tracker.constant.ConstantInt
 import com.abbidot.tracker.constant.GetResultCallback
 import com.abbidot.tracker.util.Util
 import com.abbidot.tracker.util.ViewUtil
+import com.baidu.platform.comapi.util.NetworkUtil
 import com.hjq.toast.Toaster
 import com.qmuiteam.qmui.alpha.QMUIAlphaButton
 import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton
@@ -65,9 +66,6 @@ abstract class BaseActivity<T : ViewBinding>(val inflater: (inflater: LayoutInfl
     //Activity是否在前台显示运行
     var isFrontRunning = false
 
-    //是否需要通知上个页面更新数据
-    var isNotifyUpdate = false
-
     //右边图标按钮
     var mRightImageButton: QMUIAlphaImageButton? = null
 
@@ -413,10 +411,7 @@ abstract class BaseActivity<T : ViewBinding>(val inflater: (inflater: LayoutInfl
     }
 
     fun isShowLoading(): Boolean {
-        if (null != mLoadingDialog && mLoadingDialog!!.isShowing) {
+        return null != mLoadingDialog && mLoadingDialog!!.isShowing
-            return true
-        }
-        return false
     }
 
     fun showLoading(show: Boolean, tipsRes: Int, cancelable: Boolean = true) {
@@ -575,7 +570,13 @@ abstract class BaseActivity<T : ViewBinding>(val inflater: (inflater: LayoutInfl
 
             val data = it.getOrNull()
             if (null == data) {
-                if (isShowRequestErrorTip) showToast(errorTip)
+                if (isShowRequestErrorTip) {
+                    if (NetworkUtil.isNetworkAvailable(mContext)) {
+                        showToast(errorTip)
+                    } else {
+                        showToast(R.string.txt_no_internet)
+                    }
+                }
                 if (mNetworkRequestsFailRetryCount < mNetworkRequestsFailMaxCount) {
                     mNetworkRequestsFailRetryCount++
                     getResultCallback.onRequestError(exceptionCode)

app/src/main/java/com/abbidot/tracker/ui/fragment/device/HomeTrackFragment.kt

@@ -536,8 +536,9 @@ class HomeTrackFragment :
             }
             mTrackStateList[1].let {
                 it.colorRedId = R.color.orange_color3
-                it.menuValue =
+                it.menuValue = if (inWifiZone == ConstantInt.Type1) {
-                    if (isTimeoutReport || gpsSignal == ConstantInt.NoSignal || powerSwitch == ConstantInt.Type0 || powerSwitch == ConstantInt.Type2 || inWifiZone == ConstantInt.Type1) {
+                    getString(R.string.tracker_manage_set_led_off)
+                } else if (isTimeoutReport || gpsSignal == ConstantInt.NoSignal || powerSwitch == ConstantInt.Type0 || powerSwitch == ConstantInt.Type2) {
                     getString(R.string.txt_weak_signal)
                 } else if (gpsSignal > ConstantInt.WeakSignal) {
                     it.colorRedId = R.color.blue_color1

app/src/main/java/com/abbidot/tracker/ui/fragment/map/googlemap/GoogleBitmapHelper.kt

@@ -33,8 +33,8 @@ object GoogleBitmapHelper {
         context: Context, @DrawableRes id: Int, headUrl: String, petType: Int
     ): Bitmap? {
         var headUrlBitmap = if (TextUtils.isEmpty(headUrl)) {
-            var headResId = R.drawable.icon_dog_default_head_svg
+            var headResId = R.drawable.icon_pet_default_head_svg
-            if (petType == ConstantInt.CatPetType) headResId = R.drawable.icon_cat_default_head_svg
+            if (petType == ConstantInt.CatPetType) headResId = R.drawable.icon_pet_default_head_svg
             ImageUtil.getBitmapFromDrawableAndSvg(context, headResId)
         } else {
             ImageUtil.getImageBitmapByUrl(context, headUrl)
@@ -115,8 +115,9 @@ object GoogleBitmapHelper {
         typeface: Typeface = Typeface.DEFAULT
     ): Bitmap {
         val bgBitmap = BitmapFactory.decodeResource(context.resources, id)
-        val newmap = Bitmap.createBitmap(bgBitmap.width, bgBitmap.height, Bitmap.Config.ARGB_8888)
+        val newBitmap =
-        val canvas = Canvas(newmap)
+            Bitmap.createBitmap(bgBitmap.width, bgBitmap.height, Bitmap.Config.ARGB_8888)
+        val canvas = Canvas(newBitmap)
         canvas.drawBitmap(bgBitmap, 0f, 0f, null)
         val paint = Paint()
         paint.color = ContextCompat.getColor(context, R.color.txt_black_color)
@@ -133,7 +134,7 @@ object GoogleBitmapHelper {
         canvas.drawText(text, x, y, paint)
         canvas.save()
         canvas.restore()
-        return newmap
+        return newBitmap
     }
 
     /**

app/src/main/java/com/abbidot/tracker/ui/fragment/map/googlemap/HistoryDataGoogleMapFragment.kt

@@ -120,8 +120,8 @@ class HistoryDataGoogleMapFragment : BaseGoogleMapFragment() {
         }
         mPetBean = petBean
 //        lifecycleScope.launch {
-//
 //        }
+        try {
             mPetBean?.apply {
                 var bitmap = GoogleBitmapHelper.headToBitmap(
                     mContext!!, R.drawable.pic_map_gps_avatar, imgurl, petType
@@ -132,6 +132,9 @@ class HistoryDataGoogleMapFragment : BaseGoogleMapFragment() {
                 mPetIconDescriptor = BitmapDescriptorFactory.fromBitmap(bitmap!!)
                 mMarker?.setIcon(mPetIconDescriptor)
             }
+        } catch (e: Exception) {
+            LogUtil.e("setPetBean 异常了$e")
+        }
     }
 
     /**

app/src/main/java/com/abbidot/tracker/ui/fragment/pet/PetV2Fragment.kt

@@ -69,8 +69,9 @@ class PetV2Fragment : BaseFragment<FragmentPetV2Binding>(FragmentPetV2Binding::i
                 }
             }
 
+            getHomeV2Activity()?.let { ac ->
                 vp2SwitchPetTrack.let {
-                it.adapter = ViewPagerAdapter(mFragments, requireActivity())
+                    it.adapter = ViewPagerAdapter(mFragments, ac)
                     ViewUtil.instance.setViewPager2Config(
                         it, object : ViewPager2.OnPageChangeCallback() {
                             override fun onPageSelected(position: Int) {
@@ -87,6 +88,7 @@ class PetV2Fragment : BaseFragment<FragmentPetV2Binding>(FragmentPetV2Binding::i
                         ilHomePetTopBar.ivTopPetBtnSmall
                     )
                 }
+            }
             if (AppUtils.isDebug()) {
                 ilHomePetTopBar.homeDataPetHeadSmall.appHeadImage.setOnLongClickListener {
                     getHomeV2Activity()?.goToDebugActivity()
@@ -149,7 +151,7 @@ class PetV2Fragment : BaseFragment<FragmentPetV2Binding>(FragmentPetV2Binding::i
     }
 
     private fun getMessageCount() {
-        requireActivity().lifecycleScope.launch(Dispatchers.IO) {
+        lifecycleScope.launch(Dispatchers.IO) {
             MyDatabase.messageDao().findAll(MyDatabase.MessageTableName)?.apply {
                 var noReadNum = size
                 LogUtil.e("消息数量：${size}")
@@ -158,8 +160,10 @@ class PetV2Fragment : BaseFragment<FragmentPetV2Binding>(FragmentPetV2Binding::i
                 }
                 getHomeV2Activity()?.runOnUiThread {
                     mViewBinding.homePetMessageCountText.let {
-                        if (noReadNum > 0) it.visibility = View.VISIBLE
+                        if (noReadNum > 0) {
-                        else it.visibility = View.GONE
+                            if (noReadNum > 99) noReadNum = 99
+                            it.visibility = View.VISIBLE
+                        } else it.visibility = View.GONE
                         it.text = "$noReadNum"
                     }
 

app/src/main/java/com/abbidot/tracker/util/ImageUtil.kt

@@ -220,7 +220,7 @@ object ImageUtil {
                 //默认大小50dp
                 .size(QMUIDisplayHelper.dpToPx(50)).allowHardware(false).build()
         val drawable = imageLoader.execute(request).drawable ?: return getBitmapFromDrawableAndSvg(
-            context, R.drawable.icon_dog_default_head_svg
+            context, R.drawable.icon_pet_default_head_svg
         ) ?: BitmapFactory.decodeResource(
             context.resources, R.drawable.pic_avatar_df
         )

app/src/main/java/com/abbidot/tracker/util/ViewUtil.kt

@@ -975,7 +975,7 @@ class ViewUtil private constructor() {
     ) {
         if (petList.size == 0) {
             petName.text = context.getString(R.string.no_pet)
-            petHead.load(R.drawable.icon_dog_default_head_svg)
+            petHead.load(R.drawable.icon_pet_default_head_svg)
             return
         }
         val pet = petList[selectPos]
@@ -1050,8 +1050,8 @@ class ViewUtil private constructor() {
      */
     fun setPetTypeHead(imageView: ImageView, imageUrl: String, type: Int) {
         if (TextUtils.isEmpty(imageUrl)) {
-            val defaultHead = if (type == 2) R.drawable.icon_cat_default_head_svg
+            val defaultHead = if (type == 2) R.drawable.icon_pet_default_head_svg
-            else R.drawable.icon_dog_default_head_svg
+            else R.drawable.icon_pet_default_head_svg
             imageView.load(defaultHead)
         } else {
             imageLoadUrl(imageView, imageUrl)

app/src/main/java/com/abbidot/tracker/vm/MapViewModel.kt

@@ -312,8 +312,10 @@ class MapViewModel : ViewModel() {
             }
             deviceStateList[1].apply {
                 menuType = ConstantInt.Open
-                val gpsValue =
+                val gpsValue = if (it.inWifiZone == ConstantInt.Type1) {
-                    if (isTimeoutReport || it.gpsSignal == ConstantInt.NoSignal || it.powerSwitch == ConstantInt.Type0 || it.powerSwitch == ConstantInt.Type2 || it.inWifiZone == ConstantInt.Type1) {
+                    menuType = ConstantInt.Close
+                    context.getString(R.string.tracker_manage_set_led_off)
+                } else if (isTimeoutReport || it.gpsSignal == ConstantInt.NoSignal || it.powerSwitch == ConstantInt.Type0 || it.powerSwitch == ConstantInt.Type2) {
                     menuType = ConstantInt.Close
                     context.getString(R.string.txt_weak_signal)
                 } else if (it.gpsSignal > ConstantInt.WeakSignal) {

app/src/main/res/drawable/icon_dog_default_head_svg.xml

@@ -1,37 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <group>
-    <clip-path
-        android:pathData="M0,0h107.9v107.9h-107.9z"/>
-    <path
-        android:pathData="M107.9,0H0V107.9H107.9V0Z"
-        android:fillColor="#F2F2F2"/>
-    <path
-        android:pathData="M44.66,29.47C45.23,29.37 45.8,29.32 46.38,29.32C49.24,29.32 52.11,29.27 54.97,29.32C57.42,29.22 59.87,29.26 62.31,29.43C63.31,29.54 64.24,29.96 65.31,30.03C65.83,30.05 66.34,29.97 66.82,29.78C67.31,29.6 67.74,29.31 68.11,28.95C69.11,27.95 70.59,28.4 71.74,28.95C72.41,29.25 73.07,29.58 73.74,29.95C77.06,31.6 80.74,33.22 83.19,36.04L83.7,37C84.19,38.16 84.44,39.4 84.44,40.66C84.44,41.91 84.19,43.15 83.7,44.31C83.21,45.61 82.77,46.94 82.35,48.31C82.14,48.95 81.91,49.59 81.72,50.24C81.42,51.24 80.9,52.24 80.57,53.3C80.29,54.67 79.76,55.98 79,57.16C78.4,57.94 77.53,58.47 76.56,58.65C76.07,58.71 75.59,58.71 75.1,58.65C74.64,58.61 74.19,58.5 73.77,58.31C73.12,58.05 73.28,59.05 73.28,59.39C73.28,64.82 73.28,64.58 73.28,70C73.28,78 70.83,81.38 63.18,83.87C60.5,84.73 57.71,85.18 54.9,85.2C51.87,85.29 48.84,84.95 45.9,84.2C42.97,83.47 40.24,82.11 37.9,80.2C35.39,78.08 34.55,75.2 34.59,72.03C34.68,66.13 34.59,65.9 34.59,60.03V58.18C32.72,58.97 30.51,58.95 29.08,57.35C28.28,56.34 27.7,55.16 27.39,53.91C26.82,52.01 26.07,50.2 25.45,48.31C24.91,46.69 24.37,45.07 23.86,43.45C23.42,42.21 23.28,40.89 23.44,39.58C23.61,38.28 24.07,37.03 24.8,35.94C25.65,34.81 26.74,33.9 28,33.26C29.48,32.4 30.97,31.58 32.48,30.79C33.48,30.26 34.48,29.79 35.57,29.25C36.46,28.68 37.51,28.39 38.57,28.43C39.63,28.7 40.61,29.24 41.4,30C41.51,30.1 41.65,30.18 41.79,30.23C42.09,30.27 42.4,30.21 42.66,30.06C43.3,29.79 43.97,29.59 44.66,29.47ZM71.09,67.08C71.09,64.32 71.01,61.57 71.09,58.82C71.18,55.79 70.78,52.77 69.89,49.88C68.42,44.79 67,39.68 65.84,34.5C65.38,32.44 64.25,31.98 62.59,31.79C61.96,31.72 61.33,31.68 60.7,31.68H47.12C45.86,31.64 44.6,31.83 43.41,32.24C43.12,32.33 42.85,32.5 42.65,32.74C42.45,32.97 42.32,33.26 42.28,33.56C41.11,38.2 39.96,42.86 38.62,47.46C37.28,51.77 36.64,56.26 36.74,60.77C36.94,66.38 36.91,66.34 36.74,71.95C36.63,73.53 36.99,75.1 37.76,76.49C38.53,77.87 39.69,78.99 41.09,79.73C46.28,82.84 51.96,83.43 57.82,82.73C61.43,82.4 64.88,81.12 67.82,79C68.87,78.29 69.72,77.33 70.29,76.21C70.87,75.08 71.15,73.82 71.1,72.56C71,68.86 71.09,70.8 71.09,67.08ZM82.2,40.88C82.29,39.82 82.08,38.76 81.6,37.81C81.11,36.87 80.37,36.08 79.45,35.54C76.66,33.87 73.73,32.42 70.84,30.93C70.49,30.73 70.08,30.64 69.68,30.67C69.27,30.7 68.88,30.86 68.57,31.12C68.22,31.37 67.95,31.73 67.81,32.14C67.67,32.55 67.66,32.99 67.78,33.41C69.64,40.41 71.53,47.41 73.38,54.41C73.69,55.57 74.25,56.47 75.51,56.53C76.77,56.59 77.51,55.65 77.9,54.47C79.2,50.63 80.51,46.79 81.84,42.96C82.08,42.29 82.2,41.59 82.2,40.88ZM25.7,40.63C25.66,40.91 25.66,41.2 25.7,41.48C27.04,46.2 28.62,50.84 30.44,55.39C31.08,57.03 33.05,56.92 33.92,55.29C34.39,54.35 34.75,53.37 35,52.35C36.67,46.19 38.3,40.01 40,33.84C40.19,33.39 40.23,32.89 40.13,32.42C40.02,31.94 39.76,31.51 39.4,31.19C39.02,30.88 38.55,30.7 38.06,30.69C37.57,30.67 37.09,30.82 36.69,31.11C34.06,32.49 31.4,33.81 28.82,35.28C27.85,35.78 27.03,36.55 26.48,37.5C25.93,38.45 25.66,39.53 25.7,40.63Z"
-        android:fillColor="#35221B"/>
-    <path
-        android:pathData="M71.09,67.08C71.09,70.8 71.03,68.86 71.09,72.58C71.13,73.84 70.86,75.09 70.29,76.21C69.72,77.33 68.87,78.29 67.83,79C64.89,81.12 61.44,82.4 57.83,82.73C51.97,83.41 46.29,82.82 41.1,79.73C39.71,79 38.55,77.88 37.78,76.51C37.01,75.14 36.64,73.57 36.74,72C36.91,66.39 36.94,66.43 36.74,60.82C36.64,56.31 37.28,51.82 38.62,47.51C39.96,42.91 41.11,38.25 42.28,33.61C42.32,33.31 42.45,33.02 42.65,32.79C42.85,32.55 43.12,32.38 43.41,32.29C44.6,31.88 45.86,31.69 47.12,31.73H60.7C61.33,31.73 61.96,31.77 62.59,31.84C64.25,32.03 65.38,32.49 65.84,34.55C66.97,39.73 68.42,44.84 69.91,49.93C70.8,52.82 71.2,55.84 71.11,58.87C71,61.57 71.09,64.32 71.09,67.08ZM48.45,67.74C48.45,68.54 48.45,69.34 48.45,70.14C48.45,71.6 49.03,73 50.06,74.03C51.09,75.06 52.49,75.64 53.95,75.64C55.41,75.64 56.81,75.06 57.84,74.03C58.87,73 59.45,71.6 59.45,70.14C59.45,68.71 59.45,67.28 59.45,65.85C59.45,64.93 59.53,64.33 60.6,63.93C61.51,63.57 62.3,62.95 62.86,62.14C63.42,61.33 63.74,60.38 63.76,59.4C63.83,58.71 63.62,58.13 62.84,58.01C62.06,57.89 61.71,58.41 61.55,59.08C61.48,59.36 61.55,59.67 61.44,59.93C61.26,60.52 60.92,61.04 60.46,61.45C59.99,61.85 59.43,62.11 58.82,62.21C58.21,62.3 57.59,62.22 57.02,61.98C56.46,61.74 55.98,61.34 55.63,60.83C55.52,60.72 55.43,60.59 55.37,60.45C55.31,60.3 55.27,60.15 55.27,59.99C55.27,59.83 55.31,59.68 55.37,59.53C55.43,59.39 55.52,59.26 55.63,59.15C56.43,58.25 57.17,57.31 57.84,56.31C58.84,54.85 58.12,53.31 56.46,53.2C54.74,53.09 53.02,53.09 51.3,53.2C50.96,53.22 50.64,53.34 50.36,53.53C50.08,53.72 49.87,53.99 49.73,54.3C49.59,54.61 49.54,54.95 49.58,55.28C49.62,55.62 49.75,55.93 49.96,56.2C50.61,57.14 51.32,58.04 52.09,58.89C52.87,59.73 52.62,60.41 51.98,61.13C51.6,61.56 51.11,61.88 50.56,62.06C50.02,62.24 49.43,62.26 48.87,62.13C47.12,61.81 46.48,60.42 46.12,59C45.93,58.21 45.74,57.82 44.98,57.95C44.22,58.08 44.05,58.69 44.13,59.39C44.35,61.27 45.13,62.99 46.87,63.64C48.46,64.24 48.54,65.21 48.44,66.5C48.42,66.93 48.45,67.34 48.45,67.74ZM47.74,46.18C47.74,45.95 47.74,45.73 47.74,45.5C47.76,45.16 47.7,44.81 47.58,44.49C47.47,44.17 47.28,43.88 47.05,43.63C46.81,43.38 46.53,43.18 46.22,43.04C45.9,42.9 45.56,42.82 45.22,42.82C44.89,42.82 44.56,42.89 44.26,43.02C43.96,43.15 43.68,43.34 43.45,43.58C43.23,43.82 43.05,44.1 42.94,44.41C42.82,44.72 42.77,45.05 42.79,45.38C42.73,46.12 42.76,46.86 42.89,47.59C42.93,47.89 43.04,48.18 43.19,48.44C43.35,48.69 43.56,48.92 43.81,49.09C44.05,49.27 44.33,49.39 44.63,49.46C44.93,49.52 45.23,49.53 45.53,49.47C47,49.35 47.74,48.26 47.74,46.18ZM60.14,46.18C60.14,48.25 60.84,49.33 62.32,49.49C62.77,49.58 63.25,49.53 63.67,49.33C64.09,49.14 64.44,48.82 64.67,48.42C65,47.75 65.18,47.02 65.2,46.28C65.22,45.54 65.07,44.8 64.76,44.12C64.57,43.69 64.25,43.34 63.85,43.11C63.44,42.88 62.97,42.78 62.51,42.84C61,42.89 60.14,44.08 60.14,46.16V46.18Z"
-        android:fillColor="#F6D593"/>
-    <path
-        android:pathData="M82.2,40.88C82.2,41.58 82.08,42.28 81.84,42.94C80.51,46.77 79.19,50.61 77.9,54.45C77.51,55.63 76.9,56.57 75.51,56.51C74.12,56.45 73.69,55.51 73.38,54.39C71.53,47.39 69.64,40.39 67.78,33.39C67.66,32.97 67.67,32.53 67.81,32.12C67.95,31.71 68.22,31.35 68.57,31.1C68.88,30.84 69.27,30.68 69.68,30.65C70.08,30.62 70.49,30.71 70.84,30.91C73.73,32.4 76.66,33.85 79.45,35.52C80.37,36.06 81.12,36.85 81.6,37.8C82.09,38.75 82.3,39.82 82.2,40.88Z"
-        android:fillColor="#F6D593"/>
-    <path
-        android:pathData="M25.7,40.63C25.66,39.54 25.93,38.45 26.48,37.5C27.03,36.56 27.84,35.78 28.81,35.28C31.39,33.81 34.05,32.49 36.68,31.11C37.08,30.82 37.56,30.67 38.05,30.69C38.54,30.7 39.01,30.88 39.39,31.19C39.75,31.51 40.01,31.94 40.12,32.42C40.22,32.89 40.18,33.39 39.99,33.84C38.31,40 36.68,46.19 35,52.35C34.75,53.37 34.39,54.35 33.92,55.29C33.05,56.92 31.08,57.03 30.44,55.39C28.62,50.84 27.04,46.2 25.7,41.48C25.67,41.2 25.67,40.91 25.7,40.63Z"
-        android:fillColor="#F6D593"/>
-    <path
-        android:pathData="M48.45,67.74C48.45,67.34 48.45,66.93 48.45,66.53C48.55,65.24 48.45,64.27 46.88,63.67C45.11,63.02 44.36,61.3 44.14,59.42C44.06,58.72 44.23,58.12 44.99,57.98C45.75,57.84 45.94,58.24 46.13,59.03C46.49,60.45 47.13,61.84 48.88,62.16C49.44,62.29 50.02,62.27 50.57,62.09C51.12,61.91 51.61,61.59 51.99,61.16C52.63,60.44 52.88,59.76 52.1,58.92C51.34,58.06 50.64,57.16 50,56.22C49.79,55.95 49.66,55.64 49.62,55.3C49.58,54.97 49.63,54.63 49.77,54.32C49.9,54.01 50.12,53.74 50.4,53.55C50.68,53.36 51,53.24 51.34,53.22C53.06,53.11 54.78,53.11 56.5,53.22C58.16,53.32 58.84,54.87 57.88,56.33C57.21,57.33 56.47,58.28 55.67,59.17C55.56,59.28 55.47,59.41 55.41,59.55C55.35,59.7 55.31,59.85 55.31,60.01C55.31,60.17 55.35,60.32 55.41,60.47C55.47,60.61 55.56,60.74 55.67,60.85C56.02,61.36 56.5,61.76 57.06,62C57.63,62.24 58.25,62.32 58.86,62.23C59.46,62.13 60.03,61.87 60.5,61.47C60.96,61.06 61.3,60.54 61.48,59.95C61.57,59.69 61.48,59.38 61.59,59.1C61.75,58.43 62.08,57.9 62.88,58.03C63.68,58.16 63.88,58.73 63.8,59.42C63.78,60.4 63.46,61.36 62.9,62.16C62.34,62.97 61.55,63.59 60.64,63.95C59.57,64.35 59.46,64.95 59.49,65.87C59.49,67.3 59.49,68.73 59.49,70.16C59.49,71.62 58.91,73.02 57.88,74.05C56.85,75.08 55.45,75.66 53.99,75.66C52.53,75.66 51.13,75.08 50.1,74.05C49.07,73.02 48.49,71.62 48.49,70.16C48.42,69.34 48.45,68.54 48.45,67.74ZM50.73,67.74H50.79C50.79,68.66 50.72,69.58 50.79,70.48C50.87,71.27 51.24,72.01 51.84,72.54C52.43,73.07 53.2,73.36 54,73.35C54.78,73.33 55.53,73.03 56.1,72.51C56.68,71.98 57.04,71.27 57.13,70.49C57.2,69.75 57.06,68.98 57.19,68.26C57.61,65.83 57,63.96 54.59,62.92C54.31,62.8 54.17,62.44 53.72,62.63C52.82,62.97 52.06,63.58 51.53,64.38C51,65.19 50.74,66.13 50.78,67.09L50.73,67.74Z"
-        android:fillColor="#35221B"/>
-    <path
-        android:pathData="M47.74,46.18C47.74,48.26 47.04,49.35 45.53,49.47C45.23,49.53 44.93,49.52 44.63,49.46C44.33,49.39 44.05,49.27 43.81,49.1C43.56,48.92 43.35,48.7 43.19,48.44C43.04,48.18 42.93,47.89 42.89,47.59C42.76,46.86 42.73,46.12 42.79,45.38C42.77,45.05 42.82,44.72 42.94,44.41C43.05,44.1 43.23,43.82 43.45,43.58C43.68,43.34 43.96,43.15 44.26,43.02C44.56,42.89 44.89,42.82 45.22,42.82C45.56,42.83 45.9,42.9 46.22,43.04C46.53,43.18 46.81,43.38 47.05,43.63C47.28,43.88 47.47,44.17 47.58,44.49C47.7,44.81 47.76,45.16 47.74,45.5C47.75,45.73 47.74,46 47.74,46.18Z"
-        android:fillColor="#35221B"/>
-    <path
-        android:pathData="M60.14,46.16C60.14,44.08 60.97,42.89 62.51,42.82C62.97,42.76 63.44,42.86 63.85,43.09C64.25,43.32 64.57,43.67 64.76,44.1C65.07,44.78 65.22,45.52 65.2,46.26C65.19,47 65,47.73 64.67,48.4C64.44,48.8 64.09,49.12 63.67,49.31C63.25,49.51 62.78,49.56 62.32,49.47C60.84,49.31 60.14,48.23 60.14,46.16Z"
-        android:fillColor="#35221B"/>
-    <path
-        android:pathData="M50.73,67.77V67.09C50.69,66.13 50.95,65.18 51.48,64.38C52.01,63.58 52.77,62.97 53.67,62.63C54.12,62.44 54.26,62.8 54.54,62.92C56.95,63.92 57.54,65.83 57.14,68.26C57.01,68.98 57.14,69.75 57.08,70.49C57,71.26 56.64,71.97 56.07,72.49C55.51,73.02 54.77,73.32 54,73.35C53.22,73.34 52.47,73.05 51.89,72.53C51.31,72 50.95,71.29 50.86,70.51C50.77,69.61 50.86,68.69 50.86,67.77H50.73Z"
-        android:fillColor="#E95950"/>
-  </group>
-</vector>

app/src/main/res/drawable/icon_pet_default_head_svg.xml

@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="107.9dp"
+    android:height="107.9dp"
+    android:viewportWidth="107.9"
+    android:viewportHeight="107.9">
+  <path
+      android:pathData="M0,0L107.9,0L107.9,107.9L0,107.9L0,0Z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M78.5,79.97C75.54,84.48 68.18,88.03 62.84,87.96C59.89,87.92 54.86,85.45 53.53,85.45C52.49,85.45 47.77,87.91 44.89,87.98C32.01,88.29 22.9,75.4 27.39,63.26C29.64,57.17 43.56,44.13 50.04,43.23C57.15,42.24 61.28,43.37 66.68,47.79C76.4,55.74 87.1,66.86 78.5,79.96L78.5,79.97Z"
+      android:fillColor="#FF996E"/>
+  <path
+      android:pathData="M62.2,20.54C66.16,19.65 69.93,20.25 72.74,23.22C81.23,32.22 68.99,45.78 58.89,37.81C53.09,33.24 55.29,22.1 62.2,20.54Z"
+      android:fillColor="#FF996E"/>
+  <path
+      android:pathData="M34.95,22.78C44.12,14.12 57.74,27.63 49.3,36.8C39.7,47.26 25.07,32.11 34.95,22.78Z"
+      android:fillColor="#FF996E"/>
+  <path
+      android:pathData="M76.15,53.62C67.97,45.8 78.59,33.06 87.65,40.32C96.7,47.57 84.35,61.48 76.15,53.62Z"
+      android:fillColor="#FF996E"/>
+  <path
+      android:pathData="M23.86,38.36C33.12,36.42 38.5,49.86 29.67,54.87C18.26,61.35 10.92,41.06 23.86,38.36Z"
+      android:fillColor="#FF996E"/>
+</vector>

app/src/main/res/layout/layout_head_image_view.xml

@@ -5,7 +5,7 @@
     android:layout_width="@dimen/dp_80"
     android:layout_height="@dimen/dp_80"
     android:scaleType="centerCrop"
-    android:src="@drawable/icon_dog_default_head_svg"
+    android:src="@drawable/icon_pet_default_head_svg"
     app:qmui_border_color="?attr/qmui_config_color_gray_6"
     app:qmui_border_width="1px"
     app:qmui_is_circle="true"

app/src/main/res/values/strings.xml

@@ -1057,5 +1057,6 @@
     <string name="txt_live_works_cellular">Live works on cellular only</string>
     <string name="txt_unbind_device">Unbind Device</string>
     <string name="txt_edit_profile">Edit Profile</string>
+    <string name="txt_no_internet">No internet connection</string>
 
 </resources>