|
|
@@ -29,6 +29,7 @@
|
|
|
|
|
|
#import "CoursewareAlertView.h"
|
|
|
#import "CourseWarePreviewView.h"
|
|
|
+#import "WebViewBaseConfig.h"
|
|
|
#define touchPy 10
|
|
|
|
|
|
@interface KSNewWhiteBoard ()<WKUIDelegate,WKNavigationDelegate,WKScriptMessageHandler,UIImagePickerControllerDelegate,UINavigationControllerDelegate,TZImagePickerControllerDelegate,UIAlertViewDelegate,UIGestureRecognizerDelegate,RSKImageCropViewControllerDelegate>
|
|
|
@@ -111,7 +112,7 @@
|
|
|
|
|
|
- (void)configUserAgent:(WKWebViewConfiguration *)config {
|
|
|
NSString *oldUserAgent = config.applicationNameForUserAgent;
|
|
|
- NSString *newAgent = [NSString stringWithFormat:@"%@ %@ %@",oldUserAgent,@"COLEXIUAPPI",@"COLEXIUTEACHER"];
|
|
|
+ NSString *newAgent = [NSString stringWithFormat:@"%@ %@ %@",oldUserAgent,AGENT_NAME,AGENT_DOMAIN];
|
|
|
config.applicationNameForUserAgent = newAgent;
|
|
|
}
|
|
|
|
|
|
@@ -146,7 +147,7 @@
|
|
|
WeakWebViewScriptMessageDelegate *weakScriptMessageDelegate = [[WeakWebViewScriptMessageDelegate alloc] initWithDelegate:self];
|
|
|
//这个类主要用来做native与JavaScript的交互管理
|
|
|
WKUserContentController * wkUController = [[WKUserContentController alloc] init];
|
|
|
- [wkUController addScriptMessageHandler:weakScriptMessageDelegate name:@"COLEXIU"];
|
|
|
+ [wkUController addScriptMessageHandler:weakScriptMessageDelegate name:SCRIPT_NAME];
|
|
|
config.userContentController = wkUController;
|
|
|
WKPreferences *preferences = [WKPreferences new];
|
|
|
// 是否支出javaScript
|
|
|
@@ -258,7 +259,7 @@
|
|
|
#pragma mark - WKScriptMessageHandler
|
|
|
- (void)userContentController:(WKUserContentController *)userContentController
|
|
|
didReceiveScriptMessage:(WKScriptMessage *)message {
|
|
|
- if ([message.name isEqualToString:@"COLEXIU"]) {
|
|
|
+ if ([message.name isEqualToString:SCRIPT_NAME]) {
|
|
|
NSDictionary *parm = [self convertJsonStringToNSDictionary:message.body];
|
|
|
// 回到主线程
|
|
|
dispatch_async(dispatch_get_main_queue(), ^{
|
|
|
@@ -335,7 +336,7 @@
|
|
|
- (void)dealloc {
|
|
|
NSLog(@"-white board-");
|
|
|
|
|
|
- [[_myWebView configuration].userContentController removeScriptMessageHandlerForName:@"DAYA"];
|
|
|
+ [[_myWebView configuration].userContentController removeScriptMessageHandlerForName:SCRIPT_NAME];
|
|
|
[_myWebView loadHTMLString:@"" baseURL:nil];
|
|
|
[_myWebView removeFromSuperview];
|
|
|
_myWebView = nil;
|
|
|
@@ -457,7 +458,7 @@
|
|
|
NSData *imgData = [UIImage compressImage:image maxLength:5];
|
|
|
|
|
|
NSString *fileName = @"whiteboardImage";
|
|
|
- [[KSUploadManager shareInstance] configBucketName:@"daya"];
|
|
|
+ [[KSUploadManager shareInstance] configBucketName:@"klx"];
|
|
|
[[KSUploadManager shareInstance] uploadImage:imgData fileName:fileName successCallback:^(NSMutableArray * _Nonnull fileUrlArray) {
|
|
|
NSString *imageUrl = [fileUrlArray lastObject];
|
|
|
[self insertImageWithUrl:imageUrl size:image.size];
|
|
|
@@ -735,7 +736,7 @@
|
|
|
- (void)leaveRoom {
|
|
|
[self removeTouchWindow];
|
|
|
[self removeLoadig];
|
|
|
- [[_myWebView configuration].userContentController removeScriptMessageHandlerForName:@"DAYA"];
|
|
|
+ [[_myWebView configuration].userContentController removeScriptMessageHandlerForName:SCRIPT_NAME];
|
|
|
[_myWebView loadHTMLString:@"" baseURL:nil];
|
|
|
[_myWebView removeFromSuperview];
|
|
|
|
Steven