root
/
ifish
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

三控、两控页面适配iPhone X

This commit is contained in:
xuemh 2018-04-03 00:02:18 +08:00
parent 951a1f082e
commit a8f9a034dc
4 changed files with 49 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Ifish.xcodeproj/project.pbxproj
View File

@ -6212,6 +6212,7 @@
88F5EFA81D48D08100CC7CAF /* libzbar.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libzbar.a; sourceTree = "<group>"; }; 88F5EFA81D48D08100CC7CAF /* libzbar.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libzbar.a; sourceTree = "<group>"; };
88F740BE1ECC28E800876AED /* ShopAddGoodsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShopAddGoodsViewController.h; sourceTree = "<group>"; }; 88F740BE1ECC28E800876AED /* ShopAddGoodsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShopAddGoodsViewController.h; sourceTree = "<group>"; };
88F740BF1ECC28E800876AED /* ShopAddGoodsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShopAddGoodsViewController.m; sourceTree = "<group>"; }; 88F740BF1ECC28E800876AED /* ShopAddGoodsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShopAddGoodsViewController.m; sourceTree = "<group>"; };
E5C644C0206BBD7100C558D5 /* CommonMacros.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CommonMacros.h; sourceTree = "<group>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */ /* Begin PBXFrameworksBuildPhase section */
@ -12477,6 +12478,7 @@
8876A5851BB83447007A4B54 /* Ifish */ = { 8876A5851BB83447007A4B54 /* Ifish */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
E5C644BF206BBD5F00C558D5 /* Common */,
882953EA1DBDA3A000E9DDD7 /* ifishImgSouce */, 882953EA1DBDA3A000E9DDD7 /* ifishImgSouce */,
881B9F581D9CA98B001948AD /* Ifish.entitlements */, 881B9F581D9CA98B001948AD /* Ifish.entitlements */,
88F5EEE81D48D04100CC7CAF /* libs */, 88F5EEE81D48D04100CC7CAF /* libs */,
@ -13716,6 +13718,14 @@
path = zbar; path = zbar;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
E5C644BF206BBD5F00C558D5 /* Common */ = {
isa = PBXGroup;
children = (
E5C644C0206BBD7100C558D5 /* CommonMacros.h */,
);
path = Common;
sourceTree = "<group>";
};
/* End PBXGroup section */ /* End PBXGroup section */
/* Begin PBXNativeTarget section */ /* Begin PBXNativeTarget section */
@ -13785,7 +13795,7 @@
8876A5821BB83447007A4B54 = { 8876A5821BB83447007A4B54 = {
CreatedOnToolsVersion = 7.0; CreatedOnToolsVersion = 7.0;
DevelopmentTeam = WFX8GD5HFX; DevelopmentTeam = WFX8GD5HFX;
ProvisioningStyle = Manual; ProvisioningStyle = Automatic;
SystemCapabilities = { SystemCapabilities = {
com.apple.BackgroundModes = { com.apple.BackgroundModes = {
enabled = 1; enabled = 1;
@ -16432,7 +16442,8 @@
CLANG_CXX_LIBRARY = "libstdc++"; CLANG_CXX_LIBRARY = "libstdc++";
CODE_SIGN_ENTITLEMENTS = Ifish/Ifish.entitlements; CODE_SIGN_ENTITLEMENTS = Ifish/Ifish.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Yu Ying Technology Co., Ltd. (WFX8GD5HFX)"; CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Yu Ying Technology Co., Ltd. (WFX8GD5HFX)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Yu Ying Technology Co., Ltd. (WFX8GD5HFX)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = WFX8GD5HFX; DEVELOPMENT_TEAM = WFX8GD5HFX;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
ENABLE_TESTABILITY = YES; ENABLE_TESTABILITY = YES;
@ -16514,8 +16525,8 @@
); );
PRODUCT_BUNDLE_IDENTIFIER = com.shyuying.Ifish8; PRODUCT_BUNDLE_IDENTIFIER = com.shyuying.Ifish8;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "05fbf8da-562c-4344-ade4-ae990d722f7a"; PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = isfishAppstoreDistribution; PROVISIONING_PROFILE_SPECIFIER = "";
TARGETED_DEVICE_FAMILY = 1; TARGETED_DEVICE_FAMILY = 1;
USER_HEADER_SEARCH_PATHS = ""; USER_HEADER_SEARCH_PATHS = "";
}; };
@ -16529,7 +16540,8 @@
CLANG_CXX_LIBRARY = "libstdc++"; CLANG_CXX_LIBRARY = "libstdc++";
CODE_SIGN_ENTITLEMENTS = Ifish/Ifish.entitlements; CODE_SIGN_ENTITLEMENTS = Ifish/Ifish.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Yu Ying Technology Co., Ltd. (WFX8GD5HFX)"; CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Yu Ying Technology Co., Ltd. (WFX8GD5HFX)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Yu Ying Technology Co., Ltd. (WFX8GD5HFX)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = WFX8GD5HFX; DEVELOPMENT_TEAM = WFX8GD5HFX;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
ENABLE_TESTABILITY = YES; ENABLE_TESTABILITY = YES;
@ -16611,8 +16623,8 @@
); );
PRODUCT_BUNDLE_IDENTIFIER = com.shyuying.Ifish8; PRODUCT_BUNDLE_IDENTIFIER = com.shyuying.Ifish8;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "05fbf8da-562c-4344-ade4-ae990d722f7a"; PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = isfishAppstoreDistribution; PROVISIONING_PROFILE_SPECIFIER = "";
TARGETED_DEVICE_FAMILY = 1; TARGETED_DEVICE_FAMILY = 1;
USER_HEADER_SEARCH_PATHS = ""; USER_HEADER_SEARCH_PATHS = "";
}; };

