Skip to content

Y
YDL-Component-Medical
Commit b6110bac by 严久程
Options

私聊页面自定义的埋点数据发送

parents 05da92d4 3007a1b2
Showing with 183 additions and 171 deletions
app/src/main/java/com/ydl/component/MainActivity.kt
package com.ydl.component
//import com.ydl.confide.home.ConfideHomeActivity
import android.Manifest
import android.annotation.SuppressLint
import android.content.ComponentName
......@@ -10,7 +11,6 @@ import android.net.Uri
import android.os.IBinder
import android.provider.Settings
import android.util.Log
import android.widget.LinearLayout
import com.alibaba.android.arouter.launcher.ARouter
import com.tbruyelle.rxpermissions2.RxPermissions
import com.umeng.analytics.MobclickAgent
......@@ -18,7 +18,6 @@ import com.ydl.component.home.HomeActivity
import com.ydl.component.music.FragmentContainerActivity
import com.ydl.component.mvp.DemoContract
import com.ydl.component.mvp.DemoPresenter
//import com.ydl.confide.home.ConfideHomeActivity
import com.ydl.media.audio.PlayService
import com.ydl.ydl_router.manager.YDLRouterManager
import com.ydl.ydl_router.manager.YDLRouterParams
......@@ -28,6 +27,7 @@ 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.dynamic.activity.MyTrendsActivity
import com.yidianling.fm.api.service.IFMService
import com.yidianling.tests.home.NewTestHomeActivity
import kotlinx.android.synthetic.main.activity_main.*
......@@ -99,7 +99,9 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
FragmentContainerActivity.start(this,"NewMultiMessageFragment")
}
bt_to_dynamic.setOnClickListener {
FragmentContainerActivity.start(this,"TrendsHomeFragment")
// FragmentContainerActivity.start(this,"TrendsHomeFragment")
val intentm = Intent(this, MyTrendsActivity::class.java)
startActivity(intentm)
}
bt_to_tests.setOnClickListener {
startActivity(Intent(this, NewTestHomeActivity::class.java))
......
app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java
......@@ -31,7 +31,6 @@ public final class DemoGlobalConfig implements IConfigModule {
@Override
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(appEnv)
......
config.gradle
......@@ -43,18 +43,17 @@ ext {
// -------------- 业务模块 --------------
//第三步 若干
"m-confide" : "0.0.41.2",
"m-consultant" : "0.0.51.11",
"m-fm" : "0.0.23.4",
"m-user" : "0.0.41.1",
"m-home" : "0.0.6.25",
"m-muse" : "0.0.20.4",
"m-tests" : "0.0.15.3",
"m-course" : "0.0.34.4",
"m-im" : "0.0.3.8",
"m-confide" : "0.0.41.3",
"m-consultant" : "0.0.51.13",
"m-fm" : "0.0.23.5",
"m-user" : "0.0.41.2",
"m-home" : "0.0.6.26",
"m-im" : "0.0.3.9",
"m-dynamic" : "0.0.1.7",
"m-muse" : "0.0.20.7",
"m-tests" : "0.0.15.7",
"m-course" : "0.0.34.7",
//-------------- 业务模块 API 层 --------------
"m-audioim-api" : "0.0.5",
......@@ -71,36 +70,36 @@ ext {
//-------------- 功能组件 --------------
//第一步
"ydl-platform" : "0.0.29.3",
"ydl-platform" : "0.0.29.4",
//第二步 若干
"ydl-webview" : "0.0.28.12",
"ydl-media" : "0.0.14.4",
"ydl-pay" : "0.0.11.5",
"m-audioim" : "0.0.40.4",
"ydl-webview" : "0.0.28.13",
"ydl-media" : "0.0.14.5",
"ydl-pay" : "0.0.11.6",
"m-audioim" : "0.0.40.5",
//以下 几乎不会动
"router" : "0.0.1",
"ydl-net" : "0.0.3.1",
"ydl-utils" : "0.0.3",
"ydl-flutter-base": "0.0.5.17",
"ydl-flutter-base": "0.0.5.20",
]
ydlCompileVersion = [
// -------------- 业务模块 --------------
//第三步 若干
"m-confide" : "0.0.40",
"m-consultant" : "0.0.28",
"m-course" : "0.0.22",
"m-fm" : "0.0.15",
"m-user" : "0.0.25",
"m-home" : "0.0.3",
"m-im" : "0.0.1",
"m-dynamic" : "0.0.1",
// 以下为接入flutter的模块
"m-muse" : "0.0.7",
"m-tests" : "0.0.4",
"m-confide" : "0.0.41.3",
"m-consultant" : "0.0.51.13",
"m-fm" : "0.0.23.5",
"m-user" : "0.0.41.2",
"m-home" : "0.0.6.26",
"m-im" : "0.0.3.9",
"m-dynamic" : "0.0.1.7",
"m-muse" : "0.0.20.7",
"m-tests" : "0.0.15.7",
"m-course" : "0.0.34.7",
//-------------- 业务模块 API 层 --------------
"m-audioim-api" : "0.0.5",
"m-confide-api" : "0.0.1.1",
......@@ -116,20 +115,20 @@ ext {
//-------------- 功能组件 --------------
//第一步
"ydl-platform" : "0.0.29.3",
"ydl-platform" : "0.0.29.4",
//第二步 若干
"ydl-webview" : "0.0.28.9",
"ydl-webview" : "0.0.28.13",
"ydl-media" : "0.0.14.4",
"ydl-pay" : "0.0.11.5",
"m-audioim" : "0.0.40.4",
"ydl-pay" : "0.0.11.6",
"m-audioim" : "0.0.40.5",
//以下 几乎不会动
"router" : "0.0.1",
"ydl-net" : "0.0.3.1",
"ydl-utils" : "0.0.3",
"ydl-flutter-base": "0.0.5.17",
"ydl-flutter-base": "0.0.5.20",
]
dependencies = [
......@@ -267,7 +266,7 @@ ext {
//flutter功能组件升级===>发布ydl-flutter组件===>引用flutter相关的业务模块
"ydl-flutter-base" : "com.ydl:ydl-flutter-base:${ydlCompileVersion["ydl-flutter-base"]}", //组件化项目中的flutter base模块
"ydl-flutter" : "com.ydl:ydl-flutter:0.0.16.4@aar", //flutter aar
"ydl-flutter" : "com.ydl:ydl-flutter:0.0.16.7@aar", //flutter aar
"ydl-flutter-sp" : "com.ydl:ydl-flutter-sp:0.0.2@aar", //flutter 缓存 aar
//基础组件 <<--- 先发这个，发完改这里的版本号
......@@ -290,7 +289,7 @@ ext {
"ydl-m-consultant-api" : "com.ydl:m-consultant-api:${ydlCompileVersion["m-consultant-api"]}",
"ydl-m-dynamic-api" : "com.ydl:m-dynamic-api:${ydlCompileVersion["m-dynamic-api"]}",
"ydl-m-confide-api" : "com.ydl:m-confide-api:${ydlCompileVersion["m-confide-api"]}",
"ydl-m-course-api" : "com.ydl:m-course-api:${ydlCompileVersion["m-course-api"]}",
"ydl-m-course-api" : "com.ydl:m-course-api:${ydlCompileVersion["m-course-api"]}",
]
}
m-consultant/src/main/java/com/yidianling/consultant/adapter/ExpertSearchAdapter.kt
......@@ -215,9 +215,9 @@ class ExpertSearchAdapter(private val context: Context, private val expertSearch
holder.tvChat.setTextColor(ContextCompat.getColor(context,R.color.platform_color_999999))
holder.tvChat.background = ContextCompat.getDrawable(context,R.drawable.consultant_expert_search_chat_rest)
}
//月售时长
//服务时长
val durationStringBuffer = StringBuffer()
holder.tvSaleDurationForMonth.text = durationStringBuffer.append(itemBean.saleDurationForMonth.toInt()).append("").toString()
holder.tvSaleDurationForMonth.text = durationStringBuffer.append(itemBean.allSaleDuration.toInt()).append("").toString()
//价格
val sb = StringBuffer()
holder.tvPrice.text = sb.append("").append(itemBean.minBookingPrice).toString()
......@@ -308,7 +308,7 @@ class ExpertSearchAdapter(private val context: Context, private val expertSearch
val tvOrderNum = itemView.tvOrderNum!!
//帮助人数文案
val tvOrderNumContent = itemView.tvOrderNumContent
//月售时长
//服务时长
val tvSaleDurationForMonth = itemView.tvSaleDurationForMonth!!
//月售时长文案
val tvSaleDurationForMonthContent = itemView.tvSaleDurationForMonthContent
......
m-consultant/src/main/java/com/yidianling/consultant/model/bean/DoctorServiceItem.kt
......@@ -10,116 +10,121 @@ import com.yidianling.consultant.bean.ExpertSearchTagsIconBean
* @Company 壹点灵
* @date 2018/12/11
*/
data class DoctorServiceItem(/**
* 专家ID
*/
val doctorId : String?,
/**
* 专家uid
*/
val uid : String?,
/**
* 专家名称
*/
val name : String?,
/**
* 跳转路由地址（正常为专家主页地址）
*/
val linkUrl : String?,
/**
* 专家头像地址
*/
val head : String?,
/**
* 专家是否在线 1.在线
*/
val isOnline : Int?,
/**
* 能力等级 1.实习 2.新手 3.精英
*/
val abilityLevel : Int?,
/**
* 有免费咨询：1.有，2.无
*/
val hasServiceFree : Int?,
/**
* 活动图标
*/
val activityImg:String?,
/**
* 是否参加活动
*/
val joinActivity: Boolean?,
/**
* 是否新入驻：true:是，false:否
*/
var isNewEnter : Boolean = false,
/**
* 好评率(倾诉+咨询)
*/
var feedbackRate : Float = 0f,
/**
* 评价数(咨询订单数)
*/
var zixunOrderNum : Int = 0,
/**
* 咨询最低价
*/
val minBookingPrice : String?,
/**
* 资质材料
*/
val teamCertifications : String?,
/**
* 标签分类
*/
val tags : String?,
/**
* 已帮助人数(咨询人数)
*/
val zixunOrderUser : String?,
/**
* 月售时长
*/
var saleDurationForMonth : Float = 0f,
/**
* 服务
*/
val products : MutableList<ExpertSearchProductsBean>?,
/**
* 标签图片
*/
val tagsIcon : ExpertSearchTagsIconBean?,
/**
* 今日是否可约
*/
val isTodayFree : Boolean?,
/**
* 是否咨询中
*/
var inConsult : Boolean = false,
/**
* 是否聆听中
*/
var isListening: Boolean = false,
/**
* 私聊人数
*/
var chatNum: Int = 0,
/**
* 个人铭言
*/
val famousRemark : String?,
/**
* 省
*/
val province : String?,
/**
* 市
*/
val city : String?,
/**
* 私聊按钮的文案(如果不为空则取这个字段的值，如果为空 则默认为：“私聊”)
*/
val chatBtnText : String?
data class DoctorServiceItem(
/**
* 专家ID
*/
val doctorId: String?,
/**
* 专家uid
*/
val uid: String?,
/**
* 专家名称
*/
val name: String?,
/**
* 跳转路由地址（正常为专家主页地址）
*/
val linkUrl: String?,
/**
* 专家头像地址
*/
val head: String?,
/**
* 专家是否在线 1.在线
*/
val isOnline: Int?,
/**
* 能力等级 1.实习 2.新手 3.精英
*/
val abilityLevel: Int?,
/**
* 有免费咨询：1.有，2.无
*/
val hasServiceFree: Int?,
/**
* 活动图标
*/
val activityImg: String?,
/**
* 是否参加活动
*/
val joinActivity: Boolean?,
/**
* 是否新入驻：true:是，false:否
*/
var isNewEnter: Boolean = false,
/**
* 好评率(倾诉+咨询)
*/
var feedbackRate: Float = 0f,
/**
* 评价数(咨询订单数)
*/
var zixunOrderNum: Int = 0,
/**
* 咨询最低价
*/
val minBookingPrice: String?,
/**
* 资质材料
*/
val teamCertifications: String?,
/**
* 标签分类
*/
val tags: String?,
/**
* 已帮助人数(咨询人数)
*/
val zixunOrderUser: String?,
/**
* 月售时长
*/
var saleDurationForMonth: Float = 0f,
/**
* 服务时长
*/
var allSaleDuration: Float = 0f,
/**
* 服务
*/
val products: MutableList<ExpertSearchProductsBean>?,
/**
* 标签图片
*/
val tagsIcon: ExpertSearchTagsIconBean?,
/**
* 今日是否可约
*/
val isTodayFree: Boolean?,
/**
* 是否咨询中
*/
var inConsult: Boolean = false,
/**
* 是否聆听中
*/
var isListening: Boolean = false,
/**
* 私聊人数
*/
var chatNum: Int = 0,
/**
* 个人铭言
*/
val famousRemark: String?,
/**
* 省
*/
val province: String?,
/**
* 市
*/
val city: String?,
/**
* 私聊按钮的文案(如果不为空则取这个字段的值，如果为空 则默认为：“私聊”)
*/
val chatBtnText: String?
)
\ No newline at end of file
m-consultant/src/main/java/com/yidianling/consultant/ui/view/topView/RecommendListView.kt
......@@ -200,9 +200,10 @@ class RecommendListView : LinearLayout {
recommendViewPager.adapter = RecommendViewPagerAdapter()
recommendViewPager.currentItem = 0
if (mSceneSpecialTopicList.size < 4) {
if (mSceneSpecialTopicList.size <= 4) {
recommendViewPagerIndicator.visibility = View.GONE
} else {
recommendViewPagerIndicator.visibility = View.VISIBLE
setSelectedIndex(0) // 默认为左边选中
}
......
m-course/src/main/res/layout/activity_course_commeny.xml
......@@ -13,7 +13,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="19dp"
android:src="@drawable/course_toolbar_back"
android:src="@drawable/platform_common_back"
app:layout_constraintBottom_toBottomOf="@+id/tv_title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/tv_title" />
......
m-course/src/main/res/layout/activity_course_poster.xml
......@@ -12,7 +12,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="15dp"
android:src="@drawable/course_toolbar_back"
android:src="@drawable/platform_common_back"
app:layout_constraintBottom_toBottomOf="@+id/tv_title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/tv_title" />
......
m-course/src/main/res/layout/activity_course_reply_list.xml
......@@ -10,7 +10,7 @@
android:layout_width="match_parent"
android:layout_height="50dp"
app:pa_title_text="课后笔记"
app:pa_left_start_icon="@drawable/course_toolbar_back"/>
app:pa_left_start_icon="@drawable/platform_common_back"/>
<android.support.v7.widget.RecyclerView
......
m-course/src/main/res/layout/activity_course_search.xml
......@@ -19,7 +19,7 @@
android:id="@+id/activity_course_back_btn"
android:layout_width="13dp"
android:layout_height="22dp"
android:src="@drawable/course_toolbar_back"
android:src="@drawable/platform_common_back"
android:visibility="gone"/>
<com.yidianling.course.widget.SearchBarView
......
m-course/src/main/res/layout/course_layout_title_bar.xml
......@@ -12,7 +12,7 @@
android:layout_centerVertical="true"
android:paddingLeft="15dp"
android:paddingRight="10dp"
android:src="@drawable/course_toolbar_back" />
android:src="@drawable/platform_common_back" />
<TextView
android:id="@+id/tv_title"
......
m-dynamic/src/main/java/com/yidianling/dynamic/trendList/TrendsListFragment.kt
......@@ -7,7 +7,6 @@ import android.animation.ObjectAnimator
import android.content.Intent
import android.os.Bundle
import android.os.Handler
import android.support.design.widget.CoordinatorLayout
import android.support.v4.view.animation.FastOutLinearInInterpolator
import android.support.v4.widget.SwipeRefreshLayout
import android.support.v7.widget.LinearLayoutManager
......@@ -17,14 +16,12 @@ import android.view.LayoutInflater
import android.view.View
import android.widget.ImageView
import android.widget.LinearLayout
import android.widget.RelativeLayout
import android.widget.TextView
import com.ydl.webview.H5Params
import com.ydl.webview.NewH5Activity
import com.ydl.ydlcommon.utils.BuryPointUtils
import com.ydl.ydlcommon.utils.SharedPreferencesEditor
import com.ydl.ydlcommon.view.WrapContentLinearLayoutManager
import com.ydl.ydlcommon.view.widgets.MultiSwipeRefreshLayout
import com.yidianling.common.tools.LogUtil
import com.yidianling.common.tools.ToastUtil
import com.yidianling.dynamic.DynamicConstants
......
m-dynamic/src/main/res/layout/dynamic_activity_mytrends.xml
......@@ -43,7 +43,7 @@
android:gravity="center_vertical"
android:paddingRight="10dp"
android:visibility="gone"
android:src="@drawable/dynamic_more12x" />
android:src="@drawable/platform_common_more" />
</RelativeLayout>
......
m-dynamic/src/main/res/layout/dynamic_activity_trends_reply_info.xml
......@@ -44,7 +44,7 @@
android:gravity="center_vertical"
android:paddingRight="10dp"
android:visibility="gone"
android:src="@drawable/dynamic_more12x" />
android:src="@drawable/platform_common_more" />
<ImageView
android:layout_width="match_parent"
......
m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java
......@@ -221,7 +221,9 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
}
});
getUserInfoCollect();
collectInfoPopupWindow.show(top_expert_info_cl);
if (!getActivity().isFinishing()) {
collectInfoPopupWindow.show(top_expert_info_cl);
}
try {
YdlBuryPointUtil.sendPv("用户信息收集页面");
......
m-muse/src/main/java/com/yidianling/muse/handler/MusePlugin.kt
......@@ -4,6 +4,8 @@ import android.graphics.drawable.Drawable
import com.google.gson.Gson
import com.ydl.media.audio.AudioPlayer
import com.ydl.media.audio.model.Music
import com.ydl.media.view.PlayTypeEnum
import com.ydl.media.view.PlayerFloatHelper
import com.ydl.ydlcommon.utils.YDLCacheUtils
import com.ydl.ydlcommon.view.dialog.YDLShareDialog
import com.yidianling.common.tools.ToastUtil
......@@ -77,6 +79,7 @@ class MusePlugin : MethodChannel.MethodCallHandler {
music.artist = ""
music.coverPath = ""
music.title = ""
PlayerFloatHelper.playingType = PlayTypeEnum.PLAY_TYPE_MUSE
AudioPlayer.get().singleCirclePlay(music)
}
}
......
m-user/src/main/res/layout/user_activity_get_identifying_code.xml
......@@ -10,7 +10,8 @@
android:id="@+id/tb_title"
android:layout_width="match_parent"
android:layout_height="@dimen/title_bar_height"
app:pa_left_start_icon="@drawable/user_toolbar_back"
android:background="@color/platform_white"
app:pa_left_start_icon="@drawable/platform_common_back"
app:pa_title_text="手机号" />
<TextView
......
m-user/src/main/res/layout/user_activity_input_phone.xml
......@@ -7,9 +7,10 @@
android:orientation="vertical">
<com.ydl.ydlcommon.view.TitleBar
android:background="@color/platform_white"
android:layout_width="match_parent"
android:layout_height="@dimen/title_bar_height"
app:pa_left_start_icon="@drawable/user_toolbar_back"
app:pa_left_start_icon="@drawable/platform_common_back"
app:pa_title_text="填写手机号"/>
<TextView
......
m-user/src/main/res/layout/user_activity_me_privacy.xml
......@@ -9,7 +9,8 @@
<com.ydl.ydlcommon.view.TitleBar
android:layout_width="match_parent"
android:layout_height="50dp"
app:pa_left_start_icon="@drawable/user_toolbar_back"
android:background="@color/platform_white"
app:pa_left_start_icon="@drawable/platform_common_back"
app:pa_title_text="隐私安全">
</com.ydl.ydlcommon.view.TitleBar>
......
ydl-platform/src/main/java/com/ydl/ydlcommon/view/TitleBar.java
......@@ -266,7 +266,7 @@ public class TitleBar extends RelativeLayout {
if(mLeftStartIconColor != 0xffffff && mLeftStartIcon == null) {
//动态设置返回图标颜色
Resources resources = this.getResources();
Bitmap bmp = BitmapFactory.decodeResource(resources, R.drawable.platform_toolbar_back);
Bitmap bmp = BitmapFactory.decodeResource(resources, R.drawable.platform_common_back);
Bitmap colorBmp = BitmapUtils.tintBitmap(bmp, mLeftStartIconColor);
return new BitmapDrawable(resources, colorBmp);
}else {
......
ydl-webview/src/main/java/com/ydl/webview/NewH5Activity.java
......@@ -763,7 +763,7 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
tb_title.setImageVis(1);
}
} else {
tb_title.setImage(getResources().getDrawable(YDLConstants.FROM_YDL.equals(appFrom) ? R.drawable.platform_toolbar_back : R.drawable.platform_toolbar_back_yellow));
tb_title.setImage(getResources().getDrawable(R.drawable.platform_common_back));
tb_title.setmLeftText("");
tb_title.setImageListener(v -> {
if (h5Params.getShowUrlTitle()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment