资源浅醉重命名

app/build.gradle

@@ -117,6 +117,7 @@ android {
             signingConfig signingConfigs.ydl
         }
 
+
         xlzx {
             applicationId rootProject.ext.xlzx_app["applicationId"]
             versionName rootProject.ext.xlzx_app["versionName"]
@@ -167,9 +168,15 @@ dependencies {
     if (true) {
         //开发模式
         api project(':m-user')
+        implementation modularPublication('com.ydl:m-user-api')
         api project(':m-tests')
         api project(':m-consultant')
+        implementation modularPublication('com.ydl:m-consultant-api')
         api project(':m-confide')
+
+//        api "com.ydl:m-consultant-api:0.0.2"
+//        api 'com.ydl:m-consultant-module-ydl:0.0.18@aar'
+
         api (project(':ydl-platform')){
             transitive = true
         }

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

@@ -24,6 +24,8 @@ import com.ydl.ydlcommon.modular.ModularServiceManager
 import com.ydl.ydlcommon.mvp.lce.BaseLceActivity
 import com.ydl.ydlcommon.router.IYDLRouterConstant
 import com.yidianling.common.tools.ToastUtil
+import com.yidianling.consultant.ExpertSearchActivity.Companion.HOT_SEARCH_DOCTOR_NAME
+import com.yidianling.consultant.api.IConsultantService
 import com.yidianling.fm.api.service.IFMService
 import com.yidianling.tests.home.TestHomeActivity
 import kotlinx.android.synthetic.main.activity_main.*
@@ -76,15 +78,15 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
                 .withBoolean("isFromGuide", true)
                 .navigation()
         }
-//        bt_to_consultant.setOnClickListener {
-//            ARouter.getInstance()
-//                .build("/consult/hot_search")
-//                .withString(
-//                    HOT_SEARCH_DOCTOR_NAME,
-//                    this.resources?.getString(R.string.platform_search_hint)
-//                )
-//                .navigation()
-//        }
+        bt_to_consultant.setOnClickListener {
+            ARouter.getInstance()
+                .build("/consult/hot_search")
+                .withString(
+                    HOT_SEARCH_DOCTOR_NAME,
+                    this.resources?.getString(R.string.platform_search_hint)
+                )
+                .navigation()
+        }
         bt_to_music.setOnClickListener {
             startActivity(Intent(this, MusicPlayActivity::class.java))
         }
@@ -128,7 +130,6 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
     }
 
 
-
     override fun reLoadData() {
         mPresenter?.loadUsers()
     }
@@ -168,16 +169,24 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
     override fun onResume() {
         super.onResume()
         MobclickAgent.onResume(this)
+
+        ModularServiceManager.provide(IConsultantService::class.java).showConsultAssistantDialog(this)
     }
 
+    override fun onPause() {
+        super.onPause()
 
-    override fun onDestroy() {
-        if (serviceConnection != null) {
-            unbindService(serviceConnection)
-        }
-        super.onDestroy()
+        ModularServiceManager.provide(IConsultantService::class.java).hideConsultAssistantDialog()
     }
 
+
+//    override fun onDestroy() {
+//        if (serviceConnection != null) {
+//            unbindService(serviceConnection)
+//        }
+//        super.onDestroy()
+//    }
+
     private inner class PlayServiceConnection : ServiceConnection {
         override fun onServiceConnected(name: ComponentName, service: IBinder) {
             playService = (service as PlayService.PlayBinder).service

app/src/main/java/com/ydl/component/base/DemoAppLifecycles.java

@@ -5,6 +5,7 @@ import android.app.Application;
 import android.content.Context;
 import android.content.Intent;
 
+import com.ydl.devicesidlib.DeviceIDHelper;
 import com.ydl.media.audio.PlayService;
 import com.ydl.ydlcommon.base.delegate.IAppLifecycles;
 import com.ydl.ydlcommon.utils.YdlBuryPointUtil;
@@ -28,6 +29,9 @@ public class DemoAppLifecycles implements IAppLifecycles {
         //数据埋点初始化--一定要放在主进程中
         YdlBuryPointUtil.init(application);
 
+        //设备ID初始化
+        DeviceIDHelper.getInstance().init(application);
+
         //Flutter 初始化需要在主线程中执行
         FlutterMain.startInitialization(application);
 

app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java

@@ -27,6 +27,7 @@ public final class DemoGlobalConfig implements IConfigModule {
     public void applyOptions(@NotNull Context context, @NotNull GlobalConfig.Builder builder) {
         builder.setFrom( "ydl".equals(BuildConfig.FLAVOR) ?YDLConstants.FROM_YDL  :YDLConstants.FROM_XLZX)
                 .addUrl("github", APP_DOMAIN)
+                .setEnv(YDLConstants.ENV_TEST)
                 .setDebug(BuildConfig.DEBUG);
     }
 }

app/src/main/java/com/ydl/component/mvp/DemoModel.kt

@@ -32,7 +32,7 @@ class DemoModel : BaseModel(), DemoContract.Model {
         return YDLHttpUtils.obtainApi(DemoService::class.java)
             .getUsers(1, 10)
             //使用接口缓存
-            .compose(YDLHttpUtils.transformCache("users"))
+//            .compose(YDLHttpUtils.transformCache("users"))
     }
 
     @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)

config.gradle

@@ -182,7 +182,7 @@ ext {
             //功能组件 <<--- 再发这些，发完改这里的版本号
             "ydl-webview"                  : 'com.ydl:ydl-webview:0.0.18@aar',
             "ydl-media"                    : 'com.ydl:ydl-media:0.0.7@aar',
-            "ydl-audioim"                  : 'com.ydl:m-audioim:0.0.9@aar',
+            "ydl-audioim"                  : 'com.ydl:m-audioim:0.0.10@aar',
             "ydl-pay"                      : 'com.ydl:ydl-pay:0.0.2@aar',
 
             //业务组件 <<--- 最后发这些(只发改过的)

m-audioim/build.gradle

@@ -8,7 +8,7 @@ apply plugin: 'plugin.resTools'  // 资源重命名插件
 // 配置资源重命名插件
 resConfig {
     new_prefix = 'audioim_'  // 资源前缀
-    old_prefix = 'audio_home_'         // 老前缀，可为''空字符串
+    old_prefix = ''         // 老前缀，可为''空字符串
 }
 
 kapt {
@@ -37,6 +37,9 @@ android {
         flavorDimensions "versionCode"
     }
 
+    //前缀的名字
+    resourcePrefix "audioim_"
+
     buildTypes {
         release {
             minifyEnabled false

m-audioim/gradle.properties

 IS_PUBLISH=true
-VERSION_NAME=0.0.9
\ No newline at end of file
+VERSION_NAME=0.0.10
\ No newline at end of file

m-audioim/src/main/java/com/ydl/audioim/AudioHomeActivity.kt

@@ -61,7 +61,7 @@ import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
-import kotlinx.android.synthetic.main.activity_audio_home.*
+import kotlinx.android.synthetic.main.audioim_activity_audio_home.*
 import java.util.concurrent.TimeUnit
 
 
@@ -293,7 +293,7 @@ class AudioHomeActivity : BaseMvpActivity<IAudioHomeActivityContract.View, IAudi
     }
 
     override fun layoutResId(): Int {
-        return R.layout.activity_audio_home
+        return R.layout.audioim_activity_audio_home
     }
 
     override fun initDataAndEvent() {
@@ -314,7 +314,7 @@ class AudioHomeActivity : BaseMvpActivity<IAudioHomeActivityContract.View, IAudi
     }
 
     private fun setWindowStatusBarColor() {
-        StatusBarUtils.setWindowStatusBarColor(this, R.color.color_40353535)
+        StatusBarUtils.setWindowStatusBarColor(this, R.color.audioim_color_40353535)
     }
 
     @SuppressLint("InvalidWakeLockTag")
@@ -365,8 +365,8 @@ class AudioHomeActivity : BaseMvpActivity<IAudioHomeActivityContract.View, IAudi
 
         if (!TextUtils.isEmpty(expertHeadUrl)) {
             var option = SimpleImageOpConfiger()
-            option.errorPic = R.drawable.head_place_hold_pic
-            option.loadingPic = R.drawable.head_place_hold_pic
+            option.errorPic = R.drawable.audioim_head_place_hold_pic
+            option.loadingPic = R.drawable.audioim_head_place_hold_pic
             option.transform = 0
             YDLImageCacheManager.showImage(this, expertHeadUrl, iv_head, option)
         }
@@ -387,10 +387,10 @@ class AudioHomeActivity : BaseMvpActivity<IAudioHomeActivityContract.View, IAudi
         iv_hands_free.setOnClickListener {
             if (iv_hands_free.isSelected) {
                 iv_hands_free.isSelected = false
-                iv_hands_free.setImageResource(R.drawable.audio_home_img_hands_free_unuse)
+                iv_hands_free.setImageResource(R.drawable.audioim_img_hands_free_unuse)
             } else {
                 iv_hands_free.isSelected = true
-                iv_hands_free.setImageResource(R.drawable.audio_home_img_hands_free)
+                iv_hands_free.setImageResource(R.drawable.audioim_img_hands_free)
             }
 
             //已经接通
@@ -500,7 +500,9 @@ class AudioHomeActivity : BaseMvpActivity<IAudioHomeActivityContract.View, IAudi
                     } else if (permission.shouldShowRequestPermissionRationale) {
                         requestPermission()
                     } else {
-                        ToastHelper.show(getString(R.string.need_storage_permission_hint))
+
+                        ToastHelper.show(getString(R.string.audioim_need_storage_permission_hint))
+
                         val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
                         val uri = Uri.fromParts("package", packageName, null)
                         intent.data = uri
@@ -541,7 +543,7 @@ class AudioHomeActivity : BaseMvpActivity<IAudioHomeActivityContract.View, IAudi
                 }, {
                     waittingStatus()
                     if (!isConnectSuccess){
-//                        iv_hang_up.setImageResource(R.mipmap.ico_close)
+//                        iv_hang_up.setImageResource(R.mipmap.audioim_ico_close)
                         //关闭音乐
                         stopPlaying()
                         //提示切换传统线路
@@ -676,7 +678,7 @@ class AudioHomeActivity : BaseMvpActivity<IAudioHomeActivityContract.View, IAudi
     private fun waittingStatus() {
         //挂断按钮可点击
         iv_hang_up.isEnabled = true
-        iv_hang_up.setImageResource(R.drawable.audio_home_img_hang_up)
+        iv_hang_up.setImageResource(R.drawable.audioim_img_hang_up)
         if (!isConnectSuccess) {
             //页面等待文案调整
             tv_waiting.visibility = View.GONE
@@ -685,8 +687,10 @@ class AudioHomeActivity : BaseMvpActivity<IAudioHomeActivityContract.View, IAudi
         }
         //切换线路按钮可见
         tv_change_route.isEnabled = true
-        tv_change_route.setTextColor(ContextCompat.getColor(this, R.color.white_f))
-        tv_change_route.setCompoundDrawablesWithIntrinsicBounds(null, null, ContextCompat.getDrawable(this, R.drawable.audio_home_img_choose_arrow), null)
+
+        tv_change_route.setTextColor(ContextCompat.getColor(this, R.color.platform_white))
+        tv_change_route.setCompoundDrawablesWithIntrinsicBounds(null, null, ContextCompat.getDrawable(this, R.drawable.audioim_img_choose_arrow), null)
+
     }
 
     /**
@@ -736,9 +740,9 @@ class AudioHomeActivity : BaseMvpActivity<IAudioHomeActivityContract.View, IAudi
             mPlayer = AudioPlayer(this)
         }
         if ((Math.random() * 10 + 1).toInt() >= 5) {
-            mPlayer!!.setTwoDataAndStart(R.raw.audio_music_1, R.raw.loop_music)
+            mPlayer!!.setTwoDataAndStart(R.raw.audioim_audio_music_1, R.raw.audioim_loop_music)
         } else {
-            mPlayer!!.setTwoDataAndStart(R.raw.audio_music_2, R.raw.loop_music)
+            mPlayer!!.setTwoDataAndStart(R.raw.audioim_audio_music_2, R.raw.audioim_loop_music)
         }
     }
 
@@ -749,7 +753,7 @@ class AudioHomeActivity : BaseMvpActivity<IAudioHomeActivityContract.View, IAudi
         if (mPlayer == null) {
             mPlayer = AudioPlayer(this)
         }
-        mPlayer!!.setDataSource(R.raw.hand_down_music)
+        mPlayer!!.setDataSource(R.raw.audioim_hand_down_music)
         mPlayer!!.switchPlayType(iv_hands_free.isSelected)
         mPlayer!!.setCompletionListener(MediaPlayer.OnCompletionListener {
             //通话剩余时间不足60s时，默认
@@ -820,8 +824,8 @@ class AudioHomeActivity : BaseMvpActivity<IAudioHomeActivityContract.View, IAudi
                     if (localRemainTime!! <= 60) {
                         if (tv_change_route.isEnabled) {
                             tv_change_route.isEnabled = false
-                            tv_change_route.setTextColor(ContextCompat.getColor(this, R.color.color_50ffffff))
-                            tv_change_route.setCompoundDrawablesWithIntrinsicBounds(null, null, ContextCompat.getDrawable(this, R.drawable.audio_home_img_choose_arrow_unuse), null)
+                            tv_change_route.setTextColor(ContextCompat.getColor(this, R.color.audioim_color_50ffffff))
+                            tv_change_route.setCompoundDrawablesWithIntrinsicBounds(null, null, ContextCompat.getDrawable(this, R.drawable.audioim_img_choose_arrow_unuse), null)
                         }
                     }
                     tv_remain_time.text = DateUtils.formatTime(localRemainTime.toString())
@@ -844,9 +848,9 @@ class AudioHomeActivity : BaseMvpActivity<IAudioHomeActivityContract.View, IAudi
             mPlayer = AudioPlayer(this)
         }
         if (3 == min) {
-            mPlayer!!.setDataSource(R.raw.last_3_min)
+            mPlayer!!.setDataSource(R.raw.audioim_last_3_min)
         } else {
-            mPlayer!!.setDataSource(R.raw.last_1_min)
+            mPlayer!!.setDataSource(R.raw.audioim_last_1_min)
         }
         mPlayer!!.switchPlayType(iv_hands_free.isSelected)
         mPlayer!!.start(false, false)

m-audioim/src/main/java/com/ydl/audioim/widget/AxbConfirmDialog.kt

@@ -5,7 +5,7 @@ import android.app.Dialog
 import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import com.ydl.audioim.R
-import kotlinx.android.synthetic.main.dialog_axb_confirm.*
+import kotlinx.android.synthetic.main.audioim_dialog_axb_confirm.*
 
 /**
  * @author jiucheng
@@ -28,9 +28,9 @@ class AxbConfirmDialog : Dialog {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         if (this.type==2){
-            setContentView(R.layout.dialog_autoaxb_confirm)
+            setContentView(R.layout.audioim_dialog_autoaxb_confirm)
         }else{
-            setContentView(R.layout.dialog_axb_confirm)
+            setContentView(R.layout.audioim_dialog_axb_confirm)
         }
 
         setCanceledOnTouchOutside(false)

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

@@ -14,7 +14,7 @@
         android:layout_marginTop="25dp"
         android:layout_marginRight="10dp"
         android:background="?android:attr/selectableItemBackground"
-        android:drawableRight="@drawable/audio_home_img_choose_arrow_unuse"
+        android:drawableRight="@drawable/audioim_img_choose_arrow_unuse"
         android:drawablePadding="6dp"
         android:padding="5dp"
         android:text="切换至传统电话"
@@ -40,7 +40,7 @@
             android:layout_width="126dp"
             android:layout_height="126dp"
             android:layout_centerInParent="true"
-            android:background="@drawable/audio_home_head_background" />
+            android:background="@drawable/audioim_head_background" />
 
         <ImageView
             android:id="@+id/iv_head"
@@ -48,7 +48,7 @@
             android:layout_height="120dp"
             android:layout_centerInParent="true"
             android:scaleType="centerCrop"
-            android:src="@drawable/head_place_hold_pic" />
+            android:src="@drawable/audioim_head_place_hold_pic" />
 
     </RelativeLayout>
 
@@ -154,7 +154,7 @@
             android:layout_height="66dp"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="1dp"
-            android:src="@drawable/audio_home_img_hang_up_unuse"
+            android:src="@drawable/audioim_img_hang_up_unuse"
             android:visibility="visible" />
 
         <TextView
@@ -183,7 +183,7 @@
             android:layout_width="66dp"
             android:layout_height="66dp"
             android:layout_marginTop="1dp"
-            android:src="@drawable/audio_home_img_hands_free_unuse" />
+            android:src="@drawable/audioim_img_hands_free_unuse" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -204,7 +204,7 @@
         android:layout_below="@+id/tv_tips"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="34dp"
-        android:background="@drawable/audio_home_toast_view_background"
+        android:background="@drawable/audioim_toast_view_background"
         android:elevation="6dp"
         android:paddingLeft="11dp"
         android:paddingTop="4dp"

m-audioim/src/main/res/layout/dialog_autoaxb_confirm.xml → m-audioim/src/main/res/layout/audioim_dialog_autoaxb_confirm.xml

@@ -12,7 +12,7 @@
         android:layout_width="28dp"
         android:layout_height="28dp"
         android:layout_gravity="right"
-        android:src="@drawable/ico_close" />
+        android:src="@drawable/audioim_ico_close" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -21,7 +21,7 @@
         android:gravity="center_horizontal"
         android:layout_marginTop="20dp"
         android:paddingTop="21dp"
-        android:background="@drawable/audio_home_autoaxb_background"
+        android:background="@drawable/audioim_autoaxb_background"
         android:orientation="vertical">
 
 
@@ -31,7 +31,7 @@
             android:layout_marginTop="6dp"
             android:layout_marginLeft="21dp"
             android:layout_marginRight="21dp"
-            android:src="@drawable/switch_axb" />
+            android:src="@drawable/audioim_switch_axb" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -55,7 +55,7 @@
                 android:layout_width="4dp"
                 android:layout_height="4dp"
                 android:layout_gravity="center_vertical"
-                android:background="@drawable/audio_circle_blue_4">
+                android:background="@drawable/audioim_audio_circle_blue_4">
             </TextView>
             <TextView
                 android:layout_width="wrap_content"
@@ -70,7 +70,7 @@
                 android:layout_width="4dp"
                 android:layout_height="4dp"
                 android:layout_gravity="center_vertical"
-                android:background="@drawable/audio_circle_blue_4">
+                android:background="@drawable/audioim_audio_circle_blue_4">
             </TextView>
         </LinearLayout>
 
@@ -80,14 +80,14 @@
             android:layout_width="182dp"
             android:layout_height="38dp"
             android:layout_marginTop="40dp"
-            android:background="@drawable/audio_home_button_autoaxb_background">
+            android:background="@drawable/audioim_home_button_autoaxb_background">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
                 android:layout_gravity="center_horizontal"
-                android:drawableLeft="@drawable/audio_home_ic_phone"
+                android:drawableLeft="@drawable/audioim_ic_phone"
                 android:drawablePadding="6dp"
                 android:gravity="center_horizontal"
                 android:text="呼叫"

m-audioim/src/main/res/layout/dialog_axb_confirm.xml → m-audioim/src/main/res/layout/audioim_dialog_axb_confirm.xml

@@ -20,13 +20,13 @@
             android:layout_marginTop="7dp"
             android:layout_marginRight="10dp"
             android:padding="5dp"
-            android:src="@drawable/audio_home_ic_close_24dp" />
+            android:src="@drawable/audioim_ic_close_24dp" />
 
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
-            android:src="@drawable/audio_home_privacy_ico" />
+            android:src="@drawable/audioim_privacy_ico" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -87,14 +87,14 @@
             android:layout_height="40dp"
             android:layout_marginTop="11dp"
             android:layout_marginBottom="20dp"
-            android:background="@drawable/audio_home_privacy_background">
+            android:background="@drawable/audioim_privacy_background">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
                 android:layout_gravity="center_horizontal"
-                android:drawableLeft="@drawable/audio_home_ic_phone"
+                android:drawableLeft="@drawable/audioim_ic_phone"
                 android:gravity="center_horizontal"
                 android:text="呼叫"
                 android:textColor="@color/platform_white"

m-audioim/src/main/res/values/colors.xml

 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="color_40353535">#66353535</color>
-    <color name="color_80353535">#CC353535</color>
-    <color name="color_50ffffff">#B3ffffff</color>
-    <color name="color_30FFFFFF">#4DFFFFFF</color>
-    <color name="color_70FFFFFF">#B3FFFFFF</color>
+    <color name="audioim_color_40353535">#66353535</color>
+    <color name="audioim_color_80353535">#CC353535</color>
+    <color name="audioim_color_50ffffff">#B3ffffff</color>
+    <color name="audioim_color_30FFFFFF">#4DFFFFFF</color>
+    <color name="audioim_color_70FFFFFF">#B3FFFFFF</color>
 </resources>

m-audioim/src/main/res/values/strings.xml

 <resources>
-    <string name="app_name">av</string>
-    <string name="need_storage_permission_hint">App正常工作需要内部存储使用权限，请开启</string>
+    <string name="audioim_app_name">av</string>
+    <string name="audioim_need_storage_permission_hint">App正常工作需要内部存储使用权限，请开启</string>
 </resources>

m-confide/build.gradle

@@ -2,6 +2,14 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'plugin.resTools'  // 资源重命名插件
+
+// 配置资源重命名插件
+resConfig {
+    new_prefix = 'confide_'  // 资源前缀
+    old_prefix = ''         // 老前缀，可为''空字符串
+}
+
 kapt {
     arguments {
         arg("AROUTER_MODULE_NAME", project.getName())
@@ -54,18 +62,6 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-
-    sourceSets {
-        main {
-            res.srcDirs = [
-
-                    'src/main/res/layouts/confidehome',
-                    'src/main/res/layouts',
-                    'src/main/res'
-            ]
-        }
-    }
-
 }
 
 dependencies {

m-confide/modular.gradle

@@ -8,7 +8,7 @@ modular {
                 groupId = "com.ydl"
                 artifactId = "m-confide-module-xlzx"
                 // 上报的业务模块 aar 包的版本号
-                version = "0.0.11"
+                version = "0.0.12"
             }
 
             ydl{
@@ -16,7 +16,7 @@ modular {
                 groupId = "com.ydl"
                 artifactId = "m-confide-module-ydl"
                 // 上报的业务模块 aar 包的版本号
-                version = "0.0.11"
+                version = "0.0.12"
             }
         }
 

m-confide/src/main/AndroidManifest.xml

@@ -3,8 +3,9 @@
 
     <application>
         <activity android:name=".home.ConfideHomeActivity"
-            android:screenOrientation="portrait">
-
+            android:screenOrientation="portrait"
+                android:theme="@style/confide_NoTitleTheme"
+                >
         </activity>
     </application>
 </manifest>

m-confide/src/main/java/com/ydl/confide/home/ConfideHomeActivity.kt

 package com.ydl.confide.home
 
 import android.content.Context
+import android.os.Build
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
 import android.support.v7.widget.SimpleItemAnimator
 import android.view.View
+import android.widget.LinearLayout
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.jcodecraeer.xrecyclerview.ProgressStyle
 import com.jcodecraeer.xrecyclerview.XRecyclerView
-import com.ydl.ydl_image.listener.YDLImageRecyclerOnScrollListener
 import com.ydl.confide.R
 import com.ydl.confide.home.adapter.ConfideHomeAdapter
 import com.ydl.confide.home.bean.ConfideHomeAllFiltersBean
@@ -23,14 +24,16 @@ import com.ydl.confide.home.listener.ConfideHomeRecycleViewListener
 import com.ydl.confide.home.listener.ConfideHomeRecyleSuspendListener
 import com.ydl.confide.home.presenter.ConfideHomePresenterImpl
 import com.ydl.confide.home.util.ConfideHomeUtils
+import com.ydl.ydl_image.listener.YDLImageRecyclerOnScrollListener
 import com.ydl.ydlcommon.mvp.lce.BaseLceActivity
+import com.ydl.ydlcommon.utils.StatusBarUtils
 import com.ydl.ydlcommon.utils.remind.ToastHelper
 import com.ydl.ydlcommon.view.DrawableRightTextView
 import com.ydl.ydlcommon.view.WrapContentLinearLayoutManager
 import com.yidianling.common.tools.RxImageTool
 import com.yidianling.router.RouterManager
-import kotlinx.android.synthetic.main.confidehome_home_activity.*
-import kotlinx.android.synthetic.main.confidehome_title_bar.*
+import kotlinx.android.synthetic.main.confide_home_activity.*
+import kotlinx.android.synthetic.main.confide_title_bar.*
 
 /**
  * @author yuanwai
@@ -112,7 +115,7 @@ class ConfideHomeActivity : BaseLceActivity<IConfideHomeContract.View,IConfideHo
     }
 
     override fun layoutResId(): Int {
-        return R.layout.confidehome_home_activity
+        return R.layout.confide_home_activity
     }
 
     /**
@@ -122,7 +125,7 @@ class ConfideHomeActivity : BaseLceActivity<IConfideHomeContract.View,IConfideHo
         //重置页
         page = 2
         allFiltersBean!!.page = page
-        mPresenter.confideHomeRequest()
+        mPresenter.confideHomeRequest(true)
     }
 
     /**
@@ -174,6 +177,21 @@ class ConfideHomeActivity : BaseLceActivity<IConfideHomeContract.View,IConfideHo
 
         initClick()
         initQuickConsultDialog()
+        initStatus();
+    }
+
+
+    /**
+     * 初始化状态栏位置
+     */
+    private fun initStatus() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {//4.4以下不支持状态栏变色
+            StatusBarUtils.setTransparentForImageView(this, null)
+            val statusBarHeight = StatusBarUtils.getStatusBarHeight(this)
+            val lp1 = rl_confide_title_layout.layoutParams as LinearLayout.LayoutParams
+            lp1.height = (RxImageTool.dp2px(48f) + statusBarHeight)
+            rl_confide_title_layout.setPadding(0, statusBarHeight, 0, 0)
+        }
     }
 
     /**
@@ -245,7 +263,7 @@ class ConfideHomeActivity : BaseLceActivity<IConfideHomeContract.View,IConfideHo
         rv_list.layoutManager = layoutManager
         rv_list.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader)
         rv_list.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader)
-        rv_list.setArrowImageView(R.drawable.confidehome_downgrey)
+        rv_list.setArrowImageView(R.drawable.confide_downgrey)
         rv_list.setLoadingListener(this)
         rv_list.adapter = mConfideAdapter
     }

m-confide/src/main/java/com/ydl/confide/home/adapter/ConfideHomeAdapter.kt

@@ -97,7 +97,7 @@ class ConfideHomeAdapter(private val mContext: Context,
                 return ConfideHomeListenAndFoundViewHolder(ConfideHomeListenAndFoundView(parent.context, confideHomeEvent))
             }
             else -> {
-                return EmptyViewHolder(View.inflate(parent.context, R.layout.confidehome_empty, null))
+                return EmptyViewHolder(View.inflate(parent.context, R.layout.confide_empty, null))
             }
         }
     }

m-confide/src/main/java/com/ydl/confide/home/contract/IConfideHomeContract.kt

@@ -93,7 +93,7 @@ interface IConfideHomeContract{
         /**
          * 倾诉首页数据请求
          */
-        fun confideHomeRequest()
+        fun confideHomeRequest(isRefresh:Boolean = true)
 
         /**
          * 为你推荐列表（筛选调用）

m-confide/src/main/java/com/ydl/confide/home/popwindow/ConfideHomeGoodPopupWindow.kt

 package com.ydl.confide.home.popwindow
 
 import android.content.Context
-import android.graphics.Typeface
 import android.graphics.drawable.BitmapDrawable
 import android.support.v7.widget.GridLayoutManager
 import android.support.v7.widget.LinearLayoutManager
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.PopupWindow
-import com.yidianling.common.tools.RxImageTool
 import com.ydl.confide.R
 import com.ydl.confide.home.bean.ConfideHomeFiterItemBean
 import com.ydl.confide.home.popwindow.adapter.ConfideHomeGoodAdapter
 import com.ydl.ydlcommon.view.SpaceItemDecorator
-import kotlinx.android.synthetic.main.confidehome_good_popup_window.view.*
+import com.yidianling.common.tools.RxImageTool
+import kotlinx.android.synthetic.main.confide_good_popup_window.view.*
 
 
 
@@ -33,7 +32,7 @@ class ConfideHomeGoodPopupWindow(context: Context, goodsList: ArrayList<ConfideH
     private var selectedGoodsList: ArrayList<ConfideHomeFiterItemBean>? = null
 
     init {
-        val view = LayoutInflater.from(context).inflate(R.layout.confidehome_good_popup_window, null)
+        val view = LayoutInflater.from(context).inflate(R.layout.confide_good_popup_window, null)
         this.contentView = view
         this.isFocusable = true
         @Suppress("DEPRECATION")

m-confide/src/main/java/com/ydl/confide/home/popwindow/ConfideHomeSexAgePopupWindow.kt

 package com.ydl.confide.home.popwindow
 
 import android.content.Context
-import android.graphics.Typeface
 import android.graphics.drawable.BitmapDrawable
 import android.support.v7.widget.GridLayoutManager
 import android.support.v7.widget.LinearLayoutManager
@@ -11,13 +10,13 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.PopupWindow
 import android.widget.TextView
-import com.yidianling.common.tools.RxImageTool
 import com.ydl.confide.R
 import com.ydl.confide.home.bean.ConfideHomeAllFiltersBean
 import com.ydl.confide.home.bean.ConfideHomeFiterItemBean
 import com.ydl.confide.home.popwindow.adapter.ConfideHomeGoodAdapter
 import com.ydl.ydlcommon.view.SpaceItemDecorator
-import kotlinx.android.synthetic.main.confidehome_sexage_popup_window.view.*
+import com.yidianling.common.tools.RxImageTool
+import kotlinx.android.synthetic.main.confide_sexage_popup_window.view.*
 
 /**
  * @author yuanwai
@@ -43,7 +42,7 @@ class ConfideHomeSexAgePopupWindow(context: Context, sexData: ArrayList<ConfideH
     private var mAllFiltersBean : ConfideHomeAllFiltersBean? = null
 
     init {
-        val view = LayoutInflater.from(context).inflate(R.layout.confidehome_sexage_popup_window, null)
+        val view = LayoutInflater.from(context).inflate(R.layout.confide_sexage_popup_window, null)
         this.contentView = view
         this.isFocusable = true
         @Suppress("DEPRECATION")
@@ -164,10 +163,10 @@ class ConfideHomeSexAgePopupWindow(context: Context, sexData: ArrayList<ConfideH
      */
     private fun setSelect(tvSex1: TextView,boolean: Boolean){
         if (boolean){
-            tvSex1.setBackgroundResource(R.drawable.confidehome_filter_select_sel)
-            tvSex1.setTextColor(tvSex1.context.resources.getColor(R.color.baby_blue))
+            tvSex1.setBackgroundResource(R.drawable.confide_filter_select_sel)
+            tvSex1.setTextColor(tvSex1.context.resources.getColor(R.color.confide_main_theme))
         }else{
-            tvSex1.setBackgroundResource(R.drawable.confidehome_filter_select_nor)
+            tvSex1.setBackgroundResource(R.drawable.confide_filter_select_nor)
             tvSex1.setTextColor(tvSex1.context.resources.getColor(R.color._6))
         }
     }

m-confide/src/main/java/com/ydl/confide/home/popwindow/ConfideHomeSortPopupWindow.kt

@@ -10,7 +10,7 @@ import android.widget.PopupWindow
 import com.ydl.confide.R
 import com.ydl.confide.home.bean.ConfideHomeFiterItemBean
 import com.ydl.confide.home.popwindow.adapter.ConfideHomeSortAdapter
-import kotlinx.android.synthetic.main.confidehome_sort_popup_window.view.*
+import kotlinx.android.synthetic.main.confide_sort_popup_window.view.*
 
 /**
  * @author yuanwai
@@ -25,7 +25,7 @@ class ConfideHomeSortPopupWindow(val context: Context, private val sortItems: Ar
     private var adapter: ConfideHomeSortAdapter? = null
 
     init {
-        val view = LayoutInflater.from(context).inflate(R.layout.confidehome_sort_popup_window, null)
+        val view = LayoutInflater.from(context).inflate(R.layout.confide_sort_popup_window, null)
         this.contentView = view
         this.isFocusable = true
         @Suppress("DEPRECATION")

m-confide/src/main/java/com/ydl/confide/home/popwindow/adapter/ConfideHomeGoodAdapter.kt

@@ -8,7 +8,7 @@ import android.view.ViewGroup
 import android.widget.TextView
 import com.ydl.confide.R
 import com.ydl.confide.home.bean.ConfideHomeFiterItemBean
-import kotlinx.android.synthetic.main.confidehome_good_item.view.*
+import kotlinx.android.synthetic.main.confide_good_item.view.*
 
 /**
  * @author yuanwai
@@ -25,9 +25,9 @@ class ConfideHomeGoodAdapter(private val context: Context, private val goods: Ar
             holder.tvGoodName.text = goods[position].name
             holder.tvGoodName.isSelected = selectedGood.contains(category)
             if (holder.tvGoodName.isSelected) {
-                holder.tvGoodName.setBackgroundResource(R.drawable.confidehome_filter_select_sel)
+                holder.tvGoodName.setBackgroundResource(R.drawable.confide_filter_select_sel)
             } else {
-                holder.tvGoodName.setBackgroundResource(R.drawable.confidehome_filter_select_nor)
+                holder.tvGoodName.setBackgroundResource(R.drawable.confide_filter_select_nor)
             }
         }
     }
@@ -38,7 +38,7 @@ class ConfideHomeGoodAdapter(private val context: Context, private val goods: Ar
     }
 
     override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): ViewHolder {
-        val itemView = LayoutInflater.from(context).inflate(R.layout.confidehome_good_item, parent, false)
+        val itemView = LayoutInflater.from(context).inflate(R.layout.confide_good_item, parent, false)
         return ViewHolder(itemView)
     }
 

m-confide/src/main/java/com/ydl/confide/home/popwindow/adapter/ConfideHomeSortAdapter.kt

 package com.ydl.confide.home.popwindow.adapter
 
 import android.content.Context
-import android.graphics.Color
 import android.support.v4.content.ContextCompat
 import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
@@ -10,7 +9,7 @@ import android.view.ViewGroup
 import com.ydl.confide.R
 import com.ydl.confide.home.bean.ConfideHomeFiterItemBean
 import com.ydl.confide.home.popwindow.ConfideHomeSortPopupWindow
-import kotlinx.android.synthetic.main.confidehome_sort_item.view.*
+import kotlinx.android.synthetic.main.confide_sort_item.view.*
 
 /**
  * @author yuanwai
@@ -27,7 +26,7 @@ class ConfideHomeSortAdapter(private val context: Context,
     override fun getItemCount(): Int = sortItems.size
 
     override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): ViewHolder {
-        val itemView = LayoutInflater.from(context).inflate(R.layout.confidehome_sort_item, parent, false)
+        val itemView = LayoutInflater.from(context).inflate(R.layout.confide_sort_item, parent, false)
         return ViewHolder(itemView)
     }
 
@@ -36,7 +35,7 @@ class ConfideHomeSortAdapter(private val context: Context,
         if (holder != null) {
             holder.tvSort.text = item.name
             if (item.id == selectedSort.id) {
-                holder.tvSort.setTextColor(Color.parseColor("#1DA1F2"))
+                holder.tvSort.setTextColor(context.resources.getColor(R.color.confide_main_theme))
             }else{
                 holder.tvSort.setTextColor(ContextCompat.getColor(context, R.color._6))
             }

m-confide/src/main/java/com/ydl/confide/home/presenter/ConfideHomePresenterImpl.kt

@@ -4,7 +4,6 @@ import android.content.Context
 import android.text.TextUtils
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
-import com.yidianling.common.tools.RxNetTool
 import com.ydl.confide.home.bean.ConfideHomeDataBean
 import com.ydl.confide.home.contract.IConfideHomeContract
 import com.ydl.confide.home.http.ConfideRecommendParam
@@ -13,12 +12,14 @@ import com.ydl.confide.home.util.ConfideHomeUtils
 import com.ydl.ydlcommon.data.http.RxUtils
 import com.ydl.ydlcommon.data.http.ThrowableConsumer
 import com.ydl.ydlcommon.mvp.base.BasePresenter
-import com.ydl.ydlcommon.mvp.lce.ILceView
+import com.ydl.ydlcommon.mvp.base.IView
 import com.ydl.ydlcommon.utils.RxLifecycleUtils
 import com.ydl.ydlcommon.utils.YDLAsyncUtils
 import com.ydl.ydlcommon.utils.YDLCacheUtils
+import com.yidianling.common.tools.RxNetTool
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.functions.Consumer
+import io.reactivex.schedulers.Schedulers
 
 /**
  * @author yuanwai
@@ -65,7 +66,7 @@ class ConfideHomePresenterImpl : BasePresenter<IConfideHomeContract.View,IConfid
                         mView.confideHomeResponse(list)
                     }
                 }
-                confideHomeRequest()
+                confideHomeRequest(false)
             }
         })
     }
@@ -73,7 +74,7 @@ class ConfideHomePresenterImpl : BasePresenter<IConfideHomeContract.View,IConfid
     /**
      * 请求首页数据
      */
-    override fun confideHomeRequest() {
+    override fun confideHomeRequest(isRefresh:Boolean) {
         if (!RxNetTool.isConnected(mView.getContext())){
             mView.confideHomeRequestFail()
             return
@@ -81,9 +82,20 @@ class ConfideHomePresenterImpl : BasePresenter<IConfideHomeContract.View,IConfid
         val disposable = mModel.confideHomeRequest()
                 .map { it }
                 .filter { it != null }
-                .compose(RxUtils.applySchedulers(mView))
-            .compose(RxLifecycleUtils.bindToLifecycle(mView!!))//使用 Rxlifecycle,使 Disposable 和 Activity 一起销毁
+                .subscribeOn(Schedulers.io())
+                .doOnSubscribe {
+                    if (!isRefresh){
+                        mView.showLoading()//显示进度条
+                    }
+
+                }
+                .subscribeOn(AndroidSchedulers.mainThread())
                 .observeOn(AndroidSchedulers.mainThread())
+                .doFinally {
+                    if (!isRefresh){
+                        mView.hideLoading()//隐藏进度条
+                    }
+                }.compose(RxLifecycleUtils.bindToLifecycle(mView))
                 .subscribe(Consumer {
                     mView.confideHomeResponse(it)
                     updateCache(it)
@@ -128,7 +140,7 @@ class ConfideHomePresenterImpl : BasePresenter<IConfideHomeContract.View,IConfid
         val disposable = mModel.recommendList(param)
                 .map { it }
                 .filter { it != null }
-                .compose(RxUtils.applySchedulers(mView))
+                .compose(RxUtils.applySchedulers(mView as IView))
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(Consumer {
                     mView.recommendListResponse(it)
@@ -150,7 +162,7 @@ class ConfideHomePresenterImpl : BasePresenter<IConfideHomeContract.View,IConfid
         val disposable = mModel.recommendList(param)
                 .map { it }
                 .filter { it != null }
-                .compose(RxUtils.applySchedulers(mView))
+                .compose(RxUtils.applySchedulers(mView as IView))
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(Consumer {
                     mView.recommendListMoreResponse(it)

m-confide/src/main/java/com/ydl/confide/home/section/ConfideHomeBannerSection.kt

@@ -44,7 +44,7 @@ class ConfideHomeBannerSection(var context: Context, private var confideHomeEven
                 BannerViewHolder(ConfideHomeBannerView(context,confideHomeEvent))
             }
             else -> {
-                EmptyViewHolder(View.inflate(context,R.layout.view_empty,null))
+                EmptyViewHolder(View.inflate(context,R.layout.confide_view_empty,null))
             }
         }
     }

m-confide/src/main/java/com/ydl/confide/home/section/ConfideHomeCategorySection.kt

@@ -45,7 +45,7 @@ class ConfideHomeCategorySection(var context: Context, var confideHomeEvent : IC
                 CategoryViewHolder(ConfideHomeCategoryView(context,confideHomeEvent,homeView))
             }
             else -> {
-                EmptyViewHolder(View.inflate(context,R.layout.view_empty,null))
+                EmptyViewHolder(View.inflate(context,R.layout.confide_view_empty,null))
             }
         }
     }

m-confide/src/main/java/com/ydl/confide/home/section/ConfideHomeFilterSection.kt

@@ -66,7 +66,7 @@ class ConfideHomeFilterSection(var context: Context,var view : IConfideHomeContr
             var dp15 = RxImageTool.dip2px(15f)
             param.setMargins(dp15,0,dp15,0)
             var footerView = View(context)
-            footerView.setBackgroundColor(context.resources.getColor(R.color.confidehome_filters_line))
+            footerView.setBackgroundColor(context.resources.getColor(R.color.confide_filters_line))
             footerView.layoutParams = param
             return FooterViewHolder(footerView)
         }else{

m-confide/src/main/java/com/ydl/confide/home/section/ConfideHomeFooterSection.kt

@@ -37,7 +37,7 @@ class ConfideHomeFooterSection(var context: Context, private var confideHomeEven
                 FooterViewHolder(ConfideHomeFooterView(context,confideHomeEvent))
             }
             else -> {
-                EmptyViewHolder(View.inflate(context,R.layout.view_empty,null))
+                EmptyViewHolder(View.inflate(context,R.layout.confide_view_empty,null))
             }
         }
     }

m-confide/src/main/java/com/ydl/confide/home/section/ConfideHomeRecommendExpertSection.kt

@@ -59,7 +59,7 @@ class ConfideHomeRecommendExpertSection(var context: Context, var confideHomeEve
 
     override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): RecyclerView.ViewHolder {
         if (viewType == combineType(IConfideHomeConfig.SECTION_CONSULTANT, HEADER)) {
-            return HeadViewHolder(LayoutInflater.from(context).inflate(R.layout.confidehome_recommend_expert_head, parent, false))
+            return HeadViewHolder(LayoutInflater.from(context).inflate(R.layout.confide_recommend_expert_head, parent, false))
         } else {
             return ConfideHomeRecommendExpertViewHolder(ConfideHomeRecommendExpertView(context, confideHomeEvent))
         }

m-confide/src/main/java/com/ydl/confide/home/util/ConfideHomeUtils.kt

@@ -11,7 +11,6 @@ import android.view.View
 import android.view.animation.AnimationUtils
 import android.view.animation.LinearInterpolator
 import android.widget.ImageView
-import com.yidianling.common.tools.LogUtil
 import com.ydl.confide.R
 import com.ydl.confide.home.adapter.ConfideHomeAdapter
 import com.ydl.confide.home.bean.ConfideHomeAllFiltersBean
@@ -27,6 +26,7 @@ import com.ydl.confide.home.widget.ConfideHomeFilterView
 import com.ydl.confide.home.widget.ConfidePlayerFloatView
 import com.ydl.ydlcommon.adapter.section.SectionAdapter
 import com.ydl.ydlcommon.utils.MainUtils
+import com.yidianling.common.tools.LogUtil
 import java.io.BufferedInputStream
 import java.io.IOException
 import java.io.InputStream
@@ -461,8 +461,8 @@ class ConfideHomeUtils {
                     tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_ic_arrow_drop_down_grey_500_18dp, 0)
                 }
                 IConfideHomeConfig.FILTER_STATUS_FILTERED, IConfideHomeConfig.FILTER_STATUS_OPEN -> {
-                    tv.setTextColor(ContextCompat.getColor(mContext, R.color.baby_blue))
-                    tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_ic_arrow_drop_down_green_18dp, 0)
+                    tv.setTextColor(ContextCompat.getColor(mContext, R.color.confide_main_theme))
+                    tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.confide_ic_arrow_drop_down_green_18dp, 0)
                 }
             }
         }
@@ -475,7 +475,7 @@ class ConfideHomeUtils {
                     tv.setTextColor(ContextCompat.getColor(mContext, R.color._6))
                 }
                 IConfideHomeConfig.FILTER_STATUS_FILTERED, IConfideHomeConfig.FILTER_STATUS_OPEN -> {
-                    tv.setTextColor(ContextCompat.getColor(mContext, R.color.baby_blue))
+                    tv.setTextColor(ContextCompat.getColor(mContext, R.color.confide_main_theme))
                 }
             }
             tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_ic_arrow_drop_down_grey_500_18dp, 0)
@@ -488,7 +488,7 @@ class ConfideHomeUtils {
                     tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_ic_arrow_drop_down_grey_500_18dp, 0)
                 }
                 IConfideHomeConfig.FILTER_STATUS_FILTERED, IConfideHomeConfig.FILTER_STATUS_OPEN -> {
-                    tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_ic_arrow_drop_down_green_18dp, 0)
+                    tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.confide_ic_arrow_drop_down_green_18dp, 0)
                 }
             }
         }
@@ -497,7 +497,7 @@ class ConfideHomeUtils {
          * 启动 播放动画
          */
         fun startPlayAnim(context: Context, imageView: ImageView) {
-            var animation = AnimationUtils.loadAnimation(context, R.anim.confidehome_play_anim)
+            var animation = AnimationUtils.loadAnimation(context, R.anim.confide_play_anim)
             var lin = LinearInterpolator()//设置动画匀速运动
             animation.interpolator = lin
             imageView.startAnimation(animation)

m-confide/src/main/java/com/ydl/confide/home/widget/ConfideHomeBannerView.kt

@@ -10,7 +10,7 @@ import com.ydl.confide.home.bean.ConfideHomeBodyBean
 import com.ydl.confide.home.bean.ConfideHomeDataBean
 import com.ydl.confide.home.event.IConfideHomeEvent
 import com.ydl.ydlcommon.view.banner.GlideImageLoader
-import kotlinx.android.synthetic.main.confidehome_banner_view.view.*
+import kotlinx.android.synthetic.main.confide_banner_view.view.*
 
 /**
  * @author yuanwai
@@ -39,7 +39,7 @@ class ConfideHomeBannerView(context: Context,
 
     private fun initView() {
         val params = FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
-        View.inflate(context, R.layout.confidehome_banner_view, this)
+        View.inflate(context, R.layout.confide_banner_view, this)
         layoutParams = params
         margin = RxImageTool.dip2px(2.5f)
     }
@@ -67,7 +67,7 @@ class ConfideHomeBannerView(context: Context,
         for (index in 0..count) {
             urlLists.add((mDataList as ArrayList<ConfideHomeBodyBean>)[index].bannerImageUrl!!)
         }
-        banner.setImageLoader(GlideImageLoader(R.color.new_divide_color,6)).setImages(urlLists).start()
+        banner.setImageLoader(GlideImageLoader(R.color.confide_new_divide_color,6)).setImages(urlLists).start()
 
         banner.setOnBannerListener {
             confideHomeEvent!!.bannerClick((mDataList as ArrayList<ConfideHomeBodyBean>)[it].bannerLinkUrl, it, (mDataList as ArrayList<ConfideHomeBodyBean>)[it].bannerTitle)

m-confide/src/main/java/com/ydl/confide/home/widget/ConfideHomeCategoryItemView.kt

@@ -6,13 +6,13 @@ import android.support.v7.widget.CardView
 import android.text.TextUtils
 import android.util.AttributeSet
 import android.view.View
-import com.ydl.ydl_image.module.GlideApp
-import com.yidianling.common.tools.RxImageTool
 import com.ydl.confide.R
 import com.ydl.confide.home.bean.ConfideHomeBodyBean
 import com.ydl.confide.home.contract.IConfideHomeContract
 import com.ydl.confide.home.event.IConfideHomeEvent
-import kotlinx.android.synthetic.main.confidehome_item_category.view.*
+import com.ydl.ydl_image.module.GlideApp
+import com.yidianling.common.tools.RxImageTool
+import kotlinx.android.synthetic.main.confide_item_category.view.*
 
 /**
  * @author yuanwai
@@ -32,7 +32,7 @@ class ConfideHomeCategoryItemView(mContext: Context, @Nullable attrs: AttributeS
     }
 
     private fun initView() {
-        View.inflate(context, R.layout.confidehome_item_category, this)
+        View.inflate(context, R.layout.confide_item_category, this)
         dp35 = RxImageTool.dip2px(35f)
     }
 

m-confide/src/main/java/com/ydl/confide/home/widget/ConfideHomeCategoryView.kt

@@ -10,7 +10,7 @@ import com.ydl.confide.home.bean.ConfideHomeBodyBean
 import com.ydl.confide.home.bean.ConfideHomeDataBean
 import com.ydl.confide.home.contract.IConfideHomeContract
 import com.ydl.confide.home.event.IConfideHomeEvent
-import kotlinx.android.synthetic.main.confidehome_category_view.view.*
+import kotlinx.android.synthetic.main.confide_category_view.view.*
 
 /**
  * @author yuanwai
@@ -30,10 +30,10 @@ class ConfideHomeCategoryView(mContext: Context,
 
     private fun initView(){
         var params = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,RxImageTool.dip2px(106f))
-        View.inflate(context, R.layout.confidehome_category_view,this)
+        View.inflate(context, R.layout.confide_category_view,this)
         layoutParams = params
         orientation = HORIZONTAL
-        setBackgroundResource(R.color.confidehome_category_bg)
+        setBackgroundResource(R.color.confide_category_bg)
     }
 
     fun initData(bean: ConfideHomeDataBean?){

m-confide/src/main/java/com/ydl/confide/home/widget/ConfideHomeFilterView.kt

@@ -9,13 +9,13 @@ import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
-import com.yidianling.common.tools.RxImageTool
 import com.ydl.confide.R
 import com.ydl.confide.home.bean.ConfideHomeBodyBean
 import com.ydl.confide.home.bean.ConfideHomeDataBean
 import com.ydl.confide.home.contract.IConfideHomeContract
 import com.ydl.ydlcommon.utils.ScreenUtil
 import com.ydl.ydlcommon.view.DrawableRightTextView
+import com.yidianling.common.tools.RxImageTool
 
 /**
  * @author yuanwai
@@ -93,7 +93,7 @@ class ConfideHomeFilterView(mContext: Context, @Nullable attrs: AttributeSet?, d
         textView.text = bodyBean.filterName
         textView.setTag(R.id.tv_title,bodyBean)
         if ("排序" == bodyBean.filterName){
-            textView.setTextColor(ContextCompat.getColor(context, R.color.baby_blue))
+            textView.setTextColor(ContextCompat.getColor(context, R.color.confide_main_theme))
 //            textView.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_arrow_drop_down_green_18dp, 0)
         }
         textView.setOnClickListener {
@@ -127,7 +127,7 @@ class ConfideHomeFilterView(mContext: Context, @Nullable attrs: AttributeSet?, d
             var view = getChildAt(index)
             if (view is DrawableRightTextView){
                 if ("排序" == view.text){
-                    view.setTextColor(ContextCompat.getColor(context, R.color.baby_blue))
+                    view.setTextColor(ContextCompat.getColor(context, R.color.confide_main_theme))
                 }else{
                     view.setTextColor(ContextCompat.getColor(context, R.color._6))
                 }

m-confide/src/main/java/com/ydl/confide/home/widget/ConfideHomeFooterView.kt

@@ -7,7 +7,7 @@ import android.widget.LinearLayout
 import android.widget.RelativeLayout
 import com.ydl.confide.R
 import com.ydl.confide.home.event.IConfideHomeEvent
-import kotlinx.android.synthetic.main.confidehome_footer.view.*
+import kotlinx.android.synthetic.main.confide_footer.view.*
 
 /**
  * @author yuanwai
@@ -27,7 +27,7 @@ class ConfideHomeFooterView(var mContext: Context,var confideHomeEvent : IConfid
      */
     private fun initView() {
         var params = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,ViewGroup.LayoutParams.WRAP_CONTENT)
-        View.inflate(context, R.layout.confidehome_footer,this)
+        View.inflate(context, R.layout.confide_footer,this)
         tv_footer.setOnClickListener {
             confideHomeEvent.consultantMoreClick("app://listen/list")
         }

m-confide/src/main/java/com/ydl/confide/home/widget/ConfideHomeHeadView.kt

@@ -9,7 +9,7 @@ import com.ydl.confide.R
 import com.ydl.confide.home.bean.ConfideHomeDataBean
 import com.ydl.confide.home.config.IConfideHomeConfig
 import com.ydl.confide.home.event.IConfideHomeEvent
-import kotlinx.android.synthetic.main.confidehome_item_header.view.*
+import kotlinx.android.synthetic.main.confide_item_header.view.*
 
 @Suppress("DEPRECATION")
 /**
@@ -27,7 +27,7 @@ class ConfideHomeHeadView(context: Context, private var confideHomeEvent: IConfi
 
     private fun initView() {
         orientation = HORIZONTAL
-        View.inflate(context, R.layout.confidehome_item_header, this)
+        View.inflate(context, R.layout.confide_item_header, this)
         var params = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, RxImageTool.dip2px(25f))
         params.setMargins(0, RxImageTool.dip2px(30f), 0, RxImageTool.dip2px(18f))
         layoutParams = params
@@ -46,18 +46,18 @@ class ConfideHomeHeadView(context: Context, private var confideHomeEvent: IConfi
         when (bean.type) {
             IConfideHomeConfig.TYPE_RECOMMEND -> {
                 setPadding(0, RxImageTool.dip2px(30f), 0, 0)
-                iv_recently_talk.setImageResource(R.drawable.confidehome_recommend)
+                iv_recently_talk.setImageResource(R.drawable.confide_recommend)
                 iv_recently_title.text = bean.head.title
                 iv_recently_more.visibility = View.GONE
             }
             IConfideHomeConfig.TYPE_RECENTLY_CONFIDED -> {
                 setPadding(0, RxImageTool.dip2px(30f), 0, RxImageTool.dip2px(18f))
-                iv_recently_talk.setImageResource(R.drawable.confidehome_zuijin)
+                iv_recently_talk.setImageResource(R.drawable.confide_zuijin)
                 iv_recently_title.text = bean.head.title
                 iv_recently_more.visibility = View.GONE
             }
             IConfideHomeConfig.TYPE_SOUND -> {
-                iv_recently_talk.setImageResource(R.drawable.confidehome_listen)
+                iv_recently_talk.setImageResource(R.drawable.confide_listen)
                 iv_recently_title.text = bean.head.title
                 iv_recently_more.visibility = View.GONE
             }

m-confide/src/main/java/com/ydl/confide/home/widget/ConfideHomeListenAndFoundItemView.kt

@@ -9,7 +9,7 @@ import com.ydl.confide.home.bean.ConfideHomeBodyBean
 import com.ydl.confide.home.config.IConfideHomeConfig
 import com.ydl.confide.home.event.IConfideHomeEvent
 import com.ydl.confide.home.util.ConfideHomeUtils
-import kotlinx.android.synthetic.main.confidehome_listen_and_found_item_view.view.*
+import kotlinx.android.synthetic.main.confide_listen_and_found_item_view.view.*
 
 /**
  * @author yuanwai
@@ -24,7 +24,7 @@ class ConfideHomeListenAndFoundItemView(mContext: Context, private var confideHo
     }
 
     private fun initView() {
-        View.inflate(context, R.layout.confidehome_listen_and_found_item_view, this)
+        View.inflate(context, R.layout.confide_listen_and_found_item_view, this)
     }
 
     /**
@@ -66,15 +66,15 @@ class ConfideHomeListenAndFoundItemView(mContext: Context, private var confideHo
         when (bodyBean.confideLine) {//1在线 2离线 3通话中
             1 -> {
                 tv_isLine.text = "在线"
-                tv_isLine.setBackgroundResource(R.drawable.confidehome_bg_main_color)
+                tv_isLine.setBackgroundResource(R.drawable.confide_bg_main_color)
             }
             2 -> {
                 tv_isLine.text = "离线"
-                tv_isLine.setBackgroundResource(R.drawable.confidehome_bg_color_666666)
+                tv_isLine.setBackgroundResource(R.drawable.confide_bg_color_666666)
             }
             3 -> {
                 tv_isLine.text = "通话中"
-                tv_isLine.setBackgroundResource(R.drawable.confidehome_bg_color_ff8f38)
+                tv_isLine.setBackgroundResource(R.drawable.confide_bg_color_ff8f38)
             }
 
             else -> {
@@ -111,9 +111,9 @@ class ConfideHomeListenAndFoundItemView(mContext: Context, private var confideHo
      */
     private fun setSex(bodyBean: ConfideHomeBodyBean) {
         if (bodyBean.confideSex == 1) {
-            img_sex.setImageResource(R.drawable.confidehome_new_male)
+            img_sex.setImageResource(R.drawable.confide_new_male)
         } else {
-            img_sex.setImageResource(R.drawable.confidehome_new_female)
+            img_sex.setImageResource(R.drawable.confide_new_female)
         }
     }
 
@@ -151,16 +151,16 @@ class ConfideHomeListenAndFoundItemView(mContext: Context, private var confideHo
     private fun setConfideButton(bodyBean: ConfideHomeBodyBean) {
         when (bodyBean.confideLine) {//1.在线 2.离线 3.通话中 4.继续倾诉
             1 -> {
-                tv_confide.setBackgroundResource(R.drawable.confidehome_line_1)
+                tv_confide.setBackgroundResource(R.drawable.confide_line_1)
             }
             2 -> {
-                tv_confide.setBackgroundResource(R.drawable.confidehome_line_2)
+                tv_confide.setBackgroundResource(R.drawable.confide_line_2)
             }
             3 -> {
-                tv_confide.setBackgroundResource(R.drawable.confidehome_line_3)
+                tv_confide.setBackgroundResource(R.drawable.confide_line_3)
             }
             4 ->{
-                tv_confide.setBackgroundResource(R.drawable.confidehome_line_4)
+                tv_confide.setBackgroundResource(R.drawable.confide_line_4)
             }
         }
     }

m-confide/src/main/java/com/ydl/confide/home/widget/ConfideHomeListenAndFoundView.kt

@@ -6,7 +6,7 @@ import android.widget.FrameLayout
 import com.ydl.confide.R
 import com.ydl.confide.home.bean.ConfideHomeDataBean
 import com.ydl.confide.home.event.IConfideHomeEvent
-import kotlinx.android.synthetic.main.confidehome_banner.view.*
+import kotlinx.android.synthetic.main.confide_banner.view.*
 
 /**
  * @author Jim
@@ -28,7 +28,7 @@ class ConfideHomeListenAndFoundView(context: Context, private var confideHomeEve
     }
 
     private fun initView() {
-        View.inflate(context, R.layout.confidehome_banner, this)
+        View.inflate(context, R.layout.confide_banner, this)
     }
 
     fun initData(bean: ConfideHomeDataBean) {

m-confide/src/main/java/com/ydl/confide/home/widget/ConfideHomeRecentView.kt

@@ -13,7 +13,7 @@ import com.yidianling.common.tools.RxImageTool
 import com.ydl.confide.R
 import com.ydl.confide.home.bean.ConfideHomeDataBean
 import com.ydl.confide.home.event.IConfideHomeEvent
-import kotlinx.android.synthetic.main.confidehome_recent_view.view.*
+import kotlinx.android.synthetic.main.confide_recent_view.view.*
 
 /**
  * @author yuanwai
@@ -35,7 +35,7 @@ class ConfideHomeRecentView(mContext: Context, private var confideHomeEvent: ICo
      */
     private fun initView() {
         initLayoutParam()
-        View.inflate(context, R.layout.confidehome_recent_view, this)
+        View.inflate(context, R.layout.confide_recent_view, this)
 
     }
 
@@ -71,9 +71,9 @@ class ConfideHomeRecentView(mContext: Context, private var confideHomeEvent: ICo
             img_icon.setTag(R.id.img_icon, bodyBean.confidedIcon)
         }
         if (bodyBean.confideSex == 1) {
-            img_sex.setImageResource(R.drawable.confidehome_new_male)
+            img_sex.setImageResource(R.drawable.confide_new_male)
         } else {
-            img_sex.setImageResource(R.drawable.confidehome_new_female)
+            img_sex.setImageResource(R.drawable.confide_new_female)
         }
         tv_name.text = bodyBean.confidedName
         tv_history.text = bodyBean.confideHistory

m-confide/src/main/java/com/ydl/confide/home/widget/ConfideHomeRecommendExpertItemView.kt

@@ -17,7 +17,7 @@ import com.ydl.confide.home.bean.ConfideHomeBodyBean
 import com.ydl.confide.home.config.IConfideHomeConfig
 import com.ydl.confide.home.event.IConfideHomeEvent
 import com.ydl.ydlcommon.utils.ScreenUtil
-import kotlinx.android.synthetic.main.confidehome_recommend_expert_item_view.view.*
+import kotlinx.android.synthetic.main.confide_recommend_expert_item_view.view.*
 
 /**
  * @author yuanwai
@@ -38,7 +38,7 @@ class ConfideHomeRecommendExpertItemView(mContext: Context, private var confideH
     }
 
     private fun initView() {
-        View.inflate(context, R.layout.confidehome_recommend_expert_item_view, this)
+        View.inflate(context, R.layout.confide_recommend_expert_item_view, this)
         bgWidth = ScreenUtil.screenWidth - RxImageTool.dip2px(30f)
         dp100 = RxImageTool.dip2px(100f)
         dp16 = RxImageTool.dip2px(16f)
@@ -108,15 +108,15 @@ class ConfideHomeRecommendExpertItemView(mContext: Context, private var confideH
         when (bodyBean.confideLine) {//1在线 2离线 3通话中 4继续通话
             1, 4 -> {
                 tv_isLine.text = "在线"
-                tv_isLine.setBackgroundResource(R.drawable.confidehome_bg_main_color)
+                tv_isLine.setBackgroundResource(R.drawable.confide_bg_main_color)
             }
             2 -> {
                 tv_isLine.text = "离线"
-                tv_isLine.setBackgroundResource(R.drawable.confidehome_bg_color_666666)
+                tv_isLine.setBackgroundResource(R.drawable.confide_bg_color_666666)
             }
             3 -> {
                 tv_isLine.text = "通话中"
-                tv_isLine.setBackgroundResource(R.drawable.confidehome_bg_color_ff8f38)
+                tv_isLine.setBackgroundResource(R.drawable.confide_bg_color_ff8f38)
             }
         }
     }
@@ -145,9 +145,9 @@ class ConfideHomeRecommendExpertItemView(mContext: Context, private var confideH
             img_play.visibility = View.VISIBLE
         }
         if (confideIsPlay) {
-            img_play.setImageResource(R.drawable.confidehome_playing)
+            img_play.setImageResource(R.drawable.confide_playing)
         } else {
-            img_play.setImageResource(R.drawable.confidehome_sond_play)
+            img_play.setImageResource(R.drawable.confide_sond_play)
         }
         img_play.setOnClickListener {
             if (confideIsPlay) {
@@ -163,9 +163,9 @@ class ConfideHomeRecommendExpertItemView(mContext: Context, private var confideH
      */
     private fun setSex(bodyBean: ConfideHomeBodyBean) {
         if (bodyBean.confideSex == 1) {
-            img_sex.setImageResource(R.drawable.confidehome_new_male)
+            img_sex.setImageResource(R.drawable.confide_new_male)
         } else {
-            img_sex.setImageResource(R.drawable.confidehome_new_female)
+            img_sex.setImageResource(R.drawable.confide_new_female)
         }
     }
 
@@ -215,7 +215,7 @@ class ConfideHomeRecommendExpertItemView(mContext: Context, private var confideH
             textView.setTextColor(Color.parseColor("#808080"))
             textView.gravity = Gravity.CENTER
             textView.setPadding(dp3, 0, dp3, 0)
-            textView.setBackgroundResource(R.drawable.confidehome_bg_tag)
+            textView.setBackgroundResource(R.drawable.confide_bg_tag)
             textView.layoutParams = params
             textView.text = tag
             flowlayout_tag.addView(textView)

m-confide/src/main/java/com/ydl/confide/home/widget/ConfideHomeRecommendExpertView.kt

@@ -7,7 +7,7 @@ import com.ydl.confide.R
 import com.ydl.confide.home.bean.ConfideHomeDataBean
 import com.ydl.confide.home.event.IConfideHomeEvent
 import com.ydl.confide.home.widget.adapter.RecommendExpertAdapter
-import kotlinx.android.synthetic.main.confidehome_recommend_expert_view.view.*
+import kotlinx.android.synthetic.main.confide_recommend_expert_view.view.*
 
 /**
  * @author yuanwai
@@ -33,7 +33,7 @@ class ConfideHomeRecommendExpertView(context : Context, private var confideHomeE
     }
 
     private fun initView(){
-        View.inflate(context, R.layout.confidehome_recommend_expert_view,this)
+        View.inflate(context, R.layout.confide_recommend_expert_view,this)
     }
 
     fun initData(bean: ConfideHomeDataBean?){

m-confide/src/main/java/com/ydl/confide/home/widget/ConfideHomeRecommendView.kt

@@ -18,7 +18,7 @@ import com.ydl.confide.home.bean.ConfideHomeBodyBean
 import com.ydl.confide.home.config.IConfideHomeConfig
 import com.ydl.confide.home.contract.IConfideHomeContract
 import com.ydl.confide.home.event.IConfideHomeEvent
-import kotlinx.android.synthetic.main.confidehome_recommend_view.view.*
+import kotlinx.android.synthetic.main.confide_recommend_view.view.*
 
 /**
  * @author yuanwai
@@ -41,7 +41,7 @@ class ConfideHomeRecommendView(var view: IConfideHomeContract.View, context: Con
     private fun initView() {
         var params = FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
         layoutParams = params
-        View.inflate(context, R.layout.confidehome_recommend_view, this)
+        View.inflate(context, R.layout.confide_recommend_view, this)
         dp96 = RxImageTool.dip2px(96f)
         dp16 = RxImageTool.dip2px(16f)
         dp4 = RxImageTool.dip2px(4f)
@@ -92,15 +92,15 @@ class ConfideHomeRecommendView(var view: IConfideHomeContract.View, context: Con
         when (bodyBean.confideLine) {//1在线 2离线 3通话中
             1, 4 -> {
                 tv_isLine.text = "在线"
-                tv_isLine.setBackgroundResource(R.drawable.confidehome_bg_main_color)
+                tv_isLine.setBackgroundResource(R.drawable.confide_bg_main_color)
             }
             2 -> {
                 tv_isLine.text = "离线"
-                tv_isLine.setBackgroundResource(R.drawable.confidehome_bg_color_666666)
+                tv_isLine.setBackgroundResource(R.drawable.confide_bg_color_666666)
             }
             3 -> {
                 tv_isLine.text = "通话中"
-                tv_isLine.setBackgroundResource(R.drawable.confidehome_bg_color_ff8f38)
+                tv_isLine.setBackgroundResource(R.drawable.confide_bg_color_ff8f38)
             }
 //            4 -> {
 //                tv_confide.text = "继续倾诉"
@@ -133,9 +133,9 @@ class ConfideHomeRecommendView(var view: IConfideHomeContract.View, context: Con
             iv_play.visibility = View.VISIBLE
         }
         if (bodyBean.confideIsPlay) {
-            iv_play.setImageResource(R.drawable.confidehome_playing)
+            iv_play.setImageResource(R.drawable.confide_playing)
         } else {
-            iv_play.setImageResource(R.drawable.confidehome_sond_play)
+            iv_play.setImageResource(R.drawable.confide_sond_play)
         }
         iv_play.setOnClickListener {
             if (bodyBean.confideIsPlay!!) {
@@ -151,9 +151,9 @@ class ConfideHomeRecommendView(var view: IConfideHomeContract.View, context: Con
      */
     private fun setSex(bodyBean: ConfideHomeBodyBean) {
         if (bodyBean.confideSex == 1) {
-            img_sex.setImageResource(R.drawable.confidehome_new_male)
+            img_sex.setImageResource(R.drawable.confide_new_male)
         } else {
-            img_sex.setImageResource(R.drawable.confidehome_new_female)
+            img_sex.setImageResource(R.drawable.confide_new_female)
         }
     }
 
@@ -216,7 +216,7 @@ class ConfideHomeRecommendView(var view: IConfideHomeContract.View, context: Con
             textView.setTextColor(Color.parseColor("#808080"))
             textView.gravity = Gravity.CENTER
             textView.setPadding(dp3, 0, dp3, 0)
-            textView.setBackgroundResource(R.drawable.confidehome_bg_tag)
+            textView.setBackgroundResource(R.drawable.confide_bg_tag)
             textView.layoutParams = params
             textView.text = tag
             flowlayout_tag.addView(textView)
@@ -230,16 +230,16 @@ class ConfideHomeRecommendView(var view: IConfideHomeContract.View, context: Con
     private fun setConfideButton(bodyBean: ConfideHomeBodyBean) {
         when (bodyBean.confideLine) {//1在线 2离线 3通话中  4继续倾诉
             1 -> {
-                tv_confide.setBackgroundResource(R.drawable.confidehome_line_1)
+                tv_confide.setBackgroundResource(R.drawable.confide_line_1)
             }
             2 -> {
-                tv_confide.setBackgroundResource(R.drawable.confidehome_line_2)
+                tv_confide.setBackgroundResource(R.drawable.confide_line_2)
             }
             3 -> {
-                tv_confide.setBackgroundResource(R.drawable.confidehome_line_3)
+                tv_confide.setBackgroundResource(R.drawable.confide_line_3)
             }
             4 -> {
-                tv_confide.setBackgroundResource(R.drawable.confidehome_line_4)
+                tv_confide.setBackgroundResource(R.drawable.confide_line_4)
             }
         }
         tv_confide.setOnClickListener {

m-confide/src/main/java/com/ydl/confide/home/widget/ConfidePlayerFloatView.java

@@ -48,7 +48,7 @@ public class ConfidePlayerFloatView extends FrameLayout {
         wm = (WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE);
         dp3= RxImageTool.dip2px(3f);
         mTouchSlop = ViewConfiguration.get(getContext()).getScaledTouchSlop() + 5;
-        View view = inflate(context, R.layout.confidehome_playing_float_btn, this);
+        View view = inflate(context, R.layout.confide_playing_float_btn, this);
         playHead = view.findViewById(R.id.play_head);
         playState = view.findViewById(R.id.play_state);
         playClose = findViewById(R.id.play_close);
@@ -168,7 +168,7 @@ public class ConfidePlayerFloatView extends FrameLayout {
                     } else {
                         if (!isMove) {
                             if (isFmPlay) {
-                                playState.setImageResource(R.drawable.confidehome_play_stop);
+                                playState.setImageResource(R.drawable.confide_play_stop);
                                 playState.setPadding(dp3,dp3,dp3,dp3);
                                 playClose.setVisibility(VISIBLE);
                                 dividerLine.setVisibility(VISIBLE);
@@ -176,7 +176,7 @@ public class ConfidePlayerFloatView extends FrameLayout {
                                     mPlayCallBack.click(false);
                                 }
                             }  else {
-                                playState.setImageResource(R.drawable.confidehome_play_pause);
+                                playState.setImageResource(R.drawable.confide_play_pause);
                                 playState.setPadding(dp3,dp3,dp3,dp3);
                                 playClose.setVisibility(GONE);
                                 dividerLine.setVisibility(GONE);
@@ -229,12 +229,12 @@ public class ConfidePlayerFloatView extends FrameLayout {
     public void updatePlayState(Boolean isPlaying) {
         this.isFmPlay = isPlaying;
         if (isPlaying) {
-            playState.setImageResource(R.drawable.confidehome_play_pause);
+            playState.setImageResource(R.drawable.confide_play_pause);
             playState.setPadding(dp3,dp3,dp3,dp3);
             playClose.setVisibility(GONE);
             dividerLine.setVisibility(VISIBLE);
         } else {
-            playState.setImageResource(R.drawable.confidehome_play_stop);
+            playState.setImageResource(R.drawable.confide_play_stop);
             playState.setPadding(dp3,dp3,dp3,dp3);
             playClose.setVisibility(VISIBLE);
         }

m-confide/src/main/res/layouts/confidehome/color/confidehome_color_filter_selector.xml → m-confide/src/main/res/color/confide_color_filter_selector.xml

 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/baby_blue" android:state_selected="true" android:state_enabled="true"/>
+    <item android:color="@color/confide_main_theme" android:state_selected="true" android:state_enabled="true"/>
     <item android:color="@color/_6" android:state_enabled="true"/>
 </selector>
\ No newline at end of file

m-confide/src/main/res/layouts/confidehome/drawable/confidehome_bg_color_ff5b05.xml → m-confide/src/main/res/drawable/confide_bg_color_ff5b05.xml

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="@dimen/dp_3"/>
+    <corners android:radius="@dimen/confide_dp_3"/>
     <stroke android:color="#ff5b05" android:width="1px"/>
 </shape>

m-confide/src/main/res/layouts/confidehome/drawable/confidehome_bg_sound_selected.xml → m-confide/src/main/res/drawable/confide_bg_sound_selected.xml

@@ -4,7 +4,7 @@
     android:shape="rectangle"
     android:useLevel="false">
 
-    <solid android:color="#1DA1F2"/>
+    <solid android:color="@color/confide_main_theme"/>
 
     <corners android:radius="10dp"/>
 

m-confide/src/main/res/layouts/confidehome/drawable/confidehome_common_bg.xml → m-confide/src/main/res/drawable/confide_common_bg.xml

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient
-    android:startColor="#56CCF2"
-    android:endColor="#2F80ED"
+    android:startColor="@color/confide_main_theme_light"
+    android:endColor="@color/confide_main_theme"
     android:angle="0" />
 </shape>
\ No newline at end of file

m-confide/src/main/res/layouts/confidehome/drawable/confidehome_confidehome_bg.xml → m-confide/src/main/res/drawable/confide_confidehome_bg.xml

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient
-    android:startColor="#56CCF2"
-    android:endColor="#2F80ED"
+    android:startColor="@color/confide_main_theme_light"
+    android:endColor="@color/confide_main_theme"
     android:angle="0" />
 </shape>
\ No newline at end of file

m-confide/src/main/res/layouts/confidehome/drawable/confidehome_filter_btn_bg.xml → m-confide/src/main/res/drawable/confide_filter_btn_bg.xml

@@ -4,10 +4,10 @@
     <corners android:radius="20dp" />
     <!--<stroke-->
         <!--android:width="1dp"-->
-        <!--android:color="@color/platform_main_theme_blue" />-->
+        <!--android:color="@color/confide_main_theme" />-->
     <gradient
-        android:startColor="#1DA1F2"
-        android:endColor="#42C1FF"
+        android:startColor="@color/confide_main_theme"
+        android:endColor="@color/confide_main_theme"
         android:angle="0"/>
 
 </shape>
\ No newline at end of file

m-confide/src/main/res/layouts/confidehome/drawable/confidehome_filter_reset_btn_bg.xml → m-confide/src/main/res/drawable/confide_filter_reset_btn_bg.xml

@@ -4,7 +4,7 @@
     <corners android:radius="20dp" />
     <stroke
         android:width="1px"
-        android:color="@color/platform_main_theme_blue" />
+        android:color="@color/confide_main_theme" />
     <!--<solid android:color="@color/white"/>-->
 
 </shape>
\ No newline at end of file

m-confide/src/main/res/layouts/confidehome/drawable/confidehome_filter_select_sel.xml → m-confide/src/main/res/drawable/confide_filter_select_sel.xml

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="4dp" />
-    <solid android:color="#1A1DA1F2" />
-    <stroke android:width="1px" android:color="#1DA1F2"/>
+    <solid android:color="#FFFFFF" />
+    <stroke android:width="1px" android:color="@color/confide_main_theme"/>
 </shape>
\ No newline at end of file

m-confide/src/main/res/layouts/confidehome/drawable/confidehome_recent_btn_on_bg.xml → m-confide/src/main/res/drawable/confide_recent_btn_on_bg.xml

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="100dp"/>
-    <solid android:color="#1da1f2" />
+    <solid android:color="@color/confide_main_theme" />
 </shape>
\ No newline at end of file

m-confide/src/main/res/layouts/confidehome/drawable/confidehome_recommend_expert_line_bg.xml → m-confide/src/main/res/drawable/confide_recommend_expert_line_bg.xml

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:bottomRightRadius="3dp"/>
-    <solid android:color="#1DA1F2" />
+    <solid android:color="@color/confide_main_theme" />
 </shape>
\ No newline at end of file

m-confide/src/main/res/drawable/shape_gray_round.xml → m-confide/src/main/res/drawable/confide_shape_gray_round.xml

@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- 圆角 -->
-    <corners android:radius="@dimen/default_dis_size_big" />
+    <corners android:radius="@dimen/confide_default_dis_size_big" />
     <stroke
         android:width="1dp"
         android:color="#D6D6D6" />

m-confide/src/main/res/drawable/text_select_green_grey.xml → m-confide/src/main/res/drawable/confide_text_select_green_grey.xml

 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true" android:color="@color/platform_google_green"/>
+    <item android:state_checked="true" android:color="@color/confide_main_theme"/>
     <item android:state_checked="false" android:color="@color/platform_text_gray"/>
 </selector>
\ No newline at end of file

m-confide/src/main/res/layouts/confidehome/layout/confidehome_banner.xml → m-confide/src/main/res/layout/confide_banner.xml

@@ -12,8 +12,8 @@
         android:layout_height="145dp"
         android:layout_marginBottom="30dp"
         app:pa_indicator_different_width="14dp"
-        app:pa_indicator_drawable_selected="@drawable/confidehome_bg_sound_selected"
-        app:pa_indicator_drawable_unselected="@drawable/confidehome_bg_sound_unselect"
+        app:pa_indicator_drawable_selected="@drawable/confide_bg_sound_selected"
+        app:pa_indicator_drawable_unselected="@drawable/confide_bg_sound_unselect"
         app:pa_indicator_height="5dp"
         app:pa_indicator_margin="3dp"
         app:pa_is_auto_play="false"

m-confide/src/main/res/layouts/confidehome/layout/confidehome_banner_view.xml → m-confide/src/main/res/layout/confide_banner_view.xml

@@ -5,10 +5,10 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="118dp"
-        android:background="@drawable/confidehome_confidehome_bg" />
+        android:background="@drawable/confide_confidehome_bg" />
         <FrameLayout
             android:layout_width="match_parent"
-            android:layout_marginTop="@dimen/dp_10"
+            android:layout_marginTop="@dimen/confide_dp_10"
             android:layout_height="160dp"
             android:layout_marginBottom="20dp">
             <com.ydl.ydlcommon.view.banner.Banner
@@ -18,8 +18,8 @@
                 android:layout_marginLeft="15dp"
                 android:layout_marginRight="15dp"
                 app:pa_indicator_different_width="14dp"
-                app:pa_indicator_drawable_selected="@drawable/confidehome_bg_sound_selected"
-                app:pa_indicator_drawable_unselected="@drawable/confidehome_bg_sound_unselect"
+                app:pa_indicator_drawable_selected="@drawable/confide_bg_sound_selected"
+                app:pa_indicator_drawable_unselected="@drawable/confide_bg_sound_unselect"
                 app:pa_indicator_height="4dp"
                 app:pa_is_selected_same_unselected="false"
                 app:pa_is_show_inside="false" />

m-confide/src/main/res/layouts/confidehome/layout/confidehome_category_view.xml → m-confide/src/main/res/layout/confide_category_view.xml

@@ -5,9 +5,9 @@
     <com.ydl.confide.home.widget.ConfideHomeCategoryItemView
         android:id="@+id/v_item1"
         android:layout_width="0px"
-        android:layout_marginLeft="@dimen/dp_15"
-        android:layout_marginTop="@dimen/dp_19"
-        android:layout_marginBottom="@dimen/dp_18"
+        android:layout_marginLeft="@dimen/confide_dp_15"
+        android:layout_marginTop="@dimen/confide_dp_19"
+        android:layout_marginBottom="@dimen/confide_dp_18"
         android:layout_height="match_parent"
         android:layout_weight="1"
         app:cardCornerRadius="6dp"
@@ -15,9 +15,9 @@
     <com.ydl.confide.home.widget.ConfideHomeCategoryItemView
         android:id="@+id/v_item2"
         android:layout_marginLeft="10dp"
-        android:layout_marginTop="@dimen/dp_19"
-        android:layout_marginBottom="@dimen/dp_18"
-        android:layout_marginRight="@dimen/dp_15"
+        android:layout_marginTop="@dimen/confide_dp_19"
+        android:layout_marginBottom="@dimen/confide_dp_18"
+        android:layout_marginRight="@dimen/confide_dp_15"
         android:layout_width="0px"
         android:layout_height="match_parent"
         android:layout_weight="1"

m-confide/src/main/res/layouts/confidehome/layout/confidehome_footer.xml → m-confide/src/main/res/layout/confide_footer.xml

@@ -10,7 +10,7 @@
         android:drawablePadding="5dp"
         android:layout_centerInParent="true"
         android:text="更多情感恋爱专家"
-        android:drawableRight="@drawable/confidehome_more"
+        android:drawableRight="@drawable/confide_more"
         android:textColor="#666666"
         android:textSize="15dp"/>
 </merge>

m-confide/src/main/res/layout/fragment_dialog_phone_call.xml → m-confide/src/main/res/layout/confide_fragment_dialog_phone_call.xml

@@ -22,8 +22,8 @@
 
         <ImageView
             android:id="@+id/sdv_head"
-            android:layout_width="@dimen/head_size_big"
-            android:layout_height="@dimen/head_size_big"
+            android:layout_width="@dimen/confide_head_size_big"
+            android:layout_height="@dimen/confide_head_size_big"
             android:layout_centerHorizontal="true"
             android:layout_centerInParent="true"
             android:contentDescription="@null" />
@@ -42,15 +42,15 @@
 
         <ImageView
             android:layout_width="match_parent"
-            android:layout_height="@dimen/divide_line_stroke_width"
-            android:layout_marginBottom="@dimen/default_dis_size_huge"
+            android:layout_height="@dimen/confide_divide_line_stroke_width"
+            android:layout_marginBottom="@dimen/confide_default_dis_size_huge"
             android:background="#22222B24" />
 
         <TextView
             android:id="@+id/tv_phone"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/default_dis_size_huge"
+            android:layout_marginBottom="@dimen/confide_default_dis_size_huge"
             android:text="请注意接听，通常为0571开头号码"
             android:textColor="@color/white" />
 
@@ -58,14 +58,14 @@
             android:id="@+id/tv_hint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/default_dis_size_huge"
+            android:layout_marginBottom="@dimen/confide_default_dis_size_huge"
             android:text="如倒计时结束后仍然未接到来电，请挂断后重新连接"
             android:textColor="@color/white" />
 
         <ImageView
             android:layout_width="match_parent"
-            android:layout_height="@dimen/divide_line_stroke_width"
-            android:layout_marginBottom="@dimen/default_dis_size_huge"
+            android:layout_height="@dimen/confide_divide_line_stroke_width"
+            android:layout_marginBottom="@dimen/confide_default_dis_size_huge"
             android:background="#22222B24" />
     </LinearLayout>
 
@@ -106,6 +106,6 @@
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="30dp"
-        android:src="@drawable/state_stop"
+        android:src="@drawable/confide_state_stop"
         android:visibility="invisible"/>
 </RelativeLayout>

m-confide/src/main/res/layouts/confidehome/layout/confidehome_good_item.xml → m-confide/src/main/res/layout/confide_good_item.xml

@@ -6,9 +6,9 @@
     android:layout_height="30dp"
     android:layout_marginTop="8dp"
     android:gravity="center"
-    android:textColor="@color/confidehome_color_filter_selector"
+    android:textColor="@color/confide_color_filter_selector"
     android:orientation="vertical"
-    android:background="@drawable/confidehome_filter_select_nor"
-    android:textSize="@dimen/dp_13"
+    android:background="@drawable/confide_filter_select_nor"
+    android:textSize="@dimen/confide_dp_13"
     tools:text="恋爱婚姻" />
 

m-confide/src/main/res/layouts/confidehome/layout/confidehome_good_popup_window.xml → m-confide/src/main/res/layout/confide_good_popup_window.xml

@@ -8,7 +8,7 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="0.5dp"
-        android:background="@color/confidehome_filters_line"/>
+        android:background="@color/confide_filters_line"/>
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -18,7 +18,7 @@
             android:id="@+id/tv_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textSize="@dimen/dp_13"
+            android:textSize="@dimen/confide_dp_13"
             android:textColor="@color/_6"
             android:layout_marginLeft="24dp"
             android:layout_marginTop="25dp"
@@ -28,8 +28,8 @@
         <android.support.v7.widget.RecyclerView
             android:id="@+id/rvGood"
             android:layout_width="match_parent"
-            android:layout_marginLeft="@dimen/dp_16"
-            android:layout_marginRight="@dimen/dp_16"
+            android:layout_marginLeft="@dimen/confide_dp_16"
+            android:layout_marginRight="@dimen/confide_dp_16"
             android:layout_height="wrap_content" />
     </LinearLayout>
 
@@ -47,10 +47,10 @@
             android:layout_marginBottom="24dp"
             android:layout_marginTop="8dp"
             android:layout_marginLeft="15dp"
-            android:background="@drawable/confidehome_filter_reset_btn_bg"
+            android:background="@drawable/confide_filter_reset_btn_bg"
             android:text="@string/platform_reset"
-            android:textColor="@color/platform_main_theme_blue"
-            android:textSize="@dimen/dp_18" />
+            android:textColor="@color/confide_main_theme"
+            android:textSize="@dimen/confide_dp_18" />
 
         <Button
             android:id="@+id/btnConfirm"
@@ -61,11 +61,11 @@
             android:layout_marginRight="15dp"
             android:layout_marginBottom="24dp"
             android:layout_marginTop="8dp"
-            android:background="@drawable/confidehome_filter_btn_bg"
+            android:background="@drawable/confide_filter_btn_bg"
             android:gravity="center"
             android:text="@string/platform_confirm"
             android:textColor="@color/white"
-            android:textSize="@dimen/dp_18" />
+            android:textSize="@dimen/confide_dp_18" />
     </LinearLayout>
     <View
         android:id="@+id/v_zhezhao"

m-confide/src/main/res/layouts/confidehome/layout/confidehome_home_activity.xml → m-confide/src/main/res/layout/confide_home_activity.xml

 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-    android:background="@color/white">
+        android:background="@color/white"
+        android:orientation="vertical">
+
+    <include layout="@layout/confide_title_bar" />
+
+   <RelativeLayout
+           android:layout_width="match_parent"
+           android:layout_height="match_parent">
 
        <com.jcodecraeer.xrecyclerview.XRecyclerView
                android:id="@+id/rv_list"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
-        android:layout_marginTop="48dp" />
-
-    <include layout="@layout/confidehome_title_bar" />
+               />
 
        <LinearLayout
                android:id="@+id/quick_consult_card"
                android:layout_width="match_parent"
                android:layout_height="50dp"
                android:layout_alignParentBottom="true"
-        android:layout_marginBottom="30dp"
                android:layout_marginLeft="15dp"
                android:layout_marginRight="15dp"
-        android:background="@drawable/card_consult_bg"
+               android:layout_marginBottom="30dp"
+               android:background="@drawable/confide_card_consult_bg"
                android:orientation="horizontal"
-        android:paddingLeft="@dimen/dp_25"
-        android:paddingRight="@dimen/dp_25"
+               android:paddingLeft="@dimen/confide_dp_25"
+               android:paddingRight="@dimen/confide_dp_25"
                android:visibility="gone">
 
            <TextView
@@ -42,10 +47,10 @@
                    android:id="@+id/quick_consult_btn"
                    android:layout_width="wrap_content"
                    android:layout_height="30dp"
-            android:background="@drawable/consult_btn_bg"
+                   android:background="@drawable/confide_consult_btn_bg"
                    android:gravity="center"
-            android:paddingLeft="@dimen/dp_20"
-            android:paddingRight="@dimen/dp_20"
+                   android:paddingLeft="@dimen/confide_dp_20"
+                   android:paddingRight="@dimen/confide_dp_20"
                    android:text="一键倾诉"
                    android:textColor="@color/platform_color_242424"
                    android:textSize="14dp"
@@ -56,17 +61,18 @@
                android:id="@+id/v_zhezhao"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
-        android:layout_marginTop="96dp"
+               android:layout_marginTop="48dp"
                android:background="#80000000"
-        android:visibility="gone" />
+               android:visibility="gone"
+               />
 
        <com.ydl.confide.home.widget.ConfideHomeFilterView
                android:id="@+id/v_filterView"
                android:layout_width="match_parent"
                android:layout_height="48dp"
-        android:layout_marginTop="48dp"
                android:background="@color/white"
-        android:visibility="gone" />
+               android:visibility="gone"
+               />
 
        <com.ydl.ydlcommon.mvp.lce.view.YDLStateView
                android:id="@+id/lce_state_view"
@@ -75,6 +81,8 @@
                android:layout_alignLeft="@+id/rv_list"
                android:layout_alignTop="@+id/rv_list"
                android:layout_alignRight="@+id/rv_list"
-        android:layout_alignBottom="@+id/rv_list"/>
+               android:layout_alignBottom="@+id/rv_list" />
+
+   </RelativeLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>

m-confide/src/main/res/layouts/confidehome/layout/confidehome_item_category.xml → m-confide/src/main/res/layout/confide_item_category.xml

@@ -10,14 +10,14 @@
         android:layout_height="35dp"
         android:layout_marginTop="17dp"
         android:layout_marginLeft="16dp"
-        tools:background="@drawable/confidehome_recent_btn_on_bg"/>
+        tools:background="@drawable/confide_recent_btn_on_bg"/>
     <TextView
         android:id="@id/tv_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_17"
+        android:layout_marginTop="@dimen/confide_dp_17"
         android:layout_marginLeft="59dp"
-        android:textSize="@dimen/dp_13"
+        android:textSize="@dimen/confide_dp_13"
         android:textColor="@color/_6"
         tools:text="倾诉指南"/>
     <TextView
@@ -26,7 +26,7 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="59.5dp"
         android:layout_marginTop="38dp"
-        android:textSize="@dimen/dp_10"
+        android:textSize="@dimen/confide_dp_10"
         android:textColor="@color/_9"
         tools:text="排忧疏导，隐私安全"/>
 </FrameLayout>

m-confide/src/main/res/layouts/confidehome/layout/confidehome_item_header.xml → m-confide/src/main/res/layout/confide_item_header.xml

@@ -8,7 +8,7 @@
         android:layout_width="18dp"
         android:layout_height="18dp"
         android:layout_gravity="center_vertical"
-        tools:src="@drawable/confidehome_zuijin"
+        tools:src="@drawable/confide_zuijin"
         android:layout_marginLeft="15dp"/>
 
     <TextView
@@ -35,7 +35,7 @@
         android:paddingBottom="3dp"
         android:layout_marginRight="15dp"
         android:textSize="10sp"
-        android:background="@drawable/confidehome_bg_radius_line_gray_20"
+        android:background="@drawable/confide_bg_radius_line_gray_20"
         tools:text="更多"/>
 
 </merge>

m-confide/src/main/res/layouts/confidehome/layout/confidehome_listen_and_found_item_view.xml → m-confide/src/main/res/layout/confide_listen_and_found_item_view.xml

@@ -4,8 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="@dimen/dp_15"
-    android:layout_marginRight="@dimen/dp_15"
+    android:layout_marginLeft="@dimen/confide_dp_15"
+    android:layout_marginRight="@dimen/confide_dp_15"
     android:layout_marginBottom="1dp"
     android:layout_marginTop="1dp"
     app:cardElevation="1dp"
@@ -19,40 +19,40 @@
             android:id="@+id/img_bg"
             android:layout_width="116dp"
             android:layout_height="116dp"
-            android:background="@drawable/confidehome_listen_bg" />
+            android:background="@drawable/confide_listen_bg" />
         <!--播放图片-->
         <ImageView
             android:id="@+id/img_disc"
             android:layout_width="94dp"
             android:layout_height="94dp"
-            android:layout_marginLeft="@dimen/dp_11"
-            android:layout_marginTop="@dimen/dp_11"
-            android:background="@drawable/confidehome_listen_disc" />
+            android:layout_marginLeft="@dimen/confide_dp_11"
+            android:layout_marginTop="@dimen/confide_dp_11"
+            android:background="@drawable/confide_listen_disc" />
         <ImageView
             android:id="@+id/img_play"
             android:layout_width="38dp"
             android:layout_height="38dp"
             android:layout_marginLeft="39dp"
             android:layout_marginTop="39dp"
-            android:background="@drawable/confidehome_listen_play"/>
+            android:background="@drawable/confide_listen_play"/>
         <!--遮罩图片-->
         <ImageView
             android:id="@+id/img_mask"
             android:layout_width="116dp"
             android:layout_height="116dp"
-            android:background="@drawable/confidehome_listen_mask" />
+            android:background="@drawable/confide_listen_mask" />
 
         <TextView
             android:id="@+id/tv_isLine"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/confidehome_recommend_expert_line_bg"
+            android:background="@drawable/confide_recommend_expert_line_bg"
             android:paddingBottom="1dp"
             android:paddingLeft="9dp"
             android:paddingRight="9dp"
             android:paddingTop="1dp"
             android:textColor="@color/white"
-            android:textSize="@dimen/dp_10"
+            android:textSize="@dimen/confide_dp_10"
             tools:text="在线" />
 
         <TextView
@@ -62,7 +62,7 @@
             android:layout_marginLeft="136dp"
             android:layout_marginTop="16dp"
             android:textColor="#555555"
-            android:textSize="@dimen/dp_15"
+            android:textSize="@dimen/confide_dp_15"
             tools:text="姚雨晴" />
 
         <ImageView
@@ -72,17 +72,17 @@
             android:layout_marginLeft="6dp"
             android:layout_marginTop="19dp"
             android:layout_toRightOf="@+id/tv_name"
-            tools:background="@drawable/confidehome_new_male" />
+            tools:background="@drawable/confide_new_male" />
 
         <TextView
             android:id="@+id/tv_confide"
             android:layout_width="30dp"
             android:layout_height="30dp"
             android:layout_alignParentRight="true"
-            android:layout_marginRight="@dimen/dp_15"
+            android:layout_marginRight="@dimen/confide_dp_15"
             android:layout_marginTop="16dp"
             android:gravity="center"
-            tools:background="@drawable/confidehome_line_1" />
+            tools:background="@drawable/confide_line_1" />
 
         <TextView
             android:id="@+id/tv_confideNum"
@@ -92,7 +92,7 @@
             android:layout_marginLeft="136dp"
             android:layout_marginTop="12dp"
             android:textColor="@color/_6"
-            android:textSize="@dimen/dp_11"
+            android:textSize="@dimen/confide_dp_11"
             tools:text="8000人" />
 
         <TextView
@@ -100,22 +100,22 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@+id/tv_name"
-            android:layout_marginRight="@dimen/dp_16"
+            android:layout_marginRight="@dimen/confide_dp_16"
             android:layout_marginTop="12dp"
             android:layout_toRightOf="@+id/tv_confideNum"
             android:text="向TA倾诉"
             android:textColor="@color/_9"
-            android:textSize="@dimen/dp_11" />
+            android:textSize="@dimen/confide_dp_11" />
 
         <TextView
             android:id="@+id/tv_Connection"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@+id/tv_name"
-            android:layout_marginTop="@dimen/dp_12"
+            android:layout_marginTop="@dimen/confide_dp_12"
             android:layout_toRightOf="@+id/tv_tv_confideNumContent"
             android:textColor="@color/_6"
-            android:textSize="@dimen/dp_11"
+            android:textSize="@dimen/confide_dp_11"
             tools:text="83%" />
 
         <TextView
@@ -123,11 +123,11 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@+id/tv_name"
-            android:layout_marginTop="@dimen/dp_12"
+            android:layout_marginTop="@dimen/confide_dp_12"
             android:layout_toRightOf="@+id/tv_Connection"
             android:text="接通率"
             android:textColor="@color/_9"
-            android:textSize="@dimen/dp_11" />
+            android:textSize="@dimen/confide_dp_11" />
 
 
         <View
@@ -137,9 +137,9 @@
             android:layout_below="@+id/tv_Connection"
             android:layout_marginBottom="4dp"
             android:layout_marginLeft="136dp"
-            android:layout_marginRight="@dimen/dp_10"
+            android:layout_marginRight="@dimen/confide_dp_10"
             android:layout_marginTop="4dp"
-            android:background="@color/confidehome_line" />
+            android:background="@color/confide_line" />
 
         <TextView
             android:id="@+id/tv_content"
@@ -147,11 +147,11 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/v_line"
             android:layout_marginLeft="136dp"
-            android:layout_marginRight="@dimen/dp_15"
+            android:layout_marginRight="@dimen/confide_dp_15"
             android:ellipsize="end"
             android:maxLines="2"
             android:textColor="@color/_9"
-            android:textSize="@dimen/dp_11"
+            android:textSize="@dimen/confide_dp_11"
             tools:text="没有人一出生就是完美的，只有不断的相信自...己…才能成就自己的梦想。" />
     </RelativeLayout>
 </android.support.v7.widget.CardView>

m-confide/src/main/res/layouts/confidehome/layout/confidehome_playing_float_btn.xml → m-confide/src/main/res/layout/confide_playing_float_btn.xml

@@ -20,7 +20,7 @@
             android:layout_marginLeft="8dp"
             android:layout_marginRight="8dp"
             android:layout_marginTop="8dp"
-            android:src="@drawable/confidehome_float_head"/>
+            android:src="@drawable/confide_float_head"/>
 
         <View
             android:layout_width="1dp"
@@ -39,7 +39,7 @@
             android:layout_marginLeft="8dp"
             android:layout_marginRight="8dp"
             android:layout_marginTop="8dp"
-            android:src="@drawable/confidehome_play_pause"/>
+            android:src="@drawable/confide_play_pause"/>
 
         <View
             android:id="@+id/hz_divider_line"
@@ -59,7 +59,7 @@
             android:layout_marginLeft="8dp"
             android:layout_marginRight="8dp"
             android:layout_marginTop="8dp"
-            android:src="@drawable/confidehome_play_close"
+            android:src="@drawable/confide_play_close"
             android:visibility="gone"/>
 
     </LinearLayout>

m-confide/src/main/res/layouts/confidehome/layout/confidehome_recent_view.xml → m-confide/src/main/res/layout/confide_recent_view.xml

@@ -37,7 +37,7 @@
         android:layout_marginLeft="5dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        tools:background="@drawable/confidehome_new_male"/>
+        tools:background="@drawable/confide_new_male"/>
     <TextView
         android:id="@+id/tv_history"
         android:layout_toRightOf="@id/cv_icon"
@@ -45,7 +45,7 @@
         android:layout_marginLeft="12dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="@dimen/dp_10"
+        android:textSize="@dimen/confide_dp_10"
         android:textColor="@color/platform_color_grey_999999"
         tools:text="7月13日 你向TA倾诉过"/>
     <TextView
@@ -57,6 +57,6 @@
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
         android:gravity="center"
-        android:background="@drawable/confidehome_recent_btn_on_bg"
+        android:background="@drawable/confide_recent_btn_on_bg"
         android:text="再倾诉一次"/>
 </RelativeLayout>

m-confide/src/main/res/layouts/confidehome/layout/confidehome_recommend_expert_head.xml → m-confide/src/main/res/layout/confide_recommend_expert_head.xml

@@ -20,7 +20,7 @@
         android:layout_marginTop="34dp"
         android:layout_marginLeft="6dp"
         android:layout_marginRight="6dp"
-        android:textSize="@dimen/dp_18"
+        android:textSize="@dimen/confide_dp_18"
         android:textColor="#444444"
         tools:text="最佳倾诉榜单"/>
     <View

m-confide/src/main/res/layouts/confidehome/layout/confidehome_recommend_expert_item_view.xml → m-confide/src/main/res/layout/confide_recommend_expert_item_view.xml

@@ -7,7 +7,7 @@
     android:layout_height="match_parent"
     app:cardElevation="1dp"
     app:cardCornerRadius="6dp"
-    android:layout_marginLeft="@dimen/dp_10"
+    android:layout_marginLeft="@dimen/confide_dp_10"
     android:layout_marginBottom="2dp">
     <FrameLayout
         android:id="@+id/ll_layout"
@@ -23,23 +23,23 @@
             android:id="@id/tv_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textSize="@dimen/dp_14"
+            android:textSize="@dimen/confide_dp_14"
             android:textColor="@color/white"
-            android:layout_marginTop="@dimen/dp_12"
+            android:layout_marginTop="@dimen/confide_dp_12"
             android:paddingTop="2dp"
             android:paddingBottom="1dp"
-            android:paddingLeft="@dimen/dp_10"
-            android:paddingRight="@dimen/dp_10"
-            android:background="@drawable/confidehome_recommend_expert_title_bg"
+            android:paddingLeft="@dimen/confide_dp_10"
+            android:paddingRight="@dimen/confide_dp_10"
+            android:background="@drawable/confide_recommend_expert_title_bg"
             tools:text="情感恋爱"/>
 
         <android.support.v7.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/dp_12"
-            android:layout_marginRight="@dimen/dp_12"
+            android:layout_marginLeft="@dimen/confide_dp_12"
+            android:layout_marginRight="@dimen/confide_dp_12"
             android:layout_marginTop="48dp"
-            android:layout_marginBottom="@dimen/dp_16"
+            android:layout_marginBottom="@dimen/confide_dp_16"
             app:cardBackgroundColor="@color/white"
             app:cardCornerRadius="6dp"
             app:cardElevation="1dp">
@@ -54,17 +54,17 @@
                     android:paddingRight="9dp"
                     android:paddingTop="1dp"
                     android:paddingBottom="1dp"
-                    android:textSize="@dimen/dp_10"
+                    android:textSize="@dimen/confide_dp_10"
                     android:textColor="@color/white"
-                    android:background="@drawable/confidehome_recommend_expert_line_bg"
+                    android:background="@drawable/confide_recommend_expert_line_bg"
                     tools:text="在线"/>
                 <android.support.v7.widget.CardView
                     android:id="@+id/cv_head"
                     android:layout_width="100dp"
                     android:layout_height="100dp"
-                    android:layout_marginLeft="@dimen/dp_12"
-                    android:layout_marginTop="@dimen/dp_20"
-                    android:layout_marginBottom="@dimen/dp_20"
+                    android:layout_marginLeft="@dimen/confide_dp_12"
+                    android:layout_marginTop="@dimen/confide_dp_20"
+                    android:layout_marginBottom="@dimen/confide_dp_20"
                     app:cardCornerRadius="50dp"
                     app:cardElevation="0px">
                     <ImageView
@@ -79,16 +79,16 @@
                     android:layout_height="24dp"
                     android:layout_marginTop="91dp"
                     android:layout_marginLeft="84dp"
-                    tools:background="@drawable/confidehome_paused"/>
+                    tools:background="@drawable/confide_paused"/>
 
                 <TextView
                     android:id="@+id/tv_name"
                     android:layout_toRightOf="@+id/cv_head"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_22"
+                    android:layout_marginTop="@dimen/confide_dp_22"
                     android:layout_marginLeft="14dp"
-                    android:textSize="@dimen/dp_15"
+                    android:textSize="@dimen/confide_dp_15"
                     android:textColor="#555555"
                     tools:text="姚雨晴"/>
 
@@ -99,12 +99,12 @@
                     android:layout_marginLeft="6dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    tools:background="@drawable/confidehome_new_male"/>
+                    tools:background="@drawable/confide_new_male"/>
                 <TextView
                     android:id="@+id/tv_confideNum"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="@dimen/dp_11"
+                    android:textSize="@dimen/confide_dp_11"
                     android:textColor="@color/_6"
                     android:layout_toRightOf="@+id/cv_head"
                     android:layout_below="@+id/tv_name"
@@ -116,30 +116,30 @@
                     android:layout_below="@+id/tv_name"
                     android:layout_toRightOf="@+id/tv_confideNum"
                     android:layout_marginTop="10dp"
-                    android:layout_marginRight="@dimen/dp_16"
+                    android:layout_marginRight="@dimen/confide_dp_16"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="@dimen/dp_11"
+                    android:textSize="@dimen/confide_dp_11"
                     android:textColor="@color/_9"
                     android:text="向TA倾诉"/>
                 <TextView
                     android:id="@+id/tv_Connection"
                     android:layout_below="@+id/tv_name"
                     android:layout_toRightOf="@+id/tv_tv_confideNumContent"
-                    android:layout_marginTop="@dimen/dp_10"
+                    android:layout_marginTop="@dimen/confide_dp_10"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="@dimen/dp_11"
+                    android:textSize="@dimen/confide_dp_11"
                     android:textColor="@color/_6"
                     tools:text="83%"/>
                 <TextView
                     android:id="@+id/tv_ConnectionContent"
                     android:layout_below="@+id/tv_name"
                     android:layout_toRightOf="@+id/tv_Connection"
-                    android:layout_marginTop="@dimen/dp_10"
+                    android:layout_marginTop="@dimen/confide_dp_10"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="@dimen/dp_11"
+                    android:textSize="@dimen/confide_dp_11"
                     android:textColor="@color/_9"
                     android:text="接通率"/>
                 <LinearLayout
@@ -150,8 +150,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="16dp"
                     android:layout_marginBottom="8dp"
-                    android:layout_marginLeft="@dimen/dp_12"
-                    android:layout_marginRight="@dimen/dp_10"
+                    android:layout_marginLeft="@dimen/confide_dp_12"
+                    android:layout_marginRight="@dimen/confide_dp_10"
                     android:layout_marginTop="4dp" />
                 <View
                     android:id="@+id/v_line"
@@ -159,19 +159,19 @@
                     android:layout_toRightOf="@+id/cv_head"
                     android:layout_width="match_parent"
                     android:layout_height="0.5dp"
-                    android:layout_marginLeft="@dimen/dp_14"
-                    android:layout_marginRight="@dimen/dp_10"
+                    android:layout_marginLeft="@dimen/confide_dp_14"
+                    android:layout_marginRight="@dimen/confide_dp_10"
                     android:layout_marginBottom="4dp"
-                    android:background="@color/confidehome_line"/>
+                    android:background="@color/confide_line"/>
                 <TextView
                     android:id="@+id/tv_content"
                     android:layout_below="@+id/v_line"
                     android:layout_toRightOf="@+id/cv_head"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/dp_14"
-                    android:layout_marginRight="@dimen/dp_10"
-                    android:textSize="@dimen/dp_11"
+                    android:layout_marginLeft="@dimen/confide_dp_14"
+                    android:layout_marginRight="@dimen/confide_dp_10"
+                    android:textSize="@dimen/confide_dp_11"
                     android:textColor="@color/_9"
                     android:lines="1"
                     android:ellipsize="end"
@@ -183,12 +183,12 @@
             android:layout_width="128dp"
             android:layout_height="28dp"
             android:layout_marginTop="204dp"
-            android:layout_marginBottom="@dimen/dp_18"
+            android:layout_marginBottom="@dimen/confide_dp_18"
             android:layout_gravity="center_horizontal"
-            android:textSize="@dimen/dp_12"
+            android:textSize="@dimen/confide_dp_12"
             android:textColor="@color/white"
             android:gravity="center"
-            android:background="@drawable/confidehome_recommend_expert_btn_bg"
+            android:background="@drawable/confide_recommend_expert_btn_bg"
             android:text="向TA倾诉"/>
     </FrameLayout>
 </android.support.v7.widget.CardView>

m-confide/src/main/res/layouts/confidehome/layout/confidehome_recommend_expert_view.xml → m-confide/src/main/res/layout/confide_recommend_expert_view.xml

@@ -6,7 +6,7 @@
     android:paddingTop="14dp"
     android:paddingBottom="35dp"
     android:paddingLeft="5dp"
-    android:background="@drawable/confidehome_recommend_expert_bg">
+    android:background="@drawable/confide_recommend_expert_bg">
     <android.support.v4.view.ViewPager
         android:id="@+id/viewPager"
         android:layout_width="match_parent"

m-confide/src/main/res/layouts/confidehome/layout/confidehome_recommend_view.xml → m-confide/src/main/res/layout/confide_recommend_view.xml

@@ -9,7 +9,7 @@
         android:id="@+id/cv_head"
         android:layout_width="96dp"
         android:layout_height="96dp"
-        android:layout_marginStart="@dimen/dp_15"
+        android:layout_marginStart="@dimen/confide_dp_15"
         android:layout_marginTop="24.5dp"
         android:layout_marginBottom="24dp"
         app:cardElevation="1dp"
@@ -30,9 +30,9 @@
                 android:paddingRight="9dp"
                 android:paddingTop="1dp"
                 android:paddingBottom="1dp"
-                android:textSize="@dimen/dp_10"
+                android:textSize="@dimen/confide_dp_10"
                 android:textColor="@color/white"
-                android:background="@drawable/confidehome_recommend_expert_line_bg"
+                android:background="@drawable/confide_recommend_expert_line_bg"
                 tools:text="在线"/>
             <ImageView
                 android:id="@+id/iv_play"
@@ -41,7 +41,7 @@
                 android:layout_gravity="bottom|right"
                 android:layout_marginBottom="8dp"
                 android:layout_marginEnd="8dp"
-                tools:background="@drawable/confidehome_paused"/>
+                tools:background="@drawable/confide_paused"/>
         </FrameLayout>
     </android.support.v7.widget.CardView>
     <TextView
@@ -51,7 +51,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="24.5dp"
         android:layout_marginStart="14dp"
-        android:textSize="@dimen/dp_15"
+        android:textSize="@dimen/confide_dp_15"
         android:textColor="#555555"
         tools:text="姚雨晴"
         tools:ignore="SpUsage" />
@@ -63,25 +63,25 @@
         android:layout_marginStart="6dp"
         android:layout_width="13dp"
         android:layout_height="13dp"
-        tools:background="@drawable/confidehome_new_male"/>
+        tools:background="@drawable/confide_new_male"/>
     <TextView
         android:id="@+id/tv_confide"
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_alignParentEnd="true"
         android:layout_marginTop="24.5dp"
-        android:layout_marginEnd="@dimen/dp_15"
+        android:layout_marginEnd="@dimen/confide_dp_15"
         android:gravity="center"
-        tools:background="@drawable/confidehome_line_1"/>
+        tools:background="@drawable/confide_line_1"/>
     <TextView
         android:id="@+id/tv_confideNum"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="@dimen/dp_11"
+        android:textSize="@dimen/confide_dp_11"
         android:textColor="@color/_6"
         android:layout_toEndOf="@+id/cv_head"
         android:layout_below="@+id/tv_name"
-        android:layout_marginStart="@dimen/dp_12"
+        android:layout_marginStart="@dimen/confide_dp_12"
         android:layout_marginTop="12dp"
         tools:text="8000人"
         tools:ignore="SpUsage" />
@@ -90,10 +90,10 @@
         android:layout_below="@+id/tv_name"
         android:layout_toEndOf="@+id/tv_confideNum"
         android:layout_marginTop="12dp"
-        android:layout_marginEnd="@dimen/dp_16"
+        android:layout_marginEnd="@dimen/confide_dp_16"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="@dimen/dp_11"
+        android:textSize="@dimen/confide_dp_11"
         android:textColor="@color/_9"
         android:text="向TA倾诉"
         tools:ignore="SpUsage" />
@@ -101,10 +101,10 @@
         android:id="@+id/tv_Connection"
         android:layout_below="@+id/tv_name"
         android:layout_toEndOf="@+id/tv_tv_confideNumContent"
-        android:layout_marginTop="@dimen/dp_12"
+        android:layout_marginTop="@dimen/confide_dp_12"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="@dimen/dp_11"
+        android:textSize="@dimen/confide_dp_11"
         android:textColor="@color/_6"
         tools:text="83%"
         tools:ignore="SpUsage" />
@@ -112,11 +112,11 @@
         android:id="@+id/tv_ConnectionContent"
         android:layout_below="@+id/tv_name"
         android:layout_toEndOf="@+id/tv_Connection"
-        android:layout_marginTop="@dimen/dp_12"
+        android:layout_marginTop="@dimen/confide_dp_12"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/dp_12"
-        android:textSize="@dimen/dp_11"
+        android:layout_marginEnd="@dimen/confide_dp_12"
+        android:textSize="@dimen/confide_dp_11"
         android:textColor="@color/_9"
         android:text="接通率"
         tools:ignore="SpUsage" />
@@ -128,8 +128,8 @@
         android:layout_width="wrap_content"
         android:layout_height="16dp"
         android:layout_marginBottom="8dp"
-        android:layout_marginStart="@dimen/dp_12"
-        android:layout_marginEnd="@dimen/dp_10"
+        android:layout_marginStart="@dimen/confide_dp_12"
+        android:layout_marginEnd="@dimen/confide_dp_10"
         android:layout_marginTop="4dp" />
     <View
         android:id="@+id/v_line"
@@ -137,19 +137,19 @@
         android:layout_toEndOf="@+id/cv_head"
         android:layout_width="match_parent"
         android:layout_height="0.5dp"
-        android:layout_marginStart="@dimen/dp_12"
-        android:layout_marginEnd="@dimen/dp_15"
+        android:layout_marginStart="@dimen/confide_dp_12"
+        android:layout_marginEnd="@dimen/confide_dp_15"
         android:layout_marginBottom="4dp"
-        android:background="@color/confidehome_line"/>
+        android:background="@color/confide_line"/>
     <TextView
         android:id="@+id/tv_content"
         android:layout_below="@+id/v_line"
         android:layout_toEndOf="@+id/cv_head"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_12"
-        android:layout_marginEnd="@dimen/dp_15"
-        android:textSize="@dimen/dp_11"
+        android:layout_marginStart="@dimen/confide_dp_12"
+        android:layout_marginEnd="@dimen/confide_dp_15"
+        android:textSize="@dimen/confide_dp_11"
         android:textColor="@color/_9"
         android:lines="1"
         android:ellipsize="end"
@@ -160,10 +160,10 @@
         android:id="@+id/tv_price"
         android:layout_below="@+id/tv_content"
         android:layout_toEndOf="@+id/cv_head"
-        android:layout_marginStart="@dimen/dp_12"
+        android:layout_marginStart="@dimen/confide_dp_12"
         android:layout_marginTop="6dp"
         android:layout_marginBottom="20dp"
-        android:textSize="@dimen/dp_18"
+        android:textSize="@dimen/confide_dp_18"
         android:textColor="#FF5B05"
         android:gravity="bottom"
         android:textStyle="bold"
@@ -175,10 +175,10 @@
         android:id="@+id/tv_priceContent"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_13"
+        android:layout_marginTop="@dimen/confide_dp_13"
         android:layout_below="@+id/tv_content"
         android:layout_toEndOf="@+id/tv_price"
-        android:textSize="@dimen/dp_11"
+        android:textSize="@dimen/confide_dp_11"
         android:textColor="#FF5B05"
         android:text="元/次"
         tools:ignore="SpUsage" />
@@ -189,10 +189,10 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/tv_content"
         android:layout_toEndOf="@+id/tv_priceContent"
-        android:layout_marginTop="@dimen/dp_14"
-        android:layout_marginStart="@dimen/dp_5"
+        android:layout_marginTop="@dimen/confide_dp_14"
+        android:layout_marginStart="@dimen/confide_dp_5"
         android:textColor="#a2a2a2"
-        android:textSize="@dimen/dp_10"
+        android:textSize="@dimen/confide_dp_10"
         tools:ignore="SpUsage"
         tools:text="50元/次"/>
 
@@ -202,22 +202,22 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/tv_content"
         android:layout_alignParentEnd="true"
-        android:layout_marginEnd="@dimen/dp_15"
-        android:layout_marginTop="@dimen/dp_12"
-        android:background="@drawable/confidehome_bg_color_ff5b05"
-        android:textSize="@dimen/dp_10"
+        android:layout_marginEnd="@dimen/confide_dp_15"
+        android:layout_marginTop="@dimen/confide_dp_12"
+        android:background="@drawable/confide_bg_color_ff5b05"
+        android:textSize="@dimen/confide_dp_10"
         android:textColor="#ff5b05"
-        android:paddingStart="@dimen/dp_4"
-        android:paddingEnd="@dimen/dp_4"
-        android:paddingTop="@dimen/dp_2"
-        android:paddingBottom="@dimen/dp_2"
+        android:paddingStart="@dimen/confide_dp_4"
+        android:paddingEnd="@dimen/confide_dp_4"
+        android:paddingTop="@dimen/confide_dp_2"
+        android:paddingBottom="@dimen/confide_dp_2"
         tools:text="立减￥30"
         tools:ignore="SpUsage" />
     <View
         android:layout_below="@+id/tv_price"
         android:layout_width="match_parent"
         android:layout_height="0.5dp"
-        android:layout_marginLeft="@dimen/dp_15"
-        android:layout_marginRight="@dimen/dp_15"
-        android:background="@color/confidehome_line"/>
+        android:layout_marginLeft="@dimen/confide_dp_15"
+        android:layout_marginRight="@dimen/confide_dp_15"
+        android:background="@color/confide_line"/>
 </RelativeLayout>

m-confide/src/main/res/layouts/confidehome/layout/confidehome_sexage_popup_window.xml → m-confide/src/main/res/layout/confide_sexage_popup_window.xml

@@ -8,7 +8,7 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="0.5dp"
-        android:background="@color/confidehome_filters_line" />
+        android:background="@color/confide_filters_line" />
     <!--之所以要加一层 是因为 要设置白色 背景 但是 TextView改为padding 不好用 比较急 先这样吧-->
     <LinearLayout
         android:layout_width="match_parent"
@@ -24,7 +24,7 @@
             android:layout_marginLeft="24dp"
             android:layout_marginTop="25dp"
             android:textColor="@color/_6"
-            android:textSize="@dimen/dp_13"
+            android:textSize="@dimen/confide_dp_13"
             tools:text="性别筛选" />
     </LinearLayout>
 
@@ -42,11 +42,11 @@
             android:layout_marginLeft="24dp"
             android:layout_marginTop="8dp"
             android:layout_weight="1"
-            android:background="@drawable/confidehome_filter_select_nor"
+            android:background="@drawable/confide_filter_select_nor"
             android:gravity="center"
             android:orientation="vertical"
-            android:textColor="@color/confidehome_color_filter_selector"
-            android:textSize="@dimen/dp_13"
+            android:textColor="@color/confide_color_filter_selector"
+            android:textSize="@dimen/confide_dp_13"
             tools:text="只选男生" />
 
         <TextView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -58,11 +58,11 @@
             android:layout_marginRight="16dp"
             android:layout_marginTop="8dp"
             android:layout_weight="1"
-            android:background="@drawable/confidehome_filter_select_nor"
+            android:background="@drawable/confide_filter_select_nor"
             android:gravity="center"
             android:orientation="vertical"
-            android:textColor="@color/confidehome_color_filter_selector"
-            android:textSize="@dimen/dp_13"
+            android:textColor="@color/confide_color_filter_selector"
+            android:textSize="@dimen/confide_dp_13"
             tools:text="只选女生" />
 
         <TextView
@@ -87,7 +87,7 @@
             android:layout_marginLeft="24dp"
             android:layout_marginTop="25dp"
             android:textColor="@color/_6"
-            android:textSize="@dimen/dp_13"
+            android:textSize="@dimen/confide_dp_13"
             tools:text="年龄筛选" />
 
         <android.support.v7.widget.RecyclerView
@@ -112,10 +112,10 @@
             android:layout_marginLeft="15dp"
             android:layout_marginTop="8dp"
             android:layout_weight="1"
-            android:background="@drawable/confidehome_filter_reset_btn_bg"
+            android:background="@drawable/confide_filter_reset_btn_bg"
             android:text="@string/platform_reset"
-            android:textColor="@color/platform_main_theme_blue"
-            android:textSize="@dimen/dp_18" />
+            android:textColor="@color/confide_main_theme"
+            android:textSize="@dimen/confide_dp_18" />
 
         <Button
             android:id="@+id/btnConfirm"
@@ -126,10 +126,10 @@
             android:layout_marginRight="15dp"
             android:layout_marginTop="8dp"
             android:layout_weight="1"
-            android:background="@drawable/confidehome_filter_btn_bg"
+            android:background="@drawable/confide_filter_btn_bg"
             android:text="@string/platform_confirm"
             android:textColor="@color/white"
-            android:textSize="@dimen/dp_18" />
+            android:textSize="@dimen/confide_dp_18" />
     </LinearLayout>
 
     <View

m-confide/src/main/res/layouts/confidehome/layout/confidehome_sort_item.xml → m-confide/src/main/res/layout/confide_sort_item.xml

@@ -20,5 +20,5 @@
         android:layout_height="0.5dp"
         android:layout_marginLeft="24dp"
         android:layout_marginRight="24dp"
-        android:background="@color/confidehome_line"/>
+        android:background="@color/confide_line"/>
 </LinearLayout>

m-confide/src/main/res/layouts/confidehome/layout/confidehome_sort_popup_window.xml → m-confide/src/main/res/layout/confide_sort_popup_window.xml

@@ -7,7 +7,7 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="0.5dp"
-        android:background="@color/confidehome_filters_line"/>
+        android:background="@color/confide_filters_line"/>
     <android.support.v7.widget.RecyclerView
         android:id="@+id/rvSortItem"
         android:layout_width="match_parent"

m-confide/src/main/res/layouts/confidehome/layout/confidehome_title_bar.xml → m-confide/src/main/res/layout/confide_title_bar.xml

 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="horizontal"
     android:layout_width="match_parent"
-    android:layout_height="48dp">
-    <View
-        android:id="@+id/v_bg"
-        android:layout_width="match_parent"
     android:layout_height="48dp"
-        android:background="@drawable/confidehome_common_bg"/>
+    android:background="@drawable/confide_common_bg"
+    android:id="@+id/rl_confide_title_layout"
+    >
+
     <LinearLayout
         android:id="@+id/ll_bar_root"
         android:orientation="horizontal"
@@ -21,7 +20,7 @@
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="15dp"
             android:layout_marginRight="15dp"
-            android:background="@drawable/confidehome_back"/>
+            android:background="@drawable/confide_back"/>
         <TextView
             android:id="@+id/tv_title"
             android:layout_width="0px"
@@ -30,7 +29,7 @@
             android:gravity="center"
             android:textSize="17dp"
             android:textColor="#FFFFFF"
-            android:text="@string/confidehome_title"/>
+            android:text="@string/confide_title"/>
         <ImageView
             android:id="@+id/img_mine"
             android:layout_width="wrap_content"
@@ -38,6 +37,6 @@
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="15dp"
             android:layout_marginRight="15dp"
-            android:background="@drawable/confidehome_mine"/>
+            android:background="@drawable/confide_mine"/>
     </LinearLayout>
-</FrameLayout>
+</RelativeLayout>

m-confide/src/main/res/layouts/confidehome/values/color_confidehome.xml

-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="confidehome_line">#F0F0F0</color>
-    <color name="confidehome_filters_line">#E0E0E0</color>
-    <color name="confidehome_category_bg">#FAFAFA</color>
-</resources>
\ No newline at end of file

m-confide/src/main/res/layouts/confidehome/values/string_confide.xml

-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="confidehome_title">即时倾诉</string>
-</resources>
\ No newline at end of file

m-confide/src/main/res/values/colors.xml

 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="color_242424">#242424</color>
-    <color name="new_divide_color">#f0f0f0</color>
+    <color name="confide_color_242424">#242424</color>
+    <color name="confide_new_divide_color">#f0f0f0</color>
+    <color name="confide_line">#F0F0F0</color>
+    <color name="confide_filters_line">#E0E0E0</color>
+    <color name="confide_category_bg">#FAFAFA</color>
 </resources>

m-confide/src/main/res/values/dimens.xml

 <?xml version="1.0" encoding="UTF-8" ?>
 <resources>
     <!--分割线粗细-->
-    <dimen name="divide_line_stroke_width">0.5dp</dimen>
+    <dimen name="confide_divide_line_stroke_width">0.5dp</dimen>
 
     <!--距离部分-->
-    <dimen name="default_dis_size_nano">2dp</dimen>
-    <dimen name="default_dis_size_micro">4dp</dimen>
-    <dimen name="default_dis_size_small">6dp</dimen>
-    <dimen name="default_dis_size">8dp</dimen>
-    <dimen name="default_dis_size_big">10dp</dimen>
-    <dimen name="default_dis_size_large">12dp</dimen>
-    <dimen name="default_dis_size_huge">14dp</dimen>
-    <dimen name="default_dis_size_huge_more">16dp</dimen>
+    <dimen name="confide_default_dis_size_nano">2dp</dimen>
+    <dimen name="confide_default_dis_size_micro">4dp</dimen>
+    <dimen name="confide_default_dis_size_small">6dp</dimen>
+    <dimen name="confide_default_dis_size">8dp</dimen>
+    <dimen name="confide_default_dis_size_big">10dp</dimen>
+    <dimen name="confide_default_dis_size_large">12dp</dimen>
+    <dimen name="confide_default_dis_size_huge">14dp</dimen>
+    <dimen name="confide_default_dis_size_huge_more">16dp</dimen>
 
     <!--字体大小部分-->
-    <dimen name="default_text_size_micro">8sp</dimen>
-    <dimen name="default_text_size_little">10sp</dimen>
-    <dimen name="default_text_size_small">12sp</dimen>
-    <dimen name="default_text_size">14sp</dimen>
-    <dimen name="default_text_size_big">16sp</dimen>
-    <dimen name="default_text_size_large">18sp</dimen>
+    <dimen name="confide_default_text_size_micro">8sp</dimen>
+    <dimen name="confide_default_text_size_little">10sp</dimen>
+    <dimen name="confide_default_text_size_small">12sp</dimen>
+    <dimen name="confide_default_text_size">14sp</dimen>
+    <dimen name="confide_default_text_size_big">16sp</dimen>
+    <dimen name="confide_default_text_size_large">18sp</dimen>
 
     <!--TitleBar高度-->
-    <dimen name="title_bar_height">45dp</dimen>
-    <dimen name="action_bar_height">48dip</dimen>
+    <dimen name="confide_title_bar_height">45dp</dimen>
+    <dimen name="confide_action_bar_height">48dip</dimen>
 
     <!--JumpTextView部分-->
-    <dimen name="jump_text_view_min_height">55dp</dimen>
-    <dimen name="jump_text_view_icon_size">25dp</dimen>
+    <dimen name="confide_jump_text_view_min_height">55dp</dimen>
+    <dimen name="confide_jump_text_view_icon_size">25dp</dimen>
 
     <!-- dialog -->
-    <dimen name="normal_text_size">16sp</dimen>
-    <dimen name="big_text_size">17sp</dimen>
-    <dimen name="light_line_size">1px</dimen>
-    <dimen name="dialog_padding_vertical">20dip</dimen>
-    <dimen name="custom_dialog_padding_vertical">15dip</dimen>
-    <dimen name="dark_line_size">3px</dimen>
-    <dimen name="dialog_text_margin_horizontal">15dip</dimen>
-    <dimen name="very_samll_text_size">9sp</dimen>
+    <dimen name="confide_normal_text_size">16sp</dimen>
+    <dimen name="confide_big_text_size">17sp</dimen>
+    <dimen name="confide_light_line_size">1px</dimen>
+    <dimen name="confide_dialog_padding_vertical">20dip</dimen>
+    <dimen name="confide_custom_dialog_padding_vertical">15dip</dimen>
+    <dimen name="confide_dark_line_size">3px</dimen>
+    <dimen name="confide_dialog_text_margin_horizontal">15dip</dimen>
+    <dimen name="confide_very_samll_text_size">9sp</dimen>
     <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
+    <dimen name="confide_activity_horizontal_margin">16dp</dimen>
+    <dimen name="confide_activity_vertical_margin">16dp</dimen>
 
 
     <!--动态-->
     <!--顶部title Size-->
-    <dimen name="title_height">45dp</dimen>
-    <dimen name="title_txt_sp">20sp</dimen>
+    <dimen name="confide_title_height">45dp</dimen>
+    <dimen name="confide_title_txt_sp">20sp</dimen>
 
     <!-- map -->
-    <dimen name="chatroom_head_height">200dp</dimen>
+    <dimen name="confide_chatroom_head_height">200dp</dimen>
 
-    <dimen name="dp_1">1dp</dimen>
-    <dimen name="dp_2">2dp</dimen>
-    <dimen name="dp_3">3dp</dimen>
-    <dimen name="dp_4">4dp</dimen>
-    <dimen name="dp_5">5dp</dimen>
-    <dimen name="dp_6">6dp</dimen>
-    <dimen name="dp_7">7dp</dimen>
-    <dimen name="dp_8">8dp</dimen>
-    <dimen name="dp_9">9dp</dimen>
-    <dimen name="dp_10">10dp</dimen>
-    <dimen name="dp_11">11dp</dimen>
-    <dimen name="dp_12">12dp</dimen>
-    <dimen name="dp_13">13dp</dimen>
-    <dimen name="dp_14">14dp</dimen>
-    <dimen name="dp_15">15dp</dimen>
-    <dimen name="dp_16">16dp</dimen>
-    <dimen name="dp_17">17dp</dimen>
-    <dimen name="dp_18">18dp</dimen>
-    <dimen name="dp_19">19dp</dimen>
-    <dimen name="dp_20">20dp</dimen>
-    <dimen name="dp_21">21dp</dimen>
-    <dimen name="dp_22">22dp</dimen>
-    <dimen name="dp_23">23dp</dimen>
-    <dimen name="dp_24">24dp</dimen>
-    <dimen name="dp_25">25dp</dimen>
-    <dimen name="dp_26">26dp</dimen>
-    <dimen name="dp_27">27dp</dimen>
-    <dimen name="dp_28">28dp</dimen>
-    <dimen name="dp_29">29dp</dimen>
-    <dimen name="dp_30">30dp</dimen>
-    <dimen name="dp_31">31dp</dimen>
-    <dimen name="dp_32">32dp</dimen>
-    <dimen name="dp_33">33dp</dimen>
-    <dimen name="dp_34">34dp</dimen>
-    <dimen name="dp_35">35dp</dimen>
-    <dimen name="dp_36">36dp</dimen>
-    <dimen name="dp_37">37dp</dimen>
-    <dimen name="dp_38">38dp</dimen>
-    <dimen name="dp_48">48dp</dimen>
+    <dimen name="confide_dp_1">1dp</dimen>
+    <dimen name="confide_dp_2">2dp</dimen>
+    <dimen name="confide_dp_3">3dp</dimen>
+    <dimen name="confide_dp_4">4dp</dimen>
+    <dimen name="confide_dp_5">5dp</dimen>
+    <dimen name="confide_dp_6">6dp</dimen>
+    <dimen name="confide_dp_7">7dp</dimen>
+    <dimen name="confide_dp_8">8dp</dimen>
+    <dimen name="confide_dp_9">9dp</dimen>
+    <dimen name="confide_dp_10">10dp</dimen>
+    <dimen name="confide_dp_11">11dp</dimen>
+    <dimen name="confide_dp_12">12dp</dimen>
+    <dimen name="confide_dp_13">13dp</dimen>
+    <dimen name="confide_dp_14">14dp</dimen>
+    <dimen name="confide_dp_15">15dp</dimen>
+    <dimen name="confide_dp_16">16dp</dimen>
+    <dimen name="confide_dp_17">17dp</dimen>
+    <dimen name="confide_dp_18">18dp</dimen>
+    <dimen name="confide_dp_19">19dp</dimen>
+    <dimen name="confide_dp_20">20dp</dimen>
+    <dimen name="confide_dp_21">21dp</dimen>
+    <dimen name="confide_dp_22">22dp</dimen>
+    <dimen name="confide_dp_23">23dp</dimen>
+    <dimen name="confide_dp_24">24dp</dimen>
+    <dimen name="confide_dp_25">25dp</dimen>
+    <dimen name="confide_dp_26">26dp</dimen>
+    <dimen name="confide_dp_27">27dp</dimen>
+    <dimen name="confide_dp_28">28dp</dimen>
+    <dimen name="confide_dp_29">29dp</dimen>
+    <dimen name="confide_dp_30">30dp</dimen>
+    <dimen name="confide_dp_31">31dp</dimen>
+    <dimen name="confide_dp_32">32dp</dimen>
+    <dimen name="confide_dp_33">33dp</dimen>
+    <dimen name="confide_dp_34">34dp</dimen>
+    <dimen name="confide_dp_35">35dp</dimen>
+    <dimen name="confide_dp_36">36dp</dimen>
+    <dimen name="confide_dp_37">37dp</dimen>
+    <dimen name="confide_dp_38">38dp</dimen>
+    <dimen name="confide_dp_48">48dp</dimen>
 
-    <dimen name="dp_60">60dp</dimen>
-    <dimen name="dp_64">64dp</dimen>
-    <dimen name="dp_88">88dp</dimen>
-    <dimen name="dp_99">99dp</dimen>
-    <dimen name="dp_115">115dp</dimen>
-    <dimen name="dp_127">127dp</dimen>
-    <dimen name="head_size_big">72dp</dimen>
+    <dimen name="confide_dp_60">60dp</dimen>
+    <dimen name="confide_dp_64">64dp</dimen>
+    <dimen name="confide_dp_88">88dp</dimen>
+    <dimen name="confide_dp_99">99dp</dimen>
+    <dimen name="confide_dp_115">115dp</dimen>
+    <dimen name="confide_dp_127">127dp</dimen>
+    <dimen name="confide_head_size_big">72dp</dimen>
 </resources>

m-confide/src/main/res/values/strings.xml

 <resources>
-    <string name="app_name">PhoneCall</string>
+    <string name="confide_app_name">PhoneCall</string>
+    <string name="confide_title">即时倾诉</string>
 </resources>

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

+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="confide_NoTitleTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="android:windowActionBar">false</item>
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="colorPrimary">@color/confide_main_theme</item>
+        <item name="colorPrimaryDark">@color/confide_main_theme</item>
+        <item name="colorAccent">@color/confide_main_theme</item>
+    </style>
+
+</resources>
\ No newline at end of file

m-confide/src/xlzx/res/values/colors.xml

@@ -3,7 +3,7 @@
     <!--主题色-->
     <color name="confide_main_theme">#fdbd00</color>
     <!--主题浅色-->
-    <color name="confide_main_theme_light">#FFEC8C</color>
+    <color name="confide_main_theme_light">#FCDA42</color>
     <!--主题亮色-->
     <color name="confide_main_theme_bright">#fffae0</color>
     <!--确认按钮背景颜色-->

m-consultant/modular.gradle

@@ -8,14 +8,14 @@ modular {
                 groupId = "com.ydl"
                 artifactId = "m-consultant-module-xlzx"
                 // 上报的 心理咨询 业务模块 aar 包的版本号
-                version = "0.0.14"
+                version = "0.0.15"
             }
 
             ydl{
                 groupId = "com.ydl"
                 artifactId = "m-consultant-module-ydl"
                 // 上报的 壹点灵 业务模块 aar 包的版本号
-                version = "0.0.14"
+                version = "0.0.19"
             }
         }
 
@@ -24,7 +24,7 @@ modular {
             groupId = "com.ydl"
             artifactId = "m-consultant-api"
             //开发时注释掉版本号，发布api时打开
-            //version = "0.0.1"
+            version = "0.0.3"
             // API 层打包时需要引入的依赖
             apiDependencies {
                 implementation "com.google.code.gson:gson:2.8.2"

m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchActivity.kt

@@ -13,6 +13,7 @@ import android.support.v4.content.ContextCompat
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
 import android.text.TextUtils
+import android.util.Log
 import android.view.Gravity
 import android.view.View
 import android.view.WindowManager
@@ -30,6 +31,7 @@ import com.ydl.ydl_image.manager.YDLImageCacheManager
 import com.ydl.ydl_router.manager.YDLRouterParams
 import com.ydl.ydlcommon.base.BaseMvpActivity
 import com.ydl.ydlcommon.base.config.HttpConfig
+import com.ydl.ydlcommon.bean.GlobalInfo
 import com.ydl.ydlcommon.bean.StatusBarOptions
 import com.ydl.ydlcommon.router.IYDLRouterConstant
 import com.ydl.ydlcommon.ui.LogoLoadingView
@@ -49,12 +51,16 @@ import com.yidianling.consultant.listener.OnCategoriesSelectedListener
 import com.yidianling.consultant.listener.OnFilterConfirmListener
 import com.yidianling.consultant.listener.OnSortItemSelectedListener
 import com.yidianling.consultant.model.bean.*
+import com.yidianling.consultant.modular.singlton.ConsultAssistantDialogUtils
 import com.yidianling.consultant.modular.utils.TempH5RouteUtils
 import com.yidianling.consultant.router.ConsultantIn
 import com.yidianling.consultant.ui.view.AreaPopupWindow
 import com.yidianling.consultant.ui.view.CategoryPopupWindow
 import com.yidianling.consultant.ui.view.FilterPopupWindow
 import com.yidianling.consultant.ui.view.SortPopupWindow
+import io.reactivex.Observable
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
 import kotlinx.android.synthetic.main.consultant_activity_expert_search_list.*
 import kotlinx.android.synthetic.main.consultant_item_filter_online.view.*
 import kotlinx.android.synthetic.main.consultant_layout_search_content.*
@@ -62,6 +68,7 @@ import kotlinx.android.synthetic.main.consultant_layout_search_head_bg.*
 import kotlinx.android.synthetic.main.consultant_layout_search_toolbar.*
 import org.json.JSONObject
 import java.util.concurrent.Executors
+import java.util.concurrent.TimeUnit
 
 @Route(path = "/consult/list")
 class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPresenter>(), View.OnClickListener, IExpertSearchView,
@@ -182,6 +189,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
     private var hasSelectedArea = false  //是否选择过地区
     private var hasSelectedSort = false  //是否选择过排序
 
+
     override fun createPresenter(): ExpertSearchPresenter = ExpertSearchPresenter()
 
     private fun initViews() {
@@ -304,6 +312,8 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
 //        })
         image_scroll_top.setOnClickListener(this)
 //        initStatus()
+
+        ConsultAssistantDialogUtils.INSTANCE.fitRequest(this, "doctor_list")
     }
 
     private fun initNetLossView() {
@@ -990,9 +1000,11 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
                 } else {
                     updateFilterTextViewStatus(tvFilter, FILTER_STATUS_NORMAL)
                 }
+                    ConsultAssistantDialogUtils.INSTANCE.fitRequest(this, "doctor_list")
             }
             filterPopupWindow.isClippingEnabled = false
             filterPopupWindow.showAtLocation(viewSep2.rootView, Gravity.TOP + Gravity.RIGHT, 0, 0)
+            ConsultAssistantDialogUtils.INSTANCE.hide()
             filterPopupWindow.onFilterConfirmListener = this
             updateFilterTextViewStatus(tvFilter, FILTER_STATUS_OPEN)
 //            viewDim.visibility = View.VISIBLE
@@ -1458,5 +1470,11 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
     override fun onResume() {
         super.onResume()
         ActionCountUtils.count(ConsultBIConstants.ConsultEvent.APP_CONSULT_LIST_PAGE_VISIT)
+
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        ConsultAssistantDialogUtils.INSTANCE.resetStatus()
     }
 }

m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchPresenter.kt

@@ -11,6 +11,7 @@ import com.ydl.ydlcommon.utils.RxLifecycleUtils
 import com.ydl.ydlcommon.utils.YDLAsyncUtils
 import com.ydl.ydlcommon.utils.YDLCacheUtils
 import com.ydl.ydlcommon.utils.remind.HttpErrorUtils
+import com.yidianling.common.tools.ToastUtil
 import com.yidianling.consultant.http.ExpertSearchDataManager
 import com.yidianling.consultant.model.SearchApi
 import com.yidianling.consultant.model.bean.AllFilter
@@ -25,7 +26,6 @@ import io.reactivex.schedulers.Schedulers
  */
 class ExpertSearchPresenter : SimplePresenter<IExpertSearchView>() {
 
-
     @SuppressLint("CheckResult")
     fun fetchListHead() {
         SearchApi.getSearchApi()

m-consultant/src/main/java/com/yidianling/consultant/IExpertSearchView.kt

@@ -38,4 +38,5 @@ interface IExpertSearchView : IView {
      * 加载图片
      */
     fun showImage(url : String?, imgView : ImageView, ops : SimpleImageOpConfiger)
+
 }
\ No newline at end of file

m-consultant/src/main/java/com/yidianling/consultant/dialog/ConsultAssistantDialog.kt

+package com.yidianling.consultant.dialog
+
+
+import android.app.Dialog
+import android.content.Context
+import android.os.Bundle
+import android.view.Gravity
+import android.view.WindowManager
+import com.yidianling.consultant.R
+import kotlinx.android.synthetic.main.consultant_expert_consult_assistant_popup_window.*
+
+/**
+ * 咨询助理浮层
+ * Created by xj on 2019/10/30.
+ */
+
+class ConsultAssistantDialog(context: Context, val consultAssistantClickListener: OnConsultAssistantClickListener?) : Dialog(context, R.style.consultant_expert_dialog_default_style) {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.consultant_expert_consult_assistant_popup_window)
+
+        val params = window.attributes
+        params.width = WindowManager.LayoutParams.WRAP_CONTENT
+        params.height = WindowManager.LayoutParams.WRAP_CONTENT
+        params.gravity = Gravity.RIGHT + Gravity.BOTTOM
+        params.verticalMargin = 0.07f
+        params.flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE //不拦截外部点击事件
+        window.attributes = params
+        window.setDimAmount(0f)
+
+        window.setWindowAnimations(R.style.consultant_expert_consult_assistant_dialog_animate)
+
+        consult_assistant.setOnClickListener {
+            consultAssistantClickListener?.onClickAction()
+        }
+
+        setCanceledOnTouchOutside(false)
+    }
+
+    interface OnConsultAssistantClickListener {
+        fun onClickAction() //隐私设置
+    }
+}
\ No newline at end of file

m-consultant/src/main/java/com/yidianling/consultant/model/SearchApi.kt

@@ -60,4 +60,14 @@ interface SearchApi {
     @retrofit2.http.Headers("Content-Type:application/json")
     @GET
     fun getFilterCount(@Url url : String?): Observable<BaseAPIResponse<Int>>
+
+    //导医
+    @Headers( YDL_DOMAIN+ YDL_DOMAIN_JAVA,"Content-Type:application/json")
+    @GET("consult/assistant/guide-switch")
+    fun getConsultAssistantRequest(@Query("switchKey") switchKey: String): Observable<BaseAPIResponse<Boolean>>
+
+    //获取咨询助理uid
+    @Headers( YDL_DOMAIN+ YDL_DOMAIN_JAVA,"Content-Type:application/json")
+    @GET("consult/assistant/chat-distribute")
+    fun getConsultAssistantUidRequest(): Observable<BaseAPIResponse<Long>>
 }
\ No newline at end of file

m-consultant/src/main/java/com/yidianling/consultant/modular/ConsultantServiceImp.kt

+package com.yidianling.consultant.modular
+
+import android.app.Activity
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.yidianling.consultant.api.IConsultantService
+import com.yidianling.consultant.modular.singlton.ConsultAssistantDialogUtils
+
+/**
+ * Created by xj on 2019/11/14.
+ */
+
+@Route(path = "/consultant/ConsultantService")
+class ConsultantServiceImp: IConsultantService {
+    override fun init(context: Context?) {
+    }
+
+    /**
+     * 首页咨询助理入口
+     */
+    override fun showConsultAssistantDialog(activity: Activity) {
+        ConsultAssistantDialogUtils.INSTANCE.fitRequest(activity, "home_index")
+    }
+
+    override fun hideConsultAssistantDialog() {
+        ConsultAssistantDialogUtils.INSTANCE.hideFromHomePage()
+    }
+
+}
\ No newline at end of file

m-consultant/src/main/java/com/yidianling/consultant/modular/singlton/ConsultAssistantDialogUtils.kt

+package com.yidianling.consultant.modular.singlton
+
+import android.app.Activity
+import android.support.v7.app.AppCompatActivity
+import com.yidianling.common.tools.ToastUtil
+import com.yidianling.consultant.dialog.ConsultAssistantDialog
+import com.yidianling.consultant.model.SearchApi
+import com.yidianling.consultant.router.ConsultantIn
+import io.reactivex.Observable
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+import java.util.*
+
+/**
+ * Created by xj on 2019/11/14.
+ */
+class ConsultAssistantDialogUtils private constructor() {
+
+    companion object {
+        val INSTANCE by lazy { ConsultAssistantDialogUtils() }
+    }
+
+    var consultAssistantDialogFromHomePage: ConsultAssistantDialog? = null // 首页展示的dialog
+    var consultAssistantDialog: ConsultAssistantDialog? = null //咨询师列表页面展示的dialog
+    var expertSearchPageHasShown: Boolean = false // 专家咨询列表页面是否已经展示
+    var timer: Timer? = null
+
+
+    /**
+     *判断是否符合代码展示逻辑
+     * origin 展示请求来源    首页 home_index 咨询列表 doctor_list
+     */
+    fun fitRequest(activity: Activity, origin: String) {
+        if (ConsultantIn.isLogin() &&
+                ConsultantIn.getUserImpl().getUserInfo()?.user_type == 1
+        /** WalleChannelReader.getChannel(BaseApp.Companion.getApp()) == "android_huawei" */
+                ) {
+            shouldShowDialog(activity, origin)
+        }
+    }
+
+    /**
+     * 判断是否符合接口展示逻辑
+     */
+    private fun shouldShowDialog(activity: Activity, origin: String, isDelay: Boolean = false) {
+        // 请求接口判断导医咨询助理按钮是否展示
+        SearchApi.getSearchApi().getConsultAssistantRequest(origin)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe {
+                    if (it.data) {
+                        if (origin == "home_index") {
+                            showFromYdlHome(activity)
+                        } else if (origin == "doctor_list") {
+                            show(activity)
+                        }
+                    }
+                }
+    }
+
+    //////////////////////////////////////  首页的展示隐藏逻辑 代码块start  ///////////////////////////////////////////////////
+
+    /**
+     * 首页页展示
+     */
+    fun showFromYdlHome(activity: Activity) {
+        consultAssistantDialogFromHomePage?.dismiss()
+        consultAssistantDialogFromHomePage = null
+        consultAssistantDialogFromHomePage = ConsultAssistantDialog(activity, object : ConsultAssistantDialog.OnConsultAssistantClickListener {
+            override fun onClickAction() {
+                //获取用户uid
+                getConsultAssistantUid(activity)
+            }
+
+        })
+        consultAssistantDialogFromHomePage?.show()
+    }
+
+    /**
+     * 首页隐藏
+     */
+    fun hideFromHomePage() {
+        consultAssistantDialogFromHomePage?.dismiss()
+    }
+
+    //////////////////////////////////////  首页的展示隐藏逻辑 代码块end  ///////////////////////////////////////////////////
+
+    //////////////////////////////////////  咨询师列表页面的展示隐藏逻辑 代码块start  ///////////////////////////////////////////////////
+    /**
+     * 咨询师列表页展示
+     */
+    fun show(activity: Activity) {
+
+        if (!expertSearchPageHasShown && timer == null) {
+            timer = Timer()
+            timer!!.schedule(object : TimerTask() {
+                override fun run() {
+                    Observable.just(1).observeOn(AndroidSchedulers.mainThread())
+                            .subscribe {
+                                showDialog(activity)
+                                expertSearchPageHasShown = true
+                            }
+                }
+            }, 10000)
+        } else {
+            showDialog(activity)
+        }
+    }
+
+    /**
+     * 咨询师列表页展示浮层
+     */
+    fun showDialog(activity: Activity) {
+        consultAssistantDialog?.dismiss()
+        consultAssistantDialog = null
+        consultAssistantDialog = ConsultAssistantDialog(activity, object : ConsultAssistantDialog.OnConsultAssistantClickListener {
+            override fun onClickAction() {
+                //获取用户uid
+                getConsultAssistantUid(activity)
+            }
+
+        })
+        consultAssistantDialog?.show()
+    }
+
+
+    /**
+     * 咨询师列表页隐藏
+     */
+    fun hide() {
+        consultAssistantDialog?.dismiss()
+    }
+
+    /**
+     * 咨询师列表页面使用的重置本单例关于专家咨询列表页面得状态
+     */
+    fun resetStatus() {
+        consultAssistantDialog?.dismiss()
+        timer?.cancel()
+        timer = null
+        expertSearchPageHasShown = false
+        consultAssistantDialog = null
+    }
+
+    //////////////////////////////////////  咨询师列表页面的展示隐藏逻辑 代码块end  ///////////////////////////////////////////////////
+
+    private fun getConsultAssistantUid(activity: Activity) {
+        // 请求接口获取咨询助理的uid
+        SearchApi.getSearchApi().getConsultAssistantUidRequest()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe {
+                    if (it.code == "200" && it.data != 0.toLong()) {
+                        ConsultantIn.startP2PSession(activity as AppCompatActivity, it.data.toString())
+                    } else {
+                        ToastUtil.toastShort("咨询助理忙碌中，请稍后再试")
+                    }
+                }
+    }
+}
\ No newline at end of file

m-consultant/src/main/java/com/yidianling/consultant/router/ConsultantIn.kt

@@ -20,6 +20,10 @@ object ConsultantIn {
         RouterManager.getImRouter().startP2PXiaoYi(context)
     }
 
+    fun isLogin(): Boolean {
+        return ModularServiceManager.provide(IUserService::class.java).isLogin()
+    }
+
     fun startP2PSession(context: AppCompatActivity, toUid: String) {
         RouterManager.getImRouter().startP2PSession(context, toUid)
     }

m-consultant/src/main/modular_api/com/yidianling/consultant/api/IConsultantService.kt

+package com.yidianling.consultant.api
+
+import android.app.Activity
+import com.alibaba.android.arouter.facade.template.IProvider
+
+/**
+ * Created by xj on 2019/11/14.
+ */
+interface IConsultantService: IProvider {
+    // 显示咨询助理弹框
+    fun showConsultAssistantDialog(activity: Activity)
+    // 隐藏咨询助理弹框
+    fun hideConsultAssistantDialog()
+}
\ No newline at end of file

m-consultant/src/main/res/anim/consultant_expert_consult_assistant_dialog_animate_hide_anim.xml

+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="500"
+        android:fromXDelta="0"
+        android:toXDelta="100%p" />
+</set>

m-consultant/src/main/res/anim/consultant_expert_consult_assistant_dialog_animate_show_anim.xml

+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="500"
+        android:fromXDelta="100%p"
+        android:toXDelta="0" />
+</set>

m-consultant/src/main/res/layout/consultant_expert_consult_assistant_popup_window.xml

+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content" android:layout_height="wrap_content"
+    android:paddingBottom="60dp"
+    android:paddingRight="11dp">
+
+    <ImageView
+        android:id="@+id/consult_assistant"
+        android:layout_width="66dp"
+        android:layout_height="68dp"
+        android:scaleType="centerCrop"
+        android:src="@drawable/consultant_expert_consult_assistant_img"/>
+
+</RelativeLayout>
\ No newline at end of file

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

@@ -22,4 +22,19 @@
         <item name="android:windowEnterAnimation">@anim/consultant_expert_service_popupwindow_filter_show_anim</item>
         <item name="android:windowExitAnimation">@anim/consultant_expert_service_popupwindow_filter_hide_anim</item>
     </style>
+
+    <style name="consultant_expert_consult_assistant_dialog_animate">
+        <!-- 指定显示的动画xml -->
+        <item name="android:windowEnterAnimation">@anim/consultant_expert_consult_assistant_dialog_animate_show_anim</item>
+        <item name="android:windowExitAnimation">@anim/consultant_expert_consult_assistant_dialog_animate_hide_anim</item>
+    </style>
+
+    <style name="consultant_expert_dialog_default_style" parent="@android:style/Theme.Dialog">
+        <item name="android:windowBackground">@color/transparent</item>
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:backgroundDimEnabled">true</item>
+    </style>
 </resources>

m-user/src/main/java/com/yidianling/user/ui/SmsLoginActivity.kt

@@ -13,7 +13,6 @@ import com.ydl.ydlcommon.router.YdlCommonOut
 import com.ydl.ydlcommon.utils.ActivityManager
 import com.ydl.ydlcommon.utils.UserInfoCache
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
-import com.ydl.ydlcommon.utils.actionutil.BIConstants
 import com.ydl.ydlcommon.utils.remind.ToastHelper
 import com.yidianling.router.im.IMLoginInfo
 import com.yidianling.router.im.IMRequestCallback
@@ -170,7 +169,7 @@ class SmsLoginActivity : BaseActivity() {
      * 注册流程成功之后，进行百度监测 注册埋点
      */
     fun baiduActionBury() {
-        ActionCountUtils.baiduCount(BIConstants.APP_REGISTER_PAGE, UserBIConstants.POSITION_CODE_REGISTER_CLICK, 25)
+        ActionCountUtils.baiduCount(UserBIConstants.APP_REGISTER_PAGE, UserBIConstants.POSITION_CODE_REGISTER_CLICK, 25)
     }
 
     //关闭手势解锁页面与指纹解锁页面

m-user/src/main/java/com/yidianling/user/ui/login/RegisterAndLoginActivity.kt

@@ -28,10 +28,8 @@ import com.umeng.socialize.bean.SHARE_MEDIA
 import com.ydl.ydlcommon.base.BaseMvpActivity
 import com.ydl.ydlcommon.utils.ActivityManager
 import com.ydl.ydlcommon.utils.StatusBarUtils
-
 import com.ydl.ydlcommon.utils.YDLCacheUtils
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
-import com.ydl.ydlcommon.utils.actionutil.BIConstants
 import com.ydl.ydlcommon.view.dialog.CommonDialog
 import com.yidianling.common.tools.LogUtil
 import com.yidianling.common.tools.RxKeyboardTool
@@ -173,7 +171,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
      * 注册流程成功之后，进行百度埋点
      */
     override fun baiduActionBury(uid: String?, positionClick: String) {
-        ActionCountUtils.baiduCount(uid, BIConstants.APP_REGISTER_PAGE, positionClick, "","", 25)
+        ActionCountUtils.baiduCount(uid, UserBIConstants.APP_REGISTER_PAGE, positionClick, "","", 25)
     }
 
 

m-user/src/main/java/com/yidianling/user/ui/login/VerificationCodeActivity.kt

@@ -229,7 +229,7 @@ class VerificationCodeActivity : BaseMvpActivity<IVerificationCodeContract.View,
 
 
     override fun baiduActionBury() {
-        ActionCountUtils.baiduCount(BIConstants.APP_REGISTER_PAGE, UserBIConstants.POSITION_CODE_REGISTER_CLICK, 25)
+        ActionCountUtils.baiduCount(UserBIConstants.APP_REGISTER_PAGE, UserBIConstants.POSITION_CODE_REGISTER_CLICK, 25)
     }
 
     /**

ydl-platform/src/main/java/com/ydl/ydlcommon/utils/actionutil/ActionCountUtils.kt

@@ -171,13 +171,13 @@ class ActionCountUtils {
                 actionDataParams.screenHeight(RxDeviceTool.getScreenHeight(RxTool.getContext()!!))
 
                 val baiduActionDataParams = BaiduActionDataBean.Builder()
-                baiduActionDataParams.pkname = "com.cxzapp.yidianling"
+                baiduActionDataParams.pkname = BIConstants.PACKAGE_NAME
                 baiduActionDataParams.deviceType = 2
-                baiduActionDataParams.deviceId(DeviceTool.getIMEI())
+                baiduActionDataParams.deviceId(DeviceIDHelper.getInstance().deviceId)
                 baiduActionDataParams.convertType(convertType)
                 baiduActionDataParams.convertTime(System.currentTimeMillis() / 1000)
                 baiduActionDataParams.appid(0.toLong())
-                baiduActionDataParams.appName("壹点灵心理咨询")
+                baiduActionDataParams.appName(BIConstants.APP_NAME)
                 baiduActionDataParams.androidId(DeviceTool.getAndroidID())
                 baiduActionDataParams.ip("")
                 baiduActionDataParams.ipv6("")

ydl-platform/src/main/java/com/ydl/ydlcommon/utils/actionutil/BIConstants.kt

@@ -9,118 +9,32 @@ import com.ydl.ydlcommon.base.config.YDLConstants
  */
 class BIConstants{
     companion object {
-        /**
-         * 消息端来源
-         */
-        const val APP_ID = "ydl-app-android-user" //这是用户端主包的
 
         /**
-         * 操作系统
-         */
-        const val OS = "Android" //android系统
-
-        /**
-         * 埋点板块
-         */
-        const val PART_ID_LOGIN_MAIN = "login_main"
-        //咨询筛选页
-        const val PART_ID_CONSULT_FILTER_PAGE = "consult_filter_page"
-        //百度监测 应用启动行为
-        const val WELCOME_PAGE = "welcome_page"
-        //百度监测 用户注册行为
-        const val APP_REGISTER_PAGE = "app_register_page"
-
-        /**
-         * position
-         * 点击类型
+         * 消息端来源
+         * ydl:ydl-app-android-user
+         * xlzx:ydl-app-android-xlzx
          */
-        const val POSITION_LOGIN_CLICK = "login_click" //登录点击
-        const val POSITION_LOGIN_SUCCESS_CLICK = "login_success_click" //登录成功点击
-        //咨询筛选页
-        const val POSITION_CONSULT_TYPE_CLICK = "consult_type_click" //咨询方式
-        const val POSITION_AVERAGE_SERVICE_INPUT = "average_service_input" //服务均价
-        const val POSITION_AGE_CHOICE_CLICK = "age_choice_click" //年龄选择
-        const val POSITION_QUALIFICATION_CHOICE_CLICK = "qualification_choice_click" //资质选择
-        const val POSITION_OTHER_CHOICE_CLICK = "other_choice_click" //其他选择
-        const val POSITION_CONSULT_FILTER_RESET_CLICK = "consult_filter_reset_click" //重置
-        const val POSITION_CONSULT_FILTER_CHECKOUT_CLICK = "consult_filter_checkoutallconsultants_click" //查看XXX位咨询师
-        //百度监测 应用启动
-        const val POSITION_APP_START_UP_CLICK = "app_start_up_click" //应用启动
-        //百度监测 用户注册
-        const val POSITION_WX_REGISTER_CLICK = "wx_register_click" //微信第一次登录
-        const val POSITION_QQ_REGISTER_CLICK = "qq_register_click" //QQ第一次登录
-        const val POSITION_PHONE_REGISTER_CLICK = "phone_register_click" //手机号密码第一次登录
-        const val POSITION_ALIYUN_REGISTER_CLICK = "aliyun_register_click" //阿里云第一次一键登录
-        const val POSITION_CODE_REGISTER_CLICK = "code_register_click" //短信第一次登录
-        //随便逛逛点击
-        const val POSITION_LOOK_AROUND_CLICK = "look_around_click"
-        //登录主页浏览事件（包含随便逛逛）
-        const val POSITION_LOGIN_ONE_PAGE_VISIT = "login_main_one_page_visit"
-        //登录主页浏览事件（不包含随便逛逛）
-        const val POSITION_LOGIN_TWO_PAGE_VISIT = "login_main_two_page_visit"
-
 
-        /**
-         * action type
-         * 行为数据埋点，sign1字段 是对同一key下多种不同行为的描述
-         */
-        const val ACTION_TYPE_CODE_LOGIN: String = "code_login" //验证码登录
-        const val ACTION_TYPE_RESET_PWD: String = "reset_pwd" //重置密码登录
-        const val ACTION_TYPE_PWD_LOGIN: String = "pwd_login" //手机号密码登录
-        const val ACTION_TYPE_DIRECT_LOGIN: String = "direct_login" //一键登录
-        const val ACTION_TYPE_QQ_THIRD_LOGIN: String = "qq_login" //QQ登录
-        const val ACTION_TYPE_WX_THIRD_LOGIN: String = "wx_login" //WX登录
+        var APP_ID:String = ""
+            get() {
+                    return "ydl-app-android-"+ (if (BaseApp.instance.getGlobalConfig().appFrom== YDLConstants.FROM_XLZX)"xlzx" else "user")
                 }
 
-    //====================壹点灵用户版首页（ydl_user_main_page）====================
-    class UserMainEvent {
-        companion object {
-
-            private const val YDL_USER_MAIN_PAGE: String = "ydl_user_main_page|"//壹点灵用户版首页    partId
-
-            const val YDL_USER_SEARCH_CLICK: String = YDL_USER_MAIN_PAGE + "ydl_user_search_click"//搜索栏
-            const val YDL_USER_TELEPHONE_CUSTOMER_SERVICE_CLICK: String = YDL_USER_MAIN_PAGE + "ydl_user_telephone_customer_service_click"//电话客服
-            const val YDL_USER_BANNER_CLICK: String = YDL_USER_MAIN_PAGE + "ydl_user_banner_click"//banner
-            const val YDL_USER_NOTICE_CLICK: String = YDL_USER_MAIN_PAGE + "ydl_user_notice_click"//公告
-            const val YDL_USER_CONSULT_CLASSIFICATION_CLICK: String = YDL_USER_MAIN_PAGE + "ydl_user_consult_classification_click"//首页咨询分类
-            const val YDL_USER_CONSULT_CLICK: String = YDL_USER_MAIN_PAGE + "ydl_user_consult_click"//四个大按钮 心理咨询点击人数
-            const val YDL_USER_TALK_IN_TIME_CLICK: String = YDL_USER_MAIN_PAGE + "ydl_user_talk_in_time_click"//四个大按钮 即时倾诉点击人数
-            const val YDL_USER_PSYCHOLOGICAL_CLASSROOM_CLICK: String = YDL_USER_MAIN_PAGE + "ydl_user_psychological_classroom_click"//四个大按钮 心理课堂点击人数
-            const val YDL_USER_PSYCHOLOGICAL_TEST_CLICK: String = YDL_USER_MAIN_PAGE + "ydl_user_psychological_test_click"//四个大按钮 心理测试点击人数
-            const val YDL_USER_CONSULT_MORE_CLICK: String = YDL_USER_MAIN_PAGE + "ydl_user_consult_more_click"//咨询解惑更多
-            const val YDL_USER_CONSULT_TYPE_CLICK: String = YDL_USER_MAIN_PAGE + "ydl_user_consult_type_click"//咨询解惑分类标签
-            const val YDL_USER_EXPERT_INTRODUCTION_CLICK: String = YDL_USER_MAIN_PAGE + "ydl_user_expert_introduction_click"//咨询师介绍模块
-            const val YDL_USER_PRIVATE_CHAT_CLICK: String = YDL_USER_MAIN_PAGE + "ydl_user_private_chat_click"//咨询师私聊按钮
-            const val YDL_USER_LISTEN_MORE_CLICK: String = YDL_USER_MAIN_PAGE + "ydl_user_listen_more_click"//倾诉排解更多
-            const val YDL_USER_LISTEN_TYPE_CLICK: String = YDL_USER_MAIN_PAGE + "ydl_user_listen_type_click"//倾诉排解分类标签
-            const val YDL_USER_LISTENER_INTRODUCTION_CLICK: String = YDL_USER_MAIN_PAGE + "ydl_user_listener_introduction_click "//倾诉师介绍模块
-            const val YDL_USER_COURSE_MORE_CLICK: String = YDL_USER_MAIN_PAGE + "ydl_user_course_more_click"//课程成长更多
-            const val YDL_USER_COURSE_CLICK: String = YDL_USER_MAIN_PAGE + "ydl_user_course_click"//课程标题图区域
-            const val YDL_USER_ASK_MORE_CLICK: String = YDL_USER_MAIN_PAGE + "ydl_user_ask_more_click"//解忧问答更多
-            const val YDL_USER_ASK_COMMENT_CLICK: String = YDL_USER_MAIN_PAGE + "ydl_user_ask_comment_click"//问答评论区域
-            const val YDL_USER_HEART_RADIO_MORE_CLICK: String = YDL_USER_MAIN_PAGE + "ydl_user_heart_radio_more_click"//心灵电台更多
-            const val YDL_USER_RADIO_CLICK: String = YDL_USER_MAIN_PAGE + "ydl_user_radio_click "//区域内四个标题
-            const val YDL_USER_RADIO_PLAY_CLICK: String = YDL_USER_MAIN_PAGE + "ydl_user_radio_play_click"//心灵电台play按钮点击
-            const val YDL_USER_ARTICLE_MORE_CLICK: String = YDL_USER_MAIN_PAGE + "ydl_user_article_more_click"//文章阅读更多
-            const val YDL_USER_ARTICLE_CLICK: String = YDL_USER_MAIN_PAGE + "ydl_user_article_click"//文章标题图区域
-            const val YDL_USER_MAIN_PAGE_VISIT: String = YDL_USER_MAIN_PAGE + "ydl_user_main_page_visit "//首页浏览事件
+        var APP_NAME:String = ""
+            get() {
+                    return if (BaseApp.instance.getGlobalConfig().appFrom== YDLConstants.FROM_XLZX)"心理咨询" else "壹点灵心理咨询"
                 }
+
+        var PACKAGE_NAME:String = ""
+            get() {
+                    return if (BaseApp.instance.getGlobalConfig().appFrom== YDLConstants.FROM_XLZX)"com.cxzapp.xinlizixun" else "com.cxzapp.yidianling"
                 }
 
-    //====================APP咨询列表页（app_consult_list_page）====================
-    class ConsultEvent {
-        companion object {
-            private const val APP_CONSULT_LIST_PAGE: String = "app_consult_list_page|"//APP咨询列表页  partId
+        /**
+         * 操作系统
+         */
+        const val OS  = "Android" //android系统
 
-            const val APP_CONSULT_LIST_PAGE_VISIT: String = APP_CONSULT_LIST_PAGE + "app_consult_list_page_visit"//列表页浏览事件
-            const val APP_CONSULT_LIST_CONSULT_GUIDE_CLICK: String = APP_CONSULT_LIST_PAGE + "app_consult_list_consult_guide_click "//咨询指南
-            const val APP_CONSULT_LIST_ONLINE_CUSTOMER_CLICK: String = APP_CONSULT_LIST_PAGE + "app_consult_list_online_customer_click"//在线客服
-            const val APP_CONSULT_LIST_THEME_CLICK: String = APP_CONSULT_LIST_PAGE + "app_consult_list_theme_click "//主题全部
-            const val APP_CONSULT_LIST_AREA_CLICK: String = APP_CONSULT_LIST_PAGE + "app_consult_list_area_click"//地区各个地区
-            const val APP_CONSULT_LIST_SORT_CLICK: String = APP_CONSULT_LIST_PAGE + "app_consult_list_sort_click"//排序综合排序
-            const val APP_CONSULT_LIST_DOCTOR_CLICK: String = APP_CONSULT_LIST_PAGE + "app_consult_list_doctor_click"//每个咨询师页面点击
-            const val APP_CONSULT_LIST_CHAT_CLICK: String = APP_CONSULT_LIST_PAGE + "app_consult_list_chat_click"//每个咨询师私聊
-        }
     }
-
 }
\ No newline at end of file