liuzhenxing1118 hai 9 meses
pai
achega
ab03cf4622
Modificáronse 18 ficheiros con 50 adicións e 24 borrados
  1. 3 3
      artimenring-iOS/Artimenring/Base.lproj/Localizable.strings
  2. 4 1
      artimenring-iOS/Artimenring/Classes/ViewController/Mine/SKMineViewController+user.m
  3. 3 2
      artimenring-iOS/Artimenring/Classes/ViewController/Mine/SKMineViewController.m
  4. 22 0
      artimenring-iOS/Artimenring/Images.xcassets/Location/icon_change.imageset/Contents.json
  5. BIN=BIN
      artimenring-iOS/Artimenring/Images.xcassets/Location/icon_change.imageset/icon_change@2x.png
  6. BIN=BIN
      artimenring-iOS/Artimenring/Images.xcassets/Location/icon_change.imageset/icon_change@3x.png
  7. BIN=BIN
      artimenring-iOS/Artimenring/Images.xcassets/Mine/mine_list_0.imageset/mine_list_0@2x.png
  8. BIN=BIN
      artimenring-iOS/Artimenring/Images.xcassets/Mine/mine_list_0.imageset/mine_list_0@3x.png
  9. BIN=BIN
      artimenring-iOS/Artimenring/Images.xcassets/Mine/mine_list_1.imageset/mine_list_1@2x.png
  10. BIN=BIN
      artimenring-iOS/Artimenring/Images.xcassets/Mine/mine_list_1.imageset/mine_list_1@3x.png
  11. BIN=BIN
      artimenring-iOS/Artimenring/Images.xcassets/Mine/mine_list_2.imageset/mine_list_2@2x.png
  12. BIN=BIN
      artimenring-iOS/Artimenring/Images.xcassets/Mine/mine_list_2.imageset/mine_list_2@3x.png
  13. 3 3
      artimenring-iOS/Artimenring/de.lproj/Localizable.strings
  14. 3 3
      artimenring-iOS/Artimenring/es.lproj/Localizable.strings
  15. 3 3
      artimenring-iOS/Artimenring/fr.lproj/Localizable.strings
  16. 3 3
      artimenring-iOS/Artimenring/it.lproj/Localizable.strings
  17. 3 3
      artimenring-iOS/Artimenring/zh-HK.lproj/Localizable.strings
  18. 3 3
      artimenring-iOS/Artimenring/zh-Hans.lproj/Localizable.strings

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

@@ -712,9 +712,9 @@
 "Tabbar.Chat" = "Chat";
 "Tabbar.Watch" = "Function";
 "Tabbar.Mine" = "Account";
-"Mine.List.0" = "APP Account Management";
-"Mine.List.1" = "About us";
-"Mine.List.2" = "Baby list";
+"Mine.List.0" = "Baby list";
+"Mine.List.1" = "APP Account Management";
+"Mine.List.2" = "About us";
 "Mine.List.3" = "Novelty";
 "Mine.List.4" = "User Guide";
 "Mine.Baby" = "Child Name:";

+ 4 - 1
artimenring-iOS/Artimenring/Classes/ViewController/Mine/SKMineViewController+user.m

