修复了部分UI，阿里推送token，wifi重名的问题

Ifish/controllers/ConnectAauariumVC/ConAquarChooseWiFiVC.m

@@ -102,6 +102,11 @@ Assign BOOL isGoChangeWiFi;//更换为设备的WiFi
 -(void)checkWiFi{
     NSDictionary *ifs = [self getSSIDInfo];
     NSString *wifiName = [ifs objectForKey:@"SSID"];
+    //先判断之前的wifi名称是否和热点的wifi名称重复，如果冲突，则提示wifi名称错误
+    if ([wifiName isEqualToString:self.wifiName]) {
+        [self.view makeToast:@"请先连接设备热点"];
+        return;
+    }
     if ([wifiName rangeOfString:@"ifish"].location!=NSNotFound) {
         //wifi正确，则尝试连接设备
         ConnectingAquarVC *connecting = InitObject(ConnectingAquarVC);

Ifish/controllers/ConnectAauariumVC/ConAquarNowWiFiPwdVC.m

@@ -112,7 +112,6 @@ Strong UIButton *nextBtn;
         _wifiPwdTextField.keyboardType = UIKeyboardTypeAlphabet;
         _wifiPwdTextField.delegate = self;
         _wifiPwdTextField.backgroundColor = XWhite;
-        _wifiPwdTextField.secureTextEntry = YES;
         _wifiPwdTextField.layer.masksToBounds = YES;
         _wifiPwdTextField.layer.cornerRadius = kSizeFrom750(10);
         _wifiPwdTextField.leftViewMode = UITextFieldViewModeAlways;
@@ -160,7 +159,7 @@ Strong UIButton *nextBtn;
 -(void)addContentLabel{
     
     UILabel *preLabel;
-    NSArray *textArr = @[@"1.选择信号较强的2.4G WiFi，将设备和手机尽量靠近路由器，正确填写WiFi密码即可快速让设备联备；",@"2.设备暂不支持5G WiFi，若已连接，请切换2.4G WiFi；",@"3.路由器不能开启如AP隔离、防蹭网、WLAN助手等限制WiFi接入的选项；",@"4.设备暂不支持WAP/WPA2 企业级WiFi，若已连接，请切换其他WiFi。"];
+    NSArray *textArr = @[@"1.选择信号较强的2.4G WiFi，将设备和手机尽量靠近路由器，正确填写WiFi密码即可快速让设备联网；",@"2.设备暂不支持5G WiFi，若已连接，请切换2.4G WiFi；",@"3.路由器不能开启如AP隔离、防蹭网、WLAN助手等限制WiFi接入的选项；",@"4.设备暂不支持WAP/WPA2 企业级WiFi，若已连接，请切换其他WiFi。"];
     for (int i=3; i>=0; i--) {
         UILabel *label = InitObject(UILabel);
         label.text = textArr[i];