Skip to content

C
colorfulSchoolReconsitution
Commit eac81d83 by 刘卓鑫
Options

本底更改

parent 04cfb972
Showing with 40 additions and 34 deletions
ColorfulSchool/ColorfulSchool.xcodeproj/project.pbxproj
...@@ -73,8 +73,8 @@ ...@@ -73,8 +73,8 @@
1CB3AC0F23053245006F1724 /* ZXOauthHasDCAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CB3AC0E23053245006F1724 /* ZXOauthHasDCAccountViewController.m */; }; 1CB3AC0F23053245006F1724 /* ZXOauthHasDCAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CB3AC0E23053245006F1724 /* ZXOauthHasDCAccountViewController.m */; };
1CB3AC1523053BF0006F1724 /* UIImage+Crop.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CB3AC1223053BED006F1724 /* UIImage+Crop.m */; }; 1CB3AC1523053BF0006F1724 /* UIImage+Crop.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CB3AC1223053BED006F1724 /* UIImage+Crop.m */; };
1CB3AC1623053BF0006F1724 /* CropImageController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CB3AC1423053BEF006F1724 /* CropImageController.m */; }; 1CB3AC1623053BF0006F1724 /* CropImageController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CB3AC1423053BEF006F1724 /* CropImageController.m */; };
1CC15426230D460200582EC1 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1CC15425230D460100582EC1 /* LaunchScreen.storyboard */; };
1CC15429230D5B7400582EC1 /* ZXAimiWalletAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CC15428230D5B7400582EC1 /* ZXAimiWalletAlertView.m */; }; 1CC15429230D5B7400582EC1 /* ZXAimiWalletAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CC15428230D5B7400582EC1 /* ZXAimiWalletAlertView.m */; };
1CC1542D230D6E3600582EC1 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1CC1542C230D6E3600582EC1 /* LaunchScreen.storyboard */; };
1CD9C41222C3103D00C04683 /* ZXAppointBathDeviceListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CD9C41122C3103D00C04683 /* ZXAppointBathDeviceListTableViewCell.m */; }; 1CD9C41222C3103D00C04683 /* ZXAppointBathDeviceListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CD9C41122C3103D00C04683 /* ZXAppointBathDeviceListTableViewCell.m */; };
1CD9C41522C3191300C04683 /* ZXAppointForbbidenModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CD9C41422C3191300C04683 /* ZXAppointForbbidenModel.m */; }; 1CD9C41522C3191300C04683 /* ZXAppointForbbidenModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CD9C41422C3191300C04683 /* ZXAppointForbbidenModel.m */; };
1CD9C41822C36E6700C04683 /* ZXAppointRecordModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CD9C41722C36E6700C04683 /* ZXAppointRecordModel.m */; }; 1CD9C41822C36E6700C04683 /* ZXAppointRecordModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CD9C41722C36E6700C04683 /* ZXAppointRecordModel.m */; };
...@@ -810,9 +810,9 @@ ...@@ -810,9 +810,9 @@
1CB3AC1223053BED006F1724 /* UIImage+Crop.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+Crop.m"; sourceTree = "<group>"; }; 1CB3AC1223053BED006F1724 /* UIImage+Crop.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+Crop.m"; sourceTree = "<group>"; };
1CB3AC1323053BEE006F1724 /* UIImage+Crop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+Crop.h"; sourceTree = "<group>"; }; 1CB3AC1323053BEE006F1724 /* UIImage+Crop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+Crop.h"; sourceTree = "<group>"; };
1CB3AC1423053BEF006F1724 /* CropImageController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CropImageController.m; sourceTree = "<group>"; }; 1CB3AC1423053BEF006F1724 /* CropImageController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CropImageController.m; sourceTree = "<group>"; };
1CC15425230D460100582EC1 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
1CC15427230D5B7400582EC1 /* ZXAimiWalletAlertView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZXAimiWalletAlertView.h; sourceTree = "<group>"; }; 1CC15427230D5B7400582EC1 /* ZXAimiWalletAlertView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZXAimiWalletAlertView.h; sourceTree = "<group>"; };
1CC15428230D5B7400582EC1 /* ZXAimiWalletAlertView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZXAimiWalletAlertView.m; sourceTree = "<group>"; }; 1CC15428230D5B7400582EC1 /* ZXAimiWalletAlertView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZXAimiWalletAlertView.m; sourceTree = "<group>"; };
1CC1542C230D6E3600582EC1 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
1CD9C41022C3103D00C04683 /* ZXAppointBathDeviceListTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZXAppointBathDeviceListTableViewCell.h; sourceTree = "<group>"; }; 1CD9C41022C3103D00C04683 /* ZXAppointBathDeviceListTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZXAppointBathDeviceListTableViewCell.h; sourceTree = "<group>"; };
1CD9C41122C3103D00C04683 /* ZXAppointBathDeviceListTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZXAppointBathDeviceListTableViewCell.m; sourceTree = "<group>"; }; 1CD9C41122C3103D00C04683 /* ZXAppointBathDeviceListTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZXAppointBathDeviceListTableViewCell.m; sourceTree = "<group>"; };
1CD9C41322C3191300C04683 /* ZXAppointForbbidenModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZXAppointForbbidenModel.h; sourceTree = "<group>"; }; 1CD9C41322C3191300C04683 /* ZXAppointForbbidenModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZXAppointForbbidenModel.h; sourceTree = "<group>"; };
...@@ -2835,7 +2835,7 @@ ...@@ -2835,7 +2835,7 @@
A754365221D33182005584CC /* AppDelegate.m */, A754365221D33182005584CC /* AppDelegate.m */,
A705BF9521D4AA69004F1628 /* AppDelegate+Extension.h */, A705BF9521D4AA69004F1628 /* AppDelegate+Extension.h */,
A75436F021D34DEA005584CC /* AppDelegate+Extension.m */, A75436F021D34DEA005584CC /* AppDelegate+Extension.m */,
1CC15425230D460100582EC1 /* LaunchScreen.storyboard */, 1CC1542C230D6E3600582EC1 /* LaunchScreen.storyboard */,
9142D2CE1F35C84E004F90CF /* Info.plist */, 9142D2CE1F35C84E004F90CF /* Info.plist */,
9142D2F71F35D212004F90CF /* PrefixHeader.pch */, 9142D2F71F35D212004F90CF /* PrefixHeader.pch */,
9142D2C61F35C84E004F90CF /* ColorfulSchool.xcdatamodeld */, 9142D2C61F35C84E004F90CF /* ColorfulSchool.xcdatamodeld */,
...@@ -4897,7 +4897,7 @@ ...@@ -4897,7 +4897,7 @@
A705C01221D4B067004F1628 /* UIBarButtonItemArrowRight@3x.png in Resources */, A705C01221D4B067004F1628 /* UIBarButtonItemArrowRight@3x.png in Resources */,
A7F3E16421B5330F00010E23 /* About.txt in Resources */, A7F3E16421B5330F00010E23 /* About.txt in Resources */,
A786A5B321F70A6C0041B81C /* JSPOST.html in Resources */, A786A5B321F70A6C0041B81C /* JSPOST.html in Resources */,
1CC15426230D460200582EC1 /* LaunchScreen.storyboard in Resources */, 1CC1542D230D6E3600582EC1 /* LaunchScreen.storyboard in Resources */,
A705C00821D4B067004F1628 /* ImageSelectedSmallOn.png in Resources */, A705C00821D4B067004F1628 /* ImageSelectedSmallOn.png in Resources */,
A705C00E21D4B067004F1628 /* PlayButtonOverlayLargeTap.png in Resources */, A705C00E21D4B067004F1628 /* PlayButtonOverlayLargeTap.png in Resources */,
A754368B21D331F8005584CC /* SearchEquipmenController.xib in Resources */, A754368B21D331F8005584CC /* SearchEquipmenController.xib in Resources */,
......
ColorfulSchool/ColorfulSchool.xcodeproj/xcshareddata/xcschemes/ColorfulSchool.xcscheme
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
</AdditionalOptions> </AdditionalOptions>
</TestAction> </TestAction>
<LaunchAction <LaunchAction
buildConfiguration = "Debug" buildConfiguration = "Release"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0" launchStyle = "0"
......
ColorfulSchool/ColorfulSchool/AppDelegate.m
...@@ -64,10 +64,10 @@ ...@@ -64,10 +64,10 @@
_isPlaying = NO; _isPlaying = NO;
//默认配置 //默认配置
[self defaultLauchConfigAndIsOpenPreventCrashManager:NO]; [self defaultLauchConfigAndIsOpenPreventCrashManager:YES];
//启动环境 //启动环境
[APIManager sharedAPIManager].lauchEnvironment = ZXColorfulSchoolEnvironmentTest; [APIManager sharedAPIManager].lauchEnvironment = ZXColorfulSchoolEnvironmentProduct;
//极光推送 //极光推送
[self initPushWithOptions:launchOptions isProduct:YES]; [self initPushWithOptions:launchOptions isProduct:YES];
......
ColorfulSchool/ColorfulSchool/Classes/Login(登录注册)/Login/Controller/ZXBindTelViewController.m
// //
...@@ -142,7 +142,11 @@ ...@@ -142,7 +142,11 @@
make.height.mas_equalTo(45 * k6Scale); make.height.mas_equalTo(45 * k6Scale);
}]; }];
kWeakSelf(self); kWeakSelf(self);
[[okBtn rac_signalForControlEvents:UIControlEventTouchUpInside] subscribeNext:^(id x) { [[okBtn rac_signalForControlEvents:UIControlEventTouchUpInside] subscribeNext:^(UIButton *x) {
x.enabled = NO;
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
x.enabled = YES;
});
kStrongSelf(self); kStrongSelf(self);
if ([vioCodeField.text isEqualToString:@""]) { if ([vioCodeField.text isEqualToString:@""]) {
[ZXTool showText:@"请输入验证码"]; [ZXTool showText:@"请输入验证码"];
......
ColorfulSchool/ColorfulSchool/Classes/Login(登录注册)/Login/Controller/ZXLoginViewController.m
// //
...@@ -445,9 +445,9 @@ ...@@ -445,9 +445,9 @@
ZXOauthHasDCAccountViewController *oauthVc = [[ZXOauthHasDCAccountViewController alloc] init]; ZXOauthHasDCAccountViewController *oauthVc = [[ZXOauthHasDCAccountViewController alloc] init];
oauthVc.openId = openid; oauthVc.openId = openid;
oauthVc.thirdType = thirdType; oauthVc.thirdType = thirdType;
kWeakSelf(self);
oauthVc.bindSuccess = ^{ oauthVc.bindSuccess = ^{
kStrongSelf(self);
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
//跳转复杂版 //跳转复杂版
MyTabViewController * tabRoot = [[MyTabViewController alloc]init]; MyTabViewController * tabRoot = [[MyTabViewController alloc]init];
......
ColorfulSchool/ColorfulSchool/Classes/Login(登录注册)/Login/Controller/ZXOauthHasDCAccountViewController.m
// //
...@@ -100,5 +100,9 @@ ...@@ -100,5 +100,9 @@
} }
- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
[UIApplication sharedApplication].statusBarStyle = 0;
}
@end @end
ColorfulSchool/ColorfulSchool/LaunchScreen.storyboard
<?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="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina4_7" orientation="portrait"> <device id="retina5_5" orientation="portrait">
<adaptation id="fullscreen"/> <adaptation id="fullscreen"/>
</device> </device>
<dependencies> <dependencies>
...@@ -14,33 +14,32 @@ ...@@ -14,33 +14,32 @@
<objects> <objects>
<viewController id="01J-lp-oVM" sceneMemberID="viewController"> <viewController id="01J-lp-oVM" sceneMemberID="viewController">
<layoutGuides> <layoutGuides>
<viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/> <viewControllerLayoutGuide type="top" id="od9-eW-c29"/>
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/> <viewControllerLayoutGuide type="bottom" id="YMM-Aj-3la"/>
</layoutGuides> </layoutGuides>
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3"> <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/> <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_default" translatesAutoresizingMaskIntoConstraints="NO" id="9TK-JG-p7L"> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="default_home" translatesAutoresizingMaskIntoConstraints="NO" id="IQM-oG-43Q">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/> <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
</imageView> </imageView>
</subviews> </subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints> <constraints>
<constraint firstAttribute="trailing" secondItem="9TK-JG-p7L" secondAttribute="trailing" id="Jix-0z-yLj"/> <constraint firstItem="IQM-oG-43Q" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="b6N-rS-Esj"/>
<constraint firstItem="xb3-aO-Qok" firstAttribute="top" secondItem="9TK-JG-p7L" secondAttribute="bottom" id="auK-YO-aLi"/> <constraint firstAttribute="bottom" secondItem="IQM-oG-43Q" secondAttribute="bottom" id="c5r-tx-Xhs"/>
<constraint firstItem="9TK-JG-p7L" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="pF9-jj-Ptu"/> <constraint firstAttribute="trailing" secondItem="IQM-oG-43Q" secondAttribute="trailing" id="dMi-DZ-WkA"/>
<constraint firstItem="9TK-JG-p7L" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="r4a-8T-Fkr"/> <constraint firstItem="IQM-oG-43Q" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="jch-Lx-Yr1"/>
</constraints> </constraints>
</view> </view>
<nil key="simulatedStatusBarMetrics"/>
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="-3246" y="-618"/> <point key="canvasLocation" x="34.782608695652179" y="559.23913043478262"/>
</scene> </scene>
</scenes> </scenes>
<resources> <resources>
<image name="img_default" width="375" height="667"/> <image name="default_home" width="375" height="667"/>
</resources> </resources>
</document> </document>
ColorfulSchool/ColorfulSchool/Main(入口)/Controller/ViewController.xib
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/> <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_default" translatesAutoresizingMaskIntoConstraints="NO" id="RRP-Qq-y3w"> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="default_home" translatesAutoresizingMaskIntoConstraints="NO" id="RRP-Qq-y3w">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/> <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
</imageView> </imageView>
</subviews> </subviews>
...@@ -30,10 +30,10 @@ ...@@ -30,10 +30,10 @@
<constraint firstItem="RRP-Qq-y3w" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="dor-M8-Uhc"/> <constraint firstItem="RRP-Qq-y3w" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="dor-M8-Uhc"/>
<constraint firstItem="RRP-Qq-y3w" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="kve-KJ-ryJ"/> <constraint firstItem="RRP-Qq-y3w" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="kve-KJ-ryJ"/>
</constraints> </constraints>
<point key="canvasLocation" x="-658" y="-4"/> <point key="canvasLocation" x="-658.39999999999998" y="-4.0479760119940034"/>
</view> </view>
</objects> </objects>
<resources> <resources>
<image name="img_default" width="375" height="667"/> <image name="default_home" width="375" height="667"/>
</resources> </resources>
</document> </document>
ColorfulSchool/ColorfulSchool/images.xcassets/newHomePage/img_default.imageset/Contents.json → ColorfulSchool/ColorfulSchool/images.xcassets/newHomePage/default_home.imageset/Contents.json
...@@ -2,17 +2,16 @@ ...@@ -2,17 +2,16 @@
"images" : [ "images" : [
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "default.png.png",
"scale" : "1x" "scale" : "1x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "default.png@2x.png", "filename" : "default_home@2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "default.png@3x.png", "filename" : "default_home@3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
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