修改一些细节

VirtualPayment/VirtualPayment/Application/Info.plist

@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>CFBundleAllowMixedLocalizations</key>
+	<true/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
@@ -726,23 +728,23 @@
 		</dict>
 	</dict>
 	<key>NSCalendarsUsageDescription</key>
-	<string>"真享生活"需要您的同意，才能访问日历，以便于匹配时间</string>
+	<string>&quot;真享生活&quot;需要您的同意，才能访问日历，以便于匹配时间</string>
 	<key>NSCameraUsageDescription</key>
-	<string>"真享生活"需要您的同意，才能访问相机，以便于上传头像和增信材料</string>
+	<string>&quot;真享生活&quot;需要您的同意，才能访问相机，以便于上传头像和增信材料</string>
 	<key>NSContactsUsageDescription</key>
-	<string>"真享生活"需要您的同意，才能访问通讯录，让您的好友为您增加信用吧</string>
+	<string>&quot;真享生活&quot;需要您的同意，才能访问通讯录，让您的好友为您增加信用吧</string>
 	<key>NSLocationAlwaysAndWhenInUseUsageDeion</key>
-	<string>为了向您推荐附近的服务，"真享生活"需要获取您的地理位置</string>
+	<string>为了向您推荐附近的服务，&quot;真享生活&quot;需要获取您的地理位置</string>
 	<key>NSLocationAlwaysUsageDescription</key>
-	<string>为了向您推荐附近的服务，"真享生活"需要获取您的地理位置</string>
+	<string>为了向您推荐附近的服务，&quot;真享生活&quot;需要获取您的地理位置</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>为了向您推荐附近的服务，"真享生活"需要获取您的地理位置</string>
+	<string>为了向您推荐附近的服务，&quot;真享生活&quot;需要获取您的地理位置</string>
 	<key>NSMicrophoneUsageDescription</key>
-	<string>"真享生活" 需要您的同意，才能访问麦克风，以便于进行音频认证</string>
+	<string>&quot;真享生活&quot; 需要您的同意，才能访问麦克风，以便于进行音频认证</string>
 	<key>NSPhotoLibraryAddUsageDescription</key>
-	<string>"真享生活"需要您的同意，才能使用您的图库</string>
+	<string>&quot;真享生活&quot;需要您的同意，才能使用您的图库</string>
 	<key>NSPhotoLibraryUsageDescription</key>
-	<string>"真享生活"需要您的同意，才能使用您的图库</string>
+	<string>&quot;真享生活&quot;需要您的同意，才能使用您的图库</string>
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>remote-notification</string>

VirtualPayment/VirtualPayment/QGClasses/UserCenter/Function/UserCenterMessage/VC/QGEditListBaseVC.m

@@ -284,7 +284,8 @@
                 }
                 if ([DeviceAdaptation canClick]) {
                     if (model.nav_url && model.nav_url.length > 0) {
-                        [QGApplicationOpenURL handleAllSupportUrl:[(QGMessageListModel *) model nav_url]];
+                        NSString *urlStr = model.nav_url;
+                        [self openURLWithUrlString:urlStr];
                     } else {
                         NSMutableDictionary *mdict = [NSMutableDictionary dictionaryWithCapacity:1];
                         [mdict setValue:model forKey:@"msgListModel"];
@@ -296,26 +297,7 @@
             } else {
                 if (!model.navExpire || ![model.navExpire boolValue]) {
                     NSString *urlStr = model.nav_url;
-                    NSURL *url = [NSURL URLWithString:urlStr];
-                    //如果直接转失败，则编码一下 再转
-                    if (!url) {
-                        urlStr = [urlStr stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-                        url = [NSURL URLWithString:urlStr];
-                    }
-                    XYQBJumpType jumpType =  [[QGApplicationOpenURL shareInstance] autoParseURL:url];
-                    /// 针对webView特别处理
-                    if (jumpType == XYQBJumpTypeHttp) {
-                        CWWebViewController *webVC = [[CWWebViewController alloc]init];
-                        webVC.urlString = [(QGMessageListModel *) model nav_url];
-                        webVC.callBackBlock = ^(NSString *tag, NSDictionary *params) {
-                            if ([tag isEqualToString:WebView_ReopenBrowserWithNewUrl]) {
-                                [QGApplicationOpenURL handleAllSupportUrl:params[@"urlString"]];
-                            }
-                        };
-                        [self.navigationController pushViewController:webVC animated:YES];
-                    }else{
-                        [QGApplicationOpenURL handleAllSupportUrl:[(QGMessageListModel *) model nav_url]];
-                    }
+                    [self openURLWithUrlString:urlStr];
                 }
             }
         }
@@ -328,6 +310,34 @@
     }
 }
 
+
+/// 处理跳转逻辑,如果是http处理callbackBlock,如果不是,任意跳转
+/// @param urlString NSString
+- (void)openURLWithUrlString:(NSString *)urlString
+{
+    NSString *urlStr = urlString;
+    NSURL *url = [NSURL URLWithString:urlStr];
+    //如果直接转失败，则编码一下 再转
+    if (!url) {
+        urlStr = [urlStr stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+        url = [NSURL URLWithString:urlStr];
+    }
+    XYQBJumpType jumpType =  [[QGApplicationOpenURL shareInstance] autoParseURL:url];
+    /// 针对webView特别处理
+    if (jumpType == XYQBJumpTypeHttp) {
+        CWWebViewController *webVC = [[CWWebViewController alloc]init];
+        webVC.urlString = urlStr;
+        webVC.callBackBlock = ^(NSString *tag, NSDictionary *params) {
+            if ([tag isEqualToString:WebView_ReopenBrowserWithNewUrl]) {
+                [QGApplicationOpenURL handleAllSupportUrl:params[@"urlString"]];
+            }
+        };
+        [self.navigationController pushViewController:webVC animated:YES];
+    }else{
+        [QGApplicationOpenURL handleAllSupportUrl:urlString];
+    }
+}
+
 - (void)allDataSelected {
     BOOL selected = NO;
     if ([self.dataSource count] != self.selectedData.count) {

VirtualPayment/VirtualPayment/QGUtils/QGTool/QGBasicUITool/QGAppMacro.h

@@ -85,7 +85,7 @@ static NSString *const kTencentSchemeKey = @"tencent1108767784";
 #define VCCRegisterAgreement @"http://pages.xyqb.com/zhen-xiang-sheng-huo-yong-hu-zhu-ce-xie-yi/"
 
 ///需要打线上包时解开注释
-//#define FormalEnviroment @"YES"
+#define FormalEnviroment @"YES"
 
 // 通过判断“FormalEnviroment”是否已经定义，区分后配置正式环境或测试环境。
 #ifdef FormalEnviroment