liuzhenxing1118 9 months ago
parent
commit
eaf43c70ee
31 changed files with 171 additions and 162 deletions
  1. 22 22
      artimenring-iOS/Artimenring/Base.lproj/Localizable.strings
  2. 5 4
      artimenring-iOS/Artimenring/Classes/View/SKChildCellView.m
  3. 38 38
      artimenring-iOS/Artimenring/Classes/ViewController/Watch/SKWatchViewController.m
  4. BIN
      artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_1_0.imageset/watch_icon_1_0@2x.png
  5. BIN
      artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_1_0.imageset/watch_icon_1_0@3x.png
  6. 5 5
      artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_1_1.imageset/Contents.json
  7. BIN
      artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_1_1.imageset/watch_icon_1_1@2x.png
  8. BIN
      artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_1_1.imageset/watch_icon_1_1@3x.png
  9. BIN
      artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_1_2.imageset/watch_icon_1_2@2x.png
  10. BIN
      artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_1_2.imageset/watch_icon_1_2@3x.png
  11. BIN
      artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_1_3.imageset/watch_icon_1_3@2x.png
  12. BIN
      artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_1_3.imageset/watch_icon_1_3@3x.png
  13. BIN
      artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_2_1.imageset/watch_icon_2_1@2x.png
  14. BIN
      artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_2_1.imageset/watch_icon_2_1@3x.png
  15. 22 0
      artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_2_6.imageset/Contents.json
  16. BIN
      artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_2_6.imageset/watch_icon_2_6@2x.png
  17. BIN
      artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_2_6.imageset/watch_icon_2_6@3x.png
  18. 22 0
      artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_2_8.imageset/Contents.json
  19. BIN
      artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_2_8.imageset/watch_icon_2_8@2x.png
  20. BIN
      artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_2_8.imageset/watch_icon_2_8@3x.png
  21. 5 5
      artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_3_0.imageset/Contents.json
  22. BIN
      artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_3_0.imageset/watch_icon_3_0@2x.png
  23. BIN
      artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_3_0.imageset/watch_icon_3_0@3x.png
  24. 5 5
      artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_3_3.imageset/Contents.json
  25. BIN
      artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_3_3.imageset/watch_icon_3_3@2x.png
  26. BIN
      artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_3_3.imageset/watch_icon_3_3@3x.png
  27. BIN
      artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_notadmin_1_0.imageset/watch_icon_notadmin_1_0@2x.png
  28. BIN
      artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_notadmin_1_0.imageset/watch_icon_notadmin_1_0@3x.png
  29. 23 23
      artimenring-iOS/Artimenring/zh-HK.lproj/Localizable.strings
  30. 24 24
      artimenring-iOS/Artimenring/zh-Hans.lproj/Localizable.strings
  31. 0 36
      artimenring-iOS/VeryFit Kids.xcodeproj/project.pbxproj

+ 22 - 22
artimenring-iOS/Artimenring/Base.lproj/Localizable.strings

@@ -721,32 +721,32 @@
 "Mine.No.UserName" = "Unknown";
 "Mine.No.PhoneNum" = "No data";
 "Watch.Admin.Section.0" = "";
-"Watch.Admin.Section.1" = "Communication Link";
-"Watch.Admin.Section.2" = "Security Guard";
-"Watch.Admin.Section.3" = "Watch Setting";
+"Watch.Admin.Section.1" = "Security Guard";
+"Watch.Admin.Section.2" = "Watch Setting";
+"Watch.Admin.Section.3" = "Communication Link";
 "Watch.Admin.0.0" = "Magic school";
 "Watch.Admin.0.1" = "Task Management";
 "Watch.Admin.0.2" = "Step Count";
 "Watch.Admin.0.3" = "Music";
-"Watch.Admin.1.0" = "Address book";
-"Watch.Admin.1.1" = "Voice Query";
-"Watch.Admin.1.2" = "Forward SMS";
-"Watch.Admin.1.3" = "Block strangers call";
-"Watch.Admin.2.0" = "Track history";
-"Watch.Admin.2.1" = "Geo Fence";
-"Watch.Admin.2.2" = "School Mode";
-"Watch.Admin.2.3" = "Alarm clock";
-"Watch.Admin.2.4" = "Calendar";
-"Watch.Admin.3.0" = "Watch Wi-Fi";
-"Watch.Admin.3.1" = "Remote control";
-"Watch.Admin.3.2" = "Power Mode";
-"Watch.Admin.3.3" = "Eye Protection Mode";
-"Watch.Admin.3.4" = "Data Usage Control";
-"Watch.Admin.3.5" = "System upgrade";
-"Watch.Admin.3.6" = "Watch Information";
-"Watch.Admin.3.7" = "Message center";
-"Watch.Admin.3.8" = "Advanced Setting";
-"Watch.Admin.3.9" = "Adjustment";
+"Watch.Admin.1.0" = "Track history";
+"Watch.Admin.1.1" = "Geo Fence";
+"Watch.Admin.1.2" = "School Mode";
+"Watch.Admin.1.3" = "Alarm clock";
+"Watch.Admin.1.4" = "Calendar";
+"Watch.Admin.2.0" = "Watch Wi-Fi";
+"Watch.Admin.2.1" = "Remote control";
+"Watch.Admin.2.2" = "Power Mode";
+"Watch.Admin.2.3" = "Eye Protection Mode";
+"Watch.Admin.2.4" = "Data Usage Control";
+"Watch.Admin.2.5" = "System upgrade";
+"Watch.Admin.2.6" = "Watch Information";
+"Watch.Admin.2.7" = "Message center";
+"Watch.Admin.2.8" = "Advanced Setting";
+"Watch.Admin.2.9" = "Adjustment";
+"Watch.Admin.3.0" = "Address book";
+"Watch.Admin.3.1" = "Voice Query";
+"Watch.Admin.3.2" = "Forward SMS";
+"Watch.Admin.3.3" = "Block strangers call";
 "Watch.NotAdmin.0.0" = "Magic school";
 "Watch.NotAdmin.0.1" = "Task Management";
 "Watch.NotAdmin.0.2" = "Step Count";

+ 5 - 4
artimenring-iOS/Artimenring/Classes/View/SKChildCellView.m

@@ -38,10 +38,6 @@
 }
 
 - (void)initView {
-    UIButton* button = [[UIButton alloc] initWithFrame:self.bounds];
-    [button addTarget:self action:@selector(itemBtnClick:) forControlEvents:UIControlEventTouchUpInside];
-    [self addSubview:button];
-    
     //head
     float x = 15;
     float y = (self.frame.size.height - SIZE_IMAGE)/2;
@@ -123,6 +119,11 @@
     UIView* line = [[UIView alloc] initWithFrame:CGRectMake(x, y, w, h)];
     [line setBackgroundColor:[UIColor lightGrayColor]];
     [self addSubview:line];
+    
+    UIButton* button = [[UIButton alloc] initWithFrame:self.bounds];
+    [button addTarget:self action:@selector(itemBtnClick:) forControlEvents:UIControlEventTouchUpInside];
+    [button setBackgroundColor:[UIColor clearColor]];
+    [self addSubview:button];
 }
 
 - (void)refreshType:(NSInteger)type {

+ 38 - 38
artimenring-iOS/Artimenring/Classes/ViewController/Watch/SKWatchViewController.m

@@ -96,19 +96,7 @@ static NSString * const HeaderReuseIdentifier = @"WatchHeaderID";
             [firstArray addObject:@(1)];
         //[firstArray addObject:@(2)]; //此界面不显示计步
         mFunctionDic[@"0"] = firstArray;
-        
-        NSMutableArray* secondArray = NSMutableArray.new;
-        [secondArray addObject:@(0)];
-        if (model.match.callCharge) //国外版本不支持//
-            [secondArray addObject:@(1)];
-        if (model.match.watchSMS)
-            [secondArray addObject:@(2)];
-        if (model.match.strangerIntercept)
-            [secondArray addObject:@(3)];
-        if (model.match.callRecord)
-            [secondArray addObject:@(4)];
-        mFunctionDic[@"1"] = secondArray;
-        
+    
         NSMutableArray* thirdArray = NSMutableArray.new;
         [thirdArray addObject:@(0)];
         [thirdArray addObject:@(1)];
@@ -117,7 +105,7 @@ static NSString * const HeaderReuseIdentifier = @"WatchHeaderID";
             [thirdArray addObject:@(3)];
         if (model.match.eventReminder)
             [thirdArray addObject:@(4)];
-        mFunctionDic[@"2"] = thirdArray;
+        mFunctionDic[@"1"] = thirdArray;
         
         NSMutableArray* fourArray = NSMutableArray.new;
         if (model.match.wifi)
@@ -139,7 +127,19 @@ static NSString * const HeaderReuseIdentifier = @"WatchHeaderID";
             [fourArray addObject:@(8)];
         if ([model isBind] && model.match.function)
             [fourArray addObject:@(9)];
-        mFunctionDic[@"3"] = fourArray;
+        mFunctionDic[@"2"] = fourArray;
+        
+        NSMutableArray* secondArray = NSMutableArray.new;
+        [secondArray addObject:@(0)];
+        if (model.match.callCharge) //国外版本不支持//
+            [secondArray addObject:@(1)];
+        if (model.match.watchSMS)
+            [secondArray addObject:@(2)];
+        if (model.match.strangerIntercept)
+            [secondArray addObject:@(3)];
+        if (model.match.callRecord)
+            [secondArray addObject:@(4)];
+        mFunctionDic[@"3"] = secondArray;
     }
 }
 
