Skip to content

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

no message

parent 77063e1c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 64 deletions
ALand.xcodeproj/project.pbxproj
View file @ cf50dc70
......@@ -159,8 +159,6 @@
19632DA51CB350F80024A8A1 /* StoreQRCodeViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 19632DA31CB350F80024A8A1 /* StoreQRCodeViewController.xib */; };
19632DA81CB356050024A8A1 /* UIImage+QRCode.m in Sources */ = {isa = PBXBuildFile; fileRef = 19632DA71CB356050024A8A1 /* UIImage+QRCode.m */; };
19632DAE1CB38FFC0024A8A1 /* HTTPCilent.m in Sources */ = {isa = PBXBuildFile; fileRef = 19632DAD1CB38FFC0024A8A1 /* HTTPCilent.m */; };
19632DB11CB39B190024A8A1 /* SelectPhotoView.m in Sources */ = {isa = PBXBuildFile; fileRef = 19632DB01CB39B190024A8A1 /* SelectPhotoView.m */; };
19632DB31CB39B250024A8A1 /* SelectPhotoView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 19632DB21CB39B250024A8A1 /* SelectPhotoView.xib */; };
196716FA1CFD384F00999267 /* JV_TestTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 196716F91CFD384F00999267 /* JV_TestTool.m */; };
196944DC1CEC4E6C0036E574 /* NoBillHistoryView.m in Sources */ = {isa = PBXBuildFile; fileRef = 196944DB1CEC4E6C0036E574 /* NoBillHistoryView.m */; };
196944DE1CEC4E780036E574 /* NoBillHistoryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 196944DD1CEC4E780036E574 /* NoBillHistoryView.xib */; };
......@@ -331,6 +329,8 @@
2729456D08033910EB3A7F89 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F32A640135BB4E1F47CB0E21 /* libPods.a */; };
8F1E2CE41D7042A5002CCC76 /* OrderWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F1E2CE31D7042A5002CCC76 /* OrderWebViewController.m */; };
8F59F0241D6D725500C9A564 /* NoPaymentTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F59F0231D6D725500C9A564 /* NoPaymentTableViewController.m */; };
8F75DEA21EE670FD005CC47C /* SelectPhotoView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F75DEA01EE670FD005CC47C /* SelectPhotoView.m */; };
8F75DEA31EE670FD005CC47C /* SelectPhotoView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8F75DEA11EE670FD005CC47C /* SelectPhotoView.xib */; };
8F8D99431D6706E50080ECC1 /* PayView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8F8D99421D6706E50080ECC1 /* PayView.xib */; };
8F8D994B1D670F3B0080ECC1 /* PayView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F8D994A1D670F3B0080ECC1 /* PayView.m */; };
8FAA08361D72F30700CCA46D /* LogisticsItemsModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FAA08351D72F30700CCA46D /* LogisticsItemsModel.m */; };
......@@ -633,9 +633,6 @@
19632DA71CB356050024A8A1 /* UIImage+QRCode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+QRCode.m"; sourceTree = "<group>"; };
19632DAC1CB38FFC0024A8A1 /* HTTPCilent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTTPCilent.h; sourceTree = "<group>"; };
19632DAD1CB38FFC0024A8A1 /* HTTPCilent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTTPCilent.m; sourceTree = "<group>"; };
19632DAF1CB39B190024A8A1 /* SelectPhotoView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SelectPhotoView.h; path = ../SelectPhotoView.h; sourceTree = "<group>"; };
19632DB01CB39B190024A8A1 /* SelectPhotoView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SelectPhotoView.m; path = ../SelectPhotoView.m; sourceTree = "<group>"; };
19632DB21CB39B250024A8A1 /* SelectPhotoView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = SelectPhotoView.xib; path = ../SelectPhotoView.xib; sourceTree = "<group>"; };
196716F81CFD384F00999267 /* JV_TestTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JV_TestTool.h; sourceTree = "<group>"; };
196716F91CFD384F00999267 /* JV_TestTool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JV_TestTool.m; sourceTree = "<group>"; };
196944DA1CEC4E6C0036E574 /* NoBillHistoryView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NoBillHistoryView.h; sourceTree = "<group>"; };
......@@ -958,6 +955,9 @@
8F1E2CE31D7042A5002CCC76 /* OrderWebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OrderWebViewController.m; sourceTree = "<group>"; };
8F59F0221D6D725500C9A564 /* NoPaymentTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NoPaymentTableViewController.h; sourceTree = "<group>"; };
8F59F0231D6D725500C9A564 /* NoPaymentTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NoPaymentTableViewController.m; sourceTree = "<group>"; };
8F75DE9F1EE670FD005CC47C /* SelectPhotoView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SelectPhotoView.h; path = ALand/CodeClass/Home/View/SelectPhotoView.h; sourceTree = SOURCE_ROOT; };
8F75DEA01EE670FD005CC47C /* SelectPhotoView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SelectPhotoView.m; path = ALand/CodeClass/Home/View/SelectPhotoView.m; sourceTree = SOURCE_ROOT; };
8F75DEA11EE670FD005CC47C /* SelectPhotoView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = SelectPhotoView.xib; path = ALand/CodeClass/Home/View/SelectPhotoView.xib; sourceTree = SOURCE_ROOT; };
8F8D99421D6706E50080ECC1 /* PayView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PayView.xib; sourceTree = "<group>"; };
8F8D99491D670F3B0080ECC1 /* PayView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PayView.h; sourceTree = "<group>"; };
8F8D994A1D670F3B0080ECC1 /* PayView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PayView.m; sourceTree = "<group>"; };
......@@ -1011,9 +1011,9 @@
1900A3431CB6156F00B2B7C4 /* StoreManagerment */ = {
isa = PBXGroup;
children = (
19632DAF1CB39B190024A8A1 /* SelectPhotoView.h */,
19632DB01CB39B190024A8A1 /* SelectPhotoView.m */,
19632DB21CB39B250024A8A1 /* SelectPhotoView.xib */,
8F75DE9F1EE670FD005CC47C /* SelectPhotoView.h */,
8F75DEA01EE670FD005CC47C /* SelectPhotoView.m */,
8F75DEA11EE670FD005CC47C /* SelectPhotoView.xib */,
);
path = StoreManagerment;
sourceTree = "<group>";
......@@ -2444,7 +2444,6 @@
19DC6B3E1CC0E06C0064A9FD /* CustomerTableViewCell.xib in Resources */,
1913833B1CAB96D4005F6440 /* OrderTableViewCell.xib in Resources */,
1979751C1CA8CDF300407E3F /* CommodityDetailBottomView.xib in Resources */,
19632DB31CB39B250024A8A1 /* SelectPhotoView.xib in Resources */,
195EB1E11CA5292600E298BB /* AddCommodityFooterCollectionReusableView.xib in Resources */,
1940D2F41C9A56730080678C /* LaunchScreen.storyboard in Resources */,
19D906AD1CC7898C00CD42DC /* MineViewController.xib in Resources */,
......@@ -2483,6 +2482,7 @@
192AE4271CE9C8C700BD636B /* MyBillsTableViewCell.xib in Resources */,
19563CA21CDC2E0E00AFD0E0 /* BankTableViewCell.xib in Resources */,
192940201CC8DA5B00E377EE /* InvitePartnerViewController.xib in Resources */,
8F75DEA31EE670FD005CC47C /* SelectPhotoView.xib in Resources */,
19563C9D1CDB345400AFD0E0 /* AddDetailInfoViewController.xib in Resources */,
1952C2EF1CED93E90017E4D6 /* OrderListHeaderView.xib in Resources */,
);
......@@ -2770,11 +2770,11 @@
19DCCB6C1C9A9EB30072C3BF /* IBTTabBarController.m in Sources */,
196944E51CEC7D500036E574 /* HomeAdViewController.m in Sources */,
197BA6701CD8515D000E2087 /* JavenCreateInfo.m in Sources */,
19632DB11CB39B190024A8A1 /* SelectPhotoView.m in Sources */,
190AFDA11CF41EE3002698FC /* ChangeUserSignatureViewController.m in Sources */,
19DCCB621C9A9EB30072C3BF /* IBTTableViewInfo.m in Sources */,
19ADD38E1CA4EC1000EE6E5A /* AddCommodityHeaderCollectionReusableView.m in Sources */,
1952C2F21CED95230017E4D6 /* OrderListFooterView.m in Sources */,
8F75DEA21EE670FD005CC47C /* SelectPhotoView.m in Sources */,
194FB0BE1CE2F8400089A3D5 /* JavenBankCards.m in Sources */,
19DCCB6B1C9A9EB30072C3BF /* IBTSegmentedControl.m in Sources */,
1912FCFD1CD08166004CF976 /* CommotityListModel.m in Sources */,
......@@ -2983,7 +2983,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.aland;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE = "2eabacd2-eaaa-47eb-8d52-f2cd1d0966c3";
TARGETED_DEVICE_FAMILY = 1;
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
};
......@@ -3013,7 +3013,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.aland;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE = "2eabacd2-eaaa-47eb-8d52-f2cd1d0966c3";
TARGETED_DEVICE_FAMILY = 1;
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
};
......
ALand/Assets.xcassets/AppIcon.appiconset/Contents.json
View file @ cf50dc70
{
"images" : [
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "3x"
},
{
"size" : "29x29",
"idiom" : "iphone",
......@@ -36,6 +46,16 @@
"filename" : "Icon-60@3x.png",
"scale" : "3x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "2x"
},
{
"size" : "29x29",
"idiom" : "ipad",
......
ALand/CodeClass/Home/View/HomeCollectionViewCell.xib
View file @ cf50dc70
<?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">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
......@@ -12,20 +12,20 @@
<autoresizingMask key="autoresizingMask"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
<rect key="frame" x="0.0" y="0.0" width="133" height="175"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFit" image="homeCollection7" translatesAutoresizingMaskIntoConstraints="NO" id="D99-gm-QhP">
<rect key="frame" x="0.0" y="10" width="133" height="130"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="个人中心" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ayL-bO-xEB">
<rect key="frame" x="35" y="150" width="64" height="20"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="个人中心" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ayL-bO-xEB">
<rect key="frame" x="34.5" y="150" width="65.5" height="20"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="D99-gm-QhP" secondAttribute="bottom" constant="35" id="9ka-xi-sYF"/>
<constraint firstItem="ayL-bO-xEB" firstAttribute="top" secondItem="D99-gm-QhP" secondAttribute="bottom" constant="10" id="N7W-2f-wH7"/>
......
ALand/CodeClass/Home/View/Order/OrderCellView.xib
View file @ cf50dc70
<?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">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="NO">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
<development version="7000" identifier="xcode"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
</dependencies>
<objects>
......@@ -34,13 +34,13 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="96粒" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bGv-K4-Dnw">
<rect key="frame" x="106" y="55" width="38" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<color key="textColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="x3" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OR2-4k-rSi">
<rect key="frame" x="149" y="55" width="20" height="22"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<color key="textColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="acf-qI-3N1">
......@@ -54,7 +54,7 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="售价:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jpi-l7-Qzv">
<rect key="frame" x="106" y="82" width="39" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<color key="textColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥178" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vW8-v5-AfH">
......
ALand/CodeClass/MIne/ViewController/MyBillViewController.m
View file @ cf50dc70
......@@ -69,14 +69,14 @@
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
return self.arrSortedMonths.count;
}
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
return [self.arrSortedData[section] count];
}
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
return 100;
}
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
return [self.arrSortedData[section] count];
}
- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
return 30;
......
ALand/IBTUtilites/IBTRefreshTableView/IBTRefreshTableView.h
View file @ cf50dc70
......@@ -13,7 +13,7 @@
@interface IBTRefreshTableView : IBTTableView
@property (assign, nonatomic) id <IBTScrollViewRefreshDelegate> refreshDelegate;
@property (strong, nonatomic) UIRefreshControl *refreshControl;
@property (strong, nonatomic) UIRefreshControl *refreshCtrl;
@property (strong, nonatomic) IBTScrollLoadMoreView *loadMoreView;
- (void)scrollToTopAnimated:(BOOL)animated;
......
ALand/IBTUtilites/IBTRefreshTableView/IBTRefreshTableView.m
View file @ cf50dc70
......@@ -56,8 +56,8 @@
[super didMoveToWindow];
if (!self.window) {
if (_refreshControl) {
[_refreshControl endRefreshing];
if (_refreshCtrl) {
[_refreshCtrl endRefreshing];
}
if (_refreshFooterView) {
......@@ -127,25 +127,25 @@
}
- (void)addRefreshControlWithText:(NSString *)text {
if (!_refreshControl) {
self.refreshControl = [[UIRefreshControl alloc] init];
[_refreshControl addTarget:self
if (!_refreshCtrl) {
self.refreshCtrl = [[UIRefreshControl alloc] init];
[_refreshCtrl addTarget:self
action:@selector(handleRefresh:)
forControlEvents:UIControlEventValueChanged];
}
if (text.length > 0) {
_refreshControl.attributedTitle = [[NSAttributedString alloc] initWithString:text];
_refreshCtrl.attributedTitle = [[NSAttributedString alloc] initWithString:text];
}
if (!_refreshControl.superview) {
[self addSubview:_refreshControl];
if (!_refreshCtrl.superview) {
[self addSubview:_refreshCtrl];
}
}
- (void)removeRefreshControl {
if (_refreshControl && _refreshControl.superview) {
[_refreshControl removeFromSuperview];
if (_refreshCtrl && _refreshCtrl.superview) {
[_refreshCtrl removeFromSuperview];
}
}
......@@ -185,10 +185,10 @@
// _refreshControl.attributedTitle = [[NSAttributedString alloc] initWithString:textStr];
// }
if (_refreshControl.refreshing) {
[_refreshControl endRefreshing];
if (_refreshCtrl.refreshing) {
[_refreshCtrl endRefreshing];
// Fix ContentInset became -60 when UIRefreshController endRefreshing
// Fix ContentInset became -60 when UIrefreshCtrller endRefreshing
// http://stackoverflow.com/questions/20101572/ios7-uirefreshcontrol-changes-contentinset
if (self.contentInset.top < 0) {
UIEdgeInsets inset = self.contentInset;
......
ALand/Info.plist
View file @ cf50dc70
......@@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.1.1</string>
<string>1.1.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
......@@ -50,7 +50,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1</string>
<string>1.1.2</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>wechat</string>
......
ALand/Macro/UrlHeader.h
View file @ cf50dc70
......@@ -10,9 +10,9 @@
#define UrlHeader_h
#import <Foundation/Foundation.h>
//static NSString *const REST_BASE_URL = @"http://139.196.173.244:8080/aland-server/rest"; //正式环境
static NSString *const REST_BASE_URL = @"http://139.196.173.244:8080/aland-server/rest"; //正式环境
static NSString *const REST_BASE_URL = @"http://139.196.195.30:9090/aland-server/rest"; //测试环境
//static NSString *const REST_BASE_URL = @"http://139.196.195.30:9090/aland-server/rest"; //测试环境
static NSString *const kDomain = @"0001"; //组织代码
......
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