diff --git a/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate b/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate index 53d2f24..fc5f368 100644 Binary files a/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate and b/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/LekangGuard/Home/Homes/Model/DeviceModel.h b/LekangGuard/Home/Homes/Model/DeviceModel.h index 3591144..06edf84 100644 --- a/LekangGuard/Home/Homes/Model/DeviceModel.h +++ b/LekangGuard/Home/Homes/Model/DeviceModel.h @@ -95,10 +95,10 @@ NS_ASSUME_NONNULL_BEGIN /// string 视频类型名称（0.不支持，1.菊风，2.声网，3.佰锐，4.鹈鹕) @property (nonatomic ,assign) NSInteger videoModelName; -/// string 手表闹钟（0.不支持，1.支持） +/// string 学生证闹钟（0.不支持，1.支持） @property (nonatomic ,assign) BOOL watchAlarmClock; -/// string 手表WIFF（0.不支持，1.支持） +/// string 学生证WIFF（0.不支持，1.支持） @property (nonatomic ,assign) BOOL watchWiff; /// string 设备拥有者体重 diff --git a/LekangGuard/Home/Homes/Model/ScanCodeModel.h b/LekangGuard/Home/Homes/Model/ScanCodeModel.h index eeb8bb9..188c98a 100644 --- a/LekangGuard/Home/Homes/Model/ScanCodeModel.h +++ b/LekangGuard/Home/Homes/Model/ScanCodeModel.h @@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN /// 管理员的邮箱 @property (nonatomic ,copy) NSString *admin_email; -/// 设备类型（0.默认 1.手表，2.学生卡，3.老人机） +/// 设备类型（0.默认 1.学生证，2.学生卡，3.老人机） @property (nonatomic ,assign) NSInteger device_type; /// 管理员的手机号码 diff --git a/LekangGuard/Home/Homes/ScanCodeViewController.m b/LekangGuard/Home/Homes/ScanCodeViewController.m index 35ef816..f6c8c43 100644 --- a/LekangGuard/Home/Homes/ScanCodeViewController.m +++ b/LekangGuard/Home/Homes/ScanCodeViewController.m @@ -196,8 +196,8 @@ -#pragma mark 添加手表 -/// 添加手表 +#pragma mark 添加学生证 +/// 添加学生证 - (void)nextActionWithParameters:(NSMutableDictionary *)parameters { [UICommon MessageUpload:@"加载中"]; diff --git a/LekangGuard/Home/Homes/View/HomeHeaderView.m b/LekangGuard/Home/Homes/View/HomeHeaderView.m index 16742cb..f5939bf 100644 --- a/LekangGuard/Home/Homes/View/HomeHeaderView.m +++ b/LekangGuard/Home/Homes/View/HomeHeaderView.m @@ -21,7 +21,7 @@ @property (nonatomic ,weak) KJBannerView *bannerView; -/// 手表信息View +/// 学生证信息View @property (nonatomic ,weak) UIView *msgView; /// 按钮菜单View diff --git a/LekangGuard/Home/MoreService (更多功能)/EditDeviceViewController.m b/LekangGuard/Home/MoreService (更多功能)/EditDeviceViewController.m index 5d3cf13..c962e3a 100644 --- a/LekangGuard/Home/MoreService (更多功能)/EditDeviceViewController.m +++ b/LekangGuard/Home/MoreService (更多功能)/EditDeviceViewController.m @@ -517,8 +517,8 @@ } -#pragma mark 修改手表资料 -/// 修改手表资料 +#pragma mark 修改学生证资料 +/// 修改学生证资料 - (void)UpdateDeviceInfo { if (self.phoneField.text.length <= 0) diff --git a/LekangGuard/Home/VideoChat(视频聊天)/1v1/JCManager.m b/LekangGuard/Home/VideoChat(视频聊天)/1v1/JCManager.m index 20b34b6..0b51d21 100644 --- a/LekangGuard/Home/VideoChat(视频聊天)/1v1/JCManager.m +++ b/LekangGuard/Home/VideoChat(视频聊天)/1v1/JCManager.m @@ -276,7 +276,7 @@ static JCManager* _manager; NSMutableDictionary *parameters = [NSMutableDictionary dictionary]; [parameters setValue:@(!item.video) forKey:@"callType"];/// 视频通话类型(0:视频,1:语音) [parameters setValue:APIManager.sharedManager.deviceModel.imei forKey:@"imei"]; - [parameters setValue:@"APP" forKey:@"type"];/// 手表发起传:device,APP发起传：APP + [parameters setValue:@"APP" forKey:@"type"];/// 学生证发起传:device,APP发起传：APP [[[APIManager sharedManager] APGET:UserQueryVideo_URL parameters:parameters resultClass:DeviceVideoConfigModel.class] subscribeNext:^(DeviceVideoConfigModel *model) { [UICommon HidenLoading]; self.model = model; diff --git a/LekangGuard/Home/VideoChat(视频聊天)/Model/DeviceVideoConfigModel.h b/LekangGuard/Home/VideoChat(视频聊天)/Model/DeviceVideoConfigModel.h index 60813b0..6ee3e44 100644 --- a/LekangGuard/Home/VideoChat(视频聊天)/Model/DeviceVideoConfigModel.h +++ b/LekangGuard/Home/VideoChat(视频聊天)/Model/DeviceVideoConfigModel.h @@ -21,10 +21,10 @@ NS_ASSUME_NONNULL_BEGIN /// integer($int32) example: 通话间隔 / 秒 @property (nonatomic ,assign) NSInteger callInterval; -/// string example: 手表登陆的视频id +/// string example: 学生证登陆的视频id @property (nonatomic ,copy) NSString *deviceUserName; -/// string example: 手表获取的视频通话记录id +/// string example: 学生证获取的视频通话记录id @property (nonatomic ,copy) NSString *deviceVideoId; /// string example: 分辨率 diff --git a/LekangGuard/Home/VideoChat(视频聊天)/VideoChatViewController.m b/LekangGuard/Home/VideoChat(视频聊天)/VideoChatViewController.m index 3ae94a7..1e679d9 100644 --- a/LekangGuard/Home/VideoChat(视频聊天)/VideoChatViewController.m +++ b/LekangGuard/Home/VideoChat(视频聊天)/VideoChatViewController.m @@ -279,7 +279,7 @@ NSMutableDictionary *parameters = [NSMutableDictionary dictionary]; [parameters setValue:@(0) forKey:@"callType"];/// 视频通话类型(0:视频,1:语音) [parameters setValue:APIManager.sharedManager.deviceModel.imei forKey:@"imei"]; - [parameters setValue:@"APP" forKey:@"type"];/// 手表发起传:device,APP发起传：APP + [parameters setValue:@"APP" forKey:@"type"];/// 学生证发起传:device,APP发起传：APP [[[APIManager sharedManager] APGET:UserQueryVideo_URL parameters:parameters resultClass:DeviceVideoConfigModel.class] subscribeNext:^(DeviceVideoConfigModel *model) { [UICommon HidenLoading]; weakself.configModel = model; diff --git a/LekangGuard/Managers/UIURL.h b/LekangGuard/Managers/UIURL.h index 840ec90..883299a 100644 --- a/LekangGuard/Managers/UIURL.h +++ b/LekangGuard/Managers/UIURL.h @@ -114,7 +114,7 @@ /// 删除上课禁用 #define DeleteDisabled_URL @"/device-disable-app/delete/disabledd" -/// 查找手表 +/// 查找学生证 #define QueryDevice_URL @"/device-disable-app/find/queryDevice" /// SOS号码查询 @@ -123,10 +123,10 @@ /// 添加或编辑SOS号码 #define AddSosPhone_URL @"/imei-sos-info/sos/add/phone" -/// 查询手表资料 +/// 查询学生证资料 #define QueryDeviceInfo_URL @"/app/device/query/deviceInfo" -/// 修改手表资料 +/// 修改学生证资料 #define UpdateDeviceInfo_URL @"/app/device/update/deviceInfo" /// 设备远程关机 @@ -191,7 +191,7 @@ #pragma mark -----------------------------------消息中心----------------------------------- -/// 查询手表的告警信息 +/// 查询学生证的告警信息 #define QueryRemind_URL @"/reminder-message-app/query/queryRemind" /// 删除提醒消息 @@ -286,7 +286,7 @@ /// 与设备进行视频通话 #define VideoCall_URL @"/device_video_app/video/videoCall" -/// APP发起视频/语音通话后主动挂断(在手表还未接到响铃的情况下) +/// APP发起视频/语音通话后主动挂断(在学生证还未接到响铃的情况下) #define DeleteCall_URL @"/device_video_app/video/deleteCall" /// APP挂断后上传视频通话记录 diff --git a/LekangGuard/Map/VC/MapViewController.m b/LekangGuard/Map/VC/MapViewController.m index 43f3a79..5592a70 100644 --- a/LekangGuard/Map/VC/MapViewController.m +++ b/LekangGuard/Map/VC/MapViewController.m @@ -77,7 +77,7 @@ [self zx_setRightBtnWithImg:ImageName_(@"icon_switch_devices") clickedBlock:^(ZXNavItemBtn * _Nonnull btn) { [self isMapShowMenu]; }]; - //[self.cellTitleArr addObject:@"手表短信"]; + //[self.cellTitleArr addObject:@"学生证短信"]; [self.cellTitleArr addObject:@"定位模式"]; [self.cellTitleArr addObject:@"定位说明"]; //[self.cellTitleArr addObject:@"定位纠偏"]; diff --git a/LekangGuard/Map/VC/MarkExplainViewController.m b/LekangGuard/Map/VC/MarkExplainViewController.m index 4d4edd5..7c9ecc3 100644 --- a/LekangGuard/Map/VC/MarkExplainViewController.m +++ b/LekangGuard/Map/VC/MarkExplainViewController.m @@ -60,7 +60,7 @@ { _dataArr = [NSMutableArray new]; - NSMutableDictionary *dict1 = [[NSMutableDictionary alloc] initWithObjects:@[@"icon_histroy_g",GJText(@"卫星定位"),GJText(@"支持美国GPS、中国北斗两种卫星定位，室外空旷地，最佳定位精度10米左右，但室内定位效果不佳。")] forKeys:@[@"img",@"title",@"content"]]; + NSMutableDictionary *dict1 = [[NSMutableDictionary alloc] initWithObjects:@[@"icon_histroy_g",GJText(@"卫星定位"),GJText(@"支持北斗卫星高精度定位、GPS卫星定位。室外空旷地,北斗最佳定位精度2.5米,接入地面辅助系统可做到亚米级精度, GPS最佳定位精度10米。")] forKeys:@[@"img",@"title",@"content"]]; [_dataArr addObject:dict1]; NSMutableDictionary *dict2 = [[NSMutableDictionary alloc] initWithObjects:@[@"icon_home_wifi",GJText(@"Wi-Fi定位"),GJText(@"设备通过Wi-Fi模块，收集周边的Wi-Fi热点信息，来计算出自身的位置信息，定位的精准度最佳在50米以内。")] forKeys:@[@"img",@"title",@"content"]]; diff --git a/LekangGuard/Protection(守护星)/VC/ProtectionViewController.m b/LekangGuard/Protection(守护星)/VC/ProtectionViewController.m index a925327..9353f64 100644 --- a/LekangGuard/Protection(守护星)/VC/ProtectionViewController.m +++ b/LekangGuard/Protection(守护星)/VC/ProtectionViewController.m @@ -104,32 +104,32 @@ }; [setView DevicePosition]; - /// 远程关机 - UIButton *shutdownBtn = [UICommon ui_buttonSimple:CGRectMake(10, setView.bottom+Adapted(60), SCREEN_WIDTH-20, Adapted(44)) font:FontADA_(15) normalColor:KKWhiteColorColor normalText:GJText(@"远程关机") click:^(id x) { - - EasyAlertView *alertV = [EasyAlertView alertViewWithTitle:GJText(@"远程关机") subtitle:GJText(@"\n设备将会远程关机，”是否“确认") AlertViewType:AlertViewTypeSystemAlert config:nil]; - [alertV addAlertItem:^EasyAlertItem *{ - return [EasyAlertItem itemWithTitle:GJText(@"取消") type:AlertItemTypeSystemCancel callback:nil]; - }]; - [alertV addAlertItem:^EasyAlertItem *{ - return [EasyAlertItem itemWithTitle:GJText(@"确定") type:AlertItemTypeSystemDefault callback:^(EasyAlertView *showview, long index) { - [self DeviceShutDown]; - }]; - }]; - [alertV showAlertView]; - - }]; - shutdownBtn.backgroundColor = KKMainColor; - shutdownBtn.layer.cornerRadius = Adapted(22); - shutdownBtn.layer.masksToBounds = YES; - [self.menuScroll addSubview:shutdownBtn]; +// /// 远程关机 +// UIButton *shutdownBtn = [UICommon ui_buttonSimple:CGRectMake(10, setView.bottom+Adapted(60), SCREEN_WIDTH-20, Adapted(44)) font:FontADA_(15) normalColor:KKWhiteColorColor normalText:GJText(@"远程关机") click:^(id x) { +// +// EasyAlertView *alertV = [EasyAlertView alertViewWithTitle:GJText(@"远程关机") subtitle:GJText(@"\n设备将会远程关机，”是否“确认") AlertViewType:AlertViewTypeSystemAlert config:nil]; +// [alertV addAlertItem:^EasyAlertItem *{ +// return [EasyAlertItem itemWithTitle:GJText(@"取消") type:AlertItemTypeSystemCancel callback:nil]; +// }]; +// [alertV addAlertItem:^EasyAlertItem *{ +// return [EasyAlertItem itemWithTitle:GJText(@"确定") type:AlertItemTypeSystemDefault callback:^(EasyAlertView *showview, long index) { +// [self DeviceShutDown]; +// }]; +// }]; +// [alertV showAlertView]; +// +// }]; +// shutdownBtn.backgroundColor = KKMainColor; +// shutdownBtn.layer.cornerRadius = Adapted(22); +// shutdownBtn.layer.masksToBounds = YES; +// [self.menuScroll addSubview:shutdownBtn]; NSString *msg = GJText(@"\n解除绑定后,将无法对设备进行监护,设备将重启,其他绑定该设备的用户,将自动解绑"); if(APIManager.sharedManager.deviceModel.identity == 2) msg = GJText(@"\n您是设备的管理员,如果您进行解绑,其他绑定该设备的用户,将自动解绑,确认解除绑定吗？"); /// 解除与设备的绑定 - UIButton *unbundleBtn = [UICommon ui_buttonSimple:CGRectMake(10, shutdownBtn.bottom+Adapted(15), SCREEN_WIDTH-20, Adapted(44)) font:FontADA_(15) normalColor:KKMainColor normalText:GJText(@"解除与设备的绑定") click:^(id x) { + UIButton *unbundleBtn = [UICommon ui_buttonSimple:CGRectMake(10, setView.bottom+Adapted(60), SCREEN_WIDTH-20, Adapted(44)) font:FontADA_(15) normalColor:KKMainColor normalText:GJText(@"解除与设备的绑定") click:^(id x) { EasyAlertView *alertV = [EasyAlertView alertViewWithTitle:GJText(@"设备解绑") subtitle:GJText(msg) AlertViewType:AlertViewTypeSystemAlert config:nil]; [alertV addAlertItem:^EasyAlertItem *{ diff --git a/LekangGuard/en.lproj/Localizable.strings b/LekangGuard/en.lproj/Localizable.strings index b33792d..aabda44 100644 --- a/LekangGuard/en.lproj/Localizable.strings +++ b/LekangGuard/en.lproj/Localizable.strings @@ -197,7 +197,7 @@ "确定" = "Ok"; -"添加手表" = "AddWatch"; +"添加学生证" = "AddWatch"; "请输入姓名" = "Please enter your name"; @@ -491,7 +491,7 @@ "卫星定位" = "Satellite location"; -"支持美国GPS、中国北斗两种卫星定位，室外空旷地，最佳定位精度10米左右，但室内定位效果不佳。" = "It supports the positioning of US GPS and China's Beidou satellites. The best positioning accuracy is about 10 meters in the outdoor open space, but the indoor positioning effect is not good."; +"支持北斗卫星高精度定位、GPS卫星定位。室外空旷地,北斗最佳定位精度2.5米,接入地面辅助系统可做到亚米级精度, GPS最佳定位精度10米。" = "Support Beidou satellite high-precision positioning and GPS satellite positioning. Outdoor open space, Beidou best positioning accuracy of 2.5 meters, access to the ground auxiliary system can achieve sub-meter accuracy, GPS best positioning accuracy of 10 meters."; "Wi-Fi定位" = "Wi-Fi location"; diff --git a/LekangGuard/zh-Hans.lproj/Localizable.strings b/LekangGuard/zh-Hans.lproj/Localizable.strings index c52dfa1..c3187a1 100644 --- a/LekangGuard/zh-Hans.lproj/Localizable.strings +++ b/LekangGuard/zh-Hans.lproj/Localizable.strings @@ -193,7 +193,7 @@ "确定" = "确定"; -"添加手表" = "添加手表"; +"添加学生证" = "添加学生证"; "请输入姓名" = "请输入姓名"; @@ -488,7 +488,7 @@ "卫星定位" = "卫星定位"; -"支持美国GPS、中国北斗两种卫星定位，室外空旷地，最佳定位精度10米左右，但室内定位效果不佳。" = "支持美国GPS、中国北斗两种卫星定位，室外空旷地，最佳定位精度10米左右，但室内定位效果不佳。"; +"支持北斗卫星高精度定位、GPS卫星定位。室外空旷地,北斗最佳定位精度2.5米,接入地面辅助系统可做到亚米级精度, GPS最佳定位精度10米。" = "支持北斗卫星高精度定位、GPS卫星定位。室外空旷地,北斗最佳定位精度2.5米,接入地面辅助系统可做到亚米级精度, GPS最佳定位精度10米。"; "Wi-Fi定位" = "Wi-Fi定位";