V5.0.0正式版:
1、加热棒内容修改; 2、首页商品删除,更改为行业资讯; 3、绚多设备更名显示; 4、bugly更换为新版本; 5、摄像头显示bug修复; 6、开屏广告显示不全修复;
This commit is contained in:
@@ -7,15 +7,12 @@
|
||||
//
|
||||
|
||||
#import "IfishBaseVc.h"
|
||||
#import "LXPopView.h"
|
||||
#import "DXPopover.h"
|
||||
#import "CreatErWeiMaController.h"
|
||||
#import "JHRefreshAmazingAniView.h"
|
||||
#import "UIScrollView+JHRefresh.h"
|
||||
|
||||
|
||||
@interface IfishBaseVc ()<IfishCommuniteDelegate,LxPopViewDelegate>
|
||||
@property(nonatomic,strong)DXPopover *popover;
|
||||
@interface IfishBaseVc ()<IfishCommuniteDelegate>
|
||||
|
||||
@end
|
||||
|
||||
@@ -27,6 +24,8 @@
|
||||
|
||||
[Socketsingleton sharedInstance].communiteDelegate=self;
|
||||
// Do any additional setup after loading the view.
|
||||
//右侧下拉菜单
|
||||
[self initPopOver];
|
||||
}
|
||||
|
||||
- (void)didReceiveMemoryWarning {
|
||||
@@ -138,76 +137,57 @@
|
||||
return [str copy];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
#pragma mark- 下拉菜单
|
||||
-(MessageAlertView *)popView{
|
||||
if (!_popView) {
|
||||
_popView = [[MessageAlertView alloc]initWithFrame:RECT(screen_width - kSizeFrom750(220), 0, kSizeFrom750(220), kSizeFrom750(270))];
|
||||
WEAK_SELF;
|
||||
//点击
|
||||
_popView.comboxBlock = ^(NSInteger tag) {
|
||||
if (tag == 0) {
|
||||
//修改名称
|
||||
[weakSelf shezhiMingCheng];
|
||||
}else if (tag == 1){
|
||||
//删除设备
|
||||
[weakSelf deletDevice];
|
||||
|
||||
}else if (tag == 2){
|
||||
//分享设备
|
||||
[weakSelf fenXiangSheBei];
|
||||
}
|
||||
[weakSelf presentPopView];//隐藏弹出框
|
||||
};
|
||||
}
|
||||
return _popView;
|
||||
}
|
||||
//弹出分享框
|
||||
-(void)presentPopView{
|
||||
|
||||
UIImage *image = [UIImage imageNamed:@"popover_background_image_notrangle"];
|
||||
NSArray *titleImgs = nil;
|
||||
|
||||
BOOL isHidden = self.popView.hidden;
|
||||
if (isHidden) {
|
||||
self.popView.hidden = NO;
|
||||
}
|
||||
[UIView animateWithDuration:0.3 animations:^{
|
||||
self.popView.transform = CGAffineTransformScale(self.popView.transform,isHidden?100:0.01,isHidden?100:0.01);
|
||||
|
||||
} completion:^(BOOL finished) {
|
||||
self.popView.hidden = !isHidden;
|
||||
}];
|
||||
}
|
||||
-(void)initPopOver{
|
||||
[self.view addSubview:self.popView];
|
||||
NSArray *titleImgs =nil;
|
||||
NSArray *titles=nil;
|
||||
LXPopView *pop=[[LXPopView alloc] init];
|
||||
CGFloat popRowH=160*(image.size.height/image.size.width);
|
||||
if ([self.devicemodel.isMaster isEqualToString:@"1"]) {
|
||||
//主控
|
||||
pop.frame = CGRectMake(0, 0, 160, 160*(image.size.height/image.size.width) + (popRowH -12)/2);
|
||||
titleImgs = @[@"ifishdropview_edite_device",@"ifishdropview_delect_device",@"Ifish_share_device"];
|
||||
|
||||
titles=@[@"修改名称",@"删除设备",@"分享设备"];
|
||||
|
||||
}else{
|
||||
pop.frame = CGRectMake(0,0, 160, 160*(image.size.height/image.size.width));
|
||||
titleImgs = @[@"ifishdropview_edite_device",@"ifishdropview_delect_device"];
|
||||
|
||||
titles=@[@"修改名称",@"删除设备"];
|
||||
|
||||
}
|
||||
|
||||
pop.delegate = self;
|
||||
|
||||
pop.backgroundImage =image
|
||||
;
|
||||
pop.titles = titles;
|
||||
|
||||
pop.titleImgs =titleImgs;
|
||||
|
||||
DXPopover *popover = [DXPopover popover];
|
||||
|
||||
self.popover = popover;
|
||||
|
||||
popover.arrowSize = CGSizeMake(0.0,0.0);
|
||||
|
||||
[popover showAtView:self.navigationItem.rightBarButtonItem.customView withContentView:pop];
|
||||
|
||||
NSLog(@"设备右侧pop");
|
||||
|
||||
[self.popView loadInfoWithTitle:titles Icons:titleImgs];
|
||||
}
|
||||
|
||||
#pragma mark - PopViewDelagate
|
||||
|
||||
-(void)disSelectedPopViewIndex:(NSIndexPath *)Index{
|
||||
|
||||
[self.popover dismiss];
|
||||
|
||||
if (Index.row == 0) {
|
||||
//修改名称
|
||||
[self shezhiMingCheng];
|
||||
|
||||
|
||||
}else if (Index.row == 1){
|
||||
//删除设备
|
||||
|
||||
[self deletDevice];
|
||||
|
||||
}else if (Index.row == 2){
|
||||
//分享设备
|
||||
|
||||
[self fenXiangSheBei];
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#pragma mark - 修改设备名
|
||||
|
||||
|
||||
Reference in New Issue
Block a user