Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
YDL-Component-Medical
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
杨凯
YDL-Component-Medical
Commits
e206b6d5
Commit
e206b6d5
authored
Dec 10, 2019
by
konghaorui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
补充 私聊入口
parent
9b2da4a1
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
44 additions
and
21 deletions
+44
-21
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+1
-1
MainActivity.kt
app/src/main/java/com/ydl/component/MainActivity.kt
+5
-2
FragmentContainerActivity.kt
app/src/main/java/com/ydl/component/music/FragmentContainerActivity.kt
+29
-15
activity_fragment_container.xml
app/src/main/res/layout/activity_fragment_container.xml
+0
-0
activity_main.xml
app/src/main/res/layout/activity_main.xml
+7
-1
build.gradle
m-home/build.gradle
+2
-2
No files found.
app/src/main/AndroidManifest.xml
View file @
e206b6d5
...
...
@@ -22,7 +22,7 @@
android:theme=
"@style/platform_CommonTheme"
tools:ignore=
"GoogleAppIndexingWarning"
tools:replace=
"android:allowBackup, android:icon, android:label"
>
<activity
android:name=
".music.
MusicPlay
Activity"
<activity
android:name=
".music.
FragmentContainer
Activity"
android:theme=
"@style/platform_NoTitleTheme"
/>
<!-- <activity android:name="com.yidianling.user.ui.login.RegisterAndLoginActivity" -->
<!-- <activity android:name=".MainActivity"/> -->
...
...
app/src/main/java/com/ydl/component/MainActivity.kt
View file @
e206b6d5
...
...
@@ -14,7 +14,7 @@ import com.alibaba.android.arouter.launcher.ARouter
import
com.tbruyelle.rxpermissions2.RxPermissions
import
com.umeng.analytics.MobclickAgent
import
com.ydl.audioim.YDLavManager
import
com.ydl.component.music.
MusicPlay
Activity
import
com.ydl.component.music.
FragmentContainer
Activity
import
com.ydl.component.mvp.DemoContract
import
com.ydl.component.mvp.DemoPresenter
import
com.ydl.confide.home.ConfideHomeActivity
...
...
@@ -92,7 +92,10 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
.
navigation
()
}
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
{
startActivity
(
Intent
(
this
,
NewTestHomeActivity
::
class
.
java
))
...
...
app/src/main/java/com/ydl/component/music/
MusicPlay
Activity.kt
→
app/src/main/java/com/ydl/component/music/
FragmentContainer
Activity.kt
View file @
e206b6d5
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.DemoPresenter
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
{
return
R
.
id
.
lce_content_view
return
com
.
ydl
.
component
.
R
.
id
.
lce_content_view
}
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
{
return
DemoPresenter
()
}
override
fun
layoutResId
():
Int
{
return
R
.
layout
.
activity_music_play
return
com
.
ydl
.
component
.
R
.
layout
.
activity_fragment_container
}
override
fun
initDataAndEvent
()
{
...
...
@@ -34,13 +45,16 @@ class MusicPlayActivity : BaseLceActivity<DemoContract.View, DemoContract.Prese
override
fun
setData
(
data
:
String
)
{
val
ft
=
supportFragmentManager
.
beginTransaction
()
ft
.
setCustomAnimations
(
R
.
anim
.
fragment_slide_up
,
0
)
if
(
mPlayFragment
==
null
)
{
mPlayFragment
=
PlayFragment
()
ft
.
replace
(
android
.
R
.
id
.
content
,
mPlayFragment
)
}
else
{
ft
.
show
(
mPlayFragment
)
}
ft
.
setCustomAnimations
(
com
.
ydl
.
component
.
R
.
anim
.
fragment_slide_up
,
0
)
ft
.
replace
(
android
.
R
.
id
.
content
,
getFragment
())
ft
.
commitAllowingStateLoss
()
}
private
fun
getFragment
():
Fragment
{
val
fragmentName
=
intent
.
getStringExtra
(
"fragmentName"
)
?:
""
if
(
"NewMultiMessageFragment"
==
fragmentName
)
{
return
NewMultiMessageFragment
()
}
return
PlayFragment
()
}
}
app/src/main/res/layout/activity_
music_play
.xml
→
app/src/main/res/layout/activity_
fragment_container
.xml
View file @
e206b6d5
File moved
app/src/main/res/layout/activity_main.xml
View file @
e206b6d5
...
...
@@ -169,7 +169,13 @@
android:layout_marginRight=
"10dp"
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>
...
...
m-home/build.gradle
View file @
e206b6d5
...
...
@@ -68,8 +68,8 @@ dependencies {
if
(
rootProject
.
ext
.
dev_mode
){
//开发时使用
implementation
"com.ydl:m-consultant-api:0.0.3"
implementation
"com.ydl:m-user-api:0.0.7"
implementation
modularPublication
(
'com.ydl:m-consultant-api'
)
implementation
modularPublication
(
'com.ydl:m-user-api'
)
implementation
project
(
':ydl-webview'
)
implementation
project
(
':ydl-media'
)
implementation
project
(
":ydl-platform"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment