diff --git a/tongxin.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate b/tongxin.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate
index a737b9f..181684a 100644
Binary files a/tongxin.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate and b/tongxin.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/tongxin.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/tongxin.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index 7015587..5f2cb07 100644
--- a/tongxin.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/tongxin.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -14,8 +14,8 @@
             filePath = "tongxin/Helpers/myHttp/MyHttp.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "593"
-            endingLineNumber = "593"
+            startingLineNumber = "595"
+            endingLineNumber = "595"
             landmarkName = "-UploadPictureByFileName:Path:success:failure:"
             landmarkType = "7">
          </BreakpointContent>
@@ -30,8 +30,8 @@
             filePath = "tongxin/Helpers/myHttp/MyHttp.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "586"
-            endingLineNumber = "586"
+            startingLineNumber = "588"
+            endingLineNumber = "588"
             landmarkName = "-UploadPictureByFileName:Path:success:failure:"
             landmarkType = "7">
          </BreakpointContent>
@@ -414,8 +414,8 @@
             filePath = "tongxin/VC/WatchHome/DeviceInfo/CallVideo/Agora/CallViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "521"
-            endingLineNumber = "521"
+            startingLineNumber = "531"
+            endingLineNumber = "531"
             landmarkName = "-rtcEngine:localVideoStats:"
             landmarkType = "7">
          </BreakpointContent>
@@ -430,8 +430,8 @@
             filePath = "tongxin/VC/WatchHome/DeviceInfo/CallVideo/Agora/CallViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "252"
-            endingLineNumber = "252"
+            startingLineNumber = "261"
+            endingLineNumber = "261"
             landmarkName = "-setupLocalVideo"
             landmarkType = "7">
          </BreakpointContent>
@@ -526,8 +526,8 @@
             filePath = "tongxin/VC/WatchHome/DeviceInfo/CallVideo/Agora/CallViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "468"
-            endingLineNumber = "468"
+            startingLineNumber = "478"
+            endingLineNumber = "478"
             landmarkName = "-rtcEngine:didOccurError:"
             landmarkType = "7">
          </BreakpointContent>
@@ -574,8 +574,8 @@
             filePath = "tongxin/MyTabBarViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "222"
-            endingLineNumber = "222"
+            startingLineNumber = "223"
+            endingLineNumber = "223"
             landmarkName = "-addNotification"
             landmarkType = "7">
          </BreakpointContent>
@@ -702,8 +702,8 @@
             filePath = "tongxin/VC/WatchHome/DeviceInfo/CallVideo/Agora/CallViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "454"
-            endingLineNumber = "454"
+            startingLineNumber = "463"
+            endingLineNumber = "463"
             landmarkName = "-didClickSwitchCameraButton:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1214,11 +1214,27 @@
             filePath = "tongxin/MyTabBarViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "267"
-            endingLineNumber = "267"
+            startingLineNumber = "268"
+            endingLineNumber = "268"
             landmarkName = "-tabBarController:shouldSelectViewController:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "A04503D2-C065-41C5-BEEB-DF3BEFD4515B"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "tongxin/VC/Map/MapViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "942"
+            endingLineNumber = "942"
+            landmarkName = "-subMsgView"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>
diff --git a/tongxin/Base.lproj/Main.storyboard b/tongxin/Base.lproj/Main.storyboard
index a339041..37db9cc 100644
--- a/tongxin/Base.lproj/Main.storyboard
+++ b/tongxin/Base.lproj/Main.storyboard
@@ -246,15 +246,15 @@
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.5" minValue="0.0" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="pTF-7x-gHg">
-                                        <rect key="frame" x="16" y="43.5" width="317" height="31"/>
+                                        <rect key="frame" x="16" y="43.5" width="323.5" height="31"/>
                                     </slider>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1000米" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xij-CG-bBa">
-                                        <rect key="frame" x="351" y="48" width="47" height="21"/>
+                                        <rect key="frame" x="357.5" y="48" width="40.5" height="21"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="21" id="fm4-bz-jnz"/>
                                         </constraints>
