替换链接，修改按钮颜色

Ifish.xcodeproj/project.pbxproj

@@ -16101,7 +16101,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = WFX8GD5HFX;
 				ENABLE_BITCODE = NO;
 				ENABLE_TESTABILITY = YES;
@@ -16178,13 +16178,14 @@
 					"$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/libAVCtrl",
 					"$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrl",
 				);
-				MARKETING_VERSION = 5.1.24;
+				MARKETING_VERSION = 5.1.26;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"-ObjC",
 					"-Istdc++",
 					"-force_load",
 					"\"$(PROJECT_DIR)/Ifish/GWP2PSDK/GWP2P.framework/GWP2P\"",
+					"-Wl,-ld_classic",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.shyuying.Ifish8;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -16219,9 +16220,8 @@
 				CLANG_CXX_LIBRARY = "compiler-default";
 				CODE_SIGN_ENTITLEMENTS = Ifish/Ifish.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = WFX8GD5HFX;
 				ENABLE_BITCODE = NO;
 				ENABLE_TESTABILITY = YES;
@@ -16298,13 +16298,14 @@
 					"$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/libAVCtrl",
 					"$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrl",
 				);
-				MARKETING_VERSION = 5.1.24;
+				MARKETING_VERSION = 5.1.26;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"-ObjC",
 					"-Istdc++",
 					"-force_load",
 					"\"$(PROJECT_DIR)/Ifish/GWP2PSDK/GWP2P.framework/GWP2P\"",
+					"-Wl,-ld_classic",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.shyuying.Ifish8;
 				PRODUCT_NAME = "$(TARGET_NAME)";

Ifish/ESPTouch/task/ESPTouchTaskParameter.m

