合并代码

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

@@ -184,12 +184,6 @@ class HomeViewController:BaseViewController {
         }
         view.addSubview(homeView!)
     }
-    
-
-    override func viewDidAppear(_ animated: Bool) {
-        super.viewDidAppear(animated)
-        barHidden = false
-    }
 
     
     func loadLaunchView(){
@@ -251,8 +245,6 @@ class HomeViewController:BaseViewController {
     }
     
     
->>>>>>> dev_main
-    
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         if !isShowCharge {