finish A12

zj-pay/Non-Stop/Non-Stop.xcodeproj/project.pbxproj

@@ -18,6 +18,7 @@
		EA743E3C1BEC9A6800FD542C /* AI_BusiIntroductionVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EA743E3B1BEC9A6800FD542C /* AI_BusiIntroductionVC.m */; };
		EA743E3E1BEC9A7700FD542C /* AI_BusiIntroductionVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = EA743E3D1BEC9A7700FD542C /* AI_BusiIntroductionVC.xib */; };
		EA743E401BEC9A9900FD542C /* AI-table-detail.png in Resources */ = {isa = PBXBuildFile; fileRef = EA743E3F1BEC9A9900FD542C /* AI-table-detail.png */; };
		EABDB5FA1BF03FA60069DDE2 /* AISystemAlertViewWithCallback.m in Sources */ = {isa = PBXBuildFile; fileRef = EABDB5F91BF03FA60069DDE2 /* AISystemAlertViewWithCallback.m */; };
		EAF9F1201BEC81A0009D4F25 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = EAF9F11F1BEC81A0009D4F25 /* main.m */; };
		EAF9F1231BEC81A0009D4F25 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = EAF9F1221BEC81A0009D4F25 /* AppDelegate.m */; };
		EAF9F1261BEC81A0009D4F25 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = EAF9F1251BEC81A0009D4F25 /* ViewController.m */; };
@@ -51,6 +52,8 @@
		EA743E3B1BEC9A6800FD542C /* AI_BusiIntroductionVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AI_BusiIntroductionVC.m; sourceTree = "<group>"; };
		EA743E3D1BEC9A7700FD542C /* AI_BusiIntroductionVC.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AI_BusiIntroductionVC.xib; sourceTree = "<group>"; };
		EA743E3F1BEC9A9900FD542C /* AI-table-detail.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AI-table-detail.png"; sourceTree = "<group>"; };
		EABDB5F81BF03FA60069DDE2 /* AISystemAlertViewWithCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AISystemAlertViewWithCallback.h; sourceTree = "<group>"; };
		EABDB5F91BF03FA60069DDE2 /* AISystemAlertViewWithCallback.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AISystemAlertViewWithCallback.m; sourceTree = "<group>"; };
		EAF9F11B1BEC81A0009D4F25 /* Non-Stop.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Non-Stop.app"; sourceTree = BUILT_PRODUCTS_DIR; };
		EAF9F11F1BEC81A0009D4F25 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
		EAF9F1211BEC81A0009D4F25 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
@@ -201,6 +204,8 @@
				EAF9F13D1BEC8421009D4F25 /* AIconst.h */,
				EAF9F13E1BEC8421009D4F25 /* AIUtils.h */,
				EAF9F13F1BEC8421009D4F25 /* AIUtils.m */,
				EABDB5F81BF03FA60069DDE2 /* AISystemAlertViewWithCallback.h */,
				EABDB5F91BF03FA60069DDE2 /* AISystemAlertViewWithCallback.m */,
			);
			path = util;
			sourceTree = "<group>";
@@ -292,6 +297,7 @@
				EAF9F1231BEC81A0009D4F25 /* AppDelegate.m in Sources */,
				EAF9F1201BEC81A0009D4F25 /* main.m in Sources */,
				EAF9F14C1BEC8481009D4F25 /* AI_BaseViewController.m in Sources */,
				EABDB5FA1BF03FA60069DDE2 /* AISystemAlertViewWithCallback.m in Sources */,
				EA743E3C1BEC9A6800FD542C /* AI_BusiIntroductionVC.m in Sources */,
				EAF9F1401BEC8421009D4F25 /* AIUtils.m in Sources */,
				EA743E291BEC94C000FD542C /* AI_AddBankCardVC.m in Sources */,

zj-pay/Non-Stop/Non-Stop/ViewController.m

