root/ifish
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新版本

Browse Source
This commit is contained in:
roy
2019-03-12 09:26:46 +08:00
parent cbbfcb098a
commit c08d198e11
431 changed files with 19432 additions and 9136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ifish/controllers/leftcontrollers/.DS_Store
Vendored
BIN
View File
Binary file not shown.
Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m
+10 -2
View File
@@ -60,6 +60,13 @@
UITapGestureRecognizer *fiveTapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(test)];
fiveTapGesture.numberOfTapsRequired = 5;
[self.containerView addGestureRecognizer:fiveTapGesture];
UIImage *hamburger = [[UIImage imageNamed:@"back_btn"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
self.navigationItem.leftBarButtonItem=[[UIBarButtonItem alloc]initWithImage:hamburger style:0 target:self action:@selector(clickBack)];
}
-(void)clickBack{
[self.navigationController popViewControllerAnimated:YES];
}
- (void)test {
@@ -169,7 +176,7 @@
[self appendTrakContent:[NSString stringWithFormat:@"答复状态码:%@", backModel.result]];
[self appendTrakContent:[NSString stringWithFormat:@"答复Mac地址:%@", backModel.senderMacAddress]];
self.macAddress = backModel.senderMacAddress;
[IFishHotpotUDPHelper sharedInstance].delegate = nil;
[[IFishHotpotUDPHelper sharedInstance] broadCastRestartCommand];
self.bindTimer = [NSTimer scheduledTimerWithTimeInterval:1.0 target:self selector:@selector(startBinding) userInfo:nil repeats:YES];
@@ -246,7 +253,8 @@
self.HUD.labelText = @"设备不在服务器";
}else{
self.HUD.labelText = @"设备绑定成功";
self.HUD.labelText = @"设备绑定成功";
[[IfishDataUnity shareDataInstance] initAppCenterVcWith:devicemodel addWithdissMisVc:nil];
//绑定成功 加 经验值
Ifish/controllers/leftcontrollers/ConnectHotpotViewController.xib
+2 -5
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
@@ -31,7 +31,7 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1Km-pH-09L">
<rect key="frame" x="0.0" y="35" width="375" height="251.5"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" image="hotspotconnect" translatesAutoresizingMaskIntoConstraints="NO" id="YQa-dk-iMD">
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="YQa-dk-iMD">
<rect key="frame" x="21" y="20" width="16" height="16"/>
<constraints>
<constraint firstAttribute="width" constant="16" id="CtN-fF-qWh"/>
@@ -201,7 +201,4 @@
<point key="canvasLocation" x="46.5" y="98.5"/>
</view>
</objects>
<resources>
<image name="hotspotconnect" width="19" height="17"/>
</resources>
</document>
Ifish/controllers/leftcontrollers/ConnectHotspotTipViewController.xib
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
Ifish/controllers/leftcontrollers/IFishHotpotUDPHelper.m
-1
View File
@@ -118,7 +118,6 @@
-(void)sendConnectHotspotSoketdata{
NSString* hostS = @"192.168.4.1";
//120.55.190.56 服务器IP 指令中用
ConnectHotspotModel *model = [ConnectHotspotModel new];
model.ssidName = _ssidName;
Ifish/controllers/leftcontrollers/SecondConnectWifiController.h
+2
View File
@@ -13,6 +13,7 @@
@property (weak, nonatomic) IBOutlet UIImageView *wifigifImgView;
@property (weak, nonatomic) IBOutlet UILabel *wifiNamelabel;
@property (weak, nonatomic) IBOutlet UITextField *wifiTextFiled;
@property (weak, nonatomic) IBOutlet UILabel *redTextLable;
- (IBAction)makeSureButton:(id)sender;
@@ -28,6 +29,7 @@
@property (weak, nonatomic) IBOutlet UIImageView *nodImg;
@property (weak, nonatomic) IBOutlet UILabel *connectTipLbl;
@property (weak, nonatomic) IBOutlet UIButton *connectBtn;
@property(nonatomic,copy)NSString*vcTitle;
@end
Ifish/controllers/leftcontrollers/SecondConnectWifiController.m
+9 -3
View File
@@ -113,7 +113,7 @@ extern BOOL isfromCameraView;
self.wifiTextFiled.leftView=phoneView;
self.wifiTextFiled.leftViewMode=UITextFieldViewModeAlways;
[self addTitleViewWithTitle:@"连接水族箱"];
[self addTitleViewWithTitle:self.vcTitle];
// UIBarButtonItem*rightItem=[[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"qr"] style:UIBarButtonItemStyleDone target:self action:@selector(rightButtonClickItem:)];
@@ -207,6 +207,7 @@ extern BOOL isfromCameraView;
self.connectBtn.hidden = NO;
self.shareButton.hidden = NO;
self.nodImg.hidden = NO;
self.redTextLable.hidden=NO;
}else{
@@ -224,7 +225,7 @@ extern BOOL isfromCameraView;
self.connectBtn.hidden = NO;
self.shareButton.hidden = NO;
self.nodImg.hidden = NO;
self.redTextLable.hidden=NO;
}];
}
@@ -251,6 +252,7 @@ extern BOOL isfromCameraView;
self.connectBtn.hidden = YES;
self.shareButton.hidden = YES;
self.nodImg.hidden = YES;
self.redTextLable.hidden=YES;
}
@@ -418,7 +420,7 @@ extern BOOL isfromCameraView;
}
- (IBAction)lickHereBtnClicked:(id)sender {
ConnectHotpotViewController *vc = [[ConnectHotpotViewController alloc] initWithNibName:@"ConnectHotpotViewController" bundle:nil];
ConnectHotpotViewController *vc = [[ConnectHotpotViewController alloc] init];
vc.ssid = self.ssid;
vc.bssid = self.bssid;
[self.navigationController pushViewController:vc animated:YES];
@@ -731,6 +733,10 @@ extern BOOL isfromCameraView;
}
-(void)bindDeviceSus{
}
-(void)setRootViewBindFromCameraView{
Ifish/controllers/leftcontrollers/SecondConnectWifiController.xib
+25 -11
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
@@ -14,6 +14,7 @@
<outlet property="connectBtn" destination="eDA-Ia-DAy" id="twz-Z9-3oO"/>
<outlet property="connectTipLbl" destination="dwN-It-iak" id="hMH-hE-W8C"/>
<outlet property="nodImg" destination="ZVX-4y-CYu" id="XQa-yT-9oP"/>
<outlet property="redTextLable" destination="Djf-KM-um4" id="yHh-E2-AhS"/>
<outlet property="shareButton" destination="pAw-UG-caT" id="1p5-yY-6Wq"/>
<outlet property="shuoMingShuBtn" destination="38a-MZ-Nbp" id="g7n-n1-KcQ"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
@@ -28,21 +29,21 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder=" 请输入WiFi密码" minimumFontSize="17" clearButtonMode="whileEditing" id="pTf-KM-cQt">
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder=" 请输入WiFi密码" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="pTf-KM-cQt">
<rect key="frame" x="16" y="133" width="343" height="43"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.94901960784313721" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<textInputTraits key="textInputTraits"/>
</textField>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="如果连接有问题，请尝试热点连接模式" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dwN-It-iak">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="如果连接有问题，请尝试热点连接模式" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dwN-It-iak">
<rect key="frame" x="16" y="182" width="217" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="eDA-Ia-DAy">
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eDA-Ia-DAy">
<rect key="frame" x="225" y="182" width="63" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
@@ -51,19 +52,19 @@
<action selector="lickHereBtnClicked:" destination="-1" eventType="touchUpInside" id="YeL-tw-ThH"/>
</connections>
</button>
<view contentMode="scaleToFill" misplaced="YES" id="rxi-ML-YUX" customClass="LXWaveProgressView">
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="rxi-ML-YUX" customClass="LXWaveProgressView">
<rect key="frame" x="0.0" y="184" width="375" height="61"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
</view>
<imageView contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="linkingdevice_setting.png" id="GjE-5B-hb8">
<imageView contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="linkingdevice_setting.png" translatesAutoresizingMaskIntoConstraints="NO" id="GjE-5B-hb8">
<rect key="frame" x="0.0" y="243" width="375" height="426"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="38a-MZ-Nbp">
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="38a-MZ-Nbp">
<rect key="frame" x="16" y="493" width="178" height="154"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES"/>
</button>
<button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="pAw-UG-caT">
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pAw-UG-caT">
<rect key="frame" x="267" y="133" width="92" height="43"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
<state key="normal" title="确定" backgroundImage="linkingdevice_botton.png"/>
@@ -71,24 +72,37 @@
<action selector="makeSureButton:" destination="-1" eventType="touchUpInside" id="MmM-3q-5Lu"/>
</connections>
</button>
<view contentMode="scaleToFill" misplaced="YES" id="JXU-MG-jdb">
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="JXU-MG-jdb">
<rect key="frame" x="260" y="133" width="6" height="43"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="ssidLabel" lineBreakMode="tailTruncation" adjustsFontSizeToFit="NO" id="dLX-z3-jjZ">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="ssidLabel" lineBreakMode="tailTruncation" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dLX-z3-jjZ">
<rect key="frame" x="23" y="79" width="336" height="36"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="linkingdevice_point.png" id="ZVX-4y-CYu">
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="linkingdevice_point.png" translatesAutoresizingMaskIntoConstraints="NO" id="ZVX-4y-CYu">
<rect key="frame" x="12" y="92" width="10" height="10"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="(暂不支持5G网络，请使用2.4G网络）" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Djf-KM-um4">
<rect key="frame" x="23" y="112" width="224" height="16"/>
<constraints>
<constraint firstAttribute="width" constant="224" id="eda-0s-uHB"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="Djf-KM-um4" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="23" id="Om3-mg-wDG"/>
<constraint firstItem="Djf-KM-um4" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="112" id="bPy-nD-6Ia"/>
</constraints>
<point key="canvasLocation" x="-422.5" y="214.5"/>
</view>
</objects>
Ifish/controllers/leftcontrollers/tip.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 689 KiB

After

Width:  |  Height:  |  Size: 782 KiB