Commit 6c72f6e9 by 严久程

Merge branch '咨询加声网' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into 咨询加声网

parents 205843ba d2e3abca
...@@ -4,6 +4,7 @@ import android.os.Bundle ...@@ -4,6 +4,7 @@ import android.os.Bundle
import android.support.v4.app.Fragment import android.support.v4.app.Fragment
import android.support.v4.app.FragmentPagerAdapter import android.support.v4.app.FragmentPagerAdapter
import android.support.v7.app.AppCompatActivity import android.support.v7.app.AppCompatActivity
import com.yidianling.consultant.ExpertSearchFragment
import com.yidianling.dynamic.trendsHome.TrendsHomeFragment import com.yidianling.dynamic.trendsHome.TrendsHomeFragment
import com.yidianling.home.ui.fragment.YdlHomeFragment import com.yidianling.home.ui.fragment.YdlHomeFragment
import kotlinx.android.synthetic.main.activity_test_app.* import kotlinx.android.synthetic.main.activity_test_app.*
...@@ -25,6 +26,7 @@ class TestAppActivity : AppCompatActivity() { ...@@ -25,6 +26,7 @@ class TestAppActivity : AppCompatActivity() {
setContentView(R.layout.activity_test_app) setContentView(R.layout.activity_test_app)
fragments.add(YdlHomeFragment()) fragments.add(YdlHomeFragment())
fragments.add(ExpertSearchFragment())
fragments.add(TrendsHomeFragment().setTab("trend_tap")) fragments.add(TrendsHomeFragment().setTab("trend_tap"))
val adapter: FragmentPagerAdapter = val adapter: FragmentPagerAdapter =
object : FragmentPagerAdapter(supportFragmentManager) { object : FragmentPagerAdapter(supportFragmentManager) {
......
...@@ -307,7 +307,7 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres ...@@ -307,7 +307,7 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
override fun setUserVisibleHint(isVisibleToUser: Boolean) { override fun setUserVisibleHint(isVisibleToUser: Boolean) {
super.setUserVisibleHint(isVisibleToUser) super.setUserVisibleHint(isVisibleToUser)
if (isVisibleToUser && isResumed) { if (isVisibleToUser && isResumed && userVisibleHint) {
showConsultAssistantDialog() showConsultAssistantDialog()
} else { } else {
hideConsultAssistantDialog() hideConsultAssistantDialog()
......
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