【代码优化】新增微信登录

LekangGuard.xcodeproj/project.pbxproj

@@ -220,7 +220,6 @@
 		618E9D7A29472B950038735F /* RailNameTagCollectionCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 618E9D7929472B950038735F /* RailNameTagCollectionCell.m */; };
 		618E9D7D2948267F0038735F /* RailAddressViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 618E9D7C2948267F0038735F /* RailAddressViewController.m */; };
 		618E9D80294827E10038735F /* CLLocation+YCLocation.m in Sources */ = {isa = PBXBuildFile; fileRef = 618E9D7E294827E10038735F /* CLLocation+YCLocation.m */; };
-		618E9D8329486E560038735F /* RailSearchAddressVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 618E9D8229486E560038735F /* RailSearchAddressVC.m */; };
 		618E9D86294872830038735F /* RailSearchAddressTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 618E9D85294872830038735F /* RailSearchAddressTableViewCell.m */; };
 		618E9D8A2949BC160038735F /* TrackViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 618E9D892949BC160038735F /* TrackViewController.m */; };
 		618E9D962949C6F30038735F /* NSMutableArray+convenience.m in Sources */ = {isa = PBXBuildFile; fileRef = 618E9D8C2949C6F30038735F /* NSMutableArray+convenience.m */; };
@@ -436,6 +435,7 @@
 		61D7AB182987B65400E982AA /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61D7AB172987B65300E982AA /* AudioToolbox.framework */; };
 		61D7AB1A2987B66200E982AA /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61D7AB192987B66200E982AA /* JavaScriptCore.framework */; };
 		61D7AB1C2987B69300E982AA /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61D7AB1B2987B69300E982AA /* SystemConfiguration.framework */; };
+		61EAAC382B240E9500B16081 /* RailSearchAddressVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 61EAAC372B240E9500B16081 /* RailSearchAddressVC.m */; };
 		61EDC14329447313003846D8 /* TimeSwitchModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 61EDC14229447313003846D8 /* TimeSwitchModel.m */; };
 		61EDC14629447802003846D8 /* PositionModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 61EDC14529447802003846D8 /* PositionModel.m */; };
 		7FF22BBE007BEA82E040AA14 /* Pods_LekangGuardTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 009A91CAD384C03DF0E8793F /* Pods_LekangGuardTests.framework */; };
@@ -878,8 +878,6 @@
 		618E9D7C2948267F0038735F /* RailAddressViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RailAddressViewController.m; sourceTree = "<group>"; };
 		618E9D7E294827E10038735F /* CLLocation+YCLocation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CLLocation+YCLocation.m"; sourceTree = "<group>"; };
 		618E9D7F294827E10038735F /* CLLocation+YCLocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CLLocation+YCLocation.h"; sourceTree = "<group>"; };
-		618E9D8129486E560038735F /* RailSearchAddressVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RailSearchAddressVC.h; sourceTree = "<group>"; };
-		618E9D8229486E560038735F /* RailSearchAddressVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RailSearchAddressVC.m; sourceTree = "<group>"; };
 		618E9D84294872830038735F /* RailSearchAddressTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RailSearchAddressTableViewCell.h; sourceTree = "<group>"; };
 		618E9D85294872830038735F /* RailSearchAddressTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RailSearchAddressTableViewCell.m; sourceTree = "<group>"; };
 		618E9D882949BC160038735F /* TrackViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TrackViewController.h; sourceTree = "<group>"; };
@@ -1305,6 +1303,8 @@
 		61D7AB172987B65300E982AA /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		61D7AB192987B66200E982AA /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 		61D7AB1B2987B69300E982AA /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
+		61EAAC362B240E9500B16081 /* RailSearchAddressVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RailSearchAddressVC.h; sourceTree = "<group>"; };
+		61EAAC372B240E9500B16081 /* RailSearchAddressVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RailSearchAddressVC.m; sourceTree = "<group>"; };
 		61EDC14129447313003846D8 /* TimeSwitchModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TimeSwitchModel.h; sourceTree = "<group>"; };
 		61EDC14229447313003846D8 /* TimeSwitchModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TimeSwitchModel.m; sourceTree = "<group>"; };
 		61EDC14429447802003846D8 /* PositionModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PositionModel.h; sourceTree = "<group>"; };
@@ -2509,8 +2509,8 @@
 				618E9D7C2948267F0038735F /* RailAddressViewController.m */,
 				61BBF54C2A9EDA5000BCF091 /* MoreRailAddressViewController.h */,
 				61BBF54D2A9EDA5000BCF091 /* MoreRailAddressViewController.m */,
