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

开发版本-developer——01 first commit

Browse Source
This commit is contained in:
wbzhan
2019-07-08 18:24:03 +08:00
parent 5a10dfa182
commit 8693efe121
386 changed files with 7069 additions and 1951 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/IfishYooseeP2PCore/OpenGLView.mm
+12 -16
View File
@@ -14,8 +14,7 @@
#import <OpenGLES/ES2/glext.h>
#import "Constants.h"
#import "Utils.h"
#import "P2PClient.h"
#import <GWP2P/GWP2P.h>
#import "AppDelegate.h"
#import "ShapeRenderNotifyMsg.h"
//////////////////////////////////////////////////////////
@@ -428,9 +427,9 @@ static GLfloat modelviewProj[16];
const char * cVersion = [strSysVersion UTF8String];
NSLog(@"系统版本号：%@", strSysVersion);// e.g. @"4.0"
NSString *contactId = [[P2PClient sharedClient] callId];
int callID = [contactId intValue];
NSLog(@"callid：%@", contactId);// e.g. @"4.0"
// NSString *contactId = [[P2PClient sharedClient] callId];
int callID = [[GWP2PClient sharedClient] getDeviceIDInAPMode];
// NSLog(@"callid：%@", contactId);// e.g. @"4.0"
if (self.isFisheyeDevice) {//can delete
_shapeWarp.initData(self.bounds.size.width, self.bounds.size.height, [UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.width, _shapeWarp.SHAPE_CIRCLE, cVersion, callID, uuid, _uniformMatrix,_shapeWarp.FISHEYE_360);
@@ -591,13 +590,13 @@ static GLfloat modelviewProj[16];
UIImage *image = [[UIImage alloc] initWithCGImage:[self glToUIImage].CGImage];
NSData *imgData = [NSData dataWithData:UIImagePNGRepresentation(image)];
NSString* contactid = [[P2PClient sharedClient] callId];
int contactid = [[GWP2PClient sharedClient] getDeviceIDInAPMode];
int dwApContactID = [[AppDelegate sharedDefault] dwApContactID];
if (dwApContactID != 0)
{
contactid = [NSString stringWithFormat:@"%d", dwApContactID];
contactid = dwApContactID;
}
[Utils saveHeaderFileWithId:contactid data:imgData];
[Utils saveHeaderFileWithId:[NSString stringWithFormat:@"%d",contactid] data:imgData];
if (dwApContactID != 0)
{
@@ -1072,13 +1071,13 @@ exit:
NSData *imgData = [NSData dataWithData:UIImagePNGRepresentation(image)];
NSString* contactid = [[P2PClient sharedClient] callId];
int contactid = [[GWP2PClient sharedClient] getDeviceIDInAPMode];
int dwApContactID = [[AppDelegate sharedDefault] dwApContactID];
if (dwApContactID != 0)
{
contactid = [NSString stringWithFormat:@"%d", dwApContactID];
contactid = dwApContactID;
}
[Utils saveHeaderFileWithId:contactid data:imgData];
[Utils saveHeaderFileWithId:[NSString stringWithFormat:@"%d",contactid] data:imgData];
if (dwApContactID != 0)
{
@@ -1137,12 +1136,9 @@ exit:
if (!image) {
return;
}
NSData *imgData = [NSData dataWithData:UIImagePNGRepresentation(image)];
NSString* contactid = [[P2PClient sharedClient] callId];
[Utils saveHeaderFileWithId:contactid data:imgData];
int contactid = [[GWP2PClient sharedClient] getDeviceIDInAPMode];
[Utils saveHeaderFileWithId:[NSString stringWithFormat:@"%d",contactid] data:imgData];
}