|
|
@@ -38,6 +38,7 @@ JSExportAs(lightStatusBar, -(void)jsLightStatusBar:(NSString *)status);// 导航
|
|
|
JSExportAs(openExternalLink, -(void)jsOpenExternalLink:(NSString *)url title:(NSString *)title);// 打开新控制器 加载新web
|
|
|
JSExportAs(getVersion, -(NSString *)jsGetVersion:(NSString *)str);// 获取当前版本号
|
|
|
JSExportAs(alert, -(void)jsAlert:(NSString *)content);// 弹框
|
|
|
+JSExportAs(isInstallWeixin, -(int)jsIsInstallWeixin:(NSString *)str);// 是否安装微信
|
|
|
|
|
|
|
|
|
|
|
|
@@ -65,7 +66,7 @@ JSExportAs(alert, -(void)jsAlert:(NSString *)content);// 弹框
|
|
|
|
|
|
- (void)viewDidLoad {
|
|
|
[super viewDidLoad];
|
|
|
-
|
|
|
+
|
|
|
[LXDataBaseManager shareDataBaseManager];
|
|
|
if ([[UIDevice currentDevice].systemVersion floatValue] >= 11.0) {
|
|
|
self.topC.constant = -20;
|
|
|
@@ -80,20 +81,36 @@ JSExportAs(alert, -(void)jsAlert:(NSString *)content);// 弹框
|
|
|
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(afterReceiveNewMsg) name:kAfterReceiveNewMsg object:nil];
|
|
|
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(reloadWebView) name:kReloadWebVIew object:nil];
|
|
|
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(loginOut:) name:kLoginOut object:nil];
|
|
|
-
|
|
|
|
|
|
- int state = [[[NSUserDefaults standardUserDefaults] objectForKey:@"firstLoad"] intValue];
|
|
|
[[AFNetworkReachabilityManager sharedManager] startMonitoring];
|
|
|
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(netReachChanged:) name:AFNetworkingReachabilityDidChangeNotification object:nil];
|
|
|
+
|
|
|
+// int state = [[[NSUserDefaults standardUserDefaults] objectForKey:@"firstLoad"] intValue];
|
|
|
// AFNetworkingReachabilityDidChangeNotification
|
|
|
- if (state != 1) {
|
|
|
- if ([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusNotReachable) {
|
|
|
- [self noNetGetData];
|
|
|
- }else{
|
|
|
- [[NSUserDefaults standardUserDefaults] setObject:@"1" forKey:@"firstLoad"];
|
|
|
- }
|
|
|
- }
|
|
|
+
|
|
|
+// if (state != 1) {
|
|
|
+// if ([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusNotReachable) {
|
|
|
+// [self noNetGetData];
|
|
|
+// }else{
|
|
|
+// [[NSUserDefaults standardUserDefaults] setObject:@"1" forKey:@"firstLoad"];
|
|
|
+// }
|
|
|
+// }
|
|
|
[self clearWeb];
|
|
|
}
|
|
|
+
|
|
|
+-(void)netReachChanged:(NSNotification *)notificaition{
|
|
|
+ NSDictionary *userInfo = notificaition.userInfo;
|
|
|
+ if ([userInfo[@"AFNetworkingReachabilityNotificationStatusItem"] intValue] == 0 || [userInfo[@"AFNetworkingReachabilityNotificationStatusItem"] intValue] == -1) {
|
|
|
+ [self addNoNetViews];
|
|
|
+ }else{
|
|
|
+ if ([[[NSUserDefaults standardUserDefaults] objectForKey:@"firstLoad"] intValue] == 0) {
|
|
|
+ [[NSUserDefaults standardUserDefaults] setObject:@"1" forKey:@"firstLoad"];
|
|
|
+ [self removeNoNetViews];
|
|
|
+ [self webViewFirstRequest];
|
|
|
+ }
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
// 再次加载页面
|
|
|
-(void)reloadWebView{
|
|
|
[[LXViewControllerManager shareViewControllerManager] showHudText:nil];
|
|
|
@@ -117,17 +134,17 @@ JSExportAs(alert, -(void)jsAlert:(NSString *)content);// 弹框
|
|
|
}
|
|
|
|
|
|
|
|
|
--(void)noNetGetData{
|
|
|
- [[NSUserDefaults standardUserDefaults] setObject:@"1" forKey:@"firstLoad"];
|
|
|
- [[LXViewControllerManager shareViewControllerManager] showHudText:nil];
|
|
|
- if ([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusReachableViaWWAN || [AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusReachableViaWiFi) {
|
|
|
- [[AFNetworkReachabilityManager sharedManager] stopMonitoring];
|
|
|
- [self removeNoNetViews];
|
|
|
- [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@%@", kHost, @"jyapp/free/login"]]]];
|
|
|
- }else{
|
|
|
- [self performSelector:@selector(noNetGetData) withObject:nil afterDelay:2];
|
|
|
- }
|
|
|
-}
|
|
|
+//-(void)noNetGetData{
|
|
|
+// [[NSUserDefaults standardUserDefaults] setObject:@"1" forKey:@"firstLoad"];
|
|
|
+// [[LXViewControllerManager shareViewControllerManager] showHudText:nil];
|
|
|
+// if ([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusReachableViaWWAN || [AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusReachableViaWiFi) {
|
|
|
+// [[AFNetworkReachabilityManager sharedManager] stopMonitoring];
|
|
|
+// [self removeNoNetViews];
|
|
|
+// [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@%@", kHost, @"jyapp/free/login"]]]];
|
|
|
+// }else{
|
|
|
+// [self performSelector:@selector(noNetGetData) withObject:nil afterDelay:2];
|
|
|
+// }
|
|
|
+//}
|
|
|
|
|
|
// 点击通知 跳转到通知内url
|
|
|
-(void)requestWebView:(NSNotification *)notification{
|
|
|
@@ -174,7 +191,10 @@ JSExportAs(alert, -(void)jsAlert:(NSString *)content);// 弹框
|
|
|
|
|
|
- (IBAction)click:(id)sender {
|
|
|
// [self jsLoginByWeixin:nil];
|
|
|
- [self clearWeb];
|
|
|
+// [self clearWeb];
|
|
|
+ NewWebController *ctr = [[NewWebController alloc] init];
|
|
|
+ ctr.url = @"http://www.baidu.com";
|
|
|
+ [self presentViewController:ctr animated:NO completion:nil];
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -220,13 +240,15 @@ JSExportAs(alert, -(void)jsAlert:(NSString *)content);// 弹框
|
|
|
|
|
|
-(void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error{
|
|
|
[[LXViewControllerManager shareViewControllerManager] hideHud];
|
|
|
- if ([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusNotReachable || [AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusUnknown) {
|
|
|
- [self addNoNetViews];
|
|
|
- }
|
|
|
+// if ([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusNotReachable || [AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusUnknown) {
|
|
|
+//// [self addNoNetViews];
|
|
|
+// }
|
|
|
NSString *url = webView.request.URL.absoluteString;
|
|
|
[self doSomeWithLoadUrl:url];
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+
|
|
|
-(void)webViewDidStartLoad:(UIWebView *)webView{
|
|
|
// if ([[UIDevice currentDevice].systemVersion floatValue] < 10) {
|
|
|
// [[LXViewControllerManager shareViewControllerManager] hideHud];
|
|
|
@@ -267,40 +289,39 @@ JSExportAs(alert, -(void)jsAlert:(NSString *)content);// 弹框
|
|
|
// 微信登录
|
|
|
-(NSString *)jsLoginByWeixin:(NSString *)str{
|
|
|
|
|
|
+ if ([LXUserDefaults isInstallWeiXin] != 1) {
|
|
|
+ [[LXViewControllerManager shareViewControllerManager] showHudOnlyText:@"微信登录失败，没有安装微信" delay:1.5];
|
|
|
+ return nil;
|
|
|
+ }
|
|
|
|
|
|
kMainQueue(^{
|
|
|
|
|
|
- if (![[UMSocialManager defaultManager] isInstall:UMSocialPlatformType_WechatSession]) {
|
|
|
- [[LXViewControllerManager shareViewControllerManager] showHudOnlyText:@"微信登录失败，没有安装微信" delay:1.5];
|
|
|
- return;
|
|
|
- }else{
|
|
|
+ [[UMSocialManager defaultManager] getUserInfoWithPlatform:UMSocialPlatformType_WechatSession currentViewController:self completion:^(id result, NSError *error) {
|
|
|
|
|
|
- [[UMSocialManager defaultManager] getUserInfoWithPlatform:UMSocialPlatformType_WechatSession currentViewController:self completion:^(id result, NSError *error) {
|
|
|
-
|
|
|
- UMSocialUserInfoResponse *resp = result;
|
|
|
-
|
|
|
- // 第三方登录数据(为空表示平台未提供)
|
|
|
- // 授权数据
|
|
|
- NSLog(@" uid: %@", resp.uid);
|
|
|
- NSLog(@" openid: %@", resp.openid);
|
|
|
- [LXUserDefaults saveOpenID:resp.openid];
|
|
|
- NSLog(@" accessToken: %@", resp.accessToken);
|
|
|
- NSLog(@" refreshToken: %@", resp.refreshToken);
|
|
|
- NSLog(@" expiration: %@", resp.expiration);
|
|
|
- // 用户数据
|
|
|
- NSLog(@" name: %@", resp.name);
|
|
|
- NSLog(@" iconurl: %@", resp.iconurl);
|
|
|
- NSLog(@" gender: %@", resp.unionGender);
|
|
|
-
|
|
|
- // 第三方平台SDK原始数据
|
|
|
- NSLog(@" originalResponse: %@", resp.originalResponse);
|
|
|
-
|
|
|
- [self dealWXDic:(NSDictionary *)resp.originalResponse];
|
|
|
-
|
|
|
- [[LXViewControllerManager shareViewControllerManager] hideHud];
|
|
|
- }];
|
|
|
+ UMSocialUserInfoResponse *resp = result;
|
|
|
|
|
|
- }
|
|
|
+ // 第三方登录数据(为空表示平台未提供)
|
|
|
+ // 授权数据
|
|
|
+ NSLog(@" uid: %@", resp.uid);
|
|
|
+ NSLog(@" openid: %@", resp.openid);
|
|
|
+ [LXUserDefaults saveOpenID:resp.openid];
|
|
|
+ NSLog(@" accessToken: %@", resp.accessToken);
|
|
|
+ NSLog(@" refreshToken: %@", resp.refreshToken);
|
|
|
+ NSLog(@" expiration: %@", resp.expiration);
|
|
|
+ // 用户数据
|
|
|
+ NSLog(@" name: %@", resp.name);
|
|
|
+ NSLog(@" iconurl: %@", resp.iconurl);
|
|
|
+ NSLog(@" gender: %@", resp.unionGender);
|
|
|
+
|
|
|
+ // 第三方平台SDK原始数据
|
|
|
+ NSLog(@" originalResponse: %@", resp.originalResponse);
|
|
|
+
|
|
|
+ [self dealWXDic:(NSDictionary *)resp.originalResponse];
|
|
|
+
|
|
|
+ [[LXViewControllerManager shareViewControllerManager] hideHud];
|
|
|
+ }];
|
|
|
+
|
|
|
+
|
|
|
|
|
|
});
|
|
|
|
|
|
@@ -353,10 +374,9 @@ JSExportAs(alert, -(void)jsAlert:(NSString *)content);// 弹框
|
|
|
kMainQueue(^{
|
|
|
|
|
|
if ([type intValue] == 1 || [type intValue] == 3) {
|
|
|
- if (![[UMSocialManager defaultManager] isInstall:UMSocialPlatformType_WechatSession]) {
|
|
|
+ if ([LXUserDefaults isInstallWeiXin] != 1) {
|
|
|
[[LXViewControllerManager shareViewControllerManager] showHudOnlyText:@"没有安装微信" delay:1.5];
|
|
|
return;
|
|
|
-
|
|
|
}
|
|
|
}
|
|
|
if ([type intValue] == 2) {
|
|
|
@@ -494,7 +514,7 @@ JSExportAs(alert, -(void)jsAlert:(NSString *)content);// 弹框
|
|
|
-(void)jsOpenExternalLink:(NSString *)url title:(NSString *)title{
|
|
|
if (url) {
|
|
|
if ([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusNotReachable || [AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusUnknown) {
|
|
|
- [self addNoNetViews];
|
|
|
+// [self addNoNetViews];
|
|
|
}
|
|
|
NewWebController *ctr = [[NewWebController alloc] init];
|
|
|
ctr.url = url;
|
|
|
@@ -524,6 +544,10 @@ JSExportAs(alert, -(void)jsAlert:(NSString *)content);// 弹框
|
|
|
[[LXViewControllerManager shareViewControllerManager] showAlertViewWithMessage:content];
|
|
|
}
|
|
|
|
|
|
+// 是否安装微信
|
|
|
+-(int)jsIsInstallWeixin:(NSString *)str{
|
|
|
+ return [LXUserDefaults isInstallWeiXin];
|
|
|
+}
|
|
|
|
|
|
|
|
|
|
lixianglan
