diff --git a/Ifish/Assets.xcassets/hotspotconnect.imageset/4251531889028_.pic.jpg b/Ifish/Assets.xcassets/hotspotconnect.imageset/4251531889028_.pic.jpg
new file mode 100644
index 0000000..810526a
Binary files /dev/null and b/Ifish/Assets.xcassets/hotspotconnect.imageset/4251531889028_.pic.jpg differ
diff --git a/Ifish/Assets.xcassets/hotspotconnect.imageset/Contents.json b/Ifish/Assets.xcassets/hotspotconnect.imageset/Contents.json
new file mode 100644
index 0000000..596bab8
--- /dev/null
+++ b/Ifish/Assets.xcassets/hotspotconnect.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "filename" : "4251531889028_.pic.jpg",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m
index 61558bc..ea15206 100644
--- a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m
+++ b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m
@@ -33,7 +33,7 @@
CGFloat width = size.width;
UIGraphicsBeginImageContext(size);
CGContextSetLineCap(UIGraphicsGetCurrentContext(), kCGLineCapRound);
- CGFloat lengths[] = {10,5};
+ CGFloat lengths[] = {2,2};
CGContextRef line = UIGraphicsGetCurrentContext();
CGContextSetStrokeColorWithColor(line, [UIColor colorWithRed:133/255.0 green:133/255.0 blue:133/255.0 alpha:1.0].CGColor);
CGContextSetLineDash(line, 0, lengths, 1);
@@ -55,7 +55,7 @@
// 键盘的frame
CGRect keyboardF = [userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue];
- keyboardF = [self.view convertRect:keyboardF fromView:self.view];
+ keyboardF = [self.view convertRect:keyboardF fromView:[UIApplication sharedApplication].keyWindow];
CGRect containerViewF = [self.view convertRect:self.containerView.frame fromView:self.scrollView];
CGFloat miniSpacing = 4;
diff --git a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.xib b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.xib
index dc2349a..221cb98 100644
--- a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.xib
+++ b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.xib
@@ -6,7 +6,6 @@
-
@@ -29,73 +28,76 @@
-
+
-
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
+
+
+
+
+
@@ -103,11 +105,12 @@
-
-
+
+
+
-
+
@@ -115,44 +118,45 @@
-
-
+
+
+
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
-
+
-
-
+
+
-
+
@@ -190,4 +194,7 @@
+
+
+