Commit a37a5a29 authored by Steven杜宇's avatar Steven杜宇

// UI

parent 729c8a26
...@@ -143,7 +143,9 @@ class YHPlanShareViewController: YHBaseViewController { ...@@ -143,7 +143,9 @@ class YHPlanShareViewController: YHBaseViewController {
let fileName = destinationURL.lastPathComponent let fileName = destinationURL.lastPathComponent
let fileExtension = destinationURL.pathExtension let fileExtension = destinationURL.pathExtension
YHShareManager.shared.shareFileToWeChat(fileUrl: destinationURL, filename: fileName, ext: fileExtension) YHShareManager.shared.shareFileToWeChat(fileUrl: destinationURL, filename: fileName, ext: fileExtension)
return
} }
YHHUD.flash(message: "请先点击保存PDF")
} else if eventType == .saveImg { } else if eventType == .saveImg {
......
...@@ -587,21 +587,25 @@ extension YHPlanViewController: UIScrollViewDelegate { ...@@ -587,21 +587,25 @@ extension YHPlanViewController: UIScrollViewDelegate {
let rect = self.fakeTableView.rectForRow(at: IndexPath(row: 0, section: index)) let rect = self.fakeTableView.rectForRow(at: IndexPath(row: 0, section: index))
let conditon = index == 0 ? fakeTableView.contentOffset.y <= rect.origin.y : fakeTableView.contentOffset.y < rect.origin.y-5 let conditon = index == 0 ? fakeTableView.contentOffset.y <= rect.origin.y : fakeTableView.contentOffset.y < rect.origin.y-5
if conditon {
if conditon, index < infoArr.count-1 {
find = true find = true
let targetIndex = index-1 >= 0 ? index-1 : 0 let targetIndex = index-1 >= 0 ? index-1 : 0
self.segmented2View.defaultSelectedIndex = targetIndex self.segmented2View.defaultSelectedIndex = targetIndex
self.segmented2View.reloadDataWithoutListContainer() self.segmented2View.reloadDataWithoutListContainer()
self.segmented1View.defaultSelectedIndex = targetIndex self.segmented1View.defaultSelectedIndex = targetIndex
self.segmented1View.reloadDataWithoutListContainer() self.segmented1View.reloadDataWithoutListContainer()
printLog("TargetIndex: \(targetIndex)")
break break
} }
} }
if !find { if !find {
self.segmented2View.defaultSelectedIndex = infoArr.count-1 printLog("TargetIndex: \(segmentTitles.count-1)")
self.segmented2View.defaultSelectedIndex = segmentTitles.count-1
self.segmented2View.reloadDataWithoutListContainer() self.segmented2View.reloadDataWithoutListContainer()
self.segmented1View.defaultSelectedIndex = infoArr.count-1 self.segmented1View.defaultSelectedIndex = segmentTitles.count-1
self.segmented1View.reloadDataWithoutListContainer() self.segmented1View.reloadDataWithoutListContainer()
} }
......
...@@ -14,7 +14,7 @@ class YHPlanAnalyzeInfoView: UIView { ...@@ -14,7 +14,7 @@ class YHPlanAnalyzeInfoView: UIView {
var desc: String = "" { var desc: String = "" {
didSet { didSet {
if desc.isEmpty { if desc.isEmpty {
descLabel.text = "—" descLabel.text = "—"
} else { } else {
descLabel.text = desc descLabel.text = desc
} }
......
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