说明书更改为内置图片，微信登陆时更换手机号加强验证

Ifish.xcodeproj/project.pbxproj

@@ -15777,7 +15777,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = WFX8GD5HFX;
 				ENABLE_BITCODE = NO;
 				ENABLE_TESTABILITY = YES;
@@ -15852,7 +15852,7 @@
 					"$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/libAVCtrl",
 					"$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrl",
 				);
-				MARKETING_VERSION = 5.1.7;
+				MARKETING_VERSION = 5.1.8;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"-ObjC",
@@ -15895,7 +15895,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = WFX8GD5HFX;
 				ENABLE_BITCODE = NO;
 				ENABLE_TESTABILITY = YES;
@@ -15970,7 +15970,7 @@
 					"$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrlIOS/libAVCtrl",
 					"$(PROJECT_DIR)/Ifish/controllers/IfishYooseeFile/IfishYsooseeNewLib/libAVCtrl",
 				);
-				MARKETING_VERSION = 5.1.7;
+				MARKETING_VERSION = 5.1.8;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"-ObjC",

Ifish/Assets.xcassets/Contents.json

@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
+    "author" : "xcode",
-    "author" : "xcode"
+    "version" : 1
   }
-}
+}

Ifish/Assets.xcassets/说明书/CW2.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "CW2.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Ifish/Assets.xcassets/说明书/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Ifish/Assets.xcassets/说明书/HX-WY01.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "HX-WY01.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Ifish/Assets.xcassets/说明书/SW10.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "SW10.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Ifish/Assets.xcassets/说明书/SW7.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "SW7.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Ifish/Assets.xcassets/说明书/cameraInfo.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "cameraInfo.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Ifish/Assets.xcassets/说明书/failreason.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "failreason.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Ifish/Assets.xcassets/说明书/instruction.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "instruction.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Ifish/Assets.xcassets/说明书/sw1.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "sw1.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Ifish/Utinitys/IfishHttpRequest/IfishUserDataUnity.m

@@ -14,6 +14,8 @@
 #import "IfishLoadingWebViewController.h"
 #import "IfishADTimerViewController.h"
 #import "RegistViewController.h"
+#import "InfoByImageViewController.h"
+
 @implementation IfishUserDataUnity
 
 +(IfishUserDataUnity*)shareDataInstance
@@ -147,9 +149,15 @@
                         // }];
                         IfishMianTabViewController *mianVC=[[IfishMianTabViewController alloc] init];
                         [UIApplication sharedApplication].delegate.window.rootViewController=mianVC;
-                        IfishLoadingWebViewController *pushVC = [[IfishLoadingWebViewController alloc] init];
+//                        IfishLoadingWebViewController *pushVC = [[IfishLoadingWebViewController alloc] init];
-                        pushVC.pushlink = IFISH_DEVCEITROURL;
+//                        pushVC.pushlink = IFISH_DEVCEITROURL;
-                        [mianVC.navigationController pushViewController:pushVC animated:YES];
+//                        [mianVC.navigationController pushViewController:pushVC animated:YES];
+                        
+                        InfoByImageViewController*info=[[InfoByImageViewController alloc]init];
+                        info.title=NSLocalizedString(@"ifish_deviceuse", nil);;;
+                        info.type=@"instruction";
+                        info.image=[UIImage imageNamed:@"instruction"];
+                        [mianVC.navigationController pushViewController:info animated:YES];
                         
                     }
                         break;

Ifish/controllers/IfishTabControllers/我的/mineControllers/IfishMeViewController.h

@@ -7,6 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
+#import "InfoByImageViewController.h"
 
 @interface IfishMeViewController : UIViewController
 

Ifish/controllers/IfishTabControllers/我的/mineControllers/IfishMeViewController.m

@@ -535,7 +535,16 @@
 //        webVC.pushtitle = NSLocalizedString(@"ifish_deviceuse", nil);
 //        [self.navigationController pushViewController:webVC animated:YES];
 //        self.hidesBottomBarWhenPushed = NO;
