Skip to content

C
Car-iOS-Merchant
Commit a5d543c6 authored by Sandy's avatar Sandy
Browse files
Options

修改侧边栏顺序

parent 042af6bd
Hide whitespace changes
Inline Side-by-side
Showing with 162 additions and 79 deletions
Car/Assets.xcassets/LeftView/left_scan.imageset/Contents.json 0 → 100644
View file @ a5d543c6
{
"images" : [
{
"idiom" : "universal",
"filename" : "left_scan.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "left_scan@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "left_scan@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Car/Base.lproj/Main.storyboard
View file @ a5d543c6
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<sections> <sections>
<tableViewSection id="2v7-iq-Gdb"> <tableViewSection id="2v7-iq-Gdb">
<cells> <cells>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="55" id="xtB-Sd-Tl7"> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="55" id="xtB-Sd-Tl7">
<rect key="frame" x="0.0" y="220" width="375" height="55"/> <rect key="frame" x="0.0" y="220" width="375" height="55"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="xtB-Sd-Tl7" id="d1z-wx-30x"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="xtB-Sd-Tl7" id="d1z-wx-30x">
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
</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="6Sk-Ey-xFt"> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="55" id="6Sk-Ey-xFt">
<rect key="frame" x="0.0" y="275" width="375" height="55"/> <rect key="frame" x="0.0" y="275" width="375" height="55"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6Sk-Ey-xFt" id="5c3-OT-oYJ"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6Sk-Ey-xFt" id="5c3-OT-oYJ">
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
</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="MNb-b0-8ld"> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="55" id="MNb-b0-8ld">
<rect key="frame" x="0.0" y="330" width="375" height="55"/> <rect key="frame" x="0.0" y="330" width="375" height="55"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="MNb-b0-8ld" id="e2Y-0h-fwq"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="MNb-b0-8ld" id="e2Y-0h-fwq">
...@@ -158,9 +158,39 @@ ...@@ -158,9 +158,39 @@
</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" accessoryType="disclosureIndicator" indentationWidth="10" rowHeight="55" id="9kl-2z-IJU"> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="55" id="LRW-MG-MZh">
<rect key="frame" x="0.0" y="385" width="375" height="55"/> <rect key="frame" x="0.0" y="385" width="375" height="55"/>
<autoresizingMask key="autoresizingMask"/> <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="left_scan" 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>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" accessoryType="disclosureIndicator" indentationWidth="10" rowHeight="55" id="9kl-2z-IJU">
<rect key="frame" x="0.0" y="440" width="375" height="55"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9kl-2z-IJU" id="FuF-Rg-4nb"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9kl-2z-IJU" id="FuF-Rg-4nb">
<rect key="frame" x="0.0" y="0.0" width="342" height="55"/> <rect key="frame" x="0.0" y="0.0" width="342" height="55"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
...@@ -188,8 +218,8 @@ ...@@ -188,8 +218,8 @@
</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="iSx-hH-F0d"> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="55" id="iSx-hH-F0d">
<rect key="frame" x="0.0" y="440" width="375" height="55"/> <rect key="frame" x="0.0" y="495" width="375" height="55"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="iSx-hH-F0d" id="9Lp-9Y-OgP"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="iSx-hH-F0d" id="9Lp-9Y-OgP">
<rect key="frame" x="0.0" y="0.0" width="375" height="55"/> <rect key="frame" x="0.0" y="0.0" width="375" height="55"/>
...@@ -218,36 +248,6 @@ ...@@ -218,36 +248,6 @@
</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>
...@@ -1987,12 +1987,12 @@ ...@@ -1987,12 +1987,12 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ama-4z-KkS"> <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"/> <rect key="frame" x="20" y="358.5" width="335" height="50"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="50" id="JEC-0W-DxJ"/> <constraint firstAttribute="height" constant="50" id="JEC-0W-DxJ"/>
</constraints> </constraints>
<fontDescription key="fontDescription" type="system" pointSize="20"/> <fontDescription key="fontDescription" type="system" pointSize="20"/>
<state key="normal" title="允许登录" backgroundImage="btn_abled"/> <state key="normal" title="确认登录" backgroundImage="btn_abled"/>
<state key="disabled" backgroundImage="btn_disabled"/> <state key="disabled" backgroundImage="btn_disabled"/>
<userDefinedRuntimeAttributes> <userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius"> <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
...@@ -2000,28 +2000,60 @@ ...@@ -2000,28 +2000,60 @@
</userDefinedRuntimeAttribute> </userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes> </userDefinedRuntimeAttributes>
<connections> <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"/> <action selector="actionLogin:" destination="lBd-bF-h84" eventType="touchUpInside" id="Wch-vx-zMv"/>
</connections> </connections>
</button> </button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="即将登录智能手表车族通请确认是本人登录" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OEh-I3-0VX">
<rect key="frame" x="80" y="120" width="215" height="20.5"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.39995324609999999" green="0.40002685789999998" blue="0.39994865660000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Xep-hC-1Qc">
<rect key="frame" x="20" y="428.5" width="335" height="50"/>
<color key="backgroundColor" red="0.94486624002456665" green="0.94894808530807495" blue="0.95711523294448853" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="gWq-qK-RnM"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="20"/>
<state key="normal" title="取消">
<color key="titleColor" red="0.39995324609999999" green="0.40002685789999998" blue="0.39994865660000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<state key="disabled" backgroundImage="btn_disabled"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="5"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<action selector="actionCancel:" destination="lBd-bF-h84" eventType="touchUpInside" id="Zfi-aL-myt"/>
</connections>
</button>
</subviews> </subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints> <constraints>
<constraint firstItem="Ama-4z-KkS" firstAttribute="leading" secondItem="RHs-jJ-JoQ" secondAttribute="leading" constant="20" id="1H9-R2-sr2"/> <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="OEh-I3-0VX" secondAttribute="trailing" constant="80" id="AVL-sh-hq5"/>
<constraint firstAttribute="trailing" secondItem="Xep-hC-1Qc" secondAttribute="trailing" constant="20" id="GIZ-ls-VGJ"/>
<constraint firstItem="OEh-I3-0VX" firstAttribute="leading" secondItem="RHs-jJ-JoQ" secondAttribute="leading" constant="80" id="RUw-ws-399"/>
<constraint firstItem="OEh-I3-0VX" firstAttribute="top" secondItem="wAK-Uc-5gC" secondAttribute="bottom" constant="100" id="WfQ-T1-V4i"/>
<constraint firstItem="Xep-hC-1Qc" firstAttribute="top" secondItem="Ama-4z-KkS" secondAttribute="bottom" constant="20" id="XMW-e5-RVR"/>
<constraint firstItem="Xep-hC-1Qc" firstAttribute="leading" secondItem="RHs-jJ-JoQ" secondAttribute="leading" constant="20" id="lTw-Mi-dFT"/>
<constraint firstItem="Ama-4z-KkS" firstAttribute="centerY" secondItem="RHs-jJ-JoQ" secondAttribute="centerY" constant="50" id="tHV-HX-Eme"/>
<constraint firstAttribute="trailing" secondItem="Ama-4z-KkS" secondAttribute="trailing" constant="20" id="uUB-Vq-Np6"/> <constraint firstAttribute="trailing" secondItem="Ama-4z-KkS" secondAttribute="trailing" constant="20" id="uUB-Vq-Np6"/>
</constraints> </constraints>
</view> </view>
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="k1K-ML-jIs" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="k1K-ML-jIs" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="-298" y="2119"/> <point key="canvasLocation" x="-298.39999999999998" y="2117.9910044977514"/>
</scene> </scene>
</scenes> </scenes>
<resources> <resources>
<image name="btn_abled" width="326" height="46"/> <image name="btn_abled" width="326" height="46"/>
<image name="btn_disabled" width="490" height="70"/> <image name="btn_disabled" width="490" height="70"/>
<image name="card_input_Bg" width="327" height="149"/> <image name="card_input_Bg" width="327" height="149"/>
<image name="left_scan" width="20" height="20"/>
<image name="leftvc_bill" width="19" height="20"/> <image name="leftvc_bill" width="19" height="20"/>
<image name="leftvc_cash" width="21" height="21"/> <image name="leftvc_cash" width="21" height="21"/>
<image name="leftvc_login_out" width="20" height="22"/> <image name="leftvc_login_out" width="20" height="22"/>
......
Car/CodeClass/LeftView/ViewControllers/LeftTableViewController.m
View file @ a5d543c6
...@@ -61,14 +61,14 @@ ...@@ -61,14 +61,14 @@
}else if (indexPath.row == 2) {//核销卡券 }else if (indexPath.row == 2) {//核销卡券
[self scanCard]; [self scanCard];
}else if (indexPath.row == 3) {//修改密码 }else if (indexPath.row == 3){
[self scanWatchCode];
}else if (indexPath.row == 4) {//修改密码
ModifyPswTableViewController *modifyVC = [ModifyPswTableViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN]; ModifyPswTableViewController *modifyVC = [ModifyPswTableViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN];
[kGlobal.mainNaVC pushViewController:modifyVC animated:YES]; [kGlobal.mainNaVC pushViewController:modifyVC animated:YES];
}else if (indexPath.row == 4) {//退出登录 }else if (indexPath.row == 5) {//退出登录
[kGlobal.sideSlipVC dismissViewControllerAnimated:YES completion:nil]; [kGlobal.sideSlipVC dismissViewControllerAnimated:YES completion:nil];
}else if (indexPath.row == 5){
[self scanWatchCode];
} }
} }
......
Car/CodeClass/LeftView/ViewControllers/ScanViewController.m
View file @ a5d543c6
...@@ -11,19 +11,21 @@ ...@@ -11,19 +11,21 @@
#import "WatchLoginViewController.h" #import "WatchLoginViewController.h"
@interface ScanViewController () @interface ScanViewController ()
@property (strong, nonatomic) UIButton *btnGoInput; @property (strong, nonatomic) UIButton *btnGoInput;
@property (strong, nonatomic) UILabel *labelInfo;
@end @end
@implementation ScanViewController @implementation ScanViewController
- (void)viewDidLoad { - (void)viewDidLoad {
[super viewDidLoad]; [super viewDidLoad];
self.title = @"条形码"; self.title = @"扫码";
// Do any additional setup after loading the view. // Do any additional setup after loading the view.
} }
- (void)viewDidAppear:(BOOL)animated { - (void)viewDidAppear:(BOOL)animated {
[super viewDidAppear:animated]; [super viewDidAppear:animated];
[self labelInfo];
switch (self.type) { switch (self.type) {
case scanTypeCard: case scanTypeCard:
...@@ -42,6 +44,21 @@ ...@@ -42,6 +44,21 @@
} }
} }
- (UILabel *)labelInfo {
CGFloat y = kHeight/2 - 44 - (kWidth - 120)/2 - 60;
if (!_labelInfo) {
_labelInfo = [[UILabel alloc] initWithFrame:CGRectMake(0, y, kWidth, 30)];
_labelInfo.text = @"将二维码放入框中，即可自动扫描";
_labelInfo.font = [UIFont systemFontOfSize:13];
_labelInfo.textAlignment = NSTextAlignmentCenter;
_labelInfo.textColor = [UIColor whiteColor];
// _labelInfo.backgroundColor = [UIColor redColor];
[self.view addSubview:_labelInfo];
}
return _labelInfo;
}
- (UIButton *)btnGoInput { - (UIButton *)btnGoInput {
if (!_btnGoInput) { if (!_btnGoInput) {
_btnGoInput = [UIButton buttonWithType:UIButtonTypeCustom]; _btnGoInput = [UIButton buttonWithType:UIButtonTypeCustom];
...@@ -76,8 +93,18 @@ ...@@ -76,8 +93,18 @@
} }
- (void)goWatchLoginWithUrl:(NSString *)url { - (void)goWatchLoginWithUrl:(NSString *)url {
NSString *device = [self getStringAfter:@"deviceId=" string:url];
NSString *token = [self getStringAfter:@"token=" string:url];
WS(weakSelf);
if (device == nil || token == nil) {
[MBProgressHUD j_error:@"设备信息异常！" complete:^{
[weakSelf reStartDevice];
}];
return;
}
WatchLoginViewController *loginVC = [WatchLoginViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN]; WatchLoginViewController *loginVC = [WatchLoginViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN];
loginVC.LoginUrl = url; loginVC.device = device;
loginVC.token = token;
[kGlobal.mainNaVC pushViewController:loginVC animated:YES]; [kGlobal.mainNaVC pushViewController:loginVC animated:YES];
} }
#pragma mark -实现类继承该方法，作出对应处理 #pragma mark -实现类继承该方法，作出对应处理
...@@ -115,12 +142,36 @@ ...@@ -115,12 +142,36 @@
if (self.type == scanTypeCard) { if (self.type == scanTypeCard) {
[self goCardVCWithNumber:strResult]; [self goCardVCWithNumber:strResult];
}else if (self.type == scanTypeLogin){ }else if (self.type == scanTypeLogin){
[self goWatchLoginWithUrl:strResult]; [self goWatchLoginWithUrl:strResult];
} }
} }
/**
从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)goWatchLoginViewWith //- (void)goWatchLoginViewWith
- (void)didReceiveMemoryWarning { - (void)didReceiveMemoryWarning {
......
Car/CodeClass/LeftView/ViewControllers/WatchLoginViewController.h
View file @ a5d543c6
...@@ -9,5 +9,6 @@ ...@@ -9,5 +9,6 @@
#import "BaseViewController.h" #import "BaseViewController.h"
@interface WatchLoginViewController : BaseViewController @interface WatchLoginViewController : BaseViewController
@property (strong, nonatomic) NSString *LoginUrl; @property (strong, nonatomic) NSString *device;
@property (strong, nonatomic) NSString *token;
@end @end
Car/CodeClass/LeftView/ViewControllers/WatchLoginViewController.m
View file @ a5d543c6
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
- (void)viewDidLoad { - (void)viewDidLoad {
[super viewDidLoad]; [super viewDidLoad];
self.title = @"授权登录";
// Do any additional setup after loading the view. // Do any additional setup after loading the view.
} }
- (IBAction)actionLogin:(id)sender { - (IBAction)actionLogin:(id)sender {
...@@ -23,17 +24,10 @@ ...@@ -23,17 +24,10 @@
} }
- (void)httpAllowLogin { - (void)httpAllowLogin {
NSString *device = [self getStringAfter:@"deviceId=" string:self.LoginUrl];
NSString *token = [self getStringAfter:@"token=" string:self.LoginUrl]; NSDictionary *param = @{@"deviceId":self.device,
@"token":self.token};
WS(weakSelf); 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) { [kHttp GET:kWatchLogin parameters:param complete:^(id _Nullable response, NSError * _Nullable error) {
if (kRsSuccess(response)) { if (kRsSuccess(response)) {
[MBProgressHUD j_success:@"登录成功！" complete:^{ [MBProgressHUD j_success:@"登录成功！" complete:^{
...@@ -53,29 +47,11 @@ ...@@ -53,29 +47,11 @@
}]; }];
} }
- (IBAction)actionCancel:(id)sender {
[self.navigationController popViewControllerAnimated:YES];
}
/**
从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 { - (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning]; [super didReceiveMemoryWarning];
......
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