kina => kian

ADHTuanCan.xcodeproj/project.pbxproj

@@ -3765,7 +3765,7 @@
 				DEVELOPMENT_TEAM = VUHRW5BP4S;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = ADHTuanCan/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "KINA SENG";
+				INFOPLIST_KEY_CFBundleDisplayName = "KS Culinary";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.food-and-drink";
 				INFOPLIST_KEY_NSCameraUsageDescription = "The app needs to get your camera in order to set up information such as avatars, listing pictures";
 				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "The APP gets your album so it can set up avatars to add comments and other information";
@@ -3809,7 +3809,7 @@
 				DEVELOPMENT_TEAM = VUHRW5BP4S;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = ADHTuanCan/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "KINA SENG";
+				INFOPLIST_KEY_CFBundleDisplayName = "KS Culinary";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.food-and-drink";
 				INFOPLIST_KEY_NSCameraUsageDescription = "The app needs to get your camera in order to set up information such as avatars, listing pictures";
 				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "The APP gets your album so it can set up avatars to add comments and other information";

ADHTuanCan/Class/我的/成员/view/TeamMembersAddView.swift

@@ -55,8 +55,10 @@ class TeamMembersAddView: UIView {
             self.hud.hidden()
            
             self.dataModel = self.viewModel.searchTeamMembers
-            if self.addTeamMembersBlock != nil{
+            if self.addTeamMembersBlock != nil && self.dataModel?.userId != nil{
                 self.addTeamMembersBlock!(self.dataModel!)
+            }else{
+                self.hud.showFailure("\(self.dataModel?.reason ?? "")")
             }
             self.hidden()
         }, error: { error in

ADHTuanCan/Class/登录/启动页/view/Base.lproj/StartView.xib

@@ -32,7 +32,7 @@
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Gs7-mu-8VI">
                     <rect key="frame" x="0.0" y="485" width="393" height="367"/>
                     <subviews>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="KINA" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nDC-ZD-EYb">
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="KIAN" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nDC-ZD-EYb">
                             <rect key="frame" x="0.0" y="16" width="180" height="43"/>
                             <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
                             <color key="textColor" red="0.10980392160000001" green="0.18823529410000001" blue="0.30980392159999998" alpha="1" colorSpace="calibratedRGB"/>

ADHTuanCan/Class/登录/启动页/view/en.lproj/StartView.strings

@@ -8,8 +8,8 @@
 /* Class = "UILabel"; text = "与你一起探索食材的本质与味道"; ObjectID = "R9N-mR-D03"; */
 "R9N-mR-D03.text" = "Discover the essence and taste of ingredients with you";
 
-/* Class = "UILabel"; text = "KINA"; ObjectID = "nDC-ZD-EYb"; */
-"nDC-ZD-EYb.text" = "KINA";
+/* Class = "UILabel"; text = "KIAN"; ObjectID = "nDC-ZD-EYb"; */
+"nDC-ZD-EYb.text" = "KIAN";
 
 /* Class = "UILabel"; text = "来自五星级饭店大厨的烹饪，让你体验尊贵的用餐体验，享受食材本来的味道"; ObjectID = "rZe-c0-GDp"; */
 "rZe-c0-GDp.text" = "The cooking from the chef of the five-star restaurant allows you to experience the distinguished dining experience and enjoy the original taste of the ingredients";

ADHTuanCan/Class/登录/启动页/view/zh-Hans.lproj/StartView.strings

@@ -8,8 +8,8 @@
 /* Class = "UILabel"; text = "与你一起探索食材的本质与味道"; ObjectID = "R9N-mR-D03"; */
 "R9N-mR-D03.text" = "与你一起探索食材的本质与味道";
 
-/* Class = "UILabel"; text = "KINA"; ObjectID = "nDC-ZD-EYb"; */
-"nDC-ZD-EYb.text" = "KINA";
+/* Class = "UILabel"; text = "KIAN"; ObjectID = "nDC-ZD-EYb"; */
+"nDC-ZD-EYb.text" = "KIAN";
 
 /* Class = "UILabel"; text = "来自五星级饭店大厨的烹饪，让你体验尊贵的用餐体验，享受食材本来的味道"; ObjectID = "rZe-c0-GDp"; */
 "rZe-c0-GDp.text" = "来自五星级饭店大厨的烹饪，让你体验尊贵的用餐体验，享受食材本来的味道";

ADHTuanCan/Class/订单/订单详情/view/OderDetailHeadView.swift

@@ -240,7 +240,7 @@ class OderDetailHeadView: UIView {
             self.timeOutView.isHidden = true
             self.deliveringView.isHidden = true
             self.typeLab.text = LanguagesUtil.createTextBy(Ctext: "待商家接单", Etext: "Waiting fo accept the order")
-            self.tipLab.text = LanguagesUtil.createTextBy(Ctext: "已成功下单，感谢您对KINA SENG的信任", Etext: "Order has been successfully placed, thank you for your trust in KINA SENG")
+            self.tipLab.text = LanguagesUtil.createTextBy(Ctext: "已成功下单，感谢您对KIAN SENG的信任", Etext: "Order has been successfully placed, thank you for your trust in KIAN SENG")
             self.secTipLab.text = ""
             if self.addressLab.text.isNotEmptyStr{
                 self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.detailView.height + 135 + labHeight + btnViewHeight + 70))
@@ -275,7 +275,7 @@ class OderDetailHeadView: UIView {
             self.timeOutView.isHidden = true
             self.deliveringView.isHidden = true
             self.typeLab.text = LanguagesUtil.createTextBy(Ctext: "订单已完成", Etext: "Order completed")
-            self.tipLab.text = LanguagesUtil.createTextBy(Ctext: "感谢您对KINA SENG的信任，欢迎再次光临", Etext: "Thank you for your trust in KINA SENG and welcome to visit us again")
+            self.tipLab.text = LanguagesUtil.createTextBy(Ctext: "感谢您对KIAN SENG的信任，欢迎再次光临", Etext: "Thank you for your trust in KIAN SENG and welcome to visit us again")
             self.secTipLab.text = ""
             if self.addressLab.text.isNotEmptyStr{
                 self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.detailView.height + 135 + labHeight + btnViewHeight + 70))
@@ -342,7 +342,7 @@ class OderDetailHeadView: UIView {
             self.deliveringView.isHidden = true
             self.secTipLab.text = ""
             self.typeLab.text = LanguagesUtil.createTextBy(Ctext: "订单已完成", Etext: "Order completed")
-            self.tipLab.text = LanguagesUtil.createTextBy(Ctext: "感谢您对KINA SENG的信任，欢迎再次光临", Etext: "Thank you for your trust in KINA SENG and welcome to visit us again")
+            self.tipLab.text = LanguagesUtil.createTextBy(Ctext: "感谢您对KIAN SENG的信任，欢迎再次光临", Etext: "Thank you for your trust in KIAN SENG and welcome to visit us again")
             
             if self.addressLab.text.isNotEmptyStr{
                 self.setFrameSize(CGSize.init(width: kSCREEN_WIDTH, height: 60 + self.detailView.height + 135 + labHeight + btnViewHeight + 70))

ADHTuanCan/Class/订单/订单详情/view/en.lproj/OderDetailHeadView.strings

@@ -71,8 +71,8 @@
 /* Class = "UILabel"; text = "送地配送地配送地配送"; ObjectID = "w9l-Ch-Kuy"; */
 "w9l-Ch-Kuy.text" = "送地配送地配送地配送";
 
-/* Class = "UILabel"; text = "已成功下单，感谢您对KINA SENG的信任"; ObjectID = "xKz-oc-zaI"; */
-"xKz-oc-zaI.text" = "Order has been successfully placed, thank you for your trust in KINA SENG";
+/* Class = "UILabel"; text = "已成功下单，感谢您对KIAN SENG的信任"; ObjectID = "xKz-oc-zaI"; */
+"xKz-oc-zaI.text" = "Order has been successfully placed, thank you for your trust in KIAN SENG";
 
 /* Class = "UILabel"; text = "正在路上..."; ObjectID = "oEQ-XL-iE6"; */
 "oEQ-XL-iE6.text" = "On the road ...";

ADHTuanCan/Class/订单/订单详情/view/zh-Hans.lproj/OderDetailHeadView.strings

@@ -71,8 +71,8 @@
 /* Class = "UILabel"; text = "送地配送地配送地配送"; ObjectID = "w9l-Ch-Kuy"; */
 "w9l-Ch-Kuy.text" = "送地配送地配送地配送";
 
-/* Class = "UILabel"; text = "已成功下单，感谢您对KINA SENG的信任"; ObjectID = "xKz-oc-zaI"; */
-"xKz-oc-zaI.text" = "已成功下单，感谢您对KINA SENG的信任";
+/* Class = "UILabel"; text = "已成功下单，感谢您对KIAN SENG的信任"; ObjectID = "xKz-oc-zaI"; */
+"xKz-oc-zaI.text" = "已成功下单，感谢您对KIAN SENG的信任";
 
 /* Class = "UILabel"; text = "正在路上..."; ObjectID = "oEQ-XL-iE6"; */
 "oEQ-XL-iE6.text" = "正在路上...";