diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj
index 86b5cb7..07d0d7b 100644
--- a/Ifish.xcodeproj/project.pbxproj
+++ b/Ifish.xcodeproj/project.pbxproj
@@ -6212,6 +6212,7 @@
 		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>"; };
 		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 */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -12477,6 +12478,7 @@
 		8876A5851BB83447007A4B54 /* Ifish */ = {
 			isa = PBXGroup;
 			children = (
+				E5C644BF206BBD5F00C558D5 /* Common */,
 				882953EA1DBDA3A000E9DDD7 /* ifishImgSouce */,
 				881B9F581D9CA98B001948AD /* Ifish.entitlements */,
 				88F5EEE81D48D04100CC7CAF /* libs */,
@@ -13716,6 +13718,14 @@
 			path = zbar;
 			sourceTree = "<group>";
 		};
+		E5C644BF206BBD5F00C558D5 /* Common */ = {
+			isa = PBXGroup;
+			children = (
+				E5C644C0206BBD7100C558D5 /* CommonMacros.h */,
+			);
+			path = Common;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -13785,7 +13795,7 @@
 					8876A5821BB83447007A4B54 = {
 						CreatedOnToolsVersion = 7.0;
 						DevelopmentTeam = WFX8GD5HFX;
-						ProvisioningStyle = Manual;
+						ProvisioningStyle = Automatic;
 						SystemCapabilities = {
 							com.apple.BackgroundModes = {
 								enabled = 1;
@@ -16432,7 +16442,8 @@
 				CLANG_CXX_LIBRARY = "libstdc++";
 				CODE_SIGN_ENTITLEMENTS = Ifish/Ifish.entitlements;
 				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;
 				ENABLE_BITCODE = NO;
 				ENABLE_TESTABILITY = YES;
@@ -16514,8 +16525,8 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.shyuying.Ifish8;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "05fbf8da-562c-4344-ade4-ae990d722f7a";
-				PROVISIONING_PROFILE_SPECIFIER = isfishAppstoreDistribution;
+				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				TARGETED_DEVICE_FAMILY = 1;
 				USER_HEADER_SEARCH_PATHS = "";
 			};
@@ -16529,7 +16540,8 @@
 				CLANG_CXX_LIBRARY = "libstdc++";
 				CODE_SIGN_ENTITLEMENTS = Ifish/Ifish.entitlements;
 				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;
 				ENABLE_BITCODE = NO;
 				ENABLE_TESTABILITY = YES;
@@ -16611,8 +16623,8 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.shyuying.Ifish8;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "05fbf8da-562c-4344-ade4-ae990d722f7a";
-				PROVISIONING_PROFILE_SPECIFIER = isfishAppstoreDistribution;
+				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				TARGETED_DEVICE_FAMILY = 1;
 				USER_HEADER_SEARCH_PATHS = "";
 			};
diff --git a/Ifish/Ifish-Prefix.pch b/Ifish/Ifish-Prefix.pch
index 80bee86..d4ea3db 100644
--- a/Ifish/Ifish-Prefix.pch
+++ b/Ifish/Ifish-Prefix.pch
@@ -29,6 +29,8 @@
 #import "NIMKit.h"
 #import <Bugly/BuglyLog.h>
 
+#import "CommonMacros.h"
+
 #define NTES_USE_CLEAR_BAR - (BOOL)useClearBar{return YES;}
 
 #define NTES_FORBID_INTERACTIVE_POP - (BOOL)forbidInteractivePop{return YES;}
diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/ThreeControl/ThreeControlCenterViewController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/ThreeControl/ThreeControlCenterViewController.m
index 1d312f7..ff78375 100644
--- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/ThreeControl/ThreeControlCenterViewController.m
+++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/ThreeControl/ThreeControlCenterViewController.m
@@ -94,9 +94,14 @@ typedef NS_ENUM(NSInteger,ThreeControBackMsgTape){
     
             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), kScreenSize.height - (btnControlPlace  - 10) - btnControlWith -10 -64 , btnControlWith * 105 / 122, btnControlWith );
+            self.button.frame=CGRectMake(btnControlPlace +i*(btnControlPlace +  btnControlWith * 105 / 122),  y, btnControlWith * 105 / 122, btnControlWith );
     
             
             //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/冲浪"];
     
         for (int j=0; j<nomalarr.count; j++){
-             
-        self.buttonNameLabel=[[UILabel alloc]initWithFrame:CGRectMake(btnControlPlace +j*(btnControlPlace +  btnControlWith * 105 / 122), kScreenSize.height - (btnControlPlace - 10) - 20 -64,  btnControlWith * 7 / 8, btnControlPlace  -10)];
+        CGFloat y = 0;
+        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)];
diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/TwoControl/TwoControlCenterController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/TwoControl/TwoControlCenterController.m
index 2739a1e..a63cd6a 100644
--- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/TwoControl/TwoControlCenterController.m
+++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/TwoControl/TwoControlCenterController.m
@@ -232,8 +232,13 @@ typedef NS_ENUM(NSInteger,TwoControBackMsgTape){
     
     for (int i=0; i<twoControlNormalImgArr.count; i++) {
         self.button=[UIButton buttonWithType:UIButtonTypeCustom];
-        
-        self.button.frame = CGRectMake(space+i*(buttonSize+space) + 10 ,kScreenSize.height - buttonSize - 20 - 64 - 20 , buttonSize * 105 / 122 , buttonSize );
+        CGFloat y;
+        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];
@@ -257,8 +262,13 @@ typedef NS_ENUM(NSInteger,TwoControBackMsgTape){
     NSArray*arry=@[@"灯",@"水泵"];
     
     for (int j=0; j<arry.count; j++){
-        
-     self.buttonNameLabel=[[UILabel alloc]initWithFrame:CGRectMake(space+j*(buttonSize+space) + 10, kScreenSize.height  - 20 - 64 - 30 , buttonSize * 105 / 122, 20)];
+        CGFloat y = 0;
+        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)];