Merge remote-tracking branch 'origin/release' into d/v_full_text

# Conflicts:
#	app/src/main/java/com/ydl/component/service/web/WVClickAbstractListener.java
#	config.gradle

app/src/main/java/com/ydl/component/MainActivity.kt

@@ -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

@@ -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

@@ -462,11 +462,6 @@ 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 playMeditation(int mediaId, long meditationId, int meditationType, String mediaCoverUrl) {
         if (mContext instanceof NewH5Activity) {
 //            YDLRouterManager.Companion.router(ROUTER_MUSE_PLAY,
@@ -486,6 +481,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

+<?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

+<?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

build.gradle

@@ -76,7 +76,7 @@ apply plugin: 'modular-plugin'
 
 modular {
 
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

config.gradle

@@ -5,21 +5,16 @@ ext {
     ydlPublishVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
-
-            "m-user"          : "0.0.62.36",
-            "m-home"          : "0.0.23.89",
-
-            "m-confide"       : "0.0.50.15",
+            "m-confide"       : "0.0.50.18",
             "m-consultant"    : "0.0.60.27",
             "m-fm"            : "0.0.30.09",
-           
-            "m-im"            : "0.0.21.55",
+            "m-user"          : "0.0.62.26",
+            "m-home"          : "0.0.23.80",
+            "m-im"            : "0.0.21.51",
             "m-dynamic"       : "0.0.7.74",
-
-
             "m-article"       : "0.0.0.10",
 
-            "m-muse"          : "0.0.28.73",
+            "m-muse"          : "0.0.28.75",
             "m-tests"         : "0.0.24.18",
             "m-course"        : "0.0.43.39",
 
@@ -31,7 +26,7 @@ ext {
             "m-fm-api"        : "0.0.3",
             "m-muse-api"      : "0.0.1",
             "m-tests-api"     : "0.0.2",
-            "m-user-api"      : "0.0.10.19",
+            "m-user-api"      : "0.0.10.21",
             "m-home-api"      : "0.0.4.2",
             "m-im-api"        : "0.0.12.24",
             "m-dynamic-api"   : "0.0.3.71",
@@ -99,25 +94,16 @@ ext {
             // -------------- 业务模块 --------------
             //第三步 若干
 
-
-       
-     
-
-            "m-user"          : "0.0.62.36",
-            "m-home"          : "0.0.23.89",
-        
-
-            "m-confide"       : "0.0.50.15",
+            "m-confide"       : "0.0.50.18",
             "m-consultant"    : "0.0.60.27",
             "m-fm"            : "0.0.30.09",
-           
-            
-            "m-im"            : "0.0.21.55",
+            "m-user"          : "0.0.62.26",
+            "m-home"          : "0.0.23.80",
+            "m-im"            : "0.0.21.51",
             "m-dynamic"       : "0.0.7.74",
-
             "m-article"       : "0.0.0.8",
 
-            "m-muse"          : "0.0.28.73",
+            "m-muse"          : "0.0.28.75",
             "m-tests"         : "0.0.24.18",
             "m-course"        : "0.0.43.39",
             //-------------- 业务模块 API 层 --------------
@@ -128,7 +114,7 @@ ext {
             "m-fm-api"        : "0.0.3",
             "m-muse-api"      : "0.0.1",
             "m-tests-api"     : "0.0.2",
-            "m-user-api"      : "0.0.10.19",
+            "m-user-api"      : "0.0.10.21",
             "m-home-api"      : "0.0.4.2",
             "m-im-api"        : "0.0.12.24",
             "m-dynamic-api"   : "0.0.3.71",
@@ -136,19 +122,13 @@ ext {
             //mdt组件
             "ydl-tuicore"   : "0.0.23",
             //第一步
-
             "ydl-platform"    : "0.0.41.32",
 
             //第二步 若干
             "ydl-webview"     : "0.0.38.92",
             "ydl-media"       : "0.0.21.52",
             "ydl-pay"         : "0.0.18.19",
-            "m-audioim"       : "0.0.49.30.11",
-
-
-       
-            
-            
+            "m-audioim"       : "0.0.49.30.12",
             "ydl-flutter-base": "0.0.14.38",
 
             //以下 几乎不会动

m-audioim/src/main/res/layout/audioim_activity_audio_home.xml

@@ -14,6 +14,7 @@
         android:layout_marginRight="@dimen/platform_dp_15"
         android:background="@drawable/audioim_border_white_kefu"
         android:gravity="center_vertical"
+        android:visibility="gone"
         android:orientation="horizontal">
 
         <ImageView

m-confide/src/main/java/com/ydl/confide/intro/IntroAdapter.kt

@@ -91,6 +91,7 @@ internal class IntroAdapter(
             val lastCheck = context.getSharedPreferences("temp_test", Context.MODE_PRIVATE).getLong(keySp, 0)
             val duration = System.currentTimeMillis() - lastCheck
             if (duration < 24 * 60 * 60 * 1000) {
+                hasAgreePlayWithoutWiFi = true
                 return
             }
             val dialog = CommonDialog.create(context)
@@ -114,6 +115,7 @@ internal class IntroAdapter(
                 .setLeftButton_color(R.color.platform_but_text_color_selected)
                 .setRightButton_color(R.color.platform_text_bright_color)
                 .setRightClick("取消") {
+                    hasAgreePlayWithoutWiFi = false
                     for (entry in videoViews.entries) {
                         val value = entry.value
                         if (value.canPause()) {

m-home/src/main/res/values/styles.xml

@@ -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

@@ -22,7 +22,6 @@ import com.ydl.ydlcommon.utils.StatusBarUtils
 import com.ydl.ydlcommon.utils.Utils
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
 import com.ydl.ydlcommon.utils.remind.ToastHelper
-import com.yidianling.common.tools.ToastUtil
 import com.yidianling.consultant.api.IConsultantService
 import com.yidianling.home.R
 import com.yidianling.home.adapter.YdlHomeAdapter
@@ -85,7 +84,7 @@ class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterImpl>()
      * 如果是第一次加载，则调用所有接口进行刷新，否则，只调用咨询和倾诉接口
      */
     private var isFromCreate: Boolean = true
-    var startTime by Delegates.notNull<Long>()
+    var startTime = System.currentTimeMillis()
     var endTime by Delegates.notNull<Long>()
     override fun layoutResId(): Int {
         return R.layout.home_fragment_home_module
@@ -139,24 +138,6 @@ class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterImpl>()
 
     }
 
-    /**
-     * 初始化状态栏位置
-     */
-//    private fun initStatus() {
-//
-//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {//4.4以下不支持状态栏变色
-//            val statusBarHeight = StatusBarUtils.getStatusBarHeight(activity)
-//            var homeTitleBarHeight = resources.getDimension(R.dimen.home_home_title_bar_height)
-//            val lp1 = view_search_toolbar_bg.layoutParams as RelativeLayout.LayoutParams
-//            lp1.height = (homeTitleBarHeight + statusBarHeight).toInt()
-//            view_search_toolbar_bg.layoutParams = lp1
-//
-//            val lp2 = toolbar.layoutParams as CollapsingToolbarLayout.LayoutParams
-//            lp2.topMargin = statusBarHeight
-//            toolbar.layoutParams = lp2
-//        }
-//    }
-
     override fun initDataAndEventLazy() {
     }
 
@@ -236,7 +217,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 {
@@ -374,12 +355,12 @@ class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterImpl>()
     }
     override fun onStop() {
         super.onStop()
-        endTime=System.currentTimeMillis()
+        endTime = System.currentTimeMillis()
         ActionCountUtils.count(HomeBIConstants.YDL_HOME_DWELL_TIME,(endTime-startTime).toString())
     }
     override fun onResume() {
         super.onResume()
-        startTime=System.currentTimeMillis()
+        startTime = System.currentTimeMillis()
         if (userVisibleHint) {
             ActionCountUtils.count(HomeBIConstants.YDL_USER_MAIN_PAGE_VISIT)
             if (isFromCreate) {

m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeButtonBannerView.kt

@@ -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

@@ -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

-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

-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

@@ -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/ydl/res/values/styles.xml

@@ -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

@@ -81,6 +81,14 @@ class MeditationWindowService : Service() {
     override fun onCreate() {
         super.onCreate()
         EventBus.getDefault().register(this)
+
+        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)
+        }
     }
 
     private fun showWindow() {
@@ -308,20 +316,6 @@ class MeditationWindowService : Service() {
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ECLAIR) {
-            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)
-
-                startForegroundService(intent)
-            }else{
-                startService(intent)
-            }
-        }
         return super.onStartCommand(intent, flags, startId)
     }
 

ydl-platform/src/main/java/com/ydl/ydlcommon/base/BaseActivity.kt

@@ -10,7 +10,6 @@ import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import android.widget.LinearLayout
 import com.trello.rxlifecycle2.android.ActivityEvent
 import com.ydl.ydlcommon.R
 import com.ydl.ydlcommon.base.lifecycle.IActivityLifecycleable
@@ -19,7 +18,6 @@ import com.ydl.ydlcommon.ui.LoadingDialogFragment
 import com.ydl.ydlcommon.utils.ActivityManager
 import com.ydl.ydlcommon.utils.AndroidSystemHelper
 import com.ydl.ydlcommon.utils.StatusBarUtils
-import com.yidianling.common.tools.RxImageTool
 import io.reactivex.subjects.BehaviorSubject
 import io.reactivex.subjects.Subject
 import kotlin.properties.Delegates