|
@@ -498,7 +498,7 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
|
|
}
|
|
}
|
|
|
|
|
|
-(void)bottomFourListening {
|
|
-(void)bottomFourListening {
|
|
- if(self.tabBarController.selectedIndex == 3) {
|
|
|
|
|
|
+ if(self.tabBarController.selectedIndex == 4) {
|
|
[self judgeIsHiddenBottom];
|
|
[self judgeIsHiddenBottom];
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -747,7 +747,7 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
|
|
}
|
|
}
|
|
|
|
|
|
-(void)jsHiddenBottom:(NSDictionary *)dict{
|
|
-(void)jsHiddenBottom:(NSDictionary *)dict{
|
|
- if(self.tabBarController.selectedIndex == 3) {
|
|
|
|
|
|
+ if(self.tabBarController.selectedIndex == 4) {
|
|
if([[NSString stringWithFormat:@"%@",dict[@"hidden"]] integerValue]==0) {
|
|
if([[NSString stringWithFormat:@"%@",dict[@"hidden"]] integerValue]==0) {
|
|
[self hideTabBar];
|
|
[self hideTabBar];
|
|
[self hiddenMethodTabBar];
|
|
[self hiddenMethodTabBar];
|
|
@@ -819,7 +819,7 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
|
|
}
|
|
}
|
|
if([menu isEqualToString:@"my"]) {
|
|
if([menu isEqualToString:@"my"]) {
|
|
kMainQueue(^{
|
|
kMainQueue(^{
|
|
- [self.tabBarController.tabBar hideBadgeOnItemIndex:3];
|
|
|
|
|
|
+ [self.tabBarController.tabBar hideBadgeOnItemIndex:4];
|
|
});
|
|
});
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -833,7 +833,7 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
|
|
}
|
|
}
|
|
if([menu isEqualToString:@"my"]) {
|
|
if([menu isEqualToString:@"my"]) {
|
|
kMainQueue(^{
|
|
kMainQueue(^{
|
|
- [self.tabBarController.tabBar showBadgeOnItemIndex:3];
|
|
|
|
|
|
+ [self.tabBarController.tabBar showBadgeOnItemIndex:4];
|
|
});
|
|
});
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1168,7 +1168,7 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
|
|
}
|
|
}
|
|
//切换模块
|
|
//切换模块
|
|
-(void)jsSkipAppointTab:(NSDictionary *)dict {
|
|
-(void)jsSkipAppointTab:(NSDictionary *)dict {
|
|
- if(self.tabBarController.selectedIndex == 3) {
|
|
|
|
|
|
+ if(self.tabBarController.selectedIndex == 4) {
|
|
AppDelegate *delegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
|
|
AppDelegate *delegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
|
|
JYTabBarController *tab = (JYTabBarController *)delegate.window.rootViewController;
|
|
JYTabBarController *tab = (JYTabBarController *)delegate.window.rootViewController;
|
|
NSString *name = [NSString stringWithFormat:@"%@",dict[@"name"]];
|
|
NSString *name = [NSString stringWithFormat:@"%@",dict[@"name"]];
|
|
@@ -1188,14 +1188,14 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
|
|
|
|
|
|
//刷新模块页面
|
|
//刷新模块页面
|
|
-(void)jsRefreshAppointTab:(NSDictionary *)dict {
|
|
-(void)jsRefreshAppointTab:(NSDictionary *)dict {
|
|
- if(self.tabBarController.selectedIndex == 3) {
|
|
|
|
|
|
+ if(self.tabBarController.selectedIndex == 4) {
|
|
[[NSNotificationCenter defaultCenter] postNotificationName:JYRefreshMenusView object:nil userInfo:dict];
|
|
[[NSNotificationCenter defaultCenter] postNotificationName:JYRefreshMenusView object:nil userInfo:dict];
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
#pragma mark *****其他方法
|
|
#pragma mark *****其他方法
|
|
-(void)judgeIsHiddenBottom {
|
|
-(void)judgeIsHiddenBottom {
|
|
- if(self.tabBarController.selectedIndex == 3) {
|
|
|
|
|
|
+ if(self.tabBarController.selectedIndex == 4) {
|
|
NSString *current_url = [self stringByEvaluatingJavaScriptFromString:@"document.location.href"];
|
|
NSString *current_url = [self stringByEvaluatingJavaScriptFromString:@"document.location.href"];
|
|
|
|
|
|
if([current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/free/me",kHost]]){
|
|
if([current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/free/me",kHost]]){
|
|
@@ -1461,7 +1461,7 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
|
|
|
|
|
|
#pragma mark **** 通知相关方法
|
|
#pragma mark **** 通知相关方法
|
|
-(void)openPushUrlOtherMethods:(NSNotification *)notification{
|
|
-(void)openPushUrlOtherMethods:(NSNotification *)notification{
|
|
- if(self.tabBarController.selectedIndex == 3) {
|
|
|
|
|
|
+ if(self.tabBarController.selectedIndex == 4) {
|
|
NSDictionary *infoDict = notification.userInfo;
|
|
NSDictionary *infoDict = notification.userInfo;
|
|
NSLog(@"%@",infoDict);
|
|
NSLog(@"%@",infoDict);
|
|
if (!infoDict) {return;}
|
|
if (!infoDict) {return;}
|
|
@@ -1484,13 +1484,13 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
|
|
if (!infoDict) {return;}
|
|
if (!infoDict) {return;}
|
|
NSString * urlStr = [NSString stringWithFormat:@"%@",infoDict[@"url"]];
|
|
NSString * urlStr = [NSString stringWithFormat:@"%@",infoDict[@"url"]];
|
|
if ([urlStr isEqualToString:kHost]) {return;}
|
|
if ([urlStr isEqualToString:kHost]) {return;}
|
|
- if (self.tabBarController.selectedIndex == 3) {
|
|
|
|
|
|
+ if (self.tabBarController.selectedIndex == 4) {
|
|
[self JsOpenExternalLink:@{@"url":urlStr,@"title":@"消息通知"}];
|
|
[self JsOpenExternalLink:@{@"url":urlStr,@"title":@"消息通知"}];
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-(void)alipayWXpayStatus:(NSNotification *)notification{
|
|
-(void)alipayWXpayStatus:(NSNotification *)notification{
|
|
- if(self.tabBarController.selectedIndex == 3) {
|
|
|
|
|
|
+ if(self.tabBarController.selectedIndex == 4) {
|
|
NSString * status = [notification object];
|
|
NSString * status = [notification object];
|
|
[self performSelector:@selector(payStatus:) withObject:status afterDelay:2];
|
|
[self performSelector:@selector(payStatus:) withObject:status afterDelay:2];
|
|
}
|
|
}
|
|
@@ -1498,7 +1498,7 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
|
|
-(void)payStatus:(NSString *)status
|
|
-(void)payStatus:(NSString *)status
|
|
{
|
|
{
|
|
NSLog(@"支付状态:%@",status);//目前延时两秒
|
|
NSLog(@"支付状态:%@",status);//目前延时两秒
|
|
- if(self.tabBarController.selectedIndex == 3) {
|
|
|
|
|
|
+ if(self.tabBarController.selectedIndex == 4) {
|
|
[self isExitCallToJS:[NSString stringWithFormat:@"payCallBack('%@')", status] withMethodName:@"payCallBack"];
|
|
[self isExitCallToJS:[NSString stringWithFormat:@"payCallBack('%@')", status] withMethodName:@"payCallBack"];
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1506,7 +1506,7 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
|
|
|
|
|
|
// 再次加载页面
|
|
// 再次加载页面
|
|
-(void)notNetReloadWebVIew:(NSNotification *)notification{
|
|
-(void)notNetReloadWebVIew:(NSNotification *)notification{
|
|
- if(self.tabBarController.selectedIndex == 3) {
|
|
|
|
|
|
+ if(self.tabBarController.selectedIndex == 4) {
|
|
if (![self.webView canGoBack]) {
|
|
if (![self.webView canGoBack]) {
|
|
[self webViewFirstRequest];
|
|
[self webViewFirstRequest];
|
|
}else{
|
|
}else{
|
|
@@ -1517,7 +1517,7 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
|
|
|
|
|
|
// 返回上一页面- 防止
|
|
// 返回上一页面- 防止
|
|
-(void)popWebView:(NSNotification *)notification{
|
|
-(void)popWebView:(NSNotification *)notification{
|
|
- if(self.tabBarController.selectedIndex == 3) {
|
|
|
|
|
|
+ if(self.tabBarController.selectedIndex == 4) {
|
|
if ([self.webView canGoBack]) {
|
|
if ([self.webView canGoBack]) {
|
|
[self.webView goBack];
|
|
[self.webView goBack];
|
|
}
|
|
}
|
|
@@ -1554,7 +1554,7 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
|
|
|
|
|
|
-(void)jyReceiveNewsRedPoint:(NSNotification *)notificaition {
|
|
-(void)jyReceiveNewsRedPoint:(NSNotification *)notificaition {
|
|
NSDictionary *dict = notificaition.userInfo;
|
|
NSDictionary *dict = notificaition.userInfo;
|
|
- if(self.tabBarController.selectedIndex == 3) {
|
|
|
|
|
|
+ if(self.tabBarController.selectedIndex == 4) {
|
|
NSString *textJS = [NSString stringWithFormat:@"afterReceivePushMessage('%@','%@')",dict[@"typeMsg"],dict[@"url"]];
|
|
NSString *textJS = [NSString stringWithFormat:@"afterReceivePushMessage('%@','%@')",dict[@"typeMsg"],dict[@"url"]];
|
|
[self isExitCallToJS:textJS withMethodName:@"afterReceivePushMessage"];
|
|
[self isExitCallToJS:textJS withMethodName:@"afterReceivePushMessage"];
|
|
}
|
|
}
|
|
@@ -1575,7 +1575,7 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
|
|
|
|
|
|
//刷新页面相关
|
|
//刷新页面相关
|
|
-(void)refreshNonCurVC:(NSNotification *)notificaition{
|
|
-(void)refreshNonCurVC:(NSNotification *)notificaition{
|
|
- if(self.tabBarController.selectedIndex != 3) {
|
|
|
|
|
|
+ if(self.tabBarController.selectedIndex != 4) {
|
|
[self webViewFirstRequest];
|
|
[self webViewFirstRequest];
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1589,7 +1589,7 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
|
|
|
|
|
|
//内购相关
|
|
//内购相关
|
|
-(void)receiptData:(NSNotification *)notificaition{
|
|
-(void)receiptData:(NSNotification *)notificaition{
|
|
- if(self.tabBarController.selectedIndex == 3) {
|
|
|
|
|
|
+ if(self.tabBarController.selectedIndex == 4) {
|
|
NSDictionary *infoDict = notificaition.userInfo;
|
|
NSDictionary *infoDict = notificaition.userInfo;
|
|
if (infoDict) {
|
|
if (infoDict) {
|
|
NSString *receipt = [NSString stringWithFormat:@"%@", infoDict[@"receipt"]];
|
|
NSString *receipt = [NSString stringWithFormat:@"%@", infoDict[@"receipt"]];
|
|
@@ -1600,7 +1600,7 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
|
|
|
|
|
|
#pragma mark ****粘贴板相关-梳理
|
|
#pragma mark ****粘贴板相关-梳理
|
|
-(void)updateClipboard:(NSNotification *)notificaition{
|
|
-(void)updateClipboard:(NSNotification *)notificaition{
|
|
- if(self.tabBarController.selectedIndex == 3) {
|
|
|
|
|
|
+ if(self.tabBarController.selectedIndex == 4) {
|
|
NSString *current_url = [self stringByEvaluatingJavaScriptFromString:@"document.location.href"];
|
|
NSString *current_url = [self stringByEvaluatingJavaScriptFromString:@"document.location.href"];
|
|
NSDictionary *dict = notificaition.userInfo;
|
|
NSDictionary *dict = notificaition.userInfo;
|
|
NSString *content = [NSString stringWithFormat:@"%@",dict[@"content"]];
|
|
NSString *content = [NSString stringWithFormat:@"%@",dict[@"content"]];
|
|
@@ -1613,7 +1613,7 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
|
|
}
|
|
}
|
|
|
|
|
|
-(void)openTheClipboard:(NSNotification *)notificaition{
|
|
-(void)openTheClipboard:(NSNotification *)notificaition{
|
|
- if(self.tabBarController.selectedIndex == 3) {
|
|
|
|
|
|
+ if(self.tabBarController.selectedIndex == 4) {
|
|
NSLog(@"菜单四打开指定粘贴板url");
|
|
NSLog(@"菜单四打开指定粘贴板url");
|
|
NSDictionary *dict = notificaition.userInfo;
|
|
NSDictionary *dict = notificaition.userInfo;
|
|
NSString *tmpUrl = [NSString stringWithFormat:@"%@%@", kHost, dict[@"url"]];
|
|
NSString *tmpUrl = [NSString stringWithFormat:@"%@%@", kHost, dict[@"url"]];
|