diff --git a/.DS_Store b/.DS_Store index 23cdfeb..d3f969b 100644 --- a/.DS_Store +++ b/.DS_Store Binary files differ diff --git a/.DS_Store b/.DS_Store index 23cdfeb..d3f969b 100644 --- a/.DS_Store +++ b/.DS_Store Binary files differ diff --git a/Pods/Pods.xcodeproj/xcuserdata/zhangfeng.xcuserdatad/xcschemes/xcschememanagement.plist b/Pods/Pods.xcodeproj/xcuserdata/zhangfeng.xcuserdatad/xcschemes/xcschememanagement.plist index 12c4812..b41c9a2 100644 --- a/Pods/Pods.xcodeproj/xcuserdata/zhangfeng.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/Pods/Pods.xcodeproj/xcuserdata/zhangfeng.xcuserdatad/xcschemes/xcschememanagement.plist @@ -7,112 +7,112 @@ AFNetworking.xcscheme_^#shared#^_ orderHint - 12 + 20 AMapFoundation.xcscheme_^#shared#^_ orderHint - 25 + 8 AMapLocation.xcscheme_^#shared#^_ orderHint - 10 + 22 BMKLocationKit.xcscheme_^#shared#^_ orderHint - 8 + 18 BaiduMapKit.xcscheme_^#shared#^_ orderHint - 4 + 5 Bugly.xcscheme_^#shared#^_ orderHint - 9 + 14 GTMBase64.xcscheme_^#shared#^_ orderHint - 19 + 17 MBProgressHUD.xcscheme_^#shared#^_ orderHint - 7 + 19 MOBFoundation.xcscheme_^#shared#^_ orderHint - 5 + 21 Masonry.xcscheme_^#shared#^_ orderHint - 6 + 24 OpenVPNAdapter.xcscheme_^#shared#^_ orderHint - 14 + 9 PgyUpdate.xcscheme_^#shared#^_ orderHint - 13 + 6 Pgyer.xcscheme_^#shared#^_ orderHint - 22 + 7 Pods-XYSW test-PacketTunnelProvider test.xcscheme_^#shared#^_ orderHint - 23 + 11 Pods-XYSW test.xcscheme_^#shared#^_ orderHint - 17 + 25 Pods-XYSW-PacketTunnelProvider.xcscheme_^#shared#^_ orderHint - 16 + 10 Pods-XYSW.xcscheme_^#shared#^_ orderHint - 21 + 13 Reachability.xcscheme_^#shared#^_ orderHint - 15 + 23 SVProgressHUD.xcscheme_^#shared#^_ orderHint - 11 + 4 TZImagePickerController.xcscheme_^#shared#^_ orderHint - 24 + 15 ZXNavigationBar.xcscheme_^#shared#^_ orderHint - 20 + 12 mob_pushsdk.xcscheme_^#shared#^_ orderHint - 18 + 16 diff --git a/.DS_Store b/.DS_Store index 23cdfeb..d3f969b 100644 --- a/.DS_Store +++ b/.DS_Store Binary files differ diff --git a/Pods/Pods.xcodeproj/xcuserdata/zhangfeng.xcuserdatad/xcschemes/xcschememanagement.plist b/Pods/Pods.xcodeproj/xcuserdata/zhangfeng.xcuserdatad/xcschemes/xcschememanagement.plist index 12c4812..b41c9a2 100644 --- a/Pods/Pods.xcodeproj/xcuserdata/zhangfeng.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/Pods/Pods.xcodeproj/xcuserdata/zhangfeng.xcuserdatad/xcschemes/xcschememanagement.plist @@ -7,112 +7,112 @@ AFNetworking.xcscheme_^#shared#^_ orderHint - 12 + 20 AMapFoundation.xcscheme_^#shared#^_ orderHint - 25 + 8 AMapLocation.xcscheme_^#shared#^_ orderHint - 10 + 22 BMKLocationKit.xcscheme_^#shared#^_ orderHint - 8 + 18 BaiduMapKit.xcscheme_^#shared#^_ orderHint - 4 + 5 Bugly.xcscheme_^#shared#^_ orderHint - 9 + 14 GTMBase64.xcscheme_^#shared#^_ orderHint - 19 + 17 MBProgressHUD.xcscheme_^#shared#^_ orderHint - 7 + 19 MOBFoundation.xcscheme_^#shared#^_ orderHint - 5 + 21 Masonry.xcscheme_^#shared#^_ orderHint - 6 + 24 OpenVPNAdapter.xcscheme_^#shared#^_ orderHint - 14 + 9 PgyUpdate.xcscheme_^#shared#^_ orderHint - 13 + 6 Pgyer.xcscheme_^#shared#^_ orderHint - 22 + 7 Pods-XYSW test-PacketTunnelProvider test.xcscheme_^#shared#^_ orderHint - 23 + 11 Pods-XYSW test.xcscheme_^#shared#^_ orderHint - 17 + 25 Pods-XYSW-PacketTunnelProvider.xcscheme_^#shared#^_ orderHint - 16 + 10 Pods-XYSW.xcscheme_^#shared#^_ orderHint - 21 + 13 Reachability.xcscheme_^#shared#^_ orderHint - 15 + 23 SVProgressHUD.xcscheme_^#shared#^_ orderHint - 11 + 4 TZImagePickerController.xcscheme_^#shared#^_ orderHint - 24 + 15 ZXNavigationBar.xcscheme_^#shared#^_ orderHint - 20 + 12 mob_pushsdk.xcscheme_^#shared#^_ orderHint - 18 + 16 diff --git a/XYSW.xcworkspace/xcuserdata/zhangfeng.xcuserdatad/UserInterfaceState.xcuserstate b/XYSW.xcworkspace/xcuserdata/zhangfeng.xcuserdatad/UserInterfaceState.xcuserstate index 236419d..49bc411 100644 --- a/XYSW.xcworkspace/xcuserdata/zhangfeng.xcuserdatad/UserInterfaceState.xcuserstate +++ b/XYSW.xcworkspace/xcuserdata/zhangfeng.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/.DS_Store b/.DS_Store index 23cdfeb..d3f969b 100644 --- a/.DS_Store +++ b/.DS_Store Binary files differ diff --git a/Pods/Pods.xcodeproj/xcuserdata/zhangfeng.xcuserdatad/xcschemes/xcschememanagement.plist b/Pods/Pods.xcodeproj/xcuserdata/zhangfeng.xcuserdatad/xcschemes/xcschememanagement.plist index 12c4812..b41c9a2 100644 --- a/Pods/Pods.xcodeproj/xcuserdata/zhangfeng.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/Pods/Pods.xcodeproj/xcuserdata/zhangfeng.xcuserdatad/xcschemes/xcschememanagement.plist @@ -7,112 +7,112 @@ AFNetworking.xcscheme_^#shared#^_ orderHint - 12 + 20 AMapFoundation.xcscheme_^#shared#^_ orderHint - 25 + 8 AMapLocation.xcscheme_^#shared#^_ orderHint - 10 + 22 BMKLocationKit.xcscheme_^#shared#^_ orderHint - 8 + 18 BaiduMapKit.xcscheme_^#shared#^_ orderHint - 4 + 5 Bugly.xcscheme_^#shared#^_ orderHint - 9 + 14 GTMBase64.xcscheme_^#shared#^_ orderHint - 19 + 17 MBProgressHUD.xcscheme_^#shared#^_ orderHint - 7 + 19 MOBFoundation.xcscheme_^#shared#^_ orderHint - 5 + 21 Masonry.xcscheme_^#shared#^_ orderHint - 6 + 24 OpenVPNAdapter.xcscheme_^#shared#^_ orderHint - 14 + 9 PgyUpdate.xcscheme_^#shared#^_ orderHint - 13 + 6 Pgyer.xcscheme_^#shared#^_ orderHint - 22 + 7 Pods-XYSW test-PacketTunnelProvider test.xcscheme_^#shared#^_ orderHint - 23 + 11 Pods-XYSW test.xcscheme_^#shared#^_ orderHint - 17 + 25 Pods-XYSW-PacketTunnelProvider.xcscheme_^#shared#^_ orderHint - 16 + 10 Pods-XYSW.xcscheme_^#shared#^_ orderHint - 21 + 13 Reachability.xcscheme_^#shared#^_ orderHint - 15 + 23 SVProgressHUD.xcscheme_^#shared#^_ orderHint - 11 + 4 TZImagePickerController.xcscheme_^#shared#^_ orderHint - 24 + 15 ZXNavigationBar.xcscheme_^#shared#^_ orderHint - 20 + 12 mob_pushsdk.xcscheme_^#shared#^_ orderHint - 18 + 16 diff --git a/XYSW.xcworkspace/xcuserdata/zhangfeng.xcuserdatad/UserInterfaceState.xcuserstate b/XYSW.xcworkspace/xcuserdata/zhangfeng.xcuserdatad/UserInterfaceState.xcuserstate index 236419d..49bc411 100644 --- a/XYSW.xcworkspace/xcuserdata/zhangfeng.xcuserdatad/UserInterfaceState.xcuserstate +++ b/XYSW.xcworkspace/xcuserdata/zhangfeng.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/XYSW.xcworkspace/xcuserdata/zhangfeng.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/XYSW.xcworkspace/xcuserdata/zhangfeng.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist new file mode 100644 index 0000000..18c1269 --- /dev/null +++ b/XYSW.xcworkspace/xcuserdata/zhangfeng.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.DS_Store b/.DS_Store index 23cdfeb..d3f969b 100644 --- a/.DS_Store +++ b/.DS_Store Binary files differ diff --git a/Pods/Pods.xcodeproj/xcuserdata/zhangfeng.xcuserdatad/xcschemes/xcschememanagement.plist b/Pods/Pods.xcodeproj/xcuserdata/zhangfeng.xcuserdatad/xcschemes/xcschememanagement.plist index 12c4812..b41c9a2 100644 --- a/Pods/Pods.xcodeproj/xcuserdata/zhangfeng.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/Pods/Pods.xcodeproj/xcuserdata/zhangfeng.xcuserdatad/xcschemes/xcschememanagement.plist @@ -7,112 +7,112 @@ AFNetworking.xcscheme_^#shared#^_ orderHint - 12 + 20 AMapFoundation.xcscheme_^#shared#^_ orderHint - 25 + 8 AMapLocation.xcscheme_^#shared#^_ orderHint - 10 + 22 BMKLocationKit.xcscheme_^#shared#^_ orderHint - 8 + 18 BaiduMapKit.xcscheme_^#shared#^_ orderHint - 4 + 5 Bugly.xcscheme_^#shared#^_ orderHint - 9 + 14 GTMBase64.xcscheme_^#shared#^_ orderHint - 19 + 17 MBProgressHUD.xcscheme_^#shared#^_ orderHint - 7 + 19 MOBFoundation.xcscheme_^#shared#^_ orderHint - 5 + 21 Masonry.xcscheme_^#shared#^_ orderHint - 6 + 24 OpenVPNAdapter.xcscheme_^#shared#^_ orderHint - 14 + 9 PgyUpdate.xcscheme_^#shared#^_ orderHint - 13 + 6 Pgyer.xcscheme_^#shared#^_ orderHint - 22 + 7 Pods-XYSW test-PacketTunnelProvider test.xcscheme_^#shared#^_ orderHint - 23 + 11 Pods-XYSW test.xcscheme_^#shared#^_ orderHint - 17 + 25 Pods-XYSW-PacketTunnelProvider.xcscheme_^#shared#^_ orderHint - 16 + 10 Pods-XYSW.xcscheme_^#shared#^_ orderHint - 21 + 13 Reachability.xcscheme_^#shared#^_ orderHint - 15 + 23 SVProgressHUD.xcscheme_^#shared#^_ orderHint - 11 + 4 TZImagePickerController.xcscheme_^#shared#^_ orderHint - 24 + 15 ZXNavigationBar.xcscheme_^#shared#^_ orderHint - 20 + 12 mob_pushsdk.xcscheme_^#shared#^_ orderHint - 18 + 16 diff --git a/XYSW.xcworkspace/xcuserdata/zhangfeng.xcuserdatad/UserInterfaceState.xcuserstate b/XYSW.xcworkspace/xcuserdata/zhangfeng.xcuserdatad/UserInterfaceState.xcuserstate index 236419d..49bc411 100644 --- a/XYSW.xcworkspace/xcuserdata/zhangfeng.xcuserdatad/UserInterfaceState.xcuserstate +++ b/XYSW.xcworkspace/xcuserdata/zhangfeng.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/XYSW.xcworkspace/xcuserdata/zhangfeng.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/XYSW.xcworkspace/xcuserdata/zhangfeng.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist new file mode 100644 index 0000000..18c1269 --- /dev/null +++ b/XYSW.xcworkspace/xcuserdata/zhangfeng.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/XYSW/WKWebViewController.m b/XYSW/WKWebViewController.m index bbfb388..8eea7ed 100755 --- a/XYSW/WKWebViewController.m +++ b/XYSW/WKWebViewController.m @@ -269,13 +269,8 @@ // 获取毫秒时间戳，达到每次请求的url都不同，避免缓存 double currentTime = [[NSDate date] timeIntervalSince1970]; NSString *strTime = [NSString stringWithFormat:@"%.0f",currentTime]; - if (Development == 1) { - NSString *urlStr = [NSString stringWithFormat:@"http://36.133.215.233:9500/hzapp_html/dist/#/home/workSpace/?t=%@",strTime]; - request=[NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlStr]]; - }else{ - NSString *urlStr = [NSString stringWithFormat:@"http://36.133.215.233:9500/hzapp_html/dist/#/home/workSpace/?t=%@",strTime]; - request=[NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlStr]];; - } + NSString *urlStr = [NSString stringWithFormat:@"http://192.168.100.18:9500/hzapp_html/dist/#/home/workSpace/?t=%@",strTime]; + request=[NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlStr]];; [request setTimeoutInterval:10]; diff --git a/.DS_Store b/.DS_Store index 23cdfeb..d3f969b 100644 --- a/.DS_Store +++ b/.DS_Store Binary files differ diff --git a/Pods/Pods.xcodeproj/xcuserdata/zhangfeng.xcuserdatad/xcschemes/xcschememanagement.plist b/Pods/Pods.xcodeproj/xcuserdata/zhangfeng.xcuserdatad/xcschemes/xcschememanagement.plist index 12c4812..b41c9a2 100644 --- a/Pods/Pods.xcodeproj/xcuserdata/zhangfeng.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/Pods/Pods.xcodeproj/xcuserdata/zhangfeng.xcuserdatad/xcschemes/xcschememanagement.plist @@ -7,112 +7,112 @@ AFNetworking.xcscheme_^#shared#^_ orderHint - 12 + 20 AMapFoundation.xcscheme_^#shared#^_ orderHint - 25 + 8 AMapLocation.xcscheme_^#shared#^_ orderHint - 10 + 22 BMKLocationKit.xcscheme_^#shared#^_ orderHint - 8 + 18 BaiduMapKit.xcscheme_^#shared#^_ orderHint - 4 + 5 Bugly.xcscheme_^#shared#^_ orderHint - 9 + 14 GTMBase64.xcscheme_^#shared#^_ orderHint - 19 + 17 MBProgressHUD.xcscheme_^#shared#^_ orderHint - 7 + 19 MOBFoundation.xcscheme_^#shared#^_ orderHint - 5 + 21 Masonry.xcscheme_^#shared#^_ orderHint - 6 + 24 OpenVPNAdapter.xcscheme_^#shared#^_ orderHint - 14 + 9 PgyUpdate.xcscheme_^#shared#^_ orderHint - 13 + 6 Pgyer.xcscheme_^#shared#^_ orderHint - 22 + 7 Pods-XYSW test-PacketTunnelProvider test.xcscheme_^#shared#^_ orderHint - 23 + 11 Pods-XYSW test.xcscheme_^#shared#^_ orderHint - 17 + 25 Pods-XYSW-PacketTunnelProvider.xcscheme_^#shared#^_ orderHint - 16 + 10 Pods-XYSW.xcscheme_^#shared#^_ orderHint - 21 + 13 Reachability.xcscheme_^#shared#^_ orderHint - 15 + 23 SVProgressHUD.xcscheme_^#shared#^_ orderHint - 11 + 4 TZImagePickerController.xcscheme_^#shared#^_ orderHint - 24 + 15 ZXNavigationBar.xcscheme_^#shared#^_ orderHint - 20 + 12 mob_pushsdk.xcscheme_^#shared#^_ orderHint - 18 + 16 diff --git a/XYSW.xcworkspace/xcuserdata/zhangfeng.xcuserdatad/UserInterfaceState.xcuserstate b/XYSW.xcworkspace/xcuserdata/zhangfeng.xcuserdatad/UserInterfaceState.xcuserstate index 236419d..49bc411 100644 --- a/XYSW.xcworkspace/xcuserdata/zhangfeng.xcuserdatad/UserInterfaceState.xcuserstate +++ b/XYSW.xcworkspace/xcuserdata/zhangfeng.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/XYSW.xcworkspace/xcuserdata/zhangfeng.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/XYSW.xcworkspace/xcuserdata/zhangfeng.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist new file mode 100644 index 0000000..18c1269 --- /dev/null +++ b/XYSW.xcworkspace/xcuserdata/zhangfeng.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/XYSW/WKWebViewController.m b/XYSW/WKWebViewController.m index bbfb388..8eea7ed 100755 --- a/XYSW/WKWebViewController.m +++ b/XYSW/WKWebViewController.m @@ -269,13 +269,8 @@ // 获取毫秒时间戳，达到每次请求的url都不同，避免缓存 double currentTime = [[NSDate date] timeIntervalSince1970]; NSString *strTime = [NSString stringWithFormat:@"%.0f",currentTime]; - if (Development == 1) { - NSString *urlStr = [NSString stringWithFormat:@"http://36.133.215.233:9500/hzapp_html/dist/#/home/workSpace/?t=%@",strTime]; - request=[NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlStr]]; - }else{ - NSString *urlStr = [NSString stringWithFormat:@"http://36.133.215.233:9500/hzapp_html/dist/#/home/workSpace/?t=%@",strTime]; - request=[NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlStr]];; - } + NSString *urlStr = [NSString stringWithFormat:@"http://192.168.100.18:9500/hzapp_html/dist/#/home/workSpace/?t=%@",strTime]; + request=[NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlStr]];; [request setTimeoutInterval:10]; diff --git a/XYSW/vpn_config.ovpn b/XYSW/vpn_config.ovpn old mode 100755 new mode 100644 index 39b2746..9cd0810 --- a/XYSW/vpn_config.ovpn +++ b/XYSW/vpn_config.ovpn @@ -6,6 +6,7 @@ nobind persist-key persist-tun +client-cert-not-required -----BEGIN CERTIFICATE----- MIIDKzCCAhOgAwIBAgIJAJIqaBTWeDXlMA0GCSqGSIb3DQEBCwUAMBMxETAPBgNV