Skip to content

T
total
Commit 58bceca3 authored by 曹云霄's avatar 曹云霄
Browse files
Options

修改项说明：

parent e8accc1b
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 51 deletions
total.xcodeproj/project.pbxproj
View file @ 58bceca3
...@@ -3123,8 +3123,8 @@ ...@@ -3123,8 +3123,8 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)"; CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
...@@ -3140,7 +3140,7 @@ ...@@ -3140,7 +3140,7 @@
); );
PRODUCT_BUNDLE_IDENTIFIER = com.gomoe.total; PRODUCT_BUNDLE_IDENTIFIER = com.gomoe.total;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "c2d977b5-adac-45f6-bfbb-3a53616b54d7"; PROVISIONING_PROFILE = "f96494cb-c220-43ce-8034-75e000c2193f";
SWIFT_OBJC_BRIDGING_HEADER = "total/total-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "total/total-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_OPTIMIZATION_LEVEL = "-Onone";
TARGETED_DEVICE_FAMILY = 1; TARGETED_DEVICE_FAMILY = 1;
...@@ -3154,8 +3154,8 @@ ...@@ -3154,8 +3154,8 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)"; CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
...@@ -3171,7 +3171,7 @@ ...@@ -3171,7 +3171,7 @@
); );
PRODUCT_BUNDLE_IDENTIFIER = com.gomoe.total; PRODUCT_BUNDLE_IDENTIFIER = com.gomoe.total;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "c2d977b5-adac-45f6-bfbb-3a53616b54d7"; PROVISIONING_PROFILE = "f96494cb-c220-43ce-8034-75e000c2193f";
SWIFT_OBJC_BRIDGING_HEADER = "total/total-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "total/total-Bridging-Header.h";
TARGETED_DEVICE_FAMILY = 1; TARGETED_DEVICE_FAMILY = 1;
USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**"; USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
......
total/Base.lproj/Main.storyboard
View file @ 58bceca3
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="vXZ-lx-hvc"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="vXZ-lx-hvc">
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
</dependencies> </dependencies>
<scenes> <scenes>
<!--View Controller--> <!--View Controller-->
......
total/GTOApp/Business/BusinessStoryBoard.storyboard
View file @ 58bceca3
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
...@@ -985,7 +985,7 @@ ...@@ -985,7 +985,7 @@
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="公斤" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ptr-mW-VA4"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="公斤" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ptr-mW-VA4">
<rect key="frame" x="341" y="11" width="26" height="21"/> <rect key="frame" x="341" y="11" width="28" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/> <fontDescription key="fontDescription" type="system" pointSize="13"/>
<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="calibratedRGB"/>
......
total/GTOApp/Home/GTOHomeViewController.m
View file @ 58bceca3
...@@ -58,13 +58,10 @@ static NSString *cellIDPatrol = @"cellIDPatrol"; ...@@ -58,13 +58,10 @@ static NSString *cellIDPatrol = @"cellIDPatrol";
[strongSelf startLocation]; [strongSelf startLocation];
}); });
[self httpGetAfficheData];
[self httpGetAfficheData];
} }
- (void)httpGetAfficheData { - (void)httpGetAfficheData {
if (!self.m_dataMudict) { if (!self.m_dataMudict) {
self.m_dataMudict = [NSMutableDictionary dictionary];//[@{}mutableCopy]; self.m_dataMudict = [NSMutableDictionary dictionary];//[@{}mutableCopy];
...@@ -78,18 +75,18 @@ static NSString *cellIDPatrol = @"cellIDPatrol"; ...@@ -78,18 +75,18 @@ static NSString *cellIDPatrol = @"cellIDPatrol";
NSArray *arr = dictData[@"records"]; NSArray *arr = dictData[@"records"];
[self.m_dataMudict setObject:@(arr.count) forKey:@( kAffiche)]; [self.m_dataMudict setObject:@(arr.count) forKey:@( kAffiche)];
[_c_tableV reloadData]; [_c_tableV reloadData];
// if (userU.hasLicencePermission) { if (userU.hasLicencePermission) {
// [self httpGetLicenceData]; [self httpGetLicenceData];
// return ; return ;
// } }
// if (userU.hasProjectPatrolPermission) { if (userU.hasProjectPatrolPermission) {
// [self httpGetPatrolDataWithCategory:@"project"]; [self httpGetPatrolDataWithCategory:@"project"];
// return ; return ;
// } }
// if (userU.hasHSEPatrolPermission) { if (userU.hasHSEPatrolPermission) {
// [self httpGetPatrolDataWithCategory:@"HSE"]; [self httpGetPatrolDataWithCategory:@"HSE"];
// return ; return ;
// } }
} }
}; };
void(^fail)(id) = ^(id data) { void(^fail)(id) = ^(id data) {
...@@ -102,10 +99,9 @@ static NSString *cellIDPatrol = @"cellIDPatrol"; ...@@ -102,10 +99,9 @@ static NSString *cellIDPatrol = @"cellIDPatrol";
pageSize:200 pageSize:200
success:succ success:succ
failure:fail]; failure:fail];
} }
} }
- (void)httpGetLicenceData { - (void)httpGetLicenceData {
if (!self.m_dataMudict) { if (!self.m_dataMudict) {
self.m_dataMudict = [NSMutableDictionary dictionary];//[@{}mutableCopy]; self.m_dataMudict = [NSMutableDictionary dictionary];//[@{}mutableCopy];
...@@ -113,7 +109,7 @@ static NSString *cellIDPatrol = @"cellIDPatrol"; ...@@ -113,7 +109,7 @@ static NSString *cellIDPatrol = @"cellIDPatrol";
ICRUserUtil *userU = [ICRUserUtil sharedInstance]; ICRUserUtil *userU = [ICRUserUtil sharedInstance];
// __weak typeof(self)weakSelf = self; // __weak typeof(self)weakSelf = self;
void(^succ)(id) = ^(id data) { void(^succ)(id) = ^(id data) {
[IBTLoadingView hideHUDWithText:nil]; // [IBTLoadingView hideHUDWithText:nil];
// __strong __typeof(weakSelf)strongSelf = weakSelf; // __strong __typeof(weakSelf)strongSelf = weakSelf;
NSInteger success = [data[@"success"] integerValue]; NSInteger success = [data[@"success"] integerValue];
// NSString *message = data[@"message"] ; // NSString *message = data[@"message"] ;
...@@ -123,23 +119,20 @@ static NSString *cellIDPatrol = @"cellIDPatrol"; ...@@ -123,23 +119,20 @@ static NSString *cellIDPatrol = @"cellIDPatrol";
// NSIndexSet *indexSet = [[NSIndexSet alloc]initWithIndex:2]; // NSIndexSet *indexSet = [[NSIndexSet alloc]initWithIndex:2];
// [_c_tableV reloadSections:indexSet withRowAnimation:UITableViewRowAnimationAutomatic]; // [_c_tableV reloadSections:indexSet withRowAnimation:UITableViewRowAnimationAutomatic];
[self.c_tableV reloadData]; [self.c_tableV reloadData];
// if (userU.hasProjectPatrolPermission) { if (userU.hasProjectPatrolPermission) {
// [self httpGetPatrolDataWithCategory:@"project"]; [self httpGetPatrolDataWithCategory:@"project"];
// return ; // return ;
// } }
// if (userU.hasHSEPatrolPermission) { if (userU.hasHSEPatrolPermission) {
// [self httpGetPatrolDataWithCategory:@"HSE"]; [self httpGetPatrolDataWithCategory:@"HSE"];
// return ; // return ;
// } }
} }
}; };
void(^fail)(id) = ^(id data) { void(^fail)(id) = ^(id data) {
[IBTLoadingView hideHUDWithText:nil]; // [IBTLoadingView hideHUDWithText:nil];
[IBTLoadingView showTips:data]; [IBTLoadingView showTips:data];
}; };
NSDictionary *dict = @{ NSDictionary *dict = @{
@"userUuid":userU.f_user_uuid, @"userUuid":userU.f_user_uuid,
@"billNumberLike":[NSNull null], @"billNumberLike":[NSNull null],
...@@ -153,13 +146,13 @@ static NSString *cellIDPatrol = @"cellIDPatrol"; ...@@ -153,13 +146,13 @@ static NSString *cellIDPatrol = @"cellIDPatrol";
ICRHTTPController *httpC = [ICRHTTPController sharedController]; ICRHTTPController *httpC = [ICRHTTPController sharedController];
[httpC getLicenceListWithData:dict success:succ failure:fail]; [httpC getLicenceListWithData:dict success:succ failure:fail];
} }
- (void)httpGetPatrolDataWithCategory: (NSString *)category { - (void)httpGetPatrolDataWithCategory: (NSString *)category {
if (!self.m_dataMudict) { if (!self.m_dataMudict) {
self.m_dataMudict = [NSMutableDictionary dictionary];//[@{}mutableCopy]; self.m_dataMudict = [NSMutableDictionary dictionary];//[@{}mutableCopy];
} }
void(^succ)(id) = ^(id data) { void(^succ)(id) = ^(id data) {
[IBTLoadingView hideHUDWithText:nil]; // [IBTLoadingView hideHUDWithText:nil];
NSInteger success = [data[@"success"] integerValue]; NSInteger success = [data[@"success"] integerValue];
// NSString *message = data[@"message"] ; // NSString *message = data[@"message"] ;
if (success == 1) { if (success == 1) {
...@@ -178,10 +171,10 @@ static NSString *cellIDPatrol = @"cellIDPatrol"; ...@@ -178,10 +171,10 @@ static NSString *cellIDPatrol = @"cellIDPatrol";
} }
}; };
void(^fail)(id) = ^(id data) { void(^fail)(id) = ^(id data) {
[IBTLoadingView hideHUDWithText:nil]; // [IBTLoadingView hideHUDWithText:nil];
[IBTLoadingView showTips:data]; [IBTLoadingView showTips:data];
}; };
[IBTLoadingView showProgressLabel:@"正在加载..."]; // [IBTLoadingView showProgressLabel:@"正在加载..."];
ICRHTTPController *httpCtrl = [ICRHTTPController sharedController]; //@"2015-10-16 21:46:03" ICRHTTPController *httpCtrl = [ICRHTTPController sharedController]; //@"2015-10-16 21:46:03"
[httpCtrl getMyPatrolWithCategory:category [httpCtrl getMyPatrolWithCategory:category
startTime:[[NSDate date] httpParameterString] startTime:[[NSDate date] httpParameterString]
......
total/Info.plist
View file @ 58bceca3
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.2.2</string> <string>1.2.3</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
......
total/Macro/GTOAppMacro.h
View file @ 58bceca3
...@@ -79,8 +79,8 @@ ...@@ -79,8 +79,8 @@
//#define HTTP_LOCAL_BASE_URL @"http://218.244.151.129:7580" //#define HTTP_LOCAL_BASE_URL @"http://218.244.151.129:7580"
////正式环境 ////正式环境
//#define HTTP_REST_API_BASE_URL @"http://139.196.39.77:7080/total-server/rest" #define HTTP_REST_API_BASE_URL @"http://139.196.39.77:7080/total-server/rest"
//#define HTTP_LOCAL_BASE_URL @"http://139.196.39.77:7080" #define HTTP_LOCAL_BASE_URL @"http://139.196.39.77:7080"
// //
//测试环境 //测试环境
//#define HTTP_REST_API_BASE_URL @"http://139.196.39.77:8180/total-server/rest" //#define HTTP_REST_API_BASE_URL @"http://139.196.39.77:8180/total-server/rest"
...@@ -91,8 +91,8 @@ ...@@ -91,8 +91,8 @@
//#define HTTP_REST_API_BASE_URL @"http://139.196.39.77:8080/total-server/rest" //#define HTTP_REST_API_BASE_URL @"http://139.196.39.77:8080/total-server/rest"
//开发环境 //开发环境
#define HTTP_LOCAL_BASE_URL @"http://139.196.195.30:8093" //#define HTTP_LOCAL_BASE_URL @"http://139.196.195.30:8093"
#define HTTP_REST_API_BASE_URL @"http://139.196.195.30:8093/total-server/rest" //#define HTTP_REST_API_BASE_URL @"http://139.196.195.30:8093/total-server/rest"
//豪杰/ //豪杰/
......
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