ray
/
zuoyebang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

打包所需修改

master
公司电脑 1 year ago
parent
2d937e90ac
commit
b3a9fbfc2c
55 changed files with 1928 additions and 1914 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      Pods/Headers/Private/AFNetworking/UIWebView+AFNetworking.h
  2. 1
      Pods/Headers/Public/AFNetworking/UIWebView+AFNetworking.h
  3. 24
      Pods/JLAuthorizationManager/JLAuthorizationManager/JLAuthorizationManager.h
  4. 228
      Pods/JLAuthorizationManager/JLAuthorizationManager/JLAuthorizationManager.m
  5. 2700
      Pods/Pods.xcodeproj/project.pbxproj
  6. 2
      TXNotificationSerExtension/NotificationService.h
  7. 2
      TXNotificationSerExtension/NotificationService.m
  8. 155
      tongxin.xcodeproj/project.pbxproj
  9. 2
      tongxin.xcodeproj/xcshareddata/xcschemes/yisai-LeKan.xcscheme
  10. BIN
      tongxin.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate
  11. 136
      tongxin.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  12. 198
      tongxin/AppDelegate.m
  13. 6
      tongxin/Assets.xcassets/newElectricity/Contents.json
  14. 10
      tongxin/Assets.xcassets/newElectricity/icon_home_electricity_0.imageset/Contents.json
  15. BIN
      tongxin/Assets.xcassets/newElectricity/icon_home_electricity_0.imageset/icon_home_electricity_0@2x.png
  16. BIN
      tongxin/Assets.xcassets/newElectricity/icon_home_electricity_0.imageset/icon_home_electricity_0@3x.png
  17. 10
      tongxin/Assets.xcassets/newElectricity/icon_home_electricity_100.imageset/Contents.json
  18. BIN
      tongxin/Assets.xcassets/newElectricity/icon_home_electricity_100.imageset/icon_home_electricity_100@2x.png
  19. BIN
      tongxin/Assets.xcassets/newElectricity/icon_home_electricity_100.imageset/icon_home_electricity_100@3x.png
  20. 4
      tongxin/Assets.xcassets/newElectricity/icon_home_electricity_20.imageset/Contents.json
  21. BIN
      tongxin/Assets.xcassets/newElectricity/icon_home_electricity_20.imageset/icon_home_electricity_20@2x.png
  22. BIN
      tongxin/Assets.xcassets/newElectricity/icon_home_electricity_20.imageset/icon_home_electricity_20@3x.png
  23. BIN
      tongxin/Assets.xcassets/newElectricity/icon_home_electricity_25.imageset/icon_home_electricity_25@2x.png
  24. BIN
      tongxin/Assets.xcassets/newElectricity/icon_home_electricity_25.imageset/icon_home_electricity_25@3x.png
  25. 10
      tongxin/Assets.xcassets/newElectricity/icon_home_electricity_40.imageset/Contents.json
  26. BIN
      tongxin/Assets.xcassets/newElectricity/icon_home_electricity_40.imageset/icon_home_electricity_40@2x.png
  27. BIN
      tongxin/Assets.xcassets/newElectricity/icon_home_electricity_40.imageset/icon_home_electricity_40@3x.png
  28. BIN
      tongxin/Assets.xcassets/newElectricity/icon_home_electricity_50.imageset/icon_home_electricity_50@2x.png
  29. BIN
      tongxin/Assets.xcassets/newElectricity/icon_home_electricity_50.imageset/icon_home_electricity_50@3x.png
  30. 10
      tongxin/Assets.xcassets/newElectricity/icon_home_electricity_60.imageset/Contents.json
  31. BIN
      tongxin/Assets.xcassets/newElectricity/icon_home_electricity_60.imageset/icon_home_electricity_60@2x.png
  32. BIN
      tongxin/Assets.xcassets/newElectricity/icon_home_electricity_60.imageset/icon_home_electricity_60@3x.png
  33. BIN
      tongxin/Assets.xcassets/newElectricity/icon_home_electricity_75.imageset/icon_home_electricity_75@2x.png
  34. BIN
      tongxin/Assets.xcassets/newElectricity/icon_home_electricity_75.imageset/icon_home_electricity_75@3x.png
  35. 22
      tongxin/Assets.xcassets/newElectricity/icon_home_electricity_80.imageset/Contents.json
  36. BIN
      tongxin/Assets.xcassets/newElectricity/icon_home_electricity_80.imageset/icon_home_electricity_80@2x.png
  37. BIN
      tongxin/Assets.xcassets/newElectricity/icon_home_electricity_80.imageset/icon_home_electricity_80@3x.png
  38. 3
      tongxin/Helpers/MQTT/MyMQTT.h
  39. 30
      tongxin/Info.plist
  40. 4
      tongxin/ThirdPartyLib/MessageDisplayKit/Classes/Views/MessageContentViews/XHMessageBubbleView.m
  41. 36
      tongxin/VC/HomeMeg/Chat/ChatPresenter.m
  42. 2
      tongxin/VC/HomeMeg/Chat/ChatViewController.m
  43. 18
      tongxin/VC/HomeMeg/HomeMessageViewController.m
  44. 6
      tongxin/VC/HomeMeg/View/HomeMsgTableViewCell.m
  45. 2
      tongxin/VC/HomeMeg/View/UICommon.h
  46. 23
      tongxin/VC/HomeMeg/View/UICommon.m
  47. 25
      tongxin/VC/Map/MapViewController.m
  48. 4
      tongxin/VC/WatchHome/DeviceInfo/CallVideo/Agora/CallViewController.m
  49. 24
      tongxin/VC/WatchHome/DeviceInfo/SelectContactVC.m
  50. 19
      tongxin/VC/WatchHome/NewHomeVC/WatchHomeDevMainCell.m
  51. 13
      tongxin/VC/WatchHome/View/WatchHomeHeaderView.m
  52. 4
      tongxin/tongxin.entitlements

1
Pods/Headers/Private/AFNetworking/UIWebView+AFNetworking.h generated
Unescape View File

@ -1 +0,0 @@ @@ -1 +0,0 @@
../../../AFNetworking/UIKit+AFNetworking/UIWebView+AFNetworking.h

1
Pods/Headers/Public/AFNetworking/UIWebView+AFNetworking.h generated
Unescape View File

@ -1 +0,0 @@ @@ -1 +0,0 @@
../../../AFNetworking/UIKit+AFNetworking/UIWebView+AFNetworking.h

24
Pods/JLAuthorizationManager/JLAuthorizationManager/JLAuthorizationManager.h generated
Unescape View File

