gui

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

@@ -252,7 +252,7 @@
                                         <constraint firstAttribute="height" constant="36" id="fYQ-BY-nPv"/>
                                     </constraints>
                                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="13"/>
-                                    <state key="normal" title="拨号" image="ic_location_call">
+                                    <state key="normal" image="ic_location_call">
                                         <color key="titleColor" red="0.17254901959999999" green="0.61176470589999998" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                     </state>
                                     <connections>
@@ -266,7 +266,7 @@
                                         <constraint firstAttribute="height" constant="36" id="OWe-1w-P8f"/>
                                     </constraints>
                                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="13"/>
-                                    <state key="normal" title="监听" image="ic_location_monitor">
+                                    <state key="normal" image="ic_location_monitor">
                                         <color key="titleColor" red="1" green="0.5568627451" blue="0.1019607843" alpha="1" colorSpace="calibratedRGB"/>
                                     </state>
                                     <connections>
@@ -280,7 +280,7 @@
                                         <constraint firstAttribute="height" constant="36" id="LPm-yq-MUf"/>
                                     </constraints>
                                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="13"/>
-                                    <state key="normal" title="发消息" image="ic_location_message">
+                                    <state key="normal" image="ic_location_message">
                                         <color key="titleColor" red="0.12941176469999999" green="0.89019607840000003" blue="0.41176470590000003" alpha="1" colorSpace="calibratedRGB"/>
                                     </state>
                                     <connections>
@@ -294,7 +294,7 @@
                                         <constraint firstAttribute="height" constant="36" id="Z4u-GU-8Zt"/>
                                     </constraints>
                                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="13"/>
-                                    <state key="normal" title="导航" image="ic_navgation_message">
+                                    <state key="normal" image="ic_navgation_message">
                                         <color key="titleColor" red="0.52941176469999995" green="0.36078431370000003" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                     </state>
                                     <connections>
@@ -1475,11 +1475,11 @@
         <image name="fence_point_red" width="10" height="10"/>
         <image name="guide_1" width="260" height="260"/>
         <image name="hot warning" width="270" height="110"/>
-        <image name="ic_location_call" width="20" height="20"/>
-        <image name="ic_location_message" width="20" height="20"/>
+        <image name="ic_location_call" width="26" height="26"/>
+        <image name="ic_location_message" width="26" height="26"/>
         <image name="ic_location_monitor" width="20" height="20"/>
         <image name="ic_location_pop_bg" width="70" height="70"/>
-        <image name="ic_navgation_message" width="20" height="20"/>
+        <image name="ic_navgation_message" width="26" height="26"/>
         <image name="location_address" width="20" height="20"/>
         <image name="location_time" width="14" height="14"/>
         <image name="mine_add_family" width="28" height="28"/>

artimenring-iOS/Artimenring/Classes/View/PGCustomBannerView.m

@@ -23,14 +23,14 @@
     [EUtil setButtonCornerRadius:self.mMonitorBtn radius:18];
     [EUtil setButtonCornerRadius:self.mNotbindBtn radius:18];
 
-    [self.mCallBtn setTitle:NSLocalizedString(@"Location.Btn.Call", nil) forState:UIControlStateNormal];
-    [self.mCallBtn setTitle:NSLocalizedString(@"Location.Btn.Call", nil) forState:UIControlStateSelected];
-    [self.mChatBtn setTitle:NSLocalizedString(@"Location.Btn.Chat", nil) forState:UIControlStateNormal];
-    [self.mChatBtn setTitle:NSLocalizedString(@"Location.Btn.Chat", nil) forState:UIControlStateSelected];
-    [self.mNavigationBtn setTitle:NSLocalizedString(@"Location.Btn.Navigation", nil) forState:UIControlStateNormal];
-    [self.mNavigationBtn setTitle:NSLocalizedString(@"Location.Btn.Navigation", nil) forState:UIControlStateSelected];
-    [self.mMonitorBtn setTitle:NSLocalizedString(@"Location.Btn.Monitor", nil) forState:UIControlStateNormal];
-    [self.mMonitorBtn setTitle:NSLocalizedString(@"Location.Btn.Monitor", nil) forState:UIControlStateSelected];
+//    [self.mCallBtn setTitle:NSLocalizedString(@"Location.Btn.Call", nil) forState:UIControlStateNormal];
+//    [self.mCallBtn setTitle:NSLocalizedString(@"Location.Btn.Call", nil) forState:UIControlStateSelected];
+//    [self.mChatBtn setTitle:NSLocalizedString(@"Location.Btn.Chat", nil) forState:UIControlStateNormal];
+//    [self.mChatBtn setTitle:NSLocalizedString(@"Location.Btn.Chat", nil) forState:UIControlStateSelected];
+//    [self.mNavigationBtn setTitle:NSLocalizedString(@"Location.Btn.Navigation", nil) forState:UIControlStateNormal];
+//    [self.mNavigationBtn setTitle:NSLocalizedString(@"Location.Btn.Navigation", nil) forState:UIControlStateSelected];
+//    [self.mMonitorBtn setTitle:NSLocalizedString(@"Location.Btn.Monitor", nil) forState:UIControlStateNormal];
+//    [self.mMonitorBtn setTitle:NSLocalizedString(@"Location.Btn.Monitor", nil) forState:UIControlStateSelected];
     
     [self.mCallBtn setTitleEdgeInsets:UIEdgeInsetsMake(0, 0, 0, -3)];
     [self.mCallBtn setImageEdgeInsets:UIEdgeInsetsMake(0, -3, 0, 0)];

artimenring-iOS/Artimenring/Images.xcassets/Location/ic_location_call.imageset/Contents.json

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

artimenring-iOS/Artimenring/Images.xcassets/Location/ic_location_message.imageset/Contents.json

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

artimenring-iOS/Artimenring/Images.xcassets/Location/ic_navgation_message.imageset/Contents.json

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