yinmeng/yinmeng-ios-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化，防止混沌代码时出错

Browse Source
This commit is contained in:
liyuhua
2023-11-24 14:50:51 +08:00
parent 6f4610044d
commit 5597016f94
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yinmeng-ios/yinmeng-ios.xcodeproj/xcshareddata/xcschemes/yinmeng-ios.xcscheme
View File

@@ -31,7 +31,7 @@
</Testables> </Testables>
</TestAction> </TestAction>
<LaunchAction <LaunchAction
buildConfiguration = "Debug" buildConfiguration = "Release"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0" launchStyle = "0"

2
yinmeng-ios/yinmeng-ios/Main/Mew/Message/View/SessionList/MewSessionListTableViewCell.m
View File

@@ -173,7 +173,7 @@
_avatarImageView.contentMode = UIViewContentModeScaleAspectFill; _avatarImageView.contentMode = UIViewContentModeScaleAspectFill;
_avatarImageView.layer.masksToBounds = YES; _avatarImageView.layer.masksToBounds = YES;
_avatarImageView.layer.cornerRadius = 60 / 2; _avatarImageView.layer.cornerRadius = 60 / 2;
_avatarImageView.backgroundColor = UIColor.blueColor;
} }
return _avatarImageView; return _avatarImageView;
} }

18
yinmeng-ios/yinmeng-ios/Main/YMWebViewController.m
View File

@@ -56,7 +56,7 @@ NSString * const kJSGetUid = @"getUid";
@interface YMWebViewController ()<WKNavigationDelegate, WKScriptMessageHandler> @interface YMWebViewController ()<WKNavigationDelegate, WKScriptMessageHandler>
@property (strong, nonatomic) WKWebView *webview; @property (strong, nonatomic) WKWebView *webview;
@property (strong, nonatomic) UIProgressView *progressView; @property (strong, nonatomic) UIProgressView *progressView;
@property (nonatomic, strong) WKUserContentController *userContentController; @property (nonatomic, strong) WKUserContentController *mew_userContentController;
@end @end
@@ -220,18 +220,18 @@ NSString * const kJSGetUid = @"getUid";
NSString *realCookie = [NSString stringWithFormat:@"%@=%@",@"uid",uid]; NSString *realCookie = [NSString stringWithFormat:@"%@=%@",@"uid",uid];
WKUserScript *cookieScript = [[WKUserScript alloc] initWithSource: [NSString stringWithFormat:@"document.cookie = '%@';", realCookie] injectionTime:WKUserScriptInjectionTimeAtDocumentStart forMainFrameOnly:NO]; WKUserScript *cookieScript = [[WKUserScript alloc] initWithSource: [NSString stringWithFormat:@"document.cookie = '%@';", realCookie] injectionTime:WKUserScriptInjectionTimeAtDocumentStart forMainFrameOnly:NO];
[self.userContentController addUserScript:cookieScript]; [self.mew_userContentController addUserScript:cookieScript];
///禁止缩放 ///禁止缩放
NSString *scaleJs = @"$('meta[name=description]').remove(); $('head').append( '<meta name=\"viewport\" content=\"width=device-width, initial-scale=1,user-scalable=no\">' );"; NSString *scaleJs = @"$('meta[name=description]').remove(); $('head').append( '<meta name=\"viewport\" content=\"width=device-width, initial-scale=1,user-scalable=no\">' );";
WKUserScript *scaleScript = [[WKUserScript alloc] initWithSource:scaleJs injectionTime:WKUserScriptInjectionTimeAtDocumentEnd forMainFrameOnly:NO]; WKUserScript *scaleScript = [[WKUserScript alloc] initWithSource:scaleJs injectionTime:WKUserScriptInjectionTimeAtDocumentEnd forMainFrameOnly:NO];
[self.userContentController addUserScript:scaleScript]; [self.mew_userContentController addUserScript:scaleScript];
//根据生成的WKUserScript对象，初始化WKWebViewConfiguration //根据生成的WKUserScript对象，初始化WKWebViewConfiguration
configuration.preferences.javaScriptEnabled = YES; configuration.preferences.javaScriptEnabled = YES;
configuration.preferences.javaScriptCanOpenWindowsAutomatically = YES; configuration.preferences.javaScriptCanOpenWindowsAutomatically = YES;
configuration.preferences.minimumFontSize = 10; configuration.preferences.minimumFontSize = 10;
configuration.selectionGranularity = WKSelectionGranularityCharacter; configuration.selectionGranularity = WKSelectionGranularityCharacter;
configuration.userContentController = self.userContentController; configuration.userContentController = self.mew_userContentController;
CGSize size = [UIScreen mainScreen].bounds.size; CGSize size = [UIScreen mainScreen].bounds.size;
_webview = [[WKWebView alloc]initWithFrame:CGRectMake(0, 0, size.width,size.height) configuration:configuration]; _webview = [[WKWebView alloc]initWithFrame:CGRectMake(0, 0, size.width,size.height) configuration:configuration];
@@ -267,13 +267,13 @@ NSString * const kJSGetUid = @"getUid";
return _webview; return _webview;
} }
- (WKUserContentController *)userContentController{ - (WKUserContentController *)mew_userContentController{
if (!_userContentController) { if (!_mew_userContentController) {
//自定义的WKScriptMessageHandler 是为了解决内存不释放的问题 //自定义的WKScriptMessageHandler 是为了解决内存不释放的问题
WeakWebViewScriptMessageDelegate *weakScriptMessageDelegate = [[WeakWebViewScriptMessageDelegate alloc] initWithDelegate:self]; WeakWebViewScriptMessageDelegate *weakScriptMessageDelegate = [[WeakWebViewScriptMessageDelegate alloc] initWithDelegate:self];
_userContentController = [[WKUserContentController alloc] init]; _mew_userContentController = [[WKUserContentController alloc] init];
// 获取uid // 获取uid
[_userContentController addScriptMessageHandler:weakScriptMessageDelegate name:kJSGetUid]; [_mew_userContentController addScriptMessageHandler:weakScriptMessageDelegate name:kJSGetUid];
// 分享面板 // 分享面板
// [_userContentController addScriptMessageHandler:weakScriptMessageDelegate name:kJSOpenSharePage]; // [_userContentController addScriptMessageHandler:weakScriptMessageDelegate name:kJSOpenSharePage];
// // 钱包页面 // // 钱包页面
@@ -315,6 +315,6 @@ NSString * const kJSGetUid = @"getUid";
// [_userContentController addScriptMessageHandler:weakScriptMessageDelegate name:kCheckResultFinish]; // [_userContentController addScriptMessageHandler:weakScriptMessageDelegate name:kCheckResultFinish];
// [_userContentController addScriptMessageHandler:weakScriptMessageDelegate name:kOpenNativeTarotPay]; // [_userContentController addScriptMessageHandler:weakScriptMessageDelegate name:kOpenNativeTarotPay];
} }
return _userContentController; return _mew_userContentController;
} }
@end @end