-        [[UIApplication sharedApplication] openURL:[NSURL URLWithString:IFISH_DEVCEITROURL]];
+      //  [[UIApplication sharedApplication] openURL:[NSURL URLWithString:IFISH_DEVCEITROURL]];
+        
+        self.hidesBottomBarWhenPushed = YES;
+        InfoByImageViewController*info=[[InfoByImageViewController alloc]init];
+        info.title=NSLocalizedString(@"ifish_deviceuse", nil);;;
+        info.type=@"instruction";
+        info.image=[UIImage imageNamed:@"instruction"];
+        [self.navigationController pushViewController:info animated:YES];
+        self.hidesBottomBarWhenPushed = NO;
+
         
     }else if (indexPath.section == 3 && indexPath.row == 2){
         //联系我们

Ifish/controllers/IfishTabControllers/我的/mineControllers/InfoByImageViewController.h

@@ -11,6 +11,8 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface InfoByImageViewController : BaseViewController
+@property (nonatomic, strong) UIScrollView *scrollView;
+
 @property (nonatomic, strong) UIImageView *imageView;
 @property (nonatomic, strong) UIImage *image;
 @property (nonatomic, strong) NSString *type;

Ifish/controllers/IfishTabControllers/我的/mineControllers/InfoByImageViewController.m

@@ -17,17 +17,48 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
+    
+    self.scrollView=[[UIScrollView alloc]initWithFrame:CGRectZero];
+    //self.scrollView.clipsToBounds=YES;
     self.imageView=[[UIImageView alloc]initWithFrame:CGRectZero];
-    [self.view addSubview:self.imageView];
+   // self.imageView.contentMode=UIViewContentModeCenter;
+    [self.scrollView addSubview:self.imageView];
+    //self.scrollView.scrollEnabled=NO;
+    [self.view addSubview:self.scrollView];
+    self.imageView.userInteractionEnabled=YES;
+    [ self.scrollView mas_makeConstraints:^(MASConstraintMaker *make) {
+         make.left.mas_equalTo(0);
+                 make.top.mas_equalTo(0);
+                 make.bottom.mas_equalTo(0);
+                 make.right.mas_equalTo(0);
+    }];
+    CGFloat imageHeight=kScreenHeight-TOP_HEIGHT;
+    CGFloat imageWidth=kScreenWidth;
+    
+    CGFloat ratio=imageWidth/imageHeight;
+    if (self.image)
+    {
+        ratio=self.image.size.width/self.image.size.height;
+    }
+    
+    imageHeight=imageWidth/ratio;
+    
+    self.scrollView.contentSize=CGSizeMake(imageWidth, imageHeight);
+    
    [ self.imageView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.mas_equalTo(0);
+        make.left.mas_equalTo(self.scrollView);
-                make.top.mas_equalTo(0);
+                make.top.mas_equalTo(self.scrollView);
-                make.bottom.mas_equalTo(0);
+                make.height.mas_equalTo(imageHeight);
-                make.right.mas_equalTo(0);
+                make.width.mas_equalTo(imageWidth);
+               // make.right.mas_equalTo(self.view);
+       
    }];
