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

V5.0.0bug修复

This commit is contained in:
wbzhan 2019-08-29 14:07:40 +08:00
parent 23c5d6f60d
commit 685a2b8676
17 changed files with 247 additions and 485 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Ifish.xcodeproj/project.pbxproj
View File

@ -239,7 +239,6 @@
3D4AFF6021F34E1C0053BAA0 /* libstdc++.6.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D4AFF5E21F34E1C0053BAA0 /* libstdc++.6.tbd */; };
3D4AFF6221F350820053BAA0 /* libstdc++.6.0.9.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D4AFF6121F350820053BAA0 /* libstdc++.6.0.9.tbd */; };
3D5C436E21339E9D00E15B66 /* IfishHistoryView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D5C436D21339E9D00E15B66 /* IfishHistoryView.m */; };
3D5C437021339EAB00E15B66 /* IfishHistoryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3D5C436F21339EAB00E15B66 /* IfishHistoryView.xib */; };
3D5C437321339F8F00E15B66 /* IfishChatView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D5C437221339F8F00E15B66 /* IfishChatView.m */; };
3D8F649721568AE500F04BD3 /* ConnectHotspotTipViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E52B400321042ED2003BBA3E /* ConnectHotspotTipViewController.m */; };
3D8F649A21571D7C00F04BD3 /* HitbarWifeVc.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D8F649921571D7C00F04BD3 /* HitbarWifeVc.m */; };
@ -2805,7 +2804,6 @@
3D4AFF6121F350820053BAA0 /* libstdc++.6.0.9.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libstdc++.6.0.9.tbd"; path = "usr/lib/libstdc++.6.0.9.tbd"; sourceTree = SDKROOT; };
3D5C436C21339E9D00E15B66 /* IfishHistoryView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IfishHistoryView.h; sourceTree = "<group>"; };
3D5C436D21339E9D00E15B66 /* IfishHistoryView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IfishHistoryView.m; sourceTree = "<group>"; };
3D5C436F21339EAB00E15B66 /* IfishHistoryView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = IfishHistoryView.xib; sourceTree = "<group>"; };
3D5C437121339F8F00E15B66 /* IfishChatView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IfishChatView.h; sourceTree = "<group>"; };
3D5C437221339F8F00E15B66 /* IfishChatView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IfishChatView.m; sourceTree = "<group>"; };
3D8F649821571D7C00F04BD3 /* HitbarWifeVc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HitbarWifeVc.h; sourceTree = "<group>"; };
@ -6506,7 +6504,6 @@
3D13F834212FE2C200D725F7 /* IFishWaterChangeView.m */,
3D5C436C21339E9D00E15B66 /* IfishHistoryView.h */,
3D5C436D21339E9D00E15B66 /* IfishHistoryView.m */,
3D5C436F21339EAB00E15B66 /* IfishHistoryView.xib */,
3D5C437121339F8F00E15B66 /* IfishChatView.h */,
3D5C437221339F8F00E15B66 /* IfishChatView.m */,
3D1C5066215CB6E300A2E5D6 /* IfishHotBarHeader.xib */,
@ -7775,6 +7772,7 @@
882953EA1DBDA3A000E9DDD7 /* ifishImgSouce */ = {
isa = PBXGroup;
children = (
CB5BB482231388A900860E71 /* HotBarImage */,
CBA6169022924E1D00ED380D /* messageImages */,
8891330C1ECE99B900F52EBC /* ShopVideoSource */,
8871FAC01EBC58D70038E99A /* shopCerImg */,
@ -7799,7 +7797,6 @@
882955821DBDA3A100E9DDD7 /* switchButton */,
882955921DBDA3A100E9DDD7 /* wifiviewImg */,
8829559D1DBDA3A100E9DDD7 /* XuToImg */,
882955D81DBDA3A100E9DDD7 /* YunXinSourceFile */,
);
path = ifishImgSouce;
sourceTree = "<group>";
@ -8774,13 +8771,6 @@
path = XuToImg;
sourceTree = "<group>";
};
882955D81DBDA3A100E9DDD7 /* YunXinSourceFile */ = {
isa = PBXGroup;
children = (
);
path = YunXinSourceFile;
sourceTree = "<group>";
};
882A75F41EBABB8F00AD1D15 /* ShopCertificationNewFile */ = {
isa = PBXGroup;
children = (
@ -12347,6 +12337,13 @@
path = Frameworks;
sourceTree = "<group>";
};
CB5BB482231388A900860E71 /* HotBarImage */ = {
isa = PBXGroup;
children = (
);
path = HotBarImage;
sourceTree = "<group>";
};
CB7D6A9722953BEB0014E5C7 /* YYCache */ = {
isa = PBXGroup;
children = (
@ -13943,7 +13940,6 @@
882955F31DBDA3A100E9DDD7 /* pencil .png in Resources */,
8815D1E51E02662500BEA2DA /* FullPlay_Play.png in Resources */,
882956261DBDA3A100E9DDD7 /* neves0041.png in Resources */,
3D5C437021339EAB00E15B66 /* IfishHistoryView.xib in Resources */,
88742C3E1D63FA270074F1F8 /* CertifyListFourthCell.xib in Resources */,
8864844A1EE171D30046C3BD /* redact_line@3x.png in Resources */,
8869B3A71E6967DF0010F099 /* levelUp_totoise@3x.png in Resources */,

2
Ifish/Assets.xcassets/history_bg.imageset/Contents.json vendored
View File

@ -6,11 +6,11 @@
},
{
"idiom" : "universal",
"filename" : "history_bg@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "history_bg@3x.png",
"scale" : "3x"
}
],

0
Ifish/Assets.xcassets/history_bg.imageset/history_bg@2x.png → Ifish/Assets.xcassets/history_bg.imageset/history_bg@3x.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 48 KiB

2
Ifish/Info.plist
View File

@ -70,7 +70,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>10.0.1</string>
<string>10.0.5</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationCategoryType</key>

177
Ifish/controllers/HotBar/IfishHotBarVc.m
View File

@ -149,7 +149,7 @@ Assign BOOL isInitHostoryView;
_changeWaterView.hidden=NO;
return _changeWaterView;
}
//设置换水周期
-(void)didSelectRow1:(NSString *)v andRow2:(NSString *)v2{
v=[v stringByReplacingOccurrencesOfString:@"天" withString:@""];
v2=[v2 stringByReplacingOccurrencesOfString:@":00" withString:@""];
@ -159,54 +159,31 @@ Assign BOOL isInitHostoryView;
}
IfishHotBarVo*vo=self.datas[4];
vo.title=str;
if (!self.vo.heater) {
self.vo.heater = InitObject(IfishHeaterVo);
}
self.vo.heater.heaterCycle=v;
self.vo.heater.heaterReminderTime=v2;
[self setTeampleture];
[self.mainTableView reloadData];
}
-(void)submitText:(NSString *)w andh:(NSString *)h andV:(NSString *)v{
IfishHotBarVo*vo=self.datas[1];
float heaterVolume;
if (w&&h&&v) {
heaterVolume=[w integerValue]*[h integerValue]*[v integerValue]*0.001;
self.vo.heater.heaterVolume=[NSString stringWithFormat:@"%0.1f",heaterVolume];
self.vo.heater.heaterLong=v;
self.vo.heater.heaterWidth=w;
self.vo.heater.heaterHeight=h;
}
if (self.vo.heater.heaterVolume.length) {
vo.title=[NSString stringWithFormat:@"鱼缸容量 %@L",self.vo.heater.heaterVolume];
vo.subTitle=[NSString stringWithFormat:@"推荐流量：%.1fL--%.1fL",[self.vo.heater.heaterVolume intValue]*1.5,[self.vo.heater.heaterVolume intValue]*2.0];
[self.mainTableView reloadData];
}
[self setHeigh:h andW:w andLong:v];
}
-(void)didSelectTeamptrue:(NSString *)up andDown:(NSString *)down andT:(NSString *)t andWarnCode:(NSString *)code{
up=[up stringByReplacingOccurrencesOfString:@"°c" withString:@""];
down=[down stringByReplacingOccurrencesOfString:@"°c" withString:@""];
t=[t stringByReplacingOccurrencesOfString:@"°c" withString:@""];
// [self setHeatTeapWith:t];
//设置加热温度
-(void)didChangeTemperature:(NSString *)temp{
temp=[temp stringByReplacingOccurrencesOfString:@"°c" withString:@""];
IfishHotBarVo*vo=self.datas[0];
self.vo.heaterNum=[NSString stringWithFormat:@"%f",t.floatValue];
self.vo.heaterNum=[NSString stringWithFormat:@"%f",temp.floatValue];
vo.title=[NSString stringWithFormat:@"设置温度 %.1f°c",[self.vo.heaterNum floatValue]];
[self.mainTableView reloadData];
[self setHeatTeapWith:temp];
}
//设置预警温度
-(void)didSelectTeamptrue:(NSString *)up andDown:(NSString *)down andWarnCode:(NSString *)code{
up=[up stringByReplacingOccurrencesOfString:@"°c" withString:@""];
down=[down stringByReplacingOccurrencesOfString:@"°c" withString:@""];
self.vo.wornCode=code;
// self.vo.wornCode=[NSString stringWithFormat:@"%llu",[dataContorl hexToTen:self.vo.wornCode]];
self.vo.upTeamp=up;
self.vo.downTeamp=down;
[self setHeatTeapWith:t];
// [self setTeampletureWithUp:self.vo.upTeamp andDown:self.vo.downTeamp andHnum:0 andWarmC:self.vo.wornCode];
[self setTeampletureWithUp:self.vo.upTeamp andDown:self.vo.downTeamp andHnum:0 andWarmC:self.vo.wornCode];
}
@ -321,66 +298,7 @@ Assign BOOL isInitHostoryView;
}
#pragma mark------请求服务器-------
-(void)setHeigh:(NSString*)h andW:(NSString*)w andLong:(NSString*)l{
// 参数名称 参数类型 是否必须 说明描述
// heaterId Integer 是 保存信息此字段为空
// 修改信息此字段有值
// heaterMacAddress String 是 加热棒mac地址
// heaterVolume String 是 鱼缸容积
// heaterLong String 是 鱼缸长
// heaterWidth String 是 鱼缸宽
// heaterHeight String 是 鱼缸高
// heaterCycle String 是 换水提醒周期
// c String 是 提醒时间
if ([l isEqualToString:@""]) {
[self.view makeToast:@"请输入鱼缸长"];
return;
}else if ([w isEqualToString:@""]){
[self.view makeToast:@"请输入鱼缸宽"];
return;
}else if([h isEqualToString:@""])
{
[self.view makeToast:@"请输入鱼缸高"];
return;
}
NSString*v=@"";
NSString*r=@"";
NSString*c=@"";
NSString*heaterId=@"";
if (self.vo.heater) {
v=self.vo.heater.heaterVolume;
c=self.vo.heater.heaterCycle;
r=self.vo.heater.heaterReminderTime;
heaterId=self.vo.heater.heaterId;
}
NSDictionary*para=@{
@"heaterId":heaterId,
@"heaterMacAddress":self.devicemodel.macAddress,
@"heaterVolume":v,
@"heaterLong":l,
@"heaterWidth":w,
@"heaterHeight":h,
@"heaterCycle":c,
@"heaterRemindTime":r
};
[SVProgressHUD showWithMaskType:SVProgressHUDMaskTypeBlack];
[AFHttpTool requestWihtMethod:RequestMethodTypePost url:SaveHotBarInfo params:para success:^(id response) {
NSLog(@"-----------%@",response);
NSDictionary*dict=[NSJSONSerialization JSONObjectWithData:response options:NSJSONReadingMutableContainers error:nil];
NSString*result=dict[@"result"];
if ([result integerValue]==100) {
// self.vo=[IfishHotBarVo mj_objectWithKeyValues:dict[@"data"]];
[SVProgressHUD dismiss];
[self showLableAction:@"修改成功"];
}
} failure:^(NSError *err) {
}];
}
//删除加热棒
-(void)deleteHotBarInfo{
NSDictionary*para=@{
@ -401,17 +319,11 @@ Assign BOOL isInitHostoryView;
//重置数据库
NSArray*deviceArry=[[DataCenter defaultDtacenter]valueForKey:@"deviceInfo"];
NSMutableArray *newArr = [NSMutableArray arrayWithArray:deviceArry];
for (DeviceModel *model in deviceArry) {
if ([model.deviceId isEqual:self.devicemodel.deviceId]) {
[newArr removeObject:model];
}
}
[[DataCenter defaultDtacenter] setValue: newArr forKey:@"deviceInfo"];
if ([newArr count]==0) {
@ -444,7 +356,6 @@ Assign BOOL isInitHostoryView;
[SVProgressHUD dismiss];
if ([result integerValue]==100) {
self.vo=[IfishHotBarVo mj_objectWithKeyValues:dict[@"data"]];
if (self.vo.phs.count>0) {
NSDate *curDate = [NSDate dateWithTimeInterval:self.curDay*60*60*-24 sinceDate:[NSDate date]];
NSDateFormatter *dateFormatter=[[NSDateFormatter alloc]init];//创建一个日期格式化器
@ -456,8 +367,7 @@ Assign BOOL isInitHostoryView;
self.historyView.datas=self.vo.phs;
self.historyView.hidden=YES;
}
//去除鱼缸容积，改为设置预警温度
//去除鱼缸容积
IfishHotBarVo*vo1=self.datas[4];
if (self.vo.heater.heaterCycle.length) {
if (self.vo.heater.heaterReminderTime.length) {
@ -491,16 +401,16 @@ Assign BOOL isInitHostoryView;
}
-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
if (indexPath.row==3) {
if (indexPath.row==2){//水泵流量，点击无效果
}else if (indexPath.row==3) {//历史趋势
if (!self.isInitHostoryView) {
[self getHistoryDataRequest];
}
self.historyView.hidden=NO;
}else if (indexPath.row==2){
}
else{
}else{
[self changeWaterView];
self.changeWaterView.hotVo=self.vo;
self.changeWaterView.viewType=indexPath.row;
@ -575,8 +485,6 @@ Assign BOOL isInitHostoryView;
self.vo.downTeamp=[info substringWithRange:NSMakeRange(50, 4)];
self.vo.downTeamp=[NSString stringWithFormat:@"%f",[dataContorl hexToTen:self.vo.downTeamp]*0.1];
[self.mainTableView reloadData];
}
@ -599,6 +507,7 @@ Assign BOOL isInitHostoryView;
//2 最低报警温度，关闭报警时传0
//2 最高报警温度，关闭报警时传0
//2 CRC16校验码
//设置换水周期
-(void)setTeampleture{
if (!self.vo.heater.heaterCycle||!self.vo.heater.heaterReminderTime) {
return;
@ -610,14 +519,12 @@ Assign BOOL isInitHostoryView;
NSString*heaterHeight=@"";
NSString*heaterId=@"";
NSString*heaterVolume=@"";
if (self.vo.heater) {
longNum=self.vo.heater.heaterLong;
heaterWidth=self.vo.heater.heaterWidth;
heaterHeight=self.vo.heater.heaterHeight;
if (self.vo.heater.heaterId) {
heaterId=self.vo.heater.heaterId;
heaterVolume=self.vo.heater.heaterVolume;
}
if (self.vo.heater.heaterVolume) {
heaterVolume=self.vo.heater.heaterVolume;
}
NSDictionary*para=@{
@"heaterId":heaterId,
@"heaterMacAddress":self.devicemodel.macAddress,
@ -641,30 +548,19 @@ Assign BOOL isInitHostoryView;
}];
}
#pragma mark-----打开开关----
#pragma mark-----打开预警温度开关----
-(void)clickWormCode:(NSString *)code{
IfishHotBarPackegeVo*pvo=[[IfishHotBarPackegeVo alloc]init];
pvo.msgType=@"00";
pvo.funcCode=@"05";
pvo.sendAdr=self.devicemodel.macAddress;
pvo.reciceAdr=self.devicemodel.macAddress;
pvo.lenth=@"16";
pvo.warnCode=code;
pvo.downTeamptrue=@"0000";
pvo.upTeamptrue=@"0000";
pvo.crcCode=@"0000";
NSString*stateString=[pvo description];
NSData*selctorData=[dataContorl stringToHexData:stateString];
[[Socketsingleton sharedInstance].clientSocket writeData:selctorData withTimeout:-1 tag:0];
[[Socketsingleton sharedInstance].clientSocket readDataWithTimeout:-1 tag:0];
@ -700,21 +596,14 @@ Assign BOOL isInitHostoryView;
pvo.upTeamptrue=[dataContorl leftAddZero:4 andStr:pvo.upTeamptrue];
}
}
pvo.crcCode=@"0000";
NSString*stateString=[pvo description];
NSData*selctorData=[dataContorl stringToHexData:stateString];
self.vo.heaterNum=num;
[[Socketsingleton sharedInstance].clientSocket writeData:selctorData withTimeout:-1 tag:0];
[[Socketsingleton sharedInstance].clientSocket readDataWithTimeout:-1 tag:0];
// [self showLableAction:@"发送成功"];
[self showLableAction:@"发送成功"];
}
@ -725,11 +614,7 @@ Assign BOOL isInitHostoryView;
-(void)setHeatTeapWith:(NSString*)num{
if(!num){
// [self.view makeToast:@"请选择加热温度"];
// self.vo.wornCode=[NSString stringWithFormat:@"%llu",[dataContorl hexToTen:self.vo.wornCode]];
[self setTeampletureWithUp:self.vo.upTeamp andDown:self.vo.downTeamp andHnum:0 andWarmC:self.vo.wornCode];
[self.view makeToast:@"请选择加热温度"];
return;
}
IfishPackageHeaderVo*header=[[IfishPackageHeaderVo alloc]init];
@ -749,7 +634,7 @@ Assign BOOL isInitHostoryView;
NSString*stateString=[NSString stringWithFormat:@"%@%@%@",[header getHeader],num,crc];
NSData*selctorData=[dataContorl stringToHexData:stateString];
[[Socketsingleton sharedInstance].clientSocket writeData:selctorData withTimeout:-1 tag:0];
[[Socketsingleton sharedInstance].clientSocket writeData:selctorData withTimeout:-1 tag:0];
[[Socketsingleton sharedInstance].clientSocket readDataWithTimeout:-1 tag:0];
[self showLableAction:@"发送成功"];

6
Ifish/controllers/HotBar/Views/IFishWaterChangeView.h
View File

@ -12,7 +12,11 @@
@optional
-(void)didSelectRow1:(NSString*)v andRow2:(NSString*)v2;
-(void)submitText:(NSString*)w andh:(NSString*)h andV:(NSString*)v;
-(void)didSelectTeamptrue:(NSString*)up andDown:(NSString*)down andT:(NSString*)t andWarnCode:(NSString*)code;
//设置预警温度
-(void)didSelectTeamptrue:(NSString*)up andDown:(NSString*)down andWarnCode:(NSString*)code;
//设置加热温度
-(void)didChangeTemperature:(NSString*)temp;
//设置换水周期
-(void)didSelectRemindTime:(NSString*)time;
-(void)clickWormCode:(NSString*)code;
@end

21
Ifish/controllers/HotBar/Views/IFishWaterChangeView.m
View File

@ -229,6 +229,7 @@ Strong UIImageView *sepImage;
self.openBtn.hidden = YES;
[self.data1 removeAllObjects];
[self.data2 removeAllObjects];
self.titleLabel.text=@"请设置加热温度：";
if (viewType==0) {// 设置水温
self.topUiPick.hidden=NO;
[self.data1 addObjectsFromArray:self.templetrueArr];
@ -280,7 +281,6 @@ Strong UIImageView *sepImage;
self.titleLabel.text=@"换水周期选择：";
self.selectVaule2=self.data1[0];
if (self.hotVo.heater.heaterCycle!=nil) {
[self.bottomUiPicker selectRow:[self.hotVo.heater.heaterCycle integerValue]-1 inComponent:0 animated:NO];
self.selectVaule2=self.hotVo.heater.heaterCycle;
}else{
@ -300,7 +300,7 @@ Strong UIImageView *sepImage;
//点击open按钮
- (void)openBtnClick:(UIButton *)sender {
sender.selected=!sender.selected;
if(self.viewType==0){
if(self.viewType==1){//设置预警温度
self.hotVo.wornCode=sender.selected?@"01":@"00";
[self.myDelegate clickWormCode:self.hotVo.wornCode];
}
@ -312,15 +312,16 @@ Strong UIImageView *sepImage;
//点击确定按钮
- (void)sureBtnClick:(UIButton *)sender{
self.hidden=YES;
if(_viewType==5){
[self.myDelegate didSelectRow1:self.selectVaule2 andRow2:self.selectVaule3];
}else if (_viewType==0){
// [self.myDelegate didSelectTeamptrue:self.selectVaule2];
// if(_viewType==5){
// [self.myDelegate didSelectRow1:self.selectVaule2 andRow2:self.selectVaule3];
// }else
if (_viewType==0) {//设置加热温度
[self.myDelegate didChangeTemperature:self.selectVaule1];
}
if (_viewType==1){//设置预警温度
NSString*code=self.openBtn.selected?@"01":@"00";
[self.myDelegate didSelectTeamptrue:self.selectVaule3 andDown:self.selectVaule2 andT:self.selectVaule1 andWarnCode:code];
}else if(_viewType==4){
// [self.myDelegate didSelectRemindTime:self.selectVaule2];
[self.myDelegate didSelectTeamptrue:self.selectVaule3 andDown:self.selectVaule2 andWarnCode:code];
}else if(_viewType==4){//设置换水周期
if(self.openBtn.selected==NO){
[self.myDelegate didSelectRow1:self.selectVaule2 andRow2:@""];
}else{

63
Ifish/controllers/HotBar/Views/IfishChatView.m
View File

@ -10,7 +10,9 @@
#import "IfishHistroyVo.h"
#define Normal_heaterPh 499 //只有499才是正常流量
#define Rect_Width 248.f
#define Rect_Width kSizeFrom750(568)
#define Origin_Left kSizeFrom750(72)
#define Rect_Height kSizeFrom750(185)
@interface IfishChatView()
@property(nonatomic,strong)NSMutableArray*line1;
@property(nonatomic,strong)UIView *lablesView;
@ -25,6 +27,7 @@ Strong NSMutableArray * heaterPhArray;//流量走势
if (_numLable==nil) {
_numLable=[[UILabel alloc]init];
[self addSubview:_numLable];
}
return _numLable;
}
@ -40,13 +43,13 @@ Strong NSMutableArray * heaterPhArray;//流量走势
// CGFloat gapW= 357*scale*0.1;
for (int i=0; i<self.datas.count; i++) {
IfishHistroyVo*vo=self.datas[i];
CGFloat x=32 +([vo.heaterGatheringTime floatValue]/24)*Rect_Width;
CGFloat x=Origin_Left +([vo.heaterGatheringTime floatValue]/24)*Rect_Width;
if(vo.heaterWaterTemperature.integerValue>350){
vo.heaterWaterTemperature=@"350";
}else if(vo.heaterWaterTemperature.integerValue<250){
continue;
}
CGFloat y=80*(1-((vo.heaterWaterTemperature.integerValue*0.1-25)/10))+19;//*-1*+158;
CGFloat y=Rect_Height*(1-((vo.heaterWaterTemperature.integerValue*0.1-25)/10))+kSizeFrom750(43);//*-1*+158;
CGPoint p1=CGPointMake(x, y);
// NSLog(@"%f-------%f--%f-",y,vo.heaterWaterTemperature.integerValue*0.1,x);
[_line1 addObject:NSStringFromCGPoint(p1)];
@ -66,10 +69,10 @@ Strong NSMutableArray * heaterPhArray;//流量走势
_heaterPhArray = InitObject(NSMutableArray);
//添加流量
for (int i=0; i<23; i++) {
CGFloat x=(i*(Rect_Width/24)+32);
CGFloat y=104;
CGFloat x=(i*(Rect_Width/24)+Origin_Left);
CGFloat y=kSizeFrom750(236);
UIView *lineView = [[UIView alloc] initWithFrame:RECT(x, y, Rect_Width/24, 1)];
lineView.tag = i+1000;
lineView.tag = i+100;
[self addSubview:lineView];
[_heaterPhArray addObject:lineView];
}
@ -88,11 +91,11 @@ Strong NSMutableArray * heaterPhArray;//流量走势
//如果有时间段的数据拿不到，则直接使用虚线
if ([nextVo.heaterGatheringTime integerValue]-[vo.heaterGatheringTime integerValue]>1) {
for (int i=[vo.heaterGatheringTime intValue]; i<[nextVo.heaterGatheringTime intValue]; i++) {
UIView *emptyView = [self viewWithTag:i+1000];
UIView *emptyView = [self viewWithTag:i+100];
[self drawDashLine:emptyView lineLength:2 lineSpacing:1 lineColor:[UIColor redColor]];
}
}else{
UIView *lineView = [self viewWithTag:[vo.heaterGatheringTime integerValue]+1000];
UIView *lineView = [self viewWithTag:[vo.heaterGatheringTime integerValue]+100];
if([vo.heaterPh integerValue]==Normal_heaterPh&&[nextVo.heaterPh integerValue]==Normal_heaterPh){//正常流量
lineView.layer.backgroundColor = [UIColor greenColor].CGColor;
@ -124,51 +127,7 @@ Strong NSMutableArray * heaterPhArray;//流量走势
// [path closePath];//第五条线通过调用closePath方法得到的
[path stroke];//Draws line 根据坐标点连线
//添加坐标点
// for (int i=0; i<self.line1.count; i++) {
//
// NSString* p=self.line1[i];
// CGPoint point=CGPointFromString(p);
// UIBezierPath *path0 = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(point.x-1, point.y-1, 2, 2) cornerRadius:1];
// [path0 stroke];
// [path0 fill];
//
// }
// UIColor *color1 = [UIColor greenColor];
// [color1 set]; //设置线条颜色
//
// UIBezierPath* path1 = [UIBezierPath bezierPath];
// path1.lineWidth = 1.0;
//
// path1.lineCapStyle = kCGLineCapRound; //线条拐角
// path1.lineJoinStyle = kCGLineJoinRound; //终点处理
// // Draw the lines
// for (int i=0; i<self.line2.count; i++) {
// NSString* p=self.line2[i];
// if (i==0) {
// [path1 moveToPoint:CGPointFromString(p)];//起点
// }
// [path1 addLineToPoint:CGPointFromString(p)];
// }
// [path closePath];//第五条线通过调用closePath方法得到的
// [path stroke];//Draws line 根据坐标点连线
// CGFloat dashPattern[] = {3,1};// 3实线，1空白
// [path1 setLineDash:dashPattern count:1 phase:1];
// [path1 stroke];//颜色填充
//添加坐标点
// for (int i=0; i<self.line1.count; i++) {
//
// NSString* p=self.line2[i];
// CGPoint point=CGPointFromString(p);
// UIBezierPath *path01 = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(point.x-1, point.y-1, 2, 2) cornerRadius:1];
// [path01 stroke];
// [path01 fill];
//
// }
}
/**
** lineView: 需要绘制成虚线的view

18
Ifish/controllers/HotBar/Views/IfishHistoryView.m
View File

@ -18,9 +18,6 @@ Strong UIView *bgView;
Strong IfishChatView *chartView;
Strong IfishChatView *chartHolder;
Strong UILabel *titleLabel;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *chartHeight;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *chartWidth;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *lableHeight;
Strong UIButton *predayButton;
Strong UIButton *nextdayButton;
Strong UIImageView *bgImage;
@ -71,6 +68,7 @@ Strong UIImageView *bgImage;
- (IfishChatView *)chartHolder{
if (!_chartHolder) {
_chartHolder = InitObject(IfishChatView);
_chartHolder.backgroundColor = [UIColor clearColor];
}
return _chartHolder;
}
@ -112,7 +110,7 @@ Strong UIImageView *bgImage;
}];
[self.bgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo(315);
make.width.mas_equalTo(kSizeFrom750(720));
make.center.mas_equalTo(self);
}];
@ -125,25 +123,25 @@ Strong UIImageView *bgImage;
[self.bgImage mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(8);
make.centerX.width.mas_equalTo(self.bgView);
make.height.mas_equalTo(147);
make.height.mas_equalTo(kSizeFrom750(335));
make.bottom.mas_equalTo(self.bgView.mas_bottom).offset(-10);
}];
[self.chartHolder mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.left.width.mas_equalTo(self.bgImage);
make.height.mas_equalTo(130);
make.height.mas_equalTo(kSizeFrom750(260));
}];
[self.predayButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(10);
make.height.mas_equalTo(30);
make.width.mas_equalTo(60);
make.left.mas_equalTo(kSizeFrom750(20));
make.height.mas_equalTo(kSizeFrom750(60));
make.width.mas_equalTo(kSizeFrom750(120));
make.bottom.mas_equalTo(self.bgView.mas_bottom);
}];
[self.nextdayButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.height.centerY.mas_equalTo(self.predayButton);
make.right.mas_equalTo(-20);
make.right.mas_equalTo(-kSizeFrom750(40));
}];
[self.bgImage layoutIfNeeded];

113
Ifish/controllers/HotBar/Views/IfishHistoryView.xib
View File

@ -1,113 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB" customClass="IfishHistoryView">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="69h-Z5-zDB">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<connections>
<action selector="clickBg:" destination="iN0-l3-epB" eventType="touchUpInside" id="d08-z9-v9h"/>
</connections>
</button>
<view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gCt-ke-ZyH">
<rect key="frame" x="10" y="164.5" width="355" height="338"/>
<subviews>
<button opaque="NO" tag="10" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Wvo-bU-MzQ">
<rect key="frame" x="10" y="300" width="40" height="28"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<state key="normal" title="前一天">
<color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
</state>
<connections>
<action selector="clickBottomBar:" destination="iN0-l3-epB" eventType="touchUpInside" id="PKC-QD-Ler"/>
</connections>
</button>
<button opaque="NO" tag="11" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="867-ay-tug">
<rect key="frame" x="265" y="300" width="40" height="28"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<state key="normal" title="后一天">
<color key="titleColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state>
<connections>
<action selector="clickBottomBar:" destination="iN0-l3-epB" eventType="touchUpInside" id="ULN-iZ-cCh"/>
</connections>
</button>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="history_bg" translatesAutoresizingMaskIntoConstraints="NO" id="KOt-M2-Dd2">
<rect key="frame" x="0.0" y="10" width="315" height="270"/>
</imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Qbs-BN-bJI" customClass="IfishChatView">
<rect key="frame" x="0.0" y="10" width="315" height="270"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dIS-Dw-qe1">
<rect key="frame" x="157.5" y="4" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="dIS-Dw-qe1" firstAttribute="centerX" secondItem="Qbs-BN-bJI" secondAttribute="centerX" id="QUF-1r-EB5"/>
<constraint firstItem="dIS-Dw-qe1" firstAttribute="top" secondItem="Qbs-BN-bJI" secondAttribute="top" constant="4" id="YmV-Oy-7IE"/>
<constraint firstAttribute="width" constant="315" id="dn1-rH-AVD"/>
<constraint firstAttribute="height" constant="270" id="lEF-HT-pRo"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="图表中温度，流量为0或不存在时图表中不体现" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gwB-Ff-4Go">
<rect key="frame" x="52" y="288" width="211" height="12"/>
<fontDescription key="fontDescription" type="system" pointSize="10"/>
<color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="338" id="8aC-Rs-V2O"/>
<constraint firstItem="KOt-M2-Dd2" firstAttribute="width" secondItem="Qbs-BN-bJI" secondAttribute="width" id="DNE-3F-DGX"/>
<constraint firstItem="gwB-Ff-4Go" firstAttribute="centerX" secondItem="gCt-ke-ZyH" secondAttribute="centerX" id="G61-Vc-66t"/>
<constraint firstAttribute="trailing" secondItem="867-ay-tug" secondAttribute="trailing" constant="10" id="Hi9-fm-dyZ"/>
<constraint firstItem="Qbs-BN-bJI" firstAttribute="top" secondItem="gCt-ke-ZyH" secondAttribute="top" constant="10" id="MgW-4X-UWJ"/>
<constraint firstItem="Qbs-BN-bJI" firstAttribute="centerX" secondItem="gCt-ke-ZyH" secondAttribute="centerX" id="Sfh-QT-Pn4"/>
<constraint firstAttribute="bottom" secondItem="Wvo-bU-MzQ" secondAttribute="bottom" constant="10" id="VlT-ro-Gad"/>
<constraint firstItem="gwB-Ff-4Go" firstAttribute="top" secondItem="Qbs-BN-bJI" secondAttribute="bottom" constant="8" id="c6L-8J-cWA"/>
<constraint firstItem="KOt-M2-Dd2" firstAttribute="height" secondItem="Qbs-BN-bJI" secondAttribute="height" id="dld-AE-g6d"/>
<constraint firstItem="Wvo-bU-MzQ" firstAttribute="leading" secondItem="gCt-ke-ZyH" secondAttribute="leading" constant="10" id="e1d-jF-7D0"/>
<constraint firstAttribute="width" constant="315" id="gGB-dF-pUn"/>
<constraint firstItem="KOt-M2-Dd2" firstAttribute="centerX" secondItem="Qbs-BN-bJI" secondAttribute="centerX" id="kVe-Gj-il4"/>
<constraint firstItem="KOt-M2-Dd2" firstAttribute="top" secondItem="Qbs-BN-bJI" secondAttribute="top" id="sZQ-CQ-LGw"/>
<constraint firstAttribute="bottom" secondItem="867-ay-tug" secondAttribute="bottom" constant="10" id="ySi-fC-9Of"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.20994755993150685" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="gCt-ke-ZyH" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="3wc-85-00z"/>
<constraint firstAttribute="bottom" secondItem="69h-Z5-zDB" secondAttribute="bottom" id="8ZV-V1-tgA"/>
<constraint firstItem="69h-Z5-zDB" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="OcJ-PS-bmM"/>
<constraint firstAttribute="trailing" secondItem="69h-Z5-zDB" secondAttribute="trailing" id="TYK-Fj-3Kv"/>
<constraint firstItem="69h-Z5-zDB" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="lLw-5d-kFj"/>
</constraints>
<connections>
<outlet property="bgView" destination="gCt-ke-ZyH" id="iMM-jo-xud"/>
<outlet property="chartHolder" destination="Qbs-BN-bJI" id="FDp-Om-vbH"/>
<outlet property="curDatetitle" destination="dIS-Dw-qe1" id="brm-O7-fOG"/>
</connections>
<point key="canvasLocation" x="-102" y="120"/>
</view>
</objects>
<resources>
<image name="history_bg" width="526" height="453.5"/>
</resources>
</document>

224
Ifish/controllers/IfishTabControllers/消息/PushMasssageWebViewController.m
View File

@ -9,14 +9,16 @@
#import "PushMasssageWebViewController.h"
#import <WebKit/WebKit.h>
#import <MediaPlayer/MediaPlayer.h>
#import "NJKWebViewProgressView.h"
#import "NJKWebViewProgress.h"
@interface PushMasssageWebViewController ()<NJKWebViewProgressDelegate,UIWebViewDelegate>
//#import "NJKWebViewProgressView.h"
//#import "NJKWebViewProgress.h"
@interface PushMasssageWebViewController ()<WKUIDelegate,WKNavigationDelegate>
{
NJKWebViewProgressView *_progressView;
NJKWebViewProgress *_progressProxy;
// NJKWebViewProgressView *_progressView;
// NJKWebViewProgress *_progressProxy;
}
@property(nonatomic,strong)UIWebView*myWebView;
//@property(nonatomic,strong)UIWebView*myWebView;
Strong WKWebView *webView;
Strong UIProgressView *wkProgressView;
@property(nonatomic,strong)UIActivityIndicatorView*indicator;
@end
@ -28,7 +30,7 @@
// Do any additional setup after loading the view.
[self addTitleViewWithTitle:self.pushtitle];
[self creatwebView];
[self creatWkwebView];
[self.navigationController.navigationBar setBackgroundImage:[UIImage imageNamed:@"blackbar.png"] forBarMetrics:UIBarMetricsDefault];
if ([self.navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)])
@ -58,32 +60,60 @@
}
-(void)initWebView
{
self.myWebView=[[UIWebView alloc]initWithFrame:self.view.bounds];
NSString*filepath=[[NSBundle mainBundle]pathForResource:@"shuomingshu" ofType:@"html"];
NSString*html=[NSString stringWithContentsOfFile:filepath encoding:NSUTF8StringEncoding error:nil];
[self.myWebView loadHTMLString:html baseURL:[NSURL URLWithString:filepath]];
[self.view addSubview:self.myWebView];
}
//-(void)initWebView
//{
// self.myWebView=[[UIWebView alloc]initWithFrame:self.view.bounds];
// NSString*filepath=[[NSBundle mainBundle]pathForResource:@"shuomingshu" ofType:@"html"];
// NSString*html=[NSString stringWithContentsOfFile:filepath encoding:NSUTF8StringEncoding error:nil];
//
// [self.myWebView loadHTMLString:html baseURL:[NSURL URLWithString:filepath]];
//
// [self.view addSubview:self.myWebView];
//
//}
#pragma mark - WKWeb IOS 8之后用
-(void)creatWkwebView
{
WKWebView *webView = [[WKWebView alloc] initWithFrame:self.view.bounds];
//NSString*url=[NSString stringWithFormat:@"http://www.baidu.com"];
//NSURLRequest*requst=[NSURLRequest requestWithURL:[NSURL URLWithString:url]];
NSURLRequest*requst=[NSURLRequest requestWithURL:[NSURL URLWithString:self.pushlink]];
[webView loadRequest:requst];
[self.view addSubview:webView];
//webView.navigationDelegate = self;
self.webView = [[WKWebView alloc]init];
self.webView.UIDelegate = self;
self.webView.navigationDelegate = self;
[self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:self.pushlink]]];
[self.view addSubview:self.webView];
self.wkProgressView = [[UIProgressView alloc]initWithFrame:CGRectMake(0, 0, CGRectGetWidth(self.view.frame), 2)];
self.wkProgressView.progressTintColor = [UIColor greenColor];
[self.view addSubview:self.wkProgressView];
// 给webview添加监听
[self.webView addObserver:self forKeyPath:@"estimatedProgress" options:NSKeyValueObservingOptionOld | NSKeyValueObservingOptionNew context:nil];
[self.webView mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.mas_equalTo(self.view);
}];
}
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context{
if ([keyPath isEqual:@"estimatedProgress"] && object == self.webView) {
[self.wkProgressView setAlpha:1.0f];
[self.wkProgressView setProgress:self.webView.estimatedProgress animated:YES];
if (self.webView.estimatedProgress >= 1.0f) {
[UIView animateWithDuration:0.3 delay:0.3 options:UIViewAnimationOptionCurveEaseOut animations:^{
[self.wkProgressView setAlpha:0.0f];
} completion:^(BOOL finished) {
[self.wkProgressView setProgress:0.0f animated:YES];
}];
}
}else{
[super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
}
}
- (void)dealloc{
[self.webView removeObserver:self forKeyPath:@"estimatedProgress"];
[self.webView setNavigationDelegate:nil];
[self.webView setUIDelegate:nil];
}
// 页面开始加载时调用
- (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation
{
@ -109,84 +139,84 @@
[super viewDidDisappear:animated];
}
-(void)viewWillAppear:(BOOL)animated{
[super viewWillAppear:animated];
[self.navigationController.navigationBar addSubview:_progressView];
}
-(void)viewWillDisappear:(BOOL)animated{
[super viewWillDisappear:animated];
[_progressView removeFromSuperview];
}
//-(void)viewWillAppear:(BOOL)animated{
//
// [super viewWillAppear:animated];
// [self.navigationController.navigationBar addSubview:_progressView];
//}
//
//-(void)viewWillDisappear:(BOOL)animated{
// [super viewWillDisappear:animated];
// [_progressView removeFromSuperview];
//
//}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
}
-(void)creatwebView{
self.myWebView.opaque=NO;
self.myWebView.backgroundColor=[UIColor clearColor];
self.myWebView=[[UIWebView alloc]initWithFrame:self.view.bounds];
[self.view addSubview:self.myWebView];
//self.myWebView.delegate=self;
_progressProxy = [[NJKWebViewProgress alloc] init]; // instance variable
self.myWebView.delegate = _progressProxy;
_progressProxy.webViewProxyDelegate = self;
_progressProxy.progressDelegate = self;
CGFloat progressBarHeight = 2.f;
CGRect navigationBarBounds = self.navigationController.navigationBar.bounds;
CGRect barFrame = CGRectMake(0, navigationBarBounds.size.height - progressBarHeight, navigationBarBounds.size.width, progressBarHeight);
_progressView = [[NJKWebViewProgressView alloc] initWithFrame:barFrame];
_progressView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin;
NSURLRequest*requst=[NSURLRequest requestWithURL:[NSURL URLWithString:self.pushlink]];
//NSString*url=[NSString stringWithFormat:@"https://bg.zhangxinyanv5.top/ueditorHtml/1484032071200.html"];
//NSURLRequest*requst=[NSURLRequest requestWithURL:[NSURL URLWithString:url]];
[self.myWebView loadRequest:requst];
}
-(void)webViewDidStartLoad:(UIWebView *)webView{
[_indicator startAnimating];
}
-(void)webViewDidFinishLoad:(UIWebView *)webView{
[_indicator stopAnimating];
}
-(void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error{
[_indicator stopAnimating];
}
-(void)initIndicatorView{
_indicator=[[UIActivityIndicatorView alloc]initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge];
_indicator.frame=CGRectMake(0.f,0.f,100.f, 100.f);
_indicator.backgroundColor=[UIColor colorWithRed:0 green:0 blue:0 alpha:0.5];
_indicator.center=self.view.center;
_indicator.layer.masksToBounds=YES;
_indicator.layer.cornerRadius=5;
[self.view addSubview:_indicator];
}
#pragma mark - NJKWebViewProgressDelegate
-(void)webViewProgress:(NJKWebViewProgress *)webViewProgress updateProgress:(float)progress
{
[_progressView setProgress:progress animated:YES];
//self.title = [self.myWebView stringByEvaluatingJavaScriptFromString:@"document.title"];
}
//-(void)creatwebView{
//
// self.myWebView.opaque=NO;
// self.myWebView.backgroundColor=[UIColor clearColor];
// self.myWebView=[[UIWebView alloc]initWithFrame:self.view.bounds];
// [self.view addSubview:self.myWebView];
//
// //self.myWebView.delegate=self;
//
// _progressProxy = [[NJKWebViewProgress alloc] init]; // instance variable
// self.myWebView.delegate = _progressProxy;
// _progressProxy.webViewProxyDelegate = self;
// _progressProxy.progressDelegate = self;
// CGFloat progressBarHeight = 2.f;
// CGRect navigationBarBounds = self.navigationController.navigationBar.bounds;
// CGRect barFrame = CGRectMake(0, navigationBarBounds.size.height - progressBarHeight, navigationBarBounds.size.width, progressBarHeight);
// _progressView = [[NJKWebViewProgressView alloc] initWithFrame:barFrame];
// _progressView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin;
//
// NSURLRequest*requst=[NSURLRequest requestWithURL:[NSURL URLWithString:self.pushlink]];
//
// //NSString*url=[NSString stringWithFormat:@"https://bg.zhangxinyanv5.top/ueditorHtml/1484032071200.html"];
// //NSURLRequest*requst=[NSURLRequest requestWithURL:[NSURL URLWithString:url]];
// [self.myWebView loadRequest:requst];
//
//
//}
//
//-(void)webViewDidStartLoad:(UIWebView *)webView{
//
// [_indicator startAnimating];
//
//}
//-(void)webViewDidFinishLoad:(UIWebView *)webView{
//
// [_indicator stopAnimating];
//
//}
//-(void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error{
//
// [_indicator stopAnimating];
//}
//
//-(void)initIndicatorView{
//
// _indicator=[[UIActivityIndicatorView alloc]initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge];
// _indicator.frame=CGRectMake(0.f,0.f,100.f, 100.f);
// _indicator.backgroundColor=[UIColor colorWithRed:0 green:0 blue:0 alpha:0.5];
// _indicator.center=self.view.center;
// _indicator.layer.masksToBounds=YES;
// _indicator.layer.cornerRadius=5;
// [self.view addSubview:_indicator];
//
//}
//
//#pragma mark - NJKWebViewProgressDelegate
//-(void)webViewProgress:(NJKWebViewProgress *)webViewProgress updateProgress:(float)progress
//{
// [_progressView setProgress:progress animated:YES];
// //self.title = [self.myWebView stringByEvaluatingJavaScriptFromString:@"document.title"];
//}

9
Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m
View File

@ -98,8 +98,6 @@
@property(nonatomic,strong) RusunHaveHeateSetViewController *rusunSet;
@property(nonatomic,strong) RunSun84CHSetViewController *rusun84Set;
@property (nonatomic, strong) RuiMeiSetViewController *ruimeiSet;
//@property(nonatomic,strong) DXPopover *popover;
//@property(nonatomic,strong) LXPopView *popView;
Strong MessageAlertView *popView;
@property(nonatomic,strong) UIButton *rightPopButton;
@property (nonatomic,strong) SetNameTextViewController *setNameVC;
@ -110,7 +108,6 @@ Strong MessageAlertView *popView;
@property(nonatomic,strong) HaveHotCoolWenDuPicview *xuanduoPicView;
Weak UIView *remoteView;//显示player的载体
Strong UIImage *screenShotImage;//截图
@end
extern BOOL formLogIn;//连接页面是否来自登录界面
BOOL isfromCameraView;//未绑定鱼缸时，去绑定鱼缸 判断是否从摄像头界面进入
@ -128,6 +125,7 @@ Strong UIImage *screenShotImage;//截图
-(void)viewWillAppear:(BOOL)animated{
[super viewWillAppear:animated];
//跳转到录制界面会将cameraHViewDelegate 置nil
_bottomToolHView.cameraHViewDelegate=self;
//扫码激活用 更新isActive
@ -145,7 +143,6 @@ Strong UIImage *screenShotImage;//截图
_isCanAutoOrientation = YES;
//设置默认竖屏
[[AppDelegate sharedDefault] application:[UIApplication sharedApplication] supportedInterfaceOrientationsForWindow:[AppDelegate sharedDefault].window];
[self.view hideToast];
//先判断是否授权
if (!self.contact.isActive) {
@ -200,6 +197,7 @@ Strong UIImage *screenShotImage;//截图
-(void)viewWillDisappear:(BOOL)animated{
[super viewWillDisappear:animated];
[self.view hideToast];//隐藏所有弹出框
//屏幕长亮关闭
[[ UIApplication sharedApplication] setIdleTimerDisabled:NO];
@ -215,7 +213,6 @@ Strong UIImage *screenShotImage;//截图
}
[self.player p2pStop];
[[NSNotificationCenter defaultCenter] removeObserver:self name:RECEIVE_REMOTE_MESSAGE object:nil];
[self.bottomToolHView removeObViserFromSelf];
}
- (void)dealloc {
@ -344,6 +341,7 @@ Strong UIImage *screenShotImage;//截图
_isReject=YES;
NSLog(@"摄像头连接失败");
dispatch_async(dispatch_get_main_queue(), ^{
[self.view hideToast];
[self.view makeToast:@"连接失败"];
[self hiddenMonitoringUI:NO callWithErrorType:(NSInteger)error isReCall:NO];
});
@ -2738,6 +2736,7 @@ Strong UIImage *screenShotImage;//截图
[self.canvasView bringSubviewToFront:self.promptButton];
}
}
/*
GWP2PCallErrorNone = 0, //0无原因

4
Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishcameraBottomHView/CameraBottomHView.h
View File

@ -19,8 +19,4 @@
@property (strong, nonatomic) MBProgressHUD *progressAlert;
@property (nonatomic,strong) IfishCameraModel *camera;
-(void)removeObViserFromSelf;
-(void)addObViserFromSelf;
@end

16
Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishcameraBottomHView/CameraBottomHView.m
View File

@ -28,10 +28,8 @@ static NSString *bootomRecCellIdentifier = @"IfishRecVideoViewCell";
- (instancetype)initWithFrame:(CGRect)frame {
self = [super initWithFrame:frame];
if (self) {
//[self addObViserFromSelf];
[self setCollectionFrame:frame];
}
return self;
}
@ -39,26 +37,12 @@ static NSString *bootomRecCellIdentifier = @"IfishRecVideoViewCell";
-(void)dealloc{
//[[NSNotificationCenter defaultCenter] removeObserver:self name:ACK_RECEIVE_REMOTE_MESSAGE object:nil];
// [[NSNotificationCenter defaultCenter] removeObserver:self name:RECEIVE_REMOTE_MESSAGE object:nil];
if (_progressAlert) {
_progressAlert =nil;
}
}
-(void)removeObViserFromSelf{
////录制回放功能打开
// [[NSNotificationCenter defaultCenter] removeObserver:self name:ACK_RECEIVE_REMOTE_MESSAGE object:nil];
//[[NSNotificationCenter defaultCenter] removeObserver:self name:RECEIVE_REMOTE_MESSAGE object:nil];
}
-(void)addObViserFromSelf{
//[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(ack_receiveRemoteMessage:) name:ACK_RECEIVE_REMOTE_MESSAGE object:nil];
//[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveRemoteMessage:) name:RECEIVE_REMOTE_MESSAGE object:nil];
}
-(void)setCollectionFrame:(CGRect)frame{

3
Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm
View File

@ -741,7 +741,8 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) {
}
//存储摄像头设备关系数组
[[DataCenter defaultDtacenter]setValue:devicamerArr forKey:@"devicamerArr"];
//添加设备之后，先断开device连接，之后进入摄像头页面再重新添加链接
[[GWP2PClient sharedClient] disconnect];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
IfishP2PMonitorController *monitorVC=[[IfishP2PMonitorController alloc] init];
monitorVC.contact = cameraMdel;

23
Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m
View File

@ -22,6 +22,7 @@
@property (strong, nonatomic) IBOutletCollection(UIImageView) NSArray *dashView;
@property (weak, nonatomic) IBOutlet UITextField *pwdTf;
@property (weak, nonatomic) IBOutlet UIView *containerView;
@property (weak, nonatomic) IBOutlet UITextField *wifiNameTextField;
@property (nonatomic, strong) ESPTouchTask* epTask;
@ -43,6 +44,8 @@
@property (nonatomic, assign) NSInteger retryTimes;
Copy NSString *wifiName;//当前wifi名称
@end
@implementation ConnectHotpotViewController
@ -72,8 +75,26 @@
UIBarButtonItem * backItem=[[UIBarButtonItem alloc] initWithCustomView:back];
self.navigationItem.leftBarButtonItem=backItem;
NSDictionary *wifiDic = [self fetchSSIDInfo];
NSString *wifiName = [wifiDic objectForKey:@"SSID"];
self.wifiNameTextField.text = wifiName;
}
//获取当前链接WiFi信息
- (id)fetchSSIDInfo
{
NSArray *ifs = (id)CFBridgingRelease(CNCopySupportedInterfaces());
NSLog(@"%s: Supported interfaces: %@", __func__, ifs);
id info = nil;
for (NSString *ifnam in ifs) {
info = (id)CFBridgingRelease(CNCopyCurrentNetworkInfo((CFStringRef)ifnam));
if (info && [info count]) {
break;
}
}
return info ;
}
-(void)clickBack{
[self.navigationController popViewControllerAnimated:YES];
}

31
Ifish/controllers/leftcontrollers/ConnectHotpotViewController.xib
View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@ -16,6 +16,7 @@
<outlet property="pwdTf" destination="kiH-bp-24Q" id="PIU-eW-NJW"/>
<outlet property="scrollView" destination="rVr-h5-uWd" id="xVI-ZH-ZBs"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
<outlet property="wifiNameTextField" destination="APB-5y-OkX" id="wmR-M6-TZY"/>
<outletCollection property="dashView" destination="g0t-sG-8Wn" id="LZL-DB-Zre"/>
<outletCollection property="dashView" destination="qEQ-pQ-mfJ" id="oNj-aK-CHc"/>
</connections>
@ -29,7 +30,7 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1Km-pH-09L">
<rect key="frame" x="0.0" y="35" width="375" height="251.5"/>
<rect key="frame" x="0.0" y="35" width="375" height="251"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="YQa-dk-iMD">
<rect key="frame" x="21" y="20" width="16" height="16"/>
@ -39,38 +40,38 @@
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="热点连接" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QfU-Iw-5Wj">
<rect key="frame" x="50" y="18.5" width="69.5" height="20.5"/>
<rect key="frame" x="50" y="18" width="69.5" height="20.5"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="g0t-sG-8Wn" customClass="UIImageView">
<rect key="frame" x="38" y="61" width="299" height="1"/>
<rect key="frame" x="38" y="60.5" width="299" height="1"/>
<color key="backgroundColor" red="0.77127617390000003" green="0.77127617390000003" blue="0.77127617390000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="Gkj-Pr-nXo"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请将手机连接至wifi:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kGw-DQ-YIO">
<rect key="frame" x="50" y="78" width="135" height="18"/>
<rect key="frame" x="50" y="77.5" width="135" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="连接说明书，请" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dSQ-fr-q0c">
<rect key="frame" x="50" y="109" width="107.5" height="18"/>
<rect key="frame" x="50" y="108.5" width="107.5" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ifish-xxxx" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dDg-6q-BXw">
<rect key="frame" x="193" y="78.5" width="62" height="17"/>
<rect key="frame" x="193" y="78" width="62" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WQq-Kn-abo">
<rect key="frame" x="157.5" y="103.5" width="72" height="29"/>
<rect key="frame" x="157.5" y="103" width="72" height="29"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<state key="normal" title="点击此处。"/>
<connections>
@ -78,26 +79,26 @@
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qEQ-pQ-mfJ" customClass="UIImageView">
<rect key="frame" x="38" y="148.5" width="299" height="1"/>
<rect key="frame" x="38" y="148" width="299" height="1"/>
<color key="backgroundColor" red="0.77127617390000003" green="0.77127617390000003" blue="0.77127617390000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="hPn-jR-jsT"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="路由器名称" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="63z-z9-F6B">
<rect key="frame" x="50" y="179.5" width="76.5" height="18"/>
<rect key="frame" x="50" y="179" width="76.5" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="路由器密码" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="svD-TG-gy8">
<rect key="frame" x="50" y="213.5" width="76.5" height="18"/>
<rect key="frame" x="50" y="213" width="76.5" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="APB-5y-OkX">
<rect key="frame" x="134.5" y="175" width="188.5" height="28"/>
<rect key="frame" x="134.5" y="174" width="188.5" height="28"/>
<color key="backgroundColor" red="0.77127617390000003" green="0.77127617390000003" blue="0.77127617390000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="28" id="reY-Lx-dbw"/>
@ -110,7 +111,7 @@
</connections>
</textField>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="kiH-bp-24Q">
<rect key="frame" x="134.5" y="209" width="188.5" height="28"/>
<rect key="frame" x="134.5" y="208" width="188.5" height="28"/>
<color key="backgroundColor" red="0.77127617390000003" green="0.77127617390000003" blue="0.77127617390000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="textColor"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
@ -155,7 +156,7 @@
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mTK-j3-V77">
<rect key="frame" x="36" y="304.5" width="303" height="30"/>
<rect key="frame" x="36" y="304" width="303" height="30"/>
<color key="backgroundColor" red="0.082352941176470587" green="0.66274509803921566" blue="0.92156862745098034" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="8Ra-AW-7XB"/>