Skip to content

C
colorfulSchoolReconsitution
Commit 935da12d by 刘卓鑫
Options

定版，发不到appStore 3.8.6

parent eac81d83
Showing with 28 additions and 47 deletions
ColorfulSchool/ColorfulSchool.xcodeproj/project.pbxproj
......@@ -75,6 +75,7 @@
1CB3AC1623053BF0006F1724 /* CropImageController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CB3AC1423053BEF006F1724 /* CropImageController.m */; };
1CC15429230D5B7400582EC1 /* ZXAimiWalletAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CC15428230D5B7400582EC1 /* ZXAimiWalletAlertView.m */; };
1CC1542D230D6E3600582EC1 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1CC1542C230D6E3600582EC1 /* LaunchScreen.storyboard */; };
1CC1543B230E2FB200582EC1 /* img_lauch.png in Resources */ = {isa = PBXBuildFile; fileRef = 1CC1543A230E2FB200582EC1 /* img_lauch.png */; };
1CD9C41222C3103D00C04683 /* ZXAppointBathDeviceListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CD9C41122C3103D00C04683 /* ZXAppointBathDeviceListTableViewCell.m */; };
1CD9C41522C3191300C04683 /* ZXAppointForbbidenModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CD9C41422C3191300C04683 /* ZXAppointForbbidenModel.m */; };
1CD9C41822C36E6700C04683 /* ZXAppointRecordModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CD9C41722C36E6700C04683 /* ZXAppointRecordModel.m */; };
......@@ -813,6 +814,7 @@
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>"; };
1CC1542C230D6E3600582EC1 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
1CC1543A230E2FB200582EC1 /* img_lauch.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = img_lauch.png; 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>"; };
1CD9C41322C3191300C04683 /* ZXAppointForbbidenModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZXAppointForbbidenModel.h; sourceTree = "<group>"; };
......@@ -3394,6 +3396,7 @@
A7BE8C3721C89AE200B77C47 /* home_quanyuan_def_pic.png */,
A78A3F3F21952EE6001558A5 /* orderSound.wav */,
A7DECC642079F0E20039EC22 /* loadingBG.png */,
1CC1543A230E2FB200582EC1 /* img_lauch.png */,
A77DE2C920DB4ACC002FB903 /* washingsss.gif */,
A7200868210EF6A600BE2DC6 /* ssssaaaaff.png */,
A7DECC652079F0E20039EC22 /* ss.gif */,
......@@ -4859,6 +4862,7 @@
A705BFFD21D4B067004F1628 /* ImageError@2x.png in Resources */,
1C3940FA230A7BDC005048EB /* run.gif in Resources */,
A7F3E16621B5330F00010E23 /* About.txt in Resources */,
1CC1543B230E2FB200582EC1 /* img_lauch.png in Resources */,
A705C01821D4B067004F1628 /* VideoOverlay@3x.png in Resources */,
A7A858DC20BBA481001917F2 /* holder_index.png in Resources */,
A77DE2CA20DB4ACD002FB903 /* washingsss.gif in Resources */,
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/View/Cells/ZXHomePageAnnouceCell.m
//
//
......@@ -102,7 +102,7 @@
}
-(UIView *) returnNotReadView {
UIView *v = [[UIView alloc] initWithFrame:CGRectMake(10 * k6Scale, 10 * k6Scale, 70 * k6Scale, 25 * k6Scale)];
UIView *v = [[UIView alloc] initWithFrame:CGRectMake(10 * k6Scale, 0, 70 * k6Scale, 25 * k6Scale)];
v.backgroundColor = RGB(255, 58, 68);
UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:v.bounds byRoundingCorners:UIRectCornerBottomRight | UIRectCornerTopLeft cornerRadii:CGSizeMake(7 * k6Scale, 7 * k6Scale)];
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/View/Cells/ZXHomePageFunctionCell.m
//
//
......@@ -29,9 +29,6 @@
}
- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) {
[self.contentView mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.equalTo(self).insets(UIEdgeInsetsMake(15 * k6Scale, 15 * k6Scale, 0 * k6Scale, 15 * k6Scale));
}];
self.selectionStyle = UITableViewCellSelectionStyleNone;
......@@ -41,7 +38,7 @@
- (void)setItems:(NSArray *)items {
_items = items;
for (UIView *v in self.contentView.subviews) {
for (UIView *v in self.subviews) {
[v removeFromSuperview];
}
......@@ -51,16 +48,17 @@
if (count <= 3) {
ZXHomeFunctionView *func;
CGFloat w = (kScreenWidth - 30 * k6Scale - (_items.count - 1) * 10 * k6Scale) / _items.count * 1.0f;
for (int i = 0; i < items.count; i++) {
ZXHomeFunctionView *funcView = [[ZXHomeFunctionView alloc] init];
[self.contentView addSubview:funcView];
[self addSubview:funcView];
[funcView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.bottom.equalTo(self.contentView);
make.width.mas_equalTo(cellW);
make.top.bottom.equalTo(self);
make.width.mas_equalTo(w);
if (func) {
make.left.equalTo(func.mas_right).offset(15 * k6Scale);
make.left.equalTo(func.mas_right).offset(10 * k6Scale);
} else {
make.left.equalTo(self.contentView);
make.left.equalTo(self.mas_left).offset(15 * k6Scale);
}
}];
funcView.func = _items[i];
......
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/View/customViews/ZXHomeFunctionView.m
//
//
......@@ -30,7 +30,7 @@
[self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.equalTo(self);
}];
self.bgImageView.contentMode = UIViewContentModeScaleAspectFit;
// self.titleLabel = [[UILabel alloc] init];
// [self addSubview:_titleLabel];
// self.titleLabel.textColor = [UIColor whiteColor];
......
ColorfulSchool/ColorfulSchool/Classes/Login(登录注册)/Login/Controller/ZXLoginViewController.m
//
//
......@@ -304,6 +304,8 @@
[ZXTool saveUserInfo:user];
dispatch_async(dispatch_get_main_queue(), ^{
[SVProgressHUD dismiss];
[ZXTool hideLoadingAnimation];
//跳转复杂版
MyTabViewController * tabRoot = [[MyTabViewController alloc]init];
[UIApplication sharedApplication].keyWindow.rootViewController = tabRoot;
......
ColorfulSchool/ColorfulSchool/Info.plist
......@@ -440,7 +440,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.0</string>
<string>1.2</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>jdlogin</string>
......
ColorfulSchool/ColorfulSchool/LaunchScreen.storyboard
......@@ -21,7 +21,7 @@
<rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="default_home" translatesAutoresizingMaskIntoConstraints="NO" id="IQM-oG-43Q">
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_lauch.png" adjustsImageSizeForAccessibilityContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="IQM-oG-43Q">
<rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
</imageView>
</subviews>
......@@ -36,10 +36,10 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="34.782608695652179" y="559.23913043478262"/>
<point key="canvasLocation" x="-1242" y="174"/>
</scene>
</scenes>
<resources>
<image name="default_home" width="375" height="667"/>
<image name="img_lauch.png" width="750" height="1334"/>
</resources>
</document>
ColorfulSchool/ColorfulSchool/Main(入口)/Controller/ViewController.xib
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
......@@ -19,21 +19,21 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="default_home" translatesAutoresizingMaskIntoConstraints="NO" id="RRP-Qq-y3w">
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_lauch.png" translatesAutoresizingMaskIntoConstraints="NO" id="RRP-Qq-y3w">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
</imageView>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="RRP-Qq-y3w" secondAttribute="trailing" id="Jcf-Sq-4sA"/>
<constraint firstAttribute="bottom" secondItem="RRP-Qq-y3w" secondAttribute="bottom" id="bA0-pN-3qz"/>
<constraint firstItem="RRP-Qq-y3w" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="dor-M8-Uhc"/>
<constraint firstAttribute="bottom" secondItem="RRP-Qq-y3w" secondAttribute="bottom" id="jUF-mp-nO9"/>
<constraint firstItem="RRP-Qq-y3w" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="kve-KJ-ryJ"/>
</constraints>
<point key="canvasLocation" x="-658.39999999999998" y="-4.0479760119940034"/>
<point key="canvasLocation" x="-479.19999999999999" y="-10.344827586206897"/>
</view>
</objects>
<resources>
<image name="default_home" width="375" height="667"/>
<image name="img_lauch.png" width="750" height="1334"/>
</resources>
</document>
ColorfulSchool/ColorfulSchool/images.xcassets/newHomePage/default_home.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "default_home@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "default_home@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
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