2.6.4.1

Example/OffcnLiveSDKiOS.xcodeproj/project.pbxproj

@@ -22,6 +22,7 @@
 		A95923162484B533007F5131 /* iOSViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A95923142484B533007F5131 /* iOSViewController.m */; };
 		A95923172484B533007F5131 /* iOSAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A95923152484B533007F5131 /* iOSAppDelegate.m */; };
 		A95923192484B53F007F5131 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A95923182484B53E007F5131 /* Main.storyboard */; };
+		D58CE196990836036E0DF012 /* Pods_OffcnLiveSDKiOS_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A89BE439C54D2FF6CA0FDAEC /* Pods_OffcnLiveSDKiOS_Example.framework */; };
 		E031BC5A6D1684C7FC29ACF1 /* Pods_OffcnLiveSDKiOS_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 54CBC425CF8AC01BB87AC75D /* Pods_OffcnLiveSDKiOS_Tests.framework */; };
 /* End PBXBuildFile section */
 
@@ -76,6 +77,7 @@
 				6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */,
 				6003F592195388D20070C39A /* UIKit.framework in Frameworks */,
 				6003F58E195388D20070C39A /* Foundation.framework in Frameworks */,
+				D58CE196990836036E0DF012 /* Pods_OffcnLiveSDKiOS_Example.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

OffcnLiveSDKiOS.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'OffcnLiveSDKiOS'
-  s.version          = '2.6.4.0'
+  s.version          = '2.6.4.1'
   s.summary          = 'OffcnLiveSDKiOS.'
 
   s.description      = <<-DESC

OffcnLiveSDKiOS/Classes/OffcnDownloadManager.h

@@ -245,7 +245,7 @@ typedef void(^downloadM3u8CallBack)(BOOL isSuccess, NSError *error);
  
  @param model model
  */
-- (void)downloadWhiteboardResourcesWithModel:(OffcnDownloadManagerModel *)model finished:(void(^)(BOOL success))finished;
+- (void)downloadWhiteboardResourcesWithModel:(OffcnDownloadManagerModel *)model finished:(void(^)(OffcnDownloadManagerModel *model_call))finished;
 //下载白板字体
 - (void)downloadWhiteboardFontWithModel:(OffcnDownloadManagerModel *)model finished:(void(^)(OffcnDownloadManagerModel *model))finished;
 //下载单个文件

OffcnLiveSDKiOS/Classes/OffcnLiveSDK.h

@@ -9,7 +9,7 @@
 #import <UIKit/UIKit.h>
 #import "OffcnShareWindow.h"
 
-static const NSString *OffcnLiveSDKVersion = @"2.6.4.0";
+static const NSString *OffcnLiveSDKVersion = @"2.6.4.1";
 
 //事件通知
 #define kOffcnEventNotification @"kOffcnEventNotification"

OffcnLiveSDKiOS/Frameworks/OffcnWhiteBoard.framework/Headers/WhiteboardGLView.h

