Skip to content

Y
YDL-Component-Medical
Commit 54bfd6e2 by 霍志良
Options

Merge branch 'feat/diamond_category_zl' into 'd/v4.4.07' 

feat:修改UI\BUG修改

See merge request app_android_lib/YDL-Component!302
parents 6840701e 3fb610f0
Showing with 425 additions and 18 deletions
app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java
...@@ -20,8 +20,8 @@ import java.util.List; ...@@ -20,8 +20,8 @@ import java.util.List;
*/ */
public final class DemoGlobalConfig implements IConfigModule { public final class DemoGlobalConfig implements IConfigModule {
String APP_DOMAIN = "https://api.github.com/"; String APP_DOMAIN = "https://api.github.com/";
public static String appEnv = YDLConstants.ENV_TEST; // public static String appEnv = YDLConstants.ENV_TEST;
// public static String appEnv = YDLConstants.ENV_PROD; public static String appEnv = YDLConstants.ENV_PROD;
// public static String appEnv = YDLConstants.ENV_NEW_TEST;//配置未上传到maven库 // public static String appEnv = YDLConstants.ENV_NEW_TEST;//配置未上传到maven库
@Override @Override
......
m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchActivity.kt
...@@ -1475,7 +1475,22 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres ...@@ -1475,7 +1475,22 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
locationRegionItem?.let { locationHistoryList?.add(0, it) } locationRegionItem?.let { locationHistoryList?.add(0, it) }
showAreaPoPup(agreeLocation) showAreaPoPup(agreeLocation)
} else { } else {
ErrorLocate(false) locationList?.clear()
subLocationItem?.code = null
subLocationItem?.key = null
subLocationItem?.value = "定位失败，请稍后再试"
subLocationItem?.locationCode = "NotAuth"
subLocationItem?.let { locationList?.add(it) }
locationRegionItem = locationList?.let { it1 ->
RegionItem(
it1,
value = "定位",
key = null,
code = null
)
}
locationRegionItem?.let { locationHistoryList?.add(0, it) }
showAreaPoPup(agreeLocation)
} }
}, { }, {
ErrorLocate(false) ErrorLocate(false)
......
m-consultant/src/main/java/com/yidianling/consultant/ui/view/AreaPopupWindow.kt
...@@ -69,6 +69,11 @@ class AreaPopupWindow( ...@@ -69,6 +69,11 @@ class AreaPopupWindow(
} else { } else {
subList.addAll(regionList[0].sub) subList.addAll(regionList[0].sub)
} }
recentCityBean =
MMKV.defaultMMKV().decodeParcelable(
RECENT_CITY,
ConsultantRecentCity::class.java
)
subAdapter = SubRecyclerViewAdapter(context, subList, selectedSub, locationCode) subAdapter = SubRecyclerViewAdapter(context, subList, selectedSub, locationCode)
subAdapter.setOnAuthClickLister(object : SubRecyclerViewAdapter.OnAuthClickLister { subAdapter.setOnAuthClickLister(object : SubRecyclerViewAdapter.OnAuthClickLister {
override fun onAuthClick() { override fun onAuthClick() {
...@@ -174,7 +179,12 @@ class AreaPopupWindow( ...@@ -174,7 +179,12 @@ class AreaPopupWindow(
subAdapter.notifyDataSetChanged() subAdapter.notifyDataSetChanged()
regionAdapter.notifyDataSetChanged() regionAdapter.notifyDataSetChanged()
} else { } else {
ToastUtil.toastShort(it.msg) subLocationItem?.code = null
subLocationItem?.key = null
subLocationItem?.value = "定位失败，请稍后再试"
subLocationItem?.locationCode = "NotAuth"
subAdapter.notifyDataSetChanged()
regionAdapter.notifyDataSetChanged()
} }
}, {}) }, {})
} else { } else {
......
m-consultant/src/main/res/layout/consultant_item_region.xml
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:includeFontPadding="false" android:includeFontPadding="false"
android:paddingTop="@dimen/platform_dp_15" android:paddingTop="@dimen/platform_dp_17"
android:paddingBottom="@dimen/platform_dp_15" android:paddingBottom="@dimen/platform_dp_17"
android:gravity="center" android:gravity="center"
android:text="地区" android:text="地区"
android:textColor="@color/platform_default_text_color" android:textColor="@color/platform_default_text_color"
......
m-consultant/src/main/res/layout/consultant_ui_price_popup_window.xml
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
android:id="@+id/flPriceRangeView" android:id="@+id/flPriceRangeView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:layout_marginBottom="50dp" android:layout_marginBottom="50dp"
android:paddingStart="@dimen/platform_dp_12" android:paddingStart="@dimen/platform_dp_12"
android:paddingEnd="@dimen/platform_dp_12" android:paddingEnd="@dimen/platform_dp_12"
......
m-consultant/src/main/res/layout/consultant_ui_region_popup_window.xml
...@@ -18,6 +18,5 @@ ...@@ -18,6 +18,5 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/white" android:background="@color/white"
android:layout_weight="2" android:layout_weight="2"
android:paddingTop="10dp"
android:overScrollMode="never"/> android:overScrollMode="never"/>
</LinearLayout> </LinearLayout>
m-home/src/main/assets/home_data.json
...@@ -9,6 +9,200 @@ ...@@ -9,6 +9,200 @@
"title": "" "title": ""
}, },
"listenFree": false, "listenFree": false,
"goldList": [
{
"id": 2,
"cateId": 699,
"title": "心理健康",
"icon": "https://img.ydlcdn.com/file/2022/08/10/fkd769tv4dd0i4f4.png",
"sortNumber": 1,
"ffroms": "",
"isShow": true,
"goType": "special_consultants",
"goUrl": "",
"goNativeUrl": "ydl-user://h5/h5?params\u003d%7B%22url%22%3A%22%22%7D",
"goCriteria": "{\"__or\":[{\"product_cates.category_id2\":\"699\"}]}",
"goCriteriaMap": {
"__or": [
{
"product_cates.category_id2": "699"
}
]
}
},
{
"id": 3,
"cateId": 452,
"title": "婚姻家庭",
"icon": "https://img.ydlcdn.com/file/2022/08/10/oc8128o9mooj2n60.png",
"sortNumber": 2,
"ffroms": "",
"isShow": true,
"goType": "special_consultants",
"goUrl": "",
"goNativeUrl": "ydl-user://h5/h5?params\u003d%7B%22url%22%3A%22%22%7D",
"goCriteria": "{\"__or\":[{\"product_cates.category_id2\":\"452\"}]}",
"goCriteriaMap": {
"__or": [
{
"product_cates.category_id2": "452"
}
]
}
},
{
"id": 4,
"cateId": 23,
"title": "亲子教育",
"icon": "https://img.ydlcdn.com/file/2022/08/10/lj8xgqhj875qp1nr.png",
"sortNumber": 3,
"ffroms": "",
"isShow": true,
"goType": "special_consultants",
"goUrl": "",
"goNativeUrl": "ydl-user://h5/h5?params\u003d%7B%22url%22%3A%22%22%7D",
"goCriteria": "{\"__or\":[{\"product_cates.category_id2\":\"23\"}]}",
"goCriteriaMap": {
"__or": [
{
"product_cates.category_id2": "23"
}
]
}
},
{
"id": 5,
"cateId": 25,
"title": "人际关系",
"icon": "https://img.ydlcdn.com/file/2022/08/10/q1nz3jwmam4qkju4.png",
"sortNumber": 4,
"ffroms": "",
"isShow": true,
"goType": "special_consultants",
"goUrl": "",
"goNativeUrl": "ydl-user://h5/h5?params\u003d%7B%22url%22%3A%22%22%7D",
"goCriteria": "{\"__or\":[{\"product_cates.category_id2\":\"25\"}]}",
"goCriteriaMap": {
"__or": [
{
"product_cates.category_id2": "25"
}
]
}
},
{
"id": 6,
"cateId": 27,
"title": "情绪压力",
"icon": "https://img.ydlcdn.com/file/2022/08/10/4ru778kbbuuq1qf2.png",
"sortNumber": 5,
"ffroms": "",
"isShow": true,
"goType": "special_consultants",
"goUrl": "",
"goNativeUrl": "ydl-user://h5/h5?params\u003d%7B%22url%22%3A%22%22%7D",
"goCriteria": "{\"__or\":[{\"product_cates.category_id2\":\"27\"}]}",
"goCriteriaMap": {
"__or": [
{
"product_cates.category_id2": "27"
}
]
}
},
{
"id": 7,
"cateId": 22,
"title": "职场发展",
"icon": "https://img.ydlcdn.com/file/2022/08/10/lie46088woez2hae.png",
"sortNumber": 6,
"ffroms": "",
"isShow": true,
"goType": "special_consultants",
"goUrl": "",
"goNativeUrl": "ydl-user://h5/h5?params\u003d%7B%22url%22%3A%22%22%7D",
"goCriteria": "{\"__or\":[{\"product_cates.category_id2\":\"22\"}]}",
"goCriteriaMap": {
"__or": [
{
"product_cates.category_id2": "22"
}
]
}
},
{
"id": 8,
"cateId": 26,
"title": "个人成长",
"icon": "https://img.ydlcdn.com/file/2022/08/10/c57lpetgloqzz6bp.png",
"sortNumber": 7,
"ffroms": "",
"isShow": true,
"goType": "special_consultants",
"goUrl": "",
"goNativeUrl": "ydl-user://h5/h5?params\u003d%7B%22url%22%3A%22%22%7D",
"goCriteria": "{\"__or\":[{\"product_cates.category_id2\":\"26\"}]}",
"goCriteriaMap": {
"__or": [
{
"product_cates.category_id2": "26"
}
]
}
},
{
"id": 1,
"cateId": 1,
"title": "恋爱情感",
"icon": "https://img.ydlcdn.com/file/2022/08/10/kqc8szvhncgxgjn9.png",
"sortNumber": 8,
"ffroms": "",
"isShow": true,
"goType": "special_consultants",
"goUrl": "",
"goNativeUrl": "ydl-user://h5/h5?params\u003d%7B%22url%22%3A%22%22%7D",
"goCriteria": "{\"__or\":[{\"product_cates.category_id2\":\"1\"}]}",
"goCriteriaMap": {
"__or": [
{
"product_cates.category_id2": "1"
}
]
}
},
{
"id": 9,
"cateId": 229,
"title": "海外咨询师",
"icon": "https://img.ydlcdn.com/file/2022/08/10/xzpg3j0hqg9yoxvn.png",
"sortNumber": 9,
"ffroms": "",
"isShow": true,
"goType": "special_consultants",
"goUrl": "",
"goNativeUrl": "ydl-user://h5/h5?params\u003d%7B%22url%22%3A%22%22%7D",
"goCriteria": "{\"country_code\":{\"ne\":\"1\"}}",
"goCriteriaMap": {
"country_code": {
"ne": "1"
}
}
},
{
"id": 10,
"cateId": 0,
"title": "全部",
"icon": "https://img.ydlcdn.com/file/2022/08/10/es0z8ykoum5nb8op.png",
"sortNumber": 10,
"ffroms": "",
"isShow": true,
"goType": "special_categories",
"goUrl": "",
"goNativeUrl": "ydl-user://h5/h5?params\u003d%7B%22url%22%3A%22%22%7D",
"goCriteria": "",
"goCriteriaMap": null
}
],
"askCategoryData": [ "askCategoryData": [
{ {
"cateId": 0, "cateId": 0,
......
m-home/src/main/assets/home_data_xlzx.json
[ [
{ {
"headerBean": { "headerBean": {
"goldList": [
{
"id": 2,
"cateId": 699,
"title": "心理健康",
"icon": "https://img.ydlcdn.com/file/2022/08/10/fkd769tv4dd0i4f4.png",
"sortNumber": 1,
"ffroms": "",
"isShow": true,
"goType": "special_consultants",
"goUrl": "",
"goNativeUrl": "ydl-user://h5/h5?params\u003d%7B%22url%22%3A%22%22%7D",
"goCriteria": "{\"__or\":[{\"product_cates.category_id2\":\"699\"}]}",
"goCriteriaMap": {
"__or": [
{
"product_cates.category_id2": "699"
}
]
}
},
{
"id": 3,
"cateId": 452,
"title": "婚姻家庭",
"icon": "https://img.ydlcdn.com/file/2022/08/10/oc8128o9mooj2n60.png",
"sortNumber": 2,
"ffroms": "",
"isShow": true,
"goType": "special_consultants",
"goUrl": "",
"goNativeUrl": "ydl-user://h5/h5?params\u003d%7B%22url%22%3A%22%22%7D",
"goCriteria": "{\"__or\":[{\"product_cates.category_id2\":\"452\"}]}",
"goCriteriaMap": {
"__or": [
{
"product_cates.category_id2": "452"
}
]
}
},
{
"id": 4,
"cateId": 23,
"title": "亲子教育",
"icon": "https://img.ydlcdn.com/file/2022/08/10/lj8xgqhj875qp1nr.png",
"sortNumber": 3,
"ffroms": "",
"isShow": true,
"goType": "special_consultants",
"goUrl": "",
"goNativeUrl": "ydl-user://h5/h5?params\u003d%7B%22url%22%3A%22%22%7D",
"goCriteria": "{\"__or\":[{\"product_cates.category_id2\":\"23\"}]}",
"goCriteriaMap": {
"__or": [
{
"product_cates.category_id2": "23"
}
]
}
},
{
"id": 5,
"cateId": 25,
"title": "人际关系",
"icon": "https://img.ydlcdn.com/file/2022/08/10/q1nz3jwmam4qkju4.png",
"sortNumber": 4,
"ffroms": "",
"isShow": true,
"goType": "special_consultants",
"goUrl": "",
"goNativeUrl": "ydl-user://h5/h5?params\u003d%7B%22url%22%3A%22%22%7D",
"goCriteria": "{\"__or\":[{\"product_cates.category_id2\":\"25\"}]}",
"goCriteriaMap": {
"__or": [
{
"product_cates.category_id2": "25"
}
]
}
},
{
"id": 6,
"cateId": 27,
"title": "情绪压力",
"icon": "https://img.ydlcdn.com/file/2022/08/10/4ru778kbbuuq1qf2.png",
"sortNumber": 5,
"ffroms": "",
"isShow": true,
"goType": "special_consultants",
"goUrl": "",
"goNativeUrl": "ydl-user://h5/h5?params\u003d%7B%22url%22%3A%22%22%7D",
"goCriteria": "{\"__or\":[{\"product_cates.category_id2\":\"27\"}]}",
"goCriteriaMap": {
"__or": [
{
"product_cates.category_id2": "27"
}
]
}
},
{
"id": 7,
"cateId": 22,
"title": "职场发展",
"icon": "https://img.ydlcdn.com/file/2022/08/10/lie46088woez2hae.png",
"sortNumber": 6,
"ffroms": "",
"isShow": true,
"goType": "special_consultants",
"goUrl": "",
"goNativeUrl": "ydl-user://h5/h5?params\u003d%7B%22url%22%3A%22%22%7D",
"goCriteria": "{\"__or\":[{\"product_cates.category_id2\":\"22\"}]}",
"goCriteriaMap": {
"__or": [
{
"product_cates.category_id2": "22"
}
]
}
},
{
"id": 8,
"cateId": 26,
"title": "个人成长",
"icon": "https://img.ydlcdn.com/file/2022/08/10/c57lpetgloqzz6bp.png",
"sortNumber": 7,
"ffroms": "",
"isShow": true,
"goType": "special_consultants",
"goUrl": "",
"goNativeUrl": "ydl-user://h5/h5?params\u003d%7B%22url%22%3A%22%22%7D",
"goCriteria": "{\"__or\":[{\"product_cates.category_id2\":\"26\"}]}",
"goCriteriaMap": {
"__or": [
{
"product_cates.category_id2": "26"
}
]
}
},
{
"id": 1,
"cateId": 1,
"title": "恋爱情感",
"icon": "https://img.ydlcdn.com/file/2022/08/10/kqc8szvhncgxgjn9.png",
"sortNumber": 8,
"ffroms": "",
"isShow": true,
"goType": "special_consultants",
"goUrl": "",
"goNativeUrl": "ydl-user://h5/h5?params\u003d%7B%22url%22%3A%22%22%7D",
"goCriteria": "{\"__or\":[{\"product_cates.category_id2\":\"1\"}]}",
"goCriteriaMap": {
"__or": [
{
"product_cates.category_id2": "1"
}
]
}
},
{
"id": 9,
"cateId": 229,
"title": "海外咨询师",
"icon": "https://img.ydlcdn.com/file/2022/08/10/xzpg3j0hqg9yoxvn.png",
"sortNumber": 9,
"ffroms": "",
"isShow": true,
"goType": "special_consultants",
"goUrl": "",
"goNativeUrl": "ydl-user://h5/h5?params\u003d%7B%22url%22%3A%22%22%7D",
"goCriteria": "{\"country_code\":{\"ne\":\"1\"}}",
"goCriteriaMap": {
"country_code": {
"ne": "1"
}
}
},
{
"id": 10,
"cateId": 0,
"title": "全部",
"icon": "https://img.ydlcdn.com/file/2022/08/10/es0z8ykoum5nb8op.png",
"sortNumber": 10,
"ffroms": "",
"isShow": true,
"goType": "special_categories",
"goUrl": "",
"goNativeUrl": "ydl-user://h5/h5?params\u003d%7B%22url%22%3A%22%22%7D",
"goCriteria": "",
"goCriteriaMap": null
}
],
"askCategoryData": [ "askCategoryData": [
{ {
"cateId": 1, "cateId": 1,
......
m-home/src/ydl/java/com/yidianling/home/ui/view/HomeButtonBannerView.kt
...@@ -85,12 +85,12 @@ class HomeButtonBannerView( ...@@ -85,12 +85,12 @@ class HomeButtonBannerView(
val viewWidth = screenWidth / 4 - 40 val viewWidth = screenWidth / 4 - 40
val viewHeight = viewWidth val viewHeight = viewWidth
buttonParams = LinearLayout.LayoutParams(viewWidth, viewHeight) buttonParams = LinearLayout.LayoutParams(viewWidth, viewHeight)
buttonParams!!.setMargins(0, 0, 15, 0) buttonParams!!.setMargins(0, 0, 20, 0)
buttonParamsFrame = FrameLayout.LayoutParams(viewWidth, viewHeight) buttonParamsFrame = FrameLayout.LayoutParams(viewWidth, viewHeight)
buttonParamsFrame2 = buttonParamsFrame2 =
FrameLayout.LayoutParams((viewWidth / 2.0).toInt(), (viewHeight / 2.3).toInt()) FrameLayout.LayoutParams((viewWidth / 2.0).toInt(), (viewHeight / 2.3).toInt())
buttonParamsFrame2!!.setMargins((((viewWidth / 12f).toInt())), 0, 0, 0) // buttonParamsFrame2!!.setMargins((((viewWidth / 20f).toInt())), 0, 0, 0)
// qingsuGif.layoutParams=buttonParamsFrame2 qingsuGif.layoutParams = buttonParamsFrame2
homeModuleButtonBannerFirst.layoutParams = buttonParams homeModuleButtonBannerFirst.layoutParams = buttonParams
homeModuleButtonBannerFourth.layoutParams = buttonParams homeModuleButtonBannerFourth.layoutParams = buttonParams
homeModuleButtonBannerSecond.layoutParams = buttonParams homeModuleButtonBannerSecond.layoutParams = buttonParams
......
m-home/src/ydl/res/layout/home_button_banner_view.xml
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="@dimen/platform_dp_8" android:paddingLeft="@dimen/platform_dp_8"
android:paddingTop="@dimen/platform_dp_8" android:paddingTop="@dimen/platform_dp_8"
android:paddingRight="@dimen/platform_dp_8"> >
<RelativeLayout <RelativeLayout
android:id="@+id/homeModuleButtonBannerFirst" android:id="@+id/homeModuleButtonBannerFirst"
...@@ -98,11 +98,7 @@ ...@@ -98,11 +98,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="78dp" android:layout_height="78dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/home_button_banner_fourth_img_new" android:background="@drawable/home_button_banner_fourth_img_new">
app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintLeft_toRightOf="@id/homeModuleButtonBannerThird"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent">
<RelativeLayout <RelativeLayout
android:id="@+id/homeModuleButtonBannerSecondFrame" android:id="@+id/homeModuleButtonBannerSecondFrame"
...@@ -131,7 +127,7 @@ ...@@ -131,7 +127,7 @@
<ImageView <ImageView
android:id="@+id/qingsuGif" android:id="@+id/qingsuGif"
android:layout_width="@dimen/platform_dp_48" android:layout_width="45dp"
android:layout_height="@dimen/platform_dp_22" android:layout_height="@dimen/platform_dp_22"
android:visibility="visible" /> android:visibility="visible" />
</FrameLayout> </FrameLayout>
......
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