@@ -288,28 +288,6 @@ static NSString * const HeaderReuseIdentifier = @"WatchHeaderID";
                 break;
             }
             case 1: {
-                switch (cellTag) {
-                    case 0:
-                        [self showContact];
-                        break;
-                    case 1:
-                        [self showCallCharge];
-                        break;
-                    case 2:
-                        [self showCollectSMS];
-                        break;
-                    case 3:
-                        [self showStranger];
-                        break;
-                    case 4:
-                        [self showCallRecord];
-                        break;
-                    default:
-                        break;
-                }
-                break;
-            }
-            case 2: {
                 
                 switch (cellTag) {
                     case 0:
@@ -332,7 +310,7 @@ static NSString * const HeaderReuseIdentifier = @"WatchHeaderID";
                 }
                 break;
             }
-            case 3: {
+            case 2: {
                 switch (cellTag) {
                     case 0:
                         [self showWifi];
@@ -369,6 +347,28 @@ static NSString * const HeaderReuseIdentifier = @"WatchHeaderID";
                 }
                 break;
             }
+            case 3: {
+                switch (cellTag) {
+                    case 0:
+                        [self showContact];
+                        break;
+                    case 1:
+                        [self showCallCharge];
+                        break;
+                    case 2:
+                        [self showCollectSMS];
+                        break;
+                    case 3:
+                        [self showStranger];
+                        break;
+                    case 4:
+                        [self showCallRecord];
+                        break;
+                    default:
+                        break;
+                }
+                break;
+            }
             default:
                 break;
         }

BIN
artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_1_0.imageset/watch_icon_1_0@2x.png


BIN
artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_1_0.imageset/watch_icon_1_0@3x.png


+ 5 - 5
artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_1_1.imageset/Contents.json

@@ -5,18 +5,18 @@
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "watch_icon_1_1@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "watch_icon_1_1@3x.png",
+      "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

BIN
artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_1_1.imageset/watch_icon_1_1@2x.png


BIN
artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_1_1.imageset/watch_icon_1_1@3x.png


BIN
artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_1_2.imageset/watch_icon_1_2@2x.png


BIN
artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_1_2.imageset/watch_icon_1_2@3x.png


BIN
artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_1_3.imageset/watch_icon_1_3@2x.png


BIN
artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_1_3.imageset/watch_icon_1_3@3x.png


BIN
artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_2_1.imageset/watch_icon_2_1@2x.png


BIN
artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_2_1.imageset/watch_icon_2_1@3x.png


+ 22 - 0
artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_2_6.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "watch_icon_2_6@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "watch_icon_2_6@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_2_6.imageset/watch_icon_2_6@2x.png


BIN
artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_2_6.imageset/watch_icon_2_6@3x.png


+ 22 - 0
artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_2_8.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "watch_icon_2_8@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "watch_icon_2_8@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_2_8.imageset/watch_icon_2_8@2x.png


BIN
artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_2_8.imageset/watch_icon_2_8@3x.png


+ 5 - 5
artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_3_0.imageset/Contents.json

@@ -5,18 +5,18 @@
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "watch_icon_3_0@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "watch_icon_3_0@3x.png",
+      "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

BIN
artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_3_0.imageset/watch_icon_3_0@2x.png


BIN
artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_3_0.imageset/watch_icon_3_0@3x.png


+ 5 - 5
artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_3_3.imageset/Contents.json

@@ -5,18 +5,18 @@
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "watch_icon_3_3@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "watch_icon_3_3@3x.png",
+      "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

BIN
artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_3_3.imageset/watch_icon_3_3@2x.png


BIN
artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_3_3.imageset/watch_icon_3_3@3x.png


BIN
artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_notadmin_1_0.imageset/watch_icon_notadmin_1_0@2x.png