@@ -62,6 +62,7 @@ typedef struct WBPoint{
 -(BOOL)clearCanvas;
 
 -(BOOL)redraw;
+-(BOOL)draw;
 -(void)resize;
 -(BOOL)clearWhiteboardData;
 
@@ -80,10 +81,8 @@ typedef struct WBPoint{
 -(BOOL)setViewScrollPoint:(WBPoint)point isOptimize:(BOOL)isOptimize;
 -(WBPoint)getViewScrollRange;
 
--(BOOL)pushWhiteboardDataFromHttp:(NSData*)data;
 -(BOOL)pushWhiteboardDataFromPlayer:(NSData*)data;
 -(BOOL)pushWhiteboardDataFromFile:(NSString*)filePath operationSeq:(int)operationSeq;
--(BOOL)pushWhiteboardDataFromFileByIndex:(NSString*)filePath operationSeq:(int)operationSeq;
 -(BOOL)pushWhiteboardDataFromFileWithHandle:(NSString*)filePath operationSeq:(int)operationSeq handle:(int64_t)handle;
 @property(nonatomic)        CGFloat  scaleFactor;
 @property(weak,nonatomic) id<WhiteboardEventDelegate> eventDelegate;

OffcnLiveSDKiOS/Frameworks/OffcnWhiteBoard.framework/LICENSE

-// Copyright (c) 2018 Google Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
---------------------------------------------------------------------------------

OffcnLiveSDKiOS/Frameworks/OffcnWhiteBoard.framework/_CodeSignature/CodeResources

@@ -6,7 +6,7 @@
 	<dict>
 		<key>.DS_Store</key>
 		<data>
-		VvNG2xxRYPZZ7gPUBpLmOei0PEQ=
+		jEdqRSJwAP0FXUwcRVaps0lbljo=
 		</data>
 		<key>Headers/OffcnWhiteBoard.h</key>
 		<data>
@@ -14,7 +14,7 @@
 		</data>
 		<key>Headers/WhiteboardGLView.h</key>
 		<data>
-		P6L/7UnoqFOY/xCTo4EBmMhKXmI=
+		Cafo+S++pCjuQncC05AxWhvqWps=
 		</data>
 		<key>Headers/WhiteboardType.h</key>
 		<data>
@@ -22,28 +22,12 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		PfnMczkXfrSIUW+lExWFSC3zA94=
-		</data>
-		<key>LICENSE</key>
-		<data>
-		tINWhQnPa5eml8zvzV2d8pzfTx8=
+		jymCLyM/Ef+kSZUrNsK4/93+Tb4=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
 		il8gSRETznRJV25lh83Q25QHuCg=
 		</data>
-		<key>whiteboard.cbp</key>
-		<data>
-		XidwOASmWbztb7iSTDjdCnP2sCI=
-		</data>
-		<key>whiteboard.cscope_file_list</key>
-		<data>
-		PoNTTRRh4DxeFotHam36H8zXW6c=
-		</data>
-		<key>whiteboard.pri</key>
-		<data>
-		LK2fV3ckQrKhRmvM06Tqha/fhIg=
-		</data>
 	</dict>
 	<key>files2</key>
 	<dict>
@@ -62,11 +46,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			P6L/7UnoqFOY/xCTo4EBmMhKXmI=
+			Cafo+S++pCjuQncC05AxWhvqWps=
 			</data>
 			<key>hash2</key>
 			<data>
-			afr6hu7hW6xFG0KlzuuRpBpUNa7HzNknPe8fGh4KC3A=
+			CoMC5WZqcvGxqRhIp85ZVjvPyqmmQchuq1Bu4vfYWvU=
 			</data>
 		</dict>
 		<key>Headers/WhiteboardType.h</key>
@@ -80,17 +64,6 @@
 			OWbOEOMqaT8uoxDbTywCJjv4xe9plm+bcflRUrIIccU=
 			</data>
 		</dict>
-		<key>LICENSE</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			tINWhQnPa5eml8zvzV2d8pzfTx8=
-			</data>
-			<key>hash2</key>
-			<data>
-			5Zu1xca6QmqaxLqf5metFMUWaxKqJb6K8dEisU++LjY=
-			</data>
-		</dict>
 		<key>Modules/module.modulemap</key>
 		<dict>
 			<key>hash</key>
@@ -102,39 +75,6 @@
 			xMQWtGbxqUiZG8TFkJLi+LtOSYRx6yM/mUE3q4gqxyI=
 			</data>
 		</dict>
-		<key>whiteboard.cbp</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			XidwOASmWbztb7iSTDjdCnP2sCI=
-			</data>
-			<key>hash2</key>
-			<data>
-			XCMkrAPfxssvgXRgvautZsSM6WO8Rh46SlJSVTvaxTw=
-			</data>
-		</dict>
-		<key>whiteboard.cscope_file_list</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			PoNTTRRh4DxeFotHam36H8zXW6c=
-			</data>
-			<key>hash2</key>
-			<data>
-			7h6ikmEn3y+kFlrHscLU7s4DDOHIj3fLOx/nLt2Sf1c=
-			</data>
-		</dict>
-		<key>whiteboard.pri</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			LK2fV3ckQrKhRmvM06Tqha/fhIg=
-			</data>
-			<key>hash2</key>
-			<data>
-			DtydknqR8ZhVKIJJJdr/v8dkF1Zl/EUwSQgyppAvEHk=
-			</data>
-		</dict>
 	</dict>
 	<key>rules</key>
 	<dict>

OffcnLiveSDKiOS/Frameworks/OffcnWhiteBoard.framework/whiteboard.cbp

-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="whiteboard" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Debug">
-				<Option output="../bin/whiteboard" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
-				<Option object_output="../obj/Debug/whiteboard/" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-g" />
-					<Add directory="whiteboard" />
-				</Compiler>
-			</Target>
-			<Target title="Release">
-				<Option output="../bin/whiteboard" prefix_auto="1" extension_auto="1" />
-				<Option object_output="../obj/Release/whiteboard/" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add directory="whiteboard" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-Wall" />
-			<Add option="-std=c++17" />
-			<Add option="-fPIC" />
-			<Add option="-fno-exceptions" />
-			<Add option="-fno-rtti" />
-			<Add directory="../../third/skia" />
-		</Compiler>
-		<Linker>
-			<Add option="-ldl" />
-			<Add option="-lpthread" />
-			<Add option="-lfontconfig" />
-			<Add option="-lfreetype" />
-			<Add option="-luuid" />
-			<Add option="-lskia" />
-			<Add library="GL" />
-			<Add directory="../../third/skia/out/default" />
-		</Linker>
-		<Unit filename="../inc/core.h" />
-		<Unit filename="../inc/whiteboard.h" />
-		<Unit filename="canvas.cpp" />
-		<Unit filename="canvas.h" />
-		<Unit filename="entity.cpp" />
-		<Unit filename="entity.h" />
-		<Unit filename="image.cpp" />
-		<Unit filename="image.h" />
-		<Unit filename="line.cpp" />
-		<Unit filename="line.h" />
-		<Unit filename="main_api.cpp" />
-		<Unit filename="ops.cpp" />
-		<Unit filename="ops.h" />
-		<Unit filename="oval.cpp" />
-		<Unit filename="oval.h" />
-		<Unit filename="path.cpp" />
-		<Unit filename="path.h" />
-		<Unit filename="rect.cpp" />
-		<Unit filename="rect.h" />
-		<Unit filename="richeditor.cpp" />
-		<Unit filename="richeditor.h" />
-		<Unit filename="sk_canvas.cpp" />
-		<Unit filename="sk_canvas.h" />
-		<Unit filename="stdafx.h" />
-		<Unit filename="text.cpp" />
-		<Unit filename="text.h" />
-		<Unit filename="wb_engine.cpp" />
-		<Unit filename="wb_engine.h" />
-		<Extensions />
-	</Project>
-</CodeBlocks_project_file>

OffcnLiveSDKiOS/Frameworks/OffcnWhiteBoard.framework/whiteboard.cscope_file_list

-"/root/Documents/git/smartboard/whiteboard/canvas.h"
-"/root/Documents/git/smartboard/whiteboard/wb_engine.h"
-"/root/Documents/git/smartboard/whiteboard/wb_engine.cpp"
-"/root/Documents/git/smartboard/whiteboard/canvas.cpp"
-"/root/Documents/git/smartboard/whiteboard/main.cpp"
-"/root/Documents/git/smartboard/whiteboard/stdafx.h"
-"/root/Documents/git/smartboard/whiteboard/sk_canvas.h"
-"/root/Documents/git/smartboard/inc/whiteboard.h"
-"/root/Documents/git/smartboard/whiteboard/sk_canvas.cpp"

OffcnLiveSDKiOS/Frameworks/OffcnWhiteBoard.framework/whiteboard.pri

-INCLUDEPATH += $$PWD
-
-CONFIG  += c++17
-DEFINES += SK_GL SK_SUPPORT_GPU QT_NO_FOREACH
-
-HEADERS += \
-    $$PWD/canvas.h \
-    $$PWD/cursor.h \
-    $$PWD/entity.h \
-    $$PWD/image.h \
-    $$PWD/line.h \
-    $$PWD/oval.h \
-    $$PWD/path.h \
-    $$PWD/rect.h \
-    $$PWD/richeditor.h \
-    $$PWD/sk_canvas.h \
-    $$PWD/stdafx.h \
-    $$PWD/text.h \
-    $$PWD/wb_engine.h
-SOURCES += \
-    $$PWD/canvas.cpp \
-    $$PWD/cursor.cpp \
-    $$PWD/entity.cpp \
-    $$PWD/image.cpp \
-    $$PWD/line.cpp \
-    $$PWD/main_api.cpp \
-    $$PWD/oval.cpp \
-    $$PWD/path.cpp \
-    $$PWD/rect.cpp \
-    $$PWD/richeditor.cpp \
-    $$PWD/sk_canvas.cpp \
-    $$PWD/text.cpp \
-    $$PWD/wb_engine.cpp
-
-INCLUDEPATH += \
-    E:\\Workspace\\skia_chrome_m88 \
-    E:\\Workspace\\skia_chrome_m88\\include \
-    E:\\Workspace\\skia_chrome_m88\\include\\core \
-    E:\\Workspace\\skia_chrome_m88\\src\\core \
-    E:\\Workspace\\skia_chrome_m88\\src\\utils \
-    E:\\Workspace\\skia_chrome_m88\\samplecode \
-    E:\\Workspace\\skia_chrome_m88\\tools\\sk_app
-
-CONFIG(debug, debug|release) {
-    LIBS += -LE:\\Workspace\\skia_chrome_m88\\out\\Static_Debug_x86 -lskia -lUser32 -lOpengl32 -ld3dcompiler -lD3D12
-} else {
-    LIBS += -LE:\\Workspace\\skia_chrome_m88\\out\\Static -lskia -lUser32 -lOpengl32 -ld3dcompiler -lD3D12
-}