@@ -13,6 +13,7 @@
#import "AI_SignSuccessVC.h"
#import "AI_BusiIntroductionVC.h"
#import "AI_VerifyMessageCodeVC.h"
#import "AISystemAlertViewWithCallback.h"
@interface ViewController ()
@@ -32,8 +33,9 @@
}
- (void)openNonStop:(id)sender {
//    AI_HadSignContractVCViewController *vc = [[AI_HadSignContractVCViewController alloc]initWithBundleNib];
    UINavigationController *nav = [[UINavigationController alloc]initWithRootViewController:[[AI_VerifyMessageCodeVC alloc]initWithBundleNib]];
    UINavigationController *nav = [[UINavigationController alloc]initWithRootViewController:[[AI_SignSuccessVC alloc]initWithBundleNib]];
    [self presentViewController:nav animated:NO completion:nil];
   
}
- (void)didReceiveMemoryWarning {

zj-pay/Non-Stop/Non-Stop/res/layout/AI_SignSuccessVC.xib

@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6254" systemVersion="14B25" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9059" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
    <dependencies>
        <deployment identifier="iOS"/>
        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6247"/>
        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9049"/>
    </dependencies>
    <objects>
        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AI_SignSuccessVC">
            <connections>
                <outlet property="amountTF" destination="hCV-ce-0fI" id="QuY-Qe-JyM"/>
                <outlet property="backButton" destination="W1j-tt-NE0" id="YIH-M6-4t8"/>
                <outlet property="cardNoLabel" destination="TcT-HY-rq2" id="IW1-uB-FQF"/>
                <outlet property="cardNoTF" destination="rJ3-D9-pnd" id="9sB-l5-lD3"/>
                <outlet property="phoneNoTF" destination="lLf-dK-eIh" id="C08-oU-u4C"/>
                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
@@ -40,8 +41,8 @@
                    <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                    <nil key="highlightedColor"/>
                </label>
                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="绑  定  金  额 :" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="78F-Ye-Gog">
                    <rect key="frame" x="16" y="127" width="97" height="21"/>
                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="绑定金额:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="78F-Ye-Gog">
                    <rect key="frame" x="16" y="127" width="69" height="21"/>
                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
                    <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -72,7 +73,7 @@
                    </connections>
                </button>
                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="hCV-ce-0fI">
                    <rect key="frame" x="121" y="124" width="177" height="21"/>
                    <rect key="frame" x="93" y="124" width="177" height="21"/>
                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -83,9 +84,4 @@
            <point key="canvasLocation" x="203" y="322"/>
        </view>
    </objects>
    <simulatedMetricsContainer key="defaultSimulatedMetrics">
        <simulatedStatusBarMetrics key="statusBar"/>
        <simulatedOrientationMetrics key="orientation"/>
        <simulatedScreenMetrics key="destination" type="retina4"/>
    </simulatedMetricsContainer>
</document>

zj-pay/Non-Stop/Non-Stop/src/non-stop/AI_HadSignContractVCViewController.h

@@ -10,4 +10,6 @@
@interface AI_HadSignContractVCViewController : AI_BaseViewController
@property(nonatomic,assign) NSInteger payType;
@end

zj-pay/Non-Stop/Non-Stop/src/non-stop/AI_HadSignContractVCViewController.m

@@ -12,10 +12,6 @@
@interface AI_HadSignContractVCViewController ()
{
    NSInteger payType;
}
@property (weak, nonatomic) IBOutlet UILabel *signPhoneNumeLable;
@property (weak, nonatomic) IBOutlet UIView *amountButtonsView;
@property (weak, nonatomic) IBOutlet UIView *webChatView;
@@ -79,9 +75,9 @@
    self.webChatView.hidden = YES;
    self.unionPayView.hidden = YES;
    
    payType = PAY_TYPE_UNIONPAY;
    _payType = PAY_TYPE_UNIONPAY;//测试用
    
    if (payType == PAY_TYPE_UNIONPAY) {
    if (_payType == PAY_TYPE_UNIONPAY) {
        
        self.webChatView.hidden = YES;
        self.unionPayView.hidden = NO;
@@ -101,7 +97,7 @@
        _border.path = [UIBezierPath bezierPathWithRect:self.unionPayDashView.bounds].CGPath;
        _border.frame = self.unionPayDashView.bounds;
        [self.unionPayDashView.layer addSublayer:_border];
    }else if(payType == PAY_TYPE_WEBCHAT){
    }else if(_payType == PAY_TYPE_WEBCHAT){
        self.webChatView.hidden = NO;
        self.unionPayView.hidden = YES;
        

zj-pay/Non-Stop/Non-Stop/src/non-stop/AI_SignSuccessVC.h

@@ -14,4 +14,5 @@
@property (nonatomic,copy) NSString *phoneNo;
@property (nonatomic,copy) NSString *amount;
@property (nonatomic,assign) NSInteger payType;
@end

zj-pay/Non-Stop/Non-Stop/src/non-stop/AI_SignSuccessVC.m

@@ -15,6 +15,7 @@
@property (weak, nonatomic) IBOutlet UILabel *amountTF;
@property (weak, nonatomic) IBOutlet UIButton *backButton;
@property (weak, nonatomic) IBOutlet UILabel *cardNoLabel;
@end
@implementation AI_SignSuccessVC
@@ -23,6 +24,12 @@
    [super viewDidLoad];
    
    [self setTitle:@"永不停机开通成功" AndBackAction:@selector(goBack:)];
    if (self.payType == PAY_TYPE_WEBCHAT) {
        self.cardNoLabel.text = @"绑定微信账号:";
    }else{
        self.cardNoLabel.text = @"绑定银行卡号:";
    }
    
    [self.backButton setBackgroundImage:[AIUtils imageWithColor:AI_MAIN_THEME_COLOR] forState:UIControlStateNormal];
    [AIUtils setUIViewCorner:self.backButton WithRadius:4 andColor:[AI_MAIN_THEME_COLOR CGColor]];

zj-pay/Non-Stop/Non-Stop/src/util/AISystemAlertViewWithCallback.h

@@ -0,0 +1,19 @@
//
//  AISystemAlertViewWithCallback.h
//  Non-Stop
//
//  Created by tony on 15/11/9.
//  Copyright © 2015年 shelomi. All rights reserved.
//
#import <UIKit/UIKit.h>
@class AISystemAlertViewWithCallback;
typedef void(^ClickCallback)(AISystemAlertViewWithCallback *alert,NSInteger buttonIndex);
@interface AISystemAlertViewWithCallback : UIAlertView <UIAlertViewDelegate>
- (instancetype) initWithTitle:(NSString *)title message:(NSString *)message callback:(ClickCallback) callback cancelButtonTitle:(nullable NSString *)cancelButtonTitle otherButtonTitles:(nullable NSString *)otherButtonTitles, ... NS_REQUIRES_NIL_TERMINATION;
@end

zj-pay/Non-Stop/Non-Stop/src/util/AISystemAlertViewWithCallback.m

@@ -0,0 +1,54 @@
//
//  AISystemAlertViewWithCallback.m
//  Non-Stop
//
//  Created by tony on 15/11/9.
//  Copyright © 2015年 shelomi. All rights reserved.
//
#import "AISystemAlertViewWithCallback.h"
@interface AISystemAlertViewWithCallback ()
@property (nonatomic,copy) ClickCallback callback;
@end
@implementation AISystemAlertViewWithCallback
- (instancetype) initWithTitle:(NSString *)title message:(NSString *)message callback:(ClickCallback) callback cancelButtonTitle:(nullable NSString *)cancelButtonTitle otherButtonTitles:(nullable NSString *)otherButtonTitles, ... {
    self = [self initWithTitle:title message:message delegate:self cancelButtonTitle:cancelButtonTitle otherButtonTitles:nil, nil];
    
    id eachObject;
    va_list argumentList;
    if (otherButtonTitles) // The first argument isn't part of the varargs list,
    {                                   // so we'll handle it separately.
        [self addButtonWithTitle:otherButtonTitles];
        va_start(argumentList, otherButtonTitles); // Start scanning for arguments after firstObject.
        while ((eachObject = va_arg(argumentList, id))) // As many times as we can get an argument of type "id"
            [self addButtonWithTitle: eachObject]; // that isn't nil, add it to self's contents.
        va_end(argumentList);
    }
    
    if (self) {
        _callback = callback;
    }
    return self;
    
}
- (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex{
    if(_callback){
        _callback(self,buttonIndex);
    }
}
/*
// Only override drawRect: if you perform custom drawing.
// An empty implementation adversely affects performance during animation.
- (void)drawRect:(CGRect)rect {
    // Drawing code
}
*/
@end