bug修改

LekangGuard/Common/tabBar/TabBarViewController.m

@@ -10,6 +10,7 @@
 #import "LoginViewController.h"
 #import "AppDelegate.h"
 #import "ScanCodeViewController.h"
+#import "JCManager.h"
 
 @interface TabBarViewController ()<UITabBarControllerDelegate>
 
@@ -135,6 +136,8 @@
         }
         //退出登录清除用户信息
         [[APIManager sharedManager] clearUserInfo];
+        [UIApplication sharedApplication].applicationIconBadgeNumber = 0;
+        [[JCManager shared] uninitialize];
         AppDelegate *app = (AppDelegate *)[UIApplication sharedApplication].delegate;
         [app showRootViewController];
     }];

LekangGuard/Home/Homes/SelectContactViewController.m

@@ -44,6 +44,15 @@
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     self.zx_navTitle = GJText(@"选择关系");
+    if (self.model.binding_status == 1)
+    {
+        EasyAlertView *alertV = [EasyAlertView alertViewWithTitle:nil subtitle:F(GJText(@"设备已被%@绑定，请选择关系后向管理员申请关注！"), self.model.admin_phone) AlertViewType:AlertViewTypeSystemAlert config:nil];
+        [alertV addAlertItem:^EasyAlertItem *{
+            return [EasyAlertItem itemWithTitle:GJText(@"确定") type:AlertItemTypeSystemDefault callback:^(EasyAlertView *showview, long index) {
+            }];
+        }];
+        [alertV showAlertView];
+    }
     
     [self zx_setRightBtnWithText:GJText(self.model.binding_status == 1 ? @"申请关注" : @"下一步") clickedBlock:^(ZXNavItemBtn * _Nonnull btn) {
         if (self.phoneField.text.length <= 1)

LekangGuard/Home/VideoChat(视频聊天)/Agora/CallViewController.m

@@ -197,7 +197,7 @@
         [[AgoraVideoEncoderConfiguration alloc] initWithSize:self.videoSize
                                                    frameRate:AgoraVideoFrameRateFps7
                                                      bitrate:AgoraVideoBitrateStandard
-                                             orientationMode:AgoraVideoOutputOrientationModeFixedLandscape
+                                             orientationMode:AgoraVideoOutputOrientationModeFixedPortrait
                                                   mirrorMode:AgoraVideoMirrorModeAuto];
         encoderConfiguration.dimensions = self.videoSize;
         [self.agoraKit setVideoEncoderConfiguration:encoderConfiguration];

LekangGuard/Home/VideoChat(视频聊天)/VideoChatViewController.m

@@ -363,7 +363,6 @@
     {
         [[JCManager shared] _stopCallTimeoutTimer];
         [[JCManager shared] _stopVideoLimitTimeoutTimer];
-        [[JCManager shared] callVideoWithUserName];
     }
 
     [JCManager shared].gMianVC = self;
@@ -371,6 +370,7 @@
 //    self.jhModel.limit_time = DefineVideoLimitTime;
 //    self.jhModel.wait_time = DefineCallWaitTime;
     [JCManager shared].model = self.configModel;
+    [[JCManager shared] callVideoWithUserName];
 
 
     //调起页面

LekangGuard/Managers/UIURL.h

@@ -259,7 +259,7 @@
 #define PrivacyPolicyURLStr [NSString stringWithFormat:@"http://39.108.227.227/getway/privacypolicy"]
 
 //二维码丢失
-#define QRcodeLostURLStr [NSString stringWithFormat:@"http://39.108.227.227/getway/qrcode_tx"]
+#define QRcodeLostURLStr [NSString stringWithFormat:@"http://120.77.209.176:20000/getway/qrcode_tx"]
 
 /// 根据imei查询可视频通话成员
 #define QueryVideo_URL @"/device_video_app/query/queryVideo"

LekangGuard/My/VC/Message(消息)/AttentionMessageViewController.m

@@ -197,7 +197,7 @@
         //申请记录的消息
 //        用户（17328339622）申请关注【宝贝】设备
         cell.isApplicationRrecord = YES;
-        NSString *tmp = [NSString stringWithFormat:@"用户(%@)",dMessage.phone];
+        NSString *tmp = [NSString stringWithFormat:GJText(@"用户(%@)"),dMessage.phone];
         NSInteger lenght = tmp.length;
         tmp = [NSString stringWithFormat:GJText(@"%@申请关注【%@】的设备"),tmp,dMessage.name];
         NSMutableAttributedString *att = [[NSMutableAttributedString alloc] initWithString:tmp];

LekangGuard/en.lproj/Localizable.strings

@@ -656,8 +656,6 @@
 
 "%@的管理员%@把管理员转让给您" = "%@'s administrator %@ transfers the administrator to you";
 
-"用户(%@)" = "User (%@)";
-
 "您将%@的管理员转让给%@" = "You transfer the administrator of %@ to %@";
 
 "管理员转让记录" = "Administrator transfer record";
@@ -809,3 +807,7 @@
 "设置设备的定位模式：频次间隔越久，设备续航时间越长。" = "Set the positioning mode of the device: The longer the frequency interval, the longer the battery life of the device.";
 
 "：%ld分钟/次" = ": %ld minute/once";
+
+"设备已被%@绑定，请选择关系后向管理员申请关注！" = "The device has been bound with %@. Please select the relationship and apply to the administrator for attention!";
+
+"手机号不能为空" = "The mobile phone number cannot be empty";

LekangGuard/zh-Hans.lproj/Localizable.strings

@@ -806,9 +806,9 @@
 
 "：%ld分钟/次" = "：%ld分钟/次";
 
-"" = "";
+"设备已被%@绑定，请选择关系后向管理员申请关注！" = "设备已被%@绑定，请选择关系后向管理员申请关注！";
 
-"" = "";
+"手机号不能为空" = "手机号不能为空";
 
 "" = "";