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
50f3dd7e
Commit
50f3dd7e
authored
Jun 03, 2022
by
刘鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 冥想service删除注释代码,home组件ydl包内容迁移位置
parent
96033667
Show whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
76 additions
and
37 deletions
+76
-37
MainActivity.kt
app/src/main/java/com/ydl/component/MainActivity.kt
+1
-0
DemoGlobalConfig.java
app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java
+2
-2
WVClickAbstractListener.java
app/src/main/java/com/ydl/component/service/web/WVClickAbstractListener.java
+5
-7
common_dialog_default_in.xml
app/src/main/res/anim/common_dialog_default_in.xml
+20
-0
common_dialog_default_out.xml
app/src/main/res/anim/common_dialog_default_out.xml
+22
-0
styles.xml
m-home/src/main/res/values/styles.xml
+2
-8
YdlHomeFragment.kt
m-home/src/xlzx/java/com/yidianling/home/ui/fragment/YdlHomeFragment.kt
+1
-1
HomeButtonBannerView.kt
m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeButtonBannerView.kt
+1
-1
HomeConfideExpertInfoView.kt
m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeConfideExpertInfoView.kt
+3
-3
MeditationTypeAdapter.kt
m-home/src/ydl/java/com/yidianling/home/adapter/MeditationTypeAdapter.kt
+4
-4
MeditationViewPagerAdapter.kt
m-home/src/ydl/java/com/yidianling/home/adapter/MeditationViewPagerAdapter.kt
+3
-2
HomeMuseView.kt
m-home/src/ydl/java/com/yidianling/home/ui/view/HomeMuseView.kt
+1
-1
AdaptiveVideoView.kt
m-home/src/ydl/java/com/yidianling/home/widget/AdaptiveVideoView.kt
+0
-0
home_layout_meditation_entrance.xml
m-home/src/ydl/res/layout/home_layout_meditation_entrance.xml
+0
-0
home_layout_meditation_item.xml
m-home/src/ydl/res/layout/home_layout_meditation_item.xml
+0
-0
home_layout_meditation_more_type.xml
m-home/src/ydl/res/layout/home_layout_meditation_more_type.xml
+0
-0
styles.xml
m-home/src/ydl/res/values/styles.xml
+11
-0
MeditationWindowService.kt
m-muse/src/main/java/com/yidianling/muse/service/MeditationWindowService.kt
+0
-8
No files found.
app/src/main/java/com/ydl/component/MainActivity.kt
View file @
50f3dd7e
...
...
@@ -291,6 +291,7 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
}
@SuppressLint
(
"MissingSuperCall"
)
override
fun
onDestroy
()
{
if
(
serviceConnection
!=
null
)
{
unbindService
(
serviceConnection
)
...
...
app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java
View file @
50f3dd7e
...
...
@@ -21,9 +21,9 @@ import java.util.List;
public
final
class
DemoGlobalConfig
implements
IConfigModule
{
String
APP_DOMAIN
=
"https://api.github.com/"
;
// public static String appEnv = YDLConstants.ENV_AUTO_TEST;
public
static
String
appEnv
=
YDLConstants
.
ENV_TEST
;
//
public static String appEnv = YDLConstants.ENV_TEST;
// public static String appEnv = YDLConstants.ENV_NEW_TEST;//配置未上传到maven库
//
public static String appEnv = YDLConstants.ENV_PROD;
public
static
String
appEnv
=
YDLConstants
.
ENV_PROD
;
@Override
public
void
injectAppLifecycle
(
@NotNull
Context
context
,
@NotNull
List
<
IAppLifecycles
>
lifecycles
)
{
lifecycles
.
add
(
new
DemoAppLifecycles
());
...
...
app/src/main/java/com/ydl/component/service/web/WVClickAbstractListener.java
View file @
50f3dd7e
...
...
@@ -460,13 +460,6 @@ public class WVClickAbstractListener implements WebViewClientClickListener {
@Override
public
void
playMeditation
(
int
mediaId
,
long
meditationId
,
int
meditationType
,
String
mediaCoverUrl
)
{
public
void
getNextExpertStatus
(
String
doctorID
,
String
title
,
String
uid
)
{
EventBus
.
getDefault
().
post
(
new
ChangeAnotherExpertEvent
(
doctorID
,
title
,
uid
));
}
if
(
mContext
instanceof
NewH5Activity
)
{
// YDLRouterManager.Companion.router(ROUTER_MUSE_PLAY,
// new YDLRouterParams().putExtra("MEDITATION_ID", String.valueOf(meditationId))
...
...
@@ -485,6 +478,11 @@ public class WVClickAbstractListener implements WebViewClientClickListener {
}
@Override
public
void
getNextExpertStatus
(
String
doctorID
,
String
title
,
String
uid
)
{
EventBus
.
getDefault
().
post
(
new
ChangeAnotherExpertEvent
(
doctorID
,
title
,
uid
));
}
@Override
public
void
switchSound
(
int
mediaId
,
long
meditationId
,
int
meditationType
,
int
businessType
,
String
buried
,
String
mediaUrl
,
String
mediaCoverUrl
,
String
title
,
String
desc
,
int
status
)
{
...
...
app/src/main/res/anim/common_dialog_default_in.xml
0 → 100644
View file @
50f3dd7e
<?xml version="1.0" encoding="utf-8"?>
<set
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:android=
"http://schemas.android.com/apk/res/android"
tools:ignore=
"ResourceName"
>
<alpha
android:fromAlpha=
"0.0"
android:toAlpha=
"1.0"
android:duration=
"600"
/>
<scale
android:pivotX=
"50%"
android:pivotY=
"50%"
android:fromXScale=
"0.0"
android:toXScale=
"1.0"
android:fromYScale=
"0.0"
android:toYScale=
"1.0"
android:duration=
"600"
/>
</set>
\ No newline at end of file
app/src/main/res/anim/common_dialog_default_out.xml
0 → 100644
View file @
50f3dd7e
<?xml version="1.0" encoding="utf-8"?>
<set
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:android=
"http://schemas.android.com/apk/res/android"
tools:ignore=
"ResourceName"
>
<alpha
android:duration=
"300"
android:fromAlpha=
"1.0"
android:toAlpha=
"0.0"
/>
<!--
<scale
android:pivotX="50%"
android:pivotY="50%"
android:fromXScale="1.0"
android:toXScale="0.0"
android:fromYScale="1.0"
android:toYScale="0.0"
android:duration="500"/>
-->
</set>
\ No newline at end of file
m-home/src/main/res/values/styles.xml
View file @
50f3dd7e
...
...
@@ -11,13 +11,6 @@
<item
name=
"colorAccent"
>
@color/platform_main_theme
</item>
</style>
<style
name=
"MeditationTabLayoutStyle"
parent=
"Widget.Design.TabLayout"
>
<item
name=
"tabIndicatorColor"
>
@color/white
</item>
<item
name=
"tabIndicatorHeight"
>
2dp
</item>
<item
name=
"tabIndicatorFullWidth"
>
false
</item>
<item
name=
"tabSelectedTextColor"
>
@color/white
</item>
<item
name=
"android:textSize"
>
16sp
</item>
<item
name=
"android:textColor"
>
@color/white_60
</item>
</style>
</resources>
\ No newline at end of file
m-home/src/xlzx/java/com/yidianling/home/ui/fragment/YdlHomeFragment.kt
View file @
50f3dd7e
...
...
@@ -236,7 +236,7 @@ class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterImpl>()
//展示弹窗
if
(
aa
==
null
)
{
//99元3小时弹出事件
ActionCountUtils
.
count
(
HomeBIConstants
.
YDL_HOME_POPUPWINDOWS_PAGE_POPUP
,
act
.
title
)
ActionCountUtils
.
count
(
HomeBIConstants
.
YDL_HOME_POPUPWINDOWS_PAGE_POPUP
,
act
?.
title
?:
"1"
)
aa
=
ActivityDialog
(
mActivity
!!
,
act
.
imageBanner
,
act
.
linkUrl
,
act
.
title
)
aa
?.
show
()
aa
?.
setOnDismissListener
{
...
...
m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeButtonBannerView.kt
View file @
50f3dd7e
...
...
@@ -45,7 +45,7 @@ class HomeButtonBannerView(private val mContext: Context, private var homeEvent:
homeEvent
?.
askMoreClick
()
}
homeModuleButtonBannerThird
.
setOnClickListener
{
homeEvent
?.
nowConfideClick
()
homeEvent
?.
nowConfideClick
(
false
)
}
homeModuleButtonBannerFourth
.
setOnClickListener
{
homeEvent
?.
psychologyTestClick
()
...
...
m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeConfideExpertInfoView.kt
View file @
50f3dd7e
...
...
@@ -74,11 +74,11 @@ class HomeConfideExpertInfoView(
view_line
.
visibility
=
View
.
VISIBLE
}
this
.
setOnClickListener
{
homeEvent
!!
.
confideClick
(
bean
.
linkUrl
,
bean
.
doctorId
)
homeEvent
?.
confideClick
(
bean
.
linkUrl
,
bean
.
confidedId
.
toString
(),
bean
.
doctorId
,
bean
.
uid
.
toString
()
)
}
iv_confide_voice
.
setOnClickListener
{
homeEvent
!!
.
confidePlayClick
(
iv_confide_voice
,
bean
)
homeEvent
?
.
confidePlayClick
(
iv_confide_voice
,
bean
)
}
}
...
...
@@ -147,7 +147,7 @@ class HomeConfideExpertInfoView(
if
(
bodyBean
.
confideLine
==
2
)
{
//喊他上线 私聊
homeEvent
!!
.
toChatForMsg
(
bodyBean
.
uid
.
toString
())
}
else
{
homeEvent
!!
.
confideClick
(
bodyBean
.
linkUrl
,
bodyBean
.
doctorId
)
homeEvent
!!
.
confideClick
(
bodyBean
.
linkUrl
,
bodyBean
.
confidedId
.
toString
(),
bodyBean
.
doctorId
,
bodyBean
.
uid
.
toString
()
)
}
}
}
...
...
m-home/src/
main/java/com/yidianling/home
/MeditationTypeAdapter.kt
→
m-home/src/
ydl/java/com/yidianling/home/adapter
/MeditationTypeAdapter.kt
View file @
50f3dd7e
package
com.yidianling.home
package
com.yidianling.home
.adapter
//import com.ydl.ydlcommon.router.IYDLRouterConstant.Companion.ROUTER_MUSE_PLAY
import
android.content.Context
import
android.view.LayoutInflater
import
android.view.View
...
...
@@ -18,6 +17,7 @@ import com.ydl.webview.NewH5Activity
import
com.ydl.ydlcommon.modular.ModularServiceManager
import
com.ydl.ydlcommon.utils.Utils
import
com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import
com.yidianling.home.R
import
com.yidianling.home.constants.HomeBIConstants
import
com.yidianling.home.model.bean.MeditationModuleBean
import
com.yidianling.user.api.service.IUserService
...
...
@@ -39,13 +39,13 @@ class MeditationTypeAdapter(
CONTENT_TYPE
->
{
MeditationTypeViewHolder
(
LayoutInflater
.
from
(
context
)
.
inflate
(
R
.
layout
.
layout_meditation_item
,
parent
,
false
)
.
inflate
(
R
.
layout
.
home_
layout_meditation_item
,
parent
,
false
)
)
}
else
->
{
MeditationTypeMoreViewHolder
(
LayoutInflater
.
from
(
context
)
.
inflate
(
R
.
layout
.
layout_meditation_more_type
,
parent
,
false
)
.
inflate
(
R
.
layout
.
home_
layout_meditation_more_type
,
parent
,
false
)
)
}
}
...
...
m-home/src/
main/java/com/yidianling/home
/MeditationViewPagerAdapter.kt
→
m-home/src/
ydl/java/com/yidianling/home/adapter
/MeditationViewPagerAdapter.kt
View file @
50f3dd7e
package
com.yidianling.home
package
com.yidianling.home
.adapter
import
android.content.Context
import
android.view.LayoutInflater
...
...
@@ -6,6 +6,7 @@ import android.view.View
import
android.view.ViewGroup
import
androidx.recyclerview.widget.LinearLayoutManager
import
androidx.recyclerview.widget.RecyclerView
import
com.yidianling.home.R
import
com.yidianling.home.model.bean.MeditationModuleBean
class
MeditationViewPagerAdapter
(
private
val
context
:
Context
,
private
val
data
:
...
...
@@ -14,7 +15,7 @@ class MeditationViewPagerAdapter(private val context: Context, private val data:
override
fun
onCreateViewHolder
(
parent
:
ViewGroup
,
viewType
:
Int
):
MeditationViewPagerViewHolder
{
return
MeditationViewPagerViewHolder
(
LayoutInflater
.
from
(
context
).
inflate
(
R
.
layout
.
layout_meditation_entrance
,
parent
,
false
))
.
from
(
context
).
inflate
(
R
.
layout
.
home_
layout_meditation_entrance
,
parent
,
false
))
}
override
fun
onBindViewHolder
(
holder
:
MeditationViewPagerViewHolder
,
position
:
Int
)
{
...
...
m-home/src/ydl/java/com/yidianling/home/ui/view/HomeMuseView.kt
View file @
50f3dd7e
...
...
@@ -18,7 +18,7 @@ import com.ydl.webview.H5Params
import
com.ydl.webview.NewH5Activity
import
com.ydl.ydlcommon.utils.Utils
import
com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import
com.yidianling.home.MeditationViewPagerAdapter
import
com.yidianling.home.
adapter.
MeditationViewPagerAdapter
import
com.yidianling.home.R
import
com.yidianling.home.constants.HomeBIConstants
import
com.yidianling.home.constract.HomeViewConfig
...
...
m-home/src/
main
/java/com/yidianling/home/widget/AdaptiveVideoView.kt
→
m-home/src/
ydl
/java/com/yidianling/home/widget/AdaptiveVideoView.kt
View file @
50f3dd7e
File moved
m-home/src/ydl/res/layout/layout_meditation_entrance.xml
→
m-home/src/ydl/res/layout/
home_
layout_meditation_entrance.xml
View file @
50f3dd7e
File moved
m-home/src/ydl/res/layout/layout_meditation_item.xml
→
m-home/src/ydl/res/layout/
home_
layout_meditation_item.xml
View file @
50f3dd7e
File moved
m-home/src/ydl/res/layout/layout_meditation_more_type.xml
→
m-home/src/ydl/res/layout/
home_
layout_meditation_more_type.xml
View file @
50f3dd7e
File moved
m-home/src/ydl/res/values/styles.xml
View file @
50f3dd7e
...
...
@@ -10,4 +10,14 @@
<style
name=
"activityDialog"
parent=
"NoTitleTheme"
>
<item
name=
"android:windowIsTranslucent"
>
true
</item>
</style>
<style
name=
"MeditationTabLayoutStyle"
parent=
"Widget.Design.TabLayout"
>
<item
name=
"tabIndicatorColor"
>
@color/white
</item>
<item
name=
"tabIndicatorHeight"
>
2dp
</item>
<item
name=
"tabIndicatorFullWidth"
>
false
</item>
<item
name=
"tabSelectedTextColor"
>
@color/white
</item>
<item
name=
"android:textSize"
>
16sp
</item>
<item
name=
"android:textColor"
>
@color/white_60
</item>
</style>
</resources>
\ No newline at end of file
m-muse/src/main/java/com/yidianling/muse/service/MeditationWindowService.kt
View file @
50f3dd7e
...
...
@@ -316,14 +316,6 @@ class MeditationWindowService : Service() {
}
override
fun
onStartCommand
(
intent
:
Intent
?,
flags
:
Int
,
startId
:
Int
):
Int
{
// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
// val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
// val channel = NotificationChannel("壹点灵", "play", NotificationManager.IMPORTANCE_HIGH)
// manager.createNotificationChannel(channel)
// val notification = NotificationCompat.Builder(this, "壹点灵").build()
// startForeground(1, notification)
// }
return
super
.
onStartCommand
(
intent
,
flags
,
startId
)
}
...
...
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