diff --git a/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate b/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate
index 928ef78..8e23a40 100644
Binary files a/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate and b/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index 9416eda..257c69d 100644
--- a/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -503,50 +503,18 @@
-
-
-
-
-
-
-
-
diff --git a/LekangGuard/AppDelegate.m b/LekangGuard/AppDelegate.m
index 571b7cc..df04a21 100644
--- a/LekangGuard/AppDelegate.m
+++ b/LekangGuard/AppDelegate.m
@@ -11,7 +11,8 @@
#import "PPGetAddressBook.h"
#import "ChatViewController.h"
#import "MessageViewController.h"
-
+#import "ReadFlowerViewController.h"
+#import "SchAndJobMessageViewController.h"
#define kMusicTime 20
#define videoTimerCount 3
@@ -330,6 +331,22 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response
}];
return ;
}
+ if([msgType isEqualToString:@"redFlower"])
+ {
+ ReadFlowerViewController *vc = [[ReadFlowerViewController alloc] init];
+ vc.selectedIndex = [msgDic[@"rewardName"] isEqualToString:APIManager.sharedManager.deviceModel.name] ? 0 : 1;
+ [[UICommon currentVC].navigationController pushViewController:vc animated:YES];
+ return;
+ }
+ if([msgType isEqualToString:@"XYTZ"] || [msgType isEqualToString:@"ZYTZ"])
+ {
+ SchAndJobMessageViewController *vc = [[SchAndJobMessageViewController alloc] init];
+ vc.navTitle = [msgType isEqualToString:@"XYTZ"] ? @"校园通知" : @"作业通知";
+ vc.viewType = [msgType isEqualToString:@"ZYTZ"] ? 0 : 1;
+ [[UICommon currentVC].navigationController pushViewController:vc animated:YES];
+ return;
+ }
+
//lowBattery rail sms sos photograph 提醒消息
//checkResults checkedResults 关注消息
//identityTransfer identityTransfered systemUpdate 系统消息
@@ -354,6 +371,7 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response
if([msgType isEqualToString:@"CostFlow"]){
selectIndex = 3;
}
+
// 跳转 消息中心页面
if(![msgType isEqualToString:@"photograph"])
{
diff --git a/LekangGuard/Home/Homes/ScanCodeViewController.m b/LekangGuard/Home/Homes/ScanCodeViewController.m
index 48cfb06..35ef816 100644
--- a/LekangGuard/Home/Homes/ScanCodeViewController.m
+++ b/LekangGuard/Home/Homes/ScanCodeViewController.m
@@ -67,9 +67,8 @@
- (void)setupCamera
{
self.scanCode = [[SGScanCode alloc] init];
- if (![self.scanCode checkCameraDeviceRearAvailable]) {
+ if (![self.scanCode checkCameraDeviceRearAvailable])
return;
- }
self.scanCode.delegate = self;
self.scanCode.sampleBufferDelegate = self;
self.scanCode.preview = self.view;
diff --git a/LekangGuard/Home/Homes/View/HomeHeaderView.m b/LekangGuard/Home/Homes/View/HomeHeaderView.m
index 282eb3c..50067b1 100644
--- a/LekangGuard/Home/Homes/View/HomeHeaderView.m
+++ b/LekangGuard/Home/Homes/View/HomeHeaderView.m
@@ -137,7 +137,7 @@
bannerView.imageType = KJBannerViewImageTypeNetIamge;
bannerView.bannerImageViewContentMode = UIViewContentModeScaleToFill;
bannerView.pageControl.selectColor = KKMainColor;
- //bannerView.imageDatas = @[@"home_banner"];
+ bannerView.imageDatas = @[@"home_banner"];
self.bannerView = bannerView;
[self addSubview:bannerView];
diff --git a/LekangGuard/Managers/APIManager.m b/LekangGuard/Managers/APIManager.m
index 6ff9758..e7bacf1 100644
--- a/LekangGuard/Managers/APIManager.m
+++ b/LekangGuard/Managers/APIManager.m
@@ -12,8 +12,8 @@
#ifdef DEBUG
//测试环境
//NSString *const dHostUrl = @"http://api.oversea.ecellsz.com:9876";
-//NSString *const dHostUrl = @"http://1.13.186.145:8822";
-NSString *const dHostUrl = @"http://120.77.209.176:8822";
+NSString *const dHostUrl = @"http://lb-mi23utxo-em1lnrk4gizs2pu8.clb.ap-nanjing.tencentclb.com:8822";
+//NSString *const dHostUrl = @"http://120.77.209.176:8822";
#else
//正式环境
NSString *const dHostUrl = @"http://api.oversea.ecellsz.com:9876";
diff --git a/LekangGuard/TabMessage/VC/MyChildViewController.m b/LekangGuard/TabMessage/VC/MyChildViewController.m
index 8ab0de3..29adf69 100644
--- a/LekangGuard/TabMessage/VC/MyChildViewController.m
+++ b/LekangGuard/TabMessage/VC/MyChildViewController.m
@@ -87,16 +87,15 @@
[UICommon HidenLoading];
if (ARRAYHASVALUE(obj.records))
{
- [weakself.msgTable.headRefreshControl endRefreshingWithAlertText:@"已为你加载最新数据~" completion:^{
-
- }];
+ [weakself.msgTable.headRefreshControl endRefreshingWithAlertText:@"已为你加载最新数据~" completion:^{}];
[weakself.msgTable.footRefreshControl endRefreshing];
- [obj.records enumerateObjectsUsingBlock:^(id _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
-
- RedFlowerModel *model = [RedFlowerModel yy_modelWithJSON:obj];
+
+ for (NSDictionary *dic in obj.records)
+ {
+ RedFlowerModel *model = [RedFlowerModel yy_modelWithJSON:dic];
[self.modelListArr addObject:model];
-
- }];
+ }
+
weakself.page++;
weakself.msgTable.footRefreshControl.hidden = obj.records.count < KSizeNO ? YES : NO;
weakself.msgTable.cellRow = self.modelListArr.count;
diff --git a/LekangGuard/TabMessage/VC/OtherChildViewController.m b/LekangGuard/TabMessage/VC/OtherChildViewController.m
index 68c6706..fca778e 100644
--- a/LekangGuard/TabMessage/VC/OtherChildViewController.m
+++ b/LekangGuard/TabMessage/VC/OtherChildViewController.m
@@ -87,16 +87,15 @@
[UICommon HidenLoading];
if (ARRAYHASVALUE(obj.records))
{
- [weakself.msgTable.headRefreshControl endRefreshingWithAlertText:@"已为你加载最新数据~" completion:^{
-
- }];
+ [weakself.msgTable.headRefreshControl endRefreshingWithAlertText:@"已为你加载最新数据~" completion:^{}];
[weakself.msgTable.footRefreshControl endRefreshing];
- [obj.records enumerateObjectsUsingBlock:^(id _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
-
- RedFlowerModel *model = [RedFlowerModel yy_modelWithJSON:obj];
+
+ for (NSDictionary *dic in obj.records)
+ {
+ RedFlowerModel *model = [RedFlowerModel yy_modelWithJSON:dic];
[self.modelListArr addObject:model];
-
- }];
+ }
+
weakself.page++;
weakself.msgTable.footRefreshControl.hidden = obj.records.count < KSizeNO ? YES : NO;
weakself.msgTable.cellRow = self.modelListArr.count;
diff --git a/LekangGuard/TabMessage/VC/SchAndJobMessageViewController.m b/LekangGuard/TabMessage/VC/SchAndJobMessageViewController.m
index ada62b4..573de7b 100644
--- a/LekangGuard/TabMessage/VC/SchAndJobMessageViewController.m
+++ b/LekangGuard/TabMessage/VC/SchAndJobMessageViewController.m
@@ -99,22 +99,22 @@
[UICommon HidenLoading];
if (ARRAYHASVALUE(obj.records))
{
- [weakself.schMsgTable.headRefreshControl endRefreshingWithAlertText:@"已为你加载最新数据~" completion:^{
-
- }];
+ [weakself.schMsgTable.headRefreshControl endRefreshingWithAlertText:@"已为你加载最新数据~" completion:^{}];
[weakself.schMsgTable.footRefreshControl endRefreshing];
- [obj.records enumerateObjectsUsingBlock:^(id _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+
+ for (NSDictionary *dic in obj.records)
+ {
if (weakself.viewType == 0)
{
- SchModel *model = [SchModel yy_modelWithJSON:obj];
+ SchModel *model = [SchModel yy_modelWithJSON:dic];
[self.modelListArr addObject:model];
}
else
{
- JobModel *model = [JobModel yy_modelWithJSON:obj];
+ JobModel *model = [JobModel yy_modelWithJSON:dic];
[self.modelListArr addObject:model];
}
- }];
+ }
weakself.page++;
weakself.schMsgTable.footRefreshControl.hidden = obj.records.count < KSizeNO ? YES : NO;
weakself.schMsgTable.cellRow = self.modelListArr.count;