优化新接口

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

@@ -739,7 +739,7 @@
 "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.6" = "Watch Information" ;
 "Watch.Admin.2.7" = "Message center";
 "Watch.Admin.2.8" = "Advanced Setting";
 "Watch.Admin.2.9" = "Adjustment";

artimenring-iOS/Artimenring/Base.lproj/View.xib

@@ -1138,8 +1138,8 @@
                         <constraint firstAttribute="height" constant="160" id="cx7-j0-rdV"/>
                     </constraints>
                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                    <state key="normal" backgroundImage="fence_icon_safe_nor"/>
-                    <state key="disabled" backgroundImage="fence_icon_safe_noedit"/>
+                    <state key="normal" backgroundImage="fence_icon_noedit"/>
+                    <state key="disabled" backgroundImage="fence_icon_noedit"/>
                     <state key="selected" backgroundImage="fence_icon_safe_sel"/>
                     <connections>
                         <action selector="onChangeFenceType:" destination="rTW-P0-plz" eventType="touchUpInside" id="IYv-9x-HZG"/>
@@ -1152,10 +1152,10 @@
                         <constraint firstAttribute="width" constant="120" id="cX6-Eg-qcN"/>
                         <constraint firstAttribute="height" constant="160" id="ryx-Qh-cEN"/>
                     </constraints>
-                    <state key="normal" backgroundImage="fence_icon_danger_nor">
+                    <state key="normal" backgroundImage="fence_icon_noedit">
                         <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     </state>
-                    <state key="disabled" backgroundImage="fence_icon_danger_nor"/>
+                    <state key="disabled" backgroundImage="fence_icon_noedit"/>
                     <state key="selected" backgroundImage="fence_icon_danger_sel"/>
                     <connections>
                         <action selector="onChangeFenceType:" destination="rTW-P0-plz" eventType="touchUpInside" id="MPT-dW-Xze"/>
@@ -1466,10 +1466,8 @@
     <resources>
         <image name="avatar" width="60" height="60"/>
         <image name="contact_camera" width="24" height="24"/>
-        <image name="fence_icon_danger_nor" width="120" height="160"/>
         <image name="fence_icon_danger_sel" width="120" height="160"/>
-        <image name="fence_icon_safe_noedit" width="120" height="160"/>
-        <image name="fence_icon_safe_nor" width="120" height="160"/>
+        <image name="fence_icon_noedit" width="120" height="160"/>
         <image name="fence_icon_safe_sel" width="120" height="160"/>
         <image name="fence_point" width="10" height="10"/>
         <image name="fence_point_red" width="10" height="10"/>

artimenring-iOS/Artimenring/Classes/ViewController/Baby/SKBabyListViewController.m

@@ -135,10 +135,11 @@
 
 - (void)deleteChild:(NSInteger)index {
     ChildModel *child = [[DataManager shared] getIndexChild:index];
-    NSString* cid = child.cid;
-    
+    NSDictionary *param = @{
+        @"cid" : child.cid,
+    };
     [self ShowHUBWithText:NSLocalizedString(@"Cancel.Following...", nil)];//@"取消关注中..."];
-    [ERequest httpRequest:@{} path:cid httpURL:URL_CHILD_DELETE httpMethod:@"GET" onSuccess:^(NSDictionary *result) {
+    [ERequest httpRequest:param httpURL:URL_CHILD_DELETE httpMethod:@"GET" onSuccess:^(NSDictionary *result) {
         [self HiddenHUB];
         if ([ERequest isSuccessWithResult:result]) {
             if([[DataManager shared] getChildCount] - 1 > 0) {

artimenring-iOS/Artimenring/Classes/ViewController/Fence/SKFenceDetailViewController.m

@@ -190,20 +190,20 @@
         };
         
         if ([self.mFenceModel.category isEqualToString:FENCE_CATEGORY_SCHOOL] || [self.mFenceModel.category isEqualToString:FENCE_CATEGORY_FAMILY]) {
-            [mHeaderView.mSafeBtn setImage:[UIImage imageNamed:@"fence_icon_safe_noedit"] forState:UIControlStateNormal];
-            [mHeaderView.mSafeBtn setImage:[UIImage imageNamed:@"fence_icon_safe_noedit"] forState:UIControlStateSelected];
+            [mHeaderView.mSafeBtn setImage:[UIImage imageNamed:@"fence_icon_noedit"] forState:UIControlStateNormal];
+            [mHeaderView.mSafeBtn setImage:[UIImage imageNamed:@"fence_icon_noedit"] forState:UIControlStateSelected];
             
-            [mHeaderView.mDangerBtn setImage:[UIImage imageNamed:@"fence_icon_danger_nor"] forState:UIControlStateNormal];
-            [mHeaderView.mDangerBtn setImage:[UIImage imageNamed:@"fence_icon_danger_nor"] forState:UIControlStateSelected];
+            [mHeaderView.mDangerBtn setImage:[UIImage imageNamed:@"fence_icon_noedit"] forState:UIControlStateNormal];
+            [mHeaderView.mDangerBtn setImage:[UIImage imageNamed:@"fence_icon_noedit"] forState:UIControlStateSelected];
             
             [mHeaderView setUserInteractionEnabled:NO];
         } else {
             BOOL isSafe = self.mFenceModel.fenceType == 1;
-            [mHeaderView.mSafeBtn setImage:[UIImage imageNamed:(isSafe? @"fence_icon_safe_sel":@"fence_icon_safe_nor")] forState:UIControlStateNormal];
-            [mHeaderView.mSafeBtn setImage:[UIImage imageNamed:(isSafe? @"fence_icon_safe_sel":@"fence_icon_safe_nor")] forState:UIControlStateSelected];
+            [mHeaderView.mSafeBtn setImage:[UIImage imageNamed:(isSafe? @"fence_icon_safe_sel":@"fence_icon_noedit")] forState:UIControlStateNormal];
+            [mHeaderView.mSafeBtn setImage:[UIImage imageNamed:(isSafe? @"fence_icon_safe_sel":@"fence_icon_noedit")] forState:UIControlStateSelected];
             
-            [mHeaderView.mDangerBtn setImage:[UIImage imageNamed:(!isSafe? @"fence_icon_danger_sel":@"fence_icon_danger_nor")] forState:UIControlStateNormal];
-            [mHeaderView.mDangerBtn setImage:[UIImage imageNamed:(isSafe? @"fence_icon_danger_sel":@"fence_icon_danger_nor")] forState:UIControlStateSelected];
+            [mHeaderView.mDangerBtn setImage:[UIImage imageNamed:(!isSafe? @"fence_icon_danger_sel":@"fence_icon_noedit")] forState:UIControlStateNormal];
+            [mHeaderView.mDangerBtn setImage:[UIImage imageNamed:(!isSafe? @"fence_icon_danger_sel":@"fence_icon_noedit")] forState:UIControlStateSelected];
         }
         
         return mHeaderView;

artimenring-iOS/Artimenring/Images.xcassets/Fence/fence_icon_danger_nor.imageset/Contents.json

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

artimenring-iOS/Artimenring/Images.xcassets/Fence/fence_icon_safe_nor.imageset/Contents.json → artimenring-iOS/Artimenring/Images.xcassets/Fence/fence_icon_noedit.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "fence_icon_safe_nor@2x.png",
+      "filename" : "fence_icon_noedit@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "fence_icon_safe_nor@3x.png",
+      "filename" : "fence_icon_noedit@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

artimenring-iOS/Artimenring/Images.xcassets/Fence/fence_icon_safe_noedit.imageset/Contents.json

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