BIN
artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_notadmin_1_0.imageset/watch_icon_notadmin_1_0@3x.png


+ 23 - 23
artimenring-iOS/Artimenring/zh-HK.lproj/Localizable.strings

@@ -995,35 +995,35 @@
 "Mine.No.PhoneNum" = "還沒有數據哦";
 
 "Watch.Admin.Section.0" = "";
-"Watch.Admin.Section.1" = "溝通聯繫";
-"Watch.Admin.Section.2" = "安全守護";
-"Watch.Admin.Section.3" = "手錶管理";
+"Watch.Admin.Section.1" = "安全守護";
+"Watch.Admin.Section.2" = "手錶管理";
+"Watch.Admin.Section.3" = "溝通聯繫";
 
 "Watch.Admin.0.0" = "魔法學院";
 "Watch.Admin.0.1" = "紅花任務";
 "Watch.Admin.0.2" = "健康計步";
 "Watch.Admin.0.3" = "音樂故事";
 
-"Watch.Admin.1.0" = "通訊錄";
-"Watch.Admin.1.1" = "話費查詢";
-"Watch.Admin.1.2" = "代收短信";
-"Watch.Admin.1.3" = "拒接陌生人";
-
-"Watch.Admin.2.0" = "歷史軌跡";
-"Watch.Admin.2.1" = "電子圍欄";
-"Watch.Admin.2.2" = "上課禁用";
-"Watch.Admin.2.3" = "鬧鐘";
-"Watch.Admin.2.4" = "活動提醒";
-
-"Watch.Admin.3.0" = "手錶Wi-Fi";
-"Watch.Admin.3.1" = "遠程控制";
-"Watch.Admin.3.2" = "省電模式";
-"Watch.Admin.3.3" = "護眼模式";
-"Watch.Admin.3.4" = "流量控制";
-"Watch.Admin.3.5" = "系統升級";
-"Watch.Admin.3.6" = "出廠信息";
-"Watch.Admin.3.7" = "消息中心";
-"Watch.Admin.3.8" = "手錶設置";
+"Watch.Admin.1.0" = "歷史軌跡";
+"Watch.Admin.1.1" = "電子圍欄";
+"Watch.Admin.1.2" = "上課禁用";
+"Watch.Admin.1.3" = "鬧鐘";
+"Watch.Admin.1.4" = "活動提醒";
+
+"Watch.Admin.2.0" = "手錶Wi-Fi";
+"Watch.Admin.2.1" = "遠程控制";
+"Watch.Admin.2.2" = "省電模式";
+"Watch.Admin.2.3" = "護眼模式";
+"Watch.Admin.2.4" = "流量控制";
+"Watch.Admin.2.5" = "系統升級";
+"Watch.Admin.2.6" = "出廠信息";
+"Watch.Admin.2.7" = "消息中心";
+"Watch.Admin.2.8" = "手錶設置";
+
+"Watch.Admin.3.0" = "通訊錄";
+"Watch.Admin.3.1" = "話費查詢";
+"Watch.Admin.3.2" = "代收短信";
+"Watch.Admin.3.3" = "拒接陌生人";
 
 "Watch.NotAdmin.0.0" = "魔法學院";
 "Watch.NotAdmin.0.1" = "紅花任務";

+ 24 - 24
artimenring-iOS/Artimenring/zh-Hans.lproj/Localizable.strings

@@ -995,36 +995,36 @@
 "Mine.No.PhoneNum" = "还没有数据哦";
 
 "Watch.Admin.Section.0" = "";
-"Watch.Admin.Section.1" = "沟通联系";
-"Watch.Admin.Section.2" = "安全守护";
-"Watch.Admin.Section.3" = "手表管理";
+"Watch.Admin.Section.1" = "安全守护";
+"Watch.Admin.Section.2" = "手表管理";
+"Watch.Admin.Section.3" = "沟通联系";
 
 "Watch.Admin.0.0" = "魔法学院";
 "Watch.Admin.0.1" = "红花任务";
 "Watch.Admin.0.2" = "健康计步";
 "Watch.Admin.0.3" = "音乐故事";
 
