Commit e206b6d5 by konghaorui

补充 私聊入口

parent 9b2da4a1
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
android:theme="@style/platform_CommonTheme" android:theme="@style/platform_CommonTheme"
tools:ignore="GoogleAppIndexingWarning" tools:ignore="GoogleAppIndexingWarning"
tools:replace="android:allowBackup, android:icon, android:label"> tools:replace="android:allowBackup, android:icon, android:label">
<activity android:name=".music.MusicPlayActivity" <activity android:name=".music.FragmentContainerActivity"
android:theme="@style/platform_NoTitleTheme" /> android:theme="@style/platform_NoTitleTheme" />
<!-- <activity android:name="com.yidianling.user.ui.login.RegisterAndLoginActivity" --> <!-- <activity android:name="com.yidianling.user.ui.login.RegisterAndLoginActivity" -->
<!-- <activity android:name=".MainActivity"/> --> <!-- <activity android:name=".MainActivity"/> -->
......
...@@ -14,7 +14,7 @@ import com.alibaba.android.arouter.launcher.ARouter ...@@ -14,7 +14,7 @@ import com.alibaba.android.arouter.launcher.ARouter
import com.tbruyelle.rxpermissions2.RxPermissions import com.tbruyelle.rxpermissions2.RxPermissions
import com.umeng.analytics.MobclickAgent import com.umeng.analytics.MobclickAgent
import com.ydl.audioim.YDLavManager import com.ydl.audioim.YDLavManager
import com.ydl.component.music.MusicPlayActivity import com.ydl.component.music.FragmentContainerActivity
import com.ydl.component.mvp.DemoContract import com.ydl.component.mvp.DemoContract
import com.ydl.component.mvp.DemoPresenter import com.ydl.component.mvp.DemoPresenter
import com.ydl.confide.home.ConfideHomeActivity import com.ydl.confide.home.ConfideHomeActivity
...@@ -92,7 +92,10 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>( ...@@ -92,7 +92,10 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
.navigation() .navigation()
} }
bt_to_music.setOnClickListener { bt_to_music.setOnClickListener {
startActivity(Intent(this, MusicPlayActivity::class.java)) FragmentContainerActivity.start(this)
}
bt_to_im.setOnClickListener {
FragmentContainerActivity.start(this,"NewMultiMessageFragment")
} }
bt_to_tests.setOnClickListener { bt_to_tests.setOnClickListener {
startActivity(Intent(this, NewTestHomeActivity::class.java)) startActivity(Intent(this, NewTestHomeActivity::class.java))
......
package com.ydl.component.music package com.ydl.component.music
import com.ydl.component.R import android.content.Context
import android.content.Intent
import android.support.v4.app.Fragment
import com.ydl.component.mvp.DemoContract import com.ydl.component.mvp.DemoContract
import com.ydl.component.mvp.DemoPresenter import com.ydl.component.mvp.DemoPresenter
import com.ydl.ydlcommon.mvp.lce.BaseLceActivity import com.ydl.ydlcommon.mvp.lce.BaseLceActivity
import com.yidianling.im.ui.page.NewMultiMessageFragment
class FragmentContainerActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(), DemoContract.View {
companion object{
fun start(context: Context,fragmentName : String = "") {
val intent = Intent(context, FragmentContainerActivity::class.java)
intent.putExtra("fragmentName", fragmentName)
context.startActivity(intent)
}
}
class MusicPlayActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(), DemoContract.View {
override fun getContentViewId(): Int { override fun getContentViewId(): Int {
return R.id.lce_content_view return com.ydl.component.R.id.lce_content_view
} }
override fun getStateViewId(): Int { override fun getStateViewId(): Int {
return R.id.lce_state_view return com.ydl.component.R.id.lce_state_view
} }
private var mPlayFragment: PlayFragment? = null
override fun createPresenter(): DemoContract.Presenter { override fun createPresenter(): DemoContract.Presenter {
return DemoPresenter() return DemoPresenter()
} }
override fun layoutResId(): Int { override fun layoutResId(): Int {
return R.layout.activity_music_play return com.ydl.component.R.layout.activity_fragment_container
} }
override fun initDataAndEvent() { override fun initDataAndEvent() {
...@@ -34,13 +45,16 @@ class MusicPlayActivity : BaseLceActivity<DemoContract.View, DemoContract.Prese ...@@ -34,13 +45,16 @@ class MusicPlayActivity : BaseLceActivity<DemoContract.View, DemoContract.Prese
override fun setData(data: String) { override fun setData(data: String) {
val ft = supportFragmentManager.beginTransaction() val ft = supportFragmentManager.beginTransaction()
ft.setCustomAnimations(R.anim.fragment_slide_up, 0) ft.setCustomAnimations(com.ydl.component.R.anim.fragment_slide_up, 0)
if (mPlayFragment == null) { ft.replace(android.R.id.content, getFragment())
mPlayFragment = PlayFragment()
ft.replace(android.R.id.content, mPlayFragment)
} else {
ft.show(mPlayFragment)
}
ft.commitAllowingStateLoss() ft.commitAllowingStateLoss()
} }
private fun getFragment(): Fragment {
val fragmentName = intent.getStringExtra("fragmentName")?:""
if ("NewMultiMessageFragment" == fragmentName) {
return NewMultiMessageFragment()
}
return PlayFragment()
}
} }
...@@ -169,7 +169,13 @@ ...@@ -169,7 +169,13 @@
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:text="首页" /> android:text="首页" />
<Button
android:id="@+id/bt_to_im"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginRight="10dp"
android:text="私聊" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
......
...@@ -68,8 +68,8 @@ dependencies { ...@@ -68,8 +68,8 @@ dependencies {
if (rootProject.ext.dev_mode){ if (rootProject.ext.dev_mode){
//开发时使用 //开发时使用
implementation "com.ydl:m-consultant-api:0.0.3" implementation modularPublication('com.ydl:m-consultant-api')
implementation "com.ydl:m-user-api:0.0.7" implementation modularPublication('com.ydl:m-user-api')
implementation project(':ydl-webview') implementation project(':ydl-webview')
implementation project(':ydl-media') implementation project(':ydl-media')
implementation project(":ydl-platform") implementation project(":ydl-platform")
......
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