1.新的支付信息管理UI

2.运动和睡眠详情7/6的日期格式改成“Jul 6”格式

baselibrary/src/main/java/com/abbidot/baselibrary/util/AppUtils.kt

@@ -18,7 +18,7 @@ class AppUtils {
 
     companion object {
 
-        private var isDebug: Boolean? = null
+        private var isDebug: Boolean? = true
 
         /**
          * 屏幕密度,系统源码注释不推荐使用
@@ -93,7 +93,7 @@ class AppUtils {
          * 是否是国内
          */
         fun isChina(type: String = SWITCH_PAGE_TYPE): Boolean {
-            return false
+            return true
             if (isDebug()) {
                 if (type == SWITCH_MAP_TYPE && MMKVUtil.getBoolean(MMKVKey.OnlyGoogleMap, false)) {
                     //只启用谷歌地图

baselibrary/src/main/java/com/abbidot/baselibrary/util/Utils.kt

@@ -37,7 +37,7 @@ class Utils {
         const val DATE_FORMAT_PATTERN_CN4 = "yyyy-MM-dd HH:mm"
         const val DATE_FORMAT_PATTERN_CN5 = "MM-dd HH:mm:ss"
         const val DATE_FORMAT_PATTERN_EN1 = "MMM d, yyyy | HH:mm"
-        const val DATE_FORMAT_PATTERN_EN2 = "d MMM yyyy  hh:mm a"
+        const val DATE_FORMAT_PATTERN_EN2 = "MMM d"
         const val DATE_FORMAT_PATTERN_EN3 = "MMM d, yyyy"
         const val DATE_FORMAT_PATTERN_EN4 = "MMM d yyyy"
         const val DATE_FORMAT_PATTERN_EN5 = "d/M"