Browse Source

修改锁屏后点击通知跳转到指定页面问题,修改通知下拉刷新闪退问题

master
公司电脑 1 year ago
parent
commit
3d8ac1eccd
  1. BIN
      LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate
  2. 38
      LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  3. 20
      LekangGuard/AppDelegate.m
  4. 3
      LekangGuard/Home/Homes/ScanCodeViewController.m
  5. 2
      LekangGuard/Home/Homes/View/HomeHeaderView.m
  6. 4
      LekangGuard/Managers/APIManager.m
  7. 15
      LekangGuard/TabMessage/VC/MyChildViewController.m
  8. 15
      LekangGuard/TabMessage/VC/OtherChildViewController.m
  9. 14
      LekangGuard/TabMessage/VC/SchAndJobMessageViewController.m

BIN
LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate generated

Binary file not shown.

38
LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@ -503,50 +503,18 @@ @@ -503,50 +503,18 @@
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "E782D0B5-0F3E-42C9-B6BC-FAD4A5C95E32"
uuid = "DC84D16B-60C3-407C-A542-336B6D8DCFFC"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "LekangGuard/AppDelegate.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "112"
endingLineNumber = "112"
startingLineNumber = "106"
endingLineNumber = "106"
landmarkName = "-pushRegistry:didReceiveIncomingPushWithPayload:forType:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "5CF9A57E-A05C-48B1-9CA3-C40AD27E93AB"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "LekangGuard/AppDelegate.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "136"
endingLineNumber = "136"
landmarkName = "-pushRegistry:didReceiveIncomingPushWithPayload:forType:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "45E08455-F827-4700-9A7F-B7E3CC10D47C"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "LekangGuard/AppDelegate.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "168"
endingLineNumber = "168"
landmarkName = "-application:didReceiveRemoteNotification:fetchCompletionHandler:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>

20
LekangGuard/AppDelegate.m

@ -11,7 +11,8 @@ @@ -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 @@ -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 @@ -354,6 +371,7 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response
if([msgType isEqualToString:@"CostFlow"]){
selectIndex = 3;
}
// 跳转 消息中心页面
if(![msgType isEqualToString:@"photograph"])
{

3
LekangGuard/Home/Homes/ScanCodeViewController.m

@ -67,9 +67,8 @@ @@ -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;

2
LekangGuard/Home/Homes/View/HomeHeaderView.m

@ -137,7 +137,7 @@ @@ -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];

4
LekangGuard/Managers/APIManager.m

@ -12,8 +12,8 @@ @@ -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";

15
LekangGuard/TabMessage/VC/MyChildViewController.m

@ -87,16 +87,15 @@ @@ -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;

15
LekangGuard/TabMessage/VC/OtherChildViewController.m

@ -87,16 +87,15 @@ @@ -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;

14
LekangGuard/TabMessage/VC/SchAndJobMessageViewController.m

@ -99,22 +99,22 @@ @@ -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;

Loading…
Cancel
Save