Skip to content

A
ALand
Commit 66309bf1 authored by Sandy's avatar Sandy
Browse files
Options

我的团队界面搭建

parent 41a8146f
Hide whitespace changes
Inline Side-by-side
Showing with 810 additions and 10 deletions
ALand.xcodeproj/project.pbxproj
View file @ 66309bf1
......@@ -135,6 +135,16 @@
19ADD38E1CA4EC1000EE6E5A /* AddCommodityHeaderCollectionReusableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 19ADD38C1CA4EC1000EE6E5A /* AddCommodityHeaderCollectionReusableView.m */; };
19ADD38F1CA4EC1000EE6E5A /* AddCommodityHeaderCollectionReusableView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 19ADD38D1CA4EC1000EE6E5A /* AddCommodityHeaderCollectionReusableView.xib */; };
19DC6AFC1CBF867E0064A9FD /* JavenShopModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 19DC6AFB1CBF867E0064A9FD /* JavenShopModel.m */; };
19DC6B0F1CC0AA7D0064A9FD /* MyTeamViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 19DC6B0E1CC0AA7D0064A9FD /* MyTeamViewController.m */; };
19DC6B131CC0ACDE0064A9FD /* MyteamTopView.m in Sources */ = {isa = PBXBuildFile; fileRef = 19DC6B121CC0ACDE0064A9FD /* MyteamTopView.m */; };
19DC6B151CC0ACF40064A9FD /* MyTeamTopView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 19DC6B141CC0ACF40064A9FD /* MyTeamTopView.xib */; };
19DC6B191CC0B5690064A9FD /* MyTeamCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 19DC6B171CC0B5690064A9FD /* MyTeamCollectionViewCell.m */; };
19DC6B1A1CC0B5690064A9FD /* MyTeamCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 19DC6B181CC0B5690064A9FD /* MyTeamCollectionViewCell.xib */; };
19DC6B291CC0CEDD0064A9FD /* MBButtonWithFontAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 19DC6B1F1CC0CEDD0064A9FD /* MBButtonWithFontAdapter.m */; };
19DC6B2A1CC0CEDD0064A9FD /* MBLabelWithFontAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 19DC6B211CC0CEDD0064A9FD /* MBLabelWithFontAdapter.m */; };
19DC6B2B1CC0CEDD0064A9FD /* MBTextFieldWithFontAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 19DC6B231CC0CEDD0064A9FD /* MBTextFieldWithFontAdapter.m */; };
19DC6B2C1CC0CEDD0064A9FD /* MBTextViewWithFontAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 19DC6B251CC0CEDD0064A9FD /* MBTextViewWithFontAdapter.m */; };
19DC6B2D1CC0CEDD0064A9FD /* MBFontAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 19DC6B281CC0CEDD0064A9FD /* MBFontAdapter.m */; };
19DCCB591C9A9EB30072C3BF /* IBTAudioController.m in Sources */ = {isa = PBXBuildFile; fileRef = 19DCCB0C1C9A9EB30072C3BF /* IBTAudioController.m */; };
19DCCB5A1C9A9EB30072C3BF /* IBTAudioRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 19DCCB0E1C9A9EB30072C3BF /* IBTAudioRecorder.m */; };
19DCCB5B1C9A9EB30072C3BF /* IBTAudioServicesManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 19DCCB101C9A9EB30072C3BF /* IBTAudioServicesManager.m */; };
......@@ -459,6 +469,24 @@
19ADD38D1CA4EC1000EE6E5A /* AddCommodityHeaderCollectionReusableView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AddCommodityHeaderCollectionReusableView.xib; sourceTree = "<group>"; };
19DC6AFA1CBF867E0064A9FD /* JavenShopModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavenShopModel.h; sourceTree = "<group>"; };
19DC6AFB1CBF867E0064A9FD /* JavenShopModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JavenShopModel.m; sourceTree = "<group>"; };
19DC6B0D1CC0AA7D0064A9FD /* MyTeamViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyTeamViewController.h; sourceTree = "<group>"; };
19DC6B0E1CC0AA7D0064A9FD /* MyTeamViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyTeamViewController.m; sourceTree = "<group>"; };
19DC6B111CC0ACDE0064A9FD /* MyteamTopView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyteamTopView.h; sourceTree = "<group>"; };
19DC6B121CC0ACDE0064A9FD /* MyteamTopView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyteamTopView.m; sourceTree = "<group>"; };
19DC6B141CC0ACF40064A9FD /* MyTeamTopView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MyTeamTopView.xib; sourceTree = "<group>"; };
19DC6B161CC0B5690064A9FD /* MyTeamCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyTeamCollectionViewCell.h; sourceTree = "<group>"; };
19DC6B171CC0B5690064A9FD /* MyTeamCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyTeamCollectionViewCell.m; sourceTree = "<group>"; };
19DC6B181CC0B5690064A9FD /* MyTeamCollectionViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MyTeamCollectionViewCell.xib; sourceTree = "<group>"; };
19DC6B1E1CC0CEDD0064A9FD /* MBButtonWithFontAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MBButtonWithFontAdapter.h; sourceTree = "<group>"; };
19DC6B1F1CC0CEDD0064A9FD /* MBButtonWithFontAdapter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MBButtonWithFontAdapter.m; sourceTree = "<group>"; };
19DC6B201CC0CEDD0064A9FD /* MBLabelWithFontAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MBLabelWithFontAdapter.h; sourceTree = "<group>"; };
19DC6B211CC0CEDD0064A9FD /* MBLabelWithFontAdapter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MBLabelWithFontAdapter.m; sourceTree = "<group>"; };
19DC6B221CC0CEDD0064A9FD /* MBTextFieldWithFontAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MBTextFieldWithFontAdapter.h; sourceTree = "<group>"; };
19DC6B231CC0CEDD0064A9FD /* MBTextFieldWithFontAdapter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MBTextFieldWithFontAdapter.m; sourceTree = "<group>"; };
19DC6B241CC0CEDD0064A9FD /* MBTextViewWithFontAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MBTextViewWithFontAdapter.h; sourceTree = "<group>"; };
19DC6B251CC0CEDD0064A9FD /* MBTextViewWithFontAdapter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MBTextViewWithFontAdapter.m; sourceTree = "<group>"; };
19DC6B271CC0CEDD0064A9FD /* MBFontAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MBFontAdapter.h; sourceTree = "<group>"; };
19DC6B281CC0CEDD0064A9FD /* MBFontAdapter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MBFontAdapter.m; sourceTree = "<group>"; };
19DCCACD1C9A9AD60072C3BF /* PrefixHeader.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PrefixHeader.pch; sourceTree = "<group>"; };
19DCCB0B1C9A9EB30072C3BF /* IBTAudioController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IBTAudioController.h; sourceTree = "<group>"; };
19DCCB0C1C9A9EB30072C3BF /* IBTAudioController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IBTAudioController.m; sourceTree = "<group>"; };
......@@ -837,6 +865,7 @@
1940D2E91C9A56730080678C /* ALand */ = {
isa = PBXGroup;
children = (
19DC6B1B1CC0CEDD0064A9FD /* Third */,
19A1C83E1CA27403003E5DD9 /* Global */,
1929F16E1C9FCFA6000E9B26 /* Assets.xcassets */,
19DCCBE71C9AA1D50072C3BF /* UserUtil */,
......@@ -1185,6 +1214,69 @@
path = Commodity;
sourceTree = "<group>";
};
19DC6B0C1CC0A9340064A9FD /* MyTeams */ = {
isa = PBXGroup;
children = (
19DC6B0D1CC0AA7D0064A9FD /* MyTeamViewController.h */,
19DC6B0E1CC0AA7D0064A9FD /* MyTeamViewController.m */,
);
path = MyTeams;
sourceTree = "<group>";
};
19DC6B101CC0ACB70064A9FD /* MyTeams */ = {
isa = PBXGroup;
children = (
19DC6B111CC0ACDE0064A9FD /* MyteamTopView.h */,
19DC6B121CC0ACDE0064A9FD /* MyteamTopView.m */,
19DC6B141CC0ACF40064A9FD /* MyTeamTopView.xib */,
19DC6B161CC0B5690064A9FD /* MyTeamCollectionViewCell.h */,
19DC6B171CC0B5690064A9FD /* MyTeamCollectionViewCell.m */,
19DC6B181CC0B5690064A9FD /* MyTeamCollectionViewCell.xib */,
);
path = MyTeams;
sourceTree = "<group>";
};
19DC6B1B1CC0CEDD0064A9FD /* Third */ = {
isa = PBXGroup;
children = (
19DC6B1C1CC0CEDD0064A9FD /* MBFontAdapter */,
);
path = Third;
sourceTree = "<group>";
};
19DC6B1C1CC0CEDD0064A9FD /* MBFontAdapter */ = {
isa = PBXGroup;
children = (
19DC6B1D1CC0CEDD0064A9FD /* control */,
19DC6B261CC0CEDD0064A9FD /* util */,
);
path = MBFontAdapter;
sourceTree = "<group>";
};
19DC6B1D1CC0CEDD0064A9FD /* control */ = {
isa = PBXGroup;
children = (
19DC6B1E1CC0CEDD0064A9FD /* MBButtonWithFontAdapter.h */,
19DC6B1F1CC0CEDD0064A9FD /* MBButtonWithFontAdapter.m */,
19DC6B201CC0CEDD0064A9FD /* MBLabelWithFontAdapter.h */,
19DC6B211CC0CEDD0064A9FD /* MBLabelWithFontAdapter.m */,
19DC6B221CC0CEDD0064A9FD /* MBTextFieldWithFontAdapter.h */,
19DC6B231CC0CEDD0064A9FD /* MBTextFieldWithFontAdapter.m */,
19DC6B241CC0CEDD0064A9FD /* MBTextViewWithFontAdapter.h */,
19DC6B251CC0CEDD0064A9FD /* MBTextViewWithFontAdapter.m */,
);
path = control;
sourceTree = "<group>";
};
19DC6B261CC0CEDD0064A9FD /* util */ = {
isa = PBXGroup;
children = (
19DC6B271CC0CEDD0064A9FD /* MBFontAdapter.h */,
19DC6B281CC0CEDD0064A9FD /* MBFontAdapter.m */,
);
path = util;
sourceTree = "<group>";
};
19DCCA851C9A95E70072C3BF /* Home */ = {
isa = PBXGroup;
children = (
......@@ -1211,6 +1303,7 @@
19DCCA871C9A95E70072C3BF /* View */ = {
isa = PBXGroup;
children = (
19DC6B101CC0ACB70064A9FD /* MyTeams */,
1900A3431CB6156F00B2B7C4 /* StoreManagerment */,
191383361CAB961B005F6440 /* Order */,
1979752F1CA90D8600407E3F /* CommodityManagement */,
......@@ -1231,6 +1324,7 @@
19DCCA881C9A95E70072C3BF /* ViewController */ = {
isa = PBXGroup;
children = (
19DC6B0C1CC0A9340064A9FD /* MyTeams */,
199B4D901CAE6F3500451E0E /* StoreManagerment */,
1979754E1CAB6F4700407E3F /* Order */,
19ADD36B1CA3B88A00EE6E5A /* Commodity */,
......@@ -1704,7 +1798,9 @@
1979754A1CAA4DB900407E3F /* CommodityMutipleSelectBottomView.xib in Resources */,
1929F16F1C9FCFA6000E9B26 /* Assets.xcassets in Resources */,
1929F17E1CA0DE32000E9B26 /* HomeTopView.xib in Resources */,
19DC6B1A1CC0B5690064A9FD /* MyTeamCollectionViewCell.xib in Resources */,
1900A33D1CB602D500B2B7C4 /* StoreNameViewController.xib in Resources */,
19DC6B151CC0ACF40064A9FD /* MyTeamTopView.xib in Resources */,
19ADD37F1CA4D38B00EE6E5A /* CommodityListCollectionViewCell.xib in Resources */,
1979753F1CAA15C700407E3F /* CommodityTableViewCell.xib in Resources */,
);
......@@ -1782,9 +1878,11 @@
191AEE611CBCC6D100F5E535 /* OperCtx.m in Sources */,
191AEE101CBB818600F5E535 /* UserInfoCertificate.m in Sources */,
19DCCBC91C9AA0450072C3BF /* NSNull+OVNatural.m in Sources */,
19DC6B131CC0ACDE0064A9FD /* MyteamTopView.m in Sources */,
191AEE141CBB818600F5E535 /* UserInfoOwnerOrg.m in Sources */,
195EB1E01CA5292600E298BB /* AddCommodityFooterCollectionReusableView.m in Sources */,
19DCCB791C9A9EB30072C3BF /* IBTWebViewController.m in Sources */,
19DC6B291CC0CEDD0064A9FD /* MBButtonWithFontAdapter.m in Sources */,
19ADD3671CA3A16C00EE6E5A /* CoverShadowView.m in Sources */,
199BC7BE1C9B045B00E4E0B8 /* RigistViewController.m in Sources */,
199BC7D01C9BAC9600E4E0B8 /* MyTools.m in Sources */,
......@@ -1841,6 +1939,7 @@
192860FF1CBF708C00FA6E85 /* MBProgressHUD+Javen.m in Sources */,
192861051CBF825100FA6E85 /* JavenShop.m in Sources */,
191AEE161CBB818600F5E535 /* UserInfoShop.m in Sources */,
19DC6B191CC0B5690064A9FD /* MyTeamCollectionViewCell.m in Sources */,
19DCCB691C9A9EB30072C3BF /* IBTObject.m in Sources */,
19DCCBDD1C9AA0450072C3BF /* IBTFileManager.m in Sources */,
1900A3411CB6059000B2B7C4 /* introductionViewController.m in Sources */,
......@@ -1890,6 +1989,7 @@
19DCCB681C9A9EB30072C3BF /* IBTLoadingView.m in Sources */,
199BC7D61C9BBE0D00E4E0B8 /* MineViewController.m in Sources */,
19DCCB5C1C9A9EB30072C3BF /* IBTAVAudioPlayWrapper.m in Sources */,
19DC6B2A1CC0CEDD0064A9FD /* MBLabelWithFontAdapter.m in Sources */,
19DCCB601C9A9EB30072C3BF /* IBTScrollLoadMoreView.m in Sources */,
1979753E1CAA15C700407E3F /* CommodityTableViewCell.m in Sources */,
19DCCB671C9A9EB30072C3BF /* IBTCustomButtom.m in Sources */,
......@@ -1900,8 +2000,10 @@
19DCCB711C9A9EB30072C3BF /* IBTUILabel.m in Sources */,
19DCCB651C9A9EB30072C3BF /* IBTBadgeView.m in Sources */,
19DCCBEF1C9AA1D50072C3BF /* QueryOrder.m in Sources */,
19DC6B0F1CC0AA7D0064A9FD /* MyTeamViewController.m in Sources */,
19DCCB5E1C9A9EB30072C3BF /* IBTModel.m in Sources */,
19DCCBD51C9AA0450072C3BF /* UITableViewCell+Helper.m in Sources */,
19DC6B2C1CC0CEDD0064A9FD /* MBTextViewWithFontAdapter.m in Sources */,
191AEE2C1CBB86C600F5E535 /* CommotityListCreateInfo.m in Sources */,
19DCCBE01C9AA0450072C3BF /* JTOptionCell.m in Sources */,
19DCCBE11C9AA0450072C3BF /* JTOptionsEntity.m in Sources */,
......@@ -1933,6 +2035,8 @@
19DCCBCD1C9AA0450072C3BF /* UIFont+Custom.m in Sources */,
19DCCBE41C9AA0450072C3BF /* ICRFunctionEntity.m in Sources */,
19632DA81CB356050024A8A1 /* UIImage+QRCode.m in Sources */,
19DC6B2B1CC0CEDD0064A9FD /* MBTextFieldWithFontAdapter.m in Sources */,
19DC6B2D1CC0CEDD0064A9FD /* MBFontAdapter.m in Sources */,
19DCCB6E1C9A9EB30072C3BF /* IBTTableViewCell.m in Sources */,
1929F16D1C9FCB62000E9B26 /* NSDictionary+Category.m in Sources */,
19ADD37E1CA4D38B00EE6E5A /* CommodityListCollectionViewCell.m in Sources */,
......
ALand/Assets.xcassets/01我的团队_iPhone_assets/Contents.json 0 → 100644
View file @ 66309bf1
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
ALand/Assets.xcassets/01我的团队_iPhone_assets/team_icon.imageset/Contents.json 0 → 100644
View file @ 66309bf1
{
"images" : [
{
"idiom" : "universal",
"filename" : "team_icon.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "team_icon@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
ALand/CodeClass/Home/View/HomeCollectionViewCell.xib
View file @ 66309bf1
......@@ -30,7 +30,7 @@
<connections>
<outlet property="imgView" destination="D99-gm-QhP" id="33R-h5-L3T"/>
</connections>
<point key="canvasLocation" x="156.5" y="357.5"/>
<point key="canvasLocation" x="289.5" y="426.5"/>
</collectionViewCell>
</objects>
<resources>
......
ALand/CodeClass/Home/View/MyTeams/MyTeamCollectionViewCell.h 0 → 100644
View file @ 66309bf1
//
// MyTeamCollectionViewCell.h
// ALand
//
// Created by Z on 16/4/15.
// Copyright © 2016年 Z. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface MyTeamCollectionViewCell : UICollectionViewCell
- (void)cellWithModel:(id)model;
@end
ALand/CodeClass/Home/View/MyTeams/MyTeamCollectionViewCell.m 0 → 100644
View file @ 66309bf1
//
// MyTeamCollectionViewCell.m
// ALand
//
// Created by Z on 16/4/15.
// Copyright © 2016年 Z. All rights reserved.
//
#import "MyTeamCollectionViewCell.h"
#import "MBLabelWithFontAdapter.h"
@interface MyTeamCollectionViewCell ()
@property (weak, nonatomic) IBOutlet MBLabelWithFontAdapter *labelTeamNums;
@property (weak, nonatomic) IBOutlet UIImageView *imgViewTeam;
@property (weak, nonatomic) IBOutlet MBLabelWithFontAdapter *labelPhone;
@property (weak, nonatomic) IBOutlet UILabel *labelAmount;
@property (weak, nonatomic) IBOutlet UIView *viewAmountBackround;
@end
@implementation MyTeamCollectionViewCell
- (void)awakeFromNib {
self.viewAmountBackround.layer.cornerRadius = self.viewAmountBackround.height / 2;
// Initialization code
}
- (void)cellWithModel:(id)model
{
self.labelTeamNums.text = [NSString stringWithFormat:@"一级成员(%d)", 2];
self.labelAmount.text = [NSString stringWithFormat:@"￥%0.2f",12.34];
}
@end
ALand/CodeClass/Home/View/MyTeams/MyTeamCollectionViewCell.xib 0 → 100644
View file @ 66309bf1
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="gTV-IL-0wX" customClass="MyTeamCollectionViewCell">
<rect key="frame" x="0.0" y="0.0" width="168" height="202"/>
<autoresizingMask key="autoresizingMask"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
<rect key="frame" x="0.0" y="0.0" width="168" height="202"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="一级成员(3)" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9UQ-ZX-IV8" customClass="MBLabelWithFontAdapter">
<rect key="frame" x="0.0" y="16" width="168" height="22"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
<variation key="heightClass=compact-widthClass=compact">
<fontDescription key="fontDescription" type="system" pointSize="6"/>
</variation>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="749" image="team_icon" translatesAutoresizingMaskIntoConstraints="NO" id="Vil-wZ-5TN">
<rect key="frame" x="37" y="48" width="94" height="77"/>
<constraints>
<constraint firstAttribute="height" constant="90" id="ag5-Ds-Xru"/>
</constraints>
<variation key="default">
<mask key="constraints">
<exclude reference="ag5-Ds-Xru"/>
</mask>
</variation>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="18253423423" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dAd-yS-LSa" customClass="MBLabelWithFontAdapter">
<rect key="frame" x="0.0" y="145" width="168" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="KGQ-Df-U2B"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
<variation key="default">
<mask key="constraints">
<exclude reference="KGQ-Df-U2B"/>
</mask>
</variation>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qvP-Dh-9Iw">
<rect key="frame" x="44" y="170" width="80" height="22"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="￥12.99" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QVd-gK-ILm">
<rect key="frame" x="10" y="0.0" width="60" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstItem="QVd-gK-ILm" firstAttribute="height" secondItem="qvP-Dh-9Iw" secondAttribute="height" id="44u-8P-tgz"/>
<constraint firstAttribute="trailing" secondItem="QVd-gK-ILm" secondAttribute="trailing" constant="10" id="Lex-6U-lGJ"/>
<constraint firstItem="QVd-gK-ILm" firstAttribute="centerY" secondItem="qvP-Dh-9Iw" secondAttribute="centerY" id="TWf-wO-eaD"/>
<constraint firstAttribute="height" constant="22" id="ihq-gL-LGb"/>
<constraint firstItem="QVd-gK-ILm" firstAttribute="leading" secondItem="qvP-Dh-9Iw" secondAttribute="leading" constant="10" id="jcp-U8-GWX"/>
<constraint firstItem="QVd-gK-ILm" firstAttribute="centerX" secondItem="qvP-Dh-9Iw" secondAttribute="centerX" id="pSa-gz-eTj"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="qvP-Dh-9Iw" firstAttribute="top" secondItem="dAd-yS-LSa" secondAttribute="bottom" constant="5" id="5z2-Rk-xGs"/>
<constraint firstAttribute="trailing" secondItem="dAd-yS-LSa" secondAttribute="trailing" id="6OH-F9-UuD"/>
<constraint firstItem="Vil-wZ-5TN" firstAttribute="top" secondItem="9UQ-ZX-IV8" secondAttribute="bottom" constant="10" id="9IE-NA-PdK"/>
<constraint firstItem="9UQ-ZX-IV8" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="CDy-0B-L5T"/>
<constraint firstItem="9UQ-ZX-IV8" firstAttribute="centerX" secondItem="gTV-IL-0wX" secondAttribute="centerX" id="DQh-zj-Ftt"/>
<constraint firstAttribute="trailing" secondItem="9UQ-ZX-IV8" secondAttribute="trailing" id="QRa-Bc-d9w"/>
<constraint firstItem="dAd-yS-LSa" firstAttribute="centerX" secondItem="gTV-IL-0wX" secondAttribute="centerX" id="eGV-fi-VMP"/>
<constraint firstItem="dAd-yS-LSa" firstAttribute="top" secondItem="Vil-wZ-5TN" secondAttribute="bottom" constant="10" id="fF1-pf-H1I"/>
<constraint firstItem="Vil-wZ-5TN" firstAttribute="centerX" secondItem="gTV-IL-0wX" secondAttribute="centerX" id="hrh-N3-yQ5"/>
<constraint firstItem="qvP-Dh-9Iw" firstAttribute="centerX" secondItem="gTV-IL-0wX" secondAttribute="centerX" id="inO-P9-3ET"/>
<constraint firstItem="dAd-yS-LSa" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="jJ4-Nh-VLs"/>
<constraint firstAttribute="bottom" secondItem="qvP-Dh-9Iw" secondAttribute="bottom" constant="10" id="uoA-LK-Pp1"/>
<constraint firstItem="9UQ-ZX-IV8" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" constant="16" id="vXA-Uo-Z7y"/>
<constraint firstItem="dAd-yS-LSa" firstAttribute="top" secondItem="Vil-wZ-5TN" secondAttribute="bottom" constant="20" id="xEe-Sr-XXa"/>
</constraints>
<size key="customSize" width="168" height="202"/>
<variation key="default">
<mask key="constraints">
<exclude reference="fF1-pf-H1I"/>
</mask>
</variation>
<connections>
<outlet property="imgViewTeam" destination="Vil-wZ-5TN" id="GQ4-jg-I7d"/>
<outlet property="labelAmount" destination="QVd-gK-ILm" id="qZg-fq-IAH"/>
<outlet property="labelPhone" destination="dAd-yS-LSa" id="ZUo-kt-QfD"/>
<outlet property="labelTeamNums" destination="9UQ-ZX-IV8" id="y5y-qh-ZHr"/>
<outlet property="viewAmountBackround" destination="qvP-Dh-9Iw" id="GxS-BJ-U1V"/>
</connections>
<point key="canvasLocation" x="266" y="286"/>
</collectionViewCell>
</objects>
<resources>
<image name="team_icon" width="94" height="94"/>
</resources>
</document>
ALand/CodeClass/Home/View/MyTeams/MyTeamTopView.xib 0 → 100644
View file @ 66309bf1
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB" customClass="MyteamTopView">
<rect key="frame" x="0.0" y="0.0" width="320" height="100"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UfO-fK-lOb">
<rect key="frame" x="0.0" y="0.0" width="320" height="100"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="x57-xK-XZs" userLabel="团队人数">
<rect key="frame" x="0.0" y="0.0" width="320" height="50"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dU8-NC-R12">
<rect key="frame" x="0.0" y="49" width="320" height="1"/>
<color key="backgroundColor" red="0.86666666670000003" green="0.86666666670000003" blue="0.86666666670000003" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="5Ta-1O-sqp"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="团队人数（含一级成员和二级成员）" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="x2R-g7-CmD">
<rect key="frame" x="10" y="14" width="272" height="21"/>
<constraints>
<constraint firstAttribute="width" constant="70" id="TLf-Hj-Cpp"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
<variation key="default">
<mask key="constraints">
<exclude reference="TLf-Hj-Cpp"/>
</mask>
</variation>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="13" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="leQ-OC-esN">
<rect key="frame" x="292" y="14" width="18" height="21"/>
<constraints>
<constraint firstAttribute="width" constant="70" id="5ek-3F-JR3"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
<variation key="default">
<mask key="constraints">
<exclude reference="5ek-3F-JR3"/>
</mask>
</variation>
</label>
</subviews>
<constraints>
<constraint firstItem="x2R-g7-CmD" firstAttribute="centerY" secondItem="x57-xK-XZs" secondAttribute="centerY" id="1U7-jM-6cv"/>
<constraint firstAttribute="bottom" secondItem="dU8-NC-R12" secondAttribute="bottom" id="P4w-Q4-f6C"/>
<constraint firstAttribute="height" constant="50" id="dLc-OE-IKi"/>
<constraint firstItem="leQ-OC-esN" firstAttribute="centerY" secondItem="x2R-g7-CmD" secondAttribute="centerY" id="gXK-hq-ZbG"/>
<constraint firstItem="x2R-g7-CmD" firstAttribute="leading" secondItem="x57-xK-XZs" secondAttribute="leading" constant="10" id="k8y-Pf-X0b"/>
<constraint firstAttribute="trailing" secondItem="dU8-NC-R12" secondAttribute="trailing" id="pIh-s1-U2j"/>
<constraint firstItem="dU8-NC-R12" firstAttribute="leading" secondItem="x57-xK-XZs" secondAttribute="leading" id="pph-p0-coc"/>
<constraint firstAttribute="trailing" secondItem="leQ-OC-esN" secondAttribute="trailing" constant="10" id="vrq-ZV-0qF"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0U2-0y-7bP" userLabel="团队人数">
<rect key="frame" x="0.0" y="50" width="320" height="50"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ip6-tC-DS3">
<rect key="frame" x="0.0" y="49" width="320" height="1"/>
<color key="backgroundColor" red="0.86666666670000003" green="0.86666666670000003" blue="0.86666666670000003" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="Pr1-kr-bi7"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="团队奖金" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="InR-XQ-naN">
<rect key="frame" x="10" y="14" width="68" height="21"/>
<constraints>
<constraint firstAttribute="width" constant="70" id="3O0-8t-VXr"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
<variation key="default">
<mask key="constraints">
<exclude reference="3O0-8t-VXr"/>
</mask>
</variation>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥129.89" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nEq-ZT-hYI">
<rect key="frame" x="240" y="14" width="70" height="21"/>
<constraints>
<constraint firstAttribute="width" constant="70" id="OKC-2C-laH"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
<variation key="default">
<mask key="constraints">
<exclude reference="OKC-2C-laH"/>
</mask>
</variation>
</label>
</subviews>
<constraints>
<constraint firstItem="nEq-ZT-hYI" firstAttribute="centerY" secondItem="InR-XQ-naN" secondAttribute="centerY" id="4if-MI-tgk"/>
<constraint firstItem="ip6-tC-DS3" firstAttribute="leading" secondItem="0U2-0y-7bP" secondAttribute="leading" id="HKq-uY-FVC"/>
<constraint firstAttribute="trailing" secondItem="nEq-ZT-hYI" secondAttribute="trailing" constant="10" id="RAo-Si-Vuh"/>
<constraint firstItem="InR-XQ-naN" firstAttribute="leading" secondItem="0U2-0y-7bP" secondAttribute="leading" constant="10" id="RXl-ws-LSG"/>
<constraint firstItem="InR-XQ-naN" firstAttribute="centerY" secondItem="0U2-0y-7bP" secondAttribute="centerY" id="ZQW-Cd-Xss"/>
<constraint firstAttribute="bottom" secondItem="ip6-tC-DS3" secondAttribute="bottom" id="hAV-3D-64c"/>
<constraint firstAttribute="height" constant="50" id="jfi-z1-v6g"/>
<constraint firstAttribute="trailing" secondItem="ip6-tC-DS3" secondAttribute="trailing" id="wiP-Ve-iSE"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="0U2-0y-7bP" firstAttribute="top" secondItem="x57-xK-XZs" secondAttribute="bottom" id="9zc-C2-JBd"/>
<constraint firstItem="x57-xK-XZs" firstAttribute="top" secondItem="UfO-fK-lOb" secondAttribute="top" id="HGi-9d-8CS"/>
<constraint firstAttribute="trailing" secondItem="0U2-0y-7bP" secondAttribute="trailing" id="NKv-yg-WUC"/>
<constraint firstAttribute="height" constant="100" id="XoW-vV-nqk"/>
<constraint firstItem="x57-xK-XZs" firstAttribute="leading" secondItem="UfO-fK-lOb" secondAttribute="leading" id="fbu-yT-TnJ"/>
<constraint firstAttribute="trailing" secondItem="x57-xK-XZs" secondAttribute="trailing" id="mca-4o-EUR"/>
<constraint firstItem="0U2-0y-7bP" firstAttribute="leading" secondItem="UfO-fK-lOb" secondAttribute="leading" id="zqc-ry-uaD"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="UfO-fK-lOb" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="Dd9-gj-7YY"/>
<constraint firstItem="UfO-fK-lOb" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="bX4-CV-BUP"/>
<constraint firstAttribute="trailing" secondItem="UfO-fK-lOb" secondAttribute="trailing" id="tX9-43-Pxl"/>
</constraints>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<connections>
<outlet property="labelTeamBonus" destination="nEq-ZT-hYI" id="eVe-I8-s2d"/>
<outlet property="labelTeamNums" destination="leQ-OC-esN" id="n1i-Q5-Pri"/>
</connections>
<point key="canvasLocation" x="269.5" y="212"/>
</view>
</objects>
</document>
ALand/CodeClass/Home/View/MyTeams/MyteamTopView.h 0 → 100644
View file @ 66309bf1
//
// MyteamTopView.h
// ALand
//
// Created by Z on 16/4/15.
// Copyright © 2016年 Z. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface MyteamTopView : UIView
- (void)setTeamNums:(NSInteger)nums bonus:(CGFloat)bonus;
@end
ALand/CodeClass/Home/View/MyTeams/MyteamTopView.m 0 → 100644
View file @ 66309bf1
//
// MyteamTopView.m
// ALand
//
// Created by Z on 16/4/15.
// Copyright © 2016年 Z. All rights reserved.
//
#import "MyteamTopView.h"
@interface MyteamTopView ()
@property (weak, nonatomic) IBOutlet UILabel *labelTeamNums;
@property (weak, nonatomic) IBOutlet UILabel *labelTeamBonus;
@end
@implementation MyteamTopView
- (void)setTeamNums:(NSInteger)nums bonus:(CGFloat)bonus
{
self.labelTeamNums.text = [NSString stringWithFormat:@"%lu", nums];
self.labelTeamBonus.text = [NSString stringWithFormat:@"￥%0.2f", bonus];
}
/*
// Only override drawRect: if you perform custom drawing.
// An empty implementation adversely affects performance during animation.
- (void)drawRect:(CGRect)rect {
// Drawing code
}
*/
@end
ALand/CodeClass/Home/View/Order/OrderDetailTableViewCell.xib
View file @ 66309bf1
......@@ -179,8 +179,8 @@
<variation key="default">
<mask key="constraints">
<exclude reference="JUD-tf-a0Z"/>
<exclude reference="dAK-lK-vhu"/>
<exclude reference="Nkd-3W-crO"/>
<exclude reference="dAK-lK-vhu"/>
<exclude reference="BGr-IB-EEs"/>
</mask>
</variation>
......
ALand/CodeClass/Home/ViewController/HomeCollectionViewController.m
View file @ 66309bf1
......@@ -15,7 +15,7 @@
#import "CommodityManagementViewController.h"
#import "OrderViewController.h"
#import "StoreManagermentViewController.h"
#import "MyTeamViewController.h"
#define kHomeCollectionViewID @"HomeCollectionViewID"
#define kCollectionViewHeadHeight 350
......@@ -119,6 +119,7 @@
}
- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
switch (indexPath.row) {
case 0://商品管理
{
......@@ -138,19 +139,21 @@
}
break;
case 2://分销管理
case 2://客户管理
{
}
break;
case 3://客户管理
case 3://我的团队
{
MyTeamViewController *myTeamVC = [[MyTeamViewController alloc] init];
myTeamVC.isShowNavigationBar = YES;
[self.navigationController pushViewController:myTeamVC animated:YES];
}
break;
case 4://店铺管理
case 4://店铺设置
{
StoreManagermentViewController *storeVC = [[StoreManagermentViewController alloc] initWithNibName:@"StoreManagermentViewController" bundle:[NSBundle mainBundle]];
storeVC.hidesBottomBarWhenPushed = YES;
......@@ -166,13 +169,13 @@
}
break;
case 6://aland商城
case 6://课堂
{
}
break;
case 7:
case 7://榜
{
}
......
ALand/CodeClass/Home/ViewController/MyTeams/MyTeamViewController.h 0 → 100644
View file @ 66309bf1
//
// MyTeamViewController.h
// ALand
//
// Created by Z on 16/4/15.
// Copyright © 2016年 Z. All rights reserved.
//
#import "IBTUIViewController.h"
@interface MyTeamViewController : IBTUIViewController
@end
ALand/CodeClass/Home/ViewController/MyTeams/MyTeamViewController.m 0 → 100644
View file @ 66309bf1
//
// MyTeamViewController.m
// ALand
//
// Created by Z on 16/4/15.
// Copyright © 2016年 Z. All rights reserved.
//
#import "MyTeamViewController.h"
#import "MyTeamCollectionViewCell.h"
#import "MyteamTopView.h"
#define kItemId @"MyTeamCollectionViewCell.h"
@interface MyTeamViewController ()<UICollectionViewDelegate, UICollectionViewDataSource>
@property (nonatomic, strong) UICollectionView *collectionView;
@end
@implementation MyTeamViewController
- (void)viewDidLoad {
[super viewDidLoad];
self.navigationItem.title = @"我的团队";
[self setUpCollectionView];
// Do any additional setup after loading the view.
}
- (void)setUpCollectionView {
UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
layout.minimumInteritemSpacing = 0;
layout.minimumLineSpacing = 1;
layout.itemSize = CGSizeMake(kWidth / 3, kWidth * 2 / 3);
self.collectionView = [[UICollectionView alloc] initWithFrame:CGRectMake(0, 0, kWidth, kHeight - 64 - 49) collectionViewLayout:layout];
self.collectionView.contentInset = UIEdgeInsetsMake(140, 0, 0, 0);
self.collectionView.backgroundColor = kBacroundColor;
self.collectionView.delegate = self;
self.collectionView.dataSource = self;
[self.collectionView registerNib:[UINib nibWithNibName:@"MyTeamCollectionViewCell" bundle:[NSBundle mainBundle]] forCellWithReuseIdentifier:kItemId];
[self.view addSubview:self.collectionView];
[self setUpTopView];
}
- (void)setUpTopView {
MyteamTopView *topView = [MyteamTopView viewWithNibName:@"MyTeamTopView"];
topView.frame = CGRectMake(0, -140 + 20, kWidth, 100);
[self.collectionView addSubview:topView];
}
#pragma mark =========== collection delegate ===========
- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
return 10;
}
- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
{
MyTeamCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:kItemId forIndexPath:indexPath];
return cell;
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
}
/*
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/
@end
ALand/CodeClass/Home/ViewController/Order/NoPaymentTableViewController.m
View file @ 66309bf1
......@@ -74,6 +74,7 @@
orderDetailVC.orderType = ORDERTOPTYPE_CANCELED;
}
orderDetailVC.isShowNavigationBar = YES;
[self.navigationController pushViewController:orderDetailVC animated:YES];
}
......
ALand/CodeClass/Login/LoginViewController.m
View file @ 66309bf1
......@@ -61,7 +61,7 @@
baseVC.modalTransitionStyle = UIModalTransitionStyleCrossDissolve;
[weakSelf presentViewController:baseVC animated:YES completion:nil];
} failure:^(NSURLSessionDataTask *task, NSError *error) {
[MBProgressHUD hideHUDForView:self.view animated:YES];
}];
......
ALand/Third/MBFontAdapter/control/MBButtonWithFontAdapter.h 0 → 100755
View file @ 66309bf1
//
// JJBaseButton.h
// JinJiangDuCheng
//
// Created by Perry on 15/4/8.
// Copyright (c) 2015年 SmartJ. All rights reserved.
//
#import <UIKit/UIKit.h>
#import "MBFontAdapter.h"
@interface MBButtonWithFontAdapter : UIButton
@end
ALand/Third/MBFontAdapter/control/MBButtonWithFontAdapter.m 0 → 100755
View file @ 66309bf1
//
// JJBaseButton.m
// JinJiangDuCheng
//
// Created by Perry on 15/4/8.
// Copyright (c) 2015年 SmartJ. All rights reserved.
//
#import "MBButtonWithFontAdapter.h"
@implementation MBButtonWithFontAdapter
-(void)awakeFromNib{
[super awakeFromNib];
[self.titleLabel setFont:[MBFontAdapter adjustFont:self.titleLabel.font]];
}
@end
ALand/Third/MBFontAdapter/control/MBLabelWithFontAdapter.h 0 → 100755
View file @ 66309bf1
//
// JJLabel.h
// JinJiangDuCheng
//
// Created by Perry on 15/3/23.
// Copyright (c) 2015年 SmartJ. All rights reserved.
//
#import <UIKit/UIKit.h>
#import "MBFontAdapter.h"
@interface MBLabelWithFontAdapter : UILabel
@end
ALand/Third/MBFontAdapter/control/MBLabelWithFontAdapter.m 0 → 100755
View file @ 66309bf1
//
// JJLabel.m
// JinJiangDuCheng
//
// Created by Perry on 15/3/23.
// Copyright (c) 2015年 SmartJ. All rights reserved.
//
#import "MBLabelWithFontAdapter.h"
@implementation MBLabelWithFontAdapter
-(id)initWithCoder:(NSCoder *)aDecoder{
self = [super initWithCoder:aDecoder];
if (self){
}
return self;
}
/*
// Only override drawRect: if you perform custom drawing.
// An empty implementation adversely affects performance during animation.
- (void)drawRect:(CGRect)rect {
// Drawing code
}
*/
-(void)awakeFromNib{
[super awakeFromNib];
[super setFont:[MBFontAdapter adjustFont:self.font]];
}
-(void)setFont:(UIFont *)font{
[super setFont:[MBFontAdapter adjustFont:font]];
}
@end
ALand/Third/MBFontAdapter/control/MBTextFieldWithFontAdapter.h 0 → 100755
View file @ 66309bf1
//
// JJBaseTextField.h
// JinJiangDuCheng
//
// Created by Perry on 15/4/8.
// Copyright (c) 2015年 SmartJ. All rights reserved.
//
#import <UIKit/UIKit.h>
#import "MBFontAdapter.h"
@interface MBTextFieldWithFontAdapter : UITextField
@end
ALand/Third/MBFontAdapter/control/MBTextFieldWithFontAdapter.m 0 → 100755
View file @ 66309bf1
//
// JJBaseTextField.m
// JinJiangDuCheng
//
// Created by Perry on 15/4/8.
// Copyright (c) 2015年 SmartJ. All rights reserved.
//
#import "MBTextFieldWithFontAdapter.h"
@implementation MBTextFieldWithFontAdapter
-(void)awakeFromNib{
[super awakeFromNib];
[super setFont:[MBFontAdapter adjustFont:self.font]];
}
-(void)setFont:(UIFont *)font{
[super setFont:[MBFontAdapter adjustFont:font]];
}
@end
ALand/Third/MBFontAdapter/control/MBTextViewWithFontAdapter.h 0 → 100755
View file @ 66309bf1
//
// MBTextViewWithFontAdapter.h
// MBFontAdapter
//
// Created by Perry on 15/6/15.
// Copyright (c) 2015年 MmoaaY. All rights reserved.
//
#import <UIKit/UIKit.h>
#import "MBFontAdapter.h"
@interface MBTextViewWithFontAdapter : UITextView
@end
ALand/Third/MBFontAdapter/control/MBTextViewWithFontAdapter.m 0 → 100755
View file @ 66309bf1
//
// MBTextViewWithFontAdapter.m
// MBFontAdapter
//
// Created by Perry on 15/6/15.
// Copyright (c) 2015年 MmoaaY. All rights reserved.
//
#import "MBTextViewWithFontAdapter.h"
@implementation MBTextViewWithFontAdapter
/*
// Only override drawRect: if you perform custom drawing.
// An empty implementation adversely affects performance during animation.
- (void)drawRect:(CGRect)rect {
// Drawing code
}
*/
-(void)awakeFromNib{
[super awakeFromNib];
[super setFont:[MBFontAdapter adjustFont:self.font]];
}
-(void)setFont:(UIFont *)font{
[super setFont:[MBFontAdapter adjustFont:font]];
}
@end
ALand/Third/MBFontAdapter/util/MBFontAdapter.h 0 → 100755
View file @ 66309bf1
//
// MBFontAdapter.h
// JinJiangDuCheng
//
// 首先，为什么会有MBFontAdapter这么奇葩的一个库？原因很简单，当某天UI萌妹子弱弱地问你：“我们的app可不可以实现
// 文字的字号在iPhone6上和iPhone6Plus上比iPhone4s和iPhone5大一些？如果要实现难度是不是比较大？工作量会不会增加很
// 多？”乍一听还真有点头大。然而，这个时候你能回答不可以么？能回答很难么？能回答工作量会增加很多么？显然不能！！！于是
// MBFontAdapter就诞生了。功能很简单。因为常用的有文字的控件就那么几个：UIButton，UILabel，UITextField，UITextView。
// 所以程序猿MmoaaY采用了非常猥琐的方式来满足UI萌妹子的私欲。如果有类似经历的程序猿，这个库或许能给你提供一些灵感和帮助。
// 当然，也许这并没有什么卵用（因为貌似大部分app都不这么干……）
//
// tips：目前完美支持storyboard及xib。只需要将控件的Class选项设置为相应的类名即可。
// 如：UILabel的Class设置为：MBLabelWithFontAdapter
//
// Created by Perry on 15/4/8.
// Copyright (c) 2015年 SmartJ. All rights reserved.
//
#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
#define IS_IPHONE_6 ([[UIScreen mainScreen] bounds].size.height == 667.0f)
#define IS_IPHONE_6_PLUS ([[UIScreen mainScreen] bounds].size.height == 736.0f)
// 这里设置iPhone6放大的字号数（现在是放大2号，也就是iPhone4s和iPhone5上字体为15时，iPhone6上字号为17）
#define IPHONE6_INCREMENT 2
// 这里设置iPhone6Plus放大的字号数（现在是放大3号，也就是iPhone4s和iPhone5上字体为15时，iPhone6上字号为18）
#define IPHONE6PLUS_INCREMENT 3
@interface MBFontAdapter : NSObject
+(UIFont *)adjustFont:(UIFont *)font;
@end
ALand/Third/MBFontAdapter/util/MBFontAdapter.m 0 → 100755
View file @ 66309bf1
//
// MBFontAdapter.m
// JinJiangDuCheng
//
// Created by Perry on 15/4/8.
// Copyright (c) 2015年 SmartJ. All rights reserved.
//
#import "MBFontAdapter.h"
@implementation MBFontAdapter
+(UIFont *)adjustFont:(UIFont *)font{
UIFont *newFont=nil;
if (IS_IPHONE_6){
newFont = [UIFont fontWithName:font.fontName size:font.pointSize+IPHONE6_INCREMENT];
}else if (IS_IPHONE_6_PLUS){
newFont = [UIFont fontWithName:font.fontName size:font.pointSize+IPHONE6PLUS_INCREMENT];
}else{
newFont = font;
}
return newFont;
}
@end
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