iOS Team / CNLiveCMineModule · Commits

Commit 114d3a17dccb694b6ed7052b5a146950771f7c14

Authored by yanglingyu
1 parent d4edc5a0

0.4.5

Inline Side-by-side
Showing 4 changed files with 14 additions and 2 deletions
CNLiveCMineModule.podspec
  View file @114d3a1
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 Pod::Spec.new do |s| 9 Pod::Spec.new do |s|
10 s.name = 'CNLiveCMineModule' 10 s.name = 'CNLiveCMineModule'
11 - s.version = '0.4.4' 11 + s.version = '0.4.5'
12 s.summary = '网家家C端个人中心' 12 s.summary = '网家家C端个人中心'
13 13
14 # This description is used to generate tags and improve search results. 14 # This description is used to generate tags and improve search results.
CNLiveCMineModule/Classes/CNCMine/View/CNEvaluaveView.m
  View file @114d3a1
@@ -46,7 +46,9 @@ @@ -46,7 +46,9 @@
46 } 46 }
47 - (void)evaBtnClick{ 47 - (void)evaBtnClick{
48 [CNMineEvaAlertView setUpShowEvaluateAlertViewDoneBlock:^(NSString * _Nonnull chooseStr) { 48 [CNMineEvaAlertView setUpShowEvaluateAlertViewDoneBlock:^(NSString * _Nonnull chooseStr) {
  49 + [QMUITips showLoadingInView:AppKeyWindow];
49 [CNMinePresent requestFeedback:chooseStr secceedBlock:^{ 50 [CNMinePresent requestFeedback:chooseStr secceedBlock:^{
  51 + [QMUITips hideAllTips];
50 [[NSUserDefaults standardUserDefaults] setObject:@"down" forKey:HIDDENDETE]; 52 [[NSUserDefaults standardUserDefaults] setObject:@"down" forKey:HIDDENDETE];
51 [self removeFromSuperview]; 53 [self removeFromSuperview];
52 }]; 54 }];
CNLiveCMineModule/Classes/CNCMine/View/CNMineEvaAlertView.m
  View file @114d3a1
@@ -155,10 +155,18 @@ @@ -155,10 +155,18 @@
155 }]; 155 }];
156 QMUIModalPresentationViewController *modalViewController = [[QMUIModalPresentationViewController alloc] init]; 156 QMUIModalPresentationViewController *modalViewController = [[QMUIModalPresentationViewController alloc] init];
157 modalViewController.onlyRespondsToKeyboardEventFromDescendantViews = NO; 157 modalViewController.onlyRespondsToKeyboardEventFromDescendantViews = NO;
  158 + __weak typeof(modalViewController) weakModal = modalViewController;
  159 + modalViewController.layoutBlock = ^(CGRect containerBounds, CGFloat keyboardHeight, CGRect contentViewDefaultFrame) {
  160 + if (keyboardHeight >0) {
  161 + weakModal.contentView.top = contentViewDefaultFrame.origin.y - DS_adapt_length(30);
  162 + }else{
  163 + weakModal.contentView.top = contentViewDefaultFrame.origin.y;
  164 + }
  165 + weakModal.contentView.left = contentViewDefaultFrame.origin.x;
  166 + };
158 modalViewController.contentView = alertView; 167 modalViewController.contentView = alertView;
159 modalViewController.modal = YES; 168 modalViewController.modal = YES;
160 [modalViewController showWithAnimated:YES completion:nil]; 169 [modalViewController showWithAnimated:YES completion:nil];
161 - __weak typeof(modalViewController) weakModal = modalViewController;  
162 __weak typeof(alertView) weakAlert = alertView; 170 __weak typeof(alertView) weakAlert = alertView;
163 [alertView.closeBtn addBlockForControlEvents:UIControlEventTouchUpInside block:^(id _Nonnull sender) { 171 [alertView.closeBtn addBlockForControlEvents:UIControlEventTouchUpInside block:^(id _Nonnull sender) {
164 [weakModal hideWithAnimated:YES completion:^(BOOL finished) { 172 [weakModal hideWithAnimated:YES completion:^(BOOL finished) {
CNLiveCMineModule/Classes/CNCMine/ViewController/CNLiveMineVC.m
  View file @114d3a1
@@ -137,7 +137,9 @@ static NSString *const CNSobotNotification_NewMessage = @"CNSobotNotification_Ne @@ -137,7 +137,9 @@ static NSString *const CNSobotNotification_NewMessage = @"CNSobotNotification_Ne
137 }else if ([[NSUserDefaults standardUserDefaults] integerForKey:@"showTimes"] == 2){ 137 }else if ([[NSUserDefaults standardUserDefaults] integerForKey:@"showTimes"] == 2){
138 [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"showTimes"]; 138 [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"showTimes"];
139 [CNMineEvaAlertView setUpShowEvaluateAlertViewDoneBlock:^(NSString * _Nonnull chooseStr) { 139 [CNMineEvaAlertView setUpShowEvaluateAlertViewDoneBlock:^(NSString * _Nonnull chooseStr) {
  140 + [QMUITips showLoadingInView:AppKeyWindow];
140 [CNMinePresent requestFeedback:chooseStr secceedBlock:^{ 141 [CNMinePresent requestFeedback:chooseStr secceedBlock:^{
  142 + [QMUITips hideAllTips];
141 [[NSUserDefaults standardUserDefaults] setObject:@"down" forKey:HIDDENDETE]; 143 [[NSUserDefaults standardUserDefaults] setObject:@"down" forKey:HIDDENDETE];
142 [self.evaluateView removeFromSuperview]; 144 [self.evaluateView removeFromSuperview];
143 }]; 145 }];