-                                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                        <nil key="textColor"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                        <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                 </subviews>
@@ -3418,6 +3418,11 @@
                                             <action selector="didClickSwitchCameraButton:" destination="CEf-zS-oi5" eventType="touchUpInside" id="M8b-bk-7dX"/>
                                         </connections>
                                     </button>
+                                    <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="FRA-7K-nag">
+                                        <rect key="frame" x="294" y="89" width="100" height="130"/>
+                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    </view>
                                 </subviews>
                                 <constraints>
                                     <constraint firstItem="u2u-8G-ysK" firstAttribute="trailing" secondItem="DDg-gc-zyG" secondAttribute="trailingMargin" constant="-2" id="LPR-SC-n8I"/>
@@ -3425,22 +3430,17 @@
                                     <constraint firstItem="u2u-8G-ysK" firstAttribute="top" secondItem="DDg-gc-zyG" secondAttribute="top" constant="46" id="kdl-FM-Rha"/>
                                 </constraints>
                             </view>
-                            <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="FRA-7K-nag">
-                                <rect key="frame" x="254" y="105" width="144" height="296"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                            </view>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="grm-sg-jiC">
-                                <rect key="frame" x="147" y="164" width="120" height="120"/>
+                                <rect key="frame" x="144" y="154" width="128" height="128"/>
                                 <constraints>
-                                    <constraint firstAttribute="width" constant="120" id="bmo-mm-xO5"/>
-                                    <constraint firstAttribute="height" constant="120" id="pWa-Bx-cCC"/>
+                                    <constraint firstAttribute="width" constant="128" id="bmo-mm-xO5"/>
+                                    <constraint firstAttribute="height" constant="128" id="pWa-Bx-cCC"/>
                                 </constraints>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="昵称" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qo1-iX-rJZ">
-                                <rect key="frame" x="186.5" y="309" width="41" height="30"/>
+                                <rect key="frame" x="40" y="294" width="334" height="32"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="30" id="kHm-9Q-XAT"/>
+                                    <constraint firstAttribute="height" constant="32" id="3fb-wT-wpg"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="20"/>
                                 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -3678,18 +3678,19 @@
                         <constraints>
                             <constraint firstItem="Fve-L7-AkA" firstAttribute="centerX" secondItem="Jcg-nt-5Dc" secondAttribute="centerX" multiplier="0.4" id="6sv-re-zx4"/>
                             <constraint firstItem="dcS-xA-rU3" firstAttribute="top" secondItem="ulG-cV-u6U" secondAttribute="bottom" constant="40" id="8ap-yi-qEj"/>
-                            <constraint firstItem="Qo1-iX-rJZ" firstAttribute="top" secondItem="grm-sg-jiC" secondAttribute="bottom" constant="25" id="9MS-EV-15Z"/>
-                            <constraint firstItem="Qo1-iX-rJZ" firstAttribute="centerX" secondItem="Jcg-nt-5Dc" secondAttribute="centerX" id="B4M-Jr-ZaD"/>
                             <constraint firstItem="b1k-UE-Gh9" firstAttribute="width" secondItem="Jcg-nt-5Dc" secondAttribute="width" multiplier="0.7" id="CP8-PT-ghp"/>
                             <constraint firstItem="ulG-cV-u6U" firstAttribute="centerX" secondItem="Jcg-nt-5Dc" secondAttribute="centerX" multiplier="1.6" id="JDb-wP-L6s"/>
                             <constraint firstItem="dcS-xA-rU3" firstAttribute="top" secondItem="b1k-UE-Gh9" secondAttribute="bottom" constant="40" id="QF6-Xt-Gej"/>
                             <constraint firstItem="b1k-UE-Gh9" firstAttribute="centerX" secondItem="Jcg-nt-5Dc" secondAttribute="centerX" id="RUz-KG-2OY"/>