@ -82,16 +82,16 @@ typedef NS_ENUM(NSInteger, JLAuthorizationType) { @@ -82,16 +82,16 @@ typedef NS_ENUM(NSInteger, JLAuthorizationType) {
authorizedHandler:(void(^)())authorizedHandler
unAuthorizedHandler:(void(^)())unAuthorizedHandler;
/**
请求健康数据权限统一入口
@param typesToShare 共享/写入共享数据类型集合
@param typesToRead 读入共享数据类型集合
@param authorizedHandler 授权后的回调
@param unAuthorizedHandler 未授权的回调
*/
- (void)JL_requestHealthAuthorizationWithShareTypes:(NSSet*)typesToShare
readTypes:(NSSet*)typesToRead
authorizedHandler:(void(^)())authorizedHandler
unAuthorizedHandler:(void(^)())unAuthorizedHandler;
///**
// 请求健康数据权限统一入口
//
// @param typesToShare 共享/写入共享数据类型集合
// @param typesToRead 读入共享数据类型集合
// @param authorizedHandler 授权后的回调
// @param unAuthorizedHandler 未授权的回调
// */
//- (void)JL_requestHealthAuthorizationWithShareTypes:(NSSet*)typesToShare
// readTypes:(NSSet*)typesToRead
// authorizedHandler:(void(^)())authorizedHandler
// unAuthorizedHandler:(void(^)())unAuthorizedHandler;
@end

228
Pods/JLAuthorizationManager/JLAuthorizationManager/JLAuthorizationManager.m generated
Unescape View File

@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
@import CoreLocation;
@import MediaPlayer;
@import Speech;//Xcode 8.0 or later
@import HealthKit;
//@import HealthKit;
@import Intents;
@import CoreBluetooth;
@ -30,102 +30,102 @@ @@ -30,102 +30,102 @@
#define IOS9 ([[[UIDevice currentDevice] systemVersion] doubleValue] >= 9.0)
#define IOS10 ([[[UIDevice currentDevice] systemVersion] doubleValue] >= 10.0)
@interface JLAuthorizationHealthManager : NSObject
- (void)JL_requestHealthAuthorizationWithShareTypes:(nullable NSSet<HKSampleType *> *)typesToShare
readTypes:(nullable NSSet<HKObjectType *> *)typesToRead
authorizedHandler:(void(^)())authorizedHandler
unAuthorizedHandler:(void(^)())unAuthorizedHandler;
@end
@implementation JLAuthorizationHealthManager
- (void)JL_requestHealthAuthorizationWithShareTypes:(nullable NSSet<HKSampleType *> *)typesToShare
readTypes:(nullable NSSet<HKObjectType *> *)typesToRead
authorizedHandler:(void(^)())authorizedHandler
unAuthorizedHandler:(void(^)())unAuthorizedHandler{
HKHealthStore *healthStore = [[HKHealthStore alloc] init];
__block BOOL shouldRequestAccess = NO;
if (typesToShare.count > 0) {
[typesToShare enumerateObjectsUsingBlock:^(HKObjectType * _Nonnull type, BOOL * _Nonnull stop) {
HKAuthorizationStatus authStatus = [healthStore authorizationStatusForType:type];
if (authStatus == HKAuthorizationStatusNotDetermined) {
shouldRequestAccess = YES;
*stop = YES;
}
}];
}else{
if (typesToRead.count > 0) {
[typesToRead enumerateObjectsUsingBlock:^(HKObjectType * _Nonnull type, BOOL * _Nonnull stop) {
HKAuthorizationStatus authStatus = [healthStore authorizationStatusForType:type];
if (authStatus == HKAuthorizationStatusNotDetermined) {
shouldRequestAccess = YES;
*stop = YES;
}
}];
}else{
NSAssert(!(typesToRead.count > 0), @"待请求的权限类型数组不能为空");
}
}
if (shouldRequestAccess) {
[healthStore requestAuthorizationToShareTypes:typesToShare readTypes:typesToRead completion:^(BOOL success, NSError * _Nullable error) {
if (success) {
dispatch_async(dispatch_get_main_queue(), ^{
authorizedHandler ? authorizedHandler() : nil;
});
}else{
dispatch_async(dispatch_get_main_queue(), ^{
unAuthorizedHandler ? unAuthorizedHandler() : nil;
});
}
}];
}else{
__block BOOL isAuthorized = NO;
if (typesToShare.count > 0) {
[typesToShare enumerateObjectsUsingBlock:^(HKSampleType * _Nonnull type, BOOL * _Nonnull stop) {
HKAuthorizationStatus authStatus = [healthStore authorizationStatusForType:type];
if (authStatus == HKAuthorizationStatusNotDetermined
|| authStatus == HKAuthorizationStatusSharingDenied) {
isAuthorized = NO;
}else{
isAuthorized = YES;
}
}];
}else{
if (typesToRead.count > 0) {
[typesToRead enumerateObjectsUsingBlock:^(HKObjectType * _Nonnull type, BOOL * _Nonnull stop) {
HKAuthorizationStatus authStatus = [healthStore authorizationStatusForType:type];
if (authStatus == HKAuthorizationStatusNotDetermined
|| authStatus == HKAuthorizationStatusSharingDenied) {
isAuthorized = NO;
}else{
isAuthorized = YES;
}
}];
}else{
NSAssert(!(typesToRead.count > 0), @"待请求的权限类型数组不能为空");
}
}
if (isAuthorized) {
authorizedHandler ? authorizedHandler() : nil;
}else{
unAuthorizedHandler ? unAuthorizedHandler() : nil;
}
}
}
@end
//@interface JLAuthorizationHealthManager : NSObject
//
//- (void)JL_requestHealthAuthorizationWithShareTypes:(nullable NSSet<HKSampleType *> *)typesToShare
// readTypes:(nullable NSSet<HKObjectType *> *)typesToRead
// authorizedHandler:(void(^)())authorizedHandler
// unAuthorizedHandler:(void(^)())unAuthorizedHandler;
//@end
//
//@implementation JLAuthorizationHealthManager
//
//- (void)JL_requestHealthAuthorizationWithShareTypes:(nullable NSSet<HKSampleType *> *)typesToShare
// readTypes:(nullable NSSet<HKObjectType *> *)typesToRead
// authorizedHandler:(void(^)())authorizedHandler
// unAuthorizedHandler:(void(^)())unAuthorizedHandler{
//
// HKHealthStore *healthStore = [[HKHealthStore alloc] init];
// __block BOOL shouldRequestAccess = NO;
// if (typesToShare.count > 0) {
//
// [typesToShare enumerateObjectsUsingBlock:^(HKObjectType * _Nonnull type, BOOL * _Nonnull stop) {
// HKAuthorizationStatus authStatus = [healthStore authorizationStatusForType:type];
// if (authStatus == HKAuthorizationStatusNotDetermined) {
// shouldRequestAccess = YES;
// *stop = YES;
// }
// }];
//
// }else{
// if (typesToRead.count > 0) {
//
// [typesToRead enumerateObjectsUsingBlock:^(HKObjectType * _Nonnull type, BOOL * _Nonnull stop) {
// HKAuthorizationStatus authStatus = [healthStore authorizationStatusForType:type];
// if (authStatus == HKAuthorizationStatusNotDetermined) {
// shouldRequestAccess = YES;
// *stop = YES;
// }
// }];
//
//
// }else{
// NSAssert(!(typesToRead.count > 0), @"待请求的权限类型数组不能为空");
// }
// }
//
// if (shouldRequestAccess) {
// [healthStore requestAuthorizationToShareTypes:typesToShare readTypes:typesToRead completion:^(BOOL success, NSError * _Nullable error) {
// if (success) {
// dispatch_async(dispatch_get_main_queue(), ^{
// authorizedHandler ? authorizedHandler() : nil;
// });
// }else{
// dispatch_async(dispatch_get_main_queue(), ^{
// unAuthorizedHandler ? unAuthorizedHandler() : nil;
// });
// }
// }];
// }else{
// __block BOOL isAuthorized = NO;
// if (typesToShare.count > 0) {
// [typesToShare enumerateObjectsUsingBlock:^(HKSampleType * _Nonnull type, BOOL * _Nonnull stop) {
// HKAuthorizationStatus authStatus = [healthStore authorizationStatusForType:type];
// if (authStatus == HKAuthorizationStatusNotDetermined
// || authStatus == HKAuthorizationStatusSharingDenied) {
// isAuthorized = NO;
// }else{
// isAuthorized = YES;
// }
// }];
// }else{
// if (typesToRead.count > 0) {
//
// [typesToRead enumerateObjectsUsingBlock:^(HKObjectType * _Nonnull type, BOOL * _Nonnull stop) {
// HKAuthorizationStatus authStatus = [healthStore authorizationStatusForType:type];
// if (authStatus == HKAuthorizationStatusNotDetermined
// || authStatus == HKAuthorizationStatusSharingDenied) {
// isAuthorized = NO;
// }else{
// isAuthorized = YES;
// }
// }];
//
// }else{
// NSAssert(!(typesToRead.count > 0), @"待请求的权限类型数组不能为空");
// }
// }
//
// if (isAuthorized) {
// authorizedHandler ? authorizedHandler() : nil;
// }else{
// unAuthorizedHandler ? unAuthorizedHandler() : nil;
// }
//
// }
//
//}
//@end
@interface JLAuthorizationManager ()<CLLocationManagerDelegate>
@ -226,19 +226,19 @@ @@ -226,19 +226,19 @@
}
}
- (void)JL_requestHealthAuthorizationWithShareTypes:(NSSet*)typesToShare
readTypes:(NSSet*)typesToRead
authorizedHandler:(void(^)())authorizedHandler
unAuthorizedHandler:(void(^)())unAuthorizedHandler{
JLAuthorizationHealthManager *healthManager = [JLAuthorizationHealthManager new];
[healthManager JL_requestHealthAuthorizationWithShareTypes:typesToShare
readTypes:typesToRead
authorizedHandler:authorizedHandler
unAuthorizedHandler:unAuthorizedHandler];
}
//- (void)JL_requestHealthAuthorizationWithShareTypes:(NSSet*)typesToShare
// readTypes:(NSSet*)typesToRead
// authorizedHandler:(void(^)())authorizedHandler
// unAuthorizedHandler:(void(^)())unAuthorizedHandler{
//
// JLAuthorizationHealthManager *healthManager = [JLAuthorizationHealthManager new];
// [healthManager JL_requestHealthAuthorizationWithShareTypes:typesToShare
// readTypes:typesToRead
// authorizedHandler:authorizedHandler
// unAuthorizedHandler:unAuthorizedHandler];
//
//
//}
#pragma mark - Photo Library
- (void)p_requestPhotoLibraryAccessWithAuthorizedHandler:(void(^)())authorizedHandler
@ -562,10 +562,10 @@ @@ -562,10 +562,10 @@
}*/
}
#pragma mark - Health
- (void)p_requestHealthAccessWithAuthorizedHandler:(void(^)())authorizedHandler
unAuthorizedHandler:(void(^)())unAuthorizedHandler{
}
//#pragma mark - Health
//- (void)p_requestHealthAccessWithAuthorizedHandler:(void(^)())authorizedHandler
// unAuthorizedHandler:(void(^)())unAuthorizedHandler{
//}
#pragma mark - Siri
- (void)p_requestSiriAccessWithAuthorizedHandler:(void(^)())authorizedHandler
unAuthorizedHandler:(void(^)())unAuthorizedHandler{

2700
Pods/Pods.xcodeproj/project.pbxproj generated
View File

File diff suppressed because it is too large Load Diff

2
TXNotificationSerExtension/NotificationService.h
Unescape View File

@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
// NotificationService.h
// TXNotificationSerExtension
//
// Created by ecell on 2023/5/12.
// Created by ecell on 2023/8/18.
// Copyright © 2023 xTT. All rights reserved.
//

2
TXNotificationSerExtension/NotificationService.m
Unescape View File

@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
// NotificationService.m
// TXNotificationSerExtension
//
// Created by ecell on 2023/5/12.
// Created by ecell on 2023/8/18.
// Copyright © 2023 xTT. All rights reserved.
//

155
tongxin.xcodeproj/project.pbxproj
Unescape View File

@ -7,7 +7,6 @@ @@ -7,7 +7,6 @@
objects = {
/* Begin PBXBuildFile section */
181B0B33223F85EB000C549D /* libsqlite3.0.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 181B0B32223F85EB000C549D /* libsqlite3.0.tbd */; };
181B0B35223F85FC000C549D /* libxml2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 181B0B34223F85FC000C549D /* libxml2.tbd */; };
182BBFA923BDCEB5007DC162 /* CallViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 182BBFA723BDCEB3007DC162 /* CallViewController.m */; };
182BBFAF23BDD322007DC162 /* AgoraConfigModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 182BBFAD23BDD31F007DC162 /* AgoraConfigModel.m */; };
@ -111,7 +110,6 @@ @@ -111,7 +110,6 @@
393CF5BB1F22034700C8DF60 /* libicucore.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 393CF5BA1F22034700C8DF60 /* libicucore.tbd */; };
393CF5BD1F22035200C8DF60 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 393CF5BC1F22035200C8DF60 /* libz.tbd */; };
393CF5C11F22036300C8DF60 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 393CF5C01F22036300C8DF60 /* JavaScriptCore.framework */; };
393CF5C31F22037400C8DF60 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 393CF5C21F22037400C8DF60 /* libsqlite3.tbd */; };
393CF7351F2319F600BAED0C /* DMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 393CF7341F2319F600BAED0C /* DMessage.m */; };
393CF7381F23242200BAED0C /* Photo.m in Sources */ = {isa = PBXBuildFile; fileRef = 393CF7371F23242200BAED0C /* Photo.m */; };
393CF73B1F23441500BAED0C /* Step.m in Sources */ = {isa = PBXBuildFile; fileRef = 393CF73A1F23441500BAED0C /* Step.m */; };
@ -442,8 +440,6 @@ @@ -442,8 +440,6 @@
615AB7332A7B559B000D5BC1 /* SGPermission.m in Sources */ = {isa = PBXBuildFile; fileRef = 615AB7232A7B559A000D5BC1 /* SGPermission.m */; };
615AB7342A7B559B000D5BC1 /* SGPermissionPhoto.m in Sources */ = {isa = PBXBuildFile; fileRef = 615AB7242A7B559A000D5BC1 /* SGPermissionPhoto.m */; };
615AB7372A80EC95000D5BC1 /* videoDevCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 615AB7362A80EC95000D5BC1 /* videoDevCollectionViewCell.m */; };
615CBC842A0DE1A4007AC03C /* NotificationService.m in Sources */ = {isa = PBXBuildFile; fileRef = 615CBC832A0DE1A4007AC03C /* NotificationService.m */; };
615CBC882A0DE1A4007AC03C /* TXNotificationSerExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 615CBC802A0DE1A4007AC03C /* TXNotificationSerExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
6160656B29FA0B570027FA41 /* MyTableViewCollectionCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 6160656A29FA0B570027FA41 /* MyTableViewCollectionCell.m */; };
6166D8782808FE74004353CE /* FWorkSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6166D8772808FE74004353CE /* FWorkSDK.framework */; };
61687B3E274E154B000CAC38 /* GWPCourseListView.m in Sources */ = {isa = PBXBuildFile; fileRef = 61687B3C274E154B000CAC38 /* GWPCourseListView.m */; };
@ -823,6 +819,8 @@ @@ -823,6 +819,8 @@
61A5FC3C2744D28100C9E5B7 /* StudentInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 61A5FC3B2744D28100C9E5B7 /* StudentInfoModel.m */; };
61ABD34F2A04DD040017EF5C /* TabBarVideoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61ABD34E2A04DD040017EF5C /* TabBarVideoViewController.m */; };
61ABD3522A04F1E20017EF5C /* VideoTabPopView.m in Sources */ = {isa = PBXBuildFile; fileRef = 61ABD3512A04F1E20017EF5C /* VideoTabPopView.m */; };
61AD09CC2A8F5376005C3A0A /* NotificationService.m in Sources */ = {isa = PBXBuildFile; fileRef = 61AD09CB2A8F5376005C3A0A /* NotificationService.m */; };
61AD09D02A8F5376005C3A0A /* TXNotificationSerExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 61AD09C82A8F5375005C3A0A /* TXNotificationSerExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
61B111052A20A80100C622B4 /* CommonPopView.m in Sources */ = {isa = PBXBuildFile; fileRef = 61B111042A20A80100C622B4 /* CommonPopView.m */; };
61B44109292DB04C00BB9EC7 /* jjcdViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61B44108292DB04C00BB9EC7 /* jjcdViewController.m */; };
61BBEF8D29F7BF8300294BEE /* NSArray+YYAdd.m in Sources */ = {isa = PBXBuildFile; fileRef = 61BBEF7129F7BF8300294BEE /* NSArray+YYAdd.m */; };
@ -902,11 +900,11 @@ @@ -902,11 +900,11 @@
remoteGlobalIDString = 3999D8FF1F0A32F000508F2B;
remoteInfo = tongxin;
};
615CBC862A0DE1A4007AC03C /* PBXContainerItemProxy */ = {
61AD09CE2A8F5376005C3A0A /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 3999D8F81F0A32F000508F2B /* Project object */;
proxyType = 1;
remoteGlobalIDString = 615CBC7F2A0DE1A4007AC03C;
remoteGlobalIDString = 61AD09C72A8F5374005C3A0A;
remoteInfo = TXNotificationSerExtension;
};
/* End PBXContainerItemProxy section */
@ -918,7 +916,7 @@ @@ -918,7 +916,7 @@
dstPath = "";
dstSubfolderSpec = 13;
files = (
615CBC882A0DE1A4007AC03C /* TXNotificationSerExtension.appex in Embed App Extensions */,
61AD09D02A8F5376005C3A0A /* TXNotificationSerExtension.appex in Embed App Extensions */,
);
name = "Embed App Extensions";
runOnlyForDeploymentPostprocessing = 0;
@ -939,7 +937,6 @@ @@ -939,7 +937,6 @@
0655C4CBBAA6999C4B67B5FD /* Pods-tongxin.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-tongxin.debug.xcconfig"; path = "Pods/Target Support Files/Pods-tongxin/Pods-tongxin.debug.xcconfig"; sourceTree = "<group>"; };
090D7EA3FBF6B1457855475D /* Pods-tongxin-tongxinUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-tongxin-tongxinUITests.release.xcconfig"; path = "Pods/Target Support Files/Pods-tongxin-tongxinUITests/Pods-tongxin-tongxinUITests.release.xcconfig"; sourceTree = "<group>"; };
1117A390A8B9211295876F97 /* libPods-tongxinTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-tongxinTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
181B0B32223F85EB000C549D /* libsqlite3.0.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.0.tbd; path = usr/lib/libsqlite3.0.tbd; sourceTree = SDKROOT; };
181B0B34223F85FC000C549D /* libxml2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libxml2.tbd; path = usr/lib/libxml2.tbd; sourceTree = SDKROOT; };
182BBFA723BDCEB3007DC162 /* CallViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CallViewController.m; sourceTree = "<group>"; };
182BBFA823BDCEB5007DC162 /* CallViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CallViewController.h; sourceTree = "<group>"; };
@ -1114,7 +1111,6 @@ @@ -1114,7 +1111,6 @@
393CF5BA1F22034700C8DF60 /* libicucore.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libicucore.tbd; path = usr/lib/libicucore.tbd; sourceTree = SDKROOT; };
393CF5BC1F22035200C8DF60 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
393CF5C01F22036300C8DF60 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
393CF5C21F22037400C8DF60 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; };
393CF7331F2319F600BAED0C /* DMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DMessage.h; sourceTree = "<group>"; };
393CF7341F2319F600BAED0C /* DMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DMessage.m; sourceTree = "<group>"; };
393CF7361F23242200BAED0C /* Photo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Photo.h; sourceTree = "<group>"; };
@ -1752,10 +1748,6 @@ @@ -1752,10 +1748,6 @@
615AB7282A7B559A000D5BC1 /* SGQRCodeLog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SGQRCodeLog.h; sourceTree = "<group>"; };
615AB7352A80EC95000D5BC1 /* videoDevCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = videoDevCollectionViewCell.h; sourceTree = "<group>"; };
615AB7362A80EC95000D5BC1 /* videoDevCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = videoDevCollectionViewCell.m; sourceTree = "<group>"; };
615CBC802A0DE1A4007AC03C /* TXNotificationSerExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = TXNotificationSerExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
615CBC822A0DE1A4007AC03C /* NotificationService.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NotificationService.h; sourceTree = "<group>"; };
615CBC832A0DE1A4007AC03C /* NotificationService.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NotificationService.m; sourceTree = "<group>"; };
615CBC852A0DE1A4007AC03C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
6160656929FA0B570027FA41 /* MyTableViewCollectionCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MyTableViewCollectionCell.h; sourceTree = "<group>"; };
6160656A29FA0B570027FA41 /* MyTableViewCollectionCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MyTableViewCollectionCell.m; sourceTree = "<group>"; };
6166D8772808FE74004353CE /* FWorkSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = FWorkSDK.framework; sourceTree = "<group>"; };
@ -2334,6 +2326,10 @@ @@ -2334,6 +2326,10 @@
61ABD34E2A04DD040017EF5C /* TabBarVideoViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TabBarVideoViewController.m; sourceTree = "<group>"; };
61ABD3502A04F1E20017EF5C /* VideoTabPopView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VideoTabPopView.h; sourceTree = "<group>"; };
61ABD3512A04F1E20017EF5C /* VideoTabPopView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VideoTabPopView.m; sourceTree = "<group>"; };
61AD09C82A8F5375005C3A0A /* TXNotificationSerExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = TXNotificationSerExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
61AD09CA2A8F5376005C3A0A /* NotificationService.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NotificationService.h; sourceTree = "<group>"; };
61AD09CB2A8F5376005C3A0A /* NotificationService.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NotificationService.m; sourceTree = "<group>"; };
61AD09CD2A8F5376005C3A0A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
61B111032A20A80100C622B4 /* CommonPopView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CommonPopView.h; sourceTree = "<group>"; };
61B111042A20A80100C622B4 /* CommonPopView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CommonPopView.m; sourceTree = "<group>"; };
61B44107292DB04C00BB9EC7 /* jjcdViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = jjcdViewController.h; sourceTree = "<group>"; };
@ -2481,9 +2477,7 @@ @@ -2481,9 +2477,7 @@
1840B9EA2323C59A00A28126 /* libzmf.a in Frameworks */,
3C6CC02621941D65004D2A19 /* WebKit.framework in Frameworks */,
181B0B35223F85FC000C549D /* libxml2.tbd in Frameworks */,
181B0B33223F85EB000C549D /* libsqlite3.0.tbd in Frameworks */,
61F2760329A49C1B002C59AE /* JCSDKOC.framework in Frameworks */,
393CF5C31F22037400C8DF60 /* libsqlite3.tbd in Frameworks */,
393CF5BB1F22034700C8DF60 /* libicucore.tbd in Frameworks */,
393CF5AB1F22030900C8DF60 /* MOBFoundation.framework in Frameworks */,
3953DBDA1F2F0A3F00162E9E /* MapKit.framework in Frameworks */,
@ -2510,7 +2504,7 @@ @@ -2510,7 +2504,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
615CBC7D2A0DE1A4007AC03C /* Frameworks */ = {
61AD09C52A8F5374005C3A0A /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
@ -3381,7 +3375,7 @@ @@ -3381,7 +3375,7 @@
3999D91F1F0A32F100508F2B /* tongxinTests */,
3999D92A1F0A32F100508F2B /* tongxinUITests */,
18CEB34F23AB6C03001B4088 /* TXNotificationSerExtension */,
615CBC812A0DE1A4007AC03C /* TXNotificationSerExtension */,
61AD09C92A8F5376005C3A0A /* TXNotificationSerExtension */,
3999D9011F0A32F000508F2B /* Products */,
E786BB666B44E32B52F91AF5 /* Pods */,
CF817805513048587B286749 /* Frameworks */,
@ -3394,7 +3388,7 @@ @@ -3394,7 +3388,7 @@
3999D9001F0A32F000508F2B /* 作业帮手表.app */,
3999D91C1F0A32F100508F2B /* tongxinTests.xctest */,
3999D9271F0A32F100508F2B /* tongxinUITests.xctest */,
615CBC802A0DE1A4007AC03C /* TXNotificationSerExtension.appex */,
61AD09C82A8F5375005C3A0A /* TXNotificationSerExtension.appex */,
);
name = Products;
sourceTree = "<group>";
@ -4275,16 +4269,6 @@ @@ -4275,16 +4269,6 @@
path = Permission;
sourceTree = "<group>";
};
615CBC812A0DE1A4007AC03C /* TXNotificationSerExtension */ = {
isa = PBXGroup;
children = (
615CBC822A0DE1A4007AC03C /* NotificationService.h */,
615CBC832A0DE1A4007AC03C /* NotificationService.m */,
615CBC852A0DE1A4007AC03C /* Info.plist */,
);
path = TXNotificationSerExtension;
sourceTree = "<group>";
};
61687B3B274E154B000CAC38 /* GWPCourseListView */ = {
isa = PBXGroup;
children = (
@ -5333,6 +5317,16 @@ @@ -5333,6 +5317,16 @@
path = NewsTemplateImages;
sourceTree = "<group>";
};
61AD09C92A8F5376005C3A0A /* TXNotificationSerExtension */ = {
isa = PBXGroup;
children = (
61AD09CA2A8F5376005C3A0A /* NotificationService.h */,
61AD09CB2A8F5376005C3A0A /* NotificationService.m */,
61AD09CD2A8F5376005C3A0A /* Info.plist */,
);
path = TXNotificationSerExtension;
sourceTree = "<group>";
};
61BBEF6C29F7BF8300294BEE /* YYKit */ = {
isa = PBXGroup;
children = (
@ -5546,10 +5540,8 @@ @@ -5546,10 +5540,8 @@
1840B9EB2325F7CD00A28126 /* ReplayKit.framework */,
1840B9E52323BF5E00A28126 /* lib */,
181B0B34223F85FC000C549D /* libxml2.tbd */,
181B0B32223F85EB000C549D /* libsqlite3.0.tbd */,
3C6CC02521941D65004D2A19 /* WebKit.framework */,
3953DBD91F2F0A3F00162E9E /* MapKit.framework */,
393CF5C21F22037400C8DF60 /* libsqlite3.tbd */,
393CF5C01F22036300C8DF60 /* JavaScriptCore.framework */,
393CF5BC1F22035200C8DF60 /* libz.tbd */,
393CF5BA1F22034700C8DF60 /* libicucore.tbd */,
@ -5594,7 +5586,7 @@ @@ -5594,7 +5586,7 @@
buildRules = (
);
dependencies = (
615CBC872A0DE1A4007AC03C /* PBXTargetDependency */,
61AD09CF2A8F5376005C3A0A /* PBXTargetDependency */,
);
name = tongxin;
productName = tongxin;
@ -5641,13 +5633,13 @@ @@ -5641,13 +5633,13 @@
productReference = 3999D9271F0A32F100508F2B /* tongxinUITests.xctest */;
productType = "com.apple.product-type.bundle.ui-testing";
};
615CBC7F2A0DE1A4007AC03C /* TXNotificationSerExtension */ = {
61AD09C72A8F5374005C3A0A /* TXNotificationSerExtension */ = {
isa = PBXNativeTarget;
buildConfigurationList = 615CBC892A0DE1A5007AC03C /* Build configuration list for PBXNativeTarget "TXNotificationSerExtension" */;
buildConfigurationList = 61AD09D12A8F5379005C3A0A /* Build configuration list for PBXNativeTarget "TXNotificationSerExtension" */;
buildPhases = (
615CBC7C2A0DE1A4007AC03C /* Sources */,
615CBC7D2A0DE1A4007AC03C /* Frameworks */,
615CBC7E2A0DE1A4007AC03C /* Resources */,
61AD09C42A8F5374005C3A0A /* Sources */,
61AD09C52A8F5374005C3A0A /* Frameworks */,
61AD09C62A8F5374005C3A0A /* Resources */,
);
buildRules = (
);
@ -5655,7 +5647,7 @@ @@ -5655,7 +5647,7 @@
);
name = TXNotificationSerExtension;
productName = TXNotificationSerExtension;
productReference = 615CBC802A0DE1A4007AC03C /* TXNotificationSerExtension.appex */;
productReference = 61AD09C82A8F5375005C3A0A /* TXNotificationSerExtension.appex */;
productType = "com.apple.product-type.app-extension";
};
/* End PBXNativeTarget section */
@ -5670,9 +5662,9 @@ @@ -5670,9 +5662,9 @@
TargetAttributes = {
3999D8FF1F0A32F000508F2B = {
CreatedOnToolsVersion = 8.3.3;
DevelopmentTeam = Q4S877C83P;
DevelopmentTeam = 8P345JS8F2;
LastSwiftMigration = 0830;
ProvisioningStyle = Automatic;
ProvisioningStyle = Manual;
SystemCapabilities = {
com.apple.BackgroundModes = {
enabled = 1;
@ -5698,10 +5690,10 @@ @@ -5698,10 +5690,10 @@
ProvisioningStyle = Automatic;
TestTargetID = 3999D8FF1F0A32F000508F2B;
};
615CBC7F2A0DE1A4007AC03C = {
61AD09C72A8F5374005C3A0A = {
CreatedOnToolsVersion = 14.2;
DevelopmentTeam = Q4S877C83P;
ProvisioningStyle = Automatic;
DevelopmentTeam = 8P345JS8F2;
ProvisioningStyle = Manual;
};
};
};
@ -5725,7 +5717,7 @@ @@ -5725,7 +5717,7 @@
3999D8FF1F0A32F000508F2B /* tongxin */,
3999D91B1F0A32F100508F2B /* tongxinTests */,
3999D9261F0A32F100508F2B /* tongxinUITests */,
615CBC7F2A0DE1A4007AC03C /* TXNotificationSerExtension */,
61AD09C72A8F5374005C3A0A /* TXNotificationSerExtension */,
);
};
/* End PBXProject section */
@ -6066,7 +6058,7 @@ @@ -6066,7 +6058,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
615CBC7E2A0DE1A4007AC03C /* Resources */ = {
61AD09C62A8F5374005C3A0A /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
@ -6867,11 +6859,11 @@ @@ -6867,11 +6859,11 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
615CBC7C2A0DE1A4007AC03C /* Sources */ = {
61AD09C42A8F5374005C3A0A /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
615CBC842A0DE1A4007AC03C /* NotificationService.m in Sources */,
61AD09CC2A8F5376005C3A0A /* NotificationService.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -6888,10 +6880,10 @@ @@ -6888,10 +6880,10 @@
target = 3999D8FF1F0A32F000508F2B /* tongxin */;
targetProxy = 3999D9281F0A32F100508F2B /* PBXContainerItemProxy */;
};
615CBC872A0DE1A4007AC03C /* PBXTargetDependency */ = {
61AD09CF2A8F5376005C3A0A /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 615CBC7F2A0DE1A4007AC03C /* TXNotificationSerExtension */;
targetProxy = 615CBC862A0DE1A4007AC03C /* PBXContainerItemProxy */;
target = 61AD09C72A8F5374005C3A0A /* TXNotificationSerExtension */;
targetProxy = 61AD09CE2A8F5376005C3A0A /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
@ -6978,6 +6970,7 @@ @@ -6978,6 +6970,7 @@
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
@ -7036,7 +7029,8 @@ @@ -7036,7 +7029,8 @@
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_IDENTITY = "Apple Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
@ -7067,11 +7061,14 @@ @@ -7067,11 +7061,14 @@
CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
CODE_SIGN_ENTITLEMENTS = tongxin/tongxin.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1.1;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = Q4S877C83P;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8P345JS8F2;
ENABLE_BITCODE = NO;
EXCLUDED_ARCHS = arm64;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/sdk",
@ -7166,6 +7163,7 @@ @@ -7166,6 +7163,7 @@
PRODUCT_NAME = "作业帮手表";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = watchReleaseProvisioning2;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
@ -7185,10 +7183,12 @@ @@ -7185,10 +7183,12 @@
CLANG_ENABLE_MODULES = YES;
CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
CODE_SIGN_ENTITLEMENTS = tongxin/tongxin.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = Q4S877C83P;
CODE_SIGN_IDENTITY = "Apple Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1.1;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8P345JS8F2;
ENABLE_BITCODE = NO;
EXCLUDED_ARCHS = "";
FRAMEWORK_SEARCH_PATHS = (
@ -7278,6 +7278,7 @@ @@ -7278,6 +7278,7 @@
PRODUCT_NAME = "作业帮手表";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = watchReleaseProvisioning2;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
@ -7293,11 +7294,14 @@ @@ -7293,11 +7294,14 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = tongxinTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.xTT.tongxinTests;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/tongxin.app/tongxin";
};
name = Debug;
@ -7308,11 +7312,14 @@ @@ -7308,11 +7312,14 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = tongxinTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.xTT.tongxinTests;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/tongxin.app/tongxin";
};
name = Release;
@ -7322,11 +7329,14 @@ @@ -7322,11 +7329,14 @@
baseConfigurationReference = 60C4B2399DD28887C9E0AFE9 /* Pods-tongxin-tongxinUITests.debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = tongxinUITests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.xTT.tongxinUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
TEST_TARGET_NAME = tongxin;
};
name = Debug;
@ -7336,25 +7346,30 @@ @@ -7336,25 +7346,30 @@
baseConfigurationReference = 090D7EA3FBF6B1457855475D /* Pods-tongxin-tongxinUITests.release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = tongxinUITests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.xTT.tongxinUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
TEST_TARGET_NAME = tongxin;
};
name = Release;
};
615CBC8A2A0DE1A5007AC03C /* Debug */ = {
61AD09D22A8F5379005C3A0A /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = Q4S877C83P;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8P345JS8F2;
GCC_C_LANGUAGE_STANDARD = gnu11;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = TXNotificationSerExtension/Info.plist;
@ -7366,22 +7381,26 @@ @@ -7366,22 +7381,26 @@
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.zuoyebang.iot.watch.TXNotificationSerExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = watchExtensionRelease;
SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
};
615CBC8B2A0DE1A5007AC03C /* Release */ = {
61AD09D32A8F5379005C3A0A /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_IDENTITY = "Apple Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = Q4S877C83P;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8P345JS8F2;
GCC_C_LANGUAGE_STANDARD = gnu11;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = TXNotificationSerExtension/Info.plist;
@ -7392,6 +7411,8 @@ @@ -7392,6 +7411,8 @@
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.zuoyebang.iot.watch.TXNotificationSerExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = watchExtensionRelease;
SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
TARGETED_DEVICE_FAMILY = "1,2";
@ -7437,11 +7458,11 @@ @@ -7437,11 +7458,11 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
615CBC892A0DE1A5007AC03C /* Build configuration list for PBXNativeTarget "TXNotificationSerExtension" */ = {
61AD09D12A8F5379005C3A0A /* Build configuration list for PBXNativeTarget "TXNotificationSerExtension" */ = {
isa = XCConfigurationList;
buildConfigurations = (
615CBC8A2A0DE1A5007AC03C /* Debug */,
615CBC8B2A0DE1A5007AC03C /* Release */,
61AD09D22A8F5379005C3A0A /* Debug */,
61AD09D32A8F5379005C3A0A /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;

2
tongxin.xcodeproj/xcshareddata/xcschemes/yisai-LeKan.xcscheme
Unescape View File

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

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

Binary file not shown.

136
tongxin.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
Unescape View File

@ -343,22 +343,6 @@ @@ -343,22 +343,6 @@
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "E8C221AF-F285-4462-8E94-6549BC3EC0BA"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "tongxin/AppDelegate.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "530"
endingLineNumber = "530"
landmarkName = "AppDelegate"
landmarkType = "3">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "7F936491-F3EA-4010-9C98-7520C9781BE6"
shouldBeEnabled = "No"
ignoreCount = "0"
@ -366,8 +350,8 @@ @@ -366,8 +350,8 @@
filePath = "tongxin/AppDelegate.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "809"
endingLineNumber = "809"
startingLineNumber = "773"
endingLineNumber = "773"
landmarkName = "-applicationWillEnterForeground:"
landmarkType = "7">
</BreakpointContent>
@ -375,38 +359,6 @@ @@ -375,38 +359,6 @@
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "6F828A69-1147-43DD-8FDD-4F7F7AB54537"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "tongxin/AppDelegate.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "274"
endingLineNumber = "274"
landmarkName = "-pushRegistry:didReceiveIncomingPushWithPayload:forType:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "EE909FE7-851E-4250-8AFB-EDDBBD27776F"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "tongxin/AppDelegate.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "252"
endingLineNumber = "252"
landmarkName = "-pushRegistry:didReceiveIncomingPushWithPayload:forType:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "A6BE533C-1A9E-430C-9616-74B67D6934F5"
shouldBeEnabled = "No"
ignoreCount = "0"
@ -446,8 +398,8 @@ @@ -446,8 +398,8 @@
filePath = "tongxin/AppDelegate.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "646"
endingLineNumber = "646"
startingLineNumber = "610"
endingLineNumber = "610"
landmarkName = "-handlePushMsg:"
landmarkType = "7">
</BreakpointContent>
@ -471,22 +423,6 @@ @@ -471,22 +423,6 @@
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "8832A44C-7255-4BD6-8CCD-128E1C7BEDEE"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "tongxin/xBase/Controller/baseViewController.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "195"
endingLineNumber = "195"
landmarkName = "-viewDidLoad"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "F453487D-7F47-4AEF-A8DD-BF28E3AA9448"
shouldBeEnabled = "No"
ignoreCount = "0"
@ -926,8 +862,8 @@ @@ -926,8 +862,8 @@
filePath = "tongxin/VC/Map/MapViewController.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1021"
endingLineNumber = "1021"
startingLineNumber = "1000"
endingLineNumber = "1000"
landmarkName = "-switchView"
landmarkType = "7">
</BreakpointContent>
@ -942,8 +878,8 @@ @@ -942,8 +878,8 @@
filePath = "tongxin/VC/Map/MapViewController.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "845"
endingLineNumber = "845"
startingLineNumber = "835"
endingLineNumber = "835"
landmarkName = "-subMsgView"
landmarkType = "7">
</BreakpointContent>
@ -1086,8 +1022,8 @@ @@ -1086,8 +1022,8 @@
filePath = "tongxin/ThirdPartyLib/MessageDisplayKit/Classes/Views/MessageContentViews/XHMessageBubbleView.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "570"
endingLineNumber = "570"
startingLineNumber = "574"
endingLineNumber = "574"
landmarkName = "-layoutSubviews"
landmarkType = "7">
</BreakpointContent>
@ -1422,8 +1358,8 @@ @@ -1422,8 +1358,8 @@
filePath = "tongxin/ThirdPartyLib/MessageDisplayKit/Classes/Views/MessageContentViews/XHMessageBubbleView.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "449"
endingLineNumber = "449"
startingLineNumber = "452"
endingLineNumber = "452"
landmarkName = "-initWithFrame:message:"
landmarkType = "7">
</BreakpointContent>
@ -1444,5 +1380,53 @@ @@ -1444,5 +1380,53 @@
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "2D430770-ACE4-4878-A32E-E8D43241688F"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "tongxin/VC/WatchHome/DeviceInfo/SelectContactVC.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "196"
endingLineNumber = "196"
landmarkName = "-rightBarItemClick"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "492708E9-6F1C-4543-9ED7-5CA5312E1644"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "tongxin/AppDelegate.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "541"
endingLineNumber = "541"
landmarkName = "-handlePushMsg:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "C7D57F59-163D-4135-9625-54713A40992A"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "tongxin/AppDelegate.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "575"
endingLineNumber = "575"
landmarkName = "-handlePushMsg:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>

198
tongxin/AppDelegate.m
Unescape View File

@ -246,33 +246,18 @@ @@ -246,33 +246,18 @@
NSDictionary *dataDic =[payload.dictionaryPayload objectForKey:@"data"];
NSString *NotificationType = dataDic[@"message"][@"type"];
int video_type = [dataDic[@"message"][@"video_type"] intValue];
if ([NotificationType isEqualToString:@"video"]) {
if ([NotificationType isEqualToString:@"video"])
{
NSMutableDictionary *mDic = [NSMutableDictionary dictionaryWithDictionary:payload.dictionaryPayload];
[mDic setValue:alertStr forKey:@"alertStr"];
[self setNotificationData:mDic];
// //MARK:收到视频消息,震动一下
// AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);//执行震动
// if([UIApplication sharedApplication].applicationState == UIApplicationStateActive){
// //判断如果是前台,推送通知
// [[NSNotificationCenter defaultCenter] postNotificationName:AccountMessageNotification object:dataDic userInfo:dataDic];
// if(self.backgroudMsg){
// [self cleanVideoNotification];
// self.backgroudMsg = nil;
// }
//
// }else{
// if (video_type == 4) { //如果是菊风视频
// //在后台,先不显示本地通知,发通知,登录SDK先,收到设备的拨打,判断还在后台再显示本地通知
// [self setNotificationData:payload.dictionaryPayload];
// }else{
// [self generateLocalNotificationsWithAlertStr:alertStr AndDataInfo:payload.dictionaryPayload];
// }
//
//
// }
}else if([NotificationType isEqualToString:@"unbind"]){
}
else if([NotificationType isEqualToString:@"unbind"])
{
[self setNotificationData:payload.dictionaryPayload];
}else{
}
else
{
xLog(@"其他VOIP推送的消息: %@",payload.dictionaryPayload);
// [UICommon MessageUpload:@""WithStatus:[NSString stringWithFormat:@"其他VOIP推送的消息: %@", payload.dictionaryPayload]];
AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);//执行震动
@ -463,51 +448,54 @@ @@ -463,51 +448,54 @@
}
-(void) setNotificationData:(NSDictionary*)userInfo{
-(void) setNotificationData:(NSDictionary*)userInfo
{
if(!userInfo){return;}
NSDictionary *dict = userInfo[@"data"];
if (userInfo[@"aps"]) {
if([dict[@"type"] isEqualToString: @"chatGroupMessage"]){ //群聊消息推送的问题
if(cUser.openid != nil ){
if ([cUser.openid isEqualToString:dict[@"message"][@"senderID"]]){
if (userInfo[@"aps"])
{
if([dict[@"type"] isEqualToString: @"chatGroupMessage"] || [dict[@"type"] isEqualToString: @"singleMessage"])
{ //群聊消息推送的问题
if(cUser.openid != nil )
{
if ([cUser.openid isEqualToString:dict[@"message"][@"senderID"]])
{
//如果是自己的消息静默处理
}else{
}
else
{
[[NSNotificationCenter defaultCenter] postNotificationName:dict[@"type"] object:dict];
//不是自己的消息
//首先先判断不在聊天界面
Circle* currentCircle = [cUser getCircleWithImei:cUser.cDevice.imei];
if(!currentCircle){
if(!currentCircle)
{
//清空推送角标
// [UIApplication sharedApplication].applicationIconBadgeNumber = 0;
// [UIApplication sharedApplication].applicationIconBadgeNumber = 0;
return;
}
//是否 同一个 群组id
if([dict[@"groupid"] isEqualToString:currentCircle.groupid]){
if([dict[@"groupid"] isEqualToString:currentCircle.groupid])
{
UITabBarController *tabBarVC = (UITabBarController*)self.window.rootViewController;
UINavigationController *navVC = (UINavigationController*)tabBarVC.selectedViewController;
if(navVC){
if(![navVC.visibleViewController isKindOfClass:[ChatViewController class]]){
AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);
// //如果是 iOS 10 以下的
// if([[[UIDevice currentDevice] systemVersion] doubleValue] < 10.0){
// AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);
// }
}
}
}else{
}
else
{
AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);
// //如果是 iOS 10 以下的
// if([[[UIDevice currentDevice] systemVersion] doubleValue] < 10.0){
// AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);
// }
}
}
}
[[NSNotificationCenter defaultCenter] postNotificationName:dict[@"type"] object:dict];
}else if([dict[@"type"] isEqualToString: @"accountMessage"]){
}
else if([dict[@"type"] isEqualToString: @"accountMessage"])
{
xLog(@"收到消息中心的消息推送");
//消息中心的数据
[[NSNotificationCenter defaultCenter] postNotificationName:AccountMessageNotification object:dict userInfo:dict];
@ -520,55 +508,6 @@ @@ -520,55 +508,6 @@
}
}
//// 在前台时推送消息才会调用的接口 ios 10 以上的新接口
//- (void)userNotificationCenter:(UNUserNotificationCenter *)center
// willPresentNotification:(UNNotification *)notification
// withCompletionHandler:(void (^)(UNNotificationPresentationOptions))completionHandler{
//
// xLog(@"Userinfo %@",notification.request.content.userInfo);
//
// [self setNotificationData:notification.request.content.userInfo];
// NSDictionary *dict = notification.request.content.userInfo[@"data"];
// //如果当前页面是聊天页面而且和当前的groupid相等 那就 清除当前的 群组的角标标记
// if([dict[@"type"] isEqualToString:@"chatGroupMessage"]){
// if(cUser.openid != nil ){
// //senderID 不同 震动
// if (![cUser.openid isEqualToString:dict[@"message"][@"senderID"]]){
// //获取当前圈子
// Circle* currentCircle = [cUser getCircleWithImei:cUser.cDevice.imei];
// if(!currentCircle){
// // //清空推送角标
// // [UIApplication sharedApplication].applicationIconBadgeNumber = 0;
// return;
// }
// //是否 同一个 群组id
// if([dict[@"groupid"] isEqualToString:currentCircle.groupid]){
// //同一个群组
// UITabBarController *tabBarVC = (UITabBarController*)self.window.rootViewController;
// UINavigationController *navVC = (UINavigationController*)tabBarVC.selectedViewController;
// if(navVC){
// if(![navVC.visibleViewController isKindOfClass:[ChatViewController class]]){
// //前台不是 聊天页面时震动
// AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);
// }else{
// //前台是聊天页面时 发送推送
// [self setNotificationData:notification.request.content.userInfo];
// }
// }
// }else{
// //不是同一群组 的震动就行无需发通知
// AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);
// }
// }
// }
// }else{
// [self setNotificationData:notification.request.content.userInfo];
// }
//
// // completionHandler(UNNotificationPresentationOptionBadge);
//}
/**
MARK: APP 挂后台的情况下 点击 通知栏跳转到响应页面
@ -585,7 +524,8 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response @@ -585,7 +524,8 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response
});
}
- (void)handlePushMsg:(NSDictionary *)infoData{
- (void)handlePushMsg:(NSDictionary *)infoData
{
xLog(@"Userinfo %@",infoData);
if(infoData.count == 0){
return;
@ -598,45 +538,69 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response @@ -598,45 +538,69 @@ 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 ){
if(cUser.openid != nil )
{
//senderID 不同 震动
if (![cUser.openid isEqualToString:dict[@"message"][@"senderID"]]){
if (![cUser.openid isEqualToString:dict[@"message"][@"senderID"]])
{
//不同账号的微聊消息,且不在聊天页面,手机震动
if(![navVC.visibleViewController isKindOfClass:[ChatViewController class]]){
AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);
}
AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);
NSString *groupid = dict[@"groupid"];
//不是同一群组 找到同一个群组并设置 主设备
for (Device* tempDevice in cUser.myDevices) {
//获取当前圈子
Circle* currentCircle = [cUser getCircleWithImei:tempDevice.imei];
if(!currentCircle){
return;
}
//是否 同一个 群组id
if([groupid isEqualToString:currentCircle.groupid]){
//同一个群组
cUser.cDevice = tempDevice;
break; //跳出循环
if([dict[@"type"] isEqualToString:@"chatGroupMessage"])
{
NSString *groupid = dict[@"groupid"];
//不是同一群组 找到同一个群组并设置 主设备
for (Device* tempDevice in cUser.myDevices) {
//获取当前圈子
Circle* currentCircle = [cUser getCircleWithImei:tempDevice.imei];
if(!currentCircle){
return;
}
//是否 同一个 群组id
if([groupid isEqualToString:currentCircle.groupid]){
//同一个群组
cUser.cDevice = tempDevice;
break; //跳出循环
}
}
}
// 跳转 聊天页面
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];
// vc.imei = model.imei;
vc.infoCircle = infoCircle;
}
[[UICommon currentVC].navigationController pushViewController:vc animated:YES];
}
}
}
}
}else{
}
else
{
//其他消息类型
NSDictionary *msgDic = dict[@"message"];
NSString * msgType = msgDic[@"type"];

6
tongxin/Assets.xcassets/newElectricity/Contents.json
Unescape View File

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
}

10
tongxin/Assets.xcassets/newElectricity/icon_home_electricity_0.imageset/Contents.json vendored
Unescape View File

@ -5,18 +5,18 @@ @@ -5,18 +5,18 @@
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "icon_home_electricity_0@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "icon_home_electricity_0@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
}

BIN
tongxin/Assets.xcassets/newElectricity/icon_home_electricity_0.imageset/icon_home_electricity_0@2x.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 395 B

After

Width:  |  Height:  |  Size: 333 B

BIN
tongxin/Assets.xcassets/newElectricity/icon_home_electricity_0.imageset/icon_home_electricity_0@3x.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 685 B

After

Width:  |  Height:  |  Size: 539 B

10
tongxin/Assets.xcassets/newElectricity/icon_home_electricity_100.imageset/Contents.json vendored
Unescape View File

@ -5,18 +5,18 @@ @@ -5,18 +5,18 @@
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "icon_home_electricity_100@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "icon_home_electricity_100@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
}

BIN
tongxin/Assets.xcassets/newElectricity/icon_home_electricity_100.imageset/icon_home_electricity_100@2x.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 451 B

After

Width:  |  Height:  |  Size: 365 B

BIN
tongxin/Assets.xcassets/newElectricity/icon_home_electricity_100.imageset/icon_home_electricity_100@3x.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 831 B

After

Width:  |  Height:  |  Size: 660 B

4
tongxin/Assets.xcassets/newElectricity/icon_home_electricity_50.imageset/Contents.json → tongxin/Assets.xcassets/newElectricity/icon_home_electricity_20.imageset/Contents.json vendored
Unescape View File

@ -5,12 +5,12 @@ @@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "icon_home_electricity_50@2x.png",
"filename" : "icon_home_electricity_20@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icon_home_electricity_50@3x.png",
"filename" : "icon_home_electricity_20@3x.png",
"idiom" : "universal",
"scale" : "3x"
}

BIN
tongxin/Assets.xcassets/newElectricity/icon_home_electricity_20.imageset/icon_home_electricity_20@2x.png vendored
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 351 B

BIN
tongxin/Assets.xcassets/newElectricity/icon_home_electricity_20.imageset/icon_home_electricity_20@3x.png vendored
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 588 B

BIN
tongxin/Assets.xcassets/newElectricity/icon_home_electricity_25.imageset/icon_home_electricity_25@2x.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 431 B

BIN
tongxin/Assets.xcassets/newElectricity/icon_home_electricity_25.imageset/icon_home_electricity_25@3x.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 749 B

10
tongxin/Assets.xcassets/newElectricity/icon_home_electricity_75.imageset/Contents.json → tongxin/Assets.xcassets/newElectricity/icon_home_electricity_40.imageset/Contents.json vendored
Unescape View File

@ -5,18 +5,18 @@ @@ -5,18 +5,18 @@
"scale" : "1x"
},
{
"filename" : "icon_home_electricity_40@2x.png",
"idiom" : "universal",
"filename" : "icon_home_electricity_75@2x.png",
"scale" : "2x"
},
{
"filename" : "icon_home_electricity_40@3x.png",
"idiom" : "universal",
"filename" : "icon_home_electricity_75@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
}

BIN
tongxin/Assets.xcassets/newElectricity/icon_home_electricity_40.imageset/icon_home_electricity_40@2x.png vendored
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 364 B

BIN
tongxin/Assets.xcassets/newElectricity/icon_home_electricity_40.imageset/icon_home_electricity_40@3x.png vendored
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 669 B

BIN
tongxin/Assets.xcassets/newElectricity/icon_home_electricity_50.imageset/icon_home_electricity_50@2x.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 455 B

BIN
tongxin/Assets.xcassets/newElectricity/icon_home_electricity_50.imageset/icon_home_electricity_50@3x.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 835 B

10
tongxin/Assets.xcassets/newElectricity/icon_home_electricity_25.imageset/Contents.json → tongxin/Assets.xcassets/newElectricity/icon_home_electricity_60.imageset/Contents.json vendored
Unescape View File

@ -5,18 +5,18 @@ @@ -5,18 +5,18 @@
"scale" : "1x"
},
{
"filename" : "icon_home_electricity_60@2x.png",
"idiom" : "universal",
"filename" : "icon_home_electricity_25@2x.png",
"scale" : "2x"
},
{
"filename" : "icon_home_electricity_60@3x.png",
"idiom" : "universal",
"filename" : "icon_home_electricity_25@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
}

BIN
tongxin/Assets.xcassets/newElectricity/icon_home_electricity_60.imageset/icon_home_electricity_60@2x.png vendored
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 370 B

BIN
tongxin/Assets.xcassets/newElectricity/icon_home_electricity_60.imageset/icon_home_electricity_60@3x.png vendored
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 665 B

BIN
tongxin/Assets.xcassets/newElectricity/icon_home_electricity_75.imageset/icon_home_electricity_75@2x.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 459 B

BIN
tongxin/Assets.xcassets/newElectricity/icon_home_electricity_75.imageset/icon_home_electricity_75@3x.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 481 B

22
tongxin/Assets.xcassets/newElectricity/icon_home_electricity_80.imageset/Contents.json vendored
Unescape View File

@ -0,0 +1,22 @@ @@ -0,0 +1,22 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "icon_home_electricity_80@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icon_home_electricity_80@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
tongxin/Assets.xcassets/newElectricity/icon_home_electricity_80.imageset/icon_home_electricity_80@2x.png vendored
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 367 B

BIN
tongxin/Assets.xcassets/newElectricity/icon_home_electricity_80.imageset/icon_home_electricity_80@3x.png vendored
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 665 B

3
tongxin/Helpers/MQTT/MyMQTT.h
Unescape View File

@ -24,7 +24,8 @@ @@ -24,7 +24,8 @@
#define PUSH_type_chatGroupEnter @"chatGroupEnter"//进入圈子
#define PUSH_type_chatGroupRemove @"chatGroupRemove"//用户离开聊天群
#define PUSH_type_chatGroupMessage @"chatGroupMessage"//新聊天消息到达
#define PUSH_type_chatGroupMessage @"chatGroupMessage"//新聊天消息到达(群聊)
#define PUSH_type_singleMessage @"singleMessage"//新聊天消息到达(单聊)
#define PUSH_type_chatGroupDisband @"chatGroupDisband"//聊天群解散

30
tongxin/Info.plist
Unescape View File

@ -66,36 +66,6 @@ @@ -66,36 +66,6 @@
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
<key>NSExceptionDomains</key>
<dict>
<key>http://39.108.227.227</key>
<dict>
<key>NSExceptionAllowInsecureHTTPLoads</key>
<true/>
<key>NSExceptionRequiresForwardSecrecy</key>
<false/>
<key>NSIncludesSubdomains</key>
<true/>
</dict>
<key>http://api.ecellsz.com</key>
<dict>
<key>NSExceptionAllowInsecureHTTPLoads</key>
<true/>
<key>NSExceptionRequiresForwardSecrecy</key>
<false/>
<key>NSIncludesSubdomains</key>
<true/>
</dict>
<key>http://iotcloud.anychat.cn</key>
<dict>
<key>NSExceptionAllowInsecureHTTPLoads</key>
<true/>
<key>NSExceptionRequiresForwardSecrecy</key>
<false/>
<key>NSIncludesSubdomains</key>
<true/>
</dict>
</dict>
</dict>
<key>NSAppleMusicUsageDescription</key>
<string>请为应用打开音乐库权限</string>

4
tongxin/ThirdPartyLib/MessageDisplayKit/Classes/Views/MessageContentViews/XHMessageBubbleView.m
Unescape View File

@ -292,6 +292,7 @@ @@ -292,6 +292,7 @@
if (currentType == XHBubbleMessageMediaTypeText) {
// 如果是文本消息，那文本消息的控件需要显示
_displayTextView.hidden = NO;
_textLabel.hidden = NO;
if(message.bubbleMessageType == XHBubbleMessageTypeSending){
_displayTextView.textColor = KKClearColor;
}else{
@ -305,6 +306,7 @@ @@ -305,6 +306,7 @@
{
// 那如果不文本消息，必须把文本消息的控件隐藏了啊
_displayTextView.hidden = YES;
_textLabel.hidden = YES;
// 对语音消息的进行特殊处理，第三方表情可以直接利用背景气泡的ImageView控件
if (currentType == XHBubbleMessageMediaTypeVoice) {
@ -335,6 +337,7 @@ @@ -335,6 +337,7 @@
_geolocationsLabel.hidden = (currentType != XHBubbleMessageMediaTypeLocalPosition);
// 那其他的控件都必须隐藏
_textLabel.hidden = YES;
_displayTextView.hidden = YES;
_bubbleImageView.hidden = YES;
_animationVoiceImageView.hidden = YES;
@ -532,6 +535,7 @@ @@ -532,6 +535,7 @@
_message = nil;
_displayTextView = nil;
_textLabel = nil;
_bubbleImageView = nil;

36
tongxin/VC/HomeMeg/Chat/ChatPresenter.m
Unescape View File

@ -232,6 +232,42 @@ @@ -232,6 +232,42 @@
}];
[[NSNotificationCenter defaultCenter] addObserverForName:PUSH_type_singleMessage
object:nil
queue:[NSOperationQueue mainQueue]
usingBlock:^(NSNotification * _Nonnull note)
{
dispatch_async(dispatch_get_global_queue(0, 0), ^{
if ([note.object[@"imei"] isEqualToString:self.myVC.infoUser.cDevice.imei]) {
while (!self.isSended) {
[NSThread sleepForTimeInterval:0.3];
}
dispatch_async(dispatch_get_main_queue(), ^(void) {
NSArray *arr = [[self.myVC.messages reverseObjectEnumerator] allObjects];
__block BOOL hasMSG = NO;
[arr enumerateObjectsUsingBlock:^(XHMessage *obj, NSUInteger idx, BOOL * _Nonnull stop) {
if ([note.object[@"message"][@"id"] isEqualToString:obj.id]) {
hasMSG = YES;
*stop = YES;
}
}];
if (!hasMSG) {
XHMessage *messgae = [XHMessage mj_objectWithKeyValues:note.object[@"message"]];
baseModel *model = [self.myVC.infoCircle getObjWithID:messgae.senderID];
messgae.isRead = NO;
messgae.avatar = model.image;
messgae.avator = model.avator;
messgae.senderName = model.name;
messgae.shouldShowUserName = YES;
[self.myVC addMessage:messgae]; //添加数据
}
});
}
});
}];
// [[NSNotificationCenter defaultCenter] addObserver:self
// selector:@selector(oldTalkStatusWithAPNS:)
// name:xAPNS_talk_status

2
tongxin/VC/HomeMeg/Chat/ChatViewController.m
Unescape View File

@ -219,7 +219,7 @@ @@ -219,7 +219,7 @@
[self.messageTableView.mj_header beginRefreshing];
if (self.chatType == 222)
// if (self.chatType == 222)
[self presenterBlock];
[self clearCornerMark];

18
tongxin/VC/HomeMeg/HomeMessageViewController.m
Unescape View File

@ -80,6 +80,22 @@ @@ -80,6 +80,22 @@
}];
//MARK : 收到新的聊天消息推送
[[NSNotificationCenter defaultCenter] addObserverForName:PUSH_type_chatGroupMessage
object:nil
queue:[NSOperationQueue mainQueue]
usingBlock:^(NSNotification * _Nonnull note)
{
[weakSelf getModelList];
}];
[[NSNotificationCenter defaultCenter] addObserverForName:PUSH_type_singleMessage
object:nil
queue:[NSOperationQueue mainQueue]
usingBlock:^(NSNotification * _Nonnull note)
{
[weakSelf getModelList];
}];
}
- (CommonTableView *)homeTable
@ -91,7 +107,7 @@ @@ -91,7 +107,7 @@
HomeMsgTableViewCell *cell = (HomeMsgTableViewCell *)cells;
if(self.myDataSource.count == 1)
{
cell.layer.cornerRadius = 28;
cell.layer.cornerRadius = 12;
cell.layer.masksToBounds = YES;
}
else

6
tongxin/VC/HomeMeg/View/HomeMsgTableViewCell.m
Unescape View File

@ -53,6 +53,12 @@ @@ -53,6 +53,12 @@
if([dic[@"openid"] isEqualToString:listModel.message[@"senderID"]])
nameStr = [NSString stringWithFormat:@"%@：",dic[@"name"]];
}
for (NSDictionary *dic in listModel.devices)
{
NSString *avator = dic[@"avator"];
if(![avator isEqualToString:@"http://39.108.227.227/getway/devicesDownload/default.jpg"])
[avatorArr addObject:listModel.avator];
}
[self.iconImg dc_setImageAvatarWithGroupId:listModel.groupid Source:avatorArr];
}

2
tongxin/VC/HomeMeg/View/UICommon.h
Unescape View File

@ -366,7 +366,7 @@ void AfterDispatch(double delayInSeconds, dispatch_block_t _Nullable block); @@ -366,7 +366,7 @@ void AfterDispatch(double delayInSeconds, dispatch_block_t _Nullable block);
height:(CGFloat)height
align:(NSTextAlignment)align;
+ (NSString *)zifuchuantihuan:(NSString *)str;
+ (NSString *)dianliangImg:(NSInteger)battery;
@end

23
tongxin/VC/HomeMeg/View/UICommon.m
Unescape View File

@ -1430,15 +1430,22 @@ void AfterDispatch(double delayInSeconds, dispatch_block_t _Nullable block) { @@ -1430,15 +1430,22 @@ void AfterDispatch(double delayInSeconds, dispatch_block_t _Nullable block) {
}
+ (NSString *)zifuchuantihuan:(NSString *)str
+ (NSString *)dianliangImg:(NSInteger)battery
{
NSString *sds = [str stringByReplacingOccurrencesOfString:@"？" withString:@"?"];
sds = [sds stringByReplacingOccurrencesOfString:@"。" withString:@"."];
sds = [sds stringByReplacingOccurrencesOfString:@"！" withString:@"!"];
sds = [sds stringByReplacingOccurrencesOfString:@"，" withString:@","];
sds = [sds stringByReplacingOccurrencesOfString:@"；" withString:@";"];
sds = [sds stringByReplacingOccurrencesOfString:@"：" withString:@":"];
return sds;
NSString *imageName;
if(battery < 10)
imageName = @"icon_home_electricity_0";
else if (battery >= 10 && battery < 29)
imageName = @"icon_home_electricity_20";
else if (battery >= 29 && battery < 48)
imageName = @"icon_home_electricity_40";
else if (battery >= 48 && battery < 67)
imageName = @"icon_home_electricity_60";
else if (battery >= 67 && battery < 86)
imageName = @"icon_home_electricity_80";
else
imageName = @"icon_home_electricity_100";
return imageName;
}
@end

25
tongxin/VC/Map/MapViewController.m
Unescape View File

@ -350,23 +350,13 @@ @@ -350,23 +350,13 @@
- (void)setBattery:(int)battery
{
// 电量
NSString *imageName = @"icon_home_electricity_50";
self.kwhView.hidden = NO;
if(battery == 0)
{
imageName = @"icon_home_electricity_0";
self.kwhView.hidden = YES;
}
else if (battery > 0 && battery < 50)
imageName = @"icon_home_electricity_25";
else if (battery >= 50 && battery < 75)
imageName = @"icon_home_electricity_50";
else if (battery >= 75 && battery < 100)
imageName = @"icon_home_electricity_75";
else if (battery == 100)
imageName = @"icon_home_electricity_100";
self.deviceBatteryImage.image = [myHelper getImageWithName:imageName];
self.deviceBatteryImage.image = [myHelper getImageWithName:[UICommon dianliangImg:battery]];
self.deviceBatteryLabel.text = [NSString stringWithFormat:@"%d%%",battery];
}
@ -939,20 +929,9 @@ @@ -939,20 +929,9 @@
make.size.mas_equalTo(CGSizeMake(50, 20));
}];
NSString *imageName = @"icon_home_electricity_50";
if(dev.battery.intValue == 0)
imageName = @"icon_home_electricity_0";
else if (dev.battery.intValue > 0 && dev.battery.intValue < 50)
imageName = @"icon_home_electricity_25";
else if (dev.battery.intValue >= 50 && dev.battery.intValue < 75)
imageName = @"icon_home_electricity_50";
else if (dev.battery.intValue >= 75 && dev.battery.intValue < 100)
imageName = @"icon_home_electricity_75";
else if (dev.battery.intValue == 100)
imageName = @"icon_home_electricity_100";
/// 电量
UIImageView *deviceBatteryImage = [UICommon ui_imageView:CGRectZero fileName:imageName];
UIImageView *deviceBatteryImage = [UICommon ui_imageView:CGRectZero fileName:[UICommon dianliangImg:dev.battery.integerValue]];
//self.deviceBatteryImage = deviceBatteryImage;
[kwhView addSubview:deviceBatteryImage];
[deviceBatteryImage mas_makeConstraints:^(MASConstraintMaker *make) {

4
tongxin/VC/WatchHome/DeviceInfo/CallVideo/Agora/CallViewController.m
Unescape View File

@ -467,7 +467,7 @@ @@ -467,7 +467,7 @@
/**
MARK: APP 接听按钮
*/
- (IBAction)acceptBtnAction:(id)sender {
- (void)acceptBtnAction:(id)sender {
self.isCall = YES;
[self joinChannel];
[self stopRing];
@ -517,7 +517,7 @@ @@ -517,7 +517,7 @@
MARK: APP 被动挂断按钮 (接通前APP的挂断)
*/
- (IBAction)hangUpButton:(UIButton *)sender {
- (void)hangUpButton:(UIButton *)sender {
[self stopRing];
[self leaveChannel];
if(!hangUping){

24
tongxin/VC/WatchHome/DeviceInfo/SelectContactVC.m
Unescape View File

@ -183,22 +183,36 @@ @@ -183,22 +183,36 @@
if(self.isContact)
{
// 通讯录
if(self.nameCell.aTextField.text.length == 0){
if(self.nameCell.aTextField.text.length == 0)
{
[UICommon MessageErrorText:@"请输入联系人名称"];
return;
}else if (self.phoneCell.aTextField.text.length == 0 ){
}
else if (self.phoneCell.aTextField.text.length == 0 )
{
[UICommon MessageErrorText:@"请输入电话号码"];
return;
}else if (!self.contactId){
if (self.isContact && self.isAddContact) {
}
else if (self.isContact && self.isAddContact && self.dphoneCell.aTextField.text.length > 0 && self.dphoneCell.aTextField.text.length < 2)
{
[UICommon MessageErrorText:@"短号不能少于两位"];
return;
}
else if (!self.contactId)
{
if (self.isContact && self.isAddContact)
{
[UICommon MessageErrorText:@"请选择头像"];
} else {
}
else
{
[UICommon MessageErrorText:@"请选择与设备的关系"];
}
return;
}
self.contactModel.name = self.nameCell.aTextField.text;
self.contactModel.phone = self.phoneCell.aTextField.text;
self.contactModel.relationship_image_id = self.contactId;

19
tongxin/VC/WatchHome/NewHomeVC/WatchHomeDevMainCell.m
Unescape View File

@ -33,23 +33,8 @@ @@ -33,23 +33,8 @@
- (void)setBattery:(int)battery{
// 电量
NSString *imageName = @"";
if(battery == 0){
imageName = @"icon_home_electricity_0";
}else if (battery < 25) {
imageName = @"icon_home_electricity_25";
}else if (battery < 30) {
imageName = @"icon_home_electricity_30";
}else if (battery < 50) {
imageName = @"icon_home_electricity_50";
}else if (battery < 60) {
imageName = @"icon_home_electricity_60";
}else if (battery < 75) {
imageName = @"icon_home_electricity_75";
}else{
imageName = @"icon_home_electricity_100";
}
self.mainBatteryImageView.image = [myHelper getImageWithName:imageName];
self.mainBatteryImageView.image = ImageName_([UICommon dianliangImg:battery]);
self.mainBatteryLabel.text = [NSString stringWithFormat:@"%d%%",battery];
}

13
tongxin/VC/WatchHome/View/WatchHomeHeaderView.m
Unescape View File

@ -192,20 +192,9 @@ @@ -192,20 +192,9 @@
make.size.mas_equalTo(CGSizeMake(60, 20));
}];
NSString *imageName = @"icon_home_electricity_50";
if(dev.battery.intValue == 0)
imageName = @"icon_home_electricity_0";
else if (dev.battery.intValue > 0 && dev.battery.intValue < 50)
imageName = @"icon_home_electricity_25";
else if (dev.battery.intValue >= 50 && dev.battery.intValue < 75)
imageName = @"icon_home_electricity_50";
else if (dev.battery.intValue >= 75 && dev.battery.intValue < 100)
imageName = @"icon_home_electricity_75";
else if (dev.battery.intValue == 100)
imageName = @"icon_home_electricity_100";
/// 电量
UIImageView *kwhImg = [UICommon ui_imageView:CGRectZero fileName:imageName];
UIImageView *kwhImg = [UICommon ui_imageView:CGRectZero fileName:[UICommon dianliangImg:dev.battery.integerValue]];
self.kwhImg = kwhImg;
[kwhView addSubview:kwhImg];
[kwhImg mas_makeConstraints:^(MASConstraintMaker *make) {

4
tongxin/tongxin.entitlements
Unescape View File

@ -9,9 +9,5 @@ @@ -9,9 +9,5 @@
<string>applinks:api.ecellsz.com</string>
<string>webcredentials:api.ecellsz.com</string>
</array>
<key>com.apple.security.application-groups</key>
<array/>
<key>keychain-access-groups</key>
<array/>
</dict>
</plist>

Write Preview
Loading…
Cancel
Save