iOS13，获取WiFi名称需定位；暗黑模式禁用

Ifish.xcodeproj/project.pbxproj

@@ -15424,7 +15424,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 10.1.7;
+				CURRENT_PROJECT_VERSION = 10.1.8;
 				DEVELOPMENT_TEAM = WFX8GD5HFX;
 				ENABLE_BITCODE = NO;
 				ENABLE_TESTABILITY = YES;
@@ -15541,7 +15541,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 10.1.7;
+				CURRENT_PROJECT_VERSION = 10.1.8;
 				DEVELOPMENT_TEAM = WFX8GD5HFX;
 				ENABLE_BITCODE = NO;
 				ENABLE_TESTABILITY = YES;

Ifish/Info.plist

@@ -407,6 +407,8 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>UIUserInterfaceStyle</key>
+	<string>Light</string>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
 </dict>

Ifish/controllers/HotBar/IfishHotBarVc.m

@@ -253,7 +253,6 @@ Assign BOOL isInitHostoryView;
     UIButton *back = [UIButton buttonWithType:UIButtonTypeCustom];
     back.frame = CGRectMake(0,0,48,44);
     [back setImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal];
-    // [_bakbutton setBackgroundImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal];
     
     [back addTarget: self action: @selector(clickBack) forControlEvents: UIControlEventTouchUpInside];
     back.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;
@@ -419,15 +418,12 @@ Assign BOOL isInitHostoryView;
         
     }
 }
-
-
-
 #pragma mark----socket返回----
 
 -(void)ifishDeviceLogInFail{
 //    self.mainTableView.userInteractionEnabled=NO;
 }
-
+//从socket获取的回调方法
 -(void)socketDidGetBackmsgData:(NSData *)data onsoket:(AsyncSocket *)sock{
     self.mainTableView.userInteractionEnabled=YES;
     NSLog(@"TwoControlView收到服务器的回执--->%@",data);
@@ -480,7 +476,7 @@ Assign BOOL isInitHostoryView;
     //设置预警温度区间
     IfishHotBarVo*vo1=self.datas[1];
     if (!IsEmptyStr(self.vo.upTeamp)) {
-        vo1.subTitle = [NSString stringWithFormat:@"%.1f°c到%.1f°c",[self.vo.downTeamp floatValue],[self.vo.upTeamp floatValue]];
+        vo1.subTitle = [NSString stringWithFormat:@"%.1f°c~%.1f°c",[self.vo.downTeamp floatValue],[self.vo.upTeamp floatValue]];
     }
     self.vo.wornCode=[info substringWithRange:NSMakeRange(44, 2)];
     //    self.vo.wornCode=[NSString stringWithFormat:@"%llu",[dataContorl hexToTen:self.vo.wornCode]];
@@ -629,9 +625,6 @@ Assign BOOL isInitHostoryView;
     header.sendAdr=self.devicemodel.macAddress;
     header.reciceAdr=self.devicemodel.macAddress;
     header.lenth=@"13";
-    
-//    NSString*str=[NSString stringWithFormat:@"%@0",num];
-    
     NSString*crc=@"0000";
     num=[dataContorl ToHex:num.longLongValue*10];
     if (num.length<4) {

Ifish/controllers/leftcontrollers/SecondConnectWifiController.m

@@ -27,7 +27,7 @@
 #import "IfishConnectingView.h"
 #import "PushMasssageWebViewController.h"
 #import "IfishUserObsever.h"
-
+#import <CoreLocation/CoreLocation.h>
 #import "ConnectHotpotViewController.h"
 #import "ConAquarNowWiFiPwdVC.h"
 @interface EspTouchDelegateImpl : NSObject<ESPTouchDelegate>
@@ -85,6 +85,7 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) {
 
 @property(nonatomic,strong)IfishConnectingView *connectingView;
 
+Strong CLLocationManager *locationManager;//iOS13,获取WiFi名称必须开启定位权限
 
 @end
 //extern BOOL formLogIn;//连接页面是否来自登录界面
@@ -100,11 +101,7 @@ extern BOOL isfromCameraView;
     _deviceArry  =[[NSMutableArray alloc]init];
     
     [self updateUI];
-    [self getSSid];
     //输入框在上面新UI  可去
-    
-   // [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(wifiviewkeyboradWillShow:) name:UIKeyboardWillChangeFrameNotification object:nil];
-    
     _wifiTextFiled.delegate=self;
     _wifiTextFiled.layer.masksToBounds=YES;
     _wifiTextFiled.layer.cornerRadius=5;
@@ -115,18 +112,12 @@ extern BOOL isfromCameraView;
     }
     UIView*phoneView=[[UIView alloc]initWithFrame:CGRectMake(0,0, 9, 10)];
     self.wifiTextFiled.leftView=phoneView;
+    self.wifiTextFiled.textColor = RGB_51;
     self.wifiTextFiled.leftViewMode=UITextFieldViewModeAlways;
 
     [self addTitleViewWithTitle:self.vcTitle];
     
     
-//    UIBarButtonItem*rightItem=[[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"qr"] style:UIBarButtonItemStyleDone target:self action:@selector(rightButtonClickItem:)];
-//    self.navigationItem.rightBarButtonItem=rightItem;
-    //setBackButtonBackgroundImage:[backImage resizableImageWithCapInsets:UIEdgeInsetsMake(0,0,0,0)
-    //self.rightButton
-    //[self.rightItem setBackButtonTitlePositionAdjustment:UIOffsetMake(20,0) forBarMetrics:UIBarMetricsDefault];
-    //[self.rightItem setBackgroundVerticalPositionAdjustment:60 forBarMetrics:UIBarMetricsDefault];
-    
     self.rightButton = [UIButton buttonWithType:UIButtonTypeCustom];
     self.rightButton.frame = CGRectMake(0, 0, 50, 44);
    
@@ -142,6 +133,8 @@ extern BOOL isfromCameraView;
     [self.shuoMingShuBtn addTarget:self action:@selector(shuoMingShuBtnAction:) forControlEvents:UIControlEventTouchUpInside];
     
     [self creatConnectStateUI];
+    //获取WiFi名称
+    [self getSSid];
 }
 
 - (void)updateUI {
@@ -496,6 +489,15 @@ extern BOOL isfromCameraView;
     // 5CCF7F0065CA
     
 }
+-(void)checkLocation{
+    NSString* phoneVersion = [[UIDevice currentDevice] systemVersion];
+    CGFloat version = [phoneVersion floatValue];
+    // 如果是iOS13 未开启地理位置权限 需要提示一下
+    if ([CLLocationManager authorizationStatus] == kCLAuthorizationStatusNotDetermined && version >= 13) {
+      self.locationManager = [[CLLocationManager alloc] init];
+      [self.locationManager requestWhenInUseAuthorization];
+    }
+}
 // refer to http://stackoverflow.com/questions/5198716/iphone-get-ssid-without-private-library
 - (NSDictionary *)fetchNetInfo
 {