Skip to content

Y
YDL-Component-Medical
Commit ffef6da8 by 刘鹏
Options

feat : 去除埋点

parent 0fcf3c2a
Showing with 219 additions and 469 deletions
app/src/main/java/com/ydl/component/base/DemoAppLifecycles.kt
......@@ -28,7 +28,6 @@ import com.ydl.ydlcommon.base.config.YDLConstants
import com.ydl.ydlcommon.base.delegate.IAppLifecycles
import com.ydl.ydlcommon.utils.AppProgressUtils
import com.ydl.ydlcommon.utils.LogUtil
import com.ydl.ydlcommon.utils.YdlBuryPointUtil
import com.ydl.ydlcommon.utils.log.LogHelper
import com.yidianling.common.tools.ToastUtil
import com.yidianling.im.config.NimApplication
......@@ -151,7 +150,6 @@ class DemoAppLifecycles : IAppLifecycles {
UMConfigure.setLogEnabled(BuildConfig.DEBUG)
HttpConfig.getInstance().initSocketConfig(Action {
//数据埋点初始化 (一定要放在主进程中/因为用到了umeng统计，需要放在umeng初始化后)
// YdlBuryPointUtil.init(application, true)
})
//安全检测
//YDLAppProtector.init();
......
config.gradle
......@@ -8,9 +8,9 @@ ext {
"m-confide" : "0.0.49.10",
"m-consultant" : "0.0.59.91",
"m-fm" : "0.0.30.03",
"m-user" : "0.0.61.65",
"m-user" : "0.0.61.68",
"m-home" : "0.0.22.70",
"m-im" : "0.0.19.75",
"m-im" : "0.0.19.81",
"m-dynamic" : "0.0.7.28",
"m-article" : "0.0.0.10",
......@@ -33,7 +33,7 @@ ext {
//-------------- 功能组件 --------------
//第一步
"ydl-platform" : "0.0.40.39",
"ydl-platform" : "0.0.40.44",
//第二步 若干
"ydl-webview" : "0.0.38.49",
......@@ -91,7 +91,7 @@ ext {
"m-confide" : "0.0.49.10",
"m-consultant" : "0.0.59.91",
"m-fm" : "0.0.30.01",
"m-user" : "0.0.61.65",
"m-user" : "0.0.61.68",
"m-home" : "0.0.22.70",
"m-im" : "0.0.19.75",
"m-dynamic" : "0.0.7.28",
......@@ -115,7 +115,7 @@ ext {
//-------------- 功能组件 --------------
//第一步
"ydl-platform" : "0.0.40.39",
"ydl-platform" : "0.0.40.44",
//第二步 若干
"ydl-webview" : "0.0.38.49",
......
m-confide/src/main/java/com/ydl/confide/home/ConfideHomeActivity.kt
......@@ -29,7 +29,6 @@ import com.ydl.ydl_image.listener.YDLImageRecyclerOnScrollListener
import com.ydl.ydlcommon.modular.ModularServiceManager
import com.ydl.ydlcommon.mvp.lce.BaseLceActivity
import com.ydl.ydlcommon.utils.StatusBarUtils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.ydl.ydlcommon.utils.remind.ToastHelper
import com.ydl.ydlcommon.view.DrawableRightTextView
import com.ydl.ydlcommon.view.WrapContentLinearLayoutManager
......@@ -182,7 +181,6 @@ class ConfideHomeActivity : BaseLceActivity<IConfideHomeContract.View,IConfideHo
initQuickConsultDialog()
initStatus();
ModularServiceManager.provide(IConsultantService::class.java).showConfideListDialog(this)
ActionCountUtils.count("daoyi_advertisement_page|daoyi_advertisement_visit","17")
}
......
m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchActivity.kt
......@@ -35,7 +35,6 @@ import com.ydl.ydlcommon.bean.StatusBarOptions
import com.ydl.ydlcommon.ui.LogoLoadingView
import com.ydl.ydlcommon.utils.BuryPointUtils
import com.ydl.ydlcommon.utils.StatusBarUtils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.ydl.ydlcommon.utils.remind.ToastHelper
import com.ydl.ydlcommon.view.listener.EndlessRecyclerViewScrollListener
import com.yidianling.common.tools.LogUtil
......@@ -967,14 +966,12 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
}
R.id.tv_guide -> {
ActionCountUtils.count(ConsultBIConstants.ConsultEvent.APP_CONSULT_LIST_CONSULT_GUIDE_CLICK)
val h5param = H5Params(HttpConfig.H5_URL + "help/consultation/", "咨询指南")
h5param.isShowMenu = true
NewH5Activity.start(this, h5param)
}
R.id.btn_call -> {
ActionCountUtils.count(ConsultBIConstants.ConsultEvent.APP_CONSULT_LIST_ONLINE_CUSTOMER_CLICK)
ConsultantIn.startP2PXiaoYi(this)
}
......@@ -1228,10 +1225,6 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
//排序选择回调
override fun onSortItemSelected(sortItem: ReorderItem) {
ActionCountUtils.count(
ConsultBIConstants.ConsultEvent.APP_CONSULT_LIST_SORT_CLICK, sortItem.value
?: ""
)
if (sortItem.value.equals("综合排序")) {
tvSort.text = "排序"
......@@ -1316,10 +1309,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
tvArea.text = sub.value
}
}
ActionCountUtils.count(
ConsultBIConstants.ConsultEvent.APP_CONSULT_LIST_AREA_CLICK,
region.value + "|" + sub.value
)
//更新热门搜索显示状态
if (headData!!.highlighter.size > 0) {
......@@ -1392,10 +1382,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
* 新增逻辑：当主题选择后，需要判断热门筛选中是否也有该主题，如果有，也需要同步更新选中状态
*/
override fun onCategoriesSelected(categories: ArrayList<CateItem>) {
ActionCountUtils.count(
ConsultBIConstants.ConsultEvent.APP_CONSULT_LIST_THEME_CLICK,
categories.map { it.cateName }.joinToString("|")
)
if (categories.size == 1 && "全部" != categories[0].cateName) {
//显示选中标题
tvSubject.text = categories[0].cateName
......@@ -1475,10 +1462,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
// return
// }
ActionCountUtils.count(
ConsultBIConstants.UserMainEvent.YDL_USER_SEARCH_CLICK,
keyWord ?: ""
)
isDoSearch = true
resetFilter()
refresh()
......@@ -1566,7 +1550,6 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
override fun onResume() {
super.onResume()
ActionCountUtils.count(ConsultBIConstants.ConsultSearchListEvent.APP_CONSULT_SEARCH_LIST_PAGE_VISIT)
}
......
m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchFragment.kt
......@@ -34,7 +34,6 @@ import com.ydl.ydlcommon.ui.LogoLoadingView
import com.ydl.ydlcommon.utils.BuryPointUtils
import com.ydl.ydlcommon.utils.DisplayUtils
import com.ydl.ydlcommon.utils.StatusBarUtils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.ydl.ydlcommon.utils.remind.ToastHelper
import com.ydl.ydlcommon.view.listener.EndlessRecyclerViewScrollListener
import com.yidianling.common.tools.LogUtil
......@@ -919,14 +918,12 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
}
R.id.tv_guide -> {
ActionCountUtils.count(ConsultBIConstants.ConsultEvent.APP_CONSULT_LIST_CONSULT_GUIDE_CLICK)
val h5param = H5Params(HttpConfig.H5_URL + "help/consultation/", "咨询指南")
h5param.isShowMenu = true
NewH5Activity.start(context, h5param)
}
R.id.btn_call -> {
ActionCountUtils.count(ConsultBIConstants.ConsultEvent.APP_CONSULT_LIST_ONLINE_CUSTOMER_CLICK)
ConsultantIn.startP2PXiaoYi(mContext)
}
......@@ -1194,10 +1191,7 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
//排序选择回调
override fun onSortItemSelected(sortItem: ReorderItem) {
ActionCountUtils.count(
ConsultBIConstants.ConsultEvent.APP_CONSULT_LIST_SORT_CLICK, sortItem.value
?: ""
)
if (sortItem.value.equals("综合排序")) {
tvSort.text = "排序"
......@@ -1282,10 +1276,7 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
tvArea.text = sub.value
}
}
ActionCountUtils.count(
ConsultBIConstants.ConsultEvent.APP_CONSULT_LIST_AREA_CLICK,
region.value + "|" + sub.value
)
//更新热门搜索显示状态
if (headData!!.highlighter.size > 0) {
......@@ -1358,10 +1349,7 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
* 新增逻辑：当主题选择后，需要判断热门筛选中是否也有该主题，如果有，也需要同步更新选中状态
*/
override fun onCategoriesSelected(categories: ArrayList<CateItem>) {
ActionCountUtils.count(
ConsultBIConstants.ConsultEvent.APP_CONSULT_LIST_THEME_CLICK,
categories.map { it.cateName }.joinToString("|")
)
if (categories.size == 1 && "全部" != categories[0].cateName) {
//显示选中标题
tvSubject.text = categories[0].cateName
......@@ -1445,10 +1433,7 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
// return
// }
ActionCountUtils.count(
ConsultBIConstants.UserMainEvent.YDL_USER_SEARCH_CLICK,
keyWord ?: ""
)
isDoSearch = true
resetFilter()
refresh()
......@@ -1537,7 +1522,6 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
override fun onResume() {
super.onResume()
refresh(false)
ActionCountUtils.count(ConsultBIConstants.ConsultEvent.APP_CONSULT_LIST_PAGE_VISIT)
}
......
m-consultant/src/main/java/com/yidianling/consultant/HotSearchActivity.kt
......@@ -27,7 +27,6 @@ import com.ydl.ydlcommon.utils.FixSizeLinkedList
import com.ydl.ydlcommon.utils.LogUtil
import com.ydl.ydlcommon.utils.SharedPreferencesEditor
import com.ydl.ydlcommon.utils.StatusBarUtils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.ydl.ydlcommon.view.banner.GlideImageLoader
import com.yidianling.common.tools.RxDeviceTool
import com.yidianling.common.tools.RxImageTool
......@@ -320,7 +319,6 @@ class HotSearchActivity : BaseMvpActivity<IHotSearchContract.View, IHotSearchCon
// ToastUtil.toastShort("请输入搜索内容")
// return
// }
ActionCountUtils.count(ConsultBIConstants.UserMainEvent.YDL_USER_SEARCH_CLICK,keyWord)
if (!TextUtils.isEmpty(keyWord)) {
historyList.remove(keyWord)
historyList.add(keyWord)
......
m-consultant/src/main/java/com/yidianling/consultant/adapter/ExpertSearchAdapter.kt
......@@ -19,7 +19,6 @@ import com.ydl.ydlcommon.data.PlatformDataManager
import com.ydl.ydlcommon.router.IYDLRouterConstant
import com.ydl.ydlcommon.utils.BuryPointUtils
import com.ydl.ydlcommon.utils.URLUtils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.ydl.ydlcommon.utils.remind.ToastHelper
import com.yidianling.common.tools.LogUtil
import com.yidianling.common.tools.RxImageTool
......@@ -410,17 +409,7 @@ class ExpertSearchAdapter(
linkUrl = URLUtils.appendParmas(linkUrl, "cateId", cateId)
}
if (pageIndex == 0) {
ActionCountUtils.count(
ConsultBIConstants.ConsultEvent.APP_CONSULT_LIST_DOCTOR_CLICK,
itemBean.doctorId ?: ""
)
} else {
ActionCountUtils.count(
ConsultBIConstants.ConsultSearchListEvent.APP_CONSULT_SEARCH_LIST_CONSULT_ITEM_CLICK,
itemBean.doctorId ?: ""
)
}
TempH5RouteUtils.tempH5Route(linkUrl)
}
......@@ -429,17 +418,7 @@ class ExpertSearchAdapter(
itemView.tvChat.setOnClickListener {
if (adapterPosition != RecyclerView.NO_POSITION) {
val doctor = listData[adapterPosition]
if (pageIndex == 0) {
ActionCountUtils.count(
ConsultBIConstants.ConsultEvent.APP_CONSULT_LIST_CHAT_CLICK,
doctor.doctorId ?: ""
)
} else {
ActionCountUtils.count(
ConsultBIConstants.ConsultSearchListEvent.APP_CONSULT_SEARCH_LIST_CHAT_CLICK,
doctor.doctorId ?: ""
)
}
//判断是否已登录
if (!ConsultantIn.getUserImpl().loginByOneKeyLogin(context,true)) {
return@setOnClickListener
......@@ -449,7 +428,6 @@ class ExpertSearchAdapter(
if (!TextUtils.isEmpty(doctor.uid)) {
//跳转私聊
ConsultantIn.startP2PSession(context as AppCompatActivity, doctor.uid!!)
ActionCountUtils.count(ConsultBIConstants.UserMainEvent.YDL_PRIVATE_CHAT_CLICK)
} else {
ToastHelper.show("请联系客服,专家参数错误！")
}
......
m-consultant/src/main/java/com/yidianling/consultant/modular/singlton/ConsultAssistantDialogUtils.kt
......@@ -6,8 +6,6 @@ import androidx.appcompat.app.AppCompatActivity
import com.ydl.ydlcommon.data.http.ThrowableConsumer
import com.ydl.ydlcommon.utils.ActivityManager
import com.ydl.ydlcommon.utils.Utils
import com.ydl.ydlcommon.utils.YdlBuryPointUtil
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.ydl.ydlnet.YDLHttpUtils.Companion.obtainApi
import com.yidianling.consultant.ConsultAssistantCenterActivity
import com.yidianling.consultant.ExpertSearchActivity
......@@ -119,12 +117,6 @@ class ConsultAssistantDialogUtils private constructor() {
return onClickAction()
}
//获取用户uid
ActionCountUtils.count("main_page|main_daoyi_entry_click")
YdlBuryPointUtil.sendClick("home_page_assistant_click")
ActionCountUtils.count(
ConsultBIConstants.POSITION_DAOYI_ADVERTISEMENT_CLICK,
"1"
)
getConsultAssistantUid("", activity, 1)
}
......@@ -159,10 +151,6 @@ class ConsultAssistantDialogUtils private constructor() {
if (!ConsultantIn.getUserImpl().loginByOneKeyLogin(activity, true)) {
return
}
ActionCountUtils.count(
ConsultBIConstants.POSITION_DAOYI_ADVERTISEMENT_CLICK,
"17"
)
getConsultAssistantUid("", activity, 17)
}
......@@ -196,10 +184,6 @@ class ConsultAssistantDialogUtils private constructor() {
return onClickAction()
}
//获取用户uid
ActionCountUtils.count(
ConsultBIConstants.POSITION_DAOYI_ADVERTISEMENT_CLICK,
"4"
)
getConsultAssistantUid("", activity, 4)
}
......@@ -256,12 +240,6 @@ class ConsultAssistantDialogUtils private constructor() {
if (Utils.isFastClick()) {
return onClickAction()
}
ActionCountUtils.count(
ConsultBIConstants.POSITION_DAOYI_ADVERTISEMENT_CLICK,
"6"
)
ActionCountUtils.count("app_consult_list_page|app_consult_list_daoyi_entry_click")
YdlBuryPointUtil.sendClick("assistant_list_click")
// 咨询师列表页面且未登录情况下，跳转登录页面
if (ConsultantIn.loginByOneKeyLogin(activity, true)) {
//获取用户uid
......@@ -283,8 +261,6 @@ class ConsultAssistantDialogUtils private constructor() {
if (Utils.isFastClick()) {
return onClickAction()
}
ActionCountUtils.count("app_consult_list_page|app_consult_list_daoyi_entry_click")
YdlBuryPointUtil.sendClick("assistant_list_click")
// 咨询师列表页面且未登录情况下，跳转登录页面
if (ConsultantIn.loginByOneKeyLogin(activity, true)) {
//获取用户uid
......@@ -362,11 +338,6 @@ class ConsultAssistantDialogUtils private constructor() {
getConsultAssistantUid(location, activity, null)
}
ActionCountUtils.count(
ConsultBIConstants.POSITION_DAOYI_ADVERTISEMENT_CLICK,
location.toString()
)
}
@SuppressLint("CheckResult")
......
m-consultant/src/main/java/com/yidianling/consultant/modular/utils/ConsultAssistantEntryUtils.kt
......@@ -8,7 +8,6 @@ import com.ydl.ydl_router.manager.YDLRouterParams
import com.ydl.ydlcommon.data.http.ThrowableConsumer
import com.ydl.ydlcommon.router.IYDLRouterConstant
import com.ydl.ydlcommon.utils.ActivityManager.Companion.getInstance
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.ydl.ydlnet.YDLHttpUtils
import com.yidianling.common.tools.LogUtil
import com.yidianling.common.tools.ToastUtil
......@@ -27,11 +26,6 @@ class ConsultAssistantEntryUtils {
companion object {
@SuppressLint("CheckResult")
fun jumpConsultAssistant(activity: Activity, location: Int, ffrom2: String?) {
ActionCountUtils.count(
ConsultBIConstants.POSITION_DAOYI_ADVERTISEMENT_CLICK,
"$location"
)
if (ConsultantIn.loginByOneKeyLogin(activity, true)) {
// 请求接口获取咨询助理的uid
YDLHttpUtils.obtainApi(SearchApi::class.java).getChatRouteConfig(location)
......
m-consultant/src/main/java/com/yidianling/consultant/ui/view/FilterPopupWindow.kt
......@@ -15,7 +15,6 @@ import android.view.inputmethod.InputMethodManager
import android.widget.*
import com.bumptech.glide.Glide
import com.ydl.ydlcommon.data.http.RxUtils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.ydl.ydlcommon.utils.remind.ToastHelper
import com.yidianling.common.tools.RxDeviceTool
import com.yidianling.common.tools.RxImageTool
......@@ -314,10 +313,6 @@ class FilterPopupWindow(
private fun biEvent(biEventName: String, biEventParams: String = "") {
if (!TextUtils.isEmpty(biEventName)) {
ActionCountUtils.count(
ConsultBIConstants.PART_ID_CONSULT_FILTER_PAGE + "|" + biEventName,
biEventParams
)
}
}
......
m-course/src/main/java/com/yidianling/course/FlutterCourseHomeFragment.kt
......@@ -15,7 +15,6 @@ import com.ydl.ydlcommon.data.http.ThrowableConsumer
import com.ydl.ydlcommon.modular.ModularServiceManager
import com.ydl.ydlcommon.router.YdlCommonRouterManager
import com.ydl.ydlcommon.utils.YDLCacheUtils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.ydl.ydlcommon.utils.remind.ToastHelper
import com.yidianling.common.tools.ToastUtil
import com.yidianling.course.bean.CourseCouponBean
......@@ -63,7 +62,6 @@ class FlutterCourseHomeFragment : BaseFlutterFragment() {
if (isVisibleToUser) {
prepareCoupon()
ActionCountUtils.count(CourseBIConstants.CourseHomeEvent.POSITION_COURSE_HOME_PAGE_VISIT)
}
}
......
m-course/src/main/java/com/yidianling/course/courseNew/courseList/CourseListContainerActivity.kt
......@@ -28,7 +28,6 @@ import com.ydl.ydlcommon.bean.StatusBarOptions
import com.ydl.ydlcommon.data.http.RxUtils
import com.ydl.ydlcommon.ui.LogoLoadingView
import com.ydl.ydlcommon.utils.NetworkParamsUtils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.ydl.ydlcommon.utils.remind.ToastHelper
import com.yidianling.common.tools.LogUtil
import com.yidianling.common.tools.RxImageTool
......@@ -129,8 +128,6 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
search_view.initBarType(SearchBarView.JUMP_TO_SEARCH_COURSE, null)
iv_back.setOnClickListener {
ActionCountUtils.count(CourseBIConstants.CourseListEvent.POSITION_COURSE_LIST_RETURN_CLICK)
finish()
}
search_view.setTextVisibility()
......@@ -283,10 +280,6 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
selectedSort = sortItem
getData(false)
ActionCountUtils.count(
CourseBIConstants.CourseListEvent.POSITION_COURSE_LIST_SORT_CLICK,
selectedSort
)
}
})
popupWindow.setOnDismissListener {
......@@ -326,10 +319,6 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
var name =
if (selectedGoodsList.size == 0) "全部类型" else selectedGoodsList[0].name
ActionCountUtils.count(
CourseBIConstants.CourseListEvent.POSITION_COURSE_LIST_CLASSIFICATION_CLICK,
name
)
}
})
popupWindow.setOnDismissListener {
......@@ -395,10 +384,6 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
if (isPromotion == 1) {
sign += "促销"
}
ActionCountUtils.count(
CourseBIConstants.CourseListEvent.POSITION_COURSE_LIST_FILTER_CLICK,
sign
)
}
})
popupWindow.setOnDismissListener {
......@@ -747,7 +732,6 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
override fun onResume() {
super.onResume()
ActionCountUtils.count(CourseBIConstants.CourseListEvent.POSITION_COURSE_LIST_PAGE_VISIT)
}
override fun checkCanDoRefresh(frame: PtrFrameLayout?, content: View?, header: View?): Boolean {
......
m-course/src/main/java/com/yidianling/course/widget/CourseItemNewView.kt
......@@ -20,7 +20,6 @@ import com.ydl.webview.H5Params
import com.ydl.webview.NewH5Activity
import com.ydl.ydl_image.module.GlideApp
import com.ydl.ydlcommon.modular.ModularServiceManager.provide
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.yidianling.common.tools.RxImageTool
import com.yidianling.common.tools.ToastUtil
import com.yidianling.consultant.api.IConsultantService
......@@ -146,10 +145,6 @@ class CourseItemNewView : ConstraintLayout {
iv_play.setOnClickListener {
playMedia()
ActionCountUtils.count(
CourseBIConstants.CourseListEvent.POSITION_COURSE_LIST_AUDITION_CLICK,
course.id
)
}
tv_view_course.setOnClickListener {
......@@ -167,7 +162,6 @@ class CourseItemNewView : ConstraintLayout {
NewH5Activity.start(mContext, h5Params)
}
ActionCountUtils.count(CourseBIConstants.CourseListEvent.POSITION_COURSE_LIST_XXX_CLICK + course.id + "_click")
}
......
m-course/src/main/java/com/yidianling/course/widget/SearchBarView.kt
......@@ -14,7 +14,6 @@ import android.widget.LinearLayout
import android.widget.TextView
import com.ydl.ydl_router.manager.YDLRouterManager
import com.ydl.ydlcommon.router.IYDLRouterConstant
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.ydl.ydlcommon.utils.actionutil.BIConstants
import com.yidianling.common.tools.RxImageTool
import com.yidianling.course.R
......@@ -64,7 +63,6 @@ class SearchBarView : LinearLayout {
setOnClickListener {
when (barType) {
JUMP_TO_SEARCH_COURSE -> {//搜索课程页面
ActionCountUtils.count(CourseBIConstants.CourseHomeEvent.POSITION_COURSE_HOME_SEACH_CLICK)
YDLRouterManager.router(IYDLRouterConstant.ROUTER_COURSE_SEARCH)
}
}
......
m-home/src/main/java/com/yidianling/home/event/HomeBaseImpl.kt
......@@ -26,7 +26,6 @@ import com.ydl.ydlcommon.modular.ModularServiceManager
import com.ydl.ydlcommon.router.IYDLRouterConstant
import com.ydl.ydlcommon.utils.LogUtil
import com.ydl.ydlcommon.utils.Utils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.ydl.ydlcommon.utils.remind.ToastHelper
import com.ydl.ydlcommon.view.dialog.CommonDialog
import com.yidianling.home.R
......@@ -49,7 +48,6 @@ open class HomeBaseImpl : IHomeBaseEvent {
//防止连击
return
}
ActionCountUtils.count(HomeBIConstants.YDL_USER_EXPERT_INTRODUCTION_CLICK, doctorId)
if (null == linkUrl || linkUrl.isEmpty()) {
return
......@@ -69,10 +67,6 @@ open class HomeBaseImpl : IHomeBaseEvent {
//防止连击
return
}
ActionCountUtils.count(
HomeBIConstants.YDL_USER_PRIVATE_CHAT_CLICK, doctorId
?: ""
)
if (!ModularServiceManager.provide(IUserService::class.java).loginByOneKeyLogin(mContext as Context,true)) {
//跳转登录
......@@ -103,10 +97,6 @@ open class HomeBaseImpl : IHomeBaseEvent {
* @param selectPosition 选中的position
*/
override fun getConsultData(type: HomeHeaderBean.ConsultCategoryDateBean, selectPosition: Int) {
ActionCountUtils.count(
HomeBIConstants.YDL_USER_CONSULT_TYPE_CLICK, type.name
?: ""
)
mHomeView!!.getConsultData(type.id.toString(), selectPosition)
}
......@@ -148,7 +138,6 @@ open class HomeBaseImpl : IHomeBaseEvent {
//防止连击
return
}
ActionCountUtils.count(HomeBIConstants.YDL_USER_TELEPHONE_CUSTOMER_SERVICE_CLICK)
val tel =
if (PlatformRamImpl.getInstance().getGlobalInfo() == null) "400-765-1010" else PlatformRamImpl.getInstance().getGlobalInfo()!!.info.tel
var con = "\n400-765-1010\n早8:30-凌晨2:00"
......@@ -206,12 +195,10 @@ open class HomeBaseImpl : IHomeBaseEvent {
2
)
)
ActionCountUtils.count(HomeBIConstants.YDL_USER_CONSULT_MORE_CLICK)
}
override fun bannerClick(banner: HomeHeaderBean.FocusListBean) {
ActionCountUtils.count(HomeBIConstants.YDL_USER_BANNER_CLICK, banner.focId.toString())
linkTo(banner.linkUrl.toString())
}
......@@ -222,12 +209,6 @@ open class HomeBaseImpl : IHomeBaseEvent {
//防止连击
return
}
ActionCountUtils.count(
HomeBIConstants.YDL_USER_CONSULT_CLASSIFICATION_CLICK,
data.cateId.toString(),
data.cateTitle
?: ""
)
goExpertSearch(data)
}
......@@ -279,7 +260,6 @@ open class HomeBaseImpl : IHomeBaseEvent {
2
)
)
ActionCountUtils.count(HomeBIConstants.YDL_USER_CONSULT_CLICK)
}
override fun nowConfideClick() {
......@@ -287,7 +267,6 @@ open class HomeBaseImpl : IHomeBaseEvent {
//防止连击
return
}
ActionCountUtils.count(HomeBIConstants.YDL_USER_TALK_IN_TIME_CLICK)
//倾诉首页 ydl-user://confide/home
YDLRouterManager.router(IYDLRouterConstant.ROUTER_CONFIDE_HOME)
......@@ -301,7 +280,6 @@ open class HomeBaseImpl : IHomeBaseEvent {
//课程频道页 ydl-user://course/home
// YDLRouterManager.router(IYDLRouterConstant.ROUTER_COURSE_HOME)
//埋点
ActionCountUtils.count(HomeBIConstants.YDL_USER_PSYCHOLOGICAL_CLASSROOM_CLICK)
ARouter.getInstance().build("/course/home").navigation()
}
......@@ -311,7 +289,6 @@ open class HomeBaseImpl : IHomeBaseEvent {
//防止连击
return
}
ActionCountUtils.count(HomeBIConstants.YDL_USER_PSYCHOLOGICAL_TEST_CLICK)
//测评频道首页 ydl-user://ceshi/home
// YDLRouterManager.router(IYDLRouterConstant.ROUTER_TEST_HOME)
ARouter.getInstance().build("/ceshi/home").navigation()
......@@ -322,7 +299,6 @@ open class HomeBaseImpl : IHomeBaseEvent {
//防止连击
return
}
ActionCountUtils.count(HomeBIConstants.YDL_USER_LISTEN_MORE_CLICK)
//倾诉首页 ydl-user://qingshu/home
YDLRouterManager.router(IYDLRouterConstant.ROUTER_CONFIDE_HOME)
......@@ -341,11 +317,6 @@ open class HomeBaseImpl : IHomeBaseEvent {
return
}
ActionCountUtils.count(
HomeBIConstants.YDL_USER_LISTENER_INTRODUCTION_CLICK,
doctorId.toString()
)
if (linkUrl.startsWith("http")) {
YDLRouterManager.router(
IYDLRouterConstant.ROUTER_H5_H5,
......@@ -409,7 +380,6 @@ open class HomeBaseImpl : IHomeBaseEvent {
}
//课程频道页 ydl-user://course/home
// YDLRouterManager.router(IYDLRouterConstant.ROUTER_COURSE_HOME)
ActionCountUtils.count(HomeBIConstants.YDL_USER_COURSE_MORE_CLICK)
ARouter.getInstance().build("/course/home").navigation()
}
......@@ -418,7 +388,6 @@ open class HomeBaseImpl : IHomeBaseEvent {
//防止连击
return
}
ActionCountUtils.count(HomeBIConstants.YDL_USER_COURSE_CLICK, bean.id.toString())
val h5Params = H5Params(
COURSE_DETAIL_H5 + bean.id,
......@@ -460,7 +429,6 @@ open class HomeBaseImpl : IHomeBaseEvent {
//防止连击
return
}
ActionCountUtils.count(HomeBIConstants.YDL_USER_ASK_MORE_CLICK)
//心事动态频道页（首页--问答） ydl-user://answers/home
YDLRouterManager.router(IYDLRouterConstant.ROUTER_ANSWERS_HOME)
}
......@@ -470,7 +438,6 @@ open class HomeBaseImpl : IHomeBaseEvent {
//防止连击
return
}
ActionCountUtils.count(HomeBIConstants.YDL_USER_RADIO_CLICK, bean.id.toString())
//电台详情页面
YDLRouterManager.router(
IYDLRouterConstant.ROUTER_FM_DETAIL,
......@@ -479,7 +446,6 @@ open class HomeBaseImpl : IHomeBaseEvent {
}
override fun fmPlayClick(fmDetail: HomeFMBean.ListBean) {
ActionCountUtils.count(HomeBIConstants.YDL_USER_RADIO_PLAY_CLICK, fmDetail.id.toString())
if (!TextUtils.isEmpty(fmDetail.fmUrl)) {
val music = Music()
......@@ -512,7 +478,6 @@ open class HomeBaseImpl : IHomeBaseEvent {
//防止连击
return
}
ActionCountUtils.count(HomeBIConstants.YDL_USER_HEART_RADIO_MORE_CLICK)
//fm列表页 ydl-user://fm/list
YDLRouterManager.router(IYDLRouterConstant.ROUTER_FM_LIST)
}
......@@ -526,7 +491,6 @@ open class HomeBaseImpl : IHomeBaseEvent {
return
}
ActionCountUtils.count(HomeBIConstants.YDL_USER_ARTICLE_CLICK, bean.id.toString())
YDLRouterManager.router(
IYDLRouterConstant.ROUTER_H5_H5,
......@@ -539,7 +503,6 @@ open class HomeBaseImpl : IHomeBaseEvent {
//防止连击
return
}
ActionCountUtils.count(HomeBIConstants.YDL_USER_ARTICLE_MORE_CLICK)
//文章列表页 ydl-user://article/list
ARouter.getInstance().build("/article/list").navigation()
......@@ -551,7 +514,6 @@ open class HomeBaseImpl : IHomeBaseEvent {
//防止连击
return
}
ActionCountUtils.count(HomeBIConstants.YDL_USER_ASK_COMMENT_CLICK, bean.id.toString())
val bundle = Bundle()
bundle.putInt("trend_id", bean.id)
bundle.putInt("comment_count", bean.commentsCount)
......@@ -586,10 +548,6 @@ open class HomeBaseImpl : IHomeBaseEvent {
* @param selectPosition 选中的position
*/
override fun getConfideData(type: HomeHeaderBean.ListenCategoryDateBean, selectPosition: Int) {
ActionCountUtils.count(
HomeBIConstants.YDL_USER_LISTEN_TYPE_CLICK, type.name
?: ""
)
mHomeView!!.getConfideData(type.id.toString(), selectPosition)
}
......
m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeImageBannerView.kt
......@@ -6,7 +6,6 @@ import android.view.View
import android.view.ViewGroup
import android.widget.FrameLayout
import android.widget.LinearLayout
import com.ydl.ydlcommon.utils.YdlBuryPointUtil
import com.ydl.ydlcommon.view.banner.GlideImageLoader
import com.yidianling.common.tools.RxDeviceTool
import com.yidianling.common.tools.RxImageTool
......@@ -68,10 +67,7 @@ class HomeImageBannerView(val mContext: Context, val homeEvent: IHomeBaseEvent)
.setImages(imageViews).start()
banner_search.setOnBannerListener {
homeEvent?.bannerClick(cacheList!![it])
YdlBuryPointUtil.sendClick(
"ydl-xinlizixun-home-banner$it",
"${cacheList[it].imageUrl}"
)
}
}
}
......
m-home/src/ydl/java/com/yidianling/home/ui/fragment/YdlHomeFragment.kt
......@@ -25,7 +25,6 @@ import com.ydl.ydlcommon.modular.ModularServiceManager
import com.ydl.ydlcommon.utils.SharedPreferencesEditor
import com.ydl.ydlcommon.utils.StatusBarUtils
import com.ydl.ydlcommon.utils.Utils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.yidianling.consultant.api.IConsultantService
import com.yidianling.home.R
import com.yidianling.home.adapter.YdlHomeAdapter
......@@ -514,8 +513,6 @@ open class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterIm
override fun onResume() {
super.onResume()
if (userVisibleHint) {
ActionCountUtils.count(HomeBIConstants.YDL_USER_MAIN_PAGE_VISIT)
if (isFromCreate) {
isFromCreate = false
mPresenter?.loadHomeData()
......
m-home/src/ydl/java/com/yidianling/home/ui/view/HomeConsultItemView.kt
......@@ -11,7 +11,6 @@ import com.ydl.ydl_image.manager.YDLImageCacheManager
import com.ydl.ydlcommon.modular.ModularServiceManager
import com.ydl.ydlcommon.utils.StringUtils
import com.ydl.ydlcommon.utils.URLUtils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.yidianling.common.tools.RxImageTool
import com.yidianling.consultant.api.IConsultantService
import com.yidianling.home.R
......@@ -71,7 +70,6 @@ class HomeConsultItemView(private var mContext: Context, private var homeEvent:
11
)*/
//补充点击事件埋点
ActionCountUtils.count(HomeBIConstants.YDL_USER_EXPERT_INTRODUCTION_CLICK, bean.uid.toString())
val url = URLUtils.appendParmas(bean.linkUrl,"cateId",cateId)
ModularServiceManager.provide(IConsultantService::class.java).dueToTypeJumpAutoOrGuide(
mContext as Activity,
......@@ -140,7 +138,6 @@ class HomeConsultItemView(private var mContext: Context, private var homeEvent:
bodyBean.uid,
""
)
ActionCountUtils.count(HomeBIConstants.YDL_PRIVATE_CHAT_CLICK)
}
}
......
m-home/src/ydl/java/com/yidianling/home/ui/view/HomePagerBannerRealView.kt
......@@ -10,7 +10,6 @@ import android.view.animation.Animation
import android.view.animation.DecelerateInterpolator
import android.view.animation.TranslateAnimation
import android.widget.LinearLayout
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.yidianling.home.constants.HomeBIConstants
import com.yidianling.home.R
import com.yidianling.home.event.IHomeBaseEvent
......@@ -164,7 +163,6 @@ class HomePagerBannerRealView(mContext : Context,homeEvent : IHomeBaseEvent) : L
tv_in_content_before.text = getName(bodyBean)
tv_in_content_after.text = String.format("老师%s",bodyBean.contentAfter)
view_in!!.setOnClickListener{
ActionCountUtils.count(HomeBIConstants.YDL_USER_NOTICE_CLICK)
homeEvent!!.linkTo(bodyBean.url!!)
}
}
......@@ -173,7 +171,6 @@ class HomePagerBannerRealView(mContext : Context,homeEvent : IHomeBaseEvent) : L
tv_out_content_before.text = getName(bodyBean)
tv_out_content_after.text = String.format("老师%s",bodyBean.contentAfter)
view_out!!.setOnClickListener{
ActionCountUtils.count(HomeBIConstants.YDL_USER_NOTICE_CLICK)
homeEvent!!.linkTo(bodyBean.url!!)
}
}
......
m-home/src/ydl/java/com/yidianling/home/ui/view/HomePagerBannerView.kt
......@@ -5,7 +5,6 @@ import android.view.View
import android.view.ViewGroup
import android.widget.FrameLayout
import android.widget.RelativeLayout
import com.ydl.ydlcommon.utils.YdlBuryPointUtil
import com.ydl.ydlcommon.view.banner.GlideImageLoader
import com.yidianling.home.R
import com.yidianling.home.event.IHomeBaseEvent
......@@ -119,7 +118,6 @@ class HomePagerBannerView(private val mContext: Context, private var homeEvent:
homeModulePagerBannerViewBanner.setOnBannerListener {
if (it < cacheList?.size) {
homeEvent?.bannerClick(cacheList[it])
YdlBuryPointUtil.sendClick("ydl-user-home-banner$it","${cacheList[it].imageUrl}")
}
}
}
......
m-im/build.gradle
......@@ -97,20 +97,12 @@ dependencies {
api project(':ydl-platform')
implementation modularPublication('com.ydl:m-im-api')
implementation modularPublication('com.ydl:m-user-api')
implementation modularPublication('com.ydl:m-dynamic-api')
implementation modularPublication('com.ydl:m-tests-api')
implementation modularPublication('com.ydl:m-course-api')
implementation modularPublication('com.ydl:m-fm-api')
implementation modularPublication('com.ydl:m-consultant-api')
implementation modularPublication('com.ydl:m-confide-api')
}else {
//发布时使用
compileOnly rootProject.ext.dependencies["ydl-m-im-api"]
compileOnly rootProject.ext.dependencies["ydl-m-user-api"]
compileOnly rootProject.ext.dependencies["ydl-m-dynamic-api"]
compileOnly rootProject.ext.dependencies["ydl-m-tests-api"]
compileOnly rootProject.ext.dependencies["ydl-m-course-api"]
compileOnly rootProject.ext.dependencies["ydl-m-fm-api"]
compileOnly rootProject.ext.dependencies["ydl-m-consultant-api"]
compileOnly rootProject.ext.dependencies["ydl-m-confide-api"]
api rootProject.ext.dependencies["ydl-webview"]
......
m-im/src/main/java/com/yidianling/im/bridge/P2PCustomActionHandlerImpl.java
......@@ -265,22 +265,22 @@ public class P2PCustomActionHandlerImpl implements IP2PCustomActionHandler {
*/
@Override
public void toExpertHome(String doctorId, String name, String cover) {
// 跳转到专家主页
String junmpurl = ImIn.INSTANCE.getExpertHost() + doctorId;
String share_title = name + "咨询工作室";
String share_head = cover;
String share_context = "";
String share_url = ImIn.INSTANCE.getShareExpertHost() + doctorId;
H5Params h5Params = new H5Params(junmpurl, null);
if (!TextUtils.isEmpty(share_url)) {
ShareData shareData1 = new ShareData(junmpurl, share_title, share_head, share_context);
h5Params.setShareData(shareData1);
}
h5Params.setShowMenu(true);
if (mActivity != null) {
NewH5Activity.start(mActivity, h5Params);
}
// // 跳转到专家主页
// String junmpurl = ImIn.INSTANCE.getExpertHost() + doctorId;
// String share_title = name + "咨询工作室";
// String share_head = cover;
// String share_context = "";
// String share_url = ImIn.INSTANCE.getShareExpertHost() + doctorId;
//
// H5Params h5Params = new H5Params(junmpurl, null);
// if (!TextUtils.isEmpty(share_url)) {
// ShareData shareData1 = new ShareData(junmpurl, share_title, share_head, share_context);
// h5Params.setShareData(shareData1);
// }
// h5Params.setShowMenu(true);
// if (mActivity != null) {
// NewH5Activity.start(mActivity, h5Params);
// }
}
/**
......@@ -937,9 +937,9 @@ public class P2PCustomActionHandlerImpl implements IP2PCustomActionHandler {
*/
@Override
public void showUserHome() {
if (ImIn.INSTANCE.membersIntent(mActivity, docInfo.toUid) != null) {
mActivity.startActivity(ImIn.INSTANCE.membersIntent(mActivity, docInfo.toUid));
}
// if (ImIn.INSTANCE.membersIntent(mActivity, docInfo.toUid) != null) {
// mActivity.startActivity(ImIn.INSTANCE.membersIntent(mActivity, docInfo.toUid));
// }
}
......
m-im/src/main/java/com/yidianling/im/router/ImIn.kt
......@@ -13,22 +13,16 @@ import com.netease.nimlib.sdk.msg.model.IMMessage
import com.netease.nimlib.sdk.uinfo.UserService
import com.netease.nimlib.sdk.uinfo.constant.UserInfoFieldEnum
import com.ydl.confide.api.IConfideService
import com.ydl.course.api.ICourseService
import com.ydl.ydl_router.manager.YDLRouterManager
import com.ydl.ydlcommon.base.config.HttpConfig
import com.ydl.ydlcommon.bean.GlobalInfo
import com.ydl.ydlcommon.data.PlatformDataManager
import com.ydl.ydlcommon.data.http.GsonProvider
import com.ydl.ydlcommon.modular.ModularServiceManager
import com.ydl.ydlcommon.router.IYDLRouterConstant
import com.yidianling.consultant.api.IConsultantService
import com.yidianling.dynamic.api.IDynamicService
import com.yidianling.fm.api.service.IFMService
import com.yidianling.im.api.bean.ReceiveRedPacketParam
import com.yidianling.im.api.service.IImService
import com.yidianling.im.config.constants.UserPreferences
import com.yidianling.im.preference.IMCache
import com.yidianling.tests.api.service.ITestsApiService
import com.yidianling.uikit.api.NimUIKit
import com.yidianling.user.api.bean.UserResponseBean
import com.yidianling.user.api.service.IAppService
......@@ -53,22 +47,6 @@ object ImIn {
return ModularServiceManager.provide(IUserService::class.java)
}
fun getDynamicService(): IDynamicService {
return ModularServiceManager.provide(IDynamicService::class.java)
}
fun getCourseService(): ICourseService{
return ModularServiceManager.provide(ICourseService::class.java)
}
fun getTestsService(): ITestsApiService{
return ModularServiceManager.provide(ITestsApiService::class.java)
}
fun getFMService(): IFMService{
return ModularServiceManager.provide(IFMService::class.java)
}
fun getConsultService(): IConsultantService {
return ModularServiceManager.provide(IConsultantService::class.java)
}
......@@ -111,61 +89,20 @@ object ImIn {
}
}
fun membersIntent(activity: Activity, userId: String): Intent? {
return getDynamicService().membersIntent(activity, userId)
}
fun replayInfoIntent(activity: Activity, replyId: String, aid: String): Intent? {
return getDynamicService().replyInfoIntent(activity, replyId, aid)
}
fun myRedPockIntent(activity: Activity){
getAppService().myRedPockIntent(activity)
}
fun trendsDetailIntent(activity: Activity, trendId: Int): Intent? {
return getDynamicService().trendsDetailIntent(activity, trendId)
}
fun trendsDetailIntent(activity: Activity, trendId: Int, isScrollToZan: Boolean): Intent? {
return getDynamicService().trendsDetailIntent(activity, trendId, isScrollToZan)
}
fun trendsDetailIntent(activity: Activity, trendId: Int, isScrollToZan: Boolean, lastId: Int): Intent? {
return getDynamicService().trendsDetailIntent(activity, trendId, isScrollToZan, lastId)
}
/**
* 跳转话题详情
*/
fun topicDetailActivity(context: Activity,topic_id : String){
var intent = getDynamicService().topicDetailIntent(context, false,topic_id)
intent?.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
context.startActivity(intent)
}
/**
* 课程专题页面
*/
fun courseTopic(activity: Activity,id : String){
getCourseService().courseTopic(activity,id)
}
fun fmDetailIntent(activity: Activity, id: Int): Intent? {
return getFMService().fmDetailIntent(activity, id)
}
fun sendRedPacketIntent(activity: Activity, toUid: String,code:Int){
ARouter.getInstance().build("/user/sendRedPacket").withString("to_uid",toUid).navigation(activity,code)
}
fun testResultH5(testResultId: Int){
getTestsService().testH5Result(testResultId.toString())
}
fun testDetailH5(testId: Int){
getTestsService().testDetailH5(testId.toString());
}
fun receiveRedPacketIntent(activity: Activity, param: ReceiveRedPacketParam){
getAppService().receiverRedPacketIntent(activity, GsonProvider.getGson().toJson(param))
......
m-im/src/main/java/com/yidianling/im/session/viewholder/MsgViewHolderSendTest.java
......@@ -86,41 +86,41 @@ public class MsgViewHolderSendTest extends MsgViewHolderBase {
ToastUtil.toastShort("参数错误");
return;
}
try {
String[] strs = url111.split("/");
String containsId = strs[strs.length - 1];
try {
int id = Integer.parseInt(containsId.replaceAll("[^0-9]*", ""));
// ImIn.INSTANCE.TestDetailActivity(context,id);
// context.startActivity(ImIn.INSTANCE.testDetailIntent((Activity) context, id));
ImIn.INSTANCE.testDetailH5(id);
ActionHandlerStorage.needLoadNewMsg = true;
} catch (NumberFormatException e) {
e.printStackTrace();
}
} catch (Exception e) {
e.printStackTrace();
}
// try {
// String[] strs = url111.split("/");
// String containsId = strs[strs.length - 1];
// try {
// int id = Integer.parseInt(containsId.replaceAll("[^0-9]*", ""));
//// ImIn.INSTANCE.TestDetailActivity(context,id);
//// context.startActivity(ImIn.INSTANCE.testDetailIntent((Activity) context, id));
// ImIn.INSTANCE.testDetailH5(id);
// ActionHandlerStorage.needLoadNewMsg = true;
// } catch (NumberFormatException e) {
// e.printStackTrace();
// }
// } catch (Exception e) {
// e.printStackTrace();
// }
} else if (flag == CustomAttachmentTest.FLAG_RESULT) {//测试结果打开
try {
// H5Params h5Params = new H5Params(url, null);
// NewH5Activity.startForResult(((Activity) view.getContext()), h5Params, 44);
String[] strs = url.split("/");
String containsId = strs[strs.length - 1];
try {
int id = Integer.parseInt(containsId.replaceAll("[^0-9]*", ""));
// ImIn.INSTANCE.TestDetailActivity(context,id);
// context.startActivity(ImIn.INSTANCE.testDetailIntent((Activity) context, id));
// context.startActivity(ImIn.INSTANCE.testResultIntent((Activity) context, id));
ImIn.INSTANCE.testResultH5(id);
} catch (NumberFormatException e) {
e.printStackTrace();
}
} catch (Exception e) {
e.printStackTrace();
}
// try {
//// H5Params h5Params = new H5Params(url, null);
//// NewH5Activity.startForResult(((Activity) view.getContext()), h5Params, 44);
// String[] strs = url.split("/");
// String containsId = strs[strs.length - 1];
// try {
// int id = Integer.parseInt(containsId.replaceAll("[^0-9]*", ""));
//// ImIn.INSTANCE.TestDetailActivity(context,id);
//// context.startActivity(ImIn.INSTANCE.testDetailIntent((Activity) context, id));
//// context.startActivity(ImIn.INSTANCE.testResultIntent((Activity) context, id));
// ImIn.INSTANCE.testResultH5(id);
// } catch (NumberFormatException e) {
// e.printStackTrace();
// }
// } catch (Exception e) {
// e.printStackTrace();
// }
}
}
......
m-im/src/main/java/com/yidianling/im/ui/adapter/MsgListAdapter.java
......@@ -74,28 +74,28 @@ public class MsgListAdapter extends CommonAdapter<MsgData> {
switch (mDataList.get(position).type) {
case 1108:
case 1111:
context.startActivity(ImIn.INSTANCE.membersIntent(context, mDataList.get(position).relation_id));
// context.startActivity(ImIn.INSTANCE.membersIntent(context, mDataList.get(position).relation_id));
fla = true;
break;
case 1109://跳转到回复详情
case 1113:// 跳转到回复详情(有回复动态)
MsgData msgData = mDataList.get(position);
context.startActivity(ImIn.INSTANCE.replayInfoIntent(context, msgData.relation_id, msgData.relation_id2));
// MsgData msgData = mDataList.get(position);
// context.startActivity(ImIn.INSTANCE.replayInfoIntent(context, msgData.relation_id, msgData.relation_id2));
fla = true;
break;
case 1110:
context.startActivity(ImIn.INSTANCE.trendsDetailIntent(context, Integer.valueOf(mDataList.get(position).relation_id), true));
// context.startActivity(ImIn.INSTANCE.trendsDetailIntent(context, Integer.valueOf(mDataList.get(position).relation_id), true));
fla = true;
break;
case 1112:
String lastid = mDataList.get(position).relation_id2;
// String lastid = mDataList.get(position).relation_id2;
int trendId = Integer.valueOf(mDataList.get(position).relation_id.trim());
int lastId = TextUtils.isEmpty(lastid) ? 0 : Integer.valueOf(lastid.trim());
context.startActivity(ImIn.INSTANCE.trendsDetailIntent(context, trendId, true, lastId));
// int trendId = Integer.valueOf(mDataList.get(position).relation_id.trim());
// int lastId = TextUtils.isEmpty(lastid) ? 0 : Integer.valueOf(lastid.trim());
// context.startActivity(ImIn.INSTANCE.trendsDetailIntent(context, trendId, true, lastId));
fla = true;
break;
case 600: //跳转H5页面--课程详情
......
m-im/src/main/java/com/yidianling/im/ui/page/fragment/adapter/InteractAdapter.kt
......@@ -112,54 +112,54 @@ class InteractAdapter(var context: Context, private var mList: ArrayList<Interac
1107 -> {
} //讨论邀请
1108 -> { //1108 动态个人主页被点赞 1111 关注用户
context.startActivity(ImIn.membersIntent(context as Activity, bean.relationId1))
// context.startActivity(ImIn.membersIntent(context as Activity, bean.relationId1))
}
1111 -> { //1108 动态个人主页被点赞 1111 关注用户
context.startActivity(ImIn.membersIntent(context as Activity, bean.relationId1))
// context.startActivity(ImIn.membersIntent(context as Activity, bean.relationId1))
}
1109 -> { //1109 动态回复被点赞 1113 动态的评论被回复
context.startActivity(
ImIn.replayInfoIntent(
context as Activity,
bean.relationId1,
bean.remark
)
)
// context.startActivity(
// ImIn.replayInfoIntent(
// context as Activity,
// bean.relationId1,
// bean.remark
// )
// )
}
1113 -> { //1109 动态回复被点赞 1113 动态的评论被回复
context.startActivity(
ImIn.replayInfoIntent(
context as Activity,
bean.relationId1,
bean.remark
)
)
// context.startActivity(
// ImIn.replayInfoIntent(
// context as Activity,
// bean.relationId1,
// bean.remark
// )
// )
}
1110 -> { // 温暖 -> 评论详情
context.startActivity(
ImIn.trendsDetailIntent(
context as Activity,
Integer.valueOf(bean.relationId1)!!,
true
)
)
// context.startActivity(
// ImIn.trendsDetailIntent(
// context as Activity,
// Integer.valueOf(bean.relationId1)!!,
// true
// )
// )
}
1112 -> { // 收到评论 -> 评论详情
context.startActivity(
ImIn.trendsDetailIntent(
context as Activity,
Integer.valueOf(bean.relationId1)!!,
false
)
)
// context.startActivity(
// ImIn.trendsDetailIntent(
// context as Activity,
// Integer.valueOf(bean.relationId1)!!,
// false
// )
// )
}
1114 -> { // 访客 -> 专家首页
context.startActivity(
ImIn.membersIntent(
context as Activity,
bean.relationUid.toString()
)
)
// context.startActivity(
// ImIn.membersIntent(
// context as Activity,
// bean.relationUid.toString()
// )
// )
}
1115 -> {
} //专家主页被访问
......
m-im/src/main/java/com/yidianling/im/ui/page/widget/ChatUnusualView.kt
......@@ -6,7 +6,6 @@ import android.view.View
import android.widget.LinearLayout
import com.ydl.ydlcommon.modular.ModularServiceManager
import com.yidianling.consultant.api.IConsultantService
import com.yidianling.dynamic.api.IDynamicService
import com.yidianling.im.R
import kotlinx.android.synthetic.main.im_chat_unusual_view.view.*
......@@ -82,12 +81,12 @@ class ChatUnusualView constructor(private val mContext: Context, attrs: Attribut
TYPE_INTERACT_NO_DATA -> {
var unusualTxtStr = "这里好安静，先逛逛社区和大家互动一下吧"
var unusualBtnStr = "去「问答」逛逛"
if (!ModularServiceManager.isDependByClz(IDynamicService::class.java)){
if (ModularServiceManager.isDependByClz(IConsultantService::class.java)){
unusualTxtStr = "这里好安静，先找咨询师聊一下吧"
unusualBtnStr = "去「咨询」逛逛"
}
}
// if (!ModularServiceManager.isDependByClz(IDynamicService::class.java)){
// if (ModularServiceManager.isDependByClz(IConsultantService::class.java)){
// unusualTxtStr = "这里好安静，先找咨询师聊一下吧"
// unusualBtnStr = "去「咨询」逛逛"
// }
// }
unusual_txt.text = unusualTxtStr
unusual_btn.text = unusualBtnStr
unusual_btn.visibility = View.VISIBLE
......
m-im/src/main/java/com/yidianling/im/ui/view/SystemItemView.java
......@@ -181,34 +181,34 @@ public class SystemItemView extends LinearLayout {
return;
}
switch (uri.getHost()) {
case "topic":
if (!TextUtils.isEmpty(id)) {
ImIn.INSTANCE.topicDetailActivity((Activity)context, id);
}
break;
case "active":
if (!TextUtils.isEmpty(id)) {
context.startActivity(ImIn.INSTANCE.trendsDetailIntent((Activity) context, Integer.valueOf(id)));
}
break;
case "course":
if ("/special".equals(uri.getPath())) {
//课程专题页面
if (TextUtils.isEmpty(id)) {
return;
}
String courseId = id;
ImIn.INSTANCE.courseTopic((Activity) context, courseId);
} else {
ImIn.INSTANCE.mainIntent(context, 2);
}
break;
case "fm":
if (!TextUtils.isEmpty(id)) {
int fm_idi = Integer.valueOf(id);
context.startActivity(ImIn.INSTANCE.fmDetailIntent((Activity) context, fm_idi));
}
break;
// case "topic":
// if (!TextUtils.isEmpty(id)) {
// ImIn.INSTANCE.topicDetailActivity((Activity)context, id);
// }
// break;
// case "active":
// if (!TextUtils.isEmpty(id)) {
// context.startActivity(ImIn.INSTANCE.trendsDetailIntent((Activity) context, Integer.valueOf(id)));
// }
// break;
// case "course":
// if ("/special".equals(uri.getPath())) {
// //课程专题页面
// if (TextUtils.isEmpty(id)) {
// return;
// }
// String courseId = id;
// ImIn.INSTANCE.courseTopic((Activity) context, courseId);
// } else {
// ImIn.INSTANCE.mainIntent(context, 2);
// }
// break;
// case "fm":
// if (!TextUtils.isEmpty(id)) {
// int fm_idi = Integer.valueOf(id);
// context.startActivity(ImIn.INSTANCE.fmDetailIntent((Activity) context, fm_idi));
// }
// break;
case "confide":
//倾诉
if("/home".equals(uri.getPath())){
......
m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java
......@@ -52,8 +52,6 @@ import com.ydl.ydlcommon.modular.ModularServiceManager;
import com.ydl.ydlcommon.utils.AnimUtils;
import com.ydl.ydlcommon.utils.LogUtil;
import com.ydl.ydlcommon.utils.SharedPreferencesEditor;
import com.ydl.ydlcommon.utils.YdlBuryPointUtil;
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils;
import com.ydl.ydlcommon.utils.log.AliYunLogConfig;
import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper;
import com.ydl.ydlcommon.utils.log.LogHelper;
......@@ -321,7 +319,6 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
// rl_common_question_enter.postDelayed(() -> openOrCloseCommonQuestionLayout(true), 300);
} else {
try {
YdlBuryPointUtil.sendPv("common_question_pager");
} catch (Exception e) {
e.printStackTrace();
}
......@@ -1531,16 +1528,13 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
CommonDialog.create(getActivity())
.setLeftOnclick("返回", v -> {
getActivity().finish();
ActionCountUtils.Companion.count("under_age_alert_page|under_age_alert_return_click");
})
.setRightClick("继续", v -> {
SharedPreferencesEditor.putString("chat_age_ensure_" + ImIn.INSTANCE.getUserInfo().getUid(), "ensure");
ActionCountUtils.Companion.count("under_age_alert_page|under_age_alert_continue_clcik");
})
.setMessage("由于您未满16周岁，如需咨询需要在家长陪同下进行")
.setCancelAble(false)
.show();
ActionCountUtils.Companion.count("under_age_alert_page|under_age_alert_page_visit");
}
}
m-im/src/main/java/com/yidianling/uikit/business/session/view/CollectUserInformationView.kt
......@@ -20,7 +20,6 @@ import android.widget.ScrollView
import android.widget.TextView
import com.ydl.ydlcommon.utils.SharedPreferencesEditor
import com.ydl.ydlcommon.utils.Utils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.ydl.ydlcommon.view.dialog.CommonDialog
import com.yidianling.common.tools.RxImageTool
import com.yidianling.common.tools.ToastUtil
......@@ -346,7 +345,6 @@ class CollectUserInformationView(
.setLeftOnclick("返回") {
backEvent()
ensureAgeDialog!!.dismiss()
ActionCountUtils.count("under_age_alert_page|under_age_alert_return_click")
}
.setRightClick("继续") {
SharedPreferencesEditor.putString(
......@@ -355,7 +353,6 @@ class CollectUserInformationView(
)
sendMsgEvent(content, list)
ensureAgeDialog!!.dismiss()
ActionCountUtils.count("under_age_alert_page|under_age_alert_continue_clcik")
}
.setMessage("由于您未满16周岁，如需咨询需要在家长陪同下进行")
.setTitle_color(R.color.im_color_242424)
......@@ -363,7 +360,6 @@ class CollectUserInformationView(
}
if (!ensureAgeDialog!!.isShowing) {
ensureAgeDialog!!.show()
ActionCountUtils.count("under_age_alert_page|under_age_alert_page_visit")
}
}
......
m-tests/src/main/java/com/yidianling/tests/home/NewTestHomeActivity.kt
......@@ -2,7 +2,6 @@ package com.yidianling.tests.home
import com.alibaba.android.arouter.facade.annotation.Route
import com.channel.ydl_flutter_base.base.BaseFlutterActivity
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.yidianling.tests.home.config.TestBIConstants
import com.yidianling.tests.home.plugin.TestPlugin
import org.json.JSONObject
......@@ -23,6 +22,5 @@ class NewTestHomeActivity : BaseFlutterActivity() {
override fun onResume() {
super.onResume()
ActionCountUtils.count(TestBIConstants.YDL_TEST_MAIN_PAGE_VISIT)
}
}
\ No newline at end of file
m-tests/src/main/java/com/yidianling/tests/home/plugin/TestPlugin.kt
......@@ -9,7 +9,6 @@ import com.ydl.ydl_router.manager.YDLRouterManager
import com.ydl.ydl_router.manager.YDLRouterParams
import com.ydl.ydlcommon.base.config.HttpConfig
import com.ydl.ydlcommon.router.IYDLRouterConstant
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.yidianling.tests.home.config.TestBIConstants
import com.yidianling.tests.list.view.TestCategoryListActivity
import com.yidianling.tests.router.TestsIn
......@@ -57,11 +56,9 @@ class TestPlugin : MethodChannel.MethodCallHandler {
override fun onMethodCall(methodCall: MethodCall, result: MethodChannel.Result) {
when (methodCall.method) {
GO_BACK -> {
// ActionCountUtils.count(TestBIConstants.YDL_TEST_MAIN_RETURN_CLICK)
mActivity?.finish()
}
GO_SEARCH -> {
// ActionCountUtils.count(TestBIConstants.YDL_TEST_MAIN_SEARCH_CLICK)
mActivity?.let {
TestSearchActivity.start(mActivity!!)
}
......@@ -82,7 +79,6 @@ class TestPlugin : MethodChannel.MethodCallHandler {
linkUrl?.let {
link(linkUrl)
}
// ActionCountUtils.count(TestBIConstants.YDL_TEST_MAIN_BANNER_CLICK,linkUrl?:"")
}
CATEGORY_CLICK -> {
......@@ -90,12 +86,10 @@ class TestPlugin : MethodChannel.MethodCallHandler {
var tabName: String = methodCall.argument<String>("tabName")?:""
TestCategoryListActivity.start(mActivity!!, tabName)
// ActionCountUtils.count(TestBIConstants.YDL_TEST_MAIN_ICON_CLICK,tabName)
}
}
ADVERT_CLICK -> {
// ActionCountUtils.count(TestBIConstants.YDL_TEST_MAIN_SCROLL_BAR_CLICK)
var linkUrl: String? = methodCall.argument<String>("linkUrl")
linkUrl?.let {
......@@ -104,14 +98,12 @@ class TestPlugin : MethodChannel.MethodCallHandler {
}
TEST_LIST_ITEM_CLICK -> {
var linkUrl: String? = methodCall.arguments.toString()
// ActionCountUtils.count(TestBIConstants.YDL_TEST_MAIN_ALL_TEST_LIST_CLICK,linkUrl?:"")
linkUrl?.let {
link(linkUrl)
}
}
LOOK_ALL_TEST -> {
// ActionCountUtils.count(TestBIConstants.YDL_TEST_MAIN_VIEW_ALL_CLICK)
mActivity?.let {
TestCategoryListActivity.start(mActivity!!)
......
m-user/src/main/java/com/yidianling/user/LoginUtils.kt
......@@ -6,8 +6,11 @@ import com.tencent.bugly.crashreport.CrashReport
import com.ydl.ydlcommon.data.http.RxUtils
import com.ydl.ydlcommon.utils.ActivityManager
import com.ydl.ydlcommon.utils.BuryPointUtils
import com.ydl.ydlcommon.utils.LogUtil
import com.ydl.ydlcommon.utils.log.AliYunLogConfig
import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper
import com.yidianling.im.api.bean.IMLoginInfo
import com.yidianling.im.api.bean.IMRequestCallback
import com.yidianling.user.api.bean.UserResponseBean
import com.yidianling.user.api.event.UserLoginEvent
import com.yidianling.user.api.event.UserLogoutEvent
......@@ -39,12 +42,41 @@ object LoginUtils {
@JvmStatic
fun onLogin(userInfo: UserResponseBean?) {
//登录IM聊天
loginIm(userInfo)
//设置极光注册id
LoginHelper.setChannelId()
val loginEvent = UserLoginEvent("login", userInfo?.uid!!)
EventBus.getDefault().post(loginEvent)
BuryPointUtils.bindUid(userInfo?.uid ?: "")
}
private fun loginIm(userInfo: UserResponseBean?) {
val info = IMLoginInfo(userInfo?.uid ?: "", userInfo?.hxpwd ?: "")
val callback = object : IMRequestCallback<IMLoginInfo> {
override fun onSuccess(t: IMLoginInfo?) {
LogUtil.e("IM登录成功：" + "info.account:" + info.account + "info.passWord" + info.passWord)
UserIn.imSetAccount(userInfo?.uid ?: "")
AliYunRichLogsHelper.getInstance().sendRichLog(AliYunLogConfig.LOGIN, "IM登录成功")
}
override fun onFailed(i: Int) {
LogUtil.e("IM登录失败：$i" + "info.account:" + info.account + "info.passWord" + info.passWord)
AliYunRichLogsHelper.getInstance().sendRichLog(AliYunLogConfig.LOGIN, "IM登录失败")
}
override fun onException(throwable: Throwable?) {
LogUtil.e("IM登录onException：${throwable?.message}")
AliYunRichLogsHelper.getInstance()
.sendRichLog(AliYunLogConfig.LOGIN, "IM登录onException：${throwable?.message}")
}
}
UserIn.imSetAccount(info.account)
UserIn.imLogin(info, callback)
}
@JvmStatic
fun logout() {
......
m-user/src/main/java/com/yidianling/user/http/UserApi.kt
......@@ -22,7 +22,7 @@ interface UserApi {
//登录
@FormUrlEncoded
@POST("api/user/user")
@POST("user/user")
fun login(@FieldMap params: Map<String, String>): Observable<BaseResponse<UserResponseBean>>
//国家列表
......@@ -32,31 +32,31 @@ interface UserApi {
//判断手机号是否存在
@FormUrlEncoded
@POST("api/user/phone-exist")
@POST("user/phone-exist")
fun phoneExists(@FieldMap params: Map<String, String>): Observable<BaseResponse<ExistResponse>>
//获取验证码
@FormUrlEncoded
@POST("api/user/chk-code")
@POST("user/chk-code")
fun getCode(@FieldMap params: Map<String, String>): Observable<BaseResponse<Any>>
//绑定手机号
@FormUrlEncoded
@POST("api/user/bind-phone")
@POST("user/bind-phone")
fun bindPhone(@FieldMap params: Map<String, String>): Observable<BaseResponse<UserResponseBean>>
//忘记密码
@FormUrlEncoded
@POST("api/user/forget")
@POST("user/forget")
fun forget(@FieldMap params: Map<String, String>): Observable<BaseResponse<Any>>
//注册
@FormUrlEncoded
@POST("api/user/reg")
@POST("user/reg")
fun register(@FieldMap params: Map<String, String>): Observable<BaseResponse<Any>>
//设置推送的channelId
@POST("api/user/device/modify")
@POST("user/device/modify")
@Headers( YDL_DOMAIN + YDL_DOMAIN_JAVA)
fun setChannelId(@Body body: RequestBody): Observable<BaseResponse<LinkedTreeMap<String, String>>>
......@@ -64,58 +64,58 @@ interface UserApi {
//设置用户信息
@FormUrlEncoded
@POST("api/user/set-info")
@POST("user/set-info")
fun setUserInfo(@FieldMap params: Map<String, String>): Observable<BaseResponse<Any>>
//上传头像
@Multipart
@POST("api/user/set-info")
@POST("user/set-info")
fun uploadHeadImg(@PartMap params: MutableMap<String, RequestBody>): Observable<BaseResponse<Any>>
//上传头像
@Multipart
@POST("api/user/set-info")
@POST("user/set-info")
fun uploadHeadImg(@Part("type") param: RequestBody): Observable<BaseResponse<Any>>
//验证账号密码
@FormUrlEncoded
@POST("api/user/chkin-pass")
@POST("user/chkin-pass")
fun checkPhonePass(@FieldMap params: Map<String, String>): Observable<BaseResponse<CheckPassword>>
//绑定QQ
@FormUrlEncoded
@POST("api/user/bind-qq")
@POST("user/bind-qq")
fun bindQQ(@FieldMap params: Map<String, String>): Observable<BaseResponse<Any>>
//绑定微信
@FormUrlEncoded
@POST("api/user/bind-wx")
@POST("user/bind-wx")
fun bindWx(@FieldMap params: Map<String, String>): Observable<BaseResponse<Any>>
//登出
@FormUrlEncoded
@POST("api/user/logout")
@POST("user/logout")
fun logout(@FieldMap params: Map<String, String>): Observable<BaseResponse<Any>>
//更换手机时密码验证
@FormUrlEncoded
@POST("api/user/confirm-pwd")
@POST("user/confirm-pwd")
fun checkPwd(@FieldMap params: Map<String, String>): Observable<BaseResponse<Any>>
//更换手机时最后校验验证码和手机
@FormUrlEncoded
@POST("api/user/replace-mob")
@POST("user/replace-mob")
fun changePhone(@FieldMap params: Map<String, String>): Observable<BaseResponse<Any>>
//同意隐私政策接口
@GET("api/user/agreePrivacyAgreement")
@GET("user/agreePrivacyAgreement")
@Headers( YDL_DOMAIN+ YDL_DOMAIN_JAVA)
fun privacyAgree(@Query("uid") uid: String): Observable<BaseResponse<Any>>
//服务端校验阿里一键认证
@POST("api/phone/verification/init")
@POST("phone/verification/init")
fun checkAliAuth(@Body body: RequestBody): Observable<BaseResponse<PhoneAuthResponseBean>>
//获取隐私政策数据
......@@ -124,42 +124,42 @@ interface UserApi {
//获取红包单号
@FormUrlEncoded
@POST("api/uc/ready-bonus")
@POST("uc/ready-bonus")
fun getRedPacketId(@FieldMap params: Map<String, String>): Observable<BaseResponse<RedPacketId>>
//上传用户信息数据接口
@POST("api/user/collect/submit")
@POST("user/collect/submit")
@Headers( YDL_DOMAIN+ YDL_DOMAIN_JAVA)
fun uploadUserInfo(@Body body: RequestBody): Observable<BaseAPIResponse<Any>>
//获取关注问题数据接口
@GET("api/cate/list-parentId")
@GET("cate/list-parentId")
@Headers( YDL_DOMAIN+ YDL_DOMAIN_JAVA)
fun getFocusData(@Query("parentId") parentId: String = "0"): Observable<BaseAPIResponse<List<CollectFocusItemBean>>>
//获取新用户引导页面url
@FormUrlEncoded
@POST("api/user/getNewUserJumpUrl")
@POST("user/getNewUserJumpUrl")
@Headers( YDL_DOMAIN+ YDL_DOMAIN_JAVA)
fun getNewUserJumpUrl(@FieldMap params: Map<String, String>): Observable<BaseAPIResponse<String>> //获取新用户引导页面url
//第三方登录获取用户信息
@POST("api/login/v2/login_wechat_qq")
@POST("login/v2/login_wechat_qq")
@Headers( YDL_DOMAIN+ YDL_DOMAIN_LOGIN_BASE_URL,LOGIN_USER_PORT)
fun thirdPartJavaLogin(@Body body: RequestBody): Observable<BaseResponse<UserResponseBean>>
/**
* 绑定手机号
*/
@POST("api/login/v2/bind_phone")
@POST("login/v2/bind_phone")
@Headers(YDL_DOMAIN+ YDL_DOMAIN_LOGIN_BASE_URL, LOGIN_USER_PORT)
fun bindPhone(@Body body: RequestBody): Observable<BaseResponse<Any>>
/**
* 一键登录和本机号码校验
*/
@POST("api/login/v2/login_direct")
@POST("login/v2/login_direct")
@Headers( YDL_DOMAIN+ YDL_DOMAIN_LOGIN_BASE_URL, LOGIN_USER_PORT)
fun autoLogin(@Body body: RequestBody): Observable<BaseResponse<UserResponseBean>>
......@@ -167,63 +167,63 @@ interface UserApi {
/**
* 密码登录
*/
@POST("api/login/v2/login_pwd")
@POST("login/v2/login_pwd")
@Headers( YDL_DOMAIN+ YDL_DOMAIN_LOGIN_BASE_URL,LOGIN_USER_PORT)
fun loginByPassword(@Body body: RequestBody): Observable<BaseResponse<UserResponseBean>>
/**
* 验证码登录
*/
@POST("api/login/v2/login_sms")
@POST("login/v2/login_sms")
@Headers( YDL_DOMAIN+ YDL_DOMAIN_LOGIN_BASE_URL,LOGIN_USER_PORT)
fun loginByMsgCode(@Body body: RequestBody): Observable<BaseResponse<UserResponseBean>>
/**
* 第三方登录
*/
@POST("api/login/v2/login_wechat_qq")
@POST("login/v2/login_wechat_qq")
@Headers( YDL_DOMAIN+ YDL_DOMAIN_LOGIN_BASE_URL,LOGIN_USER_PORT)
fun thirdPartyLogin(@Body body: RequestBody): Observable<BaseAPIResponse<UserResponseBean>>
/**
* 检查手机号来源
*/
@GET("api/login/v2/phone_detection")
@GET("login/v2/phone_detection")
@Headers(YDL_DOMAIN+ YDL_DOMAIN_LOGIN_BASE_URL,LOGIN_USER_PORT)
fun checkPhoneStatus(@Query("phone") phone: String, @Query("countryCode") countryCode: String): Observable<BaseResponse<ChcekPhoneResponeBean>>
/**
* 验证重置密码的短信验证码
*/
@GET("api/login/v2/pre_check_reset_sms")
@GET("login/v2/pre_check_reset_sms")
@Headers( YDL_DOMAIN+ YDL_DOMAIN_LOGIN_BASE_URL,LOGIN_USER_PORT)
fun checkResetCode(@Query("phone") phone: String, @Query("countryCode") countryCode: String, @Query("code") code: String): Observable<BaseResponse<Any>>
/**
* 重置密码
*/
@POST("api/login/v2/reset_pwd")
@POST("login/v2/reset_pwd")
@Headers( YDL_DOMAIN+ YDL_DOMAIN_LOGIN_BASE_URL, LOGIN_USER_PORT)
fun resetPwd(@Body body: RequestBody): Observable<BaseResponse<UserResponseBean>>
/**
* 发送登录验证码
*/
@GET("api/login/v2/send_login_sms")
@GET("login/v2/send_login_sms")
@Headers( YDL_DOMAIN+ YDL_DOMAIN_LOGIN_BASE_URL, LOGIN_USER_PORT)
fun sendLoginMsgCode(@Query("phone") phone: String, @Query("countryCode") countryCode: String): Observable<BaseResponse<Any>>
/**
* 发送忘记密码重置密码的验证码
*/
@GET("api/login/v2/send_reset_sms")
@GET("login/v2/send_reset_sms")
@Headers( YDL_DOMAIN+ YDL_DOMAIN_LOGIN_BASE_URL,LOGIN_USER_PORT)
fun sendResetCode(@Query("phone") phone: String, @Query("countryCode") countryCode: String): Observable<BaseResponse<Any>>
/**
* 第三方登录解绑
*/
@POST("api/login/v2/unbind_wechat_qq")
@POST("login/v2/unbind_wechat_qq")
@Headers( YDL_DOMAIN+ YDL_DOMAIN_LOGIN_BASE_URL,LOGIN_USER_PORT)
fun unBindThirdLogin(@Body body: RequestBody): Observable<BaseResponse<Any>>
......@@ -231,14 +231,14 @@ interface UserApi {
* 用户注销账号
*/
@FormUrlEncoded
@POST("api/user/forbid_login")
@POST("user/forbid_login")
@Headers( YDL_DOMAIN+ YDL_DOMAIN_JAVA)
fun userForbidLogin(@FieldMap params: Map<String, String>): Observable<BaseAPIResponse<Boolean>>
/**
* 是否需要强绑定手机号
*/
@POST("api/login/v2/is_need_strong_bind")
@POST("login/v2/is_need_strong_bind")
@Headers( YDL_DOMAIN+ YDL_DOMAIN_LOGIN_BASE_URL, LOGIN_USER_PORT)
fun isNeedForceBindPhone(@Body map: Map<String,String>): Observable<BaseAPIResponse<Boolean>>
}
\ No newline at end of file
ydl-flutter-base/src/main/java/com/channel/ydl_flutter_base/plugin/YDLCommonPlugin.kt
......@@ -15,8 +15,6 @@ import com.ydl.ydlcommon.router.YdlCommonOut
import com.ydl.ydlcommon.utils.LogUtil
import com.ydl.ydlcommon.utils.SharedPreferencesEditor
import com.ydl.ydlcommon.utils.YDLCacheUtils
import com.ydl.ydlcommon.utils.YdlBuryPointUtil
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.yidianling.common.tools.RxDeviceTool
import de.greenrobot.event.EventBus
import io.flutter.app.FlutterActivity
......@@ -141,16 +139,13 @@ class YDLCommonPlugin : MethodChannel.MethodCallHandler {
LogUtil.e("flutter click exception:$e")
}
YdlBuryPointUtil.sendClick(MD5Util.md5(clickPath))
}
}
ACTION_PUSH_EVENT_TRACKING_PV -> {
val map = methodCall.arguments as HashMap<*, *>
val pvPath = map["path"] as String
if (!TextUtils.isEmpty(pvPath)) {
YdlBuryPointUtil.sendPv(pvPath)
}
}
ACTION_ORIGIN_THEME -> {
val mMap = mutableMapOf<String, String>()
......@@ -202,7 +197,6 @@ class YDLCommonPlugin : MethodChannel.MethodCallHandler {
val partId = map["partId"] as String
val sign = map["sign"] as String
ActionCountUtils.count("$partId|$position", sign)
}
PAGE_GO_BACK -> {
......
ydl-platform/src/main/res/raw/api.properties
......@@ -46,10 +46,10 @@ javaurl.auto_test = https://auto_testapi.ydl.com/
javaurl.prod = https://api.ydl.com/
#java服务器api统一域名
javaapi.new_test = https://ydltestapi.ydl.com/
javaapi.test = https://testapi.ydl.com/
javaapi.auto_test = https://auto_testapi.ydl.com/
javaapi.prod = https://api.ydl.com/
javaapi.new_test = https://ydltestapi.ydl.com/api/
javaapi.test = https://testapi.ydl.com/api/
javaapi.auto_test = https://auto_testapi.ydl.com/api/
javaapi.prod = https://api.ydl.com/api/
# 网关加密的appKey和appSecret
appKey.new_test = 20BB42485BD448DE888DD745899C457D
......
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