bottom button

ChineseMedicine/ChineseMedicineSDK/Controller/BaseViewController.h

@@ -14,7 +14,10 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic, assign) BOOL isHiddenNavigationBar;
 @property(nonatomic, assign) NSInteger mBottomButtonType;
 @property(nonatomic, strong) NSDictionary* mServerDic;
+@property(nonatomic, strong) IBOutlet UIStackView * mLockStackView;
+@property(nonatomic, strong) IBOutlet UIStackView * mDetectionStackView;
 @property(nonatomic, strong) IBOutlet UIButton* mBottomButton;
+@property(nonatomic, strong) IBOutlet UIButton* mLockButton;
 
 - (void)refreshBottomButton;
 - (void)vippayCallback;

ChineseMedicine/ChineseMedicineSDK/Controller/BaseViewController.m

@@ -50,9 +50,12 @@
 
 - (void)refreshBottomButton {
     BOOL isLock = [[ChineseMedicineManager shared] isLock];
+    [self.mLockStackView setHidden:!isLock];
+    [self.mDetectionStackView setHidden:isLock];
+
     if (isLock) {
-        [self.mBottomButton setImage:SK_IMAGE(@"icon_lock") forState:UIControlStateNormal];
-        [self.mBottomButton setTitle:SK_NSLOCALIZED_STRING(@"button_lock", nil) forState:UIControlStateNormal];
+        [self.mLockButton setImage:SK_IMAGE(@"icon_lock") forState:UIControlStateNormal];
+        [self.mLockButton setTitle:SK_NSLOCALIZED_STRING(@"button_lock", nil) forState:UIControlStateNormal];
     } else {
         if (self.mBottomButtonType == 1) {
             [self.mBottomButton setImage:nil forState:UIControlStateNormal];
@@ -64,7 +67,7 @@
     }
 }
 
-- (IBAction)clickBottomButton:(id)sender {
+- (IBAction)clickLockButton:(id)sender {
     PayInfoModel* model = [[ChineseMedicineManager shared] getPayInfoModel];
     if (model.isTryout) {
         [self pushViewController:@"UnlockVC"];
@@ -73,27 +76,19 @@
         }];
     } else if (model.isExpired && model.count > 0) {
         [self showVipInfoAlert];
-    } else {
-        DetectionViewController *controller = [SK_STORYBOARD instantiateViewControllerWithIdentifier:@"DetectionVC"];
-        controller.needDrunkJudgment = NO;
-        [self.navigationController pushViewController:controller animated:YES];
     }
 }
 
+- (IBAction)clickBottomButton:(id)sender {
+    DetectionViewController *controller = [SK_STORYBOARD instantiateViewControllerWithIdentifier:@"DetectionVC"];
+    controller.needDrunkJudgment = NO;
+    [self.navigationController pushViewController:controller animated:YES];
+}
+
 - (IBAction)clickDrankButton:(id)sender {
-    PayInfoModel* model = [[ChineseMedicineManager shared] getPayInfoModel];
-    if (model.isTryout) {
-        [self pushViewController:@"UnlockVC"];
-    } else if (model.isExpired && model.count <= 0) {
-        [self showVipPayViewController:^(BOOL isOK) {
-        }];
-    } else if (model.isExpired && model.count > 0) {
-        [self showVipInfoAlert];
-    } else {
-        DetectionViewController *controller = [SK_STORYBOARD instantiateViewControllerWithIdentifier:@"DetectionVC"];
-        controller.needDrunkJudgment = YES;
-        [self.navigationController pushViewController:controller animated:YES];
-    }
+    DetectionViewController *controller = [SK_STORYBOARD instantiateViewControllerWithIdentifier:@"DetectionVC"];
+    controller.needDrunkJudgment = YES;
+    [self.navigationController pushViewController:controller animated:YES];
 }
 
 - (IBAction)clickVippayButton:(id)sender {

ChineseMedicine/LibraryResource.storyboard

@@ -327,49 +327,79 @@
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UAb-6i-bzT">
                                 <rect key="frame" x="0.0" y="748" width="414" height="80"/>
                                 <subviews>
-                                    <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="kGg-DZ-Wvw">
+                                    <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="ZXb-5d-fp6">
                                         <rect key="frame" x="10" y="5" width="394" height="50"/>
                                         <subviews>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mL9-Ai-NrW">
-                                                <rect key="frame" x="0.0" y="0.0" width="192" height="50"/>
-                                                <color key="backgroundColor" red="0.42745098040000001" green="0.89411764709999997" blue="0.20784313730000001" alpha="1" colorSpace="calibratedRGB"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="height" constant="50" id="1Rg-Uw-Fl9"/>
-                                                </constraints>
-                                                <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                                                <state key="normal" title="饮酒检测">
-                                                    <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                                                </state>
-                                                <userDefinedRuntimeAttributes>
-                                                    <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
-                                                        <integer key="value" value="10"/>
-                                                    </userDefinedRuntimeAttribute>
-                                                </userDefinedRuntimeAttributes>
-                                                <connections>
-                                                    <action selector="clickDrankButton:" destination="cP1-DQ-6Mn" eventType="touchUpInside" id="8Q7-hf-N47"/>
-                                                </connections>
-                                            </button>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="03p-hz-ai2">
-                                                <rect key="frame" x="202" y="0.0" width="192" height="50"/>
-                                                <color key="backgroundColor" red="0.42745098040000001" green="0.89411764709999997" blue="0.20784313730000001" alpha="1" colorSpace="calibratedRGB"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="height" constant="50" id="wA8-3S-dmH"/>
-                                                </constraints>
-                                                <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                                                <state key="normal">
-                                                    <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                                                </state>
-                                                <userDefinedRuntimeAttributes>
-                                                    <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
-                                                        <integer key="value" value="10"/>
-                                                    </userDefinedRuntimeAttribute>
-                                                </userDefinedRuntimeAttributes>
-                                                <connections>
-                                                    <action selector="clickBottomButton:" destination="cP1-DQ-6Mn" eventType="touchUpInside" id="9cn-IH-ZtI"/>
-                                                </connections>
-                                            </button>
+                                            <stackView hidden="YES" opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="kGg-DZ-Wvw">
+                                                <rect key="frame" x="0.0" y="0.0" width="394" height="50"/>
+                                                <subviews>
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mL9-Ai-NrW">
+                                                        <rect key="frame" x="0.0" y="0.0" width="192" height="50"/>
+                                                        <color key="backgroundColor" red="0.42745098040000001" green="0.89411764709999997" blue="0.20784313730000001" alpha="1" colorSpace="calibratedRGB"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="height" constant="50" id="1Rg-Uw-Fl9"/>
+                                                        </constraints>
+                                                        <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                        <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                                                        <state key="normal" title="饮酒检测">
+                                                            <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                                        </state>
+                                                        <userDefinedRuntimeAttributes>
+                                                            <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                                                <integer key="value" value="10"/>
+                                                            </userDefinedRuntimeAttribute>
+                                                        </userDefinedRuntimeAttributes>
+                                                        <connections>
+                                                            <action selector="clickDrankButton:" destination="cP1-DQ-6Mn" eventType="touchUpInside" id="8Q7-hf-N47"/>
+                                                        </connections>
+                                                    </button>
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="03p-hz-ai2">
+                                                        <rect key="frame" x="202" y="0.0" width="192" height="50"/>
+                                                        <color key="backgroundColor" red="0.42745098040000001" green="0.89411764709999997" blue="0.20784313730000001" alpha="1" colorSpace="calibratedRGB"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="height" constant="50" id="wA8-3S-dmH"/>
+                                                        </constraints>
+                                                        <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                        <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                                                        <state key="normal">
+                                                            <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                                        </state>
+                                                        <userDefinedRuntimeAttributes>
+                                                            <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                                                <integer key="value" value="10"/>
+                                                            </userDefinedRuntimeAttribute>
+                                                        </userDefinedRuntimeAttributes>
+                                                        <connections>
+                                                            <action selector="clickBottomButton:" destination="cP1-DQ-6Mn" eventType="touchUpInside" id="9cn-IH-ZtI"/>
+                                                        </connections>
+                                                    </button>
+                                                </subviews>
+                                            </stackView>
+                                            <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="Bye-bG-zLa">
+                                                <rect key="frame" x="0.0" y="0.0" width="394" height="50"/>
+                                                <subviews>
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fP8-AM-9zB">
+                                                        <rect key="frame" x="0.0" y="0.0" width="394" height="50"/>
+                                                        <color key="backgroundColor" red="0.42745098040000001" green="0.89411764709999997" blue="0.20784313730000001" alpha="1" colorSpace="calibratedRGB"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="height" constant="50" id="Ety-bK-Zj1"/>
+                                                        </constraints>
+                                                        <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                        <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                                                        <state key="normal">
+                                                            <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                                        </state>
+                                                        <userDefinedRuntimeAttributes>
+                                                            <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                                                <integer key="value" value="10"/>
+                                                            </userDefinedRuntimeAttribute>
+                                                        </userDefinedRuntimeAttributes>
+                                                        <connections>
+                                                            <action selector="clickLockButton:" destination="cP1-DQ-6Mn" eventType="touchUpInside" id="bT5-3k-6pr"/>
+                                                        </connections>
+                                                    </button>
+                                                </subviews>
+                                            </stackView>
                                         </subviews>
                                     </stackView>
                                     <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="检测结果仅供参考，如有不适请及时就医" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sh5-xh-EAw">
@@ -381,13 +411,13 @@
                                 </subviews>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
-                                    <constraint firstItem="kGg-DZ-Wvw" firstAttribute="leading" secondItem="UAb-6i-bzT" secondAttribute="leading" constant="10" id="4YA-5h-enY"/>
+                                    <constraint firstItem="ZXb-5d-fp6" firstAttribute="leading" secondItem="UAb-6i-bzT" secondAttribute="leading" constant="10" id="5gI-gk-dWt"/>
                                     <constraint firstAttribute="height" constant="80" id="htR-jB-Hfb"/>
                                     <constraint firstAttribute="trailing" secondItem="sh5-xh-EAw" secondAttribute="trailing" constant="17" id="oFJ-uM-CvN"/>
                                     <constraint firstItem="sh5-xh-EAw" firstAttribute="leading" secondItem="UAb-6i-bzT" secondAttribute="leading" constant="17" id="qoT-EU-CTT"/>
-                                    <constraint firstItem="sh5-xh-EAw" firstAttribute="top" secondItem="kGg-DZ-Wvw" secondAttribute="bottom" constant="30" id="r40-qz-JVw"/>
-                                    <constraint firstAttribute="trailing" secondItem="kGg-DZ-Wvw" secondAttribute="trailing" constant="10" id="sQn-2e-yLr"/>
-                                    <constraint firstItem="kGg-DZ-Wvw" firstAttribute="top" secondItem="UAb-6i-bzT" secondAttribute="top" constant="5" id="sbv-av-OEc"/>
+                                    <constraint firstItem="ZXb-5d-fp6" firstAttribute="top" secondItem="UAb-6i-bzT" secondAttribute="top" constant="5" id="svO-J8-311"/>
+                                    <constraint firstItem="sh5-xh-EAw" firstAttribute="top" secondItem="ZXb-5d-fp6" secondAttribute="bottom" constant="30" id="t4d-Q4-X2s"/>
+                                    <constraint firstAttribute="trailing" secondItem="ZXb-5d-fp6" secondAttribute="trailing" constant="10" id="ynB-Bn-sU8"/>
                                 </constraints>
                             </view>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="今日尚未检测，历史记录内可查看往期结果" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="crc-bt-Ds9">
@@ -431,8 +461,11 @@
                     <connections>
                         <outlet property="mBottomButton" destination="03p-hz-ai2" id="kH6-cv-RaI"/>
                         <outlet property="mDebugBtn" destination="BV0-KY-oij" id="HFH-mi-1bR"/>
+                        <outlet property="mDetectionStackView" destination="kGg-DZ-Wvw" id="peD-6G-b9w"/>
                         <outlet property="mExpirationDateBtn" destination="lgb-t8-NpX" id="soZ-56-2cD"/>
                         <outlet property="mHintLabel" destination="crc-bt-Ds9" id="wdd-4I-Jbn"/>
+                        <outlet property="mLockButton" destination="fP8-AM-9zB" id="cxZ-4s-d43"/>
+                        <outlet property="mLockStackView" destination="Bye-bG-zLa" id="RKS-Lf-UOV"/>
                         <outlet property="mTableView" destination="4Qq-ms-Aax" id="sCK-YI-yPZ"/>
                     </connections>
                 </viewController>