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
51cc70cb
Commit
51cc70cb
authored
Feb 20, 2020
by
konghaorui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
移动MineFragment至main目录下
parent
d8586cc0
Hide whitespace changes
Inline
Side-by-side
Showing
27 changed files
with
26 additions
and
28 deletions
+26
-28
MainActivity.kt
app/src/main/java/com/ydl/component/MainActivity.kt
+2
-2
TestAppActivity.kt
app/src/main/java/com/ydl/component/TestAppActivity.kt
+1
-1
FragmentContainerActivity.kt
app/src/main/java/com/ydl/component/music/FragmentContainerActivity.kt
+10
-4
config.gradle
config.gradle
+1
-1
MineFragment.java
m-user/src/main/java/com/yidianling/user/mine/MineFragment.java
+5
-7
UserServiceImp.kt
m-user/src/main/java/com/yidianling/user/modular_service/UserServiceImp.kt
+1
-0
user_mine_app_mine_aboutus.png
m-user/src/main/res/drawable-xhdpi/user_mine_app_mine_aboutus.png
+0
-0
user_mine_app_mine_introduce.png
m-user/src/main/res/drawable-xhdpi/user_mine_app_mine_introduce.png
+0
-0
user_mine_ic_account_charge.png
m-user/src/main/res/drawable-xhdpi/user_mine_ic_account_charge.png
+0
-0
user_mine_ic_helep.png
m-user/src/main/res/drawable-xhdpi/user_mine_ic_helep.png
+0
-0
user_mine_ic_mine_setting.png
m-user/src/main/res/drawable-xhdpi/user_mine_ic_mine_setting.png
+0
-0
user_mine_ic_mine_setting_info.png
m-user/src/main/res/drawable-xhdpi/user_mine_ic_mine_setting_info.png
+0
-0
user_mine_ic_mine_share.png
m-user/src/main/res/drawable-xhdpi/user_mine_ic_mine_share.png
+0
-0
user_mine_ic_my_course.png
m-user/src/main/res/drawable-xhdpi/user_mine_ic_my_course.png
+0
-0
user_mine_ic_order.png
m-user/src/main/res/drawable-xhdpi/user_mine_ic_order.png
+0
-0
user_mine_ic_qinshu_record.png
m-user/src/main/res/drawable-xhdpi/user_mine_ic_qinshu_record.png
+0
-0
user_mine_ic_red_pack.png
m-user/src/main/res/drawable-xhdpi/user_mine_ic_red_pack.png
+0
-0
user_mine_ic_safe.png
m-user/src/main/res/drawable-xhdpi/user_mine_ic_safe.png
+0
-0
user_mine_ic_tuiguang.png
m-user/src/main/res/drawable-xhdpi/user_mine_ic_tuiguang.png
+0
-0
user_mine_profile_bg_11.png
m-user/src/main/res/drawable-xhdpi/user_mine_profile_bg_11.png
+0
-0
user_mine_ruzhu.png
m-user/src/main/res/drawable-xhdpi/user_mine_ruzhu.png
+0
-0
user_mine_background_red_point_new_coupon.xml
m-user/src/main/res/drawable/user_mine_background_red_point_new_coupon.xml
+0
-0
user_mine_fragment_mine.xml
m-user/src/main/res/layout/user_mine_fragment_mine.xml
+0
-0
colors.xml
m-user/src/main/res/values/colors.xml
+1
-1
styles.xml
m-user/src/main/res/values/styles.xml
+5
-1
colors.xml
m-user/src/ydl/res/values/colors.xml
+0
-2
strings.xml
m-user/src/ydl/res/values/strings.xml
+0
-9
No files found.
app/src/main/java/com/ydl/component/MainActivity.kt
View file @
51cc70cb
...
@@ -148,8 +148,8 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
...
@@ -148,8 +148,8 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
.
navigation
()
.
navigation
()
}
}
bt_to_home
.
setOnClickListener
{
bt_to_home
.
setOnClickListener
{
// FragmentContainerActivity.start(this, "YdlHom
eFragment")
FragmentContainerActivity
.
start
(
this
,
"Min
eFragment"
)
startActivity
(
Intent
(
this
,
TestAppActivity
::
class
.
java
))
//
startActivity(Intent(this, TestAppActivity::class.java))
}
}
}
}
...
...
app/src/main/java/com/ydl/component/TestAppActivity.kt
View file @
51cc70cb
...
@@ -6,7 +6,7 @@ import android.support.v4.app.FragmentPagerAdapter
...
@@ -6,7 +6,7 @@ import android.support.v4.app.FragmentPagerAdapter
import
android.support.v7.app.AppCompatActivity
import
android.support.v7.app.AppCompatActivity
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
com.yidianling.user.MineFragment
import
com.yidianling.user.
mine.
MineFragment
import
kotlinx.android.synthetic.main.activity_test_app.*
import
kotlinx.android.synthetic.main.activity_test_app.*
import
java.util.*
import
java.util.*
...
...
app/src/main/java/com/ydl/component/music/FragmentContainerActivity.kt
View file @
51cc70cb
...
@@ -13,12 +13,14 @@ import com.yidianling.home.ui.fragment.YdlHomeFragment
...
@@ -13,12 +13,14 @@ import com.yidianling.home.ui.fragment.YdlHomeFragment
//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
com.yidianling.im.ui.page.NewMultiMessageFragment
import
com.yidianling.im.ui.page.NewMultiMessageFragment
import
com.yidianling.user.mine.MineFragment
class
FragmentContainerActivity
:
BaseLceActivity
<
DemoContract
.
View
,
DemoContract
.
Presenter
>(),
DemoContract
.
View
{
class
FragmentContainerActivity
:
BaseLceActivity
<
DemoContract
.
View
,
DemoContract
.
Presenter
>(),
DemoContract
.
View
{
companion
object
{
companion
object
{
fun
start
(
context
:
Context
,
fragmentName
:
String
=
""
)
{
fun
start
(
context
:
Context
,
fragmentName
:
String
=
""
)
{
val
intent
=
Intent
(
context
,
FragmentContainerActivity
::
class
.
java
)
val
intent
=
Intent
(
context
,
FragmentContainerActivity
::
class
.
java
)
intent
.
putExtra
(
"fragmentName"
,
fragmentName
)
intent
.
putExtra
(
"fragmentName"
,
fragmentName
)
context
.
startActivity
(
intent
)
context
.
startActivity
(
intent
)
...
@@ -36,6 +38,7 @@ class FragmentContainerActivity : BaseLceActivity<DemoContract.View, DemoContra
...
@@ -36,6 +38,7 @@ class FragmentContainerActivity : BaseLceActivity<DemoContract.View, DemoContra
override
fun
getStateViewId
():
Int
{
override
fun
getStateViewId
():
Int
{
return
com
.
ydl
.
component
.
R
.
id
.
lce_state_view
return
com
.
ydl
.
component
.
R
.
id
.
lce_state_view
}
}
override
fun
createPresenter
():
DemoContract
.
Presenter
{
override
fun
createPresenter
():
DemoContract
.
Presenter
{
return
DemoPresenter
()
return
DemoPresenter
()
}
}
...
@@ -60,7 +63,7 @@ class FragmentContainerActivity : BaseLceActivity<DemoContract.View, DemoContra
...
@@ -60,7 +63,7 @@ class FragmentContainerActivity : BaseLceActivity<DemoContract.View, DemoContra
}
}
private
fun
getFragment
():
Fragment
{
private
fun
getFragment
():
Fragment
{
val
fragmentName
=
intent
.
getStringExtra
(
"fragmentName"
)
?:
""
val
fragmentName
=
intent
.
getStringExtra
(
"fragmentName"
)
?:
""
if
(
"NewMultiMessageFragment"
==
fragmentName
)
{
if
(
"NewMultiMessageFragment"
==
fragmentName
)
{
return
NewMultiMessageFragment
()
return
NewMultiMessageFragment
()
}
}
...
@@ -73,6 +76,9 @@ class FragmentContainerActivity : BaseLceActivity<DemoContract.View, DemoContra
...
@@ -73,6 +76,9 @@ class FragmentContainerActivity : BaseLceActivity<DemoContract.View, DemoContra
if
(
"ExpertSearchFragment"
==
fragmentName
)
{
if
(
"ExpertSearchFragment"
==
fragmentName
)
{
return
ExpertSearchFragment
()
return
ExpertSearchFragment
()
}
}
if
(
"MineFragment"
==
fragmentName
)
{
return
MineFragment
()
}
return
PlayFragment
()
return
PlayFragment
()
}
}
}
}
config.gradle
View file @
51cc70cb
ext
{
ext
{
kotlin_version
=
"1.3.21"
kotlin_version
=
"1.3.21"
dev_mode
=
fals
e
dev_mode
=
tru
e
ydl_app
=
[
ydl_app
=
[
appName
:
"心理咨询壹点灵"
,
appName
:
"心理咨询壹点灵"
,
...
...
m-user/src/
ydl/java/com/yidianling/user
/MineFragment.java
→
m-user/src/
main/java/com/yidianling/user/mine
/MineFragment.java
View file @
51cc70cb
package
com
.
yidianling
.
user
;
package
com
.
yidianling
.
user
.
mine
;
import
android.annotation.SuppressLint
;
import
android.annotation.SuppressLint
;
import
android.content.Intent
;
import
android.content.Intent
;
...
@@ -31,15 +31,13 @@ import com.ydl.ydlcommon.view.widgets.BorderCircleImageView;
...
@@ -31,15 +31,13 @@ import com.ydl.ydlcommon.view.widgets.BorderCircleImageView;
import
com.yidianling.dynamic.api.IDynamicService
;
import
com.yidianling.dynamic.api.IDynamicService
;
import
com.yidianling.im.api.service.IImService
;
import
com.yidianling.im.api.service.IImService
;
import
com.yidianling.im.message.param.MsgListParam
;
import
com.yidianling.im.message.param.MsgListParam
;
import
com.yidianling.user.BuildConfig
;
import
com.yidianling.user.R
;
import
com.yidianling.user.UserHelper
;
import
com.yidianling.user.api.bean.UserResponseBean
;
import
com.yidianling.user.api.bean.UserResponseBean
;
import
com.yidianling.user.api.event.RefreshRecentContactListEvent
;
import
com.yidianling.user.api.service.IAppService
;
import
com.yidianling.user.api.service.IAppService
;
import
com.yidianling.user.mine.AboutUsActivity
;
import
com.yidianling.user.mine.AccountHistoryActivity
;
import
com.yidianling.user.mine.AccountSettingActivity
;
import
com.yidianling.user.mine.PersonalInfoActivity
;
import
com.yidianling.user.mine.UserChangeEvent
;
import
com.yidianling.user.mine.data.AppDataManager
;
import
com.yidianling.user.mine.data.AppDataManager
;
import
com.yidianling.user.api.event.RefreshRecentContactListEvent
;
import
com.yidianling.user.mine.http.MineHttpImpl
;
import
com.yidianling.user.mine.http.MineHttpImpl
;
import
com.yidianling.user.safePrivate.PrivacyActivity
;
import
com.yidianling.user.safePrivate.PrivacyActivity
;
import
com.yidianling.user.ui.login.RegisterAndLoginActivity
;
import
com.yidianling.user.ui.login.RegisterAndLoginActivity
;
...
...
m-user/src/main/java/com/yidianling/user/modular_service/UserServiceImp.kt
View file @
51cc70cb
...
@@ -22,6 +22,7 @@ import com.yidianling.user.api.listener.UserInfoFromApiListener
...
@@ -22,6 +22,7 @@ import com.yidianling.user.api.listener.UserInfoFromApiListener
import
com.yidianling.user.api.listener.VersionUpdateStatusListener
import
com.yidianling.user.api.listener.VersionUpdateStatusListener
import
com.yidianling.user.api.service.IUserService
import
com.yidianling.user.api.service.IUserService
import
com.yidianling.user.http.UserHttpImpl
import
com.yidianling.user.http.UserHttpImpl
import
com.yidianling.user.mine.MineFragment
import
com.yidianling.user.mine.data.AppDataManager
import
com.yidianling.user.mine.data.AppDataManager
import
com.yidianling.user.mine.utils.UpdateUtil
import
com.yidianling.user.mine.utils.UpdateUtil
import
com.yidianling.user.route.UserIn
import
com.yidianling.user.route.UserIn
...
...
m-user/src/
ydl
/res/drawable-xhdpi/user_mine_app_mine_aboutus.png
→
m-user/src/
main
/res/drawable-xhdpi/user_mine_app_mine_aboutus.png
View file @
51cc70cb
File moved
m-user/src/
ydl
/res/drawable-xhdpi/user_mine_app_mine_introduce.png
→
m-user/src/
main
/res/drawable-xhdpi/user_mine_app_mine_introduce.png
View file @
51cc70cb
File moved
m-user/src/
ydl
/res/drawable-xhdpi/user_mine_ic_account_charge.png
→
m-user/src/
main
/res/drawable-xhdpi/user_mine_ic_account_charge.png
View file @
51cc70cb
File moved
m-user/src/
ydl
/res/drawable-xhdpi/user_mine_ic_helep.png
→
m-user/src/
main
/res/drawable-xhdpi/user_mine_ic_helep.png
View file @
51cc70cb
File moved
m-user/src/
ydl
/res/drawable-xhdpi/user_mine_ic_mine_setting.png
→
m-user/src/
main
/res/drawable-xhdpi/user_mine_ic_mine_setting.png
View file @
51cc70cb
File moved
m-user/src/
ydl
/res/drawable-xhdpi/user_mine_ic_mine_setting_info.png
→
m-user/src/
main
/res/drawable-xhdpi/user_mine_ic_mine_setting_info.png
View file @
51cc70cb
File moved
m-user/src/
ydl
/res/drawable-xhdpi/user_mine_ic_mine_share.png
→
m-user/src/
main
/res/drawable-xhdpi/user_mine_ic_mine_share.png
View file @
51cc70cb
File moved
m-user/src/
ydl
/res/drawable-xhdpi/user_mine_ic_my_course.png
→
m-user/src/
main
/res/drawable-xhdpi/user_mine_ic_my_course.png
View file @
51cc70cb
File moved
m-user/src/
ydl
/res/drawable-xhdpi/user_mine_ic_order.png
→
m-user/src/
main
/res/drawable-xhdpi/user_mine_ic_order.png
View file @
51cc70cb
File moved
m-user/src/
ydl
/res/drawable-xhdpi/user_mine_ic_qinshu_record.png
→
m-user/src/
main
/res/drawable-xhdpi/user_mine_ic_qinshu_record.png
View file @
51cc70cb
File moved
m-user/src/
ydl
/res/drawable-xhdpi/user_mine_ic_red_pack.png
→
m-user/src/
main
/res/drawable-xhdpi/user_mine_ic_red_pack.png
View file @
51cc70cb
File moved
m-user/src/
ydl
/res/drawable-xhdpi/user_mine_ic_safe.png
→
m-user/src/
main
/res/drawable-xhdpi/user_mine_ic_safe.png
View file @
51cc70cb
File moved
m-user/src/
ydl
/res/drawable-xhdpi/user_mine_ic_tuiguang.png
→
m-user/src/
main
/res/drawable-xhdpi/user_mine_ic_tuiguang.png
View file @
51cc70cb
File moved
m-user/src/
ydl
/res/drawable-xhdpi/user_mine_profile_bg_11.png
→
m-user/src/
main
/res/drawable-xhdpi/user_mine_profile_bg_11.png
View file @
51cc70cb
File moved
m-user/src/
ydl
/res/drawable-xhdpi/user_mine_ruzhu.png
→
m-user/src/
main
/res/drawable-xhdpi/user_mine_ruzhu.png
View file @
51cc70cb
File moved
m-user/src/
ydl
/res/drawable/user_mine_background_red_point_new_coupon.xml
→
m-user/src/
main
/res/drawable/user_mine_background_red_point_new_coupon.xml
View file @
51cc70cb
File moved
m-user/src/
ydl
/res/layout/user_mine_fragment_mine.xml
→
m-user/src/
main
/res/layout/user_mine_fragment_mine.xml
View file @
51cc70cb
File moved
m-user/src/main/res/values/colors.xml
View file @
51cc70cb
...
@@ -40,5 +40,5 @@
...
@@ -40,5 +40,5 @@
<!--动态-->
<!--动态-->
<!--动态顶部title背景变色-->
<!--动态顶部title背景变色-->
<color
name=
"user_with_status_fail"
>
#fcff6600
</color>
</resources>
</resources>
m-user/src/main/res/values/styles.xml
View file @
51cc70cb
<resources>
<resources>
<style
name=
"user_new_divide_color_style"
>
<item
name=
"android:layout_width"
>
match_parent
</item>
<item
name=
"android:layout_height"
>
0.5dp
</item>
<item
name=
"android:background"
>
@color/platform_color_F0F0F0
</item>
</style>
</resources>
</resources>
m-user/src/ydl/res/values/colors.xml
View file @
51cc70cb
...
@@ -6,6 +6,4 @@
...
@@ -6,6 +6,4 @@
<color
name=
"user_main_theme_light"
>
#60BDF5
</color>
<color
name=
"user_main_theme_light"
>
#60BDF5
</color>
<!--主题亮色-->
<!--主题亮色-->
<color
name=
"user_main_theme_bright"
>
#E8F6FF
</color>
<color
name=
"user_main_theme_bright"
>
#E8F6FF
</color>
<color
name=
"user_with_status_fail"
>
#fcff6600
</color>
</resources>
</resources>
m-user/src/ydl/res/values/strings.xml
deleted
100644 → 0
View file @
d8586cc0
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style
name=
"user_new_divide_color_style"
>
<item
name=
"android:layout_width"
>
match_parent
</item>
<item
name=
"android:layout_height"
>
0.5dp
</item>
<item
name=
"android:background"
>
@color/platform_color_F0F0F0
</item>
</style>
</resources>
\ No newline at end of file
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