Commit f114718f authored by jie zhang's avatar jie zhang

no message

parent a36b1ffd
...@@ -49,6 +49,7 @@ extension AppDelegate:JPUSHRegisterDelegate{ ...@@ -49,6 +49,7 @@ extension AppDelegate:JPUSHRegisterDelegate{
func application(_ application: UIApplication, didReceiveRemoteNotification userInfo: [AnyHashable : Any], fetchCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void) { func application(_ application: UIApplication, didReceiveRemoteNotification userInfo: [AnyHashable : Any], fetchCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void) {
JPUSHService.handleRemoteNotification(userInfo) JPUSHService.handleRemoteNotification(userInfo)
completionHandler(UIBackgroundFetchResult.newData) completionHandler(UIBackgroundFetchResult.newData)
//处理消息的跳转
SBSkipTool.share.skipViewController(parameters: userInfo) SBSkipTool.share.skipViewController(parameters: userInfo)
} }
} }
......
...@@ -23,3 +23,6 @@ public let UPDATE_RECEIVE_ORDER_LIST: String = "UPDATE_RECEIVE_ORDER_LIST" ...@@ -23,3 +23,6 @@ public let UPDATE_RECEIVE_ORDER_LIST: String = "UPDATE_RECEIVE_ORDER_LIST"
/// 更新代办消息 /// 更新代办消息
public let UPDATE_TODO_LIST: String = "UPDATE_TODO_LIST" public let UPDATE_TODO_LIST: String = "UPDATE_TODO_LIST"
/// 首页页面跳转通知
public let SELECT_HOME_PAGE: String = "SELECT_HOME_PAGE"
...@@ -7,9 +7,11 @@ ...@@ -7,9 +7,11 @@
// //
import UIKit import UIKit
import RxSwift
class HomeContentViewController: BaseViewController { class HomeContentViewController: BaseViewController {
/// RxSwift自动释放
let disposeBag = DisposeBag()
/// 首页未开始、已领单 /// 首页未开始、已领单
@IBOutlet weak var contentSegmented: UISegmentedControl! @IBOutlet weak var contentSegmented: UISegmentedControl!
/// 内容ScrollView /// 内容ScrollView
...@@ -25,6 +27,20 @@ class HomeContentViewController: BaseViewController { ...@@ -25,6 +27,20 @@ class HomeContentViewController: BaseViewController {
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
addChildContentVc() addChildContentVc()
//接收通知处理页面跳转逻辑
NotificationCenter.default.rx.notification(Notification.Name(rawValue: SELECT_HOME_PAGE)).subscribe(onNext: {[weak self] (notice) in
// print(notice)
guard notice.object != nil else {
print("没有指定页面下标")
return
}
let index = notice.object as! Int
self?.contentSegmented.selectedSegmentIndex = index
self?.updateScroll(with: index)
}).disposed(by: disposeBag)
} }
// MARK: - 添加子控制器到主控制器 // MARK: - 添加子控制器到主控制器
...@@ -48,7 +64,7 @@ class HomeContentViewController: BaseViewController { ...@@ -48,7 +64,7 @@ class HomeContentViewController: BaseViewController {
// MARK: - 滚动结束取出下标对应控制器 // MARK: - 滚动结束取出下标对应控制器
fileprivate func selectedCurrentVc(_ index: Int,_ scrollView: UIScrollView) { fileprivate func selectedCurrentVc(_ index: Int,_ scrollView: UIScrollView) {
let tableViewVc = childViewControllers[index] let tableViewVc = childViewControllers[index]
currentVc = tableViewVc as! BaseTableViewPullController currentVc = tableViewVc as? BaseTableViewPullController
tableViewVc.view.setx(x: scrollView.contentOffset.x) tableViewVc.view.setx(x: scrollView.contentOffset.x)
tableViewVc.view.seth(h: contentScrollView.height) tableViewVc.view.seth(h: contentScrollView.height)
tableViewVc.view.setw(w: contentScrollView.width) tableViewVc.view.setw(w: contentScrollView.width)
...@@ -57,7 +73,12 @@ class HomeContentViewController: BaseViewController { ...@@ -57,7 +73,12 @@ class HomeContentViewController: BaseViewController {
// MARK: - UISegmentedControl切换事件 // MARK: - UISegmentedControl切换事件
@IBAction func segmentedControlClickAction(_ sender: UISegmentedControl) { @IBAction func segmentedControlClickAction(_ sender: UISegmentedControl) {
let offset = sender.selectedSegmentIndex * Int(contentScrollView.width) updateScroll(with: sender.selectedSegmentIndex)
}
func updateScroll(with segIndex: Int) {
// 0代表未开始,1代表已领单
let offset = segIndex * Int(self.contentScrollView.width)
contentScrollView.setContentOffset(CGPoint(x: offset, y: 0), animated: true) contentScrollView.setContentOffset(CGPoint(x: offset, y: 0), animated: true)
} }
} }
......
...@@ -26,6 +26,12 @@ class HomeViewController: BaseViewController { ...@@ -26,6 +26,12 @@ class HomeViewController: BaseViewController {
addChildContentVc() addChildContentVc()
updateVersion() updateVersion()
updateJPushAlias() updateJPushAlias()
DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + DispatchTimeInterval.seconds(3)) {
//object 传递的是首页页面的标识,未开始/已领单
NotificationCenter.default.post(name: NSNotification.Name(rawValue: "SELECT_HOME_PAGE"), object: 1)
}
} }
/*iResCode, NSString *iAlias, NSInteger seq*/ /*iResCode, NSString *iAlias, NSInteger seq*/
func updateJPushAlias(){ func updateJPushAlias(){
......
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