Browse Source

【bug修复】修复私聊推送问题等bug

master
公司电脑 11 months ago
parent
commit
eb6b4b01cf
  1. 4
      tongxin.xcodeproj/project.pbxproj
  2. 2
      tongxin.xcodeproj/xcshareddata/xcschemes/yisai-LeKan.xcscheme
  3. BIN
      tongxin.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate
  4. 227
      tongxin.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  5. 49
      tongxin/AppDelegate.m
  6. 10
      tongxin/VC/DeviceTab/ChatListViewController.m
  7. 28
      tongxin/VC/Map/AddRailViewController.m
  8. 2
      tongxin/VC/Map/MoreRailAddressViewController.m
  9. 12
      tongxin/VC/Map/RailListCell.m
  10. 4
      tongxin/xBase/Model/Rail.m

4
tongxin.xcodeproj/project.pbxproj

@ -7260,7 +7260,7 @@ @@ -7260,7 +7260,7 @@
"$(PROJECT_DIR)/sdk/lib/ios",
);
MACH_O_TYPE = mh_execute;
MARKETING_VERSION = 1.4.7;
MARKETING_VERSION = 1.4.8;
"OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--generate-entitlement-der";
OTHER_LDFLAGS = (
"$(inherited)",
@ -7376,7 +7376,7 @@ @@ -7376,7 +7376,7 @@
"$(PROJECT_DIR)/tongxin/ThirdPartyLib/ShareSDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
"$(PROJECT_DIR)/sdk/lib/ios",
);
MARKETING_VERSION = 1.4.7;
MARKETING_VERSION = 1.4.8;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",

2
tongxin.xcodeproj/xcshareddata/xcschemes/yisai-LeKan.xcscheme

@ -60,7 +60,7 @@ @@ -60,7 +60,7 @@
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Release"
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"

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

Binary file not shown.

