From 5f488b14b84606685d42802b86a5fbb602e7babf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=80=E5=8F=AA=E4=BC=9A=E7=BC=96=E7=A8=8B=E7=9A=84?= =?UTF-8?q?=E7=8B=AE=E5=AD=90?= Date: Fri, 15 Mar 2019 21:01:42 +0800 Subject: [PATCH] =?UTF-8?q?fixed:=E8=AE=BE=E5=A4=87=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ifish.xcodeproj/project.pbxproj | 8 ++++---- Ifish/AppDelegate.m | 1 - .../maincontroller/CenterViewController.m | 13 ++++++------- .../RunSun84biteCenterViewController.m | 2 +- .../设备/IfishDeviceViewController.m | 1 - .../leftcontrollers/SelectDeviceViewController.m | 1 - .../controllers/leftcontrollers/SetViewController.m | 1 - .../logAddRegistController/RegistViewController.mm | 1 - 8 files changed, 11 insertions(+), 17 deletions(-) diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index f062573..c397d50 100644 --- a/Ifish.xcodeproj/project.pbxproj +++ b/Ifish.xcodeproj/project.pbxproj @@ -17429,7 +17429,7 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "compiler-default"; CODE_SIGN_ENTITLEMENTS = Ifish/Ifish.entitlements; - CODE_SIGN_IDENTITY = "iPhone Developer: guowu ouyang (Q5YLXZSN4A)"; + CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: guowu ouyang (Q5YLXZSN4A)"; CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = WFX8GD5HFX; @@ -17542,10 +17542,10 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "compiler-default"; CODE_SIGN_ENTITLEMENTS = Ifish/Ifish.entitlements; - CODE_SIGN_IDENTITY = "iPhone Developer: guowu ouyang (Q5YLXZSN4A)"; + CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Yu Ying Technology Co., Ltd. (WFX8GD5HFX)"; CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = WFX8GD5HFX; + DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = NO; ENABLE_TESTABILITY = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -17641,7 +17641,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.shyuying.Ifish8; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; - PROVISIONING_PROFILE_SPECIFIER = isfishAppstoreDistribution; + PROVISIONING_PROFILE_SPECIFIER = ""; TARGETED_DEVICE_FAMILY = 1; USER_HEADER_SEARCH_PATHS = ""; VERSIONING_SYSTEM = "apple-generic"; diff --git a/Ifish/AppDelegate.m b/Ifish/AppDelegate.m index 31b65ff..9ce1818 100644 --- a/Ifish/AppDelegate.m +++ b/Ifish/AppDelegate.m @@ -43,7 +43,6 @@ #define BMKMAP_APPKEY @"wYcF3YXqeepKfzruExLPn0eS" //#import #import "Socketsingleton.h" -#import "CenterViewController.h" #import #import #import diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m index ccefc5b..1f7273a 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m @@ -96,13 +96,12 @@ //self.navigationBar.alpha=0; self.view.backgroundColor=COLOR_MIAN; [self creatTableView]; - return; -// [self initUI]; -// [self fishTankData]; -// -// [self creatMyindicaterView]; -// [self notBindDeviceState]; -// [self creatRefreshView]; + [self initUI]; + [self fishTankData]; + + [self creatMyindicaterView]; + [self notBindDeviceState]; + [self creatRefreshView]; diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuSunTemp/RuSunIndependence/RunSun84biteCenterViewController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuSunTemp/RuSunIndependence/RunSun84biteCenterViewController.m index 4be0528..fecc932 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuSunTemp/RuSunIndependence/RunSun84biteCenterViewController.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuSunTemp/RuSunIndependence/RunSun84biteCenterViewController.m @@ -114,7 +114,7 @@ for (int i = 0; i < 3; i ++) { self.button = [[UIButton alloc] init] ; - self.button.frame = CGRectMake(btnControlPlace +i*(btnControlPlace + btnControlWith),kScreenSize.height - 3*btnControlPlace - 2 *btnControlWith -10 - 10 , btnControlWith, btnControlWith +11); + self.button.frame = CGRectMake(btnControlPlace +i*(btnControlPlace + btnControlWith),kScreenSize.height - 3*btnControlPlace - 2 *btnControlWith -(is_iPhone_X?0:20) , btnControlWith, btnControlWith +11); [self.button setImage:[UIImage imageNamed:nameArr[i]] forState:UIControlStateNormal]; //self.button.backgroundColor = [UIColor redColor]; diff --git a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m index f069c66..6fa6872 100644 --- a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m +++ b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m @@ -41,7 +41,6 @@ #import "IfishAlibcWebViewController.h" #import "MBProgressHUD.h" #import "NTESSessionListViewController.h" -#import "RunSun84biteCenterViewController.h" #import "RunSunChangeNameViewController.h" @interface IfishDeviceViewController () diff --git a/Ifish/controllers/leftcontrollers/SelectDeviceViewController.m b/Ifish/controllers/leftcontrollers/SelectDeviceViewController.m index ead889a..3aab2a9 100644 --- a/Ifish/controllers/leftcontrollers/SelectDeviceViewController.m +++ b/Ifish/controllers/leftcontrollers/SelectDeviceViewController.m @@ -9,7 +9,6 @@ #import "SelectDeviceViewController.h" #import "FirstConnectWifiController.h" #import "LeftViewController.h" -#import "CenterViewController.h" #import "ICSDrawerController.h" #import "YooseConnectFirstViewController.h" #import "IfishMianTabViewController.h" diff --git a/Ifish/controllers/leftcontrollers/SetViewController.m b/Ifish/controllers/leftcontrollers/SetViewController.m index 7872edb..4b0401c 100644 --- a/Ifish/controllers/leftcontrollers/SetViewController.m +++ b/Ifish/controllers/leftcontrollers/SetViewController.m @@ -17,7 +17,6 @@ #import "ChangeSecretCodeController.h" #import "AboutUsViewController.h" //#import "LeftViewController.h" -//#import "CenterViewController.h" #import "RegistViewController.h" #import "AppDelegate.h" #import "LogInViewController.h" diff --git a/Ifish/controllers/logAddRegistController/RegistViewController.mm b/Ifish/controllers/logAddRegistController/RegistViewController.mm index 63a4231..8674645 100644 --- a/Ifish/controllers/logAddRegistController/RegistViewController.mm +++ b/Ifish/controllers/logAddRegistController/RegistViewController.mm @@ -13,7 +13,6 @@ #import "AFNetworking.h" #import "MyMD5.h" #import "LeftViewController.h" -#import "CenterViewController.h" #import "RightViewController.h" #import "AgreementViewController.h" #import "MyIntroductionViewController.h"