+                            <constraint firstAttribute="trailingMargin" secondItem="Qo1-iX-rJZ" secondAttribute="trailing" constant="20" id="Vqq-uc-fdY"/>
                             <constraint firstItem="qsr-Rd-Ptg" firstAttribute="centerX" secondItem="Jcg-nt-5Dc" secondAttribute="centerX" id="WdD-22-eI9"/>
                             <constraint firstItem="dcS-xA-rU3" firstAttribute="top" secondItem="Fve-L7-AkA" secondAttribute="bottom" constant="40" id="aCY-1v-f7O"/>
-                            <constraint firstItem="grm-sg-jiC" firstAttribute="centerX" secondItem="Jcg-nt-5Dc" secondAttribute="centerX" id="dtf-qv-Eh4"/>
+                            <constraint firstItem="Qo1-iX-rJZ" firstAttribute="leading" secondItem="Jcg-nt-5Dc" secondAttribute="leadingMargin" constant="20" id="d5s-A1-UTf"/>
+                            <constraint firstItem="grm-sg-jiC" firstAttribute="centerX" secondItem="Jcg-nt-5Dc" secondAttribute="centerX" constant="1" id="dtf-qv-Eh4"/>
                             <constraint firstAttribute="bottomMargin" secondItem="DDg-gc-zyG" secondAttribute="bottom" constant="-34" id="mFC-75-y8q"/>
-                            <constraint firstItem="grm-sg-jiC" firstAttribute="centerY" secondItem="Jcg-nt-5Dc" secondAttribute="centerY" multiplier="0.5" id="muX-Wh-1Hn"/>
+                            <constraint firstItem="grm-sg-jiC" firstAttribute="centerY" secondItem="Jcg-nt-5Dc" secondAttribute="centerY" multiplier="0.5" constant="-6" id="muX-Wh-1Hn"/>
                             <constraint firstAttribute="trailingMargin" secondItem="DDg-gc-zyG" secondAttribute="trailing" constant="-21" id="rMo-f5-ogr"/>
+                            <constraint firstItem="Qo1-iX-rJZ" firstAttribute="top" secondItem="grm-sg-jiC" secondAttribute="bottom" constant="12" id="ryv-YK-pDP"/>
                             <constraint firstItem="b1k-UE-Gh9" firstAttribute="top" secondItem="qsr-Rd-Ptg" secondAttribute="bottom" constant="20" id="ttM-Dh-8Fs"/>
                             <constraint firstItem="DDg-gc-zyG" firstAttribute="top" secondItem="Jcg-nt-5Dc" secondAttribute="topMargin" constant="-48" id="v0K-hO-yfQ"/>
                             <constraint firstItem="DDg-gc-zyG" firstAttribute="leading" secondItem="Jcg-nt-5Dc" secondAttribute="leadingMargin" constant="-20" id="zfx-d6-rhS"/>
@@ -3708,6 +3709,7 @@
                         <outlet property="onSwitchCameraBtn" destination="fyu-gG-NZI" id="7xl-ij-vUy"/>
                         <outlet property="remoteVideo" destination="DDg-gc-zyG" id="3RY-Rf-kRC"/>
                         <outlet property="switchCameraBtn" destination="u2u-8G-ysK" id="gcX-Wl-sa5"/>
+                        <outlet property="switchCameraLabel" destination="WAh-iu-5jy" id="Cue-jx-yUD"/>
                         <outlet property="switchCameraView" destination="ulG-cV-u6U" id="wSV-zw-s0g"/>
                         <outlet property="timeLabel" destination="qsr-Rd-Ptg" id="WlA-QZ-iNE"/>
                     </connections>