-"Watch.Admin.1.0" = "通讯录";
-"Watch.Admin.1.1" = "话费查询";
-"Watch.Admin.1.2" = "代收短信";
-"Watch.Admin.1.3" = "拒接陌生人";
-
-"Watch.Admin.2.0" = "历史轨迹";
-"Watch.Admin.2.1" = "电子围栏";
-"Watch.Admin.2.2" = "上课禁用";
-"Watch.Admin.2.3" = "闹钟";
-"Watch.Admin.2.4" = "活动提醒";
-
-"Watch.Admin.3.0" = "手表Wi-Fi";
-"Watch.Admin.3.1" = "远程控制";
-"Watch.Admin.3.2" = "省电模式";
-"Watch.Admin.3.3" = "护眼模式";
-"Watch.Admin.3.4" = "流量控制";
-"Watch.Admin.3.5" = "系统升级";
-"Watch.Admin.3.6" = "出厂信息";
-"Watch.Admin.3.7" = "消息中心";
-"Watch.Admin.3.8" = "手表设置";
-"Watch.Admin.3.9" = "手表调节";
+"Watch.Admin.1.0" = "历史轨迹";
+"Watch.Admin.1.1" = "电子围栏";
+"Watch.Admin.1.2" = "上课禁用";
+"Watch.Admin.1.3" = "闹钟";
+"Watch.Admin.1.4" = "活动提醒";
+
+"Watch.Admin.2.0" = "手表Wi-Fi";
+"Watch.Admin.2.1" = "远程控制";
+"Watch.Admin.2.2" = "省电模式";
+"Watch.Admin.2.3" = "护眼模式";
+"Watch.Admin.2.4" = "流量控制";
+"Watch.Admin.2.5" = "系统升级";
+"Watch.Admin.2.6" = "出厂信息";
+"Watch.Admin.2.7" = "消息中心";
+"Watch.Admin.2.8" = "手表设置";
+"Watch.Admin.2.9" = "手表调节";
+
+"Watch.Admin.3.0" = "通讯录";
+"Watch.Admin.3.1" = "话费查询";
+"Watch.Admin.3.2" = "代收短信";
+"Watch.Admin.3.3" = "拒接陌生人";
 
 "Watch.NotAdmin.0.0" = "魔法学院";
 "Watch.NotAdmin.0.1" = "红花任务";

+ 0 - 36
artimenring-iOS/VeryFit Kids.xcodeproj/project.pbxproj

@@ -699,10 +699,6 @@
 		E4010C2C2BEA3C4C00C0A23F /* video_start.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = video_start.mp3; sourceTree = "<group>"; };
 		E4010C2F2BEA406F00C0A23F /* JuphoonManager+ringtone.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "JuphoonManager+ringtone.h"; sourceTree = "<group>"; };
 		E4010C302BEA406F00C0A23F /* JuphoonManager+ringtone.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "JuphoonManager+ringtone.m"; sourceTree = "<group>"; };
-		E40D4D802BC7FC9800EECF7F /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Main.strings; sourceTree = "<group>"; };
-		E40D4D812BC7FC9800EECF7F /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/View.strings; sourceTree = "<group>"; };
-		E40D4D822BC7FC9800EECF7F /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		E40D4D832BC7FC9900EECF7F /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; };
 		E418495F2B8C8CCA000C18DB /* SKAlarmClockTitleViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SKAlarmClockTitleViewController.h; sourceTree = "<group>"; };
 		E41849602B8C8CCB000C18DB /* SKAlarmClockTitleViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SKAlarmClockTitleViewController.m; sourceTree = "<group>"; };
 		E41ECB4C2CF95C6B00C4C36C /* SKMainViewController+location.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "SKMainViewController+location.m"; sourceTree = "<group>"; };
@@ -920,14 +916,6 @@
 		E47FBA2E2B6B838600BB42DE /* SKAlarmClockDetailCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SKAlarmClockDetailCell.h; sourceTree = "<group>"; };
 		E47FBA312B6B9DF300BB42DE /* PooCodeView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PooCodeView.m; sourceTree = "<group>"; };
 		E47FBA322B6B9DF300BB42DE /* PooCodeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PooCodeView.h; sourceTree = "<group>"; };
-		E48233832BD6803A00BD8EE5 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Main.strings; sourceTree = "<group>"; };
-		E48233852BD6803B00BD8EE5 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		E48233862BD6803B00BD8EE5 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = "<group>"; };
-		E48233872BD6804E00BD8EE5 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Main.strings; sourceTree = "<group>"; };
-		E48233882BD6804E00BD8EE5 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/View.strings; sourceTree = "<group>"; };
-		E48233892BD6804E00BD8EE5 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		E482338A2BD6804E00BD8EE5 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Localizable.strings; sourceTree = "<group>"; };
-		E482338C2BD7D0CA00BD8EE5 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/View.strings; sourceTree = "<group>"; };
 		E483C5A02B8F0D1F00EBF8AC /* SKRegisterViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SKRegisterViewController.m; sourceTree = "<group>"; };
 		E483C5A12B8F0D1F00EBF8AC /* SKRegisterViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SKRegisterViewController.h; sourceTree = "<group>"; };
 		E483C5A32B8F0D7200EBF8AC /* SKBindPhoneViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SKBindPhoneViewController.h; sourceTree = "<group>"; };
@@ -942,10 +930,6 @@
 		E49951FB2B2C6C9B0018438F /* SKWebSocket+observer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "SKWebSocket+observer.m"; sourceTree = "<group>"; };
 		E49A83702B625B3A00D5B289 /* SKInCallViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SKInCallViewController.h; sourceTree = "<group>"; };
 		E49A83712B625B3A00D5B289 /* SKInCallViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SKInCallViewController.m; sourceTree = "<group>"; };
-		E49F8D3D2BA1A26B00EDBAA8 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Main.strings; sourceTree = "<group>"; };
-		E49F8D3E2BA1A26C00EDBAA8 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/View.strings; sourceTree = "<group>"; };
-		E49F8D3F2BA1A26C00EDBAA8 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		E49F8D402BA1A26C00EDBAA8 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
 		E49F8D542BA1A52C00EDBAA8 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Main.strings; sourceTree = "<group>"; };
 		E49F8D562BA1A53800EDBAA8 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/View.strings; sourceTree = "<group>"; };
 		E49F8D612BA3F8C900EDBAA8 /* NSString+http.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+http.m"; sourceTree = "<group>"; };
@@ -2716,11 +2700,7 @@
 			knownRegions = (
 				Base,
 				"zh-Hans",
-				de,
 				en,
-				es,
-				fr,
-				it,
 				"zh-HK",
 			);
 			mainGroup = 28159BB01A3FC06000A3E1A3;
@@ -3210,10 +3190,6 @@
 			children = (
 				7B27DC951B304CD70071203A /* Base */,
 				7B6439D61B46253A008D319B /* zh-Hans */,
-				E49F8D3F2BA1A26C00EDBAA8 /* de */,
-				E40D4D822BC7FC9800EECF7F /* es */,
-				E48233852BD6803B00BD8EE5 /* fr */,
-				E48233892BD6804E00BD8EE5 /* it */,
 				E47B69472C48C6FC00DD9A74 /* zh-HK */,
 			);
 			name = InfoPlist.strings;
@@ -3224,10 +3200,6 @@
 			children = (
 				7B6439D31B462513008D319B /* Base */,
 				7B6439D71B46253A008D319B /* zh-Hans */,
-				E49F8D402BA1A26C00EDBAA8 /* de */,
-				E40D4D832BC7FC9900EECF7F /* es */,
-				E48233862BD6803B00BD8EE5 /* fr */,
-				E482338A2BD6804E00BD8EE5 /* it */,
 				E47B69482C48C6FC00DD9A74 /* zh-HK */,
 			);
 			name = Localizable.strings;
@@ -3237,12 +3209,8 @@
 			isa = PBXVariantGroup;
 			children = (
 				E44FCB042BA1542B00C7E9CF /* Base */,
-				E49F8D3D2BA1A26B00EDBAA8 /* de */,
 				E49F8D542BA1A52C00EDBAA8 /* en */,
 				E4E558A82BBD269D00A00824 /* zh-Hans */,
-				E40D4D802BC7FC9800EECF7F /* es */,
-				E48233832BD6803A00BD8EE5 /* fr */,
-				E48233872BD6804E00BD8EE5 /* it */,
 				E47B69452C48C6FC00DD9A74 /* zh-HK */,
 			);
 			name = Main.storyboard;
@@ -3252,11 +3220,7 @@
 			isa = PBXVariantGroup;
 			children = (
 				E44FCB132BA15BB400C7E9CF /* Base */,
-				E49F8D3E2BA1A26C00EDBAA8 /* de */,
 				E49F8D562BA1A53800EDBAA8 /* en */,
-				E40D4D812BC7FC9800EECF7F /* es */,
-				E48233882BD6804E00BD8EE5 /* it */,
-				E482338C2BD7D0CA00BD8EE5 /* fr */,
 				E42D819B2C0577AB00398588 /* zh-Hans */,
 				E47B69462C48C6FC00DD9A74 /* zh-HK */,
 			);