合并代码

PhoneManager/Class/Page/Home/Controller/HomeViewController.swift

@@ -186,12 +186,6 @@ class HomeViewController:BaseViewController {
     }
 
     
-    override func viewDidAppear(_ animated: Bool) {
-        super.viewDidAppear(animated)
-        barHidden = false
-    }
-
-    
     func loadLaunchView(){
         let luanch = HomeLaunchView(frame: CGRect(x: 0, y: 0, width: ScreenW, height: ScreenH))
         luanch.show()
@@ -251,8 +245,6 @@ class HomeViewController:BaseViewController {
     }
     
     
->>>>>>> dev_main
-    
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         if !isShowCharge {