@@ -150,7 +150,8 @@ static int _datagramCount = 0;
         if (self.broadcast) {
             NSString *localInetAddr4 = [ESP_NetUtil getLocalIPv4];
             NSArray *arr = [localInetAddr4 componentsSeparatedByString:@"."];
-            return [NSString stringWithFormat:@"%@.%@.%@.255",arr[0], arr[1], arr[2]];
+            //[NSString stringWithFormat:@"%@.%@.%@.255",arr[0], arr[1], arr[2]];
+            return @"255.255.255.255";
         } else {
             int count = [self __getNextDatagramCount];
             return [NSString stringWithFormat: @"234.%d.%d.%d", count, count, count];

Ifish/Utinitys/IfishHttpRequest/IfishUserDataUnity.m

@@ -199,7 +199,8 @@
         RegistViewController*revv=[[RegistViewController alloc]init];
         revv.isBind=YES;
         revv.isFromLogin=YES;
-        [UIApplication sharedApplication].delegate.window.rootViewController=revv;;
+        UINavigationController*navi = [[UINavigationController alloc]initWithRootViewController:revv];
+        [UIApplication sharedApplication].delegate.window.rootViewController=navi;
     }
     else
     {

Ifish/airkiss/JMAirKissConnection.m

@@ -77,11 +77,7 @@
  */
 - (void)connectAirKissWithSSID:(NSString *)ssidStr
                       password:(NSString *)password {
-    //处理中文的情况
-    if([self validateContainsChinese:ssidStr])
-    {
-        ssidStr = [ssidStr stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
-    }
+   
     NSMutableArray *dataArray = [_airKissEncoder createAirKissEncorderWithSSID:ssidStr ? :@""
                                                                       password:password ? :@""];
 

Ifish/airkiss/JMAirKissEncoder.m

@@ -7,6 +7,7 @@
 //
 
 #import "JMAirKissEncoder.h"
+#import "ESP_CRC8.h"
 
 #define kRandomChar  arc4random() % 127
 
@@ -91,7 +92,14 @@
  */
 - (void)getMagicCodeWithSSID:(NSString *)ssid
                     password:(NSString *)password {
-    UInt8 length       = ssid.length + password.length + 1;
+    
+    NSUInteger numberOfBytes = [ssid lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
+    Byte bytes[numberOfBytes];
+    NSRange range = NSMakeRange(0, numberOfBytes);
+    [ssid getBytes:bytes maxLength:numberOfBytes usedLength:nil encoding:NSUTF8StringEncoding options:0 range:range remainingRange:NULL];
+    NSData *ssidData = [[NSData alloc]initWithBytes:bytes length:numberOfBytes];
+    [ssidData getBytes:bytes length:[ssidData length]];
+    UInt8 length       = numberOfBytes + password.length + 1;
     UInt8 magicCode[4] = {0x00,0x00,0x00,0x00};
     magicCode[0]       = 0x00 | (length >> 4 & 0xF);
     
@@ -101,8 +109,13 @@
     
     magicCode[1]        = 0x10 | (length & 0xF);
 
-    UInt8 *cipherBuffer = (UInt8*)[ssid UTF8String];
-    UInt8 crc8          = CRC8(cipherBuffer, (int)ssid.length);
+    UInt8 *cipherBuffer = (UInt8*)bytes;
+    ESP_CRC8 *crc = [[ESP_CRC8 alloc]init];
+    [crc updateWithBuf:bytes Nbytes:(int)sizeof(bytes)];
+    Byte apSsidCrc = [crc getValue];
+    
+    [crc reset];
+    UInt8 crc8          = apSsidCrc;//CRC8(cipherBuffer, (int)numberOfBytes);
 
     magicCode[2]        = 0x20 | (crc8 >> 4 & 0xF);
     magicCode[3]        = 0x30 | (crc8 & 0xF);

Ifish/controllers/leftcontrollers/ConfigWifiViewController.m

@@ -166,7 +166,7 @@ extern BOOL isfromCameraView;
 
    // [self addTitleViewWithTitle:self.vcTitle];
     
-    
+    [self.connectTypeBtn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
     self.rightButton = [UIButton buttonWithType:UIButtonTypeCustom];
     self.rightButton.frame = CGRectMake(0, 0, 50, 44);
    
@@ -224,18 +224,39 @@ extern BOOL isfromCameraView;
         return;
     }
     WEAK_SELF;
+    NSString*red =@"2、先长按插座复位键3秒，松手后红灯绿灯同时 闪烁,再点确定按钮。";
+    NSString* tips = @"提示:由于新版APP升级，产品包装盒内的说明书可能与新版APP联网方式不同，请以APP界面提示内容为准，也可查看右上角视频教程。";
+    
+    
+    NSString*red2 =@"2、先长按插座复位键13秒左右，松手后红灯绿灯同时熄灭,只有绿灯偶尔闪烁，再点下一步。";
+    NSString* tips2 = @"提示:由于新版APP升级，产品包装盒内的说明书可能与新版APP联网方式不同，请以APP界面提示内容为准，也可查看右上角视频教程。";
     NSString*airkisTitle = @"一键联网";
     NSString*smartTitle = @"快捷联网";
     NSString*apTitle = @"AP联网";
-    NSString*airkisTips = @"1、插座仅支持2.4G的WiFi网络，不支持5G 及 双频合一的网络(需在路由器设置中分开)\n2、先长按插座复位键3秒，松手后红灯绿灯同时 闪烁,再点确定按钮。\n3、如多次尝试一键联网都不成功，可切换其他 联网方式，每次重新连接时插座需断一次电然后重新复位连接。";
+    NSString*airkisTips = @"1、插座仅支持2.4G的WiFi网络，不支持5G 及 双频合一的网络(需在路由器设置中分开)\n2、先长按插座复位键3秒，松手后红灯绿灯同时 闪烁,再点确定按钮。\n3、如多次尝试一键联网都不成功，可切换其他 联网方式，每次重新连接时插座需断一次电然后重新复位连接。\n提示:由于新版APP升级，产品包装盒内的说明书可能与新版APP联网方式不同，请以APP界面提示内容为准，也可查看右上角视频教程。";
     NSString*smartTips = airkisTips;
-    NSString*apTips = @"1、插座仅支持2.4G的WiFi网络，不支持5G 及 双频合一的网络(需在路由器设置中分开)\n2、先长按插座复位键13秒左右，松手后红灯绿灯同时熄灭,只有绿灯偶尔闪烁，再点下一步。";
+    NSString*apTips = @"1、插座仅支持2.4G的WiFi网络，不支持5G 及 双频合一的网络(需在路由器设置中分开)\n2、先长按插座复位键13秒左右，松手后红灯绿灯同时熄灭,只有绿灯偶尔闪烁，再点下一步。\n提示:由于新版APP升级，产品包装盒内的说明书可能与新版APP联网方式不同，请以APP界面提示内容为准，也可查看右上角视频教程。";
+    NSMutableAttributedString*attair = [[NSMutableAttributedString alloc]initWithString:airkisTips attributes:@{NSForegroundColorAttributeName:[UIColor blackColor],NSFontAttributeName:[UIFont systemFontOfSize:16]}];
+    [attair addAttributes:@{NSForegroundColorAttributeName:[UIColor redColor]} range:[airkisTips rangeOfString:red]];
+    [attair addAttributes:@{NSFontAttributeName:[UIFont systemFontOfSize:11]} range:[airkisTips rangeOfString:tips]];
+    
+    
+    
+    NSMutableAttributedString*attap = [[NSMutableAttributedString alloc]initWithString:apTips attributes:@{NSForegroundColorAttributeName:[UIColor blackColor],NSFontAttributeName:[UIFont systemFontOfSize:16]}];
+    [attap addAttributes:@{NSForegroundColorAttributeName:[UIColor redColor]} range:[apTips rangeOfString:red2]];
+    [attap addAttributes:@{NSFontAttributeName:[UIFont systemFontOfSize:11]} range:[apTips rangeOfString:tips2]];
+    
+    
+    
     SPAlertController*alert  =[SPAlertController alertControllerWithTitle:nil message:nil preferredStyle:SPAlertControllerStyleActionSheet animationType:SPAlertAnimationTypeDefault];
     SPAlertAction*airkiss =[SPAlertAction actionWithTitle:airkisTitle style:SPAlertActionStyleDefault handler:^(SPAlertAction * _Nonnull action) {
         [weakSelf connectNormalView];
         weakSelf.connectType = ConnectTypeAirKiss;
         weakSelf.connectTypeTitle.text = airkisTitle;
-        weakSelf.connectTipLbl.text = airkisTips;
+        weakSelf.connectTipLbl.text = nil;
+        weakSelf.connectTipLbl.attributedText = attair;
+        //展示一键联网
+        weakSelf.shuoMingShuBtn.hidden = NO;
         [weakSelf.connectBtn setTitle:@"确定" forState:UIControlStateNormal];
     }];
     
@@ -243,16 +264,22 @@ extern BOOL isfromCameraView;
     SPAlertAction*smart =[SPAlertAction actionWithTitle:smartTitle style:SPAlertActionStyleDefault handler:^(SPAlertAction * _Nonnull action) {
         [weakSelf connectNormalView];
         weakSelf.connectType = ConnectTypeSmartConfig;
+        weakSelf.shuoMingShuBtn.hidden = YES;
         weakSelf.connectTypeTitle.text = smartTitle;
-        weakSelf.connectTipLbl.text = smartTips;
+        weakSelf.connectTipLbl.text = nil;
+        weakSelf.connectTipLbl.attributedText = attair;
+       
         [weakSelf.connectBtn setTitle:@"确定" forState:UIControlStateNormal];
     }];
 
     SPAlertAction*ap =[SPAlertAction actionWithTitle:apTitle style:SPAlertActionStyleDefault handler:^(SPAlertAction * _Nonnull action) {
         [weakSelf connectNormalView];
         weakSelf.connectType = ConnectTypeAP;
+        weakSelf.shuoMingShuBtn.hidden = NO;
         weakSelf.connectTypeTitle.text = apTitle;
-        weakSelf.connectTipLbl.text = apTips;
+        weakSelf.connectTipLbl.text = nil;
+        weakSelf.connectTipLbl.attributedText = attap;
+        
         [weakSelf.connectBtn setTitle:@"下一步" forState:UIControlStateNormal];
     }];
     SPAlertAction*cancel =[SPAlertAction actionWithTitle:@"取消" style:SPAlertActionStyleCancel handler:^(SPAlertAction * _Nonnull action) {
@@ -274,17 +301,16 @@ extern BOOL isfromCameraView;
 
 -(IBAction)shuoMingShuBtnAction:(UIButton *)btn{
     
-//    PushMasssageWebViewController*webVC=[[PushMasssageWebViewController alloc]init];
-//    webVC.pushlink =IFISH_DEVCEITROURL;
-//    webVC.pushtitle = NSLocalizedString(@"ifish_deviceuse", nil);;
-//
-//    [self.navigationController pushViewController:webVC animated:YES];
-    
-    InfoByImageViewController*info=[[InfoByImageViewController alloc]init];
-    info.title=NSLocalizedString(@"ifish_deviceuse", nil);;;
-    info.type=@"instruction";
-    info.image=[UIImage imageNamed:@"instruction"];
-    [self.navigationController pushViewController:info animated:YES];
+
+    NSString*videourl = @"https://www.ifish7.com/download/s3.mp4";
+    if(self.connectType == ConnectTypeAP)
+    {
+        videourl = @"https://www.ifish7.com/download/s4.mp4";
+    }
+    NSURL*url = [NSURL URLWithString:videourl];
+    [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:^(BOOL success) {
+            
+    }];
 
 }
 //ap模式
@@ -497,10 +523,10 @@ extern BOOL isfromCameraView;
     }
     [_wifiTextFiled resignFirstResponder];
     NSString *ssidName = @"";
-    if (_ssid.length>2) {
-        ssidName= [_ssid substringWithRange:NSMakeRange(_ssid.length-2, 2)];
+    if (_ssid.length>3) {
+        ssidName= [_ssid substringWithRange:NSMakeRange(_ssid.length-3, 3)];
     }
-    if ([ssidName.uppercaseString isEqualToString:@"5G"]) {
+    if ([ssidName.uppercaseString isEqualToString:@"-5G"]) {
         UIAlertView *alert= [[UIAlertView alloc] initWithTitle:@"" message:@"仅支持2.4G WI-Fi网络,请重新选择" delegate:nil cancelButtonTitle:@"去更改" otherButtonTitles:nil, nil];
         [alert show];
         return;

Ifish/controllers/leftcontrollers/ConfigWifiViewController.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -32,13 +32,13 @@
             <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="a2I-Bk-68I" userLabel="shuoMingShuBtn">
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="a2I-Bk-68I" userLabel="shuoMingShuBtn">
                     <rect key="frame" x="215" y="25" width="100" height="40"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="40" id="Keg-ao-If4"/>
                         <constraint firstAttribute="width" constant="100" id="MZZ-Qp-awh"/>
                     </constraints>
-                    <color key="tintColor" systemColor="labelColor"/>
+                    <color key="tintColor" systemColor="systemRedColor"/>
                     <state key="normal" title="Button"/>
                     <buttonConfiguration key="configuration" style="plain" title="联网视频"/>
                     <connections>
@@ -113,14 +113,294 @@
                     <nil key="textColor"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5UF-8K-mpU" userLabel="connectTipLbl">
-                    <rect key="frame" x="40" y="268" width="240" height="191"/>
-                    <string key="text">1、插座仅支持2.4G的WiFi网络，不支持5G 及 双频合一的网络(需在路由器设置中分开)
-2、先长按插座复位键3秒，松手后红灯绿灯同时 闪烁,再点确定按钮。
-3、如多次尝试一键联网都不成功，可切换其他 联网方式，每次重新连接时插座需断一次电
-然后重新复位连接。</string>
-                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                    <color key="textColor" systemColor="systemGrayColor"/>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5UF-8K-mpU" userLabel="connectTipLbl">
+                    <rect key="frame" x="40" y="268" width="270" height="256.5"/>
+                    <attributedString key="attributedText">
+                        <fragment content="1">
+                            <attributes>
+                                <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <font key="NSFont" metaFont="system" size="16"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment content="、插座仅支持">
+                            <attributes>
+                                <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <font key="NSFont" metaFont="system" size="16"/>
+                                <font key="NSOriginalFont" metaFont="system" size="16"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment content="2.4G">
+                            <attributes>
+                                <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <font key="NSFont" metaFont="system" size="16"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment content="的">
+                            <attributes>
+                                <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <font key="NSFont" metaFont="system" size="16"/>
+                                <font key="NSOriginalFont" metaFont="system" size="16"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment content="WiFi">
+                            <attributes>
+                                <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <font key="NSFont" metaFont="system" size="16"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment content="网络，不支持">
+                            <attributes>
+                                <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <font key="NSFont" metaFont="system" size="16"/>
+                                <font key="NSOriginalFont" metaFont="system" size="16"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment content="5G ">
+                            <attributes>
+                                <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <font key="NSFont" metaFont="system" size="16"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment content="及">
+                            <attributes>
+                                <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <font key="NSFont" metaFont="system" size="16"/>
+                                <font key="NSOriginalFont" metaFont="system" size="16"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment content=" ">
+                            <attributes>
+                                <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <font key="NSFont" metaFont="system" size="16"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment content="双频合一的网络">
+                            <attributes>
+                                <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <font key="NSFont" metaFont="system" size="16"/>
+                                <font key="NSOriginalFont" metaFont="system" size="16"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment content="(">
+                            <attributes>
+                                <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <font key="NSFont" metaFont="system" size="16"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment content="需在路由器设置中分开">
+                            <attributes>
+                                <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <font key="NSFont" metaFont="system" size="16"/>
+                                <font key="NSOriginalFont" metaFont="system" size="16"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment>
+                            <string key="content">)
+</string>
+                            <attributes>
+                                <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <font key="NSFont" metaFont="system" size="16"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment content="2">
+                            <attributes>
+                                <color key="NSColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <font key="NSFont" metaFont="system" size="16"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment content="、先长按插座复位键">
+                            <attributes>
+                                <color key="NSColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <font key="NSFont" metaFont="system" size="16"/>
+                                <font key="NSOriginalFont" metaFont="system" size="16"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment content="3">
+                            <attributes>
+                                <color key="NSColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <font key="NSFont" metaFont="system" size="16"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment content="秒，松手后红灯绿灯同时">
+                            <attributes>
+                                <color key="NSColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <font key="NSFont" metaFont="system" size="16"/>
+                                <font key="NSOriginalFont" metaFont="system" size="16"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment content=" ">
+                            <attributes>
+                                <color key="NSColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <font key="NSFont" metaFont="system" size="16"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment content="闪烁">
+                            <attributes>
+                                <color key="NSColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <font key="NSFont" metaFont="system" size="16"/>
+                                <font key="NSOriginalFont" metaFont="system" size="16"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment content=",">
+                            <attributes>
+                                <color key="NSColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <font key="NSFont" metaFont="system" size="16"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment content="再点确定按钮。">
+                            <attributes>
+                                <color key="NSColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <font key="NSFont" metaFont="system" size="16"/>
+                                <font key="NSOriginalFont" metaFont="system" size="16"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment>
+                            <string key="content">
+3</string>
+                            <attributes>
+                                <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <font key="NSFont" metaFont="system" size="16"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment content="、如多次尝试一键联网都不成功，可切换其他">
+                            <attributes>
+                                <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <font key="NSFont" metaFont="system" size="16"/>
+                                <font key="NSOriginalFont" metaFont="system" size="16"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment content=" ">
+                            <attributes>
+                                <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <font key="NSFont" metaFont="system" size="16"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment content="联网方式，每次重新连接时插座需断一次电">
+                            <attributes>
+                                <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <font key="NSFont" metaFont="system" size="16"/>
+                                <font key="NSOriginalFont" metaFont="system" size="16"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment>
+                            <string key="content" base64-UTF8="YES">
+Cg
+</string>
+                            <attributes>
+                                <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <font key="NSFont" metaFont="system" size="16"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment content="然后重新复位连接。">
+                            <attributes>
+                                <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <font key="NSFont" metaFont="system" size="16"/>
+                                <font key="NSOriginalFont" metaFont="system" size="16"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment content="


">
+                            <attributes>
+                                <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <font key="NSFont" metaFont="system" size="16"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment content="提示">
+                            <attributes>
+                                <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <font key="NSFont" size="11" name="PingFangSC-Regular"/>
+                                <font key="NSOriginalFont" metaFont="system" size="16"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment content=":">
+                            <attributes>
+                                <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <font key="NSFont" size="11" name="PingFangSC-Regular"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment content="由于新版">
+                            <attributes>
+                                <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <font key="NSFont" size="11" name="PingFangSC-Regular"/>
+                                <font key="NSOriginalFont" metaFont="system" size="16"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment content="APP">
+                            <attributes>
+                                <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <font key="NSFont" size="11" name="PingFangSC-Regular"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment content="升级，产品包装盒内的说明书可能与新版">
+                            <attributes>
+                                <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <font key="NSFont" size="11" name="PingFangSC-Regular"/>
+                                <font key="NSOriginalFont" metaFont="system" size="16"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment content="APP">
+                            <attributes>
+                                <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <font key="NSFont" size="11" name="PingFangSC-Regular"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment content="联网方式不同，请以">
+                            <attributes>
+                                <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <font key="NSFont" size="11" name="PingFangSC-Regular"/>
+                                <font key="NSOriginalFont" metaFont="system" size="16"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment content="APP">
+                            <attributes>
+                                <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <font key="NSFont" size="11" name="PingFangSC-Regular"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                        <fragment content="界面提示内容为准，也可查看右上角视频教程。">
+                            <attributes>
+                                <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <font key="NSFont" size="11" name="PingFangSC-Regular"/>
+                                <font key="NSOriginalFont" metaFont="system" size="16"/>
+                                <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                            </attributes>
+                        </fragment>
+                    </attributedString>
                     <nil key="highlightedColor"/>
                 </label>
                 <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6tu-I5-SeJ" userLabel="connectingView">
@@ -244,7 +524,7 @@
                 <constraint firstItem="kvd-IO-pFg" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="ItS-yz-iS6"/>
                 <constraint firstItem="Dv9-sQ-6QZ" firstAttribute="top" secondItem="GWP-4K-9X8" secondAttribute="bottom" id="JdG-rw-7pj"/>
                 <constraint firstItem="GWP-4K-9X8" firstAttribute="top" secondItem="bau-WU-WAP" secondAttribute="bottom" id="Jud-yA-Dhw"/>
-                <constraint firstItem="Q5M-cg-NOt" firstAttribute="trailing" secondItem="HuT-1B-gI8" secondAttribute="trailing" constant="30" id="Jwb-UH-UZV"/>
+                <constraint firstItem="HuT-1B-gI8" firstAttribute="trailing" secondItem="Q5M-cg-NOt" secondAttribute="trailing" constant="-30" id="Jwb-UH-UZV"/>
                 <constraint firstItem="504-kU-hp3" firstAttribute="top" secondItem="GWP-4K-9X8" secondAttribute="bottom" constant="56" id="NlV-Pp-gJe"/>
                 <constraint firstItem="GWP-4K-9X8" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="Nn7-ML-5NQ"/>
                 <constraint firstItem="GWP-4K-9X8" firstAttribute="top" secondItem="jcI-qI-bgh" secondAttribute="bottom" id="PMc-8l-dZ5"/>
@@ -267,7 +547,7 @@
                 <constraint firstItem="D54-Zo-SRM" firstAttribute="top" secondItem="Q5M-cg-NOt" secondAttribute="top" constant="10" id="ns7-Yx-wip"/>
                 <constraint firstItem="KU2-2N-7iz" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="obb-p1-4XH"/>
                 <constraint firstItem="504-kU-hp3" firstAttribute="top" secondItem="O5l-oe-jwK" secondAttribute="bottom" id="oyF-cp-igt"/>
-                <constraint firstItem="Q5M-cg-NOt" firstAttribute="trailing" secondItem="5UF-8K-mpU" secondAttribute="trailing" constant="40" id="qdx-A1-MzN"/>
+                <constraint firstItem="5UF-8K-mpU" firstAttribute="trailing" secondItem="Q5M-cg-NOt" secondAttribute="trailing" constant="-10" id="qdx-A1-MzN"/>
                 <constraint firstItem="Q5M-cg-NOt" firstAttribute="bottom" secondItem="kvd-IO-pFg" secondAttribute="bottom" constant="30" id="sHh-eQ-MJM"/>
                 <constraint firstItem="bau-WU-WAP" firstAttribute="leading" secondItem="d6V-cd-toE" secondAttribute="leading" id="tSj-er-HwA"/>
                 <constraint firstItem="HuT-1B-gI8" firstAttribute="bottom" secondItem="kvd-IO-pFg" secondAttribute="top" constant="-15" id="v1E-Ff-HYR"/>
@@ -285,16 +565,19 @@
     </objects>
     <resources>
         <systemColor name="labelColor">
-            <color red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
         <systemColor name="systemGrayColor">
-            <color red="0.55686274509803924" green="0.55686274509803924" blue="0.57647058823529407" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.5568627451" green="0.5568627451" blue="0.57647058819999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
         <systemColor name="systemPinkColor">
-            <color red="1" green="0.17647058823529413" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="1" green="0.1764705882" blue="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
+        <systemColor name="systemRedColor">
+            <color red="1" green="0.23137254900000001" blue="0.18823529410000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
     </resources>
 </document>

Ifish/controllers/logAddRegistController/RegistViewController.mm

@@ -85,7 +85,7 @@ extern BOOL formLogIn;
 }
 - (void)viewDidLoad {
     [super viewDidLoad];
-
+    [self.navigationController setNavbgImage:[UIImage imageNamed:@"blackbar.png"]];
     [MobSDK uploadPrivacyPermissionStatus:YES onResult:^(BOOL success) {
     }];
     _deviceArry=[[NSMutableArray alloc]init];
@@ -365,13 +365,14 @@ extern BOOL formLogIn;
 -(void)rightButtonClick:(UIButton *)sender{
     if (self.isBind)
     {
-        [[IfishUserDataUnity shareDataInstance] setAppTabRoot];
+       
         NSUserDefaults*userDefsult=[NSUserDefaults standardUserDefaults];
         UserModel*model=[dataContorl getUserInfo];
         if (model.unionId)
         {
             [userDefsult setBool:YES forKey:model.unionId];
             [userDefsult synchronize];
+            [[IfishUserDataUnity shareDataInstance] setAppTabRoot];
         }
     }