-				618E9D8129486E560038735F /* RailSearchAddressVC.h */,
+				61EAAC362B240E9500B16081 /* RailSearchAddressVC.h */,
-				618E9D8229486E560038735F /* RailSearchAddressVC.m */,
+				61EAAC372B240E9500B16081 /* RailSearchAddressVC.m */,
 				61B44DE32946D2580035E1CC /* Model */,
 				61B44DE42946D25F0035E1CC /* View */,
 			);
@@ -3609,6 +3609,7 @@
 				614F0D22296571F0007A912A /* UIScrollView+XHkeyboardControl.m in Sources */,
 				61D478CE295C3371002FC2D4 /* DLSlideView.m in Sources */,
 				61D7AB0A2987A2B700E982AA /* MZTimerLabel.m in Sources */,
+				61EAAC382B240E9500B16081 /* RailSearchAddressVC.m in Sources */,
 				613363A828F2A5F100BF4A14 /* EmailLoginViewController.m in Sources */,
 				61D7AAE32987A28900E982AA /* UILabel+QMUI.m in Sources */,
 				61CA2BE8293DEF2500605022 /* AlarmModel.m in Sources */,
@@ -3787,7 +3788,6 @@
 				614F0D11296571F0007A912A /* SETextMagnifierCaret.m in Sources */,
 				611DEB2A293F458100B1ADD7 /* SOSTableViewCell.m in Sources */,
 				61B440CD2927259700BB9EC7 /* GDMapView.m in Sources */,
-				618E9D8329486E560038735F /* RailSearchAddressVC.m in Sources */,
 				61D7AB0B2987A2B700E982AA /* LEOAlertView.m in Sources */,
 				611DEB2D293F47A300B1ADD7 /* SOSModel.m in Sources */,
 				61EDC14329447313003846D8 /* TimeSwitchModel.m in Sources */,
@@ -4254,7 +4254,7 @@
 					"$(PROJECT_DIR)/LekangGuard/Common/VoiceConvert/lib",
 					"$(PROJECT_DIR)/LekangGuard/sdk/lib/ios",
 				);
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.0.2;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -4473,7 +4473,7 @@
 					"$(PROJECT_DIR)/LekangGuard/Common/VoiceConvert/lib",
 					"$(PROJECT_DIR)/LekangGuard/sdk/lib/ios",
 				);
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.0.2;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"$(inherited)",

LekangGuard.xcodeproj/xcshareddata/xcschemes/LekangGuard.xcscheme

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

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   uuid = "C221774C-F002-4C3A-AC8E-C40B3B293279"
+   type = "0"
+   version = "2.0">
+</Bucket>

LekangGuard/AppDelegate.h

@@ -8,9 +8,12 @@
 #import <UIKit/UIKit.h>
 #import <UserNotifications/UserNotifications.h>
 #import <PushKit/PushKit.h>
+#import <Foundation/Foundation.h>
 
 #define VideoTimerIdentify @"VideoTimerIdentify"
 #define PlayVibrationIdentify @"PlayVibrationIdentify"
+
+
 @interface AppDelegate : UIResponder <UIApplicationDelegate>
 
 @property (strong, nonatomic) UIWindow *window;

LekangGuard/Common/Const.h

@@ -50,10 +50,6 @@
 #define SNJJSELF __weak typeof(self)snjjSelf = self;
 #define SNJJWEAK __weak typeof(self)snjjSelf = self;
 
-
-//高德地图 Key
-#define AMapKey @"cc2e8880f53e768cc84c374f403ef4d4"
-
 #define GJText(x) NSLocalizedString(x, nil)
 
 #define KSizeNO         20

LekangGuard/Home/MoreService (更多功能)/EditDeviceViewController.m

@@ -379,6 +379,7 @@
             {
                 EditSelectContactViewController *vc = [EditSelectContactViewController new];
                 vc.relationImageId = weakself.devModel.relationImageId;
+                vc.relationName = weakself.devModel.relation;
                 vc.isSelectMsg = ^(NSInteger relationImageId, NSString * _Nonnull name) {
                     weakself.relationLabel.text = name;
                     weakself.iconImg.image = [UICommon getClickRelationshipImageWithCodeID:relationImageId deviceType:APIManager.sharedManager.deviceModel.deviceType];

LekangGuard/Home/MoreService (更多功能)/EditSelectContactViewController.h

@@ -14,6 +14,8 @@ NS_ASSUME_NONNULL_BEGIN
 ///    string example: 与孩子关系头像id
 @property (nonatomic ,assign) NSInteger relationImageId;
 
+@property (nonatomic ,strong) NSString *relationName;
+
 @property (nonatomic ,strong) void(^isSelectMsg)(NSInteger relationImageId ,NSString *name);
 
 @end

LekangGuard/Home/MoreService (更多功能)/EditSelectContactViewController.m

@@ -119,6 +119,8 @@
         make.top.equalTo(titleLabel1.mas_bottom).offset(0);
         make.bottom.equalTo(self.view.mas_bottom);
     }];
