开发版本-developer——01 first commit

2019-07-08 18:24:03 +08:00
parent 5a10dfa182
commit 8693efe121
386 changed files with 7069 additions and 1951 deletions
@@ -18,7 +18,6 @@
@property(nonatomic,copy)  NSString * isMaster;
 //是否授权
@property(nonatomic,copy)  NSString * isActive;
-
 //摄像头密码写死  全一样 123 md5 加密
@property(nonatomic,copy)  NSString *cameraPass;
 //
@@ -4,26 +4,22 @@
 //
 //  Created by imac on 16/6/7.
 //  Copyright © 2016年 xiang. All rights reserved.
-//
+//摄像头详情页面

 #import <UIKit/UIKit.h>

-#import "P2PClient.h"
 #import <AVFoundation/AVFoundation.h>
-
 #import "TouchButton.h"
-#import "OpenGLView.h"
+//#import "OpenGLView.h"
+#import <GWP2P/GWP2P.h>
 #import "CustomBorderButton.h"
 #import "CustomView.h"
 #import "ProgressImageView.h"
-//#import "MainController.h"
-//#import "CustomTopBar.h"
 #import "AppDelegate.h"
 #define FocalLength_Elongation_btnTag 300
 #define FocalLength_Shorten_btnTag 301
 #define FocalLength_Change_sliderTag 302
 #import "MonitorBootmView.h"
-//#import "Socketsingleton.h"
 #import "SongBaoViewController.h"
 //竖屏
 #define STOPBTN_TAG 1603227
@@ -53,10 +49,10 @@
 #import "IifshSegmentView.h"

@interface IfishP2PMonitorController : UIViewController<
-   AVCaptureVideoDataOutputSampleBufferDelegate,UIGestureRecognizerDelegate,TouchButtonDelegate,
-    OpenGLViewDelegate,UIScrollViewDelegate,UIAlertViewDelegate,P2PClientDelegate,MonitorBottomCollcetionSelectDelegate,LxPopViewDelegate,CameraBottomHViewDelegate,IfishSegmentViewDelegate>
+   AVCaptureVideoDataOutputSampleBufferDelegate,UIGestureRecognizerDelegate,TouchButtonDelegate,UIScrollViewDelegate,UIAlertViewDelegate,MonitorBottomCollcetionSelectDelegate,LxPopViewDelegate,CameraBottomHViewDelegate,IfishSegmentViewDelegate>

-@property (nonatomic, strong) OpenGLView *remoteView;
+//@property (nonatomic, strong) OpenGLView *remoteView;
+@property (nonatomic, strong) GWP2PVideoPlayer *player;//摄像头页面
@property (nonatomic) BOOL isReject;
@property (nonatomic) BOOL isFullScreen4B3;
@property (nonatomic) BOOL isShowControllerBar;
@@ -1331,9 +1331,6 @@
            }
            NSString* pwdHead = PASSWORD_HEAD; //密码长度上限为30个字符
            self.camera.cameraPass = [NSString stringWithFormat:@"%@%@", pwdHead, box.yMsgInputText];
