新 icon

artimenring-iOS/Artimenring/Base.lproj/Main.storyboard

@@ -2943,11 +2943,16 @@
                                                         <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                     </state>
                                                 </button>
+                                                <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="contact_friend_mark" translatesAutoresizingMaskIntoConstraints="NO" id="l7t-Vq-IHq">
+                                                    <rect key="frame" x="123" y="16.666666666666668" width="20" height="20.000000000000004"/>
+                                                </imageView>
                                             </subviews>
                                             <constraints>
+                                                <constraint firstItem="l7t-Vq-IHq" firstAttribute="centerY" secondItem="5mR-av-Oqn" secondAttribute="centerY" id="3MS-Aa-uqe"/>
                                                 <constraint firstItem="RYb-uZ-mAx" firstAttribute="leading" secondItem="YX7-A8-pml" secondAttribute="trailing" constant="15" id="5rB-Z8-IcL"/>
                                                 <constraint firstItem="H7V-Cc-XvZ" firstAttribute="centerY" secondItem="5mR-av-Oqn" secondAttribute="centerY" id="FTd-25-Qg5"/>
                                                 <constraint firstItem="5mR-av-Oqn" firstAttribute="leading" secondItem="YX7-A8-pml" secondAttribute="trailing" constant="15" id="KhJ-MJ-lKG"/>
+                                                <constraint firstItem="l7t-Vq-IHq" firstAttribute="leading" secondItem="5mR-av-Oqn" secondAttribute="trailing" constant="5" id="UNK-tl-kLE"/>
                                                 <constraint firstItem="WZT-DM-bZI" firstAttribute="centerY" secondItem="5mR-av-Oqn" secondAttribute="centerY" id="ZMh-EH-CgM"/>
                                                 <constraint firstItem="H7V-Cc-XvZ" firstAttribute="leading" secondItem="5mR-av-Oqn" secondAttribute="trailing" constant="5" id="oty-3D-R9k"/>
                                                 <constraint firstItem="WZT-DM-bZI" firstAttribute="leading" secondItem="5mR-av-Oqn" secondAttribute="trailing" constant="5" id="wvD-cT-PxJ"/>
@@ -2960,6 +2965,7 @@
                                             <constraint firstItem="YX7-A8-pml" firstAttribute="leading" secondItem="UFK-rU-kuA" secondAttribute="leading" constant="15" id="tKQ-YK-57H"/>
                                         </constraints>
                                         <connections>
+                                            <outlet property="mFriendBtn" destination="l7t-Vq-IHq" id="7dg-iS-BLB"/>
                                             <outlet property="mHeadImage" destination="YX7-A8-pml" id="Se2-WH-tMa"/>
                                             <outlet property="mManagerBtn" destination="H7V-Cc-XvZ" id="DPd-jS-QdD"/>
                                             <outlet property="mNameLabel" destination="5mR-av-Oqn" id="e8J-72-b2o"/>
@@ -9934,6 +9940,7 @@ If you still can't scan the code properly after inserting it correctly, please s
         <image name="confirm_btn_blue" width="25" height="15"/>
         <image name="contact_address_book" width="20" height="20"/>
         <image name="contact_camera" width="24" height="24"/>
+        <image name="contact_friend_mark" width="20" height="20"/>
         <image name="doodle-off.png" width="36" height="36"/>
         <image name="fense_setting_btn" width="46" height="46"/>
         <image name="fense_setting_btn2" width="46" height="46"/>

artimenring-iOS/Artimenring/Classes/Model/EModel.h

@@ -225,11 +225,11 @@
 @interface PushMessageParamsModel : BaseModel
 @property(nonatomic, copy) NSString* name;
 @property(nonatomic, copy) NSString* friendName;
-@property(nonatomic, assign) NSInteger battery;
+@property(nonatomic, assign) NSInteger num;
 @property(nonatomic, assign) NSInteger fenceType; //围栏类型 1：安全 2：危险
 @property(nonatomic, copy) NSString* fenceName; //围栏名称