@@ -31,9 +31,12 @@
 - (void)userTableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
     switch (indexPath.row) {
         case 0:
-            [self showAccountManager];
+            [self showBabyList];
             break;
         case 1:
+            [self showAccountManager];
+            break;
+        case 2:
             [self showAboutUS];
             break;
         default:

+ 3 - 2
artimenring-iOS/Artimenring/Classes/ViewController/Mine/SKMineViewController.m

@@ -27,9 +27,10 @@
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
     if (section == 0)
-        return [DataManager shared].mChildList.count;
+        //return [DataManager shared].mChildList.count;
+        return 0;
     else
-        return 2;
+        return 3;
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {

+ 22 - 0
artimenring-iOS/Artimenring/Images.xcassets/Location/icon_change.imageset/Contents.json

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

BIN=BIN
artimenring-iOS/Artimenring/Images.xcassets/Location/icon_change.imageset/icon_change@2x.png


BIN=BIN
artimenring-iOS/Artimenring/Images.xcassets/Location/icon_change.imageset/icon_change@3x.png


BIN=BIN
artimenring-iOS/Artimenring/Images.xcassets/Mine/mine_list_0.imageset/mine_list_0@2x.png


BIN=BIN
artimenring-iOS/Artimenring/Images.xcassets/Mine/mine_list_0.imageset/mine_list_0@3x.png


BIN=BIN
artimenring-iOS/Artimenring/Images.xcassets/Mine/mine_list_1.imageset/mine_list_1@2x.png


BIN=BIN
artimenring-iOS/Artimenring/Images.xcassets/Mine/mine_list_1.imageset/mine_list_1@3x.png


BIN=BIN
artimenring-iOS/Artimenring/Images.xcassets/Mine/mine_list_2.imageset/mine_list_2@2x.png


BIN=BIN
artimenring-iOS/Artimenring/Images.xcassets/Mine/mine_list_2.imageset/mine_list_2@3x.png


+ 3 - 3
artimenring-iOS/Artimenring/de.lproj/Localizable.strings

@@ -712,9 +712,9 @@
 "Tabbar.Chat" = "Chat";
 "Tabbar.Watch" = "Funktion";
 "Tabbar.Mine" = "Konto";
-"Mine.List.0" = "APP-Kontoverwaltung";
-"Mine.List.1" = "Über uns";
-"Mine.List.2" = "Babyliste";
+"Mine.List.0" = "Babyliste";
+"Mine.List.1" = "APP-Kontoverwaltung";
+"Mine.List.2" = "Über uns";
 "Mine.List.3" = "Neuheit";
 "Mine.List.4" = "Benutzerhandbuch";
 "Mine.Baby" = "Name des Kindes:";

+ 3 - 3
artimenring-iOS/Artimenring/es.lproj/Localizable.strings

@@ -712,9 +712,9 @@
 "Tabbar.Chat" = "Chat";
 "Tabbar.Watch" = "Función";
 "Tabbar.Mine" = "Cuenta";
-"Mine.List.0" = "Administración de cuentas de APP";
-"Mine.List.1" = "Acerca de nosotros";
-"Mine.List.2" = "Lista de bebés";
+"Mine.List.0" = "Lista de bebés";
+"Mine.List.1" = "Administración de cuentas de APP";
+"Mine.List.2" = "Acerca de nosotros";
 "Mine.List.3" = "Novedad";
 "Mine.List.4" = "Guía del usuario";
 "Mine.Baby" = "Nombre del niño:";

+ 3 - 3
artimenring-iOS/Artimenring/fr.lproj/Localizable.strings

@@ -712,9 +712,9 @@
 "Tabbar.Chat" = "Chat";
 "Tabbar.Watch" = "Fonction";
 "Tabbar.Mine" = "Compte";
-"Mine.List.0" = "Gestion du compte APP";
-"Mine.List.1" = "À propos de nous";
-"Mine.List.2" = "Liste de bébés";
+"Mine.List.0" = "Liste de bébés";
+"Mine.List.1" = "Gestion du compte APP";
+"Mine.List.2" = "À propos de nous";
 "Mine.List.3" = "Nouveauté";
 "Mine.List.4" = "Guide de l'utilisateur";
 "Mine.Baby" = "Nom de l'enfant :";

+ 3 - 3
artimenring-iOS/Artimenring/it.lproj/Localizable.strings

@@ -712,9 +712,9 @@
 "Tabbar.Chat" = "Chat";
 "Tabbar.Watch" = "Funzione";
 "Tabbar.Mine" = "Conto";
-"Mine.List.0" = "Gestione account APP";
-"Mine.List.1" = "Chi siamo";
-"Mine.List.2" = "Lista dei bambini";
+"Mine.List.0" = "Lista dei bambini";
+"Mine.List.1" = "Gestione account APP";
+"Mine.List.2" = "Chi siamo";
 "Mine.List.3" = "Novità";
 "Mine.List.4" = "Guida per l'utente";
 "Mine.Baby" = "Nome del bambino:";

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

@@ -985,9 +985,9 @@
 "Tabbar.Watch" = "功能";
 "Tabbar.Mine" = "我的";
 
-"Mine.List.0" = "APP賬號管理";
-"Mine.List.1" = "關於我們";
-"Mine.List.2" = "寶貝列表";
+"Mine.List.0" = "寶貝列表";
+"Mine.List.1" = "APP賬號管理";
+"Mine.List.2" = "關於我們";
 "Mine.List.3" = "新鮮事";
 "Mine.List.4" = "新手教程";
 "Mine.Baby" = "當前手錶寶貝:";

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

@@ -985,9 +985,9 @@
 "Tabbar.Watch" = "功能";
 "Tabbar.Mine" = "我的";
 
-"Mine.List.0" = "APP账号管理";
-"Mine.List.1" = "关于我们";
-"Mine.List.2" = "宝贝列表";
+"Mine.List.0" = "宝贝列表";
+"Mine.List.1" = "APP账号管理";
+"Mine.List.2" = "关于我们";
 "Mine.List.3" = "新鲜事";
 "Mine.List.4" = "新手教程";
 "Mine.Baby" = "当前手表宝贝:";