227
tongxin.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@ -64,6 +64,21 @@ @@ -64,6 +64,21 @@
endingLineNumber = "620"
offsetFromSymbolStart = "64">
</Location>
<Location
uuid = "CD4FF0B5-EB83-4C31-9766-C2DA819BF6B4 - 9e8dec84cca44797"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "__55-[MyHttp UploadPictureByFileName:Path:success:failure:]_block_invoke.181"
moduleName = "&#x4e50;&#x5eb7;&#x5b88;&#x62a4;"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/ecell/leKanShouHu-ios/tongxin/Helpers/myHttp/MyHttp.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "620"
endingLineNumber = "620"
offsetFromSymbolStart = "32">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
@ -602,8 +617,8 @@ @@ -602,8 +617,8 @@
filePath = "tongxin/AppDelegate.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "260"
endingLineNumber = "260"
startingLineNumber = "261"
endingLineNumber = "261"
landmarkName = "-pushRegistry:didReceiveIncomingPushWithPayload:forType:"
landmarkType = "7">
<Locations>
@ -667,6 +682,21 @@ @@ -667,6 +682,21 @@
endingLineNumber = "260"
offsetFromSymbolStart = "428">
</Location>
<Location
uuid = "6F828A69-1147-43DD-8FDD-4F7F7AB54537 - 89ab2a6d81274cb7"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[AppDelegate pushRegistry:didReceiveIncomingPushWithPayload:forType:]"
moduleName = "&#x4e50;&#x5eb7;&#x5b88;&#x62a4;"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/ecell/leKanShouHu-ios/tongxin/AppDelegate.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "261"
endingLineNumber = "261"
offsetFromSymbolStart = "620">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
@ -680,8 +710,8 @@ @@ -680,8 +710,8 @@
filePath = "tongxin/AppDelegate.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "238"
endingLineNumber = "238"
startingLineNumber = "239"
endingLineNumber = "239"
landmarkName = "-pushRegistry:didReceiveIncomingPushWithPayload:forType:"
landmarkType = "7">
<Locations>
@ -745,6 +775,21 @@ @@ -745,6 +775,21 @@
endingLineNumber = "259"
offsetFromSymbolStart = "408">
</Location>
<Location
uuid = "EE909FE7-851E-4250-8AFB-EDDBBD27776F - 89ab2a6d812753dd"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[AppDelegate pushRegistry:didReceiveIncomingPushWithPayload:forType:]"
moduleName = "&#x4e50;&#x5eb7;&#x5b88;&#x62a4;"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/ecell/leKanShouHu-ios/tongxin/AppDelegate.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "239"
endingLineNumber = "239"
offsetFromSymbolStart = "560">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
@ -1039,132 +1084,6 @@ @@ -1039,132 +1084,6 @@
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "9670D78C-90E1-4E31-928B-8683FCE2C26F"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "tongxin/VC/DeviceTab/ChatListViewController.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "128"
endingLineNumber = "128"
landmarkName = "-getModelList"
landmarkType = "7">
<Locations>
<Location
uuid = "9670D78C-90E1-4E31-928B-8683FCE2C26F - bdb0af8e026b2a11"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "__38-[ChatListViewController getModelList]_block_invoke.30"
moduleName = "&#x4e50;&#x5eb7;&#x5b88;&#x62a4;"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/ecell/leKanShouHu-ios/tongxin/VC/DeviceTab/ChatListViewController.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "123"
endingLineNumber = "123"
offsetFromSymbolStart = "12">
</Location>
<Location
uuid = "9670D78C-90E1-4E31-928B-8683FCE2C26F - bdb0af8e026b2a11"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "__38-[ChatListViewController getModelList]_block_invoke.30"
moduleName = "&#x4e50;&#x5eb7;&#x5b88;&#x62a4;"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/ecell/leKanShouHu-ios/tongxin/VC/DeviceTab/ChatListViewController.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "123"
endingLineNumber = "123"
offsetFromSymbolStart = "52">
</Location>
<Location
uuid = "9670D78C-90E1-4E31-928B-8683FCE2C26F - bdb0af8e026b2ab4"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "__38-[ChatListViewController getModelList]_block_invoke.30"
moduleName = "&#x4e50;&#x5eb7;&#x5b88;&#x62a4;"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/ecell/leKanShouHu-ios/tongxin/VC/DeviceTab/ChatListViewController.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "128"
endingLineNumber = "128"
offsetFromSymbolStart = "12">
</Location>
<Location
uuid = "9670D78C-90E1-4E31-928B-8683FCE2C26F - bdb0af8e026b2ab4"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "__38-[ChatListViewController getModelList]_block_invoke.30"
moduleName = "&#x4e50;&#x5eb7;&#x5b88;&#x62a4;"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/ecell/leKanShouHu-ios/tongxin/VC/DeviceTab/ChatListViewController.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "128"
endingLineNumber = "128"
offsetFromSymbolStart = "52">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "B8959789-85F5-4D11-942F-41968B5201E8"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "tongxin/AppDelegate.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "583"
endingLineNumber = "583"
landmarkName = "-handlePushMsg:"
landmarkType = "7">
<Locations>
<Location
uuid = "B8959789-85F5-4D11-942F-41968B5201E8 - a55e6c9a345e505b"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[AppDelegate handlePushMsg:]"
moduleName = "&#x4e50;&#x5eb7;&#x5b88;&#x62a4;"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/ecell/leKanShouHu-ios/tongxin/AppDelegate.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "583"
endingLineNumber = "583"
offsetFromSymbolStart = "224">
</Location>
<Location
uuid = "B8959789-85F5-4D11-942F-41968B5201E8 - a55e6c9a345e505b"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[AppDelegate handlePushMsg:]"
moduleName = "&#x4e50;&#x5eb7;&#x5b88;&#x62a4;"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/ecell/leKanShouHu-ios/tongxin/AppDelegate.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "583"
endingLineNumber = "583"
offsetFromSymbolStart = "108">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "4A3DB748-7DE6-4B65-A363-F05E2F495B28"
shouldBeEnabled = "Yes"
ignoreCount = "0"
@ -1384,22 +1303,38 @@ @@ -1384,22 +1303,38 @@
endingLineNumber = "60"
landmarkName = "-listTable"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "D91715B2-CE61-4113-95C4-3D55E6080AA0"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "tongxin/xBase/Model/Rail.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "45"
endingLineNumber = "45"
landmarkName = "-saveSuccess:failure:"
landmarkType = "7">
<Locations>
<Location
uuid = "50689A31-2E95-4BD5-A4F1-66C60B52AC85 - 32bb4b0d00a32c2b"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "__44-[ApplicationManageViewController listTable]_block_invoke_2"
moduleName = "&#x4e50;&#x5eb7;&#x5b88;&#x62a4;"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/ecell/leKanShouHu-ios/tongxin/VC/ShortMessage/ApplicationManageViewController.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "60"
endingLineNumber = "60"
offsetFromSymbolStart = "348">
</Location>
<Location
uuid = "50689A31-2E95-4BD5-A4F1-66C60B52AC85 - 32bb4b0d00a32c2b"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "__44-[ApplicationManageViewController listTable]_block_invoke_2"
moduleName = "&#x4e50;&#x5eb7;&#x5b88;&#x62a4;"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/ecell/leKanShouHu-ios/tongxin/VC/ShortMessage/ApplicationManageViewController.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "60"
endingLineNumber = "60"
offsetFromSymbolStart = "276">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>

