no message

ZhiJi/Classes/Goods/Controller/ZTPurchaseManager.swift

@@ -58,19 +58,19 @@ class ZTPurchaseManager: NSObject {
                                             print("Purchase Success: \(product.productId)")
                                             success()
                                         } else {
-                                            MBProgressHUD.showError("未知错误,请联系客服")
+                                            MBProgressHUD.showError(NSLocalizedString("alert_unfriend_error", comment: "alert_unfriend_error"))
                                         }
                                     }else {
-                                        MBProgressHUD.showError("未知错误,请联系客服")
+                                        MBProgressHUD.showError(NSLocalizedString("alert_unfriend_error", comment: "alert_unfriend_error"))
                                     }
                                 }else {
-                                    MBProgressHUD.showError("未知错误,请联系客服")
+                                    MBProgressHUD.showError(NSLocalizedString("alert_unfriend_error", comment: "alert_unfriend_error"))
                                 }
                             }else {
-                                MBProgressHUD.showError("未知错误,请联系客服")
+                                MBProgressHUD.showError(NSLocalizedString("alert_unfriend_error", comment: "alert_unfriend_error"))
                             }
                         }else {
-                            MBProgressHUD.showError("未知错误,请联系客服")
+                            MBProgressHUD.showError(NSLocalizedString("alert_unfriend_error", comment: "alert_unfriend_error"))
                         }
                     }) { (error) in
                         innerHud.hide(animated: true)
@@ -87,18 +87,18 @@ class ZTPurchaseManager: NSObject {
                 switch error.code {
                 case .unknown:
                     print("Unknown error. Please contact support")
-                    MBProgressHUD.showError("无法连接到 iTunes Store, 请稍后再试")
+                    MBProgressHUD.showError(NSLocalizedString("alert_produce_cannot_store", comment: "alert_produce_cannot_store"))
                 case .paymentCancelled:
-                    MBProgressHUD.showError("您已取消购买")
+                    MBProgressHUD.showError(NSLocalizedString("alert_produce_cancel", comment: "alert_produce_cancel"))
                 case .paymentInvalid:
-                    MBProgressHUD.showError("无法购买, 请试试其他的")
+//                    MBProgressHUD.showError("无法购买, 请试试其他的")
                     print("The purchase identifier was invalid")
                 case .clientInvalid: print("Not allowed to make the payment")
                 case .paymentNotAllowed: print("The device is not allowed to make the payment")
                 case .storeProductNotAvailable: print("The product is not available in the current storefront")
                 case .cloudServicePermissionDenied: print("Access to cloud service information is not allowed")
                 case .cloudServiceNetworkConnectionFailed:
-                    MBProgressHUD.showError("无法连接到网络")
+                    MBProgressHUD.showError(NSLocalizedString("alert_produce_cannot_web", comment: "alert_produce_cannot_web"))
                     print("Could not connect to the network")
                 case .cloudServiceRevoked: print("User has revoked permission to use this cloud service")
                 default: print((error as NSError).localizedDescription)

ZhiJi/Classes/Login/Controller/ZJPhoneLoginViewController.m

@@ -444,8 +444,8 @@
         NSLog(kLocalizedString(@"setting_service"));
         
         BaseWebViewController * web = [[BaseWebViewController alloc] init];
-//        web.url = [dic objectForKey:@"user"];
-        web.url = [dic objectForKey:@"privacy"];
+        web.url = [dic objectForKey:@"user"];
+//        web.url = [dic objectForKey:@"privacy"];
         [self.navigationController pushViewController:web animated:YES];
         
         return NO;
@@ -453,7 +453,6 @@
         NSLog(kLocalizedString(@"setting_privacy"));
         
         BaseWebViewController * web = [[BaseWebViewController alloc] init];
-//        web.url = [dic objectForKey:@"privacy"];
         web.url = [dic objectForKey:@"privacy"];
         [self.navigationController pushViewController:web animated:YES];
         

ZhiJi/Classes/Mine/Controller/ZJSettingViewController.m

@@ -105,23 +105,16 @@
 - (NSArray *)dataSource {
     if (!_dataSource) {
         if ([ZJUserInfoManager shared].isTourist) {
-//            _dataSource = @[kLocalizedString(@"setting_version"),
-//                            kLocalizedString(@"setting_privacy"),
-//                            kLocalizedString(@"setting_service"),
-//                            kLocalizedString(@"setting_payment_service"),
-//            ];
             _dataSource = @[kLocalizedString(@"setting_version"),
-                            kLocalizedString(@"setting_protocol_combination")];
+                            kLocalizedString(@"setting_privacy"),
+                            kLocalizedString(@"setting_service"),
+                            /*kLocalizedString(@"setting_payment_service"),*/
+            ];
         }else{
-//            _dataSource = @[kLocalizedString(@"setting_version"),
-//                            kLocalizedString(@"setting_privacy"),
-//                            kLocalizedString(@"setting_service"),
-//                            kLocalizedString(@"setting_payment_service"),
-//                            kLocalizedString(@"setting_delete_account")
-//            ];
-            
             _dataSource = @[kLocalizedString(@"setting_version"),
-                            kLocalizedString(@"setting_protocol_combination"),
+                            kLocalizedString(@"setting_privacy"),
+                            kLocalizedString(@"setting_service"),
+                            /*kLocalizedString(@"setting_payment_service"),*/
                             kLocalizedString(@"setting_delete_account")
             ];
         }
@@ -201,12 +194,9 @@
         case 1:
             path = [dic objectForKey:@"privacy"];
             break;
-//        case 1:
-//            path = [dic objectForKey:@"privacy"];
-//            break;
-//        case 2:
-//            path = [dic objectForKey:@"user"];
-//            break;
+        case 2:
+            path = [dic objectForKey:@"user"];
+            break;
 //        case 3:
 //            path = [dic objectForKey:@"pay"];
 //            break;
@@ -259,13 +249,13 @@
         case 1:
             [self userClause:indexPath.row];
             break;
-//        case 2:
-//            [self userClause:indexPath.row];
-//            break;
+        case 2:
+            [self userClause:indexPath.row];
+            break;
 //        case 3:
 //            [self userClause:indexPath.row];
 //            break;
-        case 2:
+        case 3:
         {
             [AlertControllerTool alertControllerWithTitle:kLocalizedString(@"alert_notice") message:kLocalizedString(@"alert_close_account") cancelTitle:kLocalizedString(@"alert_cancel") cancelBlock:nil confirm:kLocalizedString(@"alert_confirm_style2") confirmBlock:^(id s) {
                 [self userCancellation];

ZhiJi/en.lproj/Localizable.strings

@@ -33,6 +33,9 @@ appName = "Family Mapp";
 "alert_unfriend_error"="Unknown error. Please contact support";
 "alert_no_produce_restore"="No commodities to recover";
 "alert_produce_restore_success"="Restore success";
+"alert_produce_cancel"="Cancel the purchase";
+"alert_produce_cannot_store"="Unable to connect to iTunes Store. Please try again later";
+"alert_produce_cannot_web"="Unable to connect to network";
 
 "alert_location_setting"="Location permission is not enabled, please enter the system [Settings]> [%@]> [Location] to allow access to location information in order to draw your track";
 "alert_location_enble"="Go to enable";

ZhiJi/zh-Hans.lproj/Localizable.strings

@@ -32,6 +32,9 @@ appName = "Family Mapp";
 "alert_unfriend_error"="未知错误,请联系客服";
 "alert_no_produce_restore"="没有商品可恢复";
 "alert_produce_restore_success"="恢复成功";
+"alert_produce_cancel"="您已取消购买";
+"alert_produce_cannot_store"="无法连接到 iTunes Store, 请稍后再试";
+"alert_produce_cannot_web"="无法连接到网络";
 
 "alert_location_setting"="位置权限未开启，请进入系统［设置］> [%@] > [位置]中允许访问位置信息，用来绘制您的轨迹";
 "alert_location_enble"="去开启";