+    
+    
     if (self.image)
     {
         self.imageView.image=self.image;
+       
     }
     if (self.title)
     {
@@ -36,12 +67,12 @@
     if ([self.type isEqualToString:@"service"])
     {
         UIButton*xuanduo=[UIButton buttonWithType:UIButtonTypeSystem];
-        [self.view addSubview:xuanduo];
+        [self.imageView addSubview:xuanduo];
         [xuanduo mas_makeConstraints:^(MASConstraintMaker *make) {
             
             make.left.mas_equalTo(0);
             make.top.mas_equalTo(0);
-            make.height.mas_equalTo(self.view.frame.size.height/12);
+            make.height.mas_equalTo(imageHeight/12);
             make.right.mas_equalTo(0);
 
         }];
@@ -53,12 +84,12 @@
         
         
         UIButton*reuxin=[UIButton buttonWithType:UIButtonTypeSystem];
-        [self.view addSubview:reuxin];
+        [self.imageView addSubview:reuxin];
         [reuxin mas_makeConstraints:^(MASConstraintMaker *make) {
             
             make.left.mas_equalTo(0);
-            make.top.mas_equalTo(4*self.view.frame.size.height/12-25);
+            make.top.mas_equalTo(4*imageHeight/12);
-            make.height.mas_equalTo(self.view.frame.size.height/12);
+            make.height.mas_equalTo(imageHeight/12);
             make.right.mas_equalTo(0);
 
         }];
@@ -68,12 +99,13 @@
         
         
         UIButton*songnuo=[UIButton buttonWithType:UIButtonTypeSystem];
-        [self.view addSubview:songnuo];
+
+        [self.imageView addSubview:songnuo];
         [songnuo mas_makeConstraints:^(MASConstraintMaker *make) {
             
             make.left.mas_equalTo(0);
-            make.top.mas_equalTo(8*self.view.frame.size.height/12-25);
+            make.top.mas_equalTo(8*imageHeight/12);
-            make.height.mas_equalTo(self.view.frame.size.height/12);
+            make.height.mas_equalTo(imageHeight/12);
             make.right.mas_equalTo(0);
 
         }];
@@ -82,8 +114,153 @@
         [songnuo addTarget:self action:@selector(service:) forControlEvents:UIControlEventTouchUpInside];
 
     }
+    else  if ([self.type isEqualToString:@"instruction"])//详细说明书
+    {
+        UIButton*camera=[UIButton buttonWithType:UIButtonTypeSystem];
+        [self.imageView addSubview:camera];
+        [camera mas_makeConstraints:^(MASConstraintMaker *make) {
+            
+            make.left.mas_equalTo(0);
+            make.top.mas_equalTo(0);
+            make.height.mas_equalTo(imageHeight/7);
+            make.right.mas_equalTo(0);
+
+        }];
+        camera.tag=1;
+        camera.backgroundColor=[UIColor clearColor];
+        [camera addTarget:self action:@selector(instruction:) forControlEvents:UIControlEventTouchUpInside];
+        
+        
+        UIButton*senven=[UIButton buttonWithType:UIButtonTypeSystem];
+        [self.imageView addSubview:senven];
+        [senven mas_makeConstraints:^(MASConstraintMaker *make) {
+            
+            make.left.mas_equalTo(0);
+            make.top.mas_equalTo(imageHeight/7);
+            make.height.mas_equalTo(1*imageHeight/7);
+            make.right.mas_equalTo(0);
+
+        }];
+        senven.tag=2;
+        senven.backgroundColor=[UIColor clearColor];
+        [senven addTarget:self action:@selector(instruction:) forControlEvents:UIControlEventTouchUpInside];
+        
+        UIButton*sw7=[UIButton buttonWithType:UIButtonTypeSystem];
+        [self.imageView addSubview:sw7];
+        [sw7 mas_makeConstraints:^(MASConstraintMaker *make) {
+            
+            make.left.mas_equalTo(0);
+            make.top.mas_equalTo(2*imageHeight/7);
+            make.height.mas_equalTo(1*imageHeight/7);
+            make.right.mas_equalTo(0);
+
+        }];
+        sw7.tag=3;
+        sw7.backgroundColor=[UIColor clearColor];
+        [sw7 addTarget:self action:@selector(instruction:) forControlEvents:UIControlEventTouchUpInside];
+        
+        
+        UIButton*sw10=[UIButton buttonWithType:UIButtonTypeSystem];
+        [self.imageView addSubview:sw10];
+        [sw10 mas_makeConstraints:^(MASConstraintMaker *make) {
+            
+            make.left.mas_equalTo(0);
+            make.top.mas_equalTo(3*imageHeight/7);
+            make.height.mas_equalTo(1*imageHeight/7);
+            make.right.mas_equalTo(0);
+
+        }];
+        sw10.tag=4;
+        sw10.backgroundColor=[UIColor clearColor];
+        [sw10 addTarget:self action:@selector(instruction:) forControlEvents:UIControlEventTouchUpInside];
+        
+        
+        UIButton*cw2=[UIButton buttonWithType:UIButtonTypeSystem];
+        [self.imageView addSubview:cw2];
+        [cw2 mas_makeConstraints:^(MASConstraintMaker *make) {
+            
+            make.left.mas_equalTo(0);
+            make.top.mas_equalTo(4*imageHeight/7);
+            make.height.mas_equalTo(1*imageHeight/7);
+            make.right.mas_equalTo(0);
+
+        }];
+        cw2.tag=5;
+        cw2.backgroundColor=[UIColor clearColor];
+        [cw2 addTarget:self action:@selector(instruction:) forControlEvents:UIControlEventTouchUpInside];
+        
+        UIButton*sw1_6=[UIButton buttonWithType:UIButtonTypeSystem];
+        [self.imageView addSubview:sw1_6];
+        [sw1_6 mas_makeConstraints:^(MASConstraintMaker *make) {
+            
+            make.left.mas_equalTo(0);
+            make.top.mas_equalTo(5*imageHeight/7);
+            make.height.mas_equalTo(1*imageHeight/7);
+            make.right.mas_equalTo(0);
+
+        }];
+        sw1_6.tag=6;
+        sw1_6.backgroundColor=[UIColor clearColor];
+        [sw1_6 addTarget:self action:@selector(instruction:) forControlEvents:UIControlEventTouchUpInside];
+        
+        
+        UIButton*hxwy01=[UIButton buttonWithType:UIButtonTypeSystem];
+        [self.imageView addSubview:hxwy01];
+        [hxwy01 mas_makeConstraints:^(MASConstraintMaker *make) {
+            
+            make.left.mas_equalTo(0);
+            make.top.mas_equalTo(6*imageHeight/7);
+            make.height.mas_equalTo(1*imageHeight/7);
+            make.right.mas_equalTo(0);
+
+        }];
+        hxwy01.tag=7;
+        hxwy01.backgroundColor=[UIColor clearColor];
+        [hxwy01 addTarget:self action:@selector(instruction:) forControlEvents:UIControlEventTouchUpInside];
+
+    }
     
 
+}
+-(void)instruction:(UIButton*)button
+{
+    self.hidesBottomBarWhenPushed = YES;
+    InfoByImageViewController*info=[[InfoByImageViewController alloc]init];
+   
+   
+    if (button.tag==1) {
+        info.title=@"常见失败原因";
+        info.image=[UIImage imageNamed:@"failreason"];
+    }
+    else if (button.tag==2) {
+        info.title=@"小7摄像头";
+        info.image=[UIImage imageNamed:@"cameraInfo"];
+    }
+    else if (button.tag==3) {
+        info.title=@"绚多SW7";
+        info.image=[UIImage imageNamed:@"SW7"];
+    }
+    else if (button.tag==4) {
+        info.title=@"绚多SW10";
+        info.image=[UIImage imageNamed:@"SW10"];
+    }
+    else if (button.tag==5) {
+        info.title=@"绚多CW2";
+        info.image=[UIImage imageNamed:@"CW2"];
+    }
+    else if (button.tag==6) {
+        info.title=@"绚多SW1/SW6/W6";
+        info.image=[UIImage imageNamed:@"sw1"];
+    }
+    else if (button.tag==7) {
+        info.title=@"睿芯HX-WY01";
+        info.image=[UIImage imageNamed:@"HX-WY01"];
+    }
+
+
+
+    
+    [self.navigationController pushViewController:info animated:YES];
 }
 -(void)service:(UIButton*)button
 {

Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/AboutUsViewController.m

@@ -25,7 +25,7 @@
    // CFShow((__bridge CFTypeRef)(infoDic));
     NSString *app_Version=[infoDic objectForKey:@"CFBundleShortVersionString"];
     NSLog(@"app_Version%@",app_Version);
-    app_Version=@"4.7.7";
+    app_Version=@"4.7.8";
     NSString *versionStr = [NSString stringWithFormat:@"v%@",app_Version];
     NSString *buildVersion = [infoDic objectForKey:@"CFBundleVersion"];
     if (buildVersion.length > 0) {

Ifish/controllers/IfishTabControllers/我的/mineControllers/pushSetControllrs/ChangeMobleController.m

@@ -27,8 +27,11 @@
     [self addTitleViewWithTitle:@"更换手机号"];
     //self.title  = @"更换手机号";
     UserModel*model=[[DataCenter defaultDtacenter]valueForKey:@"UserLogIn"];
-    NSMutableString*string=[[NSMutableString alloc]initWithString:model.phoneNumber];
+    NSMutableString*string=[[NSMutableString alloc]initWithString:[CommonUtils getNotNilStr:model.phoneNumber]];
-    [string replaceCharactersInRange:NSMakeRange(3, 4) withString:@"***"];
+    if (string.length>7) {
+        [string replaceCharactersInRange:NSMakeRange(3, 4) withString:@"***"];
+
+    }
     self.yuanTelPhone.text=string;
     [self.timerbutton addTarget:self action:@selector(startTime) forControlEvents:UIControlEventTouchUpInside];
     [self textStyle];

Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m

@@ -47,6 +47,7 @@
 #import "StoreNameView.h"
 #import "ConnectingAquarVC.h"
 #import "SecondConnectWifiController.h"
+#import "InfoByImageViewController.h"
 @interface IfishDeviceViewController ()<UITableViewDelegate,UITableViewDataSource,LxPopViewDelegate,ShopTtemListDelegate>
 
 @property(nonatomic,strong)UITableView *tableView;
@@ -1339,12 +1340,20 @@ Assign BOOL isPush;
 
 -(void)pushshuoMingView{
     
+//    self.hidesBottomBarWhenPushed = YES;
+//    PushMasssageWebViewController*webVC=[[PushMasssageWebViewController alloc]init];
+//    webVC.pushlink =IFISH_DEVCEITROURL;
+//    //webVC.pushlink =@"http://q.eqxiu.com/s/KmmVl87l";
+//    webVC.pushtitle = NSLocalizedString(@"ifish_deviceuse", nil);
+//    [self.navigationController pushViewController:webVC animated:YES];
+//    self.hidesBottomBarWhenPushed = NO;
+    
     self.hidesBottomBarWhenPushed = YES;
-    PushMasssageWebViewController*webVC=[[PushMasssageWebViewController alloc]init];
+    InfoByImageViewController*info=[[InfoByImageViewController alloc]init];
-    webVC.pushlink =IFISH_DEVCEITROURL;
+    info.title=@"产品说明书";
-    //webVC.pushlink =@"http://q.eqxiu.com/s/KmmVl87l";
+    info.type=@"instruction";
-    webVC.pushtitle = NSLocalizedString(@"ifish_deviceuse", nil);
+    info.image=[UIImage imageNamed:@"instruction"];
-    [self.navigationController pushViewController:webVC animated:YES];
+    [self.navigationController pushViewController:info animated:YES];
     self.hidesBottomBarWhenPushed = NO;
 }
 

Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm

@@ -32,6 +32,7 @@
 #import "IfishUserDataUnity.h"
 #import "DeviceCameraModel.h"
 #import "ConAquarChooseWiFiVC.h"
+#import "InfoByImageViewController.h"
 typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) {
     lodingViewdissMissSuccsess=0,// default is 0
     lodingViewdissMissfail,
@@ -295,11 +296,18 @@ self.attentionLabel.text=@"1、请长按摄像头背后复位孔，复位摄像
         
     }
     
-    PushMasssageWebViewController*webVC=[[PushMasssageWebViewController alloc]init];
+//    PushMasssageWebViewController*webVC=[[PushMasssageWebViewController alloc]init];
-    webVC.pushlink =IFISH_DEVCEITROURL;
+//    webVC.pushlink =IFISH_DEVCEITROURL;
-    webVC.pushtitle = NSLocalizedString(@"ifish_deviceuse", nil);;
+//    webVC.pushtitle = NSLocalizedString(@"ifish_deviceuse", nil);;
+//    
+//    [self.navigationController pushViewController:webVC animated:YES];
     
-    [self.navigationController pushViewController:webVC animated:YES];
+    InfoByImageViewController*info=[[InfoByImageViewController alloc]init];
+    info.title=NSLocalizedString(@"ifish_deviceuse", nil);;;
+    info.type=@"instruction";
+    info.image=[UIImage imageNamed:@"instruction"];
+    [self.navigationController pushViewController:info animated:YES];
+
     
 }
 