49
tongxin/AppDelegate.m

@ -40,6 +40,7 @@ @@ -40,6 +40,7 @@
#import "NdUncaughtExceptionHandler.h"
#import "Bluetooth.h"
#import "ChatListViewController.h"
// VoIP 推送
#import <PushKit/PushKit.h>
@ -592,7 +593,8 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response @@ -592,7 +593,8 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response
UITabBarController *tabBarVC = (UITabBarController*)self.window.rootViewController;
UINavigationController *navVC = (UINavigationController*)tabBarVC.selectedViewController;
if([dict[@"type"] isEqualToString:@"chatGroupMessage"]){
if([dict[@"type"] isEqualToString:@"chatGroupMessage"] || [dict[@"type"] isEqualToString:@"singleMessage"])
{
//聊天消息
//判断imei 设置 主 device 并且 跳转到 对应的聊天界面
if(cUser.openid != nil ){
@ -622,10 +624,47 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response @@ -622,10 +624,47 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response
}
// 跳转 聊天页面
if(navVC){
UIStoryboard *sb = [UIStoryboard storyboardWithName:@"Main" bundle:nil];
baseViewController *vc = [sb instantiateViewControllerWithIdentifier:@"ChatVC"];
[navVC pushViewController:vc animated:YES];
if(navVC)
{
// if(![navVC.visibleViewController isKindOfClass:[ChatViewController class]])
// {
// ChatViewController *vc = [[ChatViewController alloc] init];
// //vc.zx_navTitle = [dict[@"type"] isEqualToString:@"chatGroupMessage"] ? @"家庭群聊" : @"";
//
// vc.chatType = [dict[@"type"] isEqualToString:@"chatGroupMessage"] ? 222: 111;
// if ([dict[@"type"] isEqualToString:@"chatGroupMessage"])
// {
// Circle *infoCircle = [[Circle alloc] init];
// infoCircle.groupid = dict[@"groupid"];
// vc.infoCircle = infoCircle;
// }
// else
// {
// Circle *infoCircle = [[Circle alloc] init];
// if (dict[@"imei"])
// vc.imei = dict[@"imei"];
// vc.infoCircle = infoCircle;
// for (Device *model in cUser.myDevices)
// {
// if ([model.imei isEqualToString:dict[@"message"][@"senderID"]])
// vc.zx_navTitle = model.name;
// }
// }
// [[UICommon currentVC].navigationController pushViewController:vc animated:YES];
// }
if(![navVC.visibleViewController isKindOfClass:[ChatListViewController class]])
{
ChatListViewController *vc = [[ChatListViewController alloc] init];
vc.hidesBottomBarWhenPushed = YES;
[[UICommon currentVC].navigationController pushViewController:vc animated:YES];
}
else
{
[[NSNotificationCenter defaultCenter] postNotificationName:@"UPDATAMESSAGELIST"
object:nil];
}
}
}
}

10
tongxin/VC/DeviceTab/ChatListViewController.m

@ -32,7 +32,13 @@ @@ -32,7 +32,13 @@
make.left.right.equalTo(self.view);
make.bottom.equalTo(self.view.mas_bottom);
}];
[[NSNotificationCenter defaultCenter] addObserverForName:@"UPDATAMESSAGELIST"
object:nil
queue:[NSOperationQueue mainQueue]
usingBlock:^(NSNotification * _Nonnull note)
{
[self getModelList];
}];
}
- (void)viewWillAppear:(BOOL)animated
@ -61,7 +67,7 @@ @@ -61,7 +67,7 @@
NSLog(@"%@",cUser.cDevice);
ChatViewController *vc = [[ChatViewController alloc] init];
vc.infoDevice = cUser.cDevice;
vc.zx_navTitle = model.groupid ? @"家庭群聊" : model.name;
vc.zx_navTitle = model.name;
vc.chatType = model.groupid ? 222: 111;
if (model.groupid)
{

28
tongxin/VC/Map/AddRailViewController.m

@ -26,8 +26,8 @@ @@ -26,8 +26,8 @@
- (NSMutableArray *)myDataSource{
if (!_myDataSource) {
// _myDataSource = [[NSMutableArray alloc] initWithArray:@[@[@"围栏类型",@"地址名称",@"地址",@"有效时间",@"星期"]]];
_myDataSource = [[NSMutableArray alloc] initWithArray:@[@[@"地址名称",@"地址",@"有效时间",@"星期"]]];
_myDataSource = [[NSMutableArray alloc] initWithArray:@[@[@"围栏类型",@"地址名称",@"地址",@"有效时间",@"星期"]]];
// _myDataSource = [[NSMutableArray alloc] initWithArray:@[@[@"地址名称",@"地址",@"有效时间",@"星期"]]];
}
return _myDataSource;
}
@ -240,16 +240,6 @@ @@ -240,16 +240,6 @@
UIButton *duoBtn = [UICommon ui_buttonSimple:CGRectZero font:Font_(14) normalColor:KKTextColor normalText:@" 多边形" click:^(UIButton *btn) {
self.infoRail.type = 2;
[self selectbtnImg:btn :self.yuanBtn];
// if (self.railModel.boundaryCoordinates.count > 0)
// {
// [self.addressBtn setTitle:self.railModel.address forState:0];
// [self.addressBtn setTitleColor:KKTextBlackColor forState:0];
// }
// else
// {
// [self.addressBtn setTitle:@"请设置详细地址" forState:0];
// [self.addressBtn setTitleColor:KKGrey121 forState:0];
// }
}];
self.duoBtn = duoBtn;
[cell.contentView addSubview:duoBtn];
@ -262,16 +252,6 @@ @@ -262,16 +252,6 @@
UIButton *yuanBtn = [UICommon ui_buttonSimple:CGRectZero font:Font_(14) normalColor:KKTextColor normalText:@" 圆形" click:^(UIButton *btn) {
self.infoRail.type = 1;
[self selectbtnImg:btn :self.duoBtn];
// if (self.railModel.lat.length > 0 && self.railModel.lon.length)
// {
// [self.addressBtn setTitle:self.railModel.address forState:0];
// [self.addressBtn setTitleColor:KKTextBlackColor forState:0];
// }
// else
// {
// [self.addressBtn setTitle:@"请设置详细地址" forState:0];
// [self.addressBtn setTitleColor:KKGrey121 forState:0];
// }
}];
self.yuanBtn = yuanBtn;
[cell.contentView addSubview:yuanBtn];
@ -309,14 +289,14 @@ @@ -309,14 +289,14 @@
-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{
UIStoryboard *sb = [UIStoryboard storyboardWithName:@"Main" bundle:nil];
if (indexPath.row == 0)
if (indexPath.row == 1)
{
//地址名称
RailADNameChooseVC *vc = [sb instantiateViewControllerWithIdentifier:@"RailADNameChooseVC"];
vc.infoRail = self.infoRail;
[self.navigationController pushViewController:vc animated:YES];
}
else if(indexPath.row == 1)
else if(indexPath.row == 2)
{
//地址
if (self.infoRail.type == 1)

2
tongxin/VC/Map/MoreRailAddressViewController.m

@ -524,4 +524,6 @@ @@ -524,4 +524,6 @@
}
@end

12
tongxin/VC/Map/RailListCell.m

@ -30,13 +30,13 @@ @@ -30,13 +30,13 @@
self.addressLabel.text = model.address;
self.ruleLabel.text = [NSString stringWithFormat:@"%@-%@,%@",model.starttime,model.endedtime,[myHelper getWeekDayStr:model.week]];
self.railRangeLabel.textColor = mainColor;
// if (model.type == 1)
if (model.type == 1)
self.railRangeLabel.attributedText = [self labelFontSize:[NSString stringWithFormat:@"圆形 安全范围:%@米",model.radius]];
// else
// {
// self.railRangeLabel.textColor = RGB(255, 173, 1);
// self.railRangeLabel.text = @"多边形";
// }
else
{
self.railRangeLabel.textColor = RGB(255, 173, 1);
self.railRangeLabel.text = @"多边形";
}
}

4
tongxin/xBase/Model/Rail.m

@ -21,8 +21,8 @@ @@ -21,8 +21,8 @@
}
+ (void)getObjsSuccess:(void (^)(NSMutableArray *arr))success
failure:(void (^)(NSError *error))failure{
NSString *urlStr = [MyHttp getURL:@"getway/devices/[imei]/rail"
objArr:@[cUser.cDevice]];
// NSString *urlStr = [MyHttp getURL:@"getway/devices/[imei]/rail" objArr:@[cUser.cDevice]];
NSString *urlStr = [MyHttp getURL:@"getway/devices/[imei]/railPolygon" objArr:@[cUser.cDevice]];
[xMyHttp URL:urlStr
method:@"GET" parameters:@{}
success:^(NSURLSessionDataTask *task, id responseObject)

Loading…
Cancel
Save