-            //[[FListManager sharedFList] updatee:self.camera];
-            //[[FListManager sharedFList] getDefenceStates];
-            
            if ([box.theTagString isEqualToString:@"Msg_flist_pwd_error"]) {//获取列表文件错误,就重发获取列表的命令
                [[P2PClient sharedClient] setCurrentLabel:1];
                [[P2PClient sharedClient] getPlaybackFilesWithId:self.camera.cameraId password:self.camera.cameraPass timeInterval:1];
@@ -651,7 +651,7 @@
        }
    }else if([[P2PClient sharedClient] gwplaybackState]==PLAYBACK_STATE_STOP){
        _isPause=YES;
-        [[P2PClient sharedClient] sendCommandType:USR_CMD_PLAY_CTL
+        [[P2PClient sharedClient] sendCommandType:USR_CMD_REMOTLY_PLAY_CTL
                                        andOption:USR_CMD_OPTION_PLAY];
        if (!_isSilence) {
            [self stSilence:NO];
@@ -12,7 +12,8 @@
 #import "UDPManager.h"
 #import "UDManager.h"
 #import "LoginResult.h"
-#import "P2PClient.h"
+//#import "P2PClient.h"
+#import <GWP2P/GWP2P.h>
@interface YooseConnectFirstViewController ()

@property(nonatomic)BOOL isInitDevice;
@@ -62,10 +63,7 @@
     _isInitDevice = NO;
    
    // LoginResult *loginResult = [UDManager getLoginInfo];
-    
-//    NSString * P2PVerifyCode1 = @"1528438234";
-//    NSString * P2PVerifyCode2 = @"992805759";
-//    NSString *UserID = @"-2144354932";
+
     UserModel *model=[[DataCenter defaultDtacenter] valueForKey:@"UserLogIn"];
     NSString *userIDName=[NSString stringWithFormat:@"%d",(int)[model.gwellUserID integerValue]&0x7fffffff];
   
@@ -84,9 +82,7 @@
        [self.view makeToast:@"摄像头P2PVerifyCode2空错误码10003"];
        return;
    }
-    
-    _isInitDevice = [[P2PClient sharedClient] p2pConnectWithId:userIDName codeStr1:model.P2PVerifyCode1 codeStr2:model.P2PVerifyCode2];
-    
+    _isInitDevice = [[GWP2PClient sharedClient] connectWithAccount:userIDName codeStr1:model.P2PVerifyCode1 codeStr2:model.P2PVerifyCode2 sessionID1:model.sessionID sessionID2:model.sessionID2 customerIDs:nil];
 }

 - (void)didReceiveMemoryWarning {
@@ -185,7 +181,8 @@
        
        
        [self showTitle:@"" messsage:@" 暂未检测到设备"];
-       self.isInitDevice = [[P2PClient sharedClient] p2pConnectWithId:userIDName codeStr1:model.P2PVerifyCode1 codeStr2:model.P2PVerifyCode2];
+//       self.isInitDevice = [[P2PClient sharedClient] p2pConnectWithId:userIDName codeStr1:model.P2PVerifyCode1 codeStr2:model.P2PVerifyCode2];
+        self.isInitDevice = [[GWP2PClient sharedClient] connectWithAccount:userIDName codeStr1:model.P2PVerifyCode1 codeStr2:model.P2PVerifyCode2 sessionID1:model.sessionID sessionID2:model.sessionID2 customerIDs:nil];
        //loginResult.contactId 用户ID号
        NSLog(@"%@%@%@",userIDName,model.P2PVerifyCode1,model.P2PVerifyCode2);
       
@@ -20,6 +20,9 @@ enum
    conectType_qrcode
 };

+/**
+ 添加摄像头详情页面
+ */
@interface YooseeNextConnectViewController : BaseViewController
@property (nonatomic,strong) NSString *uuidString;
@property (nonatomic,strong) NSString *wifiPwd;
@@ -31,7 +31,7 @@
 #import "UDManager.h"
 #import "LoginResult.h"
 #import "Utils.h"
-#import "MD5Manager.h"
+#import <GWP2P/MD5Manager.h>
 #import "RightViewController.h"
 #import "LeftViewController.h"
 #import "ICSDrawerController.h"
@@ -91,11 +91,8 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) {

 - (void)viewDidLoad {
    [super viewDidLoad];
-    //[self getWifiLoop];
-    // Do any additional setup after loading the view from its nib.
    //智能联机
    _initPwSuc = NO;
-   // [[P2PClient sharedClient] setDelegate:self];
    self.conectType = conectType_Intelligent;
    self.addresses = [[NSMutableDictionary alloc] initWithCapacity:1];
    self.view.backgroundColor = [UIColor whiteColor];