杀菌倒计时，恒温温度设定修改

Ifish/controllers/erweima/CreatErWeiMaController.h

@@ -15,6 +15,7 @@
 
 @property (nonatomic,strong) DeviceModel *erdevicemodel;
 @property (nonatomic, strong) NSString *deviceid;
+@property (weak, nonatomic) IBOutlet UILabel *tips;
 
 
 @end

Ifish/controllers/erweima/CreatErWeiMaController.m

@@ -10,6 +10,7 @@
 #import "QRCodeGenerator.h"
 #import "DeviceModel.h"
 #import "UINavigationBar+Background.h"
+#import "IfishDeviceInfo.h"
 @interface CreatErWeiMaController ()
 @property(nonatomic,strong)NSArray*arry;
 @end
@@ -42,8 +43,25 @@
 //    }
     
     //DeviceModel*model=[_arry objectAtIndex:0];//分享选中设备
+    if ([self.erdevicemodel.deviceId isKindOfClass:[NSNumber class]]) {
+        self.erdevicemodel.deviceId=[NSString stringWithFormat:@"%ld",self.erdevicemodel.deviceId.integerValue];
+    }
     NSString*str=[NSString stringWithFormat:@"deviceId=%@",self.erdevicemodel.deviceId.length?self.erdevicemodel.deviceId:[CommonUtils getNotNilStr:self.deviceid]];
     self.erWeiMaView.image=[QRCodeGenerator qrImageForString:str imageSize:self.erWeiMaView.bounds.size.width];
+    if ([self.erdevicemodel.type isEqualToString:DECICE_TYPE_XUANDUO3F])
+    {
+        self.tips.text=@"点击扫一扫，和我一起控制我的宠物笼吧！";
+    }
+    else if (self.deviceid)
+    {
+    self.tips.text=@"点击扫一扫，和我一起控制我的摄像头吧！";
+    }
+    else if (self.deviceid)
+    {
+    self.tips.text=@"点击扫一扫，和我一起控制我的水族箱吧！";
+    }
+
+    
     
 }
 - (void)didReceiveMemoryWarning {

Ifish/controllers/erweima/CreatErWeiMaController.xib

@@ -1,48 +1,51 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="CreatErWeiMaController">
             <connections>
                 <outlet property="erWeiMaView" destination="hze-My-ZuV" id="UYM-4u-hMR"/>
+                <outlet property="tips" destination="6uw-d3-3oM" id="o1N-wz-TYr"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
-            <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+            <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="hze-My-ZuV">
-                    <rect key="frame" x="60" y="150" width="200" height="200"/>
-                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    <rect key="frame" x="107" y="150" width="200" height="200"/>
+                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="200" id="7N3-0U-BEk"/>
                         <constraint firstAttribute="width" constant="200" id="AwJ-0M-W5D"/>
                     </constraints>
                 </imageView>
-                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="IfishQrcLabel.png" translatesAutoresizingMaskIntoConstraints="NO" id="T92-RX-kCw">
-                    <rect key="frame" x="20" y="410" width="280" height="56"/>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6uw-d3-3oM">
+                    <rect key="frame" x="67" y="410" width="280" height="56"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="56" id="pom-vr-A4e"/>
-                        <constraint firstAttribute="width" constant="280" id="wfz-SD-4rR"/>
+                        <constraint firstAttribute="width" constant="280" id="YnI-Yn-2eh"/>
+                        <constraint firstAttribute="height" constant="56" id="p9D-kE-9Rq"/>
                     </constraints>
-                </imageView>
+                    <fontDescription key="fontDescription" type="italicSystem" pointSize="18"/>
+                    <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <nil key="highlightedColor"/>
+                </label>
             </subviews>
-            <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+            <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
-                <constraint firstItem="T92-RX-kCw" firstAttribute="top" secondItem="hze-My-ZuV" secondAttribute="bottom" constant="60" id="98I-uM-O6P"/>
-                <constraint firstItem="T92-RX-kCw" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="Ktd-gL-fpr"/>
+                <constraint firstItem="6uw-d3-3oM" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="CLF-UB-CHZ"/>
                 <constraint firstItem="hze-My-ZuV" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="150" id="aCG-nC-4Dq"/>
+                <constraint firstItem="6uw-d3-3oM" firstAttribute="top" secondItem="hze-My-ZuV" secondAttribute="bottom" constant="60" id="cZN-dp-8TY"/>
                 <constraint firstItem="hze-My-ZuV" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="dkc-Hj-wT7"/>
             </constraints>
-            <point key="canvasLocation" x="388" y="293"/>
+            <point key="canvasLocation" x="562.31884057971024" y="196.20535714285714"/>
         </view>
     </objects>
-    <resources>
-        <image name="IfishQrcLabel.png" width="694" height="137"/>
-    </resources>
 </document>

Ifish/controllers/erweima/ScanViewController.m

@@ -297,7 +297,13 @@
 -(void)shareDeviceWithUserId:(NSNumber*)userId addDeviceId:(NSString*)deviceId{
     
     NSString *userID  =[NSString stringWithFormat:@"%@",userId];
-    [AFHttpTool shareDeviceWhth:userID deviceId:deviceId success:^(id response) {
+    
+    
+    NSString *url = [NSString stringWithFormat:@"%@%@",kshareDeviceByQrCode,userID];
+    NSDictionary*para=@{
+                        @"deviceId":deviceId
+                        };
+    [AFHttpTool requestWihtMethod:RequestMethodTypePost url:url params:para success:^(id response) {
         
         NSDictionary*resultDic=[NSJSONSerialization JSONObjectWithData:response options:NSJSONReadingMutableContainers error:nil];
         NSLog(@"result:%@",resultDic[@"result"]);
@@ -317,6 +323,8 @@
         
     }];
 
+    
+
 }
 - (void)reStartScan
 {