2
Ifish/Ifish-Prefix.pch
View File

@ -29,6 +29,8 @@
#import "NIMKit.h" #import "NIMKit.h"
#import <Bugly/BuglyLog.h> #import <Bugly/BuglyLog.h>
#import "CommonMacros.h"
#define NTES_USE_CLEAR_BAR - (BOOL)useClearBar{return YES;} #define NTES_USE_CLEAR_BAR - (BOOL)useClearBar{return YES;}
#define NTES_FORBID_INTERACTIVE_POP - (BOOL)forbidInteractivePop{return YES;} #define NTES_FORBID_INTERACTIVE_POP - (BOOL)forbidInteractivePop{return YES;}

18
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/ThreeControl/ThreeControlCenterViewController.m
View File

@ -94,9 +94,14 @@ typedef NS_ENUM(NSInteger,ThreeControBackMsgTape){
self.button.tag=201+i; self.button.tag=201+i;
CGFloat y = 0;
if (is_iPhone_X) {
y = kScreenSize.height - (btnControlPlace - 10) - btnControlWith -10 -64 - 34;
} else {
y = kScreenSize.height - (btnControlPlace - 10) - btnControlWith -10 -64;
}
self.button.frame=CGRectMake(btnControlPlace +i*(btnControlPlace + btnControlWith * 105 / 122), y, btnControlWith * 105 / 122, btnControlWith );
self.button.frame=CGRectMake(btnControlPlace +i*(btnControlPlace + btnControlWith * 105 / 122), kScreenSize.height - (btnControlPlace - 10) - btnControlWith -10 -64 , btnControlWith * 105 / 122, btnControlWith );
//self.button.frame=CGRectMake1(wSpace1+(i%3)*(60+wSpace1), kScreenSize.height-80-64,60, 60); //self.button.frame=CGRectMake1(wSpace1+(i%3)*(60+wSpace1), kScreenSize.height-80-64,60, 60);
@ -121,8 +126,13 @@ typedef NS_ENUM(NSInteger,ThreeControBackMsgTape){
NSArray*arry=@[@"灯1",@"灯2",@"UV/冲浪"]; NSArray*arry=@[@"灯1",@"灯2",@"UV/冲浪"];
for (int j=0; j<nomalarr.count; j++){ for (int j=0; j<nomalarr.count; j++){
CGFloat y = 0;
self.buttonNameLabel=[[UILabel alloc]initWithFrame:CGRectMake(btnControlPlace +j*(btnControlPlace + btnControlWith * 105 / 122), kScreenSize.height - (btnControlPlace - 10) - 20 -64, btnControlWith * 7 / 8, btnControlPlace -10)]; if (is_iPhone_X) {
y = kScreenSize.height - (btnControlPlace - 10) - 20 -64 - 34;
} else {
y = kScreenSize.height - (btnControlPlace - 10) - 20 -64;
}
self.buttonNameLabel=[[UILabel alloc]initWithFrame:CGRectMake(btnControlPlace +j*(btnControlPlace + btnControlWith * 105 / 122), y, btnControlWith * 7 / 8, btnControlPlace -10)];
// self.timeLabel=[[UILabel alloc]initWithFrame:CGRectMake1(wSpace+(i%3)*(60+wSpace), kScreenSize.height-30-64,60, 20)]; // self.timeLabel=[[UILabel alloc]initWithFrame:CGRectMake1(wSpace+(i%3)*(60+wSpace), kScreenSize.height-30-64,60, 20)];

18
Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/TwoControl/TwoControlCenterController.m
View File

@ -232,8 +232,13 @@ typedef NS_ENUM(NSInteger,TwoControBackMsgTape){
for (int i=0; i<twoControlNormalImgArr.count; i++) { for (int i=0; i<twoControlNormalImgArr.count; i++) {
self.button=[UIButton buttonWithType:UIButtonTypeCustom]; self.button=[UIButton buttonWithType:UIButtonTypeCustom];
CGFloat y;
self.button.frame = CGRectMake(space+i*(buttonSize+space) + 10 ,kScreenSize.height - buttonSize - 20 - 64 - 20 , buttonSize * 105 / 122 , buttonSize ); if (is_iPhone_X) {
y = kScreenSize.height - buttonSize - 20 - 64 - 20 - 34;
} else {
y = kScreenSize.height - buttonSize - 20 - 64 - 20;
}
self.button.frame = CGRectMake(space+i*(buttonSize+space) + 10 ,y , buttonSize * 105 / 122 , buttonSize );
[self.button setImage:[UIImage imageNamed:twoControlNormalImgArr[i]] forState:UIControlStateNormal]; [self.button setImage:[UIImage imageNamed:twoControlNormalImgArr[i]] forState:UIControlStateNormal];
@ -257,8 +262,13 @@ typedef NS_ENUM(NSInteger,TwoControBackMsgTape){
NSArray*arry=@[@"灯",@"水泵"]; NSArray*arry=@[@"灯",@"水泵"];
for (int j=0; j<arry.count; j++){ for (int j=0; j<arry.count; j++){
CGFloat y = 0;
self.buttonNameLabel=[[UILabel alloc]initWithFrame:CGRectMake(space+j*(buttonSize+space) + 10, kScreenSize.height - 20 - 64 - 30 , buttonSize * 105 / 122, 20)]; if (is_iPhone_X) {
y = kScreenSize.height - 20 - 64 - 30 - 34;
} else {
y = kScreenSize.height - 20 - 64 - 30;
}
self.buttonNameLabel=[[UILabel alloc]initWithFrame:CGRectMake(space+j*(buttonSize+space) + 10, y, buttonSize * 105 / 122, 20)];