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

Merge branch 'develop' of http://139.196.24.156/ifish/ifish into develop 

# Conflicts:
#	Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m
#	Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuSunTemp/RuSunIndependence/RunSun84biteCenterViewController.m
This commit is contained in:
jiangxuefei718 2019-03-19 16:42:03 +08:00
parent 73b993aea9 5f488b14b8
commit a1f9494a73
6 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Ifish.xcodeproj/project.pbxproj
View File

@ -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";

1
Ifish/AppDelegate.m
View File

@ -43,7 +43,6 @@
#define BMKMAP_APPKEY @"wYcF3YXqeepKfzruExLPn0eS"
//#import <BaiduMapAPI_Map/BMKMapComponent.h>
#import "Socketsingleton.h"
#import "CenterViewController.h"
#import <UMCommunitySDK/UMCommunitySDK.h>
#import <UMCommunitySDK/UMComSession.h>
#import <UMSocialCore/UMSocialCore.h>

1
Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m
View File

@ -41,7 +41,6 @@
#import "IfishAlibcWebViewController.h"
#import "MBProgressHUD.h"
#import "NTESSessionListViewController.h"
#import "RunSun84biteCenterViewController.h"
#import "RunSunChangeNameViewController.h"
@interface IfishDeviceViewController ()<UITableViewDelegate,UITableViewDataSource,LxPopViewDelegate,ShopTtemListDelegate,NIMSystemNotificationManagerDelegate,NIMConversationManagerDelegate>

1
Ifish/controllers/leftcontrollers/SelectDeviceViewController.m
View File

@ -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"

1
Ifish/controllers/leftcontrollers/SetViewController.m
View File

@ -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"

1
Ifish/controllers/logAddRegistController/RegistViewController.mm
View File

@ -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"