Commit 042af6bd authored by Sandy's avatar Sandy

增加手表扫码登录功能

parent 8be817f7
...@@ -58,6 +58,8 @@ ...@@ -58,6 +58,8 @@
8FC2BDC31E1285F700A879C1 /* CodeScan.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 8FC2BDC21E1285F700A879C1 /* CodeScan.bundle */; }; 8FC2BDC31E1285F700A879C1 /* CodeScan.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 8FC2BDC21E1285F700A879C1 /* CodeScan.bundle */; };
8FC2BDC61E13847800A879C1 /* CardView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FC2BDC51E13847800A879C1 /* CardView.m */; }; 8FC2BDC61E13847800A879C1 /* CardView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FC2BDC51E13847800A879C1 /* CardView.m */; };
8FC2BDC91E13884000A879C1 /* CardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FC2BDC81E13884000A879C1 /* CardViewController.m */; }; 8FC2BDC91E13884000A879C1 /* CardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FC2BDC81E13884000A879C1 /* CardViewController.m */; };
8FCE61651E24C158004B536C /* WatchLoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FCE61641E24C158004B536C /* WatchLoginViewController.m */; };
8FCE61661E24C158004B536C /* WatchLoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FCE61641E24C158004B536C /* WatchLoginViewController.m */; };
8FED4FB91E1223D900591647 /* GuideViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FED4FB81E1223D900591647 /* GuideViewController.m */; }; 8FED4FB91E1223D900591647 /* GuideViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FED4FB81E1223D900591647 /* GuideViewController.m */; };
8FED4FBC1E1246BC00591647 /* BillListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FED4FBB1E1246BC00591647 /* BillListViewController.m */; }; 8FED4FBC1E1246BC00591647 /* BillListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FED4FBB1E1246BC00591647 /* BillListViewController.m */; };
8FED4FBF1E124BFE00591647 /* BillListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FED4FBE1E124BFE00591647 /* BillListTableViewCell.m */; }; 8FED4FBF1E124BFE00591647 /* BillListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FED4FBE1E124BFE00591647 /* BillListTableViewCell.m */; };
...@@ -234,6 +236,8 @@ ...@@ -234,6 +236,8 @@
8FC2BDC51E13847800A879C1 /* CardView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CardView.m; sourceTree = "<group>"; }; 8FC2BDC51E13847800A879C1 /* CardView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CardView.m; sourceTree = "<group>"; };
8FC2BDC71E13884000A879C1 /* CardViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CardViewController.h; sourceTree = "<group>"; }; 8FC2BDC71E13884000A879C1 /* CardViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CardViewController.h; sourceTree = "<group>"; };
8FC2BDC81E13884000A879C1 /* CardViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CardViewController.m; sourceTree = "<group>"; }; 8FC2BDC81E13884000A879C1 /* CardViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CardViewController.m; sourceTree = "<group>"; };
8FCE61631E24C158004B536C /* WatchLoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WatchLoginViewController.h; sourceTree = "<group>"; };
8FCE61641E24C158004B536C /* WatchLoginViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WatchLoginViewController.m; sourceTree = "<group>"; };
8FED4FB71E1223D900591647 /* GuideViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GuideViewController.h; sourceTree = "<group>"; }; 8FED4FB71E1223D900591647 /* GuideViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GuideViewController.h; sourceTree = "<group>"; };
8FED4FB81E1223D900591647 /* GuideViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GuideViewController.m; sourceTree = "<group>"; }; 8FED4FB81E1223D900591647 /* GuideViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GuideViewController.m; sourceTree = "<group>"; };
8FED4FBA1E1246BC00591647 /* BillListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BillListViewController.h; sourceTree = "<group>"; }; 8FED4FBA1E1246BC00591647 /* BillListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BillListViewController.h; sourceTree = "<group>"; };
...@@ -528,6 +532,8 @@ ...@@ -528,6 +532,8 @@
8FC2BD901E125F0500A879C1 /* ScanViewController.m */, 8FC2BD901E125F0500A879C1 /* ScanViewController.m */,
8FC2BDC71E13884000A879C1 /* CardViewController.h */, 8FC2BDC71E13884000A879C1 /* CardViewController.h */,
8FC2BDC81E13884000A879C1 /* CardViewController.m */, 8FC2BDC81E13884000A879C1 /* CardViewController.m */,
8FCE61631E24C158004B536C /* WatchLoginViewController.h */,
8FCE61641E24C158004B536C /* WatchLoginViewController.m */,
); );
path = ViewControllers; path = ViewControllers;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -905,6 +911,7 @@ ...@@ -905,6 +911,7 @@
8FC2BD911E125F0500A879C1 /* ScanViewController.m in Sources */, 8FC2BD911E125F0500A879C1 /* ScanViewController.m in Sources */,
8FC2BDC61E13847800A879C1 /* CardView.m in Sources */, 8FC2BDC61E13847800A879C1 /* CardView.m in Sources */,
8FC2BDBD1E12840300A879C1 /* LBXScanViewController.m in Sources */, 8FC2BDBD1E12840300A879C1 /* LBXScanViewController.m in Sources */,
8FCE61651E24C158004B536C /* WatchLoginViewController.m in Sources */,
8FC2BDC91E13884000A879C1 /* CardViewController.m in Sources */, 8FC2BDC91E13884000A879C1 /* CardViewController.m in Sources */,
8F81056E1E110174009A2AB3 /* DateTextField.m in Sources */, 8F81056E1E110174009A2AB3 /* DateTextField.m in Sources */,
8F42C0001E0D255200A54D40 /* BaseViewController.m in Sources */, 8F42C0001E0D255200A54D40 /* BaseViewController.m in Sources */,
...@@ -978,6 +985,7 @@ ...@@ -978,6 +985,7 @@
8FFE3DDE1E14AC6700BEB6A6 /* ScanViewController.m in Sources */, 8FFE3DDE1E14AC6700BEB6A6 /* ScanViewController.m in Sources */,
8FFE3DDF1E14AC6700BEB6A6 /* CardView.m in Sources */, 8FFE3DDF1E14AC6700BEB6A6 /* CardView.m in Sources */,
8FFE3DE01E14AC6700BEB6A6 /* LBXScanViewController.m in Sources */, 8FFE3DE01E14AC6700BEB6A6 /* LBXScanViewController.m in Sources */,
8FCE61661E24C158004B536C /* WatchLoginViewController.m in Sources */,
8FFE3DE11E14AC6700BEB6A6 /* CardViewController.m in Sources */, 8FFE3DE11E14AC6700BEB6A6 /* CardViewController.m in Sources */,
8FFE3DE21E14AC6700BEB6A6 /* DateTextField.m in Sources */, 8FFE3DE21E14AC6700BEB6A6 /* DateTextField.m in Sources */,
8FFE3DE31E14AC6700BEB6A6 /* BaseViewController.m in Sources */, 8FFE3DE31E14AC6700BEB6A6 /* BaseViewController.m in Sources */,
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="mts-cR-GxO"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="mts-cR-GxO">
<device id="retina4_7" orientation="portrait"> <device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/> <adaptation id="fullscreen"/>
</device> </device>
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/> <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
</constraints> </constraints>
</view> </view>
<view key="tableFooterView" contentMode="scaleToFill" id="rqg-Fl-VWf" userLabel="footerView"> <view key="tableFooterView" contentMode="scaleToFill" id="rqg-Fl-VWf" userLabel="footerView">
<rect key="frame" x="0.0" y="495" width="375" height="44"/> <rect key="frame" x="0.0" y="550" width="375" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view> </view>
...@@ -218,6 +218,36 @@ ...@@ -218,6 +218,36 @@
</tableViewCellContentView> </tableViewCellContentView>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</tableViewCell> </tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="55" id="LRW-MG-MZh">
<rect key="frame" x="0.0" y="495" width="375" height="55"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LRW-MG-MZh" id="Yof-kK-iYx">
<rect key="frame" x="0.0" y="0.0" width="375" height="55"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="leftvc_login_out" translatesAutoresizingMaskIntoConstraints="NO" id="ZtB-GK-Ea9">
<rect key="frame" x="30" y="12" width="26" height="30"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="P7w-O0-nxT"/>
<constraint firstAttribute="width" constant="26" id="haV-yN-QNV"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="扫一扫" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cHh-l7-Mcc">
<rect key="frame" x="76" y="16" width="56" height="22"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstItem="cHh-l7-Mcc" firstAttribute="centerY" secondItem="ZtB-GK-Ea9" secondAttribute="centerY" id="0eU-NZ-ip6"/>
<constraint firstItem="ZtB-GK-Ea9" firstAttribute="leading" secondItem="Yof-kK-iYx" secondAttribute="leading" constant="30" id="bJU-M4-9hO"/>
<constraint firstItem="cHh-l7-Mcc" firstAttribute="leading" secondItem="ZtB-GK-Ea9" secondAttribute="trailing" constant="20" id="dJE-Pl-J8d"/>
<constraint firstItem="ZtB-GK-Ea9" firstAttribute="centerY" secondItem="Yof-kK-iYx" secondAttribute="centerY" id="eF1-Fl-5Fg"/>
</constraints>
</tableViewCellContentView>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</tableViewCell>
</cells> </cells>
</tableViewSection> </tableViewSection>
</sections> </sections>
...@@ -1101,7 +1131,7 @@ ...@@ -1101,7 +1131,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="30"/> <rect key="frame" x="0.0" y="28" width="375" height="30"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WXk-60-mnv" id="Hdv-Fv-6SO"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WXk-60-mnv" id="Hdv-Fv-6SO">
<rect key="frame" x="0.0" y="0.0" width="375" height="29.5"/> <rect key="frame" x="0.0" y="0.0" width="375" height="29"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" tag="1111" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2016-12" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3kb-L7-Q1S"> <label opaque="NO" userInteractionEnabled="NO" tag="1111" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2016-12" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3kb-L7-Q1S">
...@@ -1131,7 +1161,7 @@ ...@@ -1131,7 +1161,7 @@
<rect key="frame" x="0.0" y="58" width="375" height="60"/> <rect key="frame" x="0.0" y="58" width="375" height="60"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="agP-LF-ma6" id="X7Q-g8-dvJ"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="agP-LF-ma6" id="X7Q-g8-dvJ">
<rect key="frame" x="0.0" y="0.0" width="375" height="59.5"/> <rect key="frame" x="0.0" y="0.0" width="375" height="59"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="工分结算" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="R4g-d8-qvx"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="工分结算" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="R4g-d8-qvx">
...@@ -1942,7 +1972,50 @@ ...@@ -1942,7 +1972,50 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="0MH-i3-O2Z" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="0MH-i3-O2Z" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="-954" y="2176"/> <point key="canvasLocation" x="-954" y="2120"/>
</scene>
<!--Watch Login View Controller-->
<scene sceneID="IfM-Jf-5An">
<objects>
<viewController storyboardIdentifier="WatchLoginViewController" id="lBd-bF-h84" customClass="WatchLoginViewController" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="wAK-Uc-5gC"/>
<viewControllerLayoutGuide type="bottom" id="L5X-gW-wBr"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="RHs-jJ-JoQ">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ama-4z-KkS">
<rect key="frame" x="20" y="527" width="335" height="50"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="JEC-0W-DxJ"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="20"/>
<state key="normal" title="允许登录" backgroundImage="btn_abled"/>
<state key="disabled" backgroundImage="btn_disabled"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="5"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<action selector="actionLogin:" destination="BYZ-38-t0r" eventType="touchUpInside" id="5uz-aV-d1L"/>
<action selector="actionLogin:" destination="lBd-bF-h84" eventType="touchUpInside" id="Wch-vx-zMv"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="Ama-4z-KkS" firstAttribute="leading" secondItem="RHs-jJ-JoQ" secondAttribute="leading" constant="20" id="1H9-R2-sr2"/>
<constraint firstItem="L5X-gW-wBr" firstAttribute="top" secondItem="Ama-4z-KkS" secondAttribute="bottom" constant="90" id="Zcb-Wn-Vrq"/>
<constraint firstAttribute="trailing" secondItem="Ama-4z-KkS" secondAttribute="trailing" constant="20" id="uUB-Vq-Np6"/>
</constraints>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="k1K-ML-jIs" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-298" y="2119"/>
</scene> </scene>
</scenes> </scenes>
<resources> <resources>
......
...@@ -36,9 +36,9 @@ ...@@ -36,9 +36,9 @@
@"pageNumber" : @(self.page), @"pageNumber" : @(self.page),
@"pageSize" : @(self.pageSize)}; @"pageSize" : @(self.pageSize)};
[MBProgressHUD j_loading]; [MBProgressHUD j_loading];
WS(weakSelf);
[kHttp POST:kAccountQueryUrl parameters:myDictionary complete:^(id _Nullable response, NSError * _Nullable error) { [kHttp POST:kAccountQueryUrl parameters:myDictionary complete:^(id _Nullable response, NSError * _Nullable error) {
[MBProgressHUD j_hideLoadingView]; [MBProgressHUD j_hideLoadingView];
WS(weakSelf);
if (kRsSuccess(response)) { if (kRsSuccess(response)) {
for (NSDictionary *dict in response[@"data"][@"records"]) { for (NSDictionary *dict in response[@"data"][@"records"]) {
StationUserAcctHisEntity *model = [[StationUserAcctHisEntity alloc] initWithDictionary:dict error:nil]; StationUserAcctHisEntity *model = [[StationUserAcctHisEntity alloc] initWithDictionary:dict error:nil];
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
}else if (indexPath.row == 1) {//账户 }else if (indexPath.row == 1) {//账户
[MBProgressHUD j_textOnly:@"正在开发中~"]; [MBProgressHUD j_textOnly:@"正在开发中~"];
}else if (indexPath.row == 2) {//核销卡券 }else if (indexPath.row == 2) {//核销卡券
[self scanView]; [self scanCard];
}else if (indexPath.row == 3) {//修改密码 }else if (indexPath.row == 3) {//修改密码
ModifyPswTableViewController *modifyVC = [ModifyPswTableViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN]; ModifyPswTableViewController *modifyVC = [ModifyPswTableViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN];
...@@ -67,10 +67,12 @@ ...@@ -67,10 +67,12 @@
}else if (indexPath.row == 4) {//退出登录 }else if (indexPath.row == 4) {//退出登录
[kGlobal.sideSlipVC dismissViewControllerAnimated:YES completion:nil]; [kGlobal.sideSlipVC dismissViewControllerAnimated:YES completion:nil];
}else if (indexPath.row == 5){
[self scanWatchCode];
} }
} }
- (void)scanView { - (void)scanCard {
//设置扫码区域参数 //设置扫码区域参数
LBXScanViewStyle *style = [[LBXScanViewStyle alloc]init]; LBXScanViewStyle *style = [[LBXScanViewStyle alloc]init];
style.centerUpOffset = 44; style.centerUpOffset = 44;
...@@ -94,6 +96,35 @@ ...@@ -94,6 +96,35 @@
ScanViewController *vc = [ScanViewController new]; ScanViewController *vc = [ScanViewController new];
vc.style = style; vc.style = style;
vc.type = scanTypeCard;
[kGlobal.mainNaVC pushViewController:vc animated:YES];
}
- (void)scanWatchCode {
//设置扫码区域参数
LBXScanViewStyle *style = [[LBXScanViewStyle alloc]init];
style.centerUpOffset = 44;
style.photoframeAngleStyle = LBXScanViewPhotoframeAngleStyle_Inner;
style.photoframeLineW = 2;
style.photoframeAngleW = 18;
style.photoframeAngleH = 18;
style.isNeedShowRetangle = YES;
style.anmiationStyle = LBXScanViewAnimationStyle_LineMove;
style.colorAngle = [UIColor colorWithRed:0./255 green:200./255. blue:20./255. alpha:1.0];
//qq里面的线条图片
UIImage *imgLine = [UIImage imageNamed:@"CodeScan.bundle/qrcode_Scan_weixin_Line"];
// imgLine = [self createImageWithColor:[UIColor colorWithRed:120/255. green:221/255. blue:71/255. alpha:1.0]];
style.animationImage = imgLine;
ScanViewController *vc = [ScanViewController new];
vc.style = style;
vc.type = scanTypeLogin;
//vc.isOpenInterestRect = YES; //vc.isOpenInterestRect = YES;
[kGlobal.mainNaVC pushViewController:vc animated:YES]; [kGlobal.mainNaVC pushViewController:vc animated:YES];
} }
......
...@@ -8,6 +8,10 @@ ...@@ -8,6 +8,10 @@
#import "LBXScanViewController.h" #import "LBXScanViewController.h"
typedef NS_ENUM(NSInteger, scanType) {
scanTypeCard,
scanTypeLogin
};
@interface ScanViewController : LBXScanViewController @interface ScanViewController : LBXScanViewController
@property (nonatomic, assign) scanType type;
@end @end
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#import "ScanViewController.h" #import "ScanViewController.h"
#import "CardViewController.h" #import "CardViewController.h"
#import "WatchLoginViewController.h"
@interface ScanViewController () @interface ScanViewController ()
@property (strong, nonatomic) UIButton *btnGoInput; @property (strong, nonatomic) UIButton *btnGoInput;
@end @end
...@@ -23,7 +24,22 @@ ...@@ -23,7 +24,22 @@
- (void)viewDidAppear:(BOOL)animated { - (void)viewDidAppear:(BOOL)animated {
[super viewDidAppear:animated]; [super viewDidAppear:animated];
[self btnGoInput];
switch (self.type) {
case scanTypeCard:
{
[self btnGoInput];
}
break;
case scanTypeLogin:
{
}
break;
default:
break;
}
} }
- (UIButton *)btnGoInput { - (UIButton *)btnGoInput {
...@@ -49,13 +65,21 @@ ...@@ -49,13 +65,21 @@
[self goCardVCWithNumber:nil]; [self goCardVCWithNumber:nil];
} }
/**
跳转核销卡券页面
*/
- (void)goCardVCWithNumber:(NSString *)number { - (void)goCardVCWithNumber:(NSString *)number {
CardViewController *cardVC = [CardViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN]; CardViewController *cardVC = [CardViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN];
cardVC.cardNumber = number; cardVC.cardNumber = number;
[kGlobal.mainNaVC pushViewController:cardVC animated:YES]; [kGlobal.mainNaVC pushViewController:cardVC animated:YES];
} }
- (void)goWatchLoginWithUrl:(NSString *)url {
WatchLoginViewController *loginVC = [WatchLoginViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN];
loginVC.LoginUrl = url;
[kGlobal.mainNaVC pushViewController:loginVC animated:YES];
}
#pragma mark -实现类继承该方法,作出对应处理 #pragma mark -实现类继承该方法,作出对应处理
- (void)scanResultWithArray:(NSArray<LBXScanResult *> *)array { - (void)scanResultWithArray:(NSArray<LBXScanResult *> *)array {
...@@ -87,10 +111,18 @@ ...@@ -87,10 +111,18 @@
[LBXScanWrapper systemVibrate]; [LBXScanWrapper systemVibrate];
//声音提醒 //声音提醒
[LBXScanWrapper systemSound]; [LBXScanWrapper systemSound];
[self goCardVCWithNumber:strResult];
if (self.type == scanTypeCard) {
[self goCardVCWithNumber:strResult];
}else if (self.type == scanTypeLogin){
[self goWatchLoginWithUrl:strResult];
}
} }
//- (void)goWatchLoginViewWith
- (void)didReceiveMemoryWarning { - (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning]; [super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated. // Dispose of any resources that can be recreated.
......
//
// WatchLoginViewController.h
// Car
//
// Created by Javen on 2017/1/10.
// Copyright © 2017年 上海勾芒信息科技. All rights reserved.
//
#import "BaseViewController.h"
@interface WatchLoginViewController : BaseViewController
@property (strong, nonatomic) NSString *LoginUrl;
@end
//
// WatchLoginViewController.m
// Car
//
// Created by Javen on 2017/1/10.
// Copyright © 2017年 上海勾芒信息科技. All rights reserved.
//
#import "WatchLoginViewController.h"
#import "HttpCilent.h"
@interface WatchLoginViewController ()
@end
@implementation WatchLoginViewController
- (void)viewDidLoad {
[super viewDidLoad];
// Do any additional setup after loading the view.
}
- (IBAction)actionLogin:(id)sender {
[self httpAllowLogin];
}
- (void)httpAllowLogin {
NSString *device = [self getStringAfter:@"deviceId=" string:self.LoginUrl];
NSString *token = [self getStringAfter:@"token=" string:self.LoginUrl];
WS(weakSelf);
if (device == nil || token == nil) {
[MBProgressHUD j_error:@"设备信息异常!" complete:^{
[weakSelf.navigationController popViewControllerAnimated:YES];
}];
}
NSDictionary *param = @{@"deviceId":device,
@"token":token};
[kHttp GET:kWatchLogin parameters:param complete:^(id _Nullable response, NSError * _Nullable error) {
if (kRsSuccess(response)) {
[MBProgressHUD j_success:@"登录成功!" complete:^{
//连续返回两级
long index = [[weakSelf.navigationController viewControllers] indexOfObject:weakSelf];
[weakSelf.navigationController
popToViewController:[weakSelf.navigationController.viewControllers
objectAtIndex:index - 2]
animated:YES];
}];
}else{
kShowRsMsg(response);
}
}];
}
/**
从prefix后开始截取连续字符串(字符串中可包涵数字字母)
@param prefix 从哪里开始截取
@param string 需要截取的字符串
@return 截取后的字符串
*/
- (NSString *)getStringAfter:(NSString *)prefix string:(NSString *)string {
NSString *grex = [NSString stringWithFormat:@"%@[a-z0-9A-Z]*",prefix];
NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:grex options:NSRegularExpressionCaseInsensitive error:nil];
NSArray * matches = [regex matchesInString:string options:0 range:NSMakeRange(0, [string length])];
if (matches.count == 1) {
NSTextCheckingResult *result = matches[0];
NSString *tempString = [string substringWithRange:result.range];
NSString *matchedString = [tempString componentsSeparatedByString:@"="][1];
return matchedString;
}
CLog(@"无法匹配到prefix:%@ \n string = %@",prefix, string);
return nil;
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
}
/*
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/
@end
...@@ -39,5 +39,6 @@ static NSString *const kAccountQueryUrl = @"account/query"; ...@@ -39,5 +39,6 @@ static NSString *const kAccountQueryUrl = @"account/query";
static NSString *const kRePrintUrl = @"printer/printRefuelBill"; static NSString *const kRePrintUrl = @"printer/printRefuelBill";
static NSString *const kGetTicketUrl = @"ticket/get?ticketNumber="; static NSString *const kGetTicketUrl = @"ticket/get?ticketNumber=";
static NSString *const kCheckTicketUrl = @"ticket/check"; static NSString *const kCheckTicketUrl = @"ticket/check";
static NSString *const kWatchLogin = @"stationUser/token/send";
#endif /* URL_h */ #endif /* URL_h */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment