1、变更推送为阿里云推，清除云信IM以及推送内容；

2、消息页面全新改版；
3、部分微小Bug修复

Ifish/controllers/FishTinkController/centerPushcontrollers/BrandDetailViewController.h

@@ -7,9 +7,9 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "BaseVIewContorller.h"
+#import "BaseViewController.h"
 #import "BrandModel.h"
-@interface BrandDetailViewController : BaseVIewContorller
+@interface BrandDetailViewController : BaseViewController
 
 @property(nonatomic,strong) BrandModel *model;
 

Ifish/controllers/FishTinkController/centerPushcontrollers/DetailViewController.h

@@ -7,9 +7,9 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "BaseVIewContorller.h"
+#import "BaseViewController.h"
 #import "ShopModel.h"
-@interface DetailViewController : BaseVIewContorller
+@interface DetailViewController : BaseViewController
 @property (weak, nonatomic) IBOutlet UITextView *detailView;
 @property (weak, nonatomic) IBOutlet UILabel *nameLabel;
 @property(nonatomic,strong)NSMutableArray*shopArr;

Ifish/controllers/FishTinkController/centerPushcontrollers/DisconnectNetController.h

@@ -7,8 +7,8 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "BaseVIewContorller.h"
-@interface DisconnectNetController : BaseVIewContorller
+#import "BaseViewController.h"
+@interface DisconnectNetController : BaseViewController
 - (IBAction)reconnectNetButton:(id)sender;
 
 @property (weak, nonatomic) IBOutlet UIImageView *netwifiImgView;

Ifish/controllers/FishTinkController/centerPushcontrollers/SongBaoViewController.h

@@ -7,9 +7,9 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "BaseVIewContorller.h"
+#import "BaseViewController.h"
 
-@interface SongBaoViewController : BaseVIewContorller
+@interface SongBaoViewController : BaseViewController
 
 
 @property(nonatomic,copy) NSString *brandIntroduce;

Ifish/controllers/FishTinkController/centerPushcontrollers/StoreViewController.h

@@ -7,9 +7,9 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "BaseVIewContorller.h"
+#import "BaseViewController.h"
 #import "merchantModel.h"
-@interface StoreViewController : BaseVIewContorller
+@interface StoreViewController : BaseViewController
 @property (weak, nonatomic) IBOutlet UILabel *storeNameLabel;
 @property (weak, nonatomic) IBOutlet UITextView *detailView;
 @property(nonatomic,strong)NSMutableArray*shopArr;

Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuSunTemp/RuSunIndependence/RunSunChangeNameViewController.h

@@ -6,12 +6,12 @@
 //  Copyright © 2017年 lianlian. All rights reserved.
 //
 
-#import "BaseVIewContorller.h"
+#import "BaseViewController.h"
 #import "RunSunCHControl.h"
 typedef void (^deviceNameBlock)(NSString *);
 //原来只有这个设备可以自定义 控制按钮名字 后来说要全部设备都要自定义 我崩溃了 这个界面不删了留个纪念吧
 //改为使用 RuSunInpdViewController
-@interface RunSunChangeNameViewController : BaseVIewContorller
+@interface RunSunChangeNameViewController : BaseViewController
 
 @property (nonatomic,copy) deviceNameBlock NameWithBlock ;
 @property(nonatomic,strong) DeviceModel* device;

Ifish/controllers/FishTinkController/maincontroller/IfishDeviceControlNameBaseController.h

@@ -6,11 +6,11 @@
 //  Copyright © 2017年 lianlian. All rights reserved.
 //
 
-#import "BaseVIewContorller.h"
+#import "BaseViewController.h"
 //修改设备名 及控制名 子类实现DataSource即可
 
 typedef void (^deviceNameBlock)(NSString *);
-@interface IfishDeviceControlNameBaseController : BaseVIewContorller<UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate>
+@interface IfishDeviceControlNameBaseController : BaseViewController<UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate>
 
 @property (nonatomic,strong) UITableView *tableView;
 @property (nonatomic,copy) NSString *name;

Ifish/controllers/FishTinkController/maincontroller/RightViewController.h

@@ -6,9 +6,9 @@
 //  Copyright © 2016年 imac. All rights reserved.
 //
 
-#import "BaseVIewContorller.h"
+#import "BaseViewController.h"
 #import "ICSDrawerController.h"
-@interface RightViewController : BaseVIewContorller
+@interface RightViewController : BaseViewController
 
 
 @end

Ifish/controllers/FishTinkController/maincontroller/RightViewController.m

@@ -16,7 +16,7 @@
 #import "SetNameTextViewController.h"
 #import "FirstConnectWifiController.h"
 #import "CenterViewController.h"
-#import "PushmassageModel.h"
+#import "PushmessageModel.h"
 #import "IfishDatabaseManager.h"
 #import "DeviceModel.h"
 #import "emptyInfoCollectionViewCell.h"

Ifish/controllers/FishTinkController/maincontroller/RightViewControllers/SetNameTextViewController.h

@@ -6,12 +6,12 @@
 //  Copyright © 2016年 imac. All rights reserved.
 //
 
-#import "BaseVIewContorller.h"
+#import "BaseViewController.h"
 #import "DeviceModel.h"
 #import "IfishCameraModel.h"
 typedef void (^NameFieldBlock)(NSString *);
 
-@interface SetNameTextViewController : BaseVIewContorller
+@interface SetNameTextViewController : BaseViewController
 
 
 @property (nonatomic,copy) NSString *name;