Commit 2ac3e0d7 authored by mengcuiguang2's avatar mengcuiguang2

代码合并

parent b9b31c7b
......@@ -21,7 +21,7 @@ import com.mints.fiveworld.mvp.model.UserTaskMsgBean
import com.mints.fiveworld.mvp.presenters.MainPresenter
import com.mints.fiveworld.mvp.views.MainView
import com.mints.fiveworld.ui.activitys.base.BaseActivity
import com.mints.fiveworld.ui.fragment.WifiFragment
import com.mints.fiveworld.ui.fragment.MainFragment
import com.mints.fiveworld.utils.WifiUtils
import com.permissionx.guolindev.PermissionX
......@@ -45,7 +45,7 @@ class MainActivity : BaseActivity(), MainView {
mainPresenter.attachView(this)
if (threeFragment == null) {
threeFragment = WifiFragment()
threeFragment = MainFragment()
}
if (!threeFragment!!.isAdded) {
......@@ -106,7 +106,7 @@ class MainActivity : BaseActivity(), MainView {
if (AppPreferencesManager.get().getBoolean(Constant.IS_ONE_PERMISSIONS, true)) {
AppPreferencesManager.get().put(Constant.IS_ONE_PERMISSIONS, false)
checkPermission()
(threeFragment as WifiFragment).setIsFirstEnter(true)
(threeFragment as MainFragment).setIsFirstEnter(true)
}
baseApplication.initMiitHelper()
......
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