|
@@ -30,8 +30,6 @@
|
|
@property (nonatomic,weak)NSTimer *timer;
|
|
@property (nonatomic,weak)NSTimer *timer;
|
|
|
|
|
|
@property(nonatomic, assign)BOOL updateNotify;
|
|
@property(nonatomic, assign)BOOL updateNotify;
|
|
-@property(nonatomic, assign)BOOL afterOpenPushMessage;
|
|
|
|
-
|
|
|
|
|
|
|
|
@property(nonatomic,strong)CLLocationManager *locaationManager;
|
|
@property(nonatomic,strong)CLLocationManager *locaationManager;
|
|
@property(nonatomic,strong)NSString *placeAdr;
|
|
@property(nonatomic,strong)NSString *placeAdr;
|
|
@@ -533,16 +531,8 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
|
|
|
|
|
|
|
|
|
|
[self removeNoNetViews];
|
|
[self removeNoNetViews];
|
|
- [[LXViewControllerManager shareViewControllerManager] hideHud];
|
|
|
|
|
|
|
|
[self isExitCallToJS:@"afterPageInit()" withMethodName:@"afterPageInit"];
|
|
[self isExitCallToJS:@"afterPageInit()" withMethodName:@"afterPageInit"];
|
|
- if (self.afterOpenPushMessage) {
|
|
|
|
- self.afterOpenPushMessage = NO;
|
|
|
|
- [self isExitCallToJS:[NSString stringWithFormat:@"afterOpenPushMessage('%d')", [self jsIsCanBack:nil]] withMethodName:@"afterOpenPushMessage"];
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
|
|
|
|
}
|
|
}
|
|
/* 页面开始加载 */
|
|
/* 页面开始加载 */
|
|
@@ -569,12 +559,10 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
|
|
[[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;
|
|
UMSocialUserInfoResponse *resp = result;
|
|
[self dealWXDic:(NSDictionary *)resp.originalResponse];
|
|
[self dealWXDic:(NSDictionary *)resp.originalResponse];
|
|
- [[LXViewControllerManager shareViewControllerManager] hideHud];
|
|
|
|
}];
|
|
}];
|
|
}
|
|
}
|
|
// 处理微信登录获取到的数据
|
|
// 处理微信登录获取到的数据
|
|
-(void)dealWXDic:(NSDictionary *)dictionary{
|
|
-(void)dealWXDic:(NSDictionary *)dictionary{
|
|
- [[LXViewControllerManager shareViewControllerManager] showHudText:nil];
|
|
|
|
//如果获取到用户信息,即用户点击了“登录”,则进行用户信息获取
|
|
//如果获取到用户信息,即用户点击了“登录”,则进行用户信息获取
|
|
if (dictionary.count > 0) {
|
|
if (dictionary.count > 0) {
|
|
NSMutableDictionary *dic = [NSMutableDictionary dictionaryWithDictionary:dictionary];
|
|
NSMutableDictionary *dic = [NSMutableDictionary dictionaryWithDictionary:dictionary];
|
|
@@ -649,7 +637,6 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
|
|
}
|
|
}
|
|
|
|
|
|
-(void)jsSaveUserToken:(NSDictionary *)dict{
|
|
-(void)jsSaveUserToken:(NSDictionary *)dict{
|
|
- [[LXViewControllerManager shareViewControllerManager] hideHud];
|
|
|
|
[LXUserDefaults saveToken:[NSString stringWithFormat:@"%@",dict[@"token"]]];
|
|
[LXUserDefaults saveToken:[NSString stringWithFormat:@"%@",dict[@"token"]]];
|
|
}
|
|
}
|
|
-(NSString *)jsGetUserToken:(NSDictionary *)dict{
|
|
-(NSString *)jsGetUserToken:(NSDictionary *)dict{
|
|
@@ -970,8 +957,6 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
|
|
tab.selectedIndex = 1;
|
|
tab.selectedIndex = 1;
|
|
[self performSelector:@selector(pushDY:) withObject:self.notiDict[@"info"] afterDelay:1];
|
|
[self performSelector:@selector(pushDY:) withObject:self.notiDict[@"info"] afterDelay:1];
|
|
}else {
|
|
}else {
|
|
- [[LXViewControllerManager shareViewControllerManager] showHudText:nil];
|
|
|
|
- self.afterOpenPushMessage = YES;
|
|
|
|
[self performSelector:@selector(requestWebTime:) withObject:self.notiDict afterDelay:1];
|
|
[self performSelector:@selector(requestWebTime:) withObject:self.notiDict afterDelay:1];
|
|
}
|
|
}
|
|
[self.timer invalidate];
|
|
[self.timer invalidate];
|
|
@@ -1357,8 +1342,6 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
|
|
if(self.tabBarController.selectedIndex != 0) {
|
|
if(self.tabBarController.selectedIndex != 0) {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
- [[LXViewControllerManager shareViewControllerManager] showHudText:nil];
|
|
|
|
- self.afterOpenPushMessage = YES;
|
|
|
|
[self performSelector:@selector(requestWebTime:) withObject:infoDict afterDelay:1];
|
|
[self performSelector:@selector(requestWebTime:) withObject:infoDict afterDelay:1];
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1430,7 +1413,6 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
|
|
// 再次加载页面
|
|
// 再次加载页面
|
|
-(void)reloadWebView{
|
|
-(void)reloadWebView{
|
|
if(self.tabBarController.selectedIndex == 0) {
|
|
if(self.tabBarController.selectedIndex == 0) {
|
|
- [[LXViewControllerManager shareViewControllerManager] showHudText:nil];
|
|
|
|
if (!self.webView.canGoBack) {
|
|
if (!self.webView.canGoBack) {
|
|
[self webViewFirstRequest];
|
|
[self webViewFirstRequest];
|
|
}else{
|
|
}else{
|