diff --git a/yinmeng-ios/yinmeng-ios.xcodeproj/project.pbxproj b/yinmeng-ios/yinmeng-ios.xcodeproj/project.pbxproj
index 335fc42..c29f5a3 100644
--- a/yinmeng-ios/yinmeng-ios.xcodeproj/project.pbxproj
+++ b/yinmeng-ios/yinmeng-ios.xcodeproj/project.pbxproj
@@ -2615,7 +2615,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 16.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
@@ -2667,7 +2667,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 16.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = iphoneos;
@@ -2700,7 +2700,7 @@
INFOPLIST_KEY_UIMainStoryboardFile = Main;
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
- IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@@ -2745,7 +2745,7 @@
INFOPLIST_KEY_UIMainStoryboardFile = Main;
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
- IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
diff --git a/yinmeng-ios/yinmeng-ios.xcodeproj/xcshareddata/xcschemes/yinmeng-ios.xcscheme b/yinmeng-ios/yinmeng-ios.xcodeproj/xcshareddata/xcschemes/yinmeng-ios.xcscheme
new file mode 100644
index 0000000..55ea517
--- /dev/null
+++ b/yinmeng-ios/yinmeng-ios.xcodeproj/xcshareddata/xcschemes/yinmeng-ios.xcscheme
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yinmeng-ios/yinmeng-ios.xcodeproj/xcuserdata/googlehandbag.xcuserdatad/xcschemes/xcschememanagement.plist b/yinmeng-ios/yinmeng-ios.xcodeproj/xcuserdata/googlehandbag.xcuserdatad/xcschemes/xcschememanagement.plist
index 19ac9fc..ac2a473 100644
--- a/yinmeng-ios/yinmeng-ios.xcodeproj/xcuserdata/googlehandbag.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/yinmeng-ios/yinmeng-ios.xcodeproj/xcuserdata/googlehandbag.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -10,5 +10,13 @@
30
+ SuppressBuildableAutocreation
+
+ 8C4D534B2AFD4CF600238AE6
+
+ primary
+
+
+
diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/MewHomeViewController.m b/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/MewHomeViewController.m
index c064adc..df9b99d 100644
--- a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/MewHomeViewController.m
+++ b/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/MewHomeViewController.m
@@ -361,7 +361,7 @@
self.containerBgImageView.frame = self.view.frame;
self.containerScrollView.frame = self.view.frame;
self.headerView.frame = CGRectMake(0, (kStatusBarHeight + 25.0) * kScreenScale, KScreenWidth, self.headerView.height);
- self.showVoiceView.frame = CGRectMake(12.0, CGRectGetMaxY(self.headerView.frame), KScreenWidth - 28, KScreenHeight - CGRectGetMaxY(self.headerView.frame) - kTabBarHeight - 12.0);
+ self.showVoiceView.frame = CGRectMake(12.0, CGRectGetMaxY(self.headerView.frame), KScreenWidth - 28, 600);
/// 右边侧栏frame
self.rightBgVoiceView.frame = CGRectMake(self.showVoiceView.frame.size.width - 40 + 5.0, CGRectGetMinY(self.showVoiceView.frame) + 2.0, 44, self.showVoiceView.viewHieght - 4.0);
diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewShowVoiceView.m b/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewShowVoiceView.m
index b8ff582..dd43296 100644
--- a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewShowVoiceView.m
+++ b/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewShowVoiceView.m
@@ -136,7 +136,8 @@
[self addSubview:self.playVoiceView];
[self.playVoiceView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.bgImageView.mas_bottom).offset(10);
- make.left.right.bottom.equalTo(self);
+ make.left.right.equalTo(self);
+ make.height.mas_equalTo(144);
}];
CGFloat marginLeft = 20.0;
diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/SessionInfoViewController.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/SessionInfoViewController.m
index 7c1c735..bc0c95a 100644
--- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/SessionInfoViewController.m
+++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/SessionInfoViewController.m
@@ -68,7 +68,7 @@
}
- (void)initSubViews {
- self.title = @"加入黑名单";
+ self.title = @"举报";
[self.view addSubview:self.stackView];
[self.stackView addArrangedSubview:self.infoView];
@@ -205,7 +205,7 @@
[self showSuccessToast:@"举报成功"];
}]];
[alert addAction:[UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:^(UIAlertAction *action){
- [self showSuccessToast:@"举报成功"];
+// [self showSuccessToast:@"举报成功"];
}]];
[self presentViewController:alert animated:YES completion:nil];
@@ -323,6 +323,7 @@
_blackButton.titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium];
[_blackButton setBackgroundColor:[ThemeColor appCellBackgroundColor]];
[_blackButton addTarget:self action:@selector(blackButtonAction:) forControlEvents:UIControlEventTouchUpInside];
+ _blackButton.hidden = YES;
}
return _blackButton;
}
diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/SessionNavView.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/SessionNavView.m
index f696c10..b89c7e0 100644
--- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/SessionNavView.m
+++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/SessionNavView.m
@@ -162,7 +162,7 @@
[_reportButton setImage:[UIImage imageNamed:@"mew_message_session_nav_report"] forState:UIControlStateNormal];
[_reportButton setImage:[UIImage imageNamed:@"mew_message_session_nav_report"] forState:UIControlStateSelected];
[_reportButton addTarget:self action:@selector(reportButtonAction:) forControlEvents:UIControlEventTouchUpInside];
- _reportButton.hidden = YES;
+ _reportButton.hidden = NO;
}
return _reportButton;
}