diff --git a/tongxin/Helpers/myHttp/MyHttp.m b/tongxin/Helpers/myHttp/MyHttp.m
index c56d016..608efee 100644
--- a/tongxin/Helpers/myHttp/MyHttp.m
+++ b/tongxin/Helpers/myHttp/MyHttp.m
@@ -184,11 +184,12 @@
         !self.reachabilityManager.isReachable) {
         //[UICommon MessageErrorText:NSLocalizedStringFromTable(@"请检查您的网络设置", @"Localization", @"")];
         [UICommon MessageErrorText:NSLocalizedStringFromTable(@"请检查您的网络设置", @"Localization", @"")];
+        [UICommon HidenLoading];
         failure(nil,nil);
         return nil;
     }
     if (showHUD) {
-        [UICommon MessageUpload:@"正在加载"];
+       // [UICommon MessageUpload:@"正在加载"];
     }
     xLog(@"请求 %@ = %@ = %@",parameters,URLString,method);
     NSURLSessionDataTask *dataTask = nil;
@@ -214,6 +215,7 @@
          } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
              [self httpFailure:failure task:task error:error
                        showHUD:showHUD showError:showError];
+             [UICommon HidenLoading];
          }];
         }else{
             dataTask = [super POST:URLString parameters:parameters
@@ -386,7 +388,7 @@
     xLog(@"请求错误 URL:%@,error = %@",task.currentRequest.URL.absoluteString, error);
     AppDelegate *app = (AppDelegate *)[UIApplication sharedApplication].delegate;
     [app endBackgroundUpdateTask];
-    
+    [UICommon HidenLoading];
     if (showError) {
         //[UICommon MessageErrorText:error.userInfo[NSLocalizedDescriptionKey]];
         [UICommon MessageErrorText:error.userInfo[NSLocalizedDescriptionKey]];
diff --git a/tongxin/MyTabBarViewController.m b/tongxin/MyTabBarViewController.m
index 4b6860b..90afbf2 100644
--- a/tongxin/MyTabBarViewController.m
+++ b/tongxin/MyTabBarViewController.m
@@ -98,6 +98,7 @@
     self.popView = [[VideoTabPopView alloc] initWithFrame:CGRectMake(0, 0, ScreenWidth, ScreenHeight)];
     [self.view addSubview:self.popView];
     
+    [self changeShadowImage];
 }
 
 
@@ -376,7 +377,29 @@
 
 
 
-
+/// 修改线条的颜色
+- (void)changeShadowImage
+{
+  if (@available(iOS 13, *))
+  {
+      UIColor *color = [UIColor whiteColor];
+      UITabBarAppearance *appearance = [self.tabBar.standardAppearance copy];
+      appearance.backgroundImage = [UICommon imageWithColor:UIColor.clearColor];
+      appearance.shadowImage = [UICommon imageWithColor:RGB(240, 240, 240)];
+      appearance.shadowColor = color;
+      // 重置背景和阴影为透明  如果设置了阴影效果则此代码需要去掉
+      //        [appearance configureWithTransparentBackground];
+      self.tabBar.standardAppearance = appearance;
+      if (@available(iOS 15.0, *)) {
+          self.tabBar.scrollEdgeAppearance = appearance;
+      } else {
+          // Fallback on earlier versions
+      }
+  } else {
+      self.tabBar.backgroundImage = [UIImage new];
+      self.tabBar.shadowImage = [UIImage new];
+  }
+}
 
 
 
diff --git a/tongxin/VC/Login/ForgetPwdViewController.m b/tongxin/VC/Login/ForgetPwdViewController.m
index c8eb272..24328de 100644
--- a/tongxin/VC/Login/ForgetPwdViewController.m
+++ b/tongxin/VC/Login/ForgetPwdViewController.m
@@ -136,9 +136,11 @@
     if(flag){
         [button setAlpha:1];
         [button setEnabled:YES];
+        button.backgroundColor = mainColor;
     }else{
         [button setAlpha:1];
         [button setEnabled:NO];
+        button.backgroundColor = RGB(255, 175, 141);
     }
 }
 - (void)rightBtnClick:(UIButton *)sender{
diff --git a/tongxin/VC/Login/LoginViewController.m b/tongxin/VC/Login/LoginViewController.m
index be7f1e9..c258c7a 100644
--- a/tongxin/VC/Login/LoginViewController.m
+++ b/tongxin/VC/Login/LoginViewController.m
@@ -47,7 +47,7 @@
     NSDictionary *infoDictionary = [[NSBundle mainBundle] infoDictionary];
     NSString *icon = [[infoDictionary valueForKeyPath:@"CFBundleIcons.CFBundlePrimaryIcon.CFBundleIconFiles"] lastObject];
     self.iconImageShow.image = [UIImage imageNamed:icon];
-    self.iconImageShow.layer.cornerRadius = 5;
+    self.iconImageShow.layer.cornerRadius = 16;
     self.iconImageShow.layer.masksToBounds = YES;
     self.iconDesLabel.text = APPName;
     
diff --git a/tongxin/VC/Login/PhoneLoginViewController.m b/tongxin/VC/Login/PhoneLoginViewController.m
index c55814a..5fa3e0b 100644
--- a/tongxin/VC/Login/PhoneLoginViewController.m
+++ b/tongxin/VC/Login/PhoneLoginViewController.m
@@ -87,12 +87,17 @@
  @param button button
  */
 -(void)setBtnBadRoGoodFlag:(BOOL)flag WithBtn:(UIButton*) button{
-    if(flag){
+    if(flag)
+    {
         [button setAlpha:1];
         [button setEnabled:YES];
-    }else{
+        button.backgroundColor = mainColor;
+    }
+    else
+    {
         [button setAlpha:1];
         [button setEnabled:NO];
+        button.backgroundColor = RGB(255, 175, 141);
     }
 }
 
diff --git a/tongxin/VC/Login/RegisteredViewController.m b/tongxin/VC/Login/RegisteredViewController.m
index f0c6a84..525f83a 100644
--- a/tongxin/VC/Login/RegisteredViewController.m
+++ b/tongxin/VC/Login/RegisteredViewController.m
@@ -149,9 +149,11 @@
     if(flag){
         [button setAlpha:1];
         [button setEnabled:YES];
+        button.backgroundColor = mainColor;
     }else{
         [button setAlpha:1];
         [button setEnabled:NO];
+        button.backgroundColor = RGB(255, 175, 141);
     }
 }
 
diff --git a/tongxin/VC/Map/AddRailViewController.m b/tongxin/VC/Map/AddRailViewController.m
index eea6366..c72a676 100644
--- a/tongxin/VC/Map/AddRailViewController.m
+++ b/tongxin/VC/Map/AddRailViewController.m
@@ -225,7 +225,7 @@
                 make.left.equalTo(cell.contentView).offset(16);
                 make.right.equalTo(cell.contentView).offset(17);
                 make.bottom.equalTo(cell.contentView.mas_bottom);
-                make.height.mas_equalTo(1);
+                make.height.mas_equalTo(0.5);
             }];
         }
         
