Commit f69402af by konghaorui

consultant 业务模块 - 资源文件前缀修改

parent 3e843120
...@@ -2,6 +2,14 @@ apply plugin: 'com.android.library' ...@@ -2,6 +2,14 @@ apply plugin: 'com.android.library'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-kapt'
apply plugin: 'plugin.resTools' // 资源重命名插件
// 配置资源重命名插件
resConfig {
new_prefix = 'consultant_' // 资源前缀
old_prefix = '' // 老前缀,可为''空字符串
}
kapt { kapt {
arguments { arguments {
arg("AROUTER_MODULE_NAME", "consultant") arg("AROUTER_MODULE_NAME", "consultant")
...@@ -35,6 +43,10 @@ android { ...@@ -35,6 +43,10 @@ android {
} }
} }
//前缀的名字
resourcePrefix "consultant_"
//Flavor 信息
publishNonDefault true publishNonDefault true
productFlavors { productFlavors {
ydl {} ydl {}
...@@ -71,7 +83,4 @@ dependencies { ...@@ -71,7 +83,4 @@ dependencies {
transitive = true transitive = true
} }
} }
} }
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
android:name=".ExpertSearchActivity" android:name=".ExpertSearchActivity"
android:launchMode="singleTask" android:launchMode="singleTask"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/platform_NoTitleTheme"/> android:theme="@style/consultant_NoTitleTheme"/>
<activity <activity
android:name=".HotSearchActivity" android:name=".HotSearchActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/platform_NoTitleTheme"/> android:theme="@style/consultant_NoTitleTheme"/>
</application> </application>
</manifest> </manifest>
\ No newline at end of file
...@@ -55,11 +55,11 @@ import com.yidianling.consultant.ui.view.AreaPopupWindow ...@@ -55,11 +55,11 @@ import com.yidianling.consultant.ui.view.AreaPopupWindow
import com.yidianling.consultant.ui.view.CategoryPopupWindow import com.yidianling.consultant.ui.view.CategoryPopupWindow
import com.yidianling.consultant.ui.view.FilterPopupWindow import com.yidianling.consultant.ui.view.FilterPopupWindow
import com.yidianling.consultant.ui.view.SortPopupWindow import com.yidianling.consultant.ui.view.SortPopupWindow
import kotlinx.android.synthetic.main.activity_expert_search_list.* import kotlinx.android.synthetic.main.consultant_activity_expert_search_list.*
import kotlinx.android.synthetic.main.item_filter_online.view.* import kotlinx.android.synthetic.main.consultant_item_filter_online.view.*
import kotlinx.android.synthetic.main.layout_search_content.* import kotlinx.android.synthetic.main.consultant_layout_search_content.*
import kotlinx.android.synthetic.main.layout_search_head_bg.* import kotlinx.android.synthetic.main.consultant_layout_search_head_bg.*
import kotlinx.android.synthetic.main.layout_search_toolbar.* import kotlinx.android.synthetic.main.consultant_layout_search_toolbar.*
import org.json.JSONObject import org.json.JSONObject
import java.util.concurrent.Executors import java.util.concurrent.Executors
...@@ -80,7 +80,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres ...@@ -80,7 +80,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
} }
override fun layoutResId(): Int { override fun layoutResId(): Int {
return R.layout.activity_expert_search_list return R.layout.consultant_activity_expert_search_list
} }
override fun initDataAndEvent() { override fun initDataAndEvent() {
...@@ -389,7 +389,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres ...@@ -389,7 +389,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
} }
} }
} }
banner_search.setImageLoader(GlideImageLoader(R.drawable.expert_banner_default)).setImages(bannerList).start() banner_search.setImageLoader(GlideImageLoader(R.drawable.consultant_expert_banner_default)).setImages(bannerList).start()
banner_search.setIndicatorBottomPadding(20) banner_search.setIndicatorBottomPadding(20)
} }
...@@ -467,7 +467,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres ...@@ -467,7 +467,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
val popWidth = RxDeviceTool.getScreenWidth(mContext) val popWidth = RxDeviceTool.getScreenWidth(mContext)
val mWidth = (popWidth - RxImageTool.dp2px(10f)) / hotData.size val mWidth = (popWidth - RxImageTool.dp2px(10f)) / hotData.size
for ((index, hot) in hotData!!.withIndex()) { for ((index, hot) in hotData!!.withIndex()) {
val tv = View.inflate(mContext, R.layout.item_filter_online, null) as TextView val tv = View.inflate(mContext, R.layout.consultant_item_filter_online, null) as TextView
val textView = tv.tvFree val textView = tv.tvFree
val params = LinearLayout.LayoutParams(0, RxImageTool.dp2px(22f)) val params = LinearLayout.LayoutParams(0, RxImageTool.dp2px(22f))
params.weight = 1f params.weight = 1f
...@@ -844,7 +844,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres ...@@ -844,7 +844,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
isRecommend = false isRecommend = false
if (curPage == 1) { if (curPage == 1) {
v_loading.setViewType(LogoLoadingView.TYPE_NET_LOSS, getString(R.string.reload_hint)) v_loading.setViewType(LogoLoadingView.TYPE_NET_LOSS, getString(R.string.consultant_reload_hint))
v_loading.visibility = View.VISIBLE v_loading.visibility = View.VISIBLE
ll_network_error.visibility = View.GONE ll_network_error.visibility = View.GONE
...@@ -875,7 +875,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres ...@@ -875,7 +875,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
if (msg != null) { if (msg != null) {
ToastUtil.toastShort(msg) ToastUtil.toastShort(msg)
} }
v_loading.setViewType(LogoLoadingView.TYPE_NET_LOSS, getString(R.string.reload_hint)) v_loading.setViewType(LogoLoadingView.TYPE_NET_LOSS, getString(R.string.consultant_reload_hint))
v_loading.visibility = View.VISIBLE v_loading.visibility = View.VISIBLE
ll_network_error.visibility = View.GONE ll_network_error.visibility = View.GONE
...@@ -1424,7 +1424,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres ...@@ -1424,7 +1424,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
} }
FILTER_STATUS_FILTERED -> { FILTER_STATUS_FILTERED -> {
tv.typeface = Typeface.DEFAULT_BOLD tv.typeface = Typeface.DEFAULT_BOLD
tv.setTextColor(ContextCompat.getColor(this, R.color.main_theme)) tv.setTextColor(ContextCompat.getColor(this, R.color.consultant_main_theme))
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_ic_arrow_drop_down_grey_500_18dp, 0) tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_ic_arrow_drop_down_grey_500_18dp, 0)
} }
FILTER_STATUS_OPEN -> { FILTER_STATUS_OPEN -> {
......
...@@ -31,8 +31,8 @@ import com.yidianling.consultant.bean.HotSearchPopularDoctorBean ...@@ -31,8 +31,8 @@ import com.yidianling.consultant.bean.HotSearchPopularDoctorBean
import com.yidianling.consultant.contract.IHotSearchContract import com.yidianling.consultant.contract.IHotSearchContract
import com.yidianling.consultant.modular.utils.TempH5RouteUtils import com.yidianling.consultant.modular.utils.TempH5RouteUtils
import com.yidianling.consultant.presenter.HotSearchPresenterImpl import com.yidianling.consultant.presenter.HotSearchPresenterImpl
import kotlinx.android.synthetic.main.activity_hot_search.* import kotlinx.android.synthetic.main.consultant_activity_hot_search.*
import kotlinx.android.synthetic.main.item_expert_hot_search.view.* import kotlinx.android.synthetic.main.consultant_item_expert_hot_search.view.*
@Route(path = "/consult/hot_search") @Route(path = "/consult/hot_search")
class HotSearchActivity : BaseMvpActivity<IHotSearchContract.View,IHotSearchContract.Presenter>(), IHotSearchContract.View { class HotSearchActivity : BaseMvpActivity<IHotSearchContract.View,IHotSearchContract.Presenter>(), IHotSearchContract.View {
...@@ -51,7 +51,7 @@ class HotSearchActivity : BaseMvpActivity<IHotSearchContract.View,IHotSearchCont ...@@ -51,7 +51,7 @@ class HotSearchActivity : BaseMvpActivity<IHotSearchContract.View,IHotSearchCont
private var dp42: Int = 0 private var dp42: Int = 0
override fun layoutResId(): Int { override fun layoutResId(): Int {
return R.layout.activity_hot_search return R.layout.consultant_activity_hot_search
} }
override fun createPresenter(): IHotSearchContract.Presenter { override fun createPresenter(): IHotSearchContract.Presenter {
...@@ -155,7 +155,7 @@ class HotSearchActivity : BaseMvpActivity<IHotSearchContract.View,IHotSearchCont ...@@ -155,7 +155,7 @@ class HotSearchActivity : BaseMvpActivity<IHotSearchContract.View,IHotSearchCont
llHotSearch.visibility = View.VISIBLE llHotSearch.visibility = View.VISIBLE
flHotSearch.removeAllViews() flHotSearch.removeAllViews()
for (index in keywordData.indices) { for (index in keywordData.indices) {
val view = LayoutInflater.from(this).inflate(R.layout.item_expert_hot_search, flHotSearch, false) val view = LayoutInflater.from(this).inflate(R.layout.consultant_item_expert_hot_search, flHotSearch, false)
view.tvHotSearch.text = keywordData[index].keyword view.tvHotSearch.text = keywordData[index].keyword
view.setOnClickListener { view.setOnClickListener {
etSearch.setText(keywordData[index].keyword) etSearch.setText(keywordData[index].keyword)
...@@ -175,7 +175,7 @@ class HotSearchActivity : BaseMvpActivity<IHotSearchContract.View,IHotSearchCont ...@@ -175,7 +175,7 @@ class HotSearchActivity : BaseMvpActivity<IHotSearchContract.View,IHotSearchCont
expertWidth = 0 expertWidth = 0
flHotExpert.removeAllViews() flHotExpert.removeAllViews()
for (index in hotSearchExpert.indices) { for (index in hotSearchExpert.indices) {
val view = LayoutInflater.from(this).inflate(R.layout.item_expert_hot_search, flHotSearch, false) val view = LayoutInflater.from(this).inflate(R.layout.consultant_item_expert_hot_search, flHotSearch, false)
view.tvHotSearch.text = hotSearchExpert[index].name view.tvHotSearch.text = hotSearchExpert[index].name
if (!TextUtils.isEmpty(hotSearchExpert[index].name)) { if (!TextUtils.isEmpty(hotSearchExpert[index].name)) {
expertWidth += getTextContentWidth(view.findViewById(R.id.tvHotSearch), if (hotSearchExpert[index].name!!.length > 7) hotSearchExpert[index].name!!.substring(0, 8) else hotSearchExpert[index].name!!) + dp42 expertWidth += getTextContentWidth(view.findViewById(R.id.tvHotSearch), if (hotSearchExpert[index].name!!.length > 7) hotSearchExpert[index].name!!.substring(0, 8) else hotSearchExpert[index].name!!) + dp42
...@@ -215,7 +215,7 @@ class HotSearchActivity : BaseMvpActivity<IHotSearchContract.View,IHotSearchCont ...@@ -215,7 +215,7 @@ class HotSearchActivity : BaseMvpActivity<IHotSearchContract.View,IHotSearchCont
TempH5RouteUtils.tempH5Route(focusList[it].linkUrl) TempH5RouteUtils.tempH5Route(focusList[it].linkUrl)
} }
} }
banner.setImageLoader(GlideImageLoader(R.drawable.expert_banner_default)).setImages(bannerList).start() banner.setImageLoader(GlideImageLoader(R.drawable.consultant_expert_banner_default)).setImages(bannerList).start()
banner.setIndicatorBottomPadding(5) banner.setIndicatorBottomPadding(5)
} }
...@@ -231,7 +231,7 @@ class HotSearchActivity : BaseMvpActivity<IHotSearchContract.View,IHotSearchCont ...@@ -231,7 +231,7 @@ class HotSearchActivity : BaseMvpActivity<IHotSearchContract.View,IHotSearchCont
if (historyList.size > 0) { if (historyList.size > 0) {
for (historyStr in historyList.reversed()) { for (historyStr in historyList.reversed()) {
val view = LayoutInflater.from(this).inflate(R.layout.item_expert_hot_search, flHotSearch, false) val view = LayoutInflater.from(this).inflate(R.layout.consultant_item_expert_hot_search, flHotSearch, false)
view.tvHotSearch.text = historyStr view.tvHotSearch.text = historyStr
historyCurrentWidth += getTextContentWidth(view.findViewById(R.id.tvHotSearch), historyCurrentWidth += getTextContentWidth(view.findViewById(R.id.tvHotSearch),
if (historyStr.length > 7) historyStr.substring(0, 8) else historyStr) + RxImageTool.dp2px(50f) if (historyStr.length > 7) historyStr.substring(0, 8) else historyStr) + RxImageTool.dp2px(50f)
......
...@@ -8,7 +8,7 @@ import android.view.ViewGroup ...@@ -8,7 +8,7 @@ import android.view.ViewGroup
import android.widget.TextView import android.widget.TextView
import com.yidianling.consultant.R import com.yidianling.consultant.R
import com.yidianling.consultant.model.bean.CateItem import com.yidianling.consultant.model.bean.CateItem
import kotlinx.android.synthetic.main.item_subject.view.* import kotlinx.android.synthetic.main.consultant_item_subject.view.*
/** /**
* 主题Recycler适配器 * 主题Recycler适配器
...@@ -25,7 +25,7 @@ class CategoryRecyclerViewAdapter(private val context: Context, private val cate ...@@ -25,7 +25,7 @@ class CategoryRecyclerViewAdapter(private val context: Context, private val cate
} }
override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): ViewHolder { override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): ViewHolder {
val itemView = LayoutInflater.from(context).inflate(R.layout.item_subject, parent, false) val itemView = LayoutInflater.from(context).inflate(R.layout.consultant_item_subject, parent, false)
return ViewHolder(itemView) return ViewHolder(itemView)
} }
......
...@@ -9,7 +9,7 @@ import android.view.ViewGroup ...@@ -9,7 +9,7 @@ import android.view.ViewGroup
import com.ydl.ydlcommon.adapter.MyBaseAdapter import com.ydl.ydlcommon.adapter.MyBaseAdapter
import com.yidianling.consultant.R import com.yidianling.consultant.R
import com.yidianling.consultant.model.bean.RegionItem import com.yidianling.consultant.model.bean.RegionItem
import kotlinx.android.synthetic.main.item_region.view.* import kotlinx.android.synthetic.main.consultant_item_region.view.*
@Suppress("DEPRECATION") @Suppress("DEPRECATION")
/** /**
...@@ -31,7 +31,7 @@ class RegionRecyclerViewAdapter(val context: Context, val regionList: ArrayList< ...@@ -31,7 +31,7 @@ class RegionRecyclerViewAdapter(val context: Context, val regionList: ArrayList<
//选中状态 //选中状态
holder.itemView.tvRegionName.setTypeface(Typeface.DEFAULT_BOLD) holder.itemView.tvRegionName.setTypeface(Typeface.DEFAULT_BOLD)
// holder.itemView.tvRegionName.setBackgroundColor(Color.rgb(255, 255, 255)) // holder.itemView.tvRegionName.setBackgroundColor(Color.rgb(255, 255, 255))
holder.itemView.tvRegionName.setTextColor(context.resources.getColor(R.color.main_theme)) holder.itemView.tvRegionName.setTextColor(context.resources.getColor(R.color.consultant_main_theme))
holder.itemView.view_select.visibility = View.VISIBLE holder.itemView.view_select.visibility = View.VISIBLE
} else { } else {
//未选中状态 //未选中状态
...@@ -46,7 +46,7 @@ class RegionRecyclerViewAdapter(val context: Context, val regionList: ArrayList< ...@@ -46,7 +46,7 @@ class RegionRecyclerViewAdapter(val context: Context, val regionList: ArrayList<
override fun getItemCount(): Int = regionList.size + 1 override fun getItemCount(): Int = regionList.size + 1
override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): ViewHolder { override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): ViewHolder {
val view = LayoutInflater.from(context).inflate(R.layout.item_region, parent, false) val view = LayoutInflater.from(context).inflate(R.layout.consultant_item_region, parent, false)
return ViewHolder(view) return ViewHolder(view)
} }
......
...@@ -10,7 +10,7 @@ import android.view.ViewGroup ...@@ -10,7 +10,7 @@ import android.view.ViewGroup
import com.yidianling.consultant.R import com.yidianling.consultant.R
import com.yidianling.consultant.listener.OnSortItemSelectedListener import com.yidianling.consultant.listener.OnSortItemSelectedListener
import com.yidianling.consultant.model.bean.ReorderItem import com.yidianling.consultant.model.bean.ReorderItem
import kotlinx.android.synthetic.main.item_sort.view.* import kotlinx.android.synthetic.main.consultant_item_sort.view.*
/** /**
* Created by zqk on 17-9-20. * Created by zqk on 17-9-20.
...@@ -23,7 +23,7 @@ class SortRecyclerViewAdapter(private val context: Context, ...@@ -23,7 +23,7 @@ class SortRecyclerViewAdapter(private val context: Context,
override fun getItemCount(): Int = sortItems.size override fun getItemCount(): Int = sortItems.size
override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): ViewHolder { override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): ViewHolder {
val itemView = LayoutInflater.from(context).inflate(R.layout.item_sort, parent, false) val itemView = LayoutInflater.from(context).inflate(R.layout.consultant_item_sort, parent, false)
return ViewHolder(itemView) return ViewHolder(itemView)
} }
...@@ -33,7 +33,7 @@ class SortRecyclerViewAdapter(private val context: Context, ...@@ -33,7 +33,7 @@ class SortRecyclerViewAdapter(private val context: Context,
holder.tvSort.text = item.value holder.tvSort.text = item.value
if (item.key == selectedSort.key) { if (item.key == selectedSort.key) {
holder.tvSort.setTypeface(Typeface.DEFAULT_BOLD) holder.tvSort.setTypeface(Typeface.DEFAULT_BOLD)
holder.tvSort.setTextColor(ContextCompat.getColor(context, R.color.main_theme)) holder.tvSort.setTextColor(ContextCompat.getColor(context, R.color.consultant_main_theme))
// holder.ivCheck.visibility = View.VISIBLE // holder.ivCheck.visibility = View.VISIBLE
} }
} }
......
...@@ -10,7 +10,7 @@ import android.view.ViewGroup ...@@ -10,7 +10,7 @@ import android.view.ViewGroup
import com.ydl.ydlcommon.adapter.MyBaseAdapter import com.ydl.ydlcommon.adapter.MyBaseAdapter
import com.yidianling.consultant.R import com.yidianling.consultant.R
import com.yidianling.consultant.model.bean.SubItem import com.yidianling.consultant.model.bean.SubItem
import kotlinx.android.synthetic.main.item_consult_type.view.* import kotlinx.android.synthetic.main.consultant_item_consult_type.view.*
/** /**
* 城市列表适配器 * 城市列表适配器
...@@ -30,7 +30,7 @@ class SubRecyclerViewAdapter(val context: Context, val subList: ArrayList<SubIte ...@@ -30,7 +30,7 @@ class SubRecyclerViewAdapter(val context: Context, val subList: ArrayList<SubIte
if (selectedSub.key == region.key) { if (selectedSub.key == region.key) {
//选中状态 //选中状态
holder.itemView.tvConsultTypeName.setTypeface(Typeface.DEFAULT_BOLD) holder.itemView.tvConsultTypeName.setTypeface(Typeface.DEFAULT_BOLD)
holder.itemView.tvConsultTypeName.setTextColor(ContextCompat.getColor(context,R.color.main_theme)) holder.itemView.tvConsultTypeName.setTextColor(ContextCompat.getColor(context,R.color.consultant_main_theme))
// holder.itemView.ivCheckCircle.visibility = View.VISIBLE // holder.itemView.ivCheckCircle.visibility = View.VISIBLE
} else { } else {
//未选中状态 //未选中状态
...@@ -44,7 +44,7 @@ class SubRecyclerViewAdapter(val context: Context, val subList: ArrayList<SubIte ...@@ -44,7 +44,7 @@ class SubRecyclerViewAdapter(val context: Context, val subList: ArrayList<SubIte
override fun getItemCount(): Int = subList.size + 1 override fun getItemCount(): Int = subList.size + 1
override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): ViewHolder { override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): ViewHolder {
val view = LayoutInflater.from(context).inflate(R.layout.item_consult_type, parent, false) val view = LayoutInflater.from(context).inflate(R.layout.consultant_item_consult_type, parent, false)
return ViewHolder(view) return ViewHolder(view)
} }
......
...@@ -15,7 +15,7 @@ import com.yidianling.consultant.adapter.RegionRecyclerViewAdapter ...@@ -15,7 +15,7 @@ import com.yidianling.consultant.adapter.RegionRecyclerViewAdapter
import com.yidianling.consultant.adapter.SubRecyclerViewAdapter import com.yidianling.consultant.adapter.SubRecyclerViewAdapter
import com.yidianling.consultant.model.bean.RegionItem import com.yidianling.consultant.model.bean.RegionItem
import com.yidianling.consultant.model.bean.SubItem import com.yidianling.consultant.model.bean.SubItem
import kotlinx.android.synthetic.main.ui_region_popup_window.view.* import kotlinx.android.synthetic.main.consultant_ui_region_popup_window.view.*
/** /**
* 地区选择弹窗 * 地区选择弹窗
...@@ -32,7 +32,7 @@ class AreaPopupWindow(val context: Context, regionList: ArrayList<RegionItem>, ...@@ -32,7 +32,7 @@ class AreaPopupWindow(val context: Context, regionList: ArrayList<RegionItem>,
init { init {
subList.addAll(selectedRegion.sub) subList.addAll(selectedRegion.sub)
val view = LayoutInflater.from(context).inflate(R.layout.ui_region_popup_window, null) val view = LayoutInflater.from(context).inflate(R.layout.consultant_ui_region_popup_window, null)
this.contentView = view this.contentView = view
this.isFocusable = true this.isFocusable = true
@Suppress("DEPRECATION") @Suppress("DEPRECATION")
......
...@@ -13,7 +13,7 @@ import com.yidianling.consultant.R ...@@ -13,7 +13,7 @@ import com.yidianling.consultant.R
import com.yidianling.consultant.adapter.CategoryRecyclerViewAdapter import com.yidianling.consultant.adapter.CategoryRecyclerViewAdapter
import com.yidianling.consultant.listener.OnCategoriesSelectedListener import com.yidianling.consultant.listener.OnCategoriesSelectedListener
import com.yidianling.consultant.model.bean.CateItem import com.yidianling.consultant.model.bean.CateItem
import kotlinx.android.synthetic.main.ui_subject_popup_window.view.* import kotlinx.android.synthetic.main.consultant_ui_subject_popup_window.view.*
/** /**
* 主题弹窗 * 主题弹窗
...@@ -24,7 +24,7 @@ class CategoryPopupWindow(context: Context, categories: ArrayList<CateItem>, sel ...@@ -24,7 +24,7 @@ class CategoryPopupWindow(context: Context, categories: ArrayList<CateItem>, sel
var onSubjectsSelectedListener: OnCategoriesSelectedListener? = null var onSubjectsSelectedListener: OnCategoriesSelectedListener? = null
init { init {
val view = LayoutInflater.from(context).inflate(R.layout.ui_subject_popup_window, null) val view = LayoutInflater.from(context).inflate(R.layout.consultant_ui_subject_popup_window, null)
this.contentView = view this.contentView = view
this.isFocusable = true this.isFocusable = true
@Suppress("DEPRECATION") @Suppress("DEPRECATION")
......
...@@ -33,9 +33,9 @@ import io.reactivex.android.schedulers.AndroidSchedulers ...@@ -33,9 +33,9 @@ import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.CompositeDisposable import io.reactivex.disposables.CompositeDisposable
import io.reactivex.disposables.Disposable import io.reactivex.disposables.Disposable
import io.reactivex.schedulers.Schedulers import io.reactivex.schedulers.Schedulers
import kotlinx.android.synthetic.main.item_filter.view.* import kotlinx.android.synthetic.main.consultant_item_filter.view.*
import kotlinx.android.synthetic.main.item_price_range.view.* import kotlinx.android.synthetic.main.consultant_item_price_range.view.*
import kotlinx.android.synthetic.main.ui_filter_popup.view.* import kotlinx.android.synthetic.main.consultant_ui_filter_popup.view.*
/** /**
...@@ -67,7 +67,7 @@ class FilterPopupWindow(private val context: Context, private val filterData: Fi ...@@ -67,7 +67,7 @@ class FilterPopupWindow(private val context: Context, private val filterData: Fi
var etMaxPrice: EditText? = null var etMaxPrice: EditText? = null
init { init {
val view = LayoutInflater.from(context).inflate(R.layout.ui_filter_popup, null) val view = LayoutInflater.from(context).inflate(R.layout.consultant_ui_filter_popup, null)
dp5 = RxImageTool.dip2px(5f) dp5 = RxImageTool.dip2px(5f)
dp10 = RxImageTool.dip2px(10f) dp10 = RxImageTool.dip2px(10f)
...@@ -86,7 +86,7 @@ class FilterPopupWindow(private val context: Context, private val filterData: Fi ...@@ -86,7 +86,7 @@ class FilterPopupWindow(private val context: Context, private val filterData: Fi
this.setBackgroundDrawable(BitmapDrawable()) this.setBackgroundDrawable(BitmapDrawable())
this.isOutsideTouchable = true this.isOutsideTouchable = true
this.animationStyle = R.style.expert_service_popupwindow_filter_anim_style this.animationStyle = R.style.consultant_expert_service_popupwindow_filter_anim_style
initShowTypeViews(view) initShowTypeViews(view)
initEnquiryViews(view) initEnquiryViews(view)
...@@ -270,12 +270,12 @@ class FilterPopupWindow(private val context: Context, private val filterData: Fi ...@@ -270,12 +270,12 @@ class FilterPopupWindow(private val context: Context, private val filterData: Fi
//按钮置灰/解除置灰 //按钮置灰/解除置灰
contentView.btnConfirm.isEnabled = it > 0 contentView.btnConfirm.isEnabled = it > 0
if (it > 0) { if (it > 0) {
contentView.btnConfirm.setTextColor(ContextCompat.getColor(context,R.color.confirm_text_color)) contentView.btnConfirm.setTextColor(ContextCompat.getColor(context,R.color.consultant_confirm_text_color))
contentView.btnConfirm.background = ContextCompat.getDrawable(context, R.drawable.bg_radius_5_dark) contentView.btnConfirm.background = ContextCompat.getDrawable(context, R.drawable.consultant_bg_radius_5_dark)
// contentView.btnConfirm.setTextColor(ContextCompat.getColor(context,R.color.white)) // contentView.btnConfirm.setTextColor(ContextCompat.getColor(context,R.color.consultant_white))
} else { } else {
contentView.btnConfirm.setTextColor(ContextCompat.getColor(context,R.color.confirm_text_hint_color)) contentView.btnConfirm.setTextColor(ContextCompat.getColor(context,R.color.consultant_confirm_text_hint_color))
contentView.btnConfirm.background = ContextCompat.getDrawable(context, R.drawable.bg_radius_5_light) contentView.btnConfirm.background = ContextCompat.getDrawable(context, R.drawable.consultant_bg_radius_5_light)
// contentView.btnConfirm.setTextColor(ContextCompat.getColor(context,R.color.color_999999)) // contentView.btnConfirm.setTextColor(ContextCompat.getColor(context,R.color.color_999999))
} }
...@@ -297,7 +297,7 @@ class FilterPopupWindow(private val context: Context, private val filterData: Fi ...@@ -297,7 +297,7 @@ class FilterPopupWindow(private val context: Context, private val filterData: Fi
private fun initOtherViews(view: View) { private fun initOtherViews(view: View) {
val mWidth = (popWidth - RxImageTool.dp2px(52f)) / 3 val mWidth = (popWidth - RxImageTool.dp2px(52f)) / 3
for ((index, other) in filterData!!.other!!.withIndex()) { for ((index, other) in filterData!!.other!!.withIndex()) {
val textView = View.inflate(context, R.layout.item_filter, null) as TextView val textView = View.inflate(context, R.layout.consultant_item_filter, null) as TextView
val params = FrameLayout.LayoutParams(mWidth, dp36) val params = FrameLayout.LayoutParams(mWidth, dp36)
val marginNum = dp5 val marginNum = dp5
params.setMargins(marginNum + (dp10 + mWidth) * (index % 3), params.setMargins(marginNum + (dp10 + mWidth) * (index % 3),
...@@ -334,7 +334,7 @@ class FilterPopupWindow(private val context: Context, private val filterData: Fi ...@@ -334,7 +334,7 @@ class FilterPopupWindow(private val context: Context, private val filterData: Fi
val mWidth = (popWidth - RxImageTool.dp2px(40f)) / 2 val mWidth = (popWidth - RxImageTool.dp2px(40f)) / 2
var float = 46f var float = 46f
for ((index, other) in filterData!!.title!!.withIndex()) { for ((index, other) in filterData!!.title!!.withIndex()) {
val textView = View.inflate(context, R.layout.item_filter, null) as TextView val textView = View.inflate(context, R.layout.consultant_item_filter, null) as TextView
// val params = FrameLayout.LayoutParams(mWidth,FrameLayout.LayoutParams.WRAP_CONTENT) // val params = FrameLayout.LayoutParams(mWidth,FrameLayout.LayoutParams.WRAP_CONTENT)
val params = FrameLayout.LayoutParams(mWidth, dp36) val params = FrameLayout.LayoutParams(mWidth, dp36)
val marginNum = dp5 val marginNum = dp5
...@@ -376,7 +376,7 @@ class FilterPopupWindow(private val context: Context, private val filterData: Fi ...@@ -376,7 +376,7 @@ class FilterPopupWindow(private val context: Context, private val filterData: Fi
private fun initAgeViews(view: View) { private fun initAgeViews(view: View) {
val mWidth = (popWidth - RxImageTool.dp2px(52f)) / 3 val mWidth = (popWidth - RxImageTool.dp2px(52f)) / 3
for ((index, age) in filterData!!.age!!.withIndex()) { for ((index, age) in filterData!!.age!!.withIndex()) {
val textView = View.inflate(context, R.layout.item_filter, null) as TextView val textView = View.inflate(context, R.layout.consultant_item_filter, null) as TextView
val params = FrameLayout.LayoutParams(mWidth, RxImageTool.dp2px(36f)) val params = FrameLayout.LayoutParams(mWidth, RxImageTool.dp2px(36f))
val marginNum = RxImageTool.dp2px(5f) val marginNum = RxImageTool.dp2px(5f)
params.setMargins(marginNum + (dp10 + mWidth) * (index % 3), params.setMargins(marginNum + (dp10 + mWidth) * (index % 3),
...@@ -412,7 +412,7 @@ class FilterPopupWindow(private val context: Context, private val filterData: Fi ...@@ -412,7 +412,7 @@ class FilterPopupWindow(private val context: Context, private val filterData: Fi
private fun initEnquiryViews(view: View) { private fun initEnquiryViews(view: View) {
val mWidth = (popWidth - RxImageTool.dp2px(52f)) / 3 val mWidth = (popWidth - RxImageTool.dp2px(52f)) / 3
for ((index, enquiry) in filterData!!.enquiry!!.withIndex()) { for ((index, enquiry) in filterData!!.enquiry!!.withIndex()) {
val textView = View.inflate(context, R.layout.item_filter, null) as TextView val textView = View.inflate(context, R.layout.consultant_item_filter, null) as TextView
val params = FrameLayout.LayoutParams(mWidth, RxImageTool.dp2px(36f)) val params = FrameLayout.LayoutParams(mWidth, RxImageTool.dp2px(36f))
val marginNum = RxImageTool.dp2px(5f) val marginNum = RxImageTool.dp2px(5f)
params.setMargins(marginNum + (RxImageTool.dp2px(10f) + mWidth) * (index % 3), params.setMargins(marginNum + (RxImageTool.dp2px(10f) + mWidth) * (index % 3),
...@@ -445,7 +445,7 @@ class FilterPopupWindow(private val context: Context, private val filterData: Fi ...@@ -445,7 +445,7 @@ class FilterPopupWindow(private val context: Context, private val filterData: Fi
} }
private fun initPriceViews(view: View) { private fun initPriceViews(view: View) {
val priceRange = View.inflate(context, R.layout.item_price_range, null) as LinearLayout val priceRange = View.inflate(context, R.layout.consultant_item_price_range, null) as LinearLayout
etMinPrice = priceRange.findViewById<EditText>(R.id.etMinPrice); etMinPrice = priceRange.findViewById<EditText>(R.id.etMinPrice);
etMaxPrice = priceRange.findViewById<EditText>(R.id.etMaxPrice); etMaxPrice = priceRange.findViewById<EditText>(R.id.etMaxPrice);
...@@ -499,7 +499,7 @@ class FilterPopupWindow(private val context: Context, private val filterData: Fi ...@@ -499,7 +499,7 @@ class FilterPopupWindow(private val context: Context, private val filterData: Fi
val mWidth = (popWidth - RxImageTool.dp2px(52f)) / 3 val mWidth = (popWidth - RxImageTool.dp2px(52f)) / 3
for ((index, priceRangesItem) in filterData!!.priceRanges!!.withIndex()) { for ((index, priceRangesItem) in filterData!!.priceRanges!!.withIndex()) {
val textView = View.inflate(context, R.layout.item_filter, null) as TextView val textView = View.inflate(context, R.layout.consultant_item_filter, null) as TextView
val params = FrameLayout.LayoutParams(mWidth, RxImageTool.dp2px(48f)) val params = FrameLayout.LayoutParams(mWidth, RxImageTool.dp2px(48f))
val marginNum = RxImageTool.dp2px(2f) val marginNum = RxImageTool.dp2px(2f)
params.setMargins(marginNum + (RxImageTool.dp2px(10f) + mWidth) * (index % 3), params.setMargins(marginNum + (RxImageTool.dp2px(10f) + mWidth) * (index % 3),
...@@ -578,7 +578,7 @@ class FilterPopupWindow(private val context: Context, private val filterData: Fi ...@@ -578,7 +578,7 @@ class FilterPopupWindow(private val context: Context, private val filterData: Fi
private fun initShowTypeViews(view: View) { private fun initShowTypeViews(view: View) {
val mWidth = (popWidth - RxImageTool.dp2px(42f)) / 2 val mWidth = (popWidth - RxImageTool.dp2px(42f)) / 2
for ((index, showType) in filterData.showType.withIndex()) { for ((index, showType) in filterData.showType.withIndex()) {
val textView = View.inflate(context, R.layout.item_filter, null) as TextView val textView = View.inflate(context, R.layout.consultant_item_filter, null) as TextView
val params = FrameLayout.LayoutParams(mWidth, dp36) val params = FrameLayout.LayoutParams(mWidth, dp36)
val marginNum = dp5 val marginNum = dp5
var textMarginLeft = marginNum + (dp10 + mWidth) * (index % 2) var textMarginLeft = marginNum + (dp10 + mWidth) * (index % 2)
......
...@@ -10,7 +10,7 @@ import com.yidianling.consultant.R ...@@ -10,7 +10,7 @@ import com.yidianling.consultant.R
import com.yidianling.consultant.adapter.SortRecyclerViewAdapter import com.yidianling.consultant.adapter.SortRecyclerViewAdapter
import com.yidianling.consultant.listener.OnSortItemSelectedListener import com.yidianling.consultant.listener.OnSortItemSelectedListener
import com.yidianling.consultant.model.bean.ReorderItem import com.yidianling.consultant.model.bean.ReorderItem
import kotlinx.android.synthetic.main.ui_sort_popup_window.view.* import kotlinx.android.synthetic.main.consultant_ui_sort_popup_window.view.*
/** /**
* 排序弹窗 * 排序弹窗
...@@ -22,7 +22,7 @@ class SortPopupWindow(val context: Context, private val sortItems: ArrayList<Reo ...@@ -22,7 +22,7 @@ class SortPopupWindow(val context: Context, private val sortItems: ArrayList<Reo
private var adapter: SortRecyclerViewAdapter private var adapter: SortRecyclerViewAdapter
init { init {
val view = LayoutInflater.from(context).inflate(R.layout.ui_sort_popup_window, null) val view = LayoutInflater.from(context).inflate(R.layout.consultant_ui_sort_popup_window, null)
this.contentView = view this.contentView = view
this.isFocusable = true this.isFocusable = true
@Suppress("DEPRECATION") @Suppress("DEPRECATION")
......
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/filter_content_text_color_en" android:state_selected="true" android:state_enabled="true"/>
<item android:color="@color/filter_content_text_color_un" android:state_enabled="true"/>
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/consultant_filter_content_text_color_en" android:state_selected="true" android:state_enabled="true"/>
<item android:color="@color/consultant_filter_content_text_color_un" android:state_enabled="true"/>
</selector>
\ No newline at end of file
...@@ -5,5 +5,5 @@ ...@@ -5,5 +5,5 @@
<solid android:color="#F2faff"/> <solid android:color="#F2faff"/>
<stroke <stroke
android:width="1dp" android:width="1dp"
android:color="@color/main_theme"/> android:color="@color/consultant_main_theme"/>
</shape> </shape>
\ No newline at end of file
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="5dp" /> <corners android:radius="5dp" />
<solid android:color="@color/confirm_bg_color" /> <solid android:color="@color/consultant_confirm_bg_color" />
<stroke <stroke
android:width="1dp" android:width="1dp"
android:color="@color/confirm_bg_color" /> android:color="@color/consultant_confirm_bg_color" />
</shape> </shape>
\ No newline at end of file
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="5dp" /> <corners android:radius="5dp" />
<solid android:color="@color/main_theme_light" /> <solid android:color="@color/consultant_main_theme_light" />
<stroke <stroke
android:width="1dp" android:width="1dp"
android:color="@color/main_theme_light" /> android:color="@color/consultant_main_theme_light" />
</shape> </shape>
\ No newline at end of file
...@@ -5,5 +5,5 @@ ...@@ -5,5 +5,5 @@
<solid android:color="@color/platform_white" /> <solid android:color="@color/platform_white" />
<stroke <stroke
android:width="1dp" android:width="1dp"
android:color="@color/main_theme" /> android:color="@color/consultant_main_theme" />
</shape> </shape>
\ No newline at end of file
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true" android:state_selected="true"> <item android:state_enabled="true" android:state_selected="true">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/main_theme_bright" /> <solid android:color="@color/consultant_main_theme_bright" />
<corners android:radius="4dp"/> <corners android:radius="4dp"/>
<stroke <stroke
android:width="0.5dp" android:width="0.5dp"
android:color="@color/main_theme"/> android:color="@color/consultant_main_theme"/>
</shape> </shape>
</item> </item>
<item android:state_enabled="true"> <item android:state_enabled="true">
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true" android:state_selected="true"> <item android:state_enabled="true" android:state_selected="true">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/main_theme_bright" /> <solid android:color="@color/consultant_main_theme_bright" />
<corners android:radius="11dp"/> <corners android:radius="11dp"/>
<stroke <stroke
android:width="0.5dp" android:width="0.5dp"
android:color="@color/main_theme"/> android:color="@color/consultant_main_theme"/>
</shape> </shape>
</item> </item>
<item android:state_enabled="true"> <item android:state_enabled="true">
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<include <include
layout="@layout/layout_search_toolbar" layout="@layout/consultant_layout_search_toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" /> android:layout_height="48dp" />
<android.support.design.widget.CoordinatorLayout <android.support.design.widget.CoordinatorLayout
android:id="@+id/container" android:id="@+id/container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/colorBg" android:background="@color/consultant_colorBg"
tools:ignore="InefficientWeight"> tools:ignore="InefficientWeight">
<android.support.design.widget.AppBarLayout <android.support.design.widget.AppBarLayout
android:id="@+id/appbar_layout" android:id="@+id/appbar_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/colorBg" android:background="@color/consultant_colorBg"
android:clipChildren="false" android:clipChildren="false"
android:clipToPadding="false" android:clipToPadding="false"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:elevation="0dp"> app:elevation="0dp">
<android.support.design.widget.CollapsingToolbarLayout <android.support.design.widget.CollapsingToolbarLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:clipChildren="false" android:clipChildren="false"
android:clipToPadding="false" android:clipToPadding="false"
app:layout_scrollFlags="scroll|exitUntilCollapsed"> app:layout_scrollFlags="scroll|exitUntilCollapsed">
<include layout="@layout/layout_search_head_bg" /> <include layout="@layout/consultant_layout_search_head_bg" />
</android.support.design.widget.CollapsingToolbarLayout> </android.support.design.widget.CollapsingToolbarLayout>
</android.support.design.widget.AppBarLayout> </android.support.design.widget.AppBarLayout>
<include layout="@layout/layout_search_content" /> <include layout="@layout/consultant_layout_search_content" />
<!--<include layout="@layout/layout_search_head_input"/>--> <!--<include layout="@layout/layout_search_head_input"/>-->
<!--筛选弹窗半透明背景--> <!--筛选弹窗半透明背景-->
<View <View
android:id="@+id/viewDim_filter" android:id="@+id/viewDim_filter"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="#40000000" android:background="#40000000"
android:visibility="gone" /> android:visibility="gone" />
</android.support.design.widget.CoordinatorLayout> </android.support.design.widget.CoordinatorLayout>
</LinearLayout> </LinearLayout>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ImageView xmlns:android="http://schemas.android.com/apk/res/android" <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/imgRate" android:id="@+id/imgRate"
android:layout_width="@dimen/platform_dp_11" android:layout_width="@dimen/platform_dp_11"
android:layout_height="@dimen/platform_dp_11" android:layout_height="@dimen/platform_dp_11"
android:layout_marginRight="@dimen/platform_dp_2" android:layout_marginRight="@dimen/platform_dp_2"
android:scaleType="fitXY" android:scaleType="fitXY"
android:background="@drawable/expert_search_full_star"> android:background="@drawable/consultant_expert_search_full_star">
</ImageView> </ImageView>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/platform_dp_7"> android:layout_marginTop="@dimen/platform_dp_7">
<TextView <TextView
android:id="@+id/tvTitle" android:id="@+id/tvTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/expert_search_single" android:background="@drawable/consultant_expert_search_single"
android:textColor="@color/platform_color_1DA1F2" android:textColor="@color/platform_color_1DA1F2"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:paddingRight="@dimen/platform_dp_3" android:paddingRight="@dimen/platform_dp_3"
android:paddingLeft="@dimen/platform_dp_3" android:paddingLeft="@dimen/platform_dp_3"
android:paddingTop="@dimen/platform_dp_05" android:paddingTop="@dimen/platform_dp_05"
android:paddingBottom="@dimen/platform_dp_05" android:paddingBottom="@dimen/platform_dp_05"
android:textSize="@dimen/platform_dp_9" android:textSize="@dimen/platform_dp_9"
tools:text="单次"/> tools:text="单次"/>
<TextView <TextView
android:id="@+id/tvContent" android:id="@+id/tvContent"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/platform_dp_6" android:layout_marginLeft="@dimen/platform_dp_6"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:lines="1" android:lines="1"
android:ellipsize="end" android:ellipsize="end"
android:textColor="@color/platform_color_666666" android:textColor="@color/platform_color_666666"
android:textSize="@dimen/platform_dp_11" android:textSize="@dimen/platform_dp_11"
tools:text="职业发展,个人成长主题倾诉" tools:text="职业发展,个人成长主题倾诉"
android:layout_marginStart="@dimen/platform_dp_6" android:layout_marginStart="@dimen/platform_dp_6"
tools:ignore="SpUsage" /> tools:ignore="SpUsage" />
</LinearLayout> </LinearLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="40dp"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="16dp" android:paddingLeft="16dp"
android:paddingRight="16dp"> android:paddingRight="16dp">
<TextView <TextView
android:id="@+id/tvConsultTypeName" android:id="@+id/tvConsultTypeName"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:textColor="@color/platform_color_black_333333" android:textColor="@color/platform_color_black_333333"
android:textSize="14sp" android:textSize="14sp"
tools:text="咨询方式" /> tools:text="咨询方式" />
<ImageView <ImageView
android:id="@+id/ivCheckCircle" android:id="@+id/ivCheckCircle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:contentDescription="@null" android:contentDescription="@null"
android:src="@drawable/ic_check" android:src="@drawable/consultant_ic_check"
android:visibility="invisible"/> android:visibility="invisible"/>
</LinearLayout> </LinearLayout>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginBottom="50dp" android:layout_marginBottom="50dp"
android:gravity="center" android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:contentDescription="@null" android:contentDescription="@null"
android:src="@drawable/blank" /> android:src="@drawable/consultant_blank" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:text="@string/platform_no_search_result" android:text="@string/platform_no_search_result"
android:textColor="@color/platform_text_gray" android:textColor="@color/platform_text_gray"
android:textSize="@dimen/sp_14" /> android:textSize="@dimen/sp_14" />
<Button <Button
android:id="@+id/btnSearchByCat" android:id="@+id/btnSearchByCat"
style="@style/Widget.AppCompat.Button.Borderless" style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:background="@drawable/bg_radius_line_green_5" android:background="@drawable/consultant_bg_radius_line_green_5"
android:paddingLeft="16dp" android:paddingLeft="16dp"
android:paddingRight="16dp" android:paddingRight="16dp"
android:text="@string/platform_search_by_category" android:text="@string/platform_search_by_category"
android:textColor="@color/main_theme" /> android:textColor="@color/consultant_main_theme" />
</LinearLayout> </LinearLayout>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android" <TextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/tvHotSearch" android:id="@+id/tvHotSearch"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginBottom="6dp" android:layout_marginBottom="6dp"
android:background="@drawable/expert_hot_search_bg" android:background="@drawable/consultant_expert_hot_search_bg"
android:ellipsize="end" android:ellipsize="end"
android:gravity="center" android:gravity="center"
android:maxEms="9" android:maxEms="9"
android:paddingLeft="@dimen/platform_dp_16" android:paddingLeft="@dimen/platform_dp_16"
android:paddingTop="@dimen/platform_dp_7" android:paddingTop="@dimen/platform_dp_7"
android:paddingRight="@dimen/platform_dp_16" android:paddingRight="@dimen/platform_dp_16"
android:paddingBottom="@dimen/platform_dp_7" android:paddingBottom="@dimen/platform_dp_7"
android:singleLine="true" android:singleLine="true"
android:textColor="#242424" android:textColor="#242424"
android:textSize="@dimen/platform_dp_14" android:textSize="@dimen/platform_dp_14"
tools:text="自闭症电视都是范德萨" /> tools:text="自闭症电视都是范德萨" />
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android" <TextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/tvFilterName" android:id="@+id/tvFilterName"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:layout_marginBottom="4dp" android:layout_marginBottom="4dp"
android:background="@drawable/bg_search_filter_selector" android:background="@drawable/consultant_bg_search_filter_selector"
android:ellipsize="end" android:ellipsize="end"
android:gravity="center" android:gravity="center"
android:maxLines="1" android:maxLines="1"
android:orientation="vertical" android:orientation="vertical"
android:paddingTop="6dp" android:paddingTop="6dp"
android:paddingBottom="6dp" android:paddingBottom="6dp"
android:textColor="@color/color_search_filter_selector" android:textColor="@color/consultant_color_search_filter_selector"
android:textSize="13dp" android:textSize="13dp"
tools:text="按专家显示" /> tools:text="按专家显示" />
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android" <TextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/tvFree" android:id="@+id/tvFree"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="22dp" android:layout_height="22dp"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/bg_search_filter_selector_radius11" android:background="@drawable/consultant_bg_search_filter_selector_radius11"
android:ellipsize="end" android:ellipsize="end"
android:gravity="center" android:gravity="center"
android:maxLines="1" android:maxLines="1"
android:textColor="@color/color_search_filter_selector" android:textColor="@color/consultant_color_search_filter_selector"
android:textSize="@dimen/text_size_12" android:textSize="@dimen/consultant_text_size_12"
tools:layout_width="80dp" tools:layout_width="80dp"
tools:text="今天有空今天有空" /> tools:text="今天有空今天有空" />
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="40dp"
android:background="#f3f3f3" android:background="#f3f3f3"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="horizontal">
<ProgressBar <ProgressBar
android:id="@+id/pbLoading" android:id="@+id/pbLoading"
style="?android:attr/progressBarStyleSmall" style="?android:attr/progressBarStyleSmall"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginRight="8dp" /> android:layout_marginRight="8dp" />
<TextView <TextView
android:id="@+id/tvHint" android:id="@+id/tvHint"
android:textSize="@dimen/text_size_12" android:textSize="@dimen/consultant_text_size_12"
android:textColor="#707070" android:textColor="#707070"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/loading" /> android:text="@string/consultant_loading" />
</LinearLayout> </LinearLayout>
\ No newline at end of file
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
android:background="@drawable/shape_round_gray_bored" android:background="@drawable/shape_round_gray_bored"
android:inputType="number" android:inputType="number"
android:maxLines="1" android:maxLines="1"
android:textCursorDrawable="@color/main_theme" android:textCursorDrawable="@color/consultant_main_theme"
android:textSize="13sp" android:textSize="13sp"
android:maxLength="7" android:maxLength="7"
/> />
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
android:background="@drawable/shape_round_gray_bored" android:background="@drawable/shape_round_gray_bored"
android:inputType="number" android:inputType="number"
android:maxLines="1" android:maxLines="1"
android:textCursorDrawable="@color/main_theme" android:textCursorDrawable="@color/consultant_main_theme"
android:textSize="13sp" android:textSize="13sp"
android:maxLength="7" android:maxLength="7"
/> />
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
android:layout_width="4dp" android:layout_width="4dp"
android:layout_height="21dp" android:layout_height="21dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:background="@color/main_theme" android:background="@color/consultant_main_theme"
android:visibility="invisible"/> android:visibility="invisible"/>
<TextView <TextView
android:id="@+id/tvRegionName" android:id="@+id/tvRegionName"
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:id="@+id/tvSort" android:id="@+id/tvSort"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="40dp"
android:gravity="center" android:gravity="center"
android:textSize="@dimen/platform_dp_15" android:textSize="@dimen/platform_dp_15"
tools:text="智能排序" /> tools:text="智能排序" />
<ImageView <ImageView
android:id="@+id/ivCheck" android:id="@+id/ivCheck"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:layout_marginRight="16dp" android:layout_marginRight="16dp"
android:contentDescription="@null" android:contentDescription="@null"
android:src="@drawable/ic_check" android:src="@drawable/consultant_ic_check"
android:visibility="gone" /> android:visibility="gone" />
</RelativeLayout> </RelativeLayout>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android" <TextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/tvSubjectName" android:id="@+id/tvSubjectName"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="36dp" android:layout_height="36dp"
android:gravity="center" android:gravity="center"
android:textColor="@color/color_search_filter_selector" android:textColor="@color/consultant_color_search_filter_selector"
android:orientation="vertical" android:orientation="vertical"
android:background="@drawable/bg_search_filter_selector" android:background="@drawable/consultant_bg_search_filter_selector"
android:textSize="14dp" android:textSize="14dp"
tools:text="恋爱婚姻" /> tools:text="恋爱婚姻" />
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android" <TextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/tvTag" android:id="@+id/tvTag"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="14dp" android:layout_height="14dp"
android:background="@drawable/bg_radius_line_gray_1" android:background="@drawable/consultant_bg_radius_line_gray_1"
android:gravity="center" android:gravity="center"
android:paddingLeft="4dp" android:paddingLeft="4dp"
android:layout_marginRight="6dp" android:layout_marginRight="6dp"
android:textColor="@color/platform_color_999999" android:textColor="@color/platform_color_999999"
android:paddingRight="4dp" android:paddingRight="4dp"
android:textSize="10dp" android:textSize="10dp"
tools:text="恋爱情感" /> tools:text="恋爱情感" />
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<com.yidianling.consultant.ui.view.DisInterceptNestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" <com.yidianling.consultant.ui.view.DisInterceptNestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/search_head_bg" android:id="@+id/search_head_bg"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/platform_white" android:background="@color/platform_white"
android:clipChildren="false" android:clipChildren="false"
android:clipToPadding="false" android:clipToPadding="false"
app:layout_collapseMode="parallax" app:layout_collapseMode="parallax"
app:layout_collapseParallaxMultiplier="0.8"> app:layout_collapseParallaxMultiplier="0.8">
<android.support.v7.widget.CardView <android.support.v7.widget.CardView
android:id="@+id/user_head_container" android:id="@+id/user_head_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="15dp" android:layout_marginLeft="15dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginRight="15dp" android:layout_marginRight="15dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:elevation="0dp" android:elevation="0dp"
android:orientation="vertical" android:orientation="vertical"
app:cardCornerRadius="4dp"> app:cardCornerRadius="4dp">
<com.ydl.ydlcommon.view.banner.Banner <com.ydl.ydlcommon.view.banner.Banner
android:id="@+id/banner_search" android:id="@+id/banner_search"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="99dp" android:layout_height="99dp"
android:scaleType="centerCrop" android:scaleType="centerCrop"
app:pa_indicator_different_width="14dp" app:pa_indicator_different_width="14dp"
app:pa_indicator_drawable_selected="@drawable/banner_indicator_select" app:pa_indicator_drawable_selected="@drawable/consultant_banner_indicator_select"
app:pa_indicator_drawable_unselected="@drawable/banner_indicator_unselect" app:pa_indicator_drawable_unselected="@drawable/consultant_banner_indicator_unselect"
app:pa_indicator_height="5dp" app:pa_indicator_height="5dp"
app:pa_indicator_margin="1.25dp" app:pa_indicator_margin="1.25dp"
app:pa_is_selected_same_unselected="false" app:pa_is_selected_same_unselected="false"
app:pa_is_show_indicator="false" /> app:pa_is_show_indicator="false" />
</android.support.v7.widget.CardView> </android.support.v7.widget.CardView>
</com.yidianling.consultant.ui.view.DisInterceptNestedScrollView> </com.yidianling.consultant.ui.view.DisInterceptNestedScrollView>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/title_layout" android:id="@+id/title_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="48dp"
android:orientation="horizontal" android:orientation="horizontal"
app:layout_collapseMode="pin"> app:layout_collapseMode="pin">
<ImageButton <ImageButton
android:id="@+id/btn_back" android:id="@+id/btn_back"
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:contentDescription="@null" android:contentDescription="@null"
app:srcCompat="@drawable/icon_back_black" /> app:srcCompat="@drawable/consultant_icon_back_black" />
<LinearLayout <LinearLayout
android:id="@+id/rl_search" android:id="@+id/rl_search"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="7dp" android:layout_marginTop="7dp"
android:layout_marginRight="22dp" android:layout_marginRight="22dp"
android:layout_marginBottom="7dp" android:layout_marginBottom="7dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/bg_radius_line_gray_16" android:background="@drawable/consultant_bg_radius_line_gray_16"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="12dp" android:layout_marginLeft="12dp"
android:src="@drawable/icon_search_zixun" /> android:src="@drawable/consultant_icon_search_zixun" />
<TextView <TextView
android:id="@+id/tv_search_content" android:id="@+id/tv_search_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginStart="6dp" android:layout_marginStart="6dp"
android:ellipsize="end" android:ellipsize="end"
android:gravity="center_vertical" android:gravity="center_vertical"
android:hint="搜索心理问题或咨询师姓名" android:hint="搜索心理问题或咨询师姓名"
android:maxLines="1" android:maxLines="1"
android:textColor="@color/platform_color_999999" android:textColor="@color/platform_color_999999"
android:textSize="12dp" /> android:textSize="12dp" />
</LinearLayout> </LinearLayout>
<TextView <TextView
android:id="@+id/btn_call" android:id="@+id/btn_call"
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginRight="2dp" android:layout_marginRight="2dp"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:drawableTop="@drawable/icon_service_black" android:drawableTop="@drawable/consultant_icon_service_black"
android:gravity="center" android:gravity="center"
android:paddingTop="7dp" android:paddingTop="7dp"
android:text="客服" android:text="客服"
android:textColor="@color/platform_color_242424" android:textColor="@color/platform_color_242424"
android:textSize="9sp" /> android:textSize="9sp" />
<TextView <TextView
android:id="@+id/tv_guide" android:id="@+id/tv_guide"
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginRight="16dp" android:layout_marginRight="16dp"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:drawableTop="@drawable/icon_guide_black" android:drawableTop="@drawable/consultant_icon_guide_black"
android:gravity="center" android:gravity="center"
android:paddingTop="7dp" android:paddingTop="7dp"
android:text="咨询指南" android:text="咨询指南"
android:textColor="@color/platform_color_242424" android:textColor="@color/platform_color_242424"
android:textSize="9sp" /> android:textSize="9sp" />
</LinearLayout> </LinearLayout>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/platform_white" android:background="@color/platform_white"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="服务类型" android:text="服务类型"
android:textSize="@dimen/platform_dp_16" android:textSize="@dimen/platform_dp_16"
android:textColor="@color/platform_color_242424" android:textColor="@color/platform_color_242424"
android:textStyle="bold" android:textStyle="bold"
android:layout_marginTop="@dimen/platform_dp_24" android:layout_marginTop="@dimen/platform_dp_24"
android:layout_marginLeft="@dimen/platform_dp_15" android:layout_marginLeft="@dimen/platform_dp_15"
android:layout_marginBottom="7dp"/> android:layout_marginBottom="7dp"/>
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/rvSubject" android:id="@+id/rvSubject"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:overScrollMode="never"/> android:overScrollMode="never"/>
<TextView <TextView
android:id="@+id/btnConfirm" android:id="@+id/btnConfirm"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="44dp" android:layout_height="44dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:layout_marginLeft="15dp" android:layout_marginLeft="15dp"
android:layout_marginRight="15dp" android:layout_marginRight="15dp"
android:layout_marginTop="19dp" android:layout_marginTop="19dp"
android:background="@drawable/bg_radius_5_dark" android:background="@drawable/consultant_bg_radius_5_dark"
android:gravity="center" android:gravity="center"
android:text="@string/platform_confirm" android:text="@string/platform_confirm"
android:textSize="17dp" android:textSize="17dp"
android:textColor="@color/confirm_text_color" /> android:textColor="@color/consultant_confirm_text_color" />
</LinearLayout> </LinearLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!--字体大小部分--> <!--字体大小部分-->
<dimen name="default_text_size_small">12sp</dimen> <dimen name="consultant_default_text_size_small">12sp</dimen>
<dimen name="default_text_size">14sp</dimen> <dimen name="consultant_default_text_size">14sp</dimen>
<dimen name="default_text_size_big">16sp</dimen> <dimen name="consultant_default_text_size_big">16sp</dimen>
<dimen name="default_text_size_large">18sp</dimen> <dimen name="consultant_default_text_size_large">18sp</dimen>
<!--距离部分--> <!--距离部分-->
<dimen name="default_dis_size_micro">4dp</dimen> <dimen name="consultant_default_dis_size_micro">4dp</dimen>
<dimen name="default_dis_size_small">6dp</dimen> <dimen name="consultant_default_dis_size_small">6dp</dimen>
<dimen name="default_dis_size">8dp</dimen> <dimen name="consultant_default_dis_size">8dp</dimen>
<dimen name="default_dis_size_big">10dp</dimen> <dimen name="consultant_default_dis_size_big">10dp</dimen>
<dimen name="default_dis_size_large">12dp</dimen> <dimen name="consultant_default_dis_size_large">12dp</dimen>
<dimen name="default_dis_size_huge">14dp</dimen> <dimen name="consultant_default_dis_size_huge">14dp</dimen>
<!--分割线粗细--> <!--分割线粗细-->
<dimen name="divide_line_stroke_width">1px</dimen> <dimen name="consultant_divide_line_stroke_width">1px</dimen>
</resources> </resources>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools"> <resources xmlns:tools="http://schemas.android.com/tools">
<!--字体大小部分--> <!--字体大小部分-->
<dimen name="default_text_size_small">12sp</dimen> <dimen name="consultant_default_text_size_small">12sp</dimen>
<dimen name="default_text_size">14sp</dimen> <dimen name="consultant_default_text_size">14sp</dimen>
<dimen name="default_text_size_big">16sp</dimen> <dimen name="consultant_default_text_size_big">16sp</dimen>
<dimen name="default_text_size_large">18sp</dimen> <dimen name="consultant_default_text_size_large">18sp</dimen>
<!--距离部分--> <!--距离部分-->
<dimen name="default_dis_size_micro">5dp</dimen> <dimen name="consultant_default_dis_size_micro">5dp</dimen>
<dimen name="default_dis_size_small">7.5dp</dimen> <dimen name="consultant_default_dis_size_small">7.5dp</dimen>
<dimen name="default_dis_size">10dp</dimen> <dimen name="consultant_default_dis_size">10dp</dimen>
<dimen name="default_dis_size_big">12.5dp</dimen> <dimen name="consultant_default_dis_size_big">12.5dp</dimen>
<dimen name="default_dis_size_large">15dp</dimen> <dimen name="consultant_default_dis_size_large">15dp</dimen>
<dimen name="default_dis_size_huge">17.5dp</dimen> <dimen name="consultant_default_dis_size_huge">17.5dp</dimen>
<!--dialog部分--> <!--dialog部分-->
<!--分割线粗细--> <!--分割线粗细-->
<dimen name="divide_line_stroke_width">0.5dp</dimen> <dimen name="consultant_divide_line_stroke_width">0.5dp</dimen>
<!--TitleBar高度--> <!--TitleBar高度-->
<dimen name="title_bar_height">45dp</dimen> <dimen name="consultant_title_bar_height">45dp</dimen>
<!--JumpTextView部分--> <!--JumpTextView部分-->
<dimen name="jump_text_view_min_height">55dp</dimen> <dimen name="consultant_jump_text_view_min_height">55dp</dimen>
<dimen name="jump_text_view_icon_size">25dp</dimen> <dimen name="consultant_jump_text_view_icon_size">25dp</dimen>
<!--JumpDraweeView部分--> <!--JumpDraweeView部分-->
<!--进度条--> <!--进度条-->
<!--照片选择器--> <!--照片选择器-->
</resources> </resources>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!-- google color--> <!-- google color-->
<color name="google_yellow">#fdbd00</color> <color name="consultant_google_yellow">#fdbd00</color>
<color name="color_FF9500">#FF9500</color> <color name="consultant_color_FF9500">#FF9500</color>
<!--app主要颜色--> <!--app主要颜色-->
<color name="white">#ffffff</color> <color name="consultant_white">#ffffff</color>
<color name="theme_bg">#FAFAFA</color> <color name="consultant_theme_bg">#FAFAFA</color>
<color name="default_text_color">#555555</color> <color name="consultant_default_text_color">#555555</color>
<color name="default_text_color_hint">#333333</color> <color name="consultant_default_text_color_hint">#333333</color>
<color name="divide_color">#EDEDED</color> <color name="consultant_divide_color">#EDEDED</color>
<color name="place_holder_color">#DDDDDD</color> <color name="consultant_place_holder_color">#DDDDDD</color>
<color name="transparent">#00FFFFFF</color> <color name="consultant_transparent">#00FFFFFF</color>
<color name="price_color">#EC7100</color> <color name="consultant_price_color">#EC7100</color>
<color name="tag_text">#777777</color> <color name="consultant_tag_text">#777777</color>
<color name="f5f5f5">#f5f5f5</color> <color name="consultant_f5f5f5">#f5f5f5</color>
<color name="black_deep">#FF000000</color> <color name="consultant_black_deep">#FF000000</color>
<color name="line">#e5e5e5</color> <color name="consultant_line">#e5e5e5</color>
<!--最后删除--> <!--最后删除-->
<color name="colorTextDefault">#555555</color> <color name="consultant_colorTextDefault">#555555</color>
<!-- main bg color --> <!-- main bg color -->
<!-- session --> <!-- session -->
<!-- image picker --> <!-- image picker -->
<!-- contact --> <!-- contact -->
<!-- setting --> <!-- setting -->
<color name="color_black_ff666666">#ff666666</color> <color name="consultant_color_black_ff666666">#ff666666</color>
<!--云信 end--> <!--云信 end-->
<color name="text_gray">#B6B6B6</color> <color name="consultant_text_gray">#B6B6B6</color>
<color name="title_bottom_line_bg">#DDDDDD</color> <color name="consultant_title_bottom_line_bg">#DDDDDD</color>
<!--动态--> <!--动态-->
<!--动态顶部title背景变色--> <!--动态顶部title背景变色-->
<color name="color_black_333333">#333333</color> <color name="consultant_color_black_333333">#333333</color>
<color name="colorBg">#f5f5f5</color> <color name="consultant_colorBg">#f5f5f5</color>
</resources> </resources>
<resources> <resources>
<!-- Default screen margins, per the Android Design guidelines. --> <!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_vertical_margin">16dp</dimen> <dimen name="consultant_activity_vertical_margin">16dp</dimen>
<!--动态--> <!--动态-->
<!--顶部title Size--> <!--顶部title Size-->
<!-- map --> <!-- map -->
<dimen name="text_size_12">12sp</dimen> <dimen name="consultant_text_size_12">12sp</dimen>
<dimen name="text_size_15">15sp</dimen> <dimen name="consultant_text_size_15">15sp</dimen>
<dimen name="title_bar_height">48dp</dimen> <dimen name="consultant_title_bar_height">48dp</dimen>
</resources> </resources>
<resources> <resources>
<string name="app_name">consultant</string> <string name="consultant_app_name">consultant</string>
<string name="attend_course_success">报名成功</string> <string name="consultant_attend_course_success">报名成功</string>
<string name="theme">主题</string> <string name="consultant_theme">主题</string>
<string name="area">地区</string> <string name="consultant_area">地区</string>
<string name="sort">排序</string> <string name="consultant_sort">排序</string>
<string name="filter">筛选</string> <string name="consultant_filter">筛选</string>
<string name="reset">重置</string> <string name="consultant_reset">重置</string>
<string name="confirm">确定</string> <string name="consultant_confirm">确定</string>
<string name="no_more">没有更多了</string> <string name="consultant_no_more">没有更多了</string>
<string name="no_search_result">没有符合条件的内容</string> <string name="consultant_no_search_result">没有符合条件的内容</string>
<string name="search_by_category">按主题搜索看看</string> <string name="consultant_search_by_category">按主题搜索看看</string>
<string name="search_hint">搜索话题、咨询师姓名</string> <string name="consultant_search_hint">搜索话题、咨询师姓名</string>
<string name="need_storage_permission_hint">App正常工作需要内部存储使用权限,请开启</string> <string name="consultant_need_storage_permission_hint">App正常工作需要内部存储使用权限,请开启</string>
<string name="user_protocol">用户协议</string> <string name="consultant_user_protocol">用户协议</string>
<string name="next_step">下一步</string> <string name="consultant_next_step">下一步</string>
<string name="finish">完成</string> <string name="consultant_finish">完成</string>
<string name="nickname_hint">设置一个昵称,方便大家认识你哦(最多10个字)</string> <string name="consultant_nickname_hint">设置一个昵称,方便大家认识你哦(最多10个字)</string>
<string name="please_select_gender">请选择性别</string> <string name="consultant_please_select_gender">请选择性别</string>
<string name="register_success">注册成功</string> <string name="consultant_register_success">注册成功</string>
<string name="private_safe_hint">设置手势密码,保障安全隐私</string> <string name="consultant_private_safe_hint">设置手势密码,保障安全隐私</string>
<string name="gson_parse_error">解析错误</string> <string name="consultant_gson_parse_error">解析错误</string>
<!--网络提示模块--> <!--网络提示模块-->
<string name="network_error">请检查网络连接!</string> <string name="consultant_network_error">请检查网络连接!</string>
<string name="timeout">网络超时!</string> <string name="consultant_timeout">网络超时!</string>
<string name="httperror">请求失败</string> <string name="consultant_httperror">请求失败</string>
<string name="loading">正在加载中...</string> <string name="consultant_loading">正在加载中...</string>
<!-- 个人名片 --> <!-- 个人名片 -->
<string name="reload_hint">加载失败,换个网络环境试试吧</string> <string name="consultant_reload_hint">加载失败,换个网络环境试试吧</string>
</resources> </resources>
<resources> <resources>
<style name="FilterTextViewStyle"> <style name="consultant_FilterTextViewStyle">
<item name="android:layout_height">40dp</item> <item name="android:layout_height">40dp</item>
<item name="android:textSize">14sp</item> <item name="android:textSize">14sp</item>
<item name="android:background">?android:attr/selectableItemBackground</item> <item name="android:background">?android:attr/selectableItemBackground</item>
<item name="android:gravity">center</item> <item name="android:gravity">center</item>
</style> </style>
<style name="NoTitleTheme" parent="Theme.AppCompat.Light.DarkActionBar"> <style name="consultant_NoTitleTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<!-- Customize your theme here. --> <!-- Customize your theme here. -->
<item name="android:windowActionBar">false</item> <item name="android:windowActionBar">false</item>
<item name="windowActionBar">false</item> <item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item> <item name="windowNoTitle">true</item>
<item name="colorPrimary">@color/main_theme</item> <item name="colorPrimary">@color/consultant_main_theme</item>
<item name="colorPrimaryDark">@color/main_theme</item> <item name="colorPrimaryDark">@color/consultant_main_theme</item>
<item name="colorAccent">@color/main_theme</item> <item name="colorAccent">@color/consultant_main_theme</item>
</style> </style>
<style name="expert_service_popupwindow_filter_anim_style"> <style name="consultant_expert_service_popupwindow_filter_anim_style">
<!-- 指定显示的动画xml --> <!-- 指定显示的动画xml -->
<item name="android:windowEnterAnimation">@anim/expert_service_popupwindow_filter_show_anim</item> <item name="android:windowEnterAnimation">@anim/consultant_expert_service_popupwindow_filter_show_anim</item>
<item name="android:windowExitAnimation">@anim/expert_service_popupwindow_filter_hide_anim</item> <item name="android:windowExitAnimation">@anim/consultant_expert_service_popupwindow_filter_hide_anim</item>
</style> </style>
</resources> </resources>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!--主题色--> <!--主题色-->
<color name="main_theme">#fdbd00</color> <color name="consultant_main_theme">#fdbd00</color>
<!--主题浅色--> <!--主题浅色-->
<color name="main_theme_light">#FFEC8C</color> <color name="consultant_main_theme_light">#FFEC8C</color>
<!--主题亮色--> <!--主题亮色-->
<color name="main_theme_bright">#fffae0</color> <color name="consultant_main_theme_bright">#fffae0</color>
<!--确认按钮背景颜色--> <!--确认按钮背景颜色-->
<color name="confirm_bg_color">#FFDD33</color> <color name="consultant_confirm_bg_color">#FFDD33</color>
<!--确认按钮字体颜色--> <!--确认按钮字体颜色-->
<color name="confirm_text_color">#242424</color> <color name="consultant_confirm_text_color">#242424</color>
<!--确认按钮提示字体颜色--> <!--确认按钮提示字体颜色-->
<color name="confirm_text_hint_color">#666666</color> <color name="consultant_confirm_text_hint_color">#666666</color>
<!--筛选条件选择框字体颜色--> <!--筛选条件选择框字体颜色-->
<color name="filter_content_text_color_en">#242424</color> <color name="consultant_filter_content_text_color_en">#242424</color>
<color name="filter_content_text_color_un">#555555</color> <color name="consultant_filter_content_text_color_un">#555555</color>
</resources> </resources>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!--主题色--> <!--主题色-->
<color name="main_theme">#1da1f2</color> <color name="consultant_main_theme">#1da1f2</color>
<!--主题浅色--> <!--主题浅色-->
<color name="main_theme_light">#60BDF5</color> <color name="consultant_main_theme_light">#60BDF5</color>
<!--主题亮色--> <!--主题亮色-->
<color name="main_theme_bright">#E8F6FF</color> <color name="consultant_main_theme_bright">#E8F6FF</color>
<!--确认按钮背景颜色--> <!--确认按钮背景颜色-->
<color name="confirm_bg_color">#1da1f2</color> <color name="consultant_confirm_bg_color">#1da1f2</color>
<!--确认按钮颜色--> <!--确认按钮颜色-->
<color name="confirm_text_color">#ffffff</color> <color name="consultant_confirm_text_color">#ffffff</color>
<!--确认提示颜色--> <!--确认提示颜色-->
<color name="confirm_text_hint_color">#60ffffff</color> <color name="consultant_confirm_text_hint_color">#60ffffff</color>
<!--筛选条件选择框字体颜色--> <!--筛选条件选择框字体颜色-->
<color name="filter_content_text_color_en">#1da1f2</color> <color name="consultant_filter_content_text_color_en">#1da1f2</color>
<color name="filter_content_text_color_un">#242424</color> <color name="consultant_filter_content_text_color_un">#242424</color>
</resources> </resources>
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