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

Browse Source 
# 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
Download Patch File Download Diff File Expand all files Collapse all files
Ifish/AppDelegate.m
-1
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>
Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m
-1
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>
Ifish/controllers/leftcontrollers/SelectDeviceViewController.m
-1
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"
Ifish/controllers/leftcontrollers/SetViewController.m
-1
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"
Ifish/controllers/logAddRegistController/RegistViewController.mm
-1
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"