root/ifish
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新版本

Browse Source
This commit is contained in:
roy
2019-03-12 09:26:46 +08:00
parent cbbfcb098a
commit c08d198e11
431 changed files with 19432 additions and 9136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ifish/Utinitys/IfishHttpRequest/IfishDataUnity.m
+27 -5
View File
@@ -10,6 +10,7 @@
//#import "JPUSHService.h"
#import "IfishCameraModel.h"
#import "IfishNewsModel.h"
#import "IfishHotBarVc.h"
@implementation IfishDataUnity
@@ -64,14 +65,14 @@
if (scanVC) {
[[UIApplication sharedApplication].delegate.window.rootViewController.view makeToastActivityBlackBack];
// [[UIApplication sharedApplication].delegate.window.rootViewController.view makeToastActivityBlackBack];
[scanVC dismissViewControllerAnimated:YES completion:^{
// [[UIApplication sharedApplication].delegate.window.rootViewController.view hideToastActivity];
[self setrootWith:devicemodel];
[[UIApplication sharedApplication].delegate.window.rootViewController.view hideToastActivity];
}];
return;
@@ -83,6 +84,9 @@
}
-(void)setrootWith:(DeviceModel*)devicemodel{
// NSString *tost=[NSString stringWithFormat:@"type%@",devicemodel.type];
// [[UIApplication sharedApplication].keyWindow makeToast:tost];
// 先判断是否授权
if ([devicemodel.type isEqual:[NSNull null]]||!devicemodel.type) {
//未知类型 跳转未授权 显示未知类型
@@ -149,7 +153,24 @@
[nav.navigationBar setBackgroundImage:[UIImage imageNamed:@"blackbar.png"] forBarMetrics:UIBarMetricsDefault];
app1.window.rootViewController=nav;
}else{
}else if ([devicemodel.type isEqualToString:DECICE_TYPE_hotBar]) {
IfishHotBarVc*barVc=[[IfishHotBarVc alloc]initWithNibName:@"IfishHotBarVc" bundle:nil];
barVc.devicemodel = devicemodel;
barVc.hidesBottomBarWhenPushed=YES;
UIApplication*app=[UIApplication sharedApplication];
AppDelegate*app1=(AppDelegate*)app.delegate;
// UINavigationController*nav=[[UINavigationController alloc]initWithRootViewController:barVc];
// [nav.navigationBar setBackgroundImage:[UIImage imageNamed:@"blackbar.png"] forBarMetrics:UIBarMetricsDefault];
// app1.window.rootViewController=nav;
// [((UINavigationController*)app1.window.rootViewController) pushViewController:barVc animated:YES];
UITabBarController*tabVc= (UITabBarController*)app1.window.rootViewController;
tabVc.selectedIndex=0;
UINavigationController*navVc=(UINavigationController*)tabVc.childViewControllers[tabVc.selectedIndex];
[navVc pushViewController:barVc animated:YES];
}
else{
int controlAmount=[devicemodel.controlAmount intValue];
@@ -186,6 +207,7 @@
app1.window.rootViewController=nav;
}
break;