diff --git a/tongxin/VC/Map/MapViewController.m b/tongxin/VC/Map/MapViewController.m
index eab0320..e495561 100644
--- a/tongxin/VC/Map/MapViewController.m
+++ b/tongxin/VC/Map/MapViewController.m
@@ -928,7 +928,7 @@
         
         /// 电量信息View
         UIView *kwhView = [[UIView alloc] init];
-        kwhView.backgroundColor = RGBA(16, 199, 114, .18);
+        kwhView.backgroundColor = dev.battery.intValue <= 25 ? RGBA(255, 94, 16, .2) :  RGBA(16, 199, 114, .2);
         kwhView.layer.cornerRadius = 10;
         kwhView.layer.masksToBounds = YES;
         //self.kwhView = kwhView;
@@ -962,7 +962,7 @@
         }];
         
         /// 电量
-        UILabel *deviceBatteryLabel = [UICommon ui_label:CGRectZero lines:0 align:NSTextAlignmentCenter font:Font_(9) textColor:RGB(16, 199, 114) text:[NSString stringWithFormat:@"%@%%",dev.battery] Radius:0];
+        UILabel *deviceBatteryLabel = [UICommon ui_label:CGRectZero lines:0 align:NSTextAlignmentCenter font:Font_(9) textColor:dev.battery.intValue <= 25 ? RGB(255, 94, 16) : RGB(16, 199, 114) text:[NSString stringWithFormat:@"%@%%",dev.battery] Radius:0];
         //self.deviceBatteryLabel = deviceBatteryLabel;
         [kwhView addSubview:deviceBatteryLabel];
         [deviceBatteryLabel mas_makeConstraints:^(MASConstraintMaker *make) {
diff --git a/tongxin/VC/WatchHome/Contacts/ContactsViewController.m b/tongxin/VC/WatchHome/Contacts/ContactsViewController.m
index 3f779cf..d7e4c4d 100644
--- a/tongxin/VC/WatchHome/Contacts/ContactsViewController.m
+++ b/tongxin/VC/WatchHome/Contacts/ContactsViewController.m
@@ -78,7 +78,7 @@
     header.numberOfLines = 2;
     header.baselineAdjustment = UIBaselineAdjustmentAlignCenters;
     [header setTextColor:KKGrey163];
-    [header setText:@"温馨提示:\n电话本最多保存50个号码(有短号的号码需要把长短号都保存)"];
+    header.attributedText = [UICommon labelLinesHeight:@"温馨提示:\n电话本最多保存50个号码(有短号的号码需要把长短号都保存)" height:3 align:NSTextAlignmentLeft];
     
     if ([self isSupportWhiteList]) {
         self.zx_navTitle = @"管理员";
@@ -185,7 +185,7 @@
         [_vbottom removeFromSuperview];
         _vbottom = nil;
     }
-    _vbottom = [[UIView alloc] initWithFrame:CGRectMake(0, ScreenHeight-TabBarHeight, ScreenWidth, TabBarHeight)];
+    _vbottom = [[UIView alloc] initWithFrame:CGRectMake(0, ScreenHeight-TabBarHeight-15, ScreenWidth, TabBarHeight+15)];
     _vbottom.backgroundColor = KKClearColor;
     
     _leftBtn = [UIButton buttonWithType:UIButtonTypeCustom];
diff --git a/tongxin/VC/WatchHome/DeviceInfo/CallVideo/Agora/CallViewController.m b/tongxin/VC/WatchHome/DeviceInfo/CallVideo/Agora/CallViewController.m
index 9fd0a48..1c667ff 100755
--- a/tongxin/VC/WatchHome/DeviceInfo/CallVideo/Agora/CallViewController.m
+++ b/tongxin/VC/WatchHome/DeviceInfo/CallVideo/Agora/CallViewController.m
@@ -55,6 +55,9 @@
 /// 摄像头切换
 @property (weak, nonatomic) IBOutlet UIButton *switchCameraBtn;
 
+/// 摄像头切换文字
+@property (nonatomic ,weak) IBOutlet UILabel *switchCameraLabel;
+
 /**
   静音按钮 容器View
  */
@@ -117,8 +120,14 @@
     
     self.remoteVideo.frame = CGRectMake(0, 0, ScreenWidth, ScreenHeight);
     /// 初始化声网
-    self.headImageView.layer.cornerRadius = 4;
+    self.headImageView.layer.cornerRadius = 12;
     self.headImageView.layer.masksToBounds = YES;
+    self.localVideo.layer.borderWidth = 1;
+    self.localVideo.layer.borderColor = KKWhiteColorColor.CGColor;
+    self.localVideo.layer.cornerRadius = 4;
+    self.nameLabel.font = FontBold_(24);
+    self.nameLabel.textColor = KKWhiteColorColor;
+    //view.layer.masksToBounds = YES;
     //判断性别
     NSString *sexImageName = [cUser.cDevice.sex isEqualToString:@"girl"] ? @"icon_girl_head_portrait" : @"icon_boy_head_portrait";
     [self.headImageView sd_setImageWithURL:[NSURL URLWithString:self.device.avator]
@@ -459,6 +468,7 @@
 {
     sender.selected = !sender.selected;
     [self.agoraKit enableLocalVideo:sender.selected];
+    self.switchCameraLabel.text = sender.selected ? @"摄像头已开" : @"摄像头已关";
 }
 
 
@@ -500,7 +510,7 @@
 
     AgoraRtcVideoCanvas *videoCanvas = [[AgoraRtcVideoCanvas alloc] init];
     videoCanvas.uid = uid;
-    videoCanvas.renderMode = AgoraVideoRenderModeFit;
+    videoCanvas.renderMode = AgoraVideoRenderModeHidden;
     videoCanvas.view = self.remoteVideo;
     [self.agoraKit setupRemoteVideo:videoCanvas];
 }
diff --git a/tongxin/VC/WatchHome/DeviceInfo/SelectContactVC.m b/tongxin/VC/WatchHome/DeviceInfo/SelectContactVC.m
index 259d8f0..89ed93e 100644
--- a/tongxin/VC/WatchHome/DeviceInfo/SelectContactVC.m
+++ b/tongxin/VC/WatchHome/DeviceInfo/SelectContactVC.m
@@ -411,7 +411,7 @@
         
         CGSize size = [cell.aTitleLabel.text sizeWithAttributes:[NSDictionary dictionaryWithObjectsAndKeys:Font_(16),NSFontAttributeName,nil]];
         
-      
+        
         [cell.aTitleLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
             make.left.equalTo(cell.backView);
             make.centerY.equalTo(cell.contentView);
diff --git a/tongxin/VC/WatchHome/DisturbBan/DisturbBanViewController.m b/tongxin/VC/WatchHome/DisturbBan/DisturbBanViewController.m
index 94601f6..b417c23 100644
--- a/tongxin/VC/WatchHome/DisturbBan/DisturbBanViewController.m
+++ b/tongxin/VC/WatchHome/DisturbBan/DisturbBanViewController.m
@@ -45,13 +45,13 @@
         [weakSelf.myTableView reloadData];
         
         // add by lsz
-        MyUILabel *header = [[MyUILabel alloc] initWithFrame:CGRectMake(0, 0, ScreenWidth, 72)];
+        MyUILabel *header = [[MyUILabel alloc] initWithFrame:CGRectMake(0, 0, ScreenWidth, 60)];
         header.font = Font_(12);
         header.adjustsFontSizeToFitWidth = YES;
-        header.numberOfLines = 3;
+        header.numberOfLines = 0;
         header.baselineAdjustment = UIBaselineAdjustmentAlignCenters;
         [header setTextColor:KKGrey163];
-        [header setText:@"温馨提示:禁用时设备除可以呼出SOS号码外，设备仅可查看时间，同时拒接所有电话和消息."];
+        [header setAttributedText:[UICommon labelLinesHeight:@"温馨提示:禁用时设备除可以呼出SOS号码外，设备仅可查看时间，同时拒接所有电话和消息." height:3 align:NSTextAlignmentLeft]];
         weakSelf.myTableView.tableHeaderView = header;
         
     } failure:^(NSError *error){
diff --git a/tongxin/VC/WatchHome/VoiceAlarm/AddVAViewController.m b/tongxin/VC/WatchHome/VoiceAlarm/AddVAViewController.m
index 9fe4c7b..8be51a4 100644
--- a/tongxin/VC/WatchHome/VoiceAlarm/AddVAViewController.m
+++ b/tongxin/VC/WatchHome/VoiceAlarm/AddVAViewController.m
@@ -163,6 +163,11 @@
             cell.textField.font = FontBold_(14);
             cell.textField.textAlignment = NSTextAlignmentRight;
             cell.textField.text = self.infoVoiceAlarm.text;
+            [cell.textField mas_remakeConstraints:^(MASConstraintMaker *make) {
+                make.right.equalTo(cell.mas_right).inset(20);
+                make.centerY.equalTo(cell);
+                make.size.mas_equalTo(CGSizeMake(150, 40));
+            }];
         }
 
         WEAKSELF