Ifish/controllers/leftcontrollers/SecondConnectWifiController.m

@@ -30,6 +30,7 @@
 #import <CoreLocation/CoreLocation.h>
 #import "ConnectHotpotViewController.h"
 #import "ConAquarNowWiFiPwdVC.h"
+#import "InfoByImageViewController.h"
 @interface EspTouchDelegateImpl : NSObject<ESPTouchDelegate>
 
 @end
@@ -167,12 +168,18 @@ extern BOOL isfromCameraView;
 
 -(void)shuoMingShuBtnAction:(UIButton *)btn{
     
-    PushMasssageWebViewController*webVC=[[PushMasssageWebViewController alloc]init];
+//    PushMasssageWebViewController*webVC=[[PushMasssageWebViewController alloc]init];
-    webVC.pushlink =IFISH_DEVCEITROURL;
+//    webVC.pushlink =IFISH_DEVCEITROURL;
-    webVC.pushtitle = NSLocalizedString(@"ifish_deviceuse", nil);;
+//    webVC.pushtitle = NSLocalizedString(@"ifish_deviceuse", nil);;
+//
+//    [self.navigationController pushViewController:webVC animated:YES];
     
-    [self.navigationController pushViewController:webVC animated:YES];
+    InfoByImageViewController*info=[[InfoByImageViewController alloc]init];
-   
+    info.title=NSLocalizedString(@"ifish_deviceuse", nil);;;
+    info.type=@"instruction";
+    info.image=[UIImage imageNamed:@"instruction"];
+    [self.navigationController pushViewController:info animated:YES];
+
 }