-@property(nonatomic, copy) NSString* fenceTime; //围栏时间
-@property(nonatomic, assign) NSInteger onOff; //开关机
+@property(nonatomic, copy) NSString* time; //围栏时间
+@property(nonatomic, assign) NSInteger status; //开关机 1:关机  2:开机
 @end
 
 @interface PushMessageModel : BaseModel

artimenring-iOS/Artimenring/Classes/Model/EModel.m

@@ -420,9 +420,9 @@
 - (NSString*)getMessage {
     switch (self.type) {
         case 10:
-            return [NSString stringWithFormat:NSLocalizedString(@"PAM.Type.Content.10", nil), self.params.name, self.params.battery];
+            return [NSString stringWithFormat:NSLocalizedString(@"PAM.Type.Content.10", nil), self.params.name, self.params.num];
         case 20: {
-            NSString* time = [EUtil convertHourString:self.params.fenceTime];
+            NSString* time = [EUtil convertHourString:self.params.time];
             if (self.params.fenceType == 1) {
                 return [NSString stringWithFormat:NSLocalizedString(@"PAM.Type.Content.20.1", nil), self.params.name, time, self.params.fenceName];
             } else {
@@ -432,7 +432,7 @@
         case 30:
             return [NSString stringWithFormat:NSLocalizedString(@"PAM.Type.Content.30", nil), self.params.name, self.params.friendName];
         case 40:
-            if (self.params.onOff <= 0) {
+            if (self.params.status <= 1) {
                 return [NSString stringWithFormat:NSLocalizedString(@"PAM.Type.Content.40.0", nil), self.params.name];
             } else {
                 return [NSString stringWithFormat:NSLocalizedString(@"PAM.Type.Content.40.1", nil), self.params.name];

artimenring-iOS/Artimenring/Classes/ViewController/Contact/ContactListCell.h

@@ -15,7 +15,8 @@
 @property(nonatomic, strong) IBOutlet UILabel* mPhoneNumberLabel;
 @property(nonatomic, strong) IBOutlet UIButton* mManagerBtn;
 @property(nonatomic, strong) IBOutlet UIButton* mOwnerBtn;
+@property(nonatomic, strong) IBOutlet UIImageView* mFriendBtn;
 
-- (void)setData:(NSString*)name phone:(NSString*)phoneNumber isManager:(BOOL)isManager isOwner:(BOOL)isOwner headImageURL:(NSString*)headImageURL imageIndexName:(NSString*)imageIndexName NationCode:(NSString*)nationCode;
+- (void)setData:(NSString*)name phone:(NSString*)phoneNumber isManager:(BOOL)isManager isOwner:(BOOL)isOwner isWatchFriend:(BOOL)isWatchFriend headImageURL:(NSString*)headImageURL imageIndexName:(NSString*)imageIndexName NationCode:(NSString*)nationCode;
 
 @end

artimenring-iOS/Artimenring/Classes/ViewController/Contact/ContactListCell.m

@@ -25,7 +25,7 @@
     // Configure the view for the selected state
 }
 
-- (void)setData:(NSString*)name phone:(NSString*)phoneNumber isManager:(BOOL)isManager isOwner:(BOOL)isOwner headImageURL:(NSString*)headImageURL imageIndexName:(NSString*)imageIndexName NationCode:(NSString*)nationCode {
+- (void)setData:(NSString*)name phone:(NSString*)phoneNumber isManager:(BOOL)isManager isOwner:(BOOL)isOwner isWatchFriend:(BOOL)isWatchFriend headImageURL:(NSString*)headImageURL imageIndexName:(NSString*)imageIndexName NationCode:(NSString*)nationCode {
     
     if (nationCode == nil || nationCode == (id)[NSNull null] || [nationCode isEqualToString:@""]) {
         self.mPhoneNumberLabel.text = phoneNumber;
@@ -36,6 +36,7 @@
     self.mNameLabel.text = name;
     [self.mManagerBtn setHidden:isManager? NO:YES];
     [self.mOwnerBtn setHidden:isOwner? NO:YES];
+    [self.mFriendBtn setHidden:isWatchFriend? NO:YES];
     
     if (headImageURL != (id)[NSNull null] && ![headImageURL isEqualToString:@"<null>"] && headImageURL.length > 0) {
         [EUtil setURLImage:self.mHeadImage placeHolderName:@"avatar" imageURL:headImageURL cornerRadius:self.mHeadImage.frame.size.width/2];

artimenring-iOS/Artimenring/Classes/ViewController/Contact/ContactListViewController.m

@@ -116,14 +116,15 @@
     
     if (indexPath.section == 0) {
         ChildModel* model = [DataManager shared].mSelectChildModel;
-        [cell setData:model.name phone:model.phoneNumber isManager:NO isOwner:YES headImageURL:model.avatarHttp imageIndexName:[model getAvatarLocalName] NationCode:model.internationalAreaCode];
+        [cell setData:model.name phone:model.phoneNumber isManager:NO isOwner:YES isWatchFriend:NO headImageURL:model.avatarHttp imageIndexName:[model getAvatarLocalName] NationCode:model.internationalAreaCode];
     } else if (indexPath.section == 2 && [self.mContactListModel getFamilys].count > indexPath.row) {
         ContactModel* model = [[self.mContactListModel getFamilys] objectAtIndex:indexPath.row];
         BOOL isOwner = [model._id isEqualToString:[DataManager shared].loginModel.userId];
-        [cell setData:model.remarkName phone:model.phoneNumber isManager:model.identity >= IDENTITY_ADMIN isOwner:isOwner headImageURL:model.avatarHttp imageIndexName:[model getAvatarLocalName] NationCode:model.internationalAreaCode];
+        [cell setData:model.remarkName phone:model.phoneNumber isManager:model.identity >= IDENTITY_ADMIN isOwner:isOwner isWatchFriend:NO headImageURL:model.avatarHttp imageIndexName:[model getAvatarLocalName] NationCode:model.internationalAreaCode];
     } else if (indexPath.section == 4 && [self.mContactListModel getFriends].count > indexPath.row) {
         ContactModel* model = [[self.mContactListModel getFriends] objectAtIndex:indexPath.row];
-        [cell setData:model.remarkName phone:model.phoneNumber isManager:NO isOwner:NO headImageURL:model.avatarHttp imageIndexName:[model getAvatarLocalName] NationCode:model.internationalAreaCode];
+        BOOL isWatchFriend = [model.origin isEqualToString:CONTACT_ORIGIN_WATCH];
+        [cell setData:model.remarkName phone:model.phoneNumber isManager:NO isOwner:NO isWatchFriend:isWatchFriend headImageURL:model.avatarHttp imageIndexName:[model getAvatarLocalName] NationCode:model.internationalAreaCode];
     }
     
     //非管理员不能点击

artimenring-iOS/Artimenring/Images.xcassets/Contact/contact_friend_mark.imageset/Contents.json

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

artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_1_0.imageset/Contents.json

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

artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_1_2.imageset/Contents.json

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

artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_1_3.imageset/Contents.json

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

artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_2_0.imageset/Contents.json

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

artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_2_1.imageset/Contents.json

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

artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_2_2.imageset/Contents.json

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

artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_2_3.imageset/Contents.json

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

artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_3_1.imageset/Contents.json

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

artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_3_2.imageset/Contents.json

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

artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_3_5.imageset/Contents.json

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

artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_3_6.imageset/Contents.json

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

artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_3_7.imageset/Contents.json

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

artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_notadmin_1_0.imageset/Contents.json

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

artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_notadmin_1_2.imageset/Contents.json

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

artimenring-iOS/Artimenring/Images.xcassets/Watch/watch_icon_notadmin_1_3.imageset/Contents.json

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