Skip to content

Y
YDL-Component-Medical
Commit 9af61216 by 洪国微
Options

Merge branch 'dev' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into dev

parents ece84663 4324bcad
Showing with 125 additions and 46 deletions
config.gradle
......@@ -155,7 +155,7 @@ ext {
"bugly-crashreport" : 'com.tencent.bugly:crashreport:2.8.6.0',
"bugly-nativecrashreport" : 'com.tencent.bugly:nativecrashreport:3.6.0.1',
"ydl-image" : 'com.ydl:ydl-image:1.0.7-SNAPSHOT@aar',
"ydl-pushagent" : 'com.ydl:ydl-pushagent:0.1.8',
"ydl-pushagent" : 'com.ydl:ydl-pushagent:0.1.9',
"ydl-notracepoint" : 'com.ydl:notracepoint-lib:0.1.8@aar',
"ydl-js" : 'com.ydl:ydl-js:1.0.7-SNAPSHOT@aar',
"ydl-router" : 'com.ydl:ydl-router:1.3.2-SNAPSHOT@aar',
......@@ -170,6 +170,8 @@ ext {
"ydl-utils" : 'com.ydl:ydl-utils:0.0.2',
"ydl-net" : 'com.ydl:ydl-net:0.0.1',
"ydl-user-router" : 'com.ydl:router:1.0.0-SNAPSHOT@aar',
"ydl-device" : 'com.ydl:device-id:0.0.7@aar',
//功能组件
"ydl-platform" : 'com.ydl:ydl-platform:0.0.13@aar',
......
m-consultant/src/main/java/com/yidianling/consultant/adapter/ExpertSearchAdapter.kt
......@@ -2,6 +2,7 @@ package com.yidianling.consultant.adapter
import android.annotation.SuppressLint
import android.content.Context
import android.support.v4.content.ContextCompat
import android.support.v7.app.AppCompatActivity
import android.support.v7.widget.RecyclerView
import android.text.TextUtils
......@@ -12,6 +13,7 @@ import android.widget.ImageView
import com.ydl.webview.H5Params
import com.ydl.webview.NewH5Activity
import com.ydl.ydl_image.config.SimpleImageOpConfiger
import com.ydl.ydl_image.module.GlideApp
import com.ydl.ydlcommon.base.config.HttpConfig
import com.ydl.ydlcommon.router.IYDLRouterConstant
import com.ydl.ydlcommon.utils.BuryPointUtils
......@@ -126,6 +128,14 @@ class ExpertSearchAdapter(private val context: Context, private val expertSearch
else{
holder.imgAbilityLevel.visibility = View.GONE
}
//活动图标
if (!TextUtils.isEmpty(itemBean.activityImg)){
holder.imgActivity.visibility = View.VISIBLE
GlideApp.with(context).load(itemBean.activityImg).into(holder.imgActivity)
// GlideApp.with(context).load("https://video.ydlcdn.com/2019/11/04/abdd3782c98939d0406080a6a80b8ea5.jpg").into(holder.imgActivity)
}else{
holder.imgActivity.visibility = View.GONE
}
//公益图标
if (1 == itemBean.hasServiceFree){
if (null != itemBean.tagsIcon && !TextUtils.isEmpty(itemBean.tagsIcon.serviceFreeIcon)){
......@@ -195,6 +205,16 @@ class ExpertSearchAdapter(private val context: Context, private val expertSearch
// holder.tvSaleDurationForMonth.visibility = View.GONE
// holder.tvSaleDurationForMonthContent.visibility = View.GONE
// }
//私聊文案
if (TextUtils.isEmpty(itemBean.chatBtnText)){
holder.tvChat.text = "私聊"
holder.tvChat.setTextColor(ContextCompat.getColor(context,R.color.white))
holder.tvChat.background = ContextCompat.getDrawable(context,R.drawable.consultant_expert_search_chat)
}else{
holder.tvChat.text = itemBean.chatBtnText
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()
......@@ -268,6 +288,8 @@ class ExpertSearchAdapter(private val context: Context, private val expertSearch
val imgHead = itemView.imgHead!!
//专家姓名
val tvName = itemView.tvName!!
//活动图标
val imgActivity = itemView.img_activity!!
//优质图标
val imgAbilityLevel = itemView.imgAbilityLevel!!
//公益图标
......
m-consultant/src/main/java/com/yidianling/consultant/model/bean/DoctorServiceItem.kt
......@@ -42,8 +42,16 @@ data class DoctorServiceItem(/**
* 有免费咨询：1.有，2.无
*/
val hasServiceFree : Int?,
/**
* 活动图标
*/
val activityImg:String?,
/**
* 是否参加活动
*/
val joinActivity: Boolean?,
/**
* 是否新入驻：true:是，false:否
* 是否新入驻：true:是，false:否
*/
var isNewEnter : Boolean = false,
/**
......@@ -109,5 +117,9 @@ data class DoctorServiceItem(/**
/**
* 市
*/
val city : String?
val city : String?,
/**
* 私聊按钮的文案(如果不为空则取这个字段的值，如果为空 则默认为：“私聊”)
*/
val chatBtnText : String?
)
\ No newline at end of file
m-consultant/src/main/res/drawable-xhdpi/consultant_online_server.png
m-consultant/src/main/res/drawable-xhdpi/consultant_online_server.png

6.26 KB | W: 0px | H: 0px

m-consultant/src/main/res/drawable-xhdpi/consultant_online_server.png

3.28 KB | W: 0px | H: 0px

m-consultant/src/main/res/drawable-xhdpi/consultant_online_server.png
m-consultant/src/main/res/drawable-xhdpi/consultant_online_server.png
m-consultant/src/main/res/drawable-xhdpi/consultant_online_server.png
m-consultant/src/main/res/drawable-xhdpi/consultant_online_server.png
  • 2-up
  • Swipe
  • Onion skin
m-consultant/src/main/res/drawable-xhdpi/consultant_online_yue.png
m-consultant/src/main/res/drawable-xhdpi/consultant_online_yue.png

10.8 KB | W: 0px | H: 0px

m-consultant/src/main/res/drawable-xhdpi/consultant_online_yue.png

5.55 KB | W: 0px | H: 0px

m-consultant/src/main/res/drawable-xhdpi/consultant_online_yue.png
m-consultant/src/main/res/drawable-xhdpi/consultant_online_yue.png
m-consultant/src/main/res/drawable-xhdpi/consultant_online_yue.png
m-consultant/src/main/res/drawable-xhdpi/consultant_online_yue.png
  • 2-up
  • Swipe
  • Onion skin
m-consultant/src/main/res/drawable/consultant_expert_search_chat.xml
......@@ -2,7 +2,12 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:angle="180"
android:startColor="#FFDB14"
android:endColor="#FFDB26"/>
<corners android:radius="@dimen/platform_dp_13"/>
android:startColor="@color/consultant_chat_start_color"
android:endColor="@color/consultant_chat_end_color"/>
<padding
android:bottom="@dimen/platform_dp_3"
android:left="@dimen/platform_dp_10"
android:right="@dimen/platform_dp_10"
android:top="@dimen/platform_dp_3" />
<corners android:radius="@dimen/platform_dp_13" />
</shape>
\ No newline at end of file
m-consultant/src/main/res/drawable/consultant_expert_search_chat_rest.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:angle="180"
android:startColor="#F0F0F0"
android:endColor="#F0F0F0"/>
<corners android:radius="@dimen/platform_dp_13" />
<padding
android:bottom="@dimen/platform_dp_3"
android:left="@dimen/dp_10"
android:right="@dimen/dp_10"
android:top="@dimen/platform_dp_3" />
<stroke android:color="#F0F0F0"/>
</shape>
\ No newline at end of file
m-consultant/src/main/res/layout/consultant_expert_search_item_view.xml
......@@ -13,7 +13,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/platform_dp_15"
android:layout_marginLeft="1.5dp"
android:padding="0.5dp"
android:background="@drawable/consultant_bg_radius_line_gray_05"
android:orientation="vertical">
......@@ -35,25 +34,31 @@
<ImageView
android:id="@+id/imgHead_online"
android:layout_width="62dp"
android:layout_height="18dp"
android:layout_height="14dp"
android:layout_gravity="bottom"
android:scaleType="centerCrop"
android:layout_alignBottom="@+id/cvHead"
app:srcCompat="@drawable/consultant_online_yue"
android:layout_marginLeft="@dimen/platform_dp_2"
tools:visibility="visible"
android:layout_marginBottom="@dimen/platform_dp_05"
android:visibility="gone"/>
<ImageView
android:id="@+id/imgHead_online_server"
android:layout_width="42dp"
android:layout_height="18dp"
android:layout_width="41dp"
android:layout_height="14dp"
android:layout_gravity="bottom"
android:scaleType="centerCrop"
android:layout_alignBottom="@+id/cvHead"
app:srcCompat="@drawable/consultant_online_server"
android:layout_marginLeft="@dimen/platform_dp_2"
tools:visibility="visible"
android:layout_marginBottom="@dimen/platform_dp_05"
android:visibility="gone"/>
<!--咨询师姓名-->
<TextView
android:id="@+id/tvName"
......@@ -82,6 +87,13 @@
android:layout_alignBottom="@+id/tvName"
android:layout_toEndOf="@+id/tvName"
android:layout_marginStart="@dimen/platform_dp_2">
<!--活动图标-->
<ImageView
android:id="@+id/img_activity"
android:layout_width="42dp"
android:layout_height="12dp"
android:layout_marginStart="@dimen/dp_4"
android:visibility="gone"/>
<!--公益图标-->
<ImageView
android:id="@+id/imgServiceFree"
......@@ -339,7 +351,7 @@
<!--私聊-->
<TextView
android:id="@+id/tvChat"
android:layout_width="58dp"
android:layout_width="wrap_content"
android:layout_height="@dimen/platform_dp_24"
android:layout_alignBottom="@+id/cvHead"
android:layout_alignParentRight="true"
......@@ -347,7 +359,7 @@
android:textSize="@dimen/platform_dp_13"
android:textStyle="bold"
android:background="@drawable/consultant_expert_search_chat"
android:textColor="@color/platform_color_242424"
android:textColor="@color/consultant_confirm_text_color"
android:text="私聊"/>
<!--描述-->
......
m-consultant/src/xlzx/res/values/colors.xml
......@@ -15,4 +15,9 @@
<!--筛选条件选择框字体颜色-->
<color name="consultant_filter_content_text_color_en">#242424</color>
<color name="consultant_filter_content_text_color_un">#555555</color>
<!--私聊按钮背景颜色-->
<color name="consultant_chat_start_color">#ffd814</color>
<color name="consultant_chat_end_color">#ffdb26</color>
</resources>
m-consultant/src/ydl/res/values/colors.xml
......@@ -15,4 +15,7 @@
<!--筛选条件选择框字体颜色-->
<color name="consultant_filter_content_text_color_en">#1da1f2</color>
<color name="consultant_filter_content_text_color_un">#242424</color>
<!--私聊按钮背景颜色-->
<color name="consultant_chat_start_color">#23B2FA</color>
<color name="consultant_chat_end_color">#1DA1F2</color>
</resources>
ydl-platform/build.gradle
......@@ -78,7 +78,10 @@ dependencies {
api rootProject.ext.dependencies["imagepicker"]
api rootProject.ext.dependencies["ydl-utils"]
api rootProject.ext.dependencies["ydl-net"]
api(rootProject.ext.dependencies["ydl-js"]) {
api ('com.ydl:device-id:0.0.7@aar'){
transitive = true
}
api(rootProject.ext.dependencies["ydl-device"]) {
transitive = true
}
api(rootProject.ext.dependencies["ydl-router"]) {
......
ydl-platform/src/main/java/com/ydl/ydlcommon/app/YdlRepository.kt
......@@ -5,6 +5,7 @@ import android.app.Application
import com.alibaba.android.arouter.launcher.ARouter
import com.lzy.imagepicker.ImagePicker
import com.lzy.imagepicker.view.CropImageView
import com.ydl.devicesidlib.DeviceIDHelper
import com.ydl.ydlcommon.actions.imagepicker.YdlImageLoader
import com.ydl.ydlcommon.utils.BuryPointUtils
import com.ydl.ydlcommon.utils.log.LogHelper
......@@ -22,6 +23,7 @@ object YdlRepository {
// 需要在主 module 的 application 的 onCreate 方法中调用此方法
fun initApp(app: Application,isDebug:Boolean) {
DeviceIDHelper.getInstance().init(app.applicationContext)
LogHelper.getInstance().deleteExpireLogSync()
//初始化工具类
RxTool.init(app)
......
ydl-platform/src/main/java/com/ydl/ydlcommon/base/BaseFragment.kt
......@@ -70,6 +70,8 @@ abstract class BaseFragment : Fragment() ,IFragmentLifecycleable{
protected lateinit var rootView: View
fun getIsViewCreated() = isViewCreated
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
isViewCreated = true
......
ydl-platform/src/main/java/com/ydl/ydlcommon/router/IYdlCommonRouter.kt
......@@ -11,11 +11,6 @@ import android.content.Context
*/
interface IYdlCommonRouter {
fun startChooseLoginWay(activity: Activity)
fun startPublishTrend(activity: Activity, url: String, cover: String, title: String)
fun publishArticleToTrend(activity: Activity, url: String, cover: String, title: String)
fun startMain(activity: Activity, isSplashActivity: Boolean)
......@@ -26,24 +21,8 @@ interface IYdlCommonRouter {
fun setMoreService(context: Context)
fun safeTipViewGone(): Boolean
fun setTrendsSafeTip(status: Boolean)
fun startPrivacy(context: Context)
fun errorAgainTime(): Long
fun getUserInfo(): YdlUserInfo?
fun startP2PXiaoYi(context: Context)
fun getUid(): Int
fun getAccessToken(): String?
/**
* 清除未读数
*/
fun cleanUnReadNum()
}
\ No newline at end of file
ydl-platform/src/main/java/com/ydl/ydlcommon/utils/ApkUpdateDialog.kt
......@@ -3,11 +3,12 @@ package com.ydl.ydlcommon.utils
import android.app.Activity
import android.app.Dialog
import android.os.Bundle
import android.text.method.ScrollingMovementMethod
import android.view.View
import android.view.ViewGroup
import com.yidianling.common.tools.RxDeviceTool
import com.ydl.ydlcommon.R
import com.ydl.ydlcommon.bean.VersionData
import com.yidianling.common.tools.RxDeviceTool
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
import kotlinx.android.synthetic.main.platform_dialog_update_layout.*
......@@ -40,8 +41,11 @@ class ApkUpdateDialog : Dialog{
setContentView(R.layout.platform_dialog_update_layout)
tv_update_content.text = updateData?.title
tv_update_content.setMovementMethod(ScrollingMovementMethod.getInstance());
text_version.text = "v${updateData?.ver}"
text_desc.text = updateData?.content
text_desc.setMovementMethod(ScrollingMovementMethod.getInstance());
v_downpress.setSize(28,14,6,9,4)
v_downpress.setTextSize(10)
......
ydl-platform/src/main/java/com/ydl/ydlcommon/utils/YdlBuryPointUtil.java
package com.ydl.ydlcommon.utils;
import android.content.Context;
import com.ydl.burypointlib.BuryPointHelper;
import com.ydl.devicesidlib.DeviceIDHelper;
import com.ydl.pushserver.pushagent.YdlPushAgent;
import com.ydl.pushserver.pushagent.network.pack.RegisterEventBean;
import com.ydl.ydlcommon.BuildConfig;
import com.ydl.ydlcommon.base.BaseApp;
import com.ydl.ydlcommon.base.config.YDLConstants;
import com.ydl.ydlcommon.modular.ModularServiceManager;
import com.ydl.ydlcommon.router.YdlCommonOut;
import com.yidianling.common.tools.RxAppTool;
......@@ -21,15 +25,17 @@ public class YdlBuryPointUtil {
public static void init(Context context1){
try {
context = context1;
if (BuildConfig.DEBUG){
String appEnv = BaseApp.instance.getGlobalConfig().getAppEnv();
boolean isTest = YDLConstants.ENV_TEST.equals(appEnv);
if (isTest){
YdlPushAgent.setDebugAdree("47.97.49.44",8094);
}
RegisterEventBean registerEventBean = new RegisterEventBean();
registerEventBean.setAppId(context.getPackageName());
registerEventBean.setAppVersion(RxAppTool.getAppVersionName(context));
String channelId = JPushUtils.INSTANCE.getRegistrationID();
registerEventBean.setDeviceId(channelId);
String deviceId = DeviceIDHelper.getInstance().getDeviceId();
registerEventBean.setDeviceId(deviceId);
registerEventBean.setManufacturer(RxDeviceTool.getBuildMANUFACTURER());
registerEventBean.setChannel(YdlCommonOut.Companion.getChannelName());
registerEventBean.setOs("Android");
......@@ -44,7 +50,7 @@ public class YdlBuryPointUtil {
YdlPushAgent.init(registerEventBean,BuildConfig.DEBUG);
BuryPointHelper.setDebug(BuildConfig.DEBUG,BuildConfig.DEBUG,true,BuildConfig.DEBUG);
BuryPointHelper.setDebug(isTest,false,true,BuildConfig.DEBUG);
BuryPointHelper.init();
}catch (Exception e){
......@@ -58,8 +64,8 @@ public class YdlBuryPointUtil {
RegisterEventBean registerEventBean = new RegisterEventBean();
registerEventBean.setAppId(context.getPackageName());
registerEventBean.setAppVersion(RxAppTool.getAppVersionName(context));
String channelId = JPushUtils.INSTANCE.getRegistrationID();
registerEventBean.setDeviceId(channelId);
String deviceId = DeviceIDHelper.getInstance().getDeviceId();
registerEventBean.setDeviceId(deviceId);
registerEventBean.setManufacturer(RxDeviceTool.getBuildMANUFACTURER());
registerEventBean.setChannel(YdlCommonOut.Companion.getChannelName());
registerEventBean.setOs("Android");
......@@ -84,8 +90,8 @@ public class YdlBuryPointUtil {
}
//click埋点
public static void sendClick(String eventId){
LogUtil.d(eventId);
YdlPushAgent.sendClickEvent(eventId);
public static void sendClick(String eventId,String... strings){
com.yidianling.common.tools.LogUtil.d(eventId);
YdlPushAgent.sendClickEvent(eventId,strings);
}
}
ydl-platform/src/main/java/com/ydl/ydlcommon/utils/actionutil/ActionCountUtils.kt
......@@ -7,6 +7,7 @@ import android.net.wifi.WifiManager
import android.text.TextUtils
import android.util.Log
import com.google.gson.Gson
import com.ydl.devicesidlib.DeviceIDHelper
import com.ydl.ydlcommon.base.BaseApp
import com.ydl.ydlcommon.base.config.YDLConstants
import com.ydl.ydlcommon.data.http.api.ApiRequestUtil
......@@ -98,7 +99,8 @@ class ActionCountUtils {
actionDataParams.osVersion(android.os.Build.VERSION.RELEASE)
actionDataParams.wifi(if (isWifi()) 0 else 1)
actionDataParams.deviceId(DeviceTool.getIMEI())
actionDataParams.deviceId(DeviceIDHelper.getInstance().deviceId)
signs == null ?: signs.forEachIndexed { index, s ->
//拓展参数个数确定，暂不使用反射调用
......
ydl-platform/src/main/res/layout/platform_dialog_update_layout.xml
......@@ -67,6 +67,8 @@
android:maxLines="3"
android:lineSpacingMultiplier="1.3"
android:textColor="#242424"
android:scrollbars="vertical"
android:fadeScrollbars="false"
tools:text="以下是 QQ8.1 体验版更新日志：项，提醒成员关注重要事件;\n2、群文件可创建文件夹，自定分类轻松;\n3、新增“群助手”，群消息自定义收起，消息管理更轻松。" />
<TextView
android:id="@+id/text_desc"
......@@ -77,6 +79,8 @@
android:maxLines="4"
android:lineSpacingMultiplier="1.3"
android:textColor="@color/platform_color_666666"
android:scrollbars="vertical"
android:fadeScrollbars="false"
tools:text="1.优化私聊功能\n2.咨询业务算法调整"/>
</LinearLayout>
......
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