Commit 1e8d38f2 authored by David黄金龙's avatar David黄金龙

Merge branch 'youhua-dev'

* youhua-dev:
  屏蔽小程序分享入口
  修改版本号  0.9.1.0
  //  UI
  框架刷新消失不见的问题修改
parents c84326a0 21fc445f
......@@ -3740,7 +3740,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 12;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -3765,7 +3765,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.9.0;
MARKETING_VERSION = 0.9.1;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
......@@ -3944,7 +3944,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 12;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -3969,7 +3969,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.9.0;
MARKETING_VERSION = 0.9.1;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
......@@ -3990,7 +3990,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 12;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -4015,7 +4015,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.9.0;
MARKETING_VERSION = 0.9.1;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
......
......@@ -250,7 +250,7 @@ extension YHCommunityViewController: JXSegmentedViewDelegate {
segmentedView.indicators = [indicator]
}
segmentedView.dataSource = segmentedDataSource
segmentedView.reloadData()
self.segmentedView.reloadDataWithoutListContainer()
}
}
......
......@@ -16,6 +16,11 @@ class YHMatchUserViewController: YHBaseViewController {
var needToMatch: Bool = false
var isStartMatch: Bool = false
lazy var bgImgV:UIImageView = {
let bg = UIImageView(image: UIImage(named: "people_match_bg"))
return bg
}()
lazy var topLabel:UILabel = {
let label = UILabel()
label.textAlignment = .center
......@@ -142,6 +147,7 @@ class YHMatchUserViewController: YHBaseViewController {
func createUI() {
self.view.addSubview(self.bgImgV)
self.view.addSubview(self.wingLeftImgV)
self.view.addSubview(self.wingRightImgV)
......@@ -155,6 +161,12 @@ class YHMatchUserViewController: YHBaseViewController {
self.view.addSubview(headLottieView)
self.view.addSubview(matchTipsLabel)
self.headLottieView.play()
bgImgV.snp.makeConstraints { make in
make.left.right.equalToSuperview()
make.top.equalTo(-k_Height_statusBar()-48.0)
make.bottom.equalToSuperview()
}
launchLottieView.snp.makeConstraints { make in
make.width.height.equalTo(KScreenWidth)
......
......@@ -252,7 +252,7 @@ class YHDocumentToActionTableViewCell: UITableViewCell {
fileImageView.image = UIImage(named: iconImgName)
fileNameLabel.text = dataSource.writing_document.doc_sign.doc_type_name
if dataSource.writing_document.doc_sign.doc_type == 7 || dataSource.writing_document.doc_sign.doc_type == 8 {
shareButton.isHidden = false
// shareButton.isHidden = false
}
}
......
......@@ -264,7 +264,7 @@ class YHSignatureToActionTableViewCell: UITableViewCell {
fileImageView.image = UIImage(named: iconImgName)
fileNameLabel.text = dataSource.doc_type_name
if dataSource.doc_type == 7 || dataSource.doc_type == 8 {
shareButton.isHidden = false
// shareButton.isHidden = false
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment