Merge branch 'release/1.0.0'

RainbowPlanet/RainbowPlanet/Macro/Common.swift

@@ -133,16 +133,16 @@ func delay(by delayTime: TimeInterval, qosClass: DispatchQoS.QoSClass? = nil,
 }
 
 func getCurrentVC() -> UIViewController? {
-    let keywindow = (UIApplication.shared.delegate as! AppDelegate).window
-    let firstView: UIView = (keywindow?.subviews.first)!
-    let secondView: UIView = firstView.subviews.first!
+    let keywindow = (UIApplication.shared.delegate as? AppDelegate)?.window
+    let firstView: UIView? = keywindow?.subviews.first
+    let secondView: UIView? = firstView?.subviews.first
     var vc = viewForController(view: secondView)
-    vc = ((vc as! UITabBarController).selectedViewController! as! UINavigationController).visibleViewController!
+    vc = ((vc as? UITabBarController)?.selectedViewController as? UINavigationController)?.visibleViewController
 
     return vc
 }
 
-private func viewForController(view:UIView)->UIViewController?{
+private func viewForController(view:UIView?)->UIViewController?{
     var next:UIView? = view
     repeat{
         if let nextResponder = next?.next, nextResponder is UIViewController {

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/CommunityNavigationBarView.swift

@@ -26,7 +26,6 @@ class CommunityNavigationBarView: BaseView {
     var scrollNumberLabel : DPScrollNumberLabel?
     
     func isTokenNil() {
-        UserMemberTotalBeanViewModel.shared.userMemberGetTotalBeanApi()
         if UserModel.isTokenNil() {
             self.scrollNumberLabel?.isHidden  = true
             self.rightButton.snp.remakeConstraints { (make) in
@@ -37,27 +36,24 @@ class CommunityNavigationBarView: BaseView {
             }
             self.scrollNumberLabel?.isHidden  = true
         }else {
-            self.scrollNumberLabel?.isHidden  = false
-            self.scrollNumberLabel!.snp_remakeConstraints {[weak self] (make) in
-                make.centerY.equalToSuperview()
-                make.size.equalTo((self?.scrollNumberLabel?.frame.size)!)
-                make.right.equalToSuperview().offset(-14)
-            }
-            self.rightButton.snp.remakeConstraints {[weak self] (make) in
-                make.centerY.equalToSuperview()
-                make.right.equalTo((self?.scrollNumberLabel?.snp_left)!).offset(-2)
-                make.size.equalTo(25)
-                
-            }
+            UserMemberTotalBeanViewModel.shared.userMemberGetTotalBeanApi()
         }
     }
     
-    override func setupViews() {
+    func setScrollNumberLabel() {
+        if scrollNumberLabel != nil {
+            scrollNumberLabel?.removeFromSuperview()
+        }
         scrollNumberLabel = DPScrollNumberLabel.init(number: 0, fontSize: 16, textColor: kFFA42FColor, signSetting: SignSetting.unsigned)
         scrollNumberLabel?.addTapGesture(1, target: self, action: #selector(skittles))
+        addSubview(scrollNumberLabel!)
+    }
+    
+    override func setupViews() {
+
         addSubview(leftButton)
         addSubview(rightButton)
-        addSubview(scrollNumberLabel!)
+        setScrollNumberLabel()
         addSubview(searchBgView)
         searchBgView.addSubview(searchIconImageView)
         searchBgView.addSubview(searchTextField)
@@ -75,8 +71,7 @@ class CommunityNavigationBarView: BaseView {
             let totalBeanModel = notification.object as? TotalBeanModel
             
 //            self?.rightButton.play()
-            self?.scrollNumberLabel!.change(to: NSNumber(value: totalBeanModel?.todayBean ?? 0) , animated: true)
-            
+            self?.setScrollNumberLabel()
             if totalBeanModel?.todayBean == 0 {
                 self?.scrollNumberLabel?.isHidden  = true
                 self?.rightButton.snp.remakeConstraints { (make) in
@@ -86,6 +81,7 @@ class CommunityNavigationBarView: BaseView {
                 }
             }else {
                 self?.scrollNumberLabel?.isHidden  = false
+                self?.scrollNumberLabel?.change(to: totalBeanModel?.todayBean as NSNumber?, animated: true)
                 self?.scrollNumberLabel!.snp_remakeConstraints { (make) in
                     make.centerY.equalToSuperview()
                     make.size.equalTo((self?.scrollNumberLabel!.frame.size)!)