+    if (self.relationName)
+        self.contactField.text = self.relationName;
     
     kWeakSelf(self)
     AfterDispatch(0.2, ^{
@@ -192,6 +194,7 @@
 -(void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
 {
     [collectionView selectItemAtIndexPath:indexPath animated:YES scrollPosition:UICollectionViewScrollPositionNone];
+    if (self.contactField.text.length <= 0)
         self.contactField.text = [UICommon getRelationshipNameWithCodeID:indexPath.item+1 deviceType:APIManager.sharedManager.deviceModel.deviceType];
     self.relationship = self.contactField.text;
     self.relationshipId = indexPath.item+1;

LekangGuard/Info.plist

@@ -11,7 +11,7 @@
 			<string>weixin</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>wxc0ca3e7f672ac786</string>
+				<string>wx8fa47f6e10667217</string>
 			</array>
 		</dict>
 	</array>
@@ -23,10 +23,6 @@
 	</array>
 	<key>LSHasLocalizedDisplayName</key>
 	<true/>
-	<key>MOBAppSecret</key>
-	<string>5ef55039c3d46dbc347f71607dae4a0f</string>
-	<key>MOBAppkey</key>
-	<string>322987b7e73df</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

LekangGuard/LekangGuard.pch

@@ -73,8 +73,10 @@
 #import "UIView+Effects.h"
 #import "UIDevice+VGAddition.h"
 
-#define WXAPPID @"wxc0ca3e7f672ac786"
+#define WXAPPID @"wx8fa47f6e10667217"
-#define WXAPPSecret @"009bbe40ee4b6a6f8a1b413a2989167a"
+#define WXAPPSecret @"c0eb6ff1a08ecc3cf986a8ea03d94f61"
+//高德地图 Key
+#define AMapKey @"替换成自己的key"
 
 //APP 在屏幕上显示的名字
 #define APPName [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleDisplayName"]

LekangGuard/Login/LoginViewController.m

@@ -222,10 +222,10 @@
         make.size.mas_equalTo(CGSizeMake(104.5, 14));
     }];
     
-//    NSArray *btnTitleArr = [WXApi isWXAppInstalled] ? @[@"微信",@"验证码"] : @[@"验证码"];
+    NSArray *btnTitleArr = [WXApi isWXAppInstalled] ? @[@"微信",@"验证码"] : @[@"验证码"];
-//    NSArray *btnImageArr = [WXApi isWXAppInstalled] ? @[@"login_wechatBtn",@"login_codeBtn"] : @[@"login_codeBtn"];
+    NSArray *btnImageArr = [WXApi isWXAppInstalled] ? @[@"login_wechatBtn",@"login_codeBtn"] : @[@"login_codeBtn"];
-    NSArray *btnTitleArr = @[@"验证码"];
+//    NSArray *btnTitleArr = @[@"验证码"];
-    NSArray *btnImageArr = @[@"login_codeBtn"];
+//    NSArray *btnImageArr = @[@"login_codeBtn"];
     for (int i = 0; i < btnTitleArr.count; i++)
     {
         UIButton *btn = [UICommon ui_buttonSimple:CGRectZero font:FontADA_(10) normalColor:KKGrey133 normalText:btnTitleArr[i] click:^(UIButton *b) {

LekangGuard/Managers/APIManager.h

@@ -1,8 +1,8 @@
 //
 //  APIManager.h
-//  Runner
+//  LekangGuard
 //
-//  Created by zhengdu on 2021/6/21.
+//  Created by ecell on 2022/10/10.
 //
 
 #import <Foundation/Foundation.h>

LekangGuard/Managers/APIManager.m

@@ -1,8 +1,8 @@
 //
 //  APIManager.m
-//  Runner
+//  LekangGuard
 //
-//  Created by zhengdu on 2021/6/21.
+//  Created by ecell on 2022/10/10.
 //
 
 #import "APIManager.h" 
@@ -11,9 +11,7 @@
 
 #ifdef DEBUG
 //测试环境
-//NSString *const dHostUrl = @"http://api.oversea.ecellsz.com:9876";
 NSString *const dHostUrl = @"http://lb-mi23utxo-em1lnrk4gizs2pu8.clb.ap-nanjing.tencentclb.com:8822";
-//NSString *const dHostUrl = @"http://120.77.209.176:8822";
 #else
 //正式环境
 NSString *const dHostUrl = @"http://lb-mi23utxo-em1lnrk4gizs2pu8.clb.ap-nanjing.tencentclb.com:8822";
@@ -211,6 +209,7 @@ NSInteger const kErrorException = 500;
     }
     
     [MSNetwork setHeader:[self setHttpHeader]];
+//    NSString * url = [[NSString stringWithFormat:@"%@",URL] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
     RACSignal *requestSignal = [RACSignal createSignal:^RACDisposable * _Nullable(id<RACSubscriber>  _Nonnull subscriber) {
         
         [MSNetwork HTTPWithMethod:method url:[NSString stringWithFormat:@"%@",URL] parameters:parameters  headers:nil cachePolicy:MSCachePolicyOnlyNetNoCache success:^(id  _Nonnull responseObject) {

LekangGuard/Managers/APRequestSerializer.h

@@ -1,8 +1,8 @@
 //
 //  APRequestSerializer.h
-//  Runner
+//  LekangGuard
 //
-//  Created by zhengdu on 2021/6/21.
+//  Created by ecell on 2022/10/10.
 //
 
 #import <Foundation/Foundation.h>

LekangGuard/Managers/APRequestSerializer.m

@@ -1,8 +1,8 @@
 //
 //  APRequestSerializer.m
-//  Runner
+//  LekangGuard
 //
-//  Created by zhengdu on 2021/6/21.
+//  Created by ecell on 2022/10/10.
 //
 
 #import "APRequestSerializer.h"

LekangGuard/Managers/UIURL.h

@@ -234,7 +234,7 @@
 #define HotMessage_URL @"/message/query/hotMessage"
 
 /// 查询问题分类GET
-#define MessageCategory_URL @"/message​/query​/messageCategory"
+#define MessageCategory_URL @"/message/query/messageCategory"
 
 /// 查询问题分类下的具体问题GET
 #define QueryContentById_URL @"/message/query/queryContentById"
@@ -272,10 +272,10 @@
 
 
 //用户协议
-#define AccoutXieYiURLStr [NSString stringWithFormat:@"http://39.108.227.227/getway/useragreement_tx"]
+#define AccoutXieYiURLStr @"https://jrhx.com.cn/useragreement/useragreement.html"
 
 //隐私政策
-#define PrivacyPolicyURLStr [NSString stringWithFormat:@"http://39.108.227.227/getway/privacypolicy"]
+#define PrivacyPolicyURLStr @"https://jrhx.com.cn/useragreement/privacypolicy.html"
 
 //二维码丢失
 #define QRcodeLostURLStr [NSString stringWithFormat:@"http://39.108.227.227/getway/qrcode_tx"]

LekangGuard/Map/Fence(电子围栏)/AddRailViewController.m

@@ -66,7 +66,7 @@
     
     kWeakSelf(self)
     
-    NSArray *arr = @[GJText(@"围栏类型"),GJText(@"安全区域"),GJText(@"地址名称"),GJText(@"地址"),GJText(@"有效时间"),GJText(@"星期")];
+    NSArray *arr = @[GJText(@"围栏类型"),GJText(@"区域类型"),GJText(@"围栏名称"),GJText(@"地址"),GJText(@"有效时间"),GJText(@"星期")];
     NSArray *timeArr = @[GJText(@"一"),GJText(@"二"),GJText(@"三"),GJText(@"四"),GJText(@"五"),GJText(@"六"),GJText(@"日")];
     
     UIView *bgView = [UICommon ui_view:CGRectMake(0, iPhoneX_NavHeight, SCREEN_WIDTH, Adapted(55)*arr.count) backgroundColor:KKWhiteColorColor cornerRadius:0 borderWidth:0 borderColor:KKWhiteColorColor];

LekangGuard/Map/Fence(电子围栏)/Model/SafetyRailModel.h

@@ -65,3 +65,4 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+                 

LekangGuard/Map/Fence(电子围栏)/RailSearchAddressVC.h

@@ -2,7 +2,7 @@
 //  RailSearchAddressVC.h
 //  LekangGuard
 //
-//  Created by ecell on 2022/12/13.
+//  Created by ecell on 2023/12/9.
 //
 
 #import "BaseViewController.h"

LekangGuard/Map/Fence(电子围栏)/RailSearchAddressVC.m

@@ -2,25 +2,22 @@
 //  RailSearchAddressVC.m
 //  LekangGuard
 //
-//  Created by ecell on 2022/12/13.
+//  Created by ecell on 2023/12/9.
 //
 
 #import "RailSearchAddressVC.h"
 #import "RailSearchAddressTableViewCell.h"
 
-
 @interface RailSearchAddressVC ()<UISearchBarDelegate,AMapSearchDelegate>
 
 @property (nonatomic, strong) AMapSearchAPI *search;
 
 @property (nonatomic, strong) AMapInputTipsSearchRequest *currentRequest;
 
-
 /// 搜索栏
 @property (strong, nonatomic) UISearchBar *searchBar;
 
 @property (nonatomic ,strong) CommonTableView *comTable;
-
 /**
  历史搜索数据
  */
@@ -55,7 +52,6 @@
         make.bottom.equalTo(self.view.mas_bottom);
     }];
 }
-
 - (CommonTableView *)comTable
 {
     if (!_comTable)
@@ -77,7 +73,6 @@
     }
     return _comTable;
 }
-
 - (UISearchBar *)searchBar
 {
     if (!_searchBar)
@@ -90,7 +85,6 @@
     }
     return _searchBar;
 }
-
 - (void)searchBarCancelButtonClicked:(UISearchBar *)searchBar
 {
     NSLog(@"aasdads");
@@ -133,14 +127,11 @@
     [self.search AMapInputTipsSearch:request];
    // self.isHistory = NO;
 }
-
 //MARK: ----  高德 搜索 API 代理方法 ----
-
 - (void)AMapSearchRequest:(id)request didFailWithError:(NSError *)error
 {
     NSLog(@"Search Error: %@",error.description);
 }
-
 - (void)onInputTipsSearchDone:(AMapInputTipsSearchRequest *)request response:(AMapInputTipsSearchResponse *)response
 {
     
@@ -168,7 +159,6 @@
     
     
 }
-
 /*
 #pragma mark - Navigation
 

LekangGuard/My/Message(消息)/RemindMessageViewController.m

@@ -295,6 +295,7 @@
             cell.messageLabel.text = [NSString stringWithFormat:GJText(@"【%@】设备当前监测心率为%@次/分"),dMessage.name, dMessage.data];
     }
     else if ([dMessage.type isEqualToString:@"lp"]) {
+        titleStr = GJText(@"课外活动");
         cell.messageLabel.text = [NSString stringWithFormat:GJText(@"【%@】于%@进行了一次课外活动"),dMessage.name,dMessage.createTime];
     }
     
@@ -309,7 +310,7 @@
     }
     
     cell.aTitleLabel.text = titleStr;
-    cell.timeLabel.text = [self getShowDateWithTime:contextModel.time];
+    cell.timeLabel.text = [self dateWithTimeInterval:F(@"%ld",[self getTimeStrWithString:dMessage.createTime])];
     return cell;
     
 }
@@ -390,22 +391,28 @@
 }
 
 
-- (NSString *)getShowDateWithTime:(NSString *)time
+#pragma mark 时间戳 转日期 （yyyy-MM-dd HH:mm:ss SS）
-{
+// 时间戳转时间,时间戳为13位是精确到毫秒的，10位精确到秒
-    NSDate *timeDate = [[NSDate alloc]initWithTimeIntervalSince1970:[time integerValue]/1000.0];
+- (NSString *)dateWithTimeInterval:(NSString *)timeStr {
+    
+    // 传入的时间戳timeStr如果是精确到秒的记得要/1000
+    NSTimeInterval timeInterval = [timeStr doubleValue]/1000;
+    NSDate *detailDate = [NSDate dateWithTimeIntervalSince1970:timeInterval];
     NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
-    dateFormatter.dateFormat = @"hh:mm";
+    // 实例化一个NSDateFormatter对象，设定时间格式，这里可以设置成自己需要的格式
-    NSString *timeStr = [dateFormatter stringFromDate:timeDate];
+    [dateFormatter setDateFormat:@"HH:mm"];
-    return timeStr;
+    NSString *dateStr = [dateFormatter stringFromDate:detailDate];
+
+    return dateStr;
 }
 
+// 字符串转时间戳 如：2017-4-10 17:15:10 （精确到毫秒*1000）
 - (NSInteger)getTimeStrWithString:(NSString *)str
 {
     NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];// 创建一个时间格式化对象
-    [dateFormatter setDateFormat:@"YYYY-MM-dd HH:mm:ss"];
+    [dateFormatter setDateFormat:@"YYYY-MM-dd HH:mm:ss"]; //设定时间的格式
-    //设定时间的格式
     NSDate *tempDate = [dateFormatter dateFromString:str];//将字符串转换为时间对象
-    NSInteger timeStr = [tempDate timeIntervalSince1970];//字符串转成时间戳,精确到毫秒*1000returntimeStr;
+    NSInteger timeStr = [tempDate timeIntervalSince1970]*1000;//字符串转成时间戳,精确到毫秒*1000
     return timeStr;
 }
 

LekangGuard/My/Problem(常见问题)/ProblemViewController.m

@@ -56,7 +56,7 @@
         }
         self.problemTable.cellRow = arr.count;
         [self.problemTable reloadData];
-       // [self GetMessageCategory];
+        [self GetMessageCategory];
     } error:^(NSError * _Nullable error) {
         NSDictionary *dic = error.userInfo;
         [UICommon MessageErrorText:dic[NSLocalizedDescriptionKey]];

LekangGuard/Protection(守护星)/VC/ProtectionViewController.m

@@ -62,7 +62,7 @@
 
 - (void)SubOneView
 {
-    DeviceMsgHeaderView *devMsgView = [[DeviceMsgHeaderView alloc] initWithFrame:CGRectMake(0, 10, SCREEN_WIDTH, 140)];
+    DeviceMsgHeaderView *devMsgView = [[DeviceMsgHeaderView alloc] initWithFrame:CGRectMake(0, 10, SCREEN_WIDTH, 148)];
     self.devMsgView = devMsgView;
     [self.menuScroll addSubview:devMsgView];
     [devMsgView setModel];

LekangGuard/Protection(守护星)/View/DeviceMsgHeaderView.m

@@ -71,7 +71,7 @@
     [bgView addSubview:iconImg];
     [iconImg mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(bgView.mas_left).offset(15);
-        make.top.equalTo(bgView.mas_top).offset(13);
+        make.top.equalTo(bgView.mas_top).offset(16);
         make.size.mas_equalTo(CGSizeMake(50, 50));
     }];
     
@@ -87,6 +87,14 @@
     }];
     
    
+    /// 班级年级
+    UILabel *bnLabel = [UICommon ui_label:CGRectZero lines:0 align:NSTextAlignmentCenter font:Font_(14) textColor:KKTextBlackColor text:@"" Radius:0];
+    self.bnLabel = bnLabel;
+    [bgView addSubview:bnLabel];
+    [bnLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(iconImg.mas_right).offset(20);
+        make.centerY.equalTo(iconImg);
+    }];
     
     /// 设备名称
     UILabel *nameLabel = [UICommon ui_label:CGRectZero lines:0 align:NSTextAlignmentCenter font:FontBold_(16) textColor:KKTextBlackColor text:@"" Radius:0];
@@ -94,16 +102,8 @@
     [bgView addSubview:nameLabel];
     [nameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(iconImg.mas_right).offset(20);
-        make.top.equalTo(iconImg.mas_top).offset(6.5);
+//        make.top.equalTo(iconImg.mas_top).offset(3);
-    }];
+        make.bottom.equalTo(bnLabel.mas_top).inset(5);
-    
-    /// 班级年级
-    UILabel *bnLabel = [UICommon ui_label:CGRectZero lines:0 align:NSTextAlignmentCenter font:Font_(15) textColor:KKTextBlackColor text:@"" Radius:0];
-    self.bnLabel = bnLabel;
-    [bgView addSubview:bnLabel];
-    [bnLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(nameLabel.mas_right).offset(25);
-        make.centerY.equalTo(nameLabel);
     }];
     
     
@@ -112,7 +112,7 @@
     [bgView addSubview:IdLabel];
     [IdLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(nameLabel);
-        make.top.equalTo(nameLabel.mas_bottom).offset(10);
+        make.top.equalTo(bnLabel.mas_bottom).offset(5);
     }];
     
     
@@ -143,7 +143,7 @@
         [self addSubview:line];
         [line mas_makeConstraints:^(MASConstraintMaker *make) {
             make.left.equalTo(self.mas_left).offset(i*ww);
-            make.top.equalTo(iconImg.mas_bottom).offset(17);
+            make.top.equalTo(iconImg.mas_bottom).offset(25);
             //make.bottom.equalTo(bgView.mas_bottom).inset(26);
             make.size.mas_equalTo(CGSizeMake(1, 45));
         }];

LekangGuard/微信登录和分享/APHandleManager.h

@@ -1,8 +1,8 @@
 //
 //  APHandleManager.h
-//  Runner
+//  LekangGuard
 //
-//  Created by zhengdu on 2021/6/16.
+//  Created by ecell on 2022/10/10.
 //
 
 #import <Foundation/Foundation.h>

LekangGuard/微信登录和分享/APHandleManager.m

@@ -1,8 +1,8 @@
 //
 //  APHandleManager.m
-//  Runner
+//  LekangGuard
 //
-//  Created by zhengdu on 2021/6/16.
+//  Created by ecell on 2022/10/10.
 //
 
 #import "APHandleManager.h"
@@ -32,7 +32,7 @@
 
 - (void)registerHandle
 {
-  [WXApi registerApp:WXAPPID universalLink:@"https://api.ecellsz.com/lekang/"];
+  [WXApi registerApp:WXAPPID universalLink:@"https://www.jrhx.com.cn/"];
     //[WeiboSDK registerApp:WEIBO_OPEN_APPID];
     
 }

LekangGuard/微信登录和分享/SendMessageToWXReq+requestWithTextOrMediaMessage.h

@@ -1,8 +1,8 @@
 //
 //  SendMessageToWXReq+requestWithTextOrMediaMessage.h
-//  SDKSample
+//  LekangGuard
 //
-//  Created by Jeason on 15/7/14.
+//  Created by ecell on 2022/10/10.
 //
 //
 

LekangGuard/微信登录和分享/SendMessageToWXReq+requestWithTextOrMediaMessage.m

@@ -1,8 +1,8 @@
 //
 //  SendMessageToWXReq+requestWithTextOrMediaMessage.m
-//  SDKSample
+//  LekangGuard
 //
-//  Created by Jeason on 15/7/14.
+//  Created by ecell on 2022/10/10.
 //
 //
 

LekangGuard/微信登录和分享/WXMediaMessage+messageConstruct.h

@@ -1,8 +1,8 @@
 //
 //  WXMediaMessage+messageConstruct.h
-//  SDKSample
+//  LekangGuard
 //
-//  Created by Jeason on 15/7/14.
+//  Created by ecell on 2022/10/10.
 //
 //
 

LekangGuard/微信登录和分享/WXMediaMessage+messageConstruct.m

@@ -1,8 +1,8 @@
 //
 //  WXMediaMessage+messageConstruct.m
-//  SDKSample
+//  LekangGuard
 //
-//  Created by Jeason on 15/7/14.
+//  Created by ecell on 2022/10/10.
 //
 //