Commit dc374e9e by 万齐军

Merge branch 'd/4.4.10' into 'feat/qj/net_quality'

# Conflicts:
#   build.gradle
parents cf35b08b c2689a91
...@@ -14,7 +14,7 @@ buildscript { ...@@ -14,7 +14,7 @@ buildscript {
ydlrouter_version = '1.2.3' ydlrouter_version = '1.2.3'
constrait_support_version = '1.0.2' constrait_support_version = '1.0.2'
componentVersion = "0.3.0.47.12-SNAPSHOT" componentVersion = "0.3.0.44"
} }
repositories { repositories {
mavenCentral() mavenCentral()
......
...@@ -164,7 +164,7 @@ ext { ...@@ -164,7 +164,7 @@ ext {
"blankUtil" : "com.blankj:utilcode:1.25.9", "blankUtil" : "com.blankj:utilcode:1.25.9",
"ydl-hnet" : "com.ydl:h-net:0.0.8", "ydl-hnet" : "com.ydl:h-net:0.0.8",
"ydl-user-router" : "com.ydl:router:1.0.0-SNAPSHOT@aar", "ydl-user-router" : "com.ydl:router:1.0.0-SNAPSHOT@aar",
"ydl-device" : "com.ydl:device-id:0.0.34", "ydl-device" : "com.ydl:device-id:0.0.35",
//flutter功能组件升级===>发布ydl-flutter组件===>引用flutter相关的业务模块 //flutter功能组件升级===>发布ydl-flutter组件===>引用flutter相关的业务模块
"ydl-flutter" : "com.ydl:ydl-flutter:0.0.57@aar", //flutter aar "ydl-flutter" : "com.ydl:ydl-flutter:0.0.57@aar", //flutter aar
// "ydl-flutter-sp" : "com.ydl:ydl-flutter-sp:0.0.2@aar", //flutter 缓存 aar // "ydl-flutter-sp" : "com.ydl:ydl-flutter-sp:0.0.2@aar", //flutter 缓存 aar
......
package com.yidianling.consultant.ui.view.topView package com.yidianling.consultant.ui.view.topView
import android.app.Activity
import android.content.Context import android.content.Context
import android.util.AttributeSet import android.util.AttributeSet
import android.view.View import android.view.View
...@@ -21,8 +20,6 @@ import com.yidianling.consultant.listener.OnCategoriesSelectedListener ...@@ -21,8 +20,6 @@ import com.yidianling.consultant.listener.OnCategoriesSelectedListener
import com.yidianling.consultant.model.bean.AllFilter import com.yidianling.consultant.model.bean.AllFilter
import com.yidianling.consultant.model.bean.ChildrenBean import com.yidianling.consultant.model.bean.ChildrenBean
import com.yidianling.consultant.model.bean.EightCategoryBean import com.yidianling.consultant.model.bean.EightCategoryBean
import kotlinx.android.synthetic.main.consultant_expert_search_big_shot_one.view.*
import kotlinx.android.synthetic.main.consultant_layout_category_view.*
import kotlinx.android.synthetic.main.consultant_layout_category_view.view.* import kotlinx.android.synthetic.main.consultant_layout_category_view.view.*
class EightCategoryView : LinearLayout, CategoryDetailAdapter.OutAdapterClicklistener, class EightCategoryView : LinearLayout, CategoryDetailAdapter.OutAdapterClicklistener,
...@@ -145,7 +142,7 @@ class EightCategoryView : LinearLayout, CategoryDetailAdapter.OutAdapterClicklis ...@@ -145,7 +142,7 @@ class EightCategoryView : LinearLayout, CategoryDetailAdapter.OutAdapterClicklis
category_detail.layoutManager = leftmanager category_detail.layoutManager = leftmanager
category_detail.adapter = categoryRightAdapter category_detail.adapter = categoryRightAdapter
mutableList.forEachIndexed { index, mutable -> mutableList.forEachIndexed { index, mutable ->
if (mutable[0].isSelected) { if (mutable.size > 0 && mutable[0].isSelected) {
eightCategoryListBean.get(index).hasData = true eightCategoryListBean.get(index).hasData = true
return@forEachIndexed return@forEachIndexed
} }
......
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