diff --git a/app/src/main/java/com/cheng/bole/bean/AreaBean.kt b/app/src/main/java/com/cheng/bole/bean/AreaEntity.kt similarity index 66% rename from app/src/main/java/com/cheng/bole/bean/AreaBean.kt rename to app/src/main/java/com/cheng/bole/bean/AreaEntity.kt index 754437e..686e104 100644 --- a/app/src/main/java/com/cheng/bole/bean/AreaBean.kt +++ b/app/src/main/java/com/cheng/bole/bean/AreaEntity.kt @@ -2,11 +2,11 @@ package com.cheng.bole.bean import java.io.Serializable -class AreaBean( +class AreaEntity( val id: Int = 0, val pid: Int = 0, val name: String = "", val amount: String = "", - var children: MutableList = mutableListOf(), + var children: MutableList = mutableListOf(), var isChecked: Boolean = false ) : Serializable \ No newline at end of file diff --git a/app/src/main/java/com/cheng/bole/bean/AttachmentBean.kt b/app/src/main/java/com/cheng/bole/bean/AttachmentEntity.kt similarity index 77% rename from app/src/main/java/com/cheng/bole/bean/AttachmentBean.kt rename to app/src/main/java/com/cheng/bole/bean/AttachmentEntity.kt index 2d1fd37..68210d7 100644 --- a/app/src/main/java/com/cheng/bole/bean/AttachmentBean.kt +++ b/app/src/main/java/com/cheng/bole/bean/AttachmentEntity.kt @@ -2,7 +2,7 @@ package com.cheng.bole.bean import java.io.Serializable -data class AttachmentBean( +data class AttachmentEntity( val id: String = "", val url: String, val type: String, diff --git a/app/src/main/java/com/cheng/bole/bean/BidDetailBean.kt b/app/src/main/java/com/cheng/bole/bean/BidDetailEntity.kt similarity index 86% rename from app/src/main/java/com/cheng/bole/bean/BidDetailBean.kt rename to app/src/main/java/com/cheng/bole/bean/BidDetailEntity.kt index 8f4b345..5197422 100644 --- a/app/src/main/java/com/cheng/bole/bean/BidDetailBean.kt +++ b/app/src/main/java/com/cheng/bole/bean/BidDetailEntity.kt @@ -2,11 +2,11 @@ package com.cheng.bole.bean import java.io.Serializable -data class BidDetailBean( +data class BidDetailEntity( val city: Int, val city_id: String, val city_name: String, - val contact: List, + val contact: List, val contact_name: String, val contact_phone: String, val content_type: String, @@ -14,7 +14,7 @@ data class BidDetailBean( val info_source: String, val is_fav: Boolean, val issue_time: String, - val origin_attachment: List, + val origin_attachment: List, val origin_title: String, val origin_content: Any, val origin_url: String, diff --git a/app/src/main/java/com/cheng/bole/bean/BidItemBean.kt b/app/src/main/java/com/cheng/bole/bean/BidItemEntity.kt similarity index 91% rename from app/src/main/java/com/cheng/bole/bean/BidItemBean.kt rename to app/src/main/java/com/cheng/bole/bean/BidItemEntity.kt index 2babb78..f37412d 100644 --- a/app/src/main/java/com/cheng/bole/bean/BidItemBean.kt +++ b/app/src/main/java/com/cheng/bole/bean/BidItemEntity.kt @@ -1,6 +1,6 @@ package com.cheng.bole.bean -data class BidItemBean( +data class BidItemEntity( val id: String, val recommend_id: String, //订阅消息 val info_source: String, diff --git a/app/src/main/java/com/cheng/bole/bean/BidTypeBean.kt b/app/src/main/java/com/cheng/bole/bean/BidTypeEntity.kt similarity index 84% rename from app/src/main/java/com/cheng/bole/bean/BidTypeBean.kt rename to app/src/main/java/com/cheng/bole/bean/BidTypeEntity.kt index 6be2b3d..dfbeb4e 100644 --- a/app/src/main/java/com/cheng/bole/bean/BidTypeBean.kt +++ b/app/src/main/java/com/cheng/bole/bean/BidTypeEntity.kt @@ -2,7 +2,7 @@ package com.cheng.bole.bean import java.io.Serializable -data class BidTypeBean( +data class BidTypeEntity( val id: String = "", val name: String = "", val sort: Int = 0, diff --git a/app/src/main/java/com/cheng/bole/bean/CompanyBean.kt b/app/src/main/java/com/cheng/bole/bean/CompanyEntity.kt similarity index 68% rename from app/src/main/java/com/cheng/bole/bean/CompanyBean.kt rename to app/src/main/java/com/cheng/bole/bean/CompanyEntity.kt index ac9b933..60fe6f4 100644 --- a/app/src/main/java/com/cheng/bole/bean/CompanyBean.kt +++ b/app/src/main/java/com/cheng/bole/bean/CompanyEntity.kt @@ -2,11 +2,11 @@ package com.cheng.bole.bean import java.io.Serializable -data class CompanyBean( +data class CompanyEntity( val city_id: String, - val city_name: String, - val company_name: String, - val contact: List, + val city_name: String?, + val company_name: String?, + val contact: List, val create_time: String, val extra: Any?, val file_id: String, diff --git a/app/src/main/java/com/cheng/bole/bean/ContactsInfoBean.kt b/app/src/main/java/com/cheng/bole/bean/ContactsEntity.kt similarity index 97% rename from app/src/main/java/com/cheng/bole/bean/ContactsInfoBean.kt rename to app/src/main/java/com/cheng/bole/bean/ContactsEntity.kt index d894d3f..b461081 100644 --- a/app/src/main/java/com/cheng/bole/bean/ContactsInfoBean.kt +++ b/app/src/main/java/com/cheng/bole/bean/ContactsEntity.kt @@ -2,7 +2,7 @@ package com.cheng.bole.bean import java.io.Serializable -class ContactsInfoBean( +class ContactsEntity( val id: String, var name: String, var phone: String, diff --git a/app/src/main/java/com/cheng/bole/bean/CorpInfoBean.kt b/app/src/main/java/com/cheng/bole/bean/CorpEntity.kt similarity index 86% rename from app/src/main/java/com/cheng/bole/bean/CorpInfoBean.kt rename to app/src/main/java/com/cheng/bole/bean/CorpEntity.kt index 0896293..32c08ef 100644 --- a/app/src/main/java/com/cheng/bole/bean/CorpInfoBean.kt +++ b/app/src/main/java/com/cheng/bole/bean/CorpEntity.kt @@ -2,7 +2,7 @@ package com.cheng.bole.bean import java.io.Serializable -data class CorpInfoBean( +data class CorpEntity( val id: String, val corp_name: String, val sub_user_limit: String, diff --git a/app/src/main/java/com/cheng/bole/bean/GuideTotalBidInfoBean.kt b/app/src/main/java/com/cheng/bole/bean/GuideTotalBidEntity.kt similarity index 76% rename from app/src/main/java/com/cheng/bole/bean/GuideTotalBidInfoBean.kt rename to app/src/main/java/com/cheng/bole/bean/GuideTotalBidEntity.kt index 0c29fc3..c8eba22 100644 --- a/app/src/main/java/com/cheng/bole/bean/GuideTotalBidInfoBean.kt +++ b/app/src/main/java/com/cheng/bole/bean/GuideTotalBidEntity.kt @@ -2,7 +2,7 @@ package com.cheng.bole.bean import java.io.Serializable -data class GuideTotalBidInfoBean( +data class GuideTotalBidEntity( val bidCount: Int, val hasContact: Int, val maxMoney: Int, diff --git a/app/src/main/java/com/cheng/bole/bean/GuideUpdateInfoBean.kt b/app/src/main/java/com/cheng/bole/bean/GuideUpdateEntity.kt similarity index 67% rename from app/src/main/java/com/cheng/bole/bean/GuideUpdateInfoBean.kt rename to app/src/main/java/com/cheng/bole/bean/GuideUpdateEntity.kt index cc5b6ef..0550b2d 100644 --- a/app/src/main/java/com/cheng/bole/bean/GuideUpdateInfoBean.kt +++ b/app/src/main/java/com/cheng/bole/bean/GuideUpdateEntity.kt @@ -1,6 +1,6 @@ package com.cheng.bole.bean -data class GuideUpdateInfoBean( +data class GuideUpdateEntity( val count: Int, val day: String ) \ No newline at end of file diff --git a/app/src/main/java/com/cheng/bole/bean/HotWordBean.kt b/app/src/main/java/com/cheng/bole/bean/HotWordEntity.kt similarity index 95% rename from app/src/main/java/com/cheng/bole/bean/HotWordBean.kt rename to app/src/main/java/com/cheng/bole/bean/HotWordEntity.kt index f9d27cf..bbbe6fa 100644 --- a/app/src/main/java/com/cheng/bole/bean/HotWordBean.kt +++ b/app/src/main/java/com/cheng/bole/bean/HotWordEntity.kt @@ -2,7 +2,7 @@ package com.cheng.bole.bean import java.io.Serializable -data class HotWordBean( +data class HotWordEntity( val id: Int, val name: String, val children: List = emptyList(), diff --git a/app/src/main/java/com/cheng/bole/bean/MerchantGoodsBean.kt b/app/src/main/java/com/cheng/bole/bean/MerchantGoodsEntity.kt similarity index 82% rename from app/src/main/java/com/cheng/bole/bean/MerchantGoodsBean.kt rename to app/src/main/java/com/cheng/bole/bean/MerchantGoodsEntity.kt index 80bc398..d3141c9 100644 --- a/app/src/main/java/com/cheng/bole/bean/MerchantGoodsBean.kt +++ b/app/src/main/java/com/cheng/bole/bean/MerchantGoodsEntity.kt @@ -2,11 +2,11 @@ package com.cheng.bole.bean import java.io.Serializable -data class MerchantGoodsBean( +data class MerchantGoodsEntity( val city_id: String, val city_name: String, - val company: CompanyBean, - val contact: List, + val company: CompanyEntity, + val contact: List, val create_time: String, val file: List, val goods_description: String, diff --git a/app/src/main/java/com/cheng/bole/bean/OrderBean.kt b/app/src/main/java/com/cheng/bole/bean/OrderEntity.kt similarity index 96% rename from app/src/main/java/com/cheng/bole/bean/OrderBean.kt rename to app/src/main/java/com/cheng/bole/bean/OrderEntity.kt index 657e1d6..977c329 100644 --- a/app/src/main/java/com/cheng/bole/bean/OrderBean.kt +++ b/app/src/main/java/com/cheng/bole/bean/OrderEntity.kt @@ -2,7 +2,7 @@ package com.cheng.bole.bean import java.io.Serializable -data class OrderBean( +data class OrderEntity( val create_time: String, val goods_name: String, val id: String, diff --git a/app/src/main/java/com/cheng/bole/bean/SearchOptionBean.kt b/app/src/main/java/com/cheng/bole/bean/SearchOptionEntity.kt similarity index 66% rename from app/src/main/java/com/cheng/bole/bean/SearchOptionBean.kt rename to app/src/main/java/com/cheng/bole/bean/SearchOptionEntity.kt index 645746f..7824df5 100644 --- a/app/src/main/java/com/cheng/bole/bean/SearchOptionBean.kt +++ b/app/src/main/java/com/cheng/bole/bean/SearchOptionEntity.kt @@ -3,7 +3,7 @@ package com.cheng.bole.bean import com.cheng.bole.manager.UserConfigManager import java.io.Serializable -class SearchOptionBean( +class SearchOptionEntity( val title: String, val items: List, var isChecked: Boolean = false @@ -18,10 +18,10 @@ class SearchOptionBean( ) : Serializable companion object { - fun getAreaOptionList(): List { + fun getAreaOptionList(): List { val areaList = UserConfigManager.getAreaList() - val list = mutableListOf() - list.add(SearchOptionBean("全国地区", listOf( + val list = mutableListOf() + list.add(SearchOptionEntity("全国地区", listOf( OptionItem(0, "全国", true) ))) areaList.forEach { area -> @@ -30,14 +30,14 @@ class SearchOptionBean( area.children.forEach { city -> cityList.add(OptionItem(city.id, city.name)) } - list.add(SearchOptionBean(area.name, cityList)) + list.add(SearchOptionEntity(area.name, cityList)) } return list } - fun getTimeOptionList(): List { - val list = mutableListOf() - list.add(SearchOptionBean("时间排序", listOf( + fun getTimeOptionList(): List { + val list = mutableListOf() + list.add(SearchOptionEntity("时间排序", listOf( OptionItem(0, "全部时间", true), OptionItem(1, "近三天"), OptionItem(2, "近七天"), @@ -48,22 +48,22 @@ class SearchOptionBean( return list } - fun getSortOptionList(): List { - val list = mutableListOf() - list.add(SearchOptionBean("排序方式", listOf( + fun getSortOptionList(): List { + val list = mutableListOf() + list.add(SearchOptionEntity("排序方式", listOf( OptionItem(0, "综合排序", true), OptionItem(1, "时间排序") ))) return list } - fun getTypeOptionList(): List { - val list = mutableListOf() + fun getTypeOptionList(): List { + val list = mutableListOf() val typeList = mutableListOf() UserConfigManager.getBidTypes().forEach { typeList.add(OptionItem(it.id.toInt(), it.name)) } - list.add(SearchOptionBean("信息类型", typeList)) + list.add(SearchOptionEntity("信息类型", typeList)) return list } } diff --git a/app/src/main/java/com/cheng/bole/bean/SeatItemBean.kt b/app/src/main/java/com/cheng/bole/bean/SeatItemEntity.kt similarity index 83% rename from app/src/main/java/com/cheng/bole/bean/SeatItemBean.kt rename to app/src/main/java/com/cheng/bole/bean/SeatItemEntity.kt index baf2dd3..72b8133 100644 --- a/app/src/main/java/com/cheng/bole/bean/SeatItemBean.kt +++ b/app/src/main/java/com/cheng/bole/bean/SeatItemEntity.kt @@ -2,7 +2,7 @@ package com.cheng.bole.bean import java.io.Serializable -data class SeatItemBean( +data class SeatItemEntity( val avatar: String, val create_time: String, val id: String, diff --git a/app/src/main/java/com/cheng/bole/bean/SourceBean.kt b/app/src/main/java/com/cheng/bole/bean/SourceEntity.kt similarity index 71% rename from app/src/main/java/com/cheng/bole/bean/SourceBean.kt rename to app/src/main/java/com/cheng/bole/bean/SourceEntity.kt index 380383a..d8881e9 100644 --- a/app/src/main/java/com/cheng/bole/bean/SourceBean.kt +++ b/app/src/main/java/com/cheng/bole/bean/SourceEntity.kt @@ -2,7 +2,7 @@ package com.cheng.bole.bean import java.io.Serializable -data class SourceBean( +data class SourceEntity( val id: String, val name: String ): Serializable \ No newline at end of file diff --git a/app/src/main/java/com/cheng/bole/bean/SubscriptionBean.kt b/app/src/main/java/com/cheng/bole/bean/SubscriptionEntity.kt similarity index 85% rename from app/src/main/java/com/cheng/bole/bean/SubscriptionBean.kt rename to app/src/main/java/com/cheng/bole/bean/SubscriptionEntity.kt index ccfedf7..6e4f82c 100644 --- a/app/src/main/java/com/cheng/bole/bean/SubscriptionBean.kt +++ b/app/src/main/java/com/cheng/bole/bean/SubscriptionEntity.kt @@ -2,7 +2,7 @@ package com.cheng.bole.bean import java.io.Serializable -data class SubscriptionBean( +data class SubscriptionEntity( val city_id: List, val city_name: ArrayList, val create_time: String, @@ -13,7 +13,7 @@ data class SubscriptionBean( val push_receiver: String, val push_receiver_ks: String, val push_type: String, - val source: List, + val source: List, val source_id: List, val source_name: List, val type: Int, diff --git a/app/src/main/java/com/cheng/bole/bean/SubscriptionMessageBean.kt b/app/src/main/java/com/cheng/bole/bean/SubscriptionMessageEntity.kt similarity index 68% rename from app/src/main/java/com/cheng/bole/bean/SubscriptionMessageBean.kt rename to app/src/main/java/com/cheng/bole/bean/SubscriptionMessageEntity.kt index 5776bc0..2560d90 100644 --- a/app/src/main/java/com/cheng/bole/bean/SubscriptionMessageBean.kt +++ b/app/src/main/java/com/cheng/bole/bean/SubscriptionMessageEntity.kt @@ -1,10 +1,10 @@ package com.cheng.bole.bean -data class SubscriptionMessageBean( +data class SubscriptionMessageEntity( val id: String, val title: String, val message: String, val type: String, val create_time: String, - val extra: BidItemBean + val extra: BidItemEntity ) \ No newline at end of file diff --git a/app/src/main/java/com/cheng/bole/bean/UserAuthBean.kt b/app/src/main/java/com/cheng/bole/bean/UserAuthEntity.kt similarity index 88% rename from app/src/main/java/com/cheng/bole/bean/UserAuthBean.kt rename to app/src/main/java/com/cheng/bole/bean/UserAuthEntity.kt index 881e27e..a9b8ab9 100644 --- a/app/src/main/java/com/cheng/bole/bean/UserAuthBean.kt +++ b/app/src/main/java/com/cheng/bole/bean/UserAuthEntity.kt @@ -2,7 +2,7 @@ package com.cheng.bole.bean import java.io.Serializable -data class UserAuthBean( +data class UserAuthEntity( val auth: Boolean, val auth_ad: Boolean, val scene: String, diff --git a/app/src/main/java/com/cheng/bole/bean/ZZDBInfoBean.kt b/app/src/main/java/com/cheng/bole/bean/ZZDBInfoEntity.kt similarity index 80% rename from app/src/main/java/com/cheng/bole/bean/ZZDBInfoBean.kt rename to app/src/main/java/com/cheng/bole/bean/ZZDBInfoEntity.kt index 53f64f3..a59ab8c 100644 --- a/app/src/main/java/com/cheng/bole/bean/ZZDBInfoBean.kt +++ b/app/src/main/java/com/cheng/bole/bean/ZZDBInfoEntity.kt @@ -2,7 +2,7 @@ package com.cheng.bole.bean import java.io.Serializable -data class ZZDBInfoBean( +data class ZZDBInfoEntity( val id: String, val name: String, val createTime: String, @@ -14,5 +14,5 @@ data class ZZDBInfoBean( val range: String, val status: String, val updateTime: String, - val children: List + val children: List ) : Serializable \ No newline at end of file diff --git a/app/src/main/java/com/cheng/bole/common/Constants.kt b/app/src/main/java/com/cheng/bole/common/Constants.kt index da34a30..3fb1aa2 100644 --- a/app/src/main/java/com/cheng/bole/common/Constants.kt +++ b/app/src/main/java/com/cheng/bole/common/Constants.kt @@ -13,7 +13,7 @@ object Constants { const val AppFilter = "${BuildConfig.APPLICATION_ID}.fileprovider" - const val WechatAppId = ""//微信APPID + const val WechatAppId = "wx2339becbc48e741d"//微信APPID const val WechatAppSecret = ""//微信secret const val UmengAppkey = "692528cc8560e34872f36551"//友盟appKey diff --git a/app/src/main/java/com/cheng/bole/common/EventConstants.kt b/app/src/main/java/com/cheng/bole/common/EventConstants.kt index b6988c6..89328c2 100644 --- a/app/src/main/java/com/cheng/bole/common/EventConstants.kt +++ b/app/src/main/java/com/cheng/bole/common/EventConstants.kt @@ -70,6 +70,8 @@ object EventConstants { const val JUMP_TO_SEAT_MANAGE = "client.jump.to.seat.manage" //跳转到席位管理 + const val JUMP_TO_MY_PUBLISH = "client.jump.to.my.publish" //跳转到我的发布 + const val JUMP_TO_FEEDBACK = "client.jump.to.feedback" //跳转到意见反馈 const val JUMP_TO_SERVICE = "client.jump.to.service" //跳转到联系客服 diff --git a/app/src/main/java/com/cheng/bole/event/ContactsEvent.kt b/app/src/main/java/com/cheng/bole/event/ContactsEvent.kt index 5a2d128..16b37cc 100644 --- a/app/src/main/java/com/cheng/bole/event/ContactsEvent.kt +++ b/app/src/main/java/com/cheng/bole/event/ContactsEvent.kt @@ -1,6 +1,6 @@ package com.cheng.bole.event -import com.cheng.bole.bean.ContactsInfoBean +import com.cheng.bole.bean.ContactsEntity -class ContactsEvent(val contacts: ContactsInfoBean) { +class ContactsEvent(val contacts: ContactsEntity) { } \ No newline at end of file diff --git a/app/src/main/java/com/cheng/bole/event/SourceDataEvent.kt b/app/src/main/java/com/cheng/bole/event/SourceDataEvent.kt index a33fe66..f2d1ff7 100644 --- a/app/src/main/java/com/cheng/bole/event/SourceDataEvent.kt +++ b/app/src/main/java/com/cheng/bole/event/SourceDataEvent.kt @@ -1,6 +1,6 @@ package com.cheng.bole.event -import com.cheng.bole.bean.SourceBean +import com.cheng.bole.bean.SourceEntity -class SourceDataEvent(val list: List) { +class SourceDataEvent(val list: List) { } \ No newline at end of file diff --git a/app/src/main/java/com/cheng/bole/manager/ContactsManager.kt b/app/src/main/java/com/cheng/bole/manager/ContactsManager.kt index 5987506..d2c188d 100644 --- a/app/src/main/java/com/cheng/bole/manager/ContactsManager.kt +++ b/app/src/main/java/com/cheng/bole/manager/ContactsManager.kt @@ -1,20 +1,20 @@ package com.cheng.bole.manager import android.text.TextUtils -import com.cheng.bole.bean.ContactsInfoBean +import com.cheng.bole.bean.ContactsEntity import com.example.base.utils.MMKVUtils import com.google.gson.Gson import com.google.gson.reflect.TypeToken object ContactsManager { - fun add(contacts: ContactsInfoBean) { + fun add(contacts: ContactsEntity) { val list = all() list.add(contacts) MMKVUtils.put("contacts_list", Gson().toJson(list)) } - fun update(contacts: ContactsInfoBean) { + fun update(contacts: ContactsEntity) { val list = all() val oldContacts = list.find { it.id == contacts.id } if (oldContacts != null) { @@ -34,10 +34,10 @@ object ContactsManager { MMKVUtils.put("contacts_list", Gson().toJson(list)) } - fun all(): MutableList { + fun all(): MutableList { val str = MMKVUtils.getString("contacts_list") return if (!TextUtils.isEmpty(str)) { - Gson().fromJson(str, object : TypeToken>(){}.type) + Gson().fromJson(str, object : TypeToken>(){}.type) } else { mutableListOf() } diff --git a/app/src/main/java/com/cheng/bole/manager/UserConfigManager.kt b/app/src/main/java/com/cheng/bole/manager/UserConfigManager.kt index a732bcb..746f66e 100644 --- a/app/src/main/java/com/cheng/bole/manager/UserConfigManager.kt +++ b/app/src/main/java/com/cheng/bole/manager/UserConfigManager.kt @@ -3,8 +3,8 @@ package com.cheng.bole.manager import android.os.Build import android.text.TextUtils import androidx.lifecycle.MutableLiveData -import com.cheng.bole.bean.BidTypeBean -import com.cheng.bole.bean.AreaBean +import com.cheng.bole.bean.BidTypeEntity +import com.cheng.bole.bean.AreaEntity import com.cheng.bole.net.ApiFactory import com.example.base.extensions.toast import com.example.base.utils.MMKVUtils @@ -226,16 +226,16 @@ object UserConfigManager { /** * 地区列表 */ - fun saveAreaList(list: List) { + fun saveAreaList(list: List) { if (list.isNotEmpty()) { MMKVUtils.put("area_list", Gson().toJson(list)) } } - fun getAreaList(): MutableList { + fun getAreaList(): MutableList { val str = MMKVUtils.getString("area_list") if (!TextUtils.isEmpty(str)) { - return Gson().fromJson(str, object : TypeToken>() {}.type) + return Gson().fromJson(str, object : TypeToken>() {}.type) } return mutableListOf() } @@ -243,8 +243,8 @@ object UserConfigManager { /** * 城市列表 */ - fun getCityList(): List { - val list = mutableListOf() + fun getCityList(): List { + val list = mutableListOf() getAreaList().forEach { list.addAll(it.children) } @@ -254,14 +254,14 @@ object UserConfigManager { /** * 招标类型 */ - fun saveBidTypes(list: List) { + fun saveBidTypes(list: List) { MMKVUtils.put("bid_type", Gson().toJson(list)) } - fun getBidTypes(): List { + fun getBidTypes(): List { val str = MMKVUtils.getString("bid_type") if (!TextUtils.isEmpty(str)) { - return Gson().fromJson(str, object : TypeToken>() {}.type) + return Gson().fromJson(str, object : TypeToken>() {}.type) } return emptyList() } diff --git a/app/src/main/java/com/cheng/bole/net/ApiService.kt b/app/src/main/java/com/cheng/bole/net/ApiService.kt index 9c18049..55a34e5 100644 --- a/app/src/main/java/com/cheng/bole/net/ApiService.kt +++ b/app/src/main/java/com/cheng/bole/net/ApiService.kt @@ -1,28 +1,28 @@ package com.cheng.bole.net import com.cheng.bole.bean.AccountEntity -import com.cheng.bole.bean.AreaBean -import com.cheng.bole.bean.BidDetailBean -import com.cheng.bole.bean.BidItemBean -import com.cheng.bole.bean.BidTypeBean -import com.cheng.bole.bean.CompanyBean -import com.cheng.bole.bean.CorpInfoBean +import com.cheng.bole.bean.AreaEntity +import com.cheng.bole.bean.BidDetailEntity +import com.cheng.bole.bean.BidItemEntity +import com.cheng.bole.bean.BidTypeEntity +import com.cheng.bole.bean.CompanyEntity +import com.cheng.bole.bean.CorpEntity import com.cheng.bole.bean.CouponEntity -import com.cheng.bole.bean.GuideTotalBidInfoBean -import com.cheng.bole.bean.GuideUpdateInfoBean -import com.cheng.bole.bean.HotWordBean +import com.cheng.bole.bean.GuideTotalBidEntity +import com.cheng.bole.bean.GuideUpdateEntity +import com.cheng.bole.bean.HotWordEntity import com.cheng.bole.bean.LoginEntity -import com.cheng.bole.bean.MerchantGoodsBean -import com.cheng.bole.bean.OrderBean +import com.cheng.bole.bean.MerchantGoodsEntity +import com.cheng.bole.bean.OrderEntity import com.cheng.bole.bean.OrderPayEntity -import com.cheng.bole.bean.ZZDBInfoBean -import com.cheng.bole.bean.SeatItemBean +import com.cheng.bole.bean.ZZDBInfoEntity +import com.cheng.bole.bean.SeatItemEntity import com.cheng.bole.bean.SendCodeEntity -import com.cheng.bole.bean.SourceBean -import com.cheng.bole.bean.SubscriptionBean -import com.cheng.bole.bean.SubscriptionMessageBean +import com.cheng.bole.bean.SourceEntity +import com.cheng.bole.bean.SubscriptionEntity +import com.cheng.bole.bean.SubscriptionMessageEntity import com.cheng.bole.bean.UploadFileEntity -import com.cheng.bole.bean.UserAuthBean +import com.cheng.bole.bean.UserAuthEntity import com.cheng.bole.bean.UserConfigEntity import com.cheng.bole.bean.UserEntity import com.cheng.bole.bean.VipGoodsEntity @@ -175,13 +175,13 @@ interface ApiService { * 订单列表查询 */ @GET("/api/order") - suspend fun getOrderList(@Query("status") status: String): HttpBaseResult> + suspend fun getOrderList(@Query("status") status: String): HttpBaseResult> /** * 订单查询 */ @GET("/api/order") - suspend fun getOrderInfo(@Query("order_id") orderId: String): HttpBaseResult + suspend fun getOrderInfo(@Query("order_id") orderId: String): HttpBaseResult /** * 更新订单 @@ -193,7 +193,7 @@ interface ApiService { * 权限验证 */ @GET("/api/user/auth") - suspend fun checkAuth(@Query("scene") scene: String? = "info"): HttpBaseResult + suspend fun checkAuth(@Query("scene") scene: String? = "info"): HttpBaseResult /** * 权限上报 @@ -205,19 +205,19 @@ interface ApiService { * 引导页推荐热词树 */ @GET("/api/hot_word") - suspend fun getHotWordList(): HttpBaseResult> + suspend fun getHotWordList(): HttpBaseResult> /** * 城市列表 */ @GET("/api/city") - suspend fun getAreaList(): HttpBaseResult> + suspend fun getAreaList(): HttpBaseResult> /** * 获取当前城市 */ @GET("/api/city/default") - suspend fun getUserCity(): HttpBaseResult + suspend fun getUserCity(): HttpBaseResult /** * 总计商机 @@ -227,13 +227,13 @@ interface ApiService { @Query("keyword") keywords: String, @Query("city_id") cityIds: String, @Query("second_kind_num") kindCount: String - ): HttpBaseResult + ): HttpBaseResult /** * 每日更新 */ @GET("/api/info/update/num") - suspend fun getUpdateNum(@Query("size") size: String): HttpBaseResult> + suspend fun getUpdateNum(@Query("size") size: String): HttpBaseResult> /** * 会员页轮播提示 @@ -245,13 +245,13 @@ interface ApiService { * 订阅列表 */ @GET("/api/recommend/subscription") - suspend fun getSubscriptionList(): HttpBaseResult> + suspend fun getSubscriptionList(): HttpBaseResult> /** * 订阅推荐列表 */ @GET("/api/recommend") - suspend fun getRecommendList(@QueryMap map: Map): HttpBaseResult> + suspend fun getRecommendList(@QueryMap map: Map): HttpBaseResult> /** * 添加订阅 @@ -275,7 +275,7 @@ interface ApiService { * 招标公告类型 */ @GET("/api/info/type") - suspend fun getBidTypeList(): HttpBaseResult> + suspend fun getBidTypeList(): HttpBaseResult> /** * 标讯详情 @@ -287,13 +287,13 @@ interface ApiService { @Query("id") id: String, @Query("source") source: String, @Query("info_source") infoSource: String - ): HttpBaseResult + ): HttpBaseResult /** * 收藏列表 */ @GET("/api/info/favorite/search") - suspend fun getFavoriteList(): HttpBaseResult> + suspend fun getFavoriteList(): HttpBaseResult> /** * 收藏标讯 @@ -317,37 +317,37 @@ interface ApiService { * 热门数据源 */ @GET("/api/source/hot") - suspend fun getHotSources(): HttpBaseResult> + suspend fun getHotSources(): HttpBaseResult> /** * 搜索数据源 */ @GET("/api/source/search") - suspend fun searchSource(@Query("keyword") keyword: String, @Query("size") size: String = "10"): HttpBaseResult> + suspend fun searchSource(@Query("keyword") keyword: String, @Query("size") size: String = "10"): HttpBaseResult> /** * 搜索页最新标讯和本地标讯 */ @GET("/api/info/ks/search") - suspend fun getNewestLocalBidList(@QueryMap map: Map): HttpBaseResult> + suspend fun getNewestLocalBidList(@QueryMap map: Map): HttpBaseResult> /** * 项目搜索 */ @GET("/api/search") - suspend fun search(@QueryMap map: Map): HttpBaseResult> + suspend fun search(@QueryMap map: Map): HttpBaseResult> /** * 供应商搜索 */ @GET("/api/user/goods/search") - suspend fun searchSupplier(@QueryMap map: Map): HttpBaseResult> + suspend fun searchSupplier(@QueryMap map: Map): HttpBaseResult> /** * 浏览历史 */ @GET("/api/info/history") - suspend fun getViewHistoryList(): HttpBaseResult> + suspend fun getViewHistoryList(): HttpBaseResult> /** * 添加代办 @@ -359,19 +359,19 @@ interface ApiService { * 资质代办列表 */ @GET("/api/agency/cert") - suspend fun getAgencyList(@QueryMap map: Map): HttpBaseResult> + suspend fun getAgencyList(@QueryMap map: Map): HttpBaseResult> /** * 我的标讯列表 */ @GET("/api/user/info") - suspend fun getMyBidList(@QueryMap map: Map): HttpBaseResult> + suspend fun getMyBidList(@QueryMap map: Map): HttpBaseResult> /** * 查询标讯 */ @GET("/api/user/info/{id}") - suspend fun getBidInfo(@Path("id") id: String): HttpBaseResult + suspend fun getBidInfo(@Path("id") id: String): HttpBaseResult /** * 添加标讯 @@ -395,13 +395,13 @@ interface ApiService { * 我的商品列表 */ @GET("/api/user/goods") - suspend fun getMyGoodsList(@QueryMap map: Map): HttpBaseResult> + suspend fun getMyGoodsList(@QueryMap map: Map): HttpBaseResult> /** * 查询商品 */ @GET("/api/user/goods/{id}") - suspend fun getGoodsInfo(@Path("id") id: String): HttpBaseResult + suspend fun getGoodsInfo(@Path("id") id: String): HttpBaseResult /** * 添加商品 @@ -425,7 +425,7 @@ interface ApiService { * 获取用户公司信息 */ @GET("/api/user/company") - suspend fun getCompanyInfo(): HttpBaseResult + suspend fun getCompanyInfo(): HttpBaseResult /** * 提交用户公司信息 @@ -443,13 +443,13 @@ interface ApiService { * 席位信息 */ @GET("/api/corp") - suspend fun getSeatInfo(): HttpBaseResult + suspend fun getSeatInfo(): HttpBaseResult /** * 席位列表 */ @GET("/api/corp/user") - suspend fun getSeatList(@Query("page") page: String = "1", @Query("size") size: String = "100"): HttpBaseResult> + suspend fun getSeatList(@Query("page") page: String = "1", @Query("size") size: String = "100"): HttpBaseResult> /** * 添加席位 @@ -467,5 +467,5 @@ interface ApiService { * 订阅消息列表 */ @GET("/api/message/ks") - suspend fun getSubscriptionMessage(@QueryMap map: Map): HttpBaseResult> + suspend fun getSubscriptionMessage(@QueryMap map: Map): HttpBaseResult> } \ No newline at end of file diff --git a/app/src/main/java/com/cheng/bole/ui/dialog/DownloadAttachmentDialog.kt b/app/src/main/java/com/cheng/bole/ui/dialog/DownloadAttachmentDialog.kt index bd39c15..acd3a88 100644 --- a/app/src/main/java/com/cheng/bole/ui/dialog/DownloadAttachmentDialog.kt +++ b/app/src/main/java/com/cheng/bole/ui/dialog/DownloadAttachmentDialog.kt @@ -14,7 +14,7 @@ import androidx.lifecycle.lifecycleScope import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.cheng.bole.R -import com.cheng.bole.bean.AttachmentBean +import com.cheng.bole.bean.AttachmentEntity import com.cheng.bole.common.Constants import com.cheng.bole.databinding.DialogDownloadAttachmentBinding import com.cheng.bole.manager.DialogEnum @@ -34,7 +34,7 @@ import kotlinx.coroutines.launch class DownloadAttachmentDialog : DialogFragment() { private val mAdapter by lazy { AttachmentAdapter() } - private val attachmentList = mutableListOf() + private val attachmentList = mutableListOf() private val loadingDialog by lazy { LoadingDialog(requireContext()) } @@ -67,7 +67,7 @@ class DownloadAttachmentDialog : DialogFragment() { val listStr = arguments?.getString("list") if (!TextUtils.isEmpty(listStr)) { - attachmentList.addAll(Gson().fromJson(listStr, object : TypeToken>() {}.type)) + attachmentList.addAll(Gson().fromJson(listStr, object : TypeToken>() {}.type)) } binding.rvAttachment.adapter = mAdapter mAdapter.setList(attachmentList) @@ -89,7 +89,7 @@ class DownloadAttachmentDialog : DialogFragment() { return dialog } - private fun download(bean: AttachmentBean) { + private fun download(bean: AttachmentEntity) { loadingDialog.show() lifecycleScope.launch(Dispatchers.IO) { DownLoadUtils.getInstance() @@ -118,7 +118,7 @@ class DownloadAttachmentDialog : DialogFragment() { } companion object { - fun newInstance(list: List): DownloadAttachmentDialog { + fun newInstance(list: List): DownloadAttachmentDialog { val arg = Bundle() arg.putString("list", Gson().toJson(list)) val fragment = DownloadAttachmentDialog() @@ -127,12 +127,12 @@ class DownloadAttachmentDialog : DialogFragment() { } } - inner class AttachmentAdapter : BaseQuickAdapter(R.layout.listitem_bid_attachment) { + inner class AttachmentAdapter : BaseQuickAdapter(R.layout.listitem_bid_attachment) { init { addChildClickViewIds(R.id.btn_download) } - override fun convert(holder: BaseViewHolder, item: AttachmentBean) { + override fun convert(holder: BaseViewHolder, item: AttachmentEntity) { SpanUtils.with(holder.getView(R.id.tv_name)) .appendImage(R.mipmap.ic_pdf_attachment) .appendSpace(DensityUtils.dp2px(8f)) diff --git a/app/src/main/java/com/cheng/bole/ui/dialog/PopupDialog.kt b/app/src/main/java/com/cheng/bole/ui/dialog/PopupDialog.kt index 230e693..07d247b 100644 --- a/app/src/main/java/com/cheng/bole/ui/dialog/PopupDialog.kt +++ b/app/src/main/java/com/cheng/bole/ui/dialog/PopupDialog.kt @@ -10,7 +10,7 @@ import android.view.ViewGroup import android.widget.PopupWindow import androidx.fragment.app.FragmentManager import com.cheng.bole.R -import com.cheng.bole.bean.SearchOptionBean +import com.cheng.bole.bean.SearchOptionEntity import com.cheng.bole.databinding.PopAboutTipBinding import com.cheng.bole.databinding.PopupSearchOptionsBinding import com.cheng.bole.ui.activity.PublicActivity @@ -19,7 +19,6 @@ import com.cheng.bole.ui.fragment.mine.about.AppConfigFragment import com.cheng.bole.ui.fragment.search.list.SearchOptionChildAdapter import com.cheng.bole.ui.fragment.search.list.SearchOptionParentAdapter import com.cheng.bole.utils.DateUtils -import com.efs.sdk.memleaksdk.monitor.internal.bi import com.example.base.decoration.DividerItemDecoration import com.example.base.extensions.getColor import com.example.base.extensions.getYYYYMMDD @@ -56,7 +55,7 @@ object PopupDialog { popWindow.showAsDropDown(v, 0, 0) } - fun showSearchAreaOptions(context: Context, v: View, cityList: List, onDismiss: () -> Unit, callback: (List) -> Unit) { + fun showSearchAreaOptions(context: Context, v: View, cityList: List, onDismiss: () -> Unit, callback: (List) -> Unit) { val view = LayoutInflater.from(context).inflate(R.layout.popup_search_options, null, false) val binding = PopupSearchOptionsBinding.bind(view) @@ -66,7 +65,7 @@ object PopupDialog { val childAdapter = SearchOptionChildAdapter(true) binding.rvChild.adapter = childAdapter - val optionList = SearchOptionBean.getAreaOptionList() + val optionList = SearchOptionEntity.getAreaOptionList() if (cityList.isNotEmpty()) { optionList[0].isChecked = false optionList[0].items[0].isChecked = false @@ -144,14 +143,14 @@ object PopupDialog { } binding.btnReset.onClick { - val optionList = SearchOptionBean.getAreaOptionList() + val optionList = SearchOptionEntity.getAreaOptionList() optionList[0].isChecked = true parentAdapter.setList(optionList) childAdapter.setList(optionList[0].items) } binding.btnNext.onClick { - val list = mutableListOf() + val list = mutableListOf() parentAdapter.data.forEachIndexed { index, option -> if (index != 0) { list.addAll(option.items.filter { it.isChecked && it.id != 0 }) @@ -171,7 +170,7 @@ object PopupDialog { } @SuppressLint("NotifyDataSetChanged") - fun showSearchTimeOptions(context: Context, v: View, manager: FragmentManager, time: SearchOptionBean.OptionItem?, onDismiss: () -> Unit, callback: (SearchOptionBean.OptionItem) -> Unit) { + fun showSearchTimeOptions(context: Context, v: View, manager: FragmentManager, time: SearchOptionEntity.OptionItem?, onDismiss: () -> Unit, callback: (SearchOptionEntity.OptionItem) -> Unit) { val view = LayoutInflater.from(context).inflate(R.layout.popup_search_options, null, false) val binding = PopupSearchOptionsBinding.bind(view) @@ -185,7 +184,7 @@ object PopupDialog { binding.rvChild.adapter = adapter binding.rvChild.addItemDecoration(DividerItemDecoration(DensityUtils.dp2px(16f), DensityUtils.dp2px(16f), color = getColor(R.color.color_eeeeee))) - val optionList = SearchOptionBean.getTimeOptionList()[0] + val optionList = SearchOptionEntity.getTimeOptionList()[0] if (time != null) { if (time.id == -1) { optionList.items[0].isChecked = false @@ -273,7 +272,7 @@ object PopupDialog { binding.tvStartTime.text = "" binding.tvEndTime.text = "" - adapter.setList(SearchOptionBean.getTimeOptionList()[0].items) + adapter.setList(SearchOptionEntity.getTimeOptionList()[0].items) } binding.btnNext.onClick { @@ -290,7 +289,7 @@ object PopupDialog { toast("请选择结束时间") return@onClick } - option = SearchOptionBean.OptionItem(-1, startTime = "${startTime / 1000}", endTime = "${endTime / 1000}") + option = SearchOptionEntity.OptionItem(-1, startTime = "${startTime / 1000}", endTime = "${endTime / 1000}") } callback.invoke(option) popWindow.dismiss() @@ -301,7 +300,7 @@ object PopupDialog { popWindow.showAsDropDown(v, 0, 0) } - fun showSearchSortOptions(context: Context, v: View, sort: SearchOptionBean.OptionItem?, onDismiss: () -> Unit, callback: (SearchOptionBean.OptionItem) -> Unit) { + fun showSearchSortOptions(context: Context, v: View, sort: SearchOptionEntity.OptionItem?, onDismiss: () -> Unit, callback: (SearchOptionEntity.OptionItem) -> Unit) { val view = LayoutInflater.from(context).inflate(R.layout.popup_search_options, null, false) val binding = PopupSearchOptionsBinding.bind(view) @@ -311,7 +310,7 @@ object PopupDialog { binding.rvChild.adapter = adapter binding.rvChild.addItemDecoration(DividerItemDecoration(DensityUtils.dp2px(16f), DensityUtils.dp2px(16f), color = getColor(R.color.color_eeeeee))) - val optionList = SearchOptionBean.getSortOptionList()[0] + val optionList = SearchOptionEntity.getSortOptionList()[0] if (sort != null) { optionList.items.forEach { it.isChecked = it.id == sort.id @@ -333,7 +332,7 @@ object PopupDialog { adapter.notifyDataSetChanged() } - binding.btnReset.onClick { adapter.setList(SearchOptionBean.getSortOptionList()[0].items) } + binding.btnReset.onClick { adapter.setList(SearchOptionEntity.getSortOptionList()[0].items) } binding.btnNext.onClick { val option = adapter.data.find { it.isChecked } @@ -348,7 +347,7 @@ object PopupDialog { popWindow.showAsDropDown(v, 0, 0) } - fun showSearchTypeOptions(context: Context, v: View, typeList: List, onDismiss: () -> Unit, callback: (List) -> Unit) { + fun showSearchTypeOptions(context: Context, v: View, typeList: List, onDismiss: () -> Unit, callback: (List) -> Unit) { val view = LayoutInflater.from(context).inflate(R.layout.popup_search_options, null, false) val binding = PopupSearchOptionsBinding.bind(view) @@ -358,7 +357,7 @@ object PopupDialog { binding.rvChild.adapter = adapter binding.rvChild.addItemDecoration(DividerItemDecoration(DensityUtils.dp2px(16f), DensityUtils.dp2px(16f), color = getColor(R.color.color_eeeeee))) - val optionList = SearchOptionBean.getTypeOptionList()[0] + val optionList = SearchOptionEntity.getTypeOptionList()[0] if (typeList.isNotEmpty()) { optionList.items.forEach { item -> if (typeList.find { it.id == item.id } != null) { @@ -381,7 +380,7 @@ object PopupDialog { adapter.notifyDataSetChanged() } - binding.btnReset.onClick { adapter.setList(SearchOptionBean.getTypeOptionList()[0].items) } + binding.btnReset.onClick { adapter.setList(SearchOptionEntity.getTypeOptionList()[0].items) } binding.btnNext.onClick { val list = adapter.data.filter { it.isChecked } diff --git a/app/src/main/java/com/cheng/bole/ui/dialog/SelectAreaDialog.kt b/app/src/main/java/com/cheng/bole/ui/dialog/SelectAreaDialog.kt index 9fc8558..1e174d8 100644 --- a/app/src/main/java/com/cheng/bole/ui/dialog/SelectAreaDialog.kt +++ b/app/src/main/java/com/cheng/bole/ui/dialog/SelectAreaDialog.kt @@ -14,7 +14,7 @@ import androidx.fragment.app.DialogFragment import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.cheng.bole.R -import com.cheng.bole.bean.AreaBean +import com.cheng.bole.bean.AreaEntity import com.cheng.bole.databinding.DialogSelectAreaBinding import com.cheng.bole.manager.UserConfigManager import com.example.base.extensions.getColor @@ -29,7 +29,7 @@ class SelectAreaDialog : DialogFragment() { private val isSingle by lazy { arguments?.getBoolean("isSingle") ?: false } private val showAll by lazy { arguments?.getBoolean("showAll") ?: false } - private var mOnBackListener: ((List) -> Unit)? = null //回调事件 + private var mOnBackListener: ((List) -> Unit)? = null //回调事件 private lateinit var binding: DialogSelectAreaBinding @@ -57,8 +57,8 @@ class SelectAreaDialog : DialogFragment() { val listStr = arguments?.getString("list") val defaultCityList = if (!TextUtils.isEmpty(listStr)) { - Gson().fromJson(listStr, object : TypeToken>() {}.type) - } else emptyList() + Gson().fromJson(listStr, object : TypeToken>() {}.type) + } else emptyList() val areaAdapter = AreaAdapter() binding.rvParent.adapter = areaAdapter @@ -68,8 +68,8 @@ class SelectAreaDialog : DialogFragment() { val areaList = UserConfigManager.getAreaList() if (!isSingle) { - areaList.add(0, AreaBean(0, name = "全国地区")) - areaList.forEach { it.children.add(0, AreaBean(0, name = "全部")) } + areaList.add(0, AreaEntity(0, name = "全国地区")) + areaList.forEach { it.children.add(0, AreaEntity(0, name = "全部")) } if (defaultCityList.size == UserConfigManager.getCityList().size) { areaList[0].isChecked = true areaList[0].children[0].isChecked = true @@ -91,7 +91,7 @@ class SelectAreaDialog : DialogFragment() { } } else { if (showAll) { - areaList.add(0, AreaBean(0, name = "全国地区", children = mutableListOf(AreaBean(0, name = "全国")))) + areaList.add(0, AreaEntity(0, name = "全国地区", children = mutableListOf(AreaEntity(0, name = "全国")))) if (defaultCityList.isEmpty()) { areaList[0].isChecked = true areaList[0].children[0].isChecked = true @@ -166,7 +166,7 @@ class SelectAreaDialog : DialogFragment() { } binding.btnNext.onClick { - val selectedCityList = mutableListOf() + val selectedCityList = mutableListOf() if (areaAdapter.data[0].children[0].id == 0 && areaAdapter.data[0].children[0].isChecked) { areaAdapter.data.forEach { selectedCityList.addAll(it.children.filter { item -> item.id != 0 }) @@ -191,12 +191,12 @@ class SelectAreaDialog : DialogFragment() { return dialog } - fun setOnSelectListener(listener: ((List) -> Unit)) { + fun setOnSelectListener(listener: ((List) -> Unit)) { mOnBackListener = listener } companion object { - fun newInstance(list: List = emptyList(), isSingle: Boolean = false, showAll: Boolean = false): SelectAreaDialog { + fun newInstance(list: List = emptyList(), isSingle: Boolean = false, showAll: Boolean = false): SelectAreaDialog { val arg = Bundle() arg.putString("list", Gson().toJson(list)) arg.putBoolean("isSingle", isSingle) @@ -207,9 +207,9 @@ class SelectAreaDialog : DialogFragment() { } } - class AreaAdapter() : BaseQuickAdapter(R.layout.listitem_search_option_parent) { + class AreaAdapter() : BaseQuickAdapter(R.layout.listitem_search_option_parent) { @SuppressLint("NotifyDataSetChanged") - override fun convert(holder: BaseViewHolder, item: AreaBean) { + override fun convert(holder: BaseViewHolder, item: AreaEntity) { holder.setText(R.id.tv_name, item.name) holder.setVisible(R.id.view_tag, item.isChecked) holder.itemView.setBackgroundColor(if (item.isChecked) Color.WHITE else Color.TRANSPARENT) @@ -260,8 +260,8 @@ class SelectAreaDialog : DialogFragment() { } } - class CityAdapter : BaseQuickAdapter(R.layout.listitem_search_option_child) { - override fun convert(holder: BaseViewHolder, item: AreaBean) { + class CityAdapter : BaseQuickAdapter(R.layout.listitem_search_option_child) { + override fun convert(holder: BaseViewHolder, item: AreaEntity) { holder.setText(R.id.tv_name, item.name) holder.setTextColor(R.id.tv_name, if (item.isChecked) getColor(R.color.color_125ffe) else getColor(R.color.color_1a1a1a)) holder.setVisible(R.id.iv_check, item.isChecked) diff --git a/app/src/main/java/com/cheng/bole/ui/dialog/SelectBidTypeDialog.kt b/app/src/main/java/com/cheng/bole/ui/dialog/SelectBidTypeDialog.kt index 0167a47..9581a67 100644 --- a/app/src/main/java/com/cheng/bole/ui/dialog/SelectBidTypeDialog.kt +++ b/app/src/main/java/com/cheng/bole/ui/dialog/SelectBidTypeDialog.kt @@ -16,7 +16,7 @@ import androidx.fragment.app.DialogFragment import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.cheng.bole.R -import com.cheng.bole.bean.BidTypeBean +import com.cheng.bole.bean.BidTypeEntity import com.cheng.bole.databinding.DialogSelectBidTypeBinding import com.cheng.bole.manager.UserConfigManager import com.example.base.extensions.getColor @@ -27,9 +27,9 @@ import com.example.base.utils.ScreenUtils class SelectBidTypeDialog : DialogFragment() { private val mAdapter by lazy { BidTypeAdapter() } - private var bidType: BidTypeBean? = null + private var bidType: BidTypeEntity? = null - private var mOnBackListener: ((BidTypeBean) -> Unit)? = null //回调事件 + private var mOnBackListener: ((BidTypeEntity) -> Unit)? = null //回调事件 private lateinit var binding: DialogSelectBidTypeBinding @@ -56,9 +56,9 @@ class SelectBidTypeDialog : DialogFragment() { binding = DialogSelectBidTypeBinding.bind(view) bidType = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { - arguments?.getSerializable("type", BidTypeBean::class.java) + arguments?.getSerializable("type", BidTypeEntity::class.java) } else { - arguments?.getSerializable("type") as? BidTypeBean + arguments?.getSerializable("type") as? BidTypeEntity } binding.mRecyclerView.adapter = mAdapter @@ -92,12 +92,12 @@ class SelectBidTypeDialog : DialogFragment() { return dialog } - fun setOnSelectListener(listener: ((BidTypeBean) -> Unit)) { + fun setOnSelectListener(listener: ((BidTypeEntity) -> Unit)) { mOnBackListener = listener } companion object { - fun newInstance(type: BidTypeBean?): SelectBidTypeDialog { + fun newInstance(type: BidTypeEntity?): SelectBidTypeDialog { val arg = Bundle() arg.putSerializable("type", type) val fragment = SelectBidTypeDialog() @@ -106,8 +106,8 @@ class SelectBidTypeDialog : DialogFragment() { } } - class BidTypeAdapter : BaseQuickAdapter(R.layout.listitem_bid_type) { - override fun convert(holder: BaseViewHolder, item: BidTypeBean) { + class BidTypeAdapter : BaseQuickAdapter(R.layout.listitem_bid_type) { + override fun convert(holder: BaseViewHolder, item: BidTypeEntity) { holder.setText(R.id.tv_name, item.name) holder.setTextColor(R.id.tv_name, if (item.isChecked) getColor(R.color.color_125ffe) else getColor(R.color.color_1a1a1a)) holder.getView(R.id.tv_name).typeface = if (item.isChecked) Typeface.DEFAULT_BOLD else Typeface.DEFAULT diff --git a/app/src/main/java/com/cheng/bole/ui/dialog/SelectContactsDialog.kt b/app/src/main/java/com/cheng/bole/ui/dialog/SelectContactsDialog.kt index ae4184f..6069de2 100644 --- a/app/src/main/java/com/cheng/bole/ui/dialog/SelectContactsDialog.kt +++ b/app/src/main/java/com/cheng/bole/ui/dialog/SelectContactsDialog.kt @@ -14,7 +14,7 @@ import androidx.fragment.app.DialogFragment import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.cheng.bole.R -import com.cheng.bole.bean.ContactsInfoBean +import com.cheng.bole.bean.ContactsEntity import com.cheng.bole.databinding.DialogSelectContactsBinding import com.cheng.bole.event.ContactsEvent import com.cheng.bole.manager.ContactsManager @@ -37,7 +37,7 @@ class SelectContactsDialog : DialogFragment() { private var contactsEvent: Disposable? = null - private var mOnBackListener: ((List) -> Unit)? = null //回调事件 + private var mOnBackListener: ((List) -> Unit)? = null //回调事件 private lateinit var binding: DialogSelectContactsBinding @@ -111,7 +111,7 @@ class SelectContactsDialog : DialogFragment() { val selectList = if (init) { val listStr = arguments?.getString("list") ?: "" if (!TextUtils.isEmpty(listStr)) { - Gson().fromJson(listStr, object : TypeToken>() {}.type) + Gson().fromJson(listStr, object : TypeToken>() {}.type) } else mutableListOf() } else { mAdapter.data.filter { it.isChecked } @@ -137,12 +137,12 @@ class SelectContactsDialog : DialogFragment() { super.onDestroyView() } - fun setOnSelectListener(listener: ((List) -> Unit)) { + fun setOnSelectListener(listener: ((List) -> Unit)) { mOnBackListener = listener } companion object { - fun newInstance(list: List): SelectContactsDialog { + fun newInstance(list: List): SelectContactsDialog { val arg = Bundle() arg.putString("list", Gson().toJson(list)) val fragment = SelectContactsDialog() @@ -151,13 +151,13 @@ class SelectContactsDialog : DialogFragment() { } } - class ContactsAdapter : BaseQuickAdapter(R.layout.listitem_contacts) { + class ContactsAdapter : BaseQuickAdapter(R.layout.listitem_contacts) { init { addChildClickViewIds(R.id.iv_edit) } - override fun convert(holder: BaseViewHolder, item: ContactsInfoBean) { + override fun convert(holder: BaseViewHolder, item: ContactsEntity) { holder.setText(R.id.tv_phone, item.phone) holder.setText(R.id.tv_name, "${item.name} | ${item.job}") holder.setImageResource(R.id.iv_check, if (item.isChecked) R.mipmap.ic_rb_checked else R.mipmap.ic_rb_default) diff --git a/app/src/main/java/com/cheng/bole/ui/dialog/SelectGoodsTypeDialog.kt b/app/src/main/java/com/cheng/bole/ui/dialog/SelectGoodsTypeDialog.kt index c6e1bac..e494136 100644 --- a/app/src/main/java/com/cheng/bole/ui/dialog/SelectGoodsTypeDialog.kt +++ b/app/src/main/java/com/cheng/bole/ui/dialog/SelectGoodsTypeDialog.kt @@ -15,7 +15,7 @@ import androidx.fragment.app.DialogFragment import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.cheng.bole.R -import com.cheng.bole.bean.BidTypeBean +import com.cheng.bole.bean.BidTypeEntity import com.cheng.bole.databinding.DialogSelectGoodsTypeBinding import com.example.base.extensions.getColor import com.example.base.extensions.onClick @@ -25,18 +25,18 @@ import com.example.base.utils.ScreenUtils class SelectGoodsTypeDialog : DialogFragment() { private val typeList by lazy { listOf( - BidTypeBean("1", "提供服务"), - BidTypeBean("2", "提供产品"), - BidTypeBean("3", "其他") + BidTypeEntity("1", "提供服务"), + BidTypeEntity("2", "提供产品"), + BidTypeEntity("3", "其他") ) } private val type by lazy { arguments?.getString("type") ?: "" } private val mAdapter by lazy { GoodsTypeAdapter() } - private var bidType: BidTypeBean? = null + private var bidType: BidTypeEntity? = null - private var mOnBackListener: ((BidTypeBean) -> Unit)? = null //回调事件 + private var mOnBackListener: ((BidTypeEntity) -> Unit)? = null //回调事件 private lateinit var binding: DialogSelectGoodsTypeBinding @@ -90,7 +90,7 @@ class SelectGoodsTypeDialog : DialogFragment() { return dialog } - fun setOnSelectListener(listener: ((BidTypeBean) -> Unit)) { + fun setOnSelectListener(listener: ((BidTypeEntity) -> Unit)) { mOnBackListener = listener } @@ -104,8 +104,8 @@ class SelectGoodsTypeDialog : DialogFragment() { } } - class GoodsTypeAdapter : BaseQuickAdapter(R.layout.listitem_bid_type) { - override fun convert(holder: BaseViewHolder, item: BidTypeBean) { + class GoodsTypeAdapter : BaseQuickAdapter(R.layout.listitem_bid_type) { + override fun convert(holder: BaseViewHolder, item: BidTypeEntity) { holder.setText(R.id.tv_name, item.name) holder.setTextColor(R.id.tv_name, if (item.isChecked) getColor(R.color.color_125ffe) else getColor(R.color.color_1a1a1a)) holder.getView(R.id.tv_name).typeface = if (item.isChecked) Typeface.DEFAULT_BOLD else Typeface.DEFAULT diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/bid/BidAdapter.kt b/app/src/main/java/com/cheng/bole/ui/fragment/bid/BidAdapter.kt index f072de5..c32c3e0 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/bid/BidAdapter.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/bid/BidAdapter.kt @@ -4,15 +4,15 @@ import android.text.Html import android.text.TextUtils import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.cheng.bole.R -import com.cheng.bole.bean.BidItemBean +import com.cheng.bole.bean.BidItemEntity import com.cheng.bole.utils.BidTypeUtils import com.cheng.bole.widget.CommonShapeView import com.example.base.ui.list.LoadMoreAdapter import java.text.DecimalFormat -class BidAdapter(private val showTipsTime: Boolean = false) : LoadMoreAdapter(R.layout.listitem_bid) { +class BidAdapter(private val showTipsTime: Boolean = false) : LoadMoreAdapter(R.layout.listitem_bid) { - override fun convert(holder: BaseViewHolder, item: BidItemBean) { + override fun convert(holder: BaseViewHolder, item: BidItemEntity) { val tvTag = holder.getView(R.id.tv_tag) tvTag.setBgColor(BidTypeUtils.getTypeColor(item.typeName)) tvTag.text = BidTypeUtils.getShortName(item.typeName) diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/bid/detail/BidDetailFragment.kt b/app/src/main/java/com/cheng/bole/ui/fragment/bid/detail/BidDetailFragment.kt index dc19eab..796f0f5 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/bid/detail/BidDetailFragment.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/bid/detail/BidDetailFragment.kt @@ -9,7 +9,7 @@ import android.webkit.WebResourceRequest import android.webkit.WebView import android.webkit.WebViewClient import com.cheng.bole.R -import com.cheng.bole.bean.BidDetailBean +import com.cheng.bole.bean.BidDetailEntity import com.cheng.bole.bean.UploadFileEntity import com.cheng.bole.bean.WxShareEntity import com.cheng.bole.common.Constants @@ -43,7 +43,7 @@ class BidDetailFragment: BaseFragment() + val detailLiveData = MutableLiveData() val favoriteLiveData = MutableLiveData() val cancelLiveData = MutableLiveData() diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/bid/detail/ContactsAdapter.kt b/app/src/main/java/com/cheng/bole/ui/fragment/bid/detail/ContactsAdapter.kt index 3638d0d..0a3e9a9 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/bid/detail/ContactsAdapter.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/bid/detail/ContactsAdapter.kt @@ -3,14 +3,14 @@ package com.cheng.bole.ui.fragment.bid.detail import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.cheng.bole.R -import com.cheng.bole.bean.ContactsInfoBean +import com.cheng.bole.bean.ContactsEntity -class ContactsAdapter: BaseQuickAdapter(R.layout.listitem_bid_detail_contact) { +class ContactsAdapter: BaseQuickAdapter(R.layout.listitem_bid_detail_contact) { init { addChildClickViewIds(R.id.iv_call) } - override fun convert(holder: BaseViewHolder, item: ContactsInfoBean) { + override fun convert(holder: BaseViewHolder, item: ContactsEntity) { holder.setText(R.id.tv_name, item.name) holder.setText(R.id.tv_phone, item.phone) } diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/AddBidContactsAdapter.kt b/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/AddBidContactsAdapter.kt new file mode 100644 index 0000000..4377690 --- /dev/null +++ b/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/AddBidContactsAdapter.kt @@ -0,0 +1,14 @@ +package com.cheng.bole.ui.fragment.bid.publish + +import com.chad.library.adapter.base.BaseQuickAdapter +import com.chad.library.adapter.base.viewholder.BaseViewHolder +import com.cheng.bole.R +import com.cheng.bole.bean.ContactsEntity + +class AddBidContactsAdapter: BaseQuickAdapter(R.layout.listitem_publish_bid_contacts) { + + override fun convert(holder: BaseViewHolder, item: ContactsEntity) { + holder.setText(R.id.tv_phone, item.phone) + holder.setText(R.id.tv_name, "${item.name} | ${item.job}") + } +} \ No newline at end of file diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/bid/AddBidFileAdapter.kt b/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/AddBidFileAdapter.kt similarity index 60% rename from app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/bid/AddBidFileAdapter.kt rename to app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/AddBidFileAdapter.kt index 756bc8c..f416961 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/bid/AddBidFileAdapter.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/AddBidFileAdapter.kt @@ -1,17 +1,17 @@ -package com.cheng.bole.ui.fragment.bid.publish.bid +package com.cheng.bole.ui.fragment.bid.publish import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.cheng.bole.R -import com.cheng.bole.bean.AttachmentBean +import com.cheng.bole.bean.AttachmentEntity -class AddBidFileAdapter : BaseQuickAdapter(R.layout.listitem_publish_bid_file) { +class AddBidFileAdapter : BaseQuickAdapter(R.layout.listitem_publish_bid_file) { init { addChildClickViewIds(R.id.iv_delete) } - override fun convert(holder: BaseViewHolder, item: AttachmentBean) { + override fun convert(holder: BaseViewHolder, item: AttachmentEntity) { holder.setText(R.id.tv_name, item.title) } diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/bid/AddBidImageAdapter.kt b/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/AddBidImageAdapter.kt similarity index 98% rename from app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/bid/AddBidImageAdapter.kt rename to app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/AddBidImageAdapter.kt index 4c5ec73..d152193 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/bid/AddBidImageAdapter.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/AddBidImageAdapter.kt @@ -1,4 +1,4 @@ -package com.cheng.bole.ui.fragment.bid.publish.bid +package com.cheng.bole.ui.fragment.bid.publish import android.annotation.SuppressLint import android.content.Context diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/bid/AddBidContactsAdapter.kt b/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/bid/AddBidContactsAdapter.kt deleted file mode 100644 index 959801d..0000000 --- a/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/bid/AddBidContactsAdapter.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.cheng.bole.ui.fragment.bid.publish.bid - -import com.chad.library.adapter.base.BaseQuickAdapter -import com.chad.library.adapter.base.viewholder.BaseViewHolder -import com.cheng.bole.R -import com.cheng.bole.bean.ContactsInfoBean - -class AddBidContactsAdapter: BaseQuickAdapter(R.layout.listitem_publish_bid_contacts) { - - override fun convert(holder: BaseViewHolder, item: ContactsInfoBean) { - holder.setText(R.id.tv_phone, item.phone) - holder.setText(R.id.tv_name, "${item.name} | ${item.job}") - } -} \ No newline at end of file diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/bid/MyBidAdapter.kt b/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/bid/MyBidAdapter.kt new file mode 100644 index 0000000..57ca534 --- /dev/null +++ b/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/bid/MyBidAdapter.kt @@ -0,0 +1,68 @@ +package com.cheng.bole.ui.fragment.bid.publish.bid + +import android.text.TextUtils +import android.widget.TextView +import com.chad.library.adapter.base.viewholder.BaseViewHolder +import com.cheng.bole.R +import com.cheng.bole.bean.BidDetailEntity +import com.cheng.bole.utils.BidTypeUtils +import com.cheng.bole.utils.StringUtils +import com.cheng.bole.widget.CommonShapeView +import com.example.base.extensions.getColor +import com.example.base.ui.list.LoadMoreAdapter + +class MyBidAdapter : LoadMoreAdapter(R.layout.listitem_my_bid) { + + init { + addChildClickViewIds(R.id.btn_delete, R.id.btn_edit, R.id.btn_view) + } + + override fun convert(holder: BaseViewHolder, item: BidDetailEntity) { + val tvTag = holder.getView(R.id.tv_tag) + tvTag.setBgColor(BidTypeUtils.getTypeColor(item.type_name)) + tvTag.text = BidTypeUtils.getShortName(item.type_name) + + holder.setText(R.id.tv_title, item.origin_title) + holder.setText(R.id.tv_location, if (TextUtils.isEmpty(item.city_name)) "全国" else item.city_name) + holder.setText(R.id.tv_amount, StringUtils.formatAmount(item.project_amount)) + holder.setText(R.id.tv_time, item.tips_time) + + holder.setGone(R.id.tv_refuse_reason, true) + holder.setGone(R.id.btn_delete, true) + holder.setGone(R.id.btn_edit, true) + when (item.status) { + "1" -> { + holder.setText(R.id.tv_status, "待审核") + holder.setTextColor(R.id.tv_status, getColor(R.color.color_ff9234)) + holder.setBackgroundResource(R.id.tv_status, R.drawable.shape_publish_status_bg1) + holder.getView(R.id.tv_status).setCompoundDrawablesWithIntrinsicBounds(R.mipmap.ic_publish_status1, 0, 0, 0) + } + + "2" -> { + holder.setText(R.id.tv_status, "已发布") + holder.setTextColor(R.id.tv_status, getColor(R.color.color_e3fae7)) + holder.setBackgroundResource(R.id.tv_status, R.drawable.shape_publish_status_bg2) + holder.getView(R.id.tv_status).setCompoundDrawablesWithIntrinsicBounds(R.mipmap.ic_publish_status2, 0, 0, 0) + + holder.setGone(R.id.btn_delete, true) + } + + "3" -> { + holder.setText(R.id.tv_status, "已驳回") + holder.setTextColor(R.id.tv_status, getColor(R.color.color_ffede7)) + holder.setBackgroundResource(R.id.tv_status, R.drawable.shape_publish_status_bg3) + holder.getView(R.id.tv_status).setCompoundDrawablesWithIntrinsicBounds(R.mipmap.ic_publish_status3, 0, 0, 0) + + holder.setText(R.id.tv_refuse_reason, "理由：${item.review_remark}") + holder.setVisible(R.id.tv_refuse_reason, true) + + holder.setGone(R.id.btn_delete, true) + holder.setGone(R.id.btn_edit, true) + } + } + + holder.setGone(R.id.tv_location, TextUtils.isEmpty(item.city_name)) + holder.setGone(R.id.tv_amount, TextUtils.isEmpty(item.project_amount)) + holder.setGone(R.id.tv_time, TextUtils.isEmpty(item.tips_time)) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/bid/MyBidFragment.kt b/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/bid/MyBidFragment.kt new file mode 100644 index 0000000..62d1340 --- /dev/null +++ b/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/bid/MyBidFragment.kt @@ -0,0 +1,75 @@ +package com.cheng.bole.ui.fragment.bid.publish.bid + +import com.cheng.bole.R +import com.cheng.bole.bean.BidDetailEntity +import com.cheng.bole.databinding.FragmentMyBidBinding +import com.cheng.bole.event.BidEvent +import com.cheng.bole.manager.DialogEnum +import com.cheng.bole.ui.activity.PublicActivity +import com.cheng.bole.ui.dialog.TipDialog +import com.cheng.bole.ui.fragment.bid.detail.BidDetailFragment +import com.example.base.common.RxBus +import com.example.base.extensions.onClick +import com.example.base.ui.list.ListFragment + +class MyBidFragment: ListFragment() { + + override fun noDataClick() { + } + + override fun bindAdapter() = MyBidAdapter() + + override fun initView() { + super.initView() + mEmptyView.setNoDataText("暂无数据") + mEmptyView.setNoDataLogo(R.mipmap.ic_empty_seat) + } + + override fun initData() { + super.initData() + firstLoad() + } + + override fun initListener() { + super.initListener() + binding.btnNext.onClick { + PublicActivity.start(requireActivity(), PublishBidMessageFragment::class.java) + } + + mAdapter.setOnItemChildClickListener { _, view, position -> + val item = mAdapter.getItem(position) + when(view.id) { + R.id.btn_delete -> { + val f = TipDialog.newInstance("温馨提示", "您确定要删除标书吗？") + f.setOnSelectListener { + if (it == DialogEnum.CLICK_OK) { + mViewModel.deleteBid(item.id) + } + } + f.show(childFragmentManager, TipDialog::class.java.simpleName) + } + + R.id.btn_edit -> { + PublicActivity.start(requireContext(), PublishBidMessageFragment::class.java, Pair("item", item)) + } + + R.id.btn_view -> { + PublicActivity.start( + requireContext(), + BidDetailFragment::class.java, + Pair("id", item.id), + Pair("info_source", item.info_source) + ) + } + } + } + } + + override fun initObserve() { + super.initObserve() + val bidEvent = RxBus.defaultInstance.toObservable(BidEvent::class.java).subscribe { + firstLoad() + } + addDisposable(bidEvent) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/bid/MyBidViewModel.kt b/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/bid/MyBidViewModel.kt new file mode 100644 index 0000000..86e89c3 --- /dev/null +++ b/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/bid/MyBidViewModel.kt @@ -0,0 +1,33 @@ +package com.cheng.bole.ui.fragment.bid.publish.bid + +import androidx.collection.ArrayMap +import androidx.lifecycle.MutableLiveData +import com.cheng.bole.bean.BidDetailEntity +import com.cheng.bole.net.ApiFactory +import com.cheng.bole.net.model.toListResult +import com.example.base.extensions.toast +import com.example.base.utils.L +import com.example.base.viewmodel.ListViewModel + +class MyBidViewModel: ListViewModel() { + val deleteLiveData = MutableLiveData() + + override suspend fun requestApi(params: ArrayMap): Result> { + return ApiFactory.apiService.getMyBidList(params).toListResult() + } + + fun deleteBid(id: String) { + showDialog() + launchOnUiTryCatch({ + val response = ApiFactory.apiService.deleteBidInfo(id) + if (response.status) { + deleteLiveData.postValue(Any()) + } else toast(response.message, true) + dismissDialog() + }, { + dismissDialog() + setError(it) + L.d(it) + }) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/bid/PublishBidMessageFragment.kt b/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/bid/PublishBidMessageFragment.kt index cf4774f..c06a4b6 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/bid/PublishBidMessageFragment.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/bid/PublishBidMessageFragment.kt @@ -8,21 +8,28 @@ import android.view.ViewTreeObserver import androidx.activity.result.contract.ActivityResultContracts import androidx.constraintlayout.widget.ConstraintLayout import com.cheng.bole.R -import com.cheng.bole.bean.AreaBean -import com.cheng.bole.bean.AttachmentBean -import com.cheng.bole.bean.BidDetailBean -import com.cheng.bole.bean.BidTypeBean +import com.cheng.bole.bean.AreaEntity +import com.cheng.bole.bean.AttachmentEntity +import com.cheng.bole.bean.BidDetailEntity +import com.cheng.bole.bean.BidTypeEntity import com.cheng.bole.bean.UploadFileEntity import com.cheng.bole.common.Constants import com.cheng.bole.databinding.FragmentPublishBidMessageBinding +import com.cheng.bole.event.BidEvent import com.cheng.bole.impl.TextWatcherImpl import com.cheng.bole.manager.UserConfigManager +import com.cheng.bole.ui.activity.PublicActivity import com.cheng.bole.ui.dialog.SelectAreaDialog import com.cheng.bole.ui.dialog.SelectBidTypeDialog import com.cheng.bole.ui.dialog.SelectContactsDialog +import com.cheng.bole.ui.fragment.bid.publish.AddBidContactsAdapter +import com.cheng.bole.ui.fragment.bid.publish.AddBidFileAdapter +import com.cheng.bole.ui.fragment.bid.publish.AddBidImageAdapter +import com.cheng.bole.ui.fragment.bid.publish.my.MyPublishFragment import com.cheng.bole.utils.FileProviderUtils import com.cheng.bole.utils.GlideEngine import com.cheng.bole.utils.PermissionUtils +import com.example.base.common.RxBus import com.example.base.extensions.getColor import com.example.base.extensions.gone import com.example.base.extensions.onClick @@ -41,7 +48,7 @@ import okhttp3.RequestBody.Companion.toRequestBody import java.io.File class PublishBidMessageFragment : BaseFragment() { - private var bidDetail: BidDetailBean? = null + private var bidDetail: BidDetailEntity? = null private val imageAdapter by lazy { AddBidImageAdapter(requireContext(), uploadedImgList) } private var uploadedImgList: ArrayList = ArrayList() @@ -55,8 +62,8 @@ class PublishBidMessageFragment : BaseFragment= Build.VERSION_CODES.TIRAMISU) { - arguments?.getSerializable("item", BidDetailBean::class.java) + arguments?.getSerializable("item", BidDetailEntity::class.java) } else { - arguments?.getSerializable("item") as? BidDetailBean + arguments?.getSerializable("item") as? BidDetailEntity } if (bidDetail != null) { setData(bidDetail!!) @@ -251,10 +258,10 @@ class PublishBidMessageFragment : BaseFragment list.forEachIndexed { index, file -> - fileAdapter.addData(AttachmentBean(file.id, file.url, "pdf", selectedFileList[index].name)) + fileAdapter.addData(AttachmentEntity(file.id, file.url, "pdf", selectedFileList[index].name)) } SpanUtils.with(binding.tvFileCount) .append("(") @@ -337,7 +344,7 @@ class PublishBidMessageFragment : BaseFragment() { private val mAdapter by lazy { ContactsJobAdapter() } - private var contactsInfo: ContactsInfoBean? = null + private var contactsInfo: ContactsEntity? = null override fun initView() { super.initView() @@ -30,15 +30,15 @@ class AddContactsFragment: BaseFragment= Build.VERSION_CODES.TIRAMISU) { - arguments?.getSerializable("item", ContactsInfoBean::class.java) + arguments?.getSerializable("item", ContactsEntity::class.java) } else { - arguments?.getSerializable("item") as? ContactsInfoBean + arguments?.getSerializable("item") as? ContactsEntity } setData() } @@ -86,7 +86,7 @@ class AddContactsFragment: BaseFragment(R.layout.listitem_contacts_job) { - override fun convert(holder: BaseViewHolder, item: ContactsInfoBean.Job) { +class ContactsJobAdapter : BaseQuickAdapter(R.layout.listitem_contacts_job) { + override fun convert(holder: BaseViewHolder, item: ContactsEntity.Job) { holder.setText(R.id.tv_name, item.name) holder.setTextColor(R.id.tv_name, if (item.isChecked) getColor(R.color.color_125ffe) else getColor(R.color.color_1a1a1a)) holder.getView(R.id.tv_name).typeface = if (item.isChecked) Typeface.DEFAULT_BOLD else Typeface.DEFAULT diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/goods/MyGoodsAdapter.kt b/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/goods/MyGoodsAdapter.kt new file mode 100644 index 0000000..55e23d8 --- /dev/null +++ b/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/goods/MyGoodsAdapter.kt @@ -0,0 +1,65 @@ +package com.cheng.bole.ui.fragment.bid.publish.goods + +import android.widget.ImageView +import android.widget.TextView +import coil.load +import coil.transform.RoundedCornersTransformation +import com.chad.library.adapter.base.BaseQuickAdapter +import com.chad.library.adapter.base.viewholder.BaseViewHolder +import com.cheng.bole.R +import com.cheng.bole.bean.MerchantGoodsEntity +import com.example.base.extensions.getColor +import com.example.base.utils.DensityUtils + +class MyGoodsAdapter: BaseQuickAdapter(R.layout.listitem_my_goods) { + + init { + addChildClickViewIds(R.id.btn_delete, R.id.btn_edit, R.id.btn_view) + } + + override fun convert(holder: BaseViewHolder, item: MerchantGoodsEntity) { + if (item.file.isNotEmpty()) { + holder.getView(R.id.iv_cover).load(item.file[0].url){ + transformations(RoundedCornersTransformation(DensityUtils.dp2px(6f).toFloat())) + } + } + holder.setText(R.id.tv_title, item.goods_name) + holder.setText(R.id.tv_content, item.goods_description) + holder.setText(R.id.tv_amount, "${item.goods_price_show}元") + holder.setText(R.id.tv_area, item.city_name) + + holder.setGone(R.id.tv_refuse_reason, true) + holder.setGone(R.id.btn_delete, true) + holder.setGone(R.id.btn_edit, true) + when (item.status) { + "1" -> { + holder.setText(R.id.tv_status, "待审核") + holder.setTextColor(R.id.tv_status, getColor(R.color.color_ff9234)) + holder.setBackgroundResource(R.id.tv_status, R.drawable.shape_publish_status_bg1) + holder.getView(R.id.tv_status).setCompoundDrawablesWithIntrinsicBounds(R.mipmap.ic_publish_status1, 0, 0, 0) + } + + "2" -> { + holder.setText(R.id.tv_status, "已发布") + holder.setTextColor(R.id.tv_status, getColor(R.color.color_e3fae7)) + holder.setBackgroundResource(R.id.tv_status, R.drawable.shape_publish_status_bg2) + holder.getView(R.id.tv_status).setCompoundDrawablesWithIntrinsicBounds(R.mipmap.ic_publish_status2, 0, 0, 0) + + holder.setGone(R.id.btn_delete, true) + } + + "3" -> { + holder.setText(R.id.tv_status, "已驳回") + holder.setTextColor(R.id.tv_status, getColor(R.color.color_ffede7)) + holder.setBackgroundResource(R.id.tv_status, R.drawable.shape_publish_status_bg3) + holder.getView(R.id.tv_status).setCompoundDrawablesWithIntrinsicBounds(R.mipmap.ic_publish_status3, 0, 0, 0) + + holder.setText(R.id.tv_refuse_reason, "理由：${item.remark}") + holder.setVisible(R.id.tv_refuse_reason, true) + + holder.setGone(R.id.btn_delete, true) + holder.setGone(R.id.btn_edit, true) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/goods/MyGoodsFragment.kt b/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/goods/MyGoodsFragment.kt new file mode 100644 index 0000000..4d293f5 --- /dev/null +++ b/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/goods/MyGoodsFragment.kt @@ -0,0 +1,128 @@ +package com.cheng.bole.ui.fragment.bid.publish.goods + +import android.graphics.Typeface +import android.widget.TextView +import com.cheng.bole.R +import com.cheng.bole.bean.MerchantGoodsEntity +import com.cheng.bole.common.Constants +import com.cheng.bole.databinding.FragmentMyGoodsBinding +import com.cheng.bole.event.SupplyEvent +import com.cheng.bole.manager.DialogEnum +import com.cheng.bole.ui.activity.PublicActivity +import com.cheng.bole.ui.dialog.TipDialog +import com.cheng.bole.ui.fragment.merchant.detail.MerchantGoodsDetailFragment +import com.example.base.common.RxBus +import com.example.base.extensions.onClick +import com.example.base.ui.BaseFragment +import com.example.base.widget.EmptyView +import com.example.base.widget.PageStatus + +class MyGoodsFragment: BaseFragment() { + private val allGoodsList = mutableListOf() + + private val mAdapter by lazy { MyGoodsAdapter() } + private val mEmptyView by lazy { EmptyView(requireContext()) } + + private var currentPosition = 0 + + private var page = 1 + + override fun initView() { + super.initView() + binding.mRecyclerView.adapter = mAdapter + mEmptyView.setNoDataText("暂无数据") + mEmptyView.setNoDataLogo(R.mipmap.ic_empty_seat) + mAdapter.setEmptyView(mEmptyView) + } + + override fun initData() { + super.initData() + mViewModel.getGoodsList(page) + } + + override fun initListener() { + super.initListener() + binding.tabLayout.observeIndexChange { fromIndex, toIndex, _, _ -> + currentPosition = toIndex + if (fromIndex != -1) { + (binding.tabLayout.getChildAt(fromIndex) as TextView).typeface = Typeface.DEFAULT + (binding.tabLayout.getChildAt(fromIndex) as TextView).setBackgroundResource(R.drawable.shape_push_bid_type_default) + } + (binding.tabLayout.getChildAt(toIndex) as TextView).typeface = Constants.douyinsansB + (binding.tabLayout.getChildAt(toIndex) as TextView).setBackgroundResource(R.drawable.shape_push_bid_type_checked) + setData() + } + + binding.mRefreshLayout.setOnRefreshListener { + page = 1 + mViewModel.getGoodsList(page) + } + + binding.mRefreshLayout.setOnLoadMoreListener { + page++ + mViewModel.getGoodsList(page) + } + + mAdapter.setOnItemChildClickListener { _, view, position -> + val item = mAdapter.getItem(position) + when(view.id) { + R.id.btn_delete -> { + val f = TipDialog.newInstance("温馨提示", "您确定要删除供应服务吗？") + f.setOnSelectListener { + if (it == DialogEnum.CLICK_OK) { + mViewModel.deleteGoods(item.id) + } + } + f.show(childFragmentManager, TipDialog::class.java.simpleName) + } + + R.id.btn_edit -> { + PublicActivity.start(requireContext(), PublishGoodsMessageFragment::class.java, Pair("item", item)) + } + + R.id.btn_view -> { + PublicActivity.start(requireActivity(), MerchantGoodsDetailFragment::class.java, Pair("item", item)) + } + } + } + + binding.btnNext.onClick { + PublicActivity.start(requireActivity(), PublishGoodsMessageFragment::class.java) + } + } + + override fun initObserve() { + super.initObserve() + mViewModel.goodsLiveData.observe(this) { list -> + if (page == 1) allGoodsList.clear() + allGoodsList.addAll(list) + if (page == 1) { + binding.mRefreshLayout.finishRefresh() + } else { + binding.mRefreshLayout.finishLoadMore() + binding.mRefreshLayout.setNoMoreData(list.size < 20) + } + binding.mRefreshLayout.setEnableLoadMore(list.size == 20) + setData() + } + + val supplyEvent = RxBus.defaultInstance.toObservable(SupplyEvent::class.java).subscribe { + binding.mRefreshLayout.autoRefresh() + } + addDisposable(supplyEvent) + } + + private fun setData() { + when(currentPosition) { + 0 -> mAdapter.setList(allGoodsList) + 1 -> mAdapter.setList(allGoodsList.filter { it.type == "1" }) + 2 -> mAdapter.setList(allGoodsList.filter { it.type == "2" }) + 3 -> mAdapter.setList(allGoodsList.filter { it.type == "3" }) + } + if (mAdapter.data.isNotEmpty()) { + mEmptyView.setStatus(PageStatus.GONG) + } else { + mEmptyView.setStatus(PageStatus.NO_DATA) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/goods/MyGoodsViewModel.kt b/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/goods/MyGoodsViewModel.kt new file mode 100644 index 0000000..762ba8f --- /dev/null +++ b/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/goods/MyGoodsViewModel.kt @@ -0,0 +1,43 @@ +package com.cheng.bole.ui.fragment.bid.publish.goods + +import androidx.lifecycle.MutableLiveData +import com.cheng.bole.bean.MerchantGoodsEntity +import com.cheng.bole.net.ApiFactory +import com.example.base.extensions.toast +import com.example.base.utils.L +import com.example.base.viewmodel.BaseViewModel + +class MyGoodsViewModel: BaseViewModel() { + val goodsLiveData = MutableLiveData>() + val deleteLiveData = MutableLiveData() + + fun getGoodsList(page: Int) { + launchOnUiTryCatch({ + val params = mutableMapOf() + params["page"] = "$page" + params["size"] = "20" + val response = ApiFactory.apiService.getMyGoodsList(params) + if (response.status) { + goodsLiveData.postValue(response.data.items) + } else toast(response.message, true) + }, { + setError(it) + L.d(it) + }) + } + + fun deleteGoods(id: String) { + showDialog() + launchOnUiTryCatch({ + val response = ApiFactory.apiService.deleteGoodsInfo(id) + if (response.status) { + deleteLiveData.postValue(Any()) + } else toast(response.message, true) + dismissDialog() + }, { + dismissDialog() + setError(it) + L.d(it) + }) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/goods/PublishGoodsMessageFragment.kt b/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/goods/PublishGoodsMessageFragment.kt index c10bf45..bbca3f6 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/goods/PublishGoodsMessageFragment.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/goods/PublishGoodsMessageFragment.kt @@ -7,20 +7,24 @@ import android.view.ViewOutlineProvider import android.view.ViewTreeObserver import androidx.constraintlayout.widget.ConstraintLayout import com.cheng.bole.R -import com.cheng.bole.bean.AreaBean -import com.cheng.bole.bean.MerchantGoodsBean +import com.cheng.bole.bean.AreaEntity +import com.cheng.bole.bean.MerchantGoodsEntity import com.cheng.bole.bean.UploadFileEntity import com.cheng.bole.common.Constants import com.cheng.bole.databinding.FragmentPublishGoodsMessageBinding +import com.cheng.bole.event.SupplyEvent import com.cheng.bole.impl.TextWatcherImpl import com.cheng.bole.manager.UserConfigManager +import com.cheng.bole.ui.activity.PublicActivity import com.cheng.bole.ui.dialog.SelectAreaDialog import com.cheng.bole.ui.dialog.SelectContactsDialog import com.cheng.bole.ui.dialog.SelectGoodsTypeDialog -import com.cheng.bole.ui.fragment.bid.publish.bid.AddBidContactsAdapter -import com.cheng.bole.ui.fragment.bid.publish.bid.AddBidImageAdapter +import com.cheng.bole.ui.fragment.bid.publish.AddBidContactsAdapter +import com.cheng.bole.ui.fragment.bid.publish.AddBidImageAdapter +import com.cheng.bole.ui.fragment.bid.publish.my.MyPublishFragment import com.cheng.bole.utils.GlideEngine import com.cheng.bole.utils.PermissionUtils +import com.example.base.common.RxBus import com.example.base.extensions.getColor import com.example.base.extensions.gone import com.example.base.extensions.onClick @@ -40,7 +44,7 @@ import okhttp3.RequestBody.Companion.toRequestBody class PublishGoodsMessageFragment: BaseFragment() { private val from by lazy { arguments?.getInt("from") ?: 0 } - private var goodsDetail: MerchantGoodsBean? = null + private var goodsDetail: MerchantGoodsEntity? = null private val imageAdapter by lazy { AddBidImageAdapter(requireContext(), uploadedImgList) } private var uploadedImgList: ArrayList = ArrayList() @@ -51,7 +55,7 @@ class PublishGoodsMessageFragment: BaseFragment= Build.VERSION_CODES.TIRAMISU) { - arguments?.getSerializable("item", MerchantGoodsBean::class.java) + arguments?.getSerializable("item", MerchantGoodsEntity::class.java) } else { - arguments?.getSerializable("item") as? MerchantGoodsBean + arguments?.getSerializable("item") as? MerchantGoodsEntity } if (goodsDetail != null) { setData(goodsDetail!!) @@ -223,12 +227,12 @@ class PublishGoodsMessageFragment: BaseFragment() { + + private val tabText = listOf("招标信息", "合作信息") + private val fragmentList by lazy { mutableListOf() } + + private val pageAdapter by lazy { + BasePageAdapter( + childFragmentManager, + tabText, + fragmentList, + FragmentStatePagerAdapter.BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT + ) + } + + override fun initView() { + super.initView() + mTitleBar?.setBackgroundColor(Color.WHITE) + + initFragment() + binding.viewPager.adapter = pageAdapter + binding.viewPager.offscreenPageLimit = fragmentList.size + binding.tabLayout.setupViewPager(ViewPager1Delegate.install(binding.viewPager, binding.tabLayout)) + } + + private fun initFragment() { + fragmentList.add(MyBidFragment()) + fragmentList.add(MyGoodsFragment()) + } + + override fun initData() { + super.initData() + mViewModel.getCompanyInfo() + } + + override fun initListener() { + super.initListener() + binding.tabLayout.observeIndexChange { fromIndex, toIndex, _, _ -> + binding.viewPager.currentItem = toIndex + if (fromIndex != -1) { + (binding.tabLayout.getChildAt(fromIndex) as TextView).typeface = Typeface.DEFAULT + } + (binding.tabLayout.getChildAt(toIndex) as TextView).typeface = Constants.douyinsansB + } + + binding.layoutAuthTip.onClick { + PublicActivity.start(requireActivity(), CompanyAuthFragment::class.java) + } + } + + override fun initObserve() { + super.initObserve() + mViewModel.companyLiveData.observe(this) { + if (it == null || it.status == "3") { + binding.layoutAuthTip.visible() + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/my/MyPublishViewModel.kt b/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/my/MyPublishViewModel.kt new file mode 100644 index 0000000..406ec37 --- /dev/null +++ b/app/src/main/java/com/cheng/bole/ui/fragment/bid/publish/my/MyPublishViewModel.kt @@ -0,0 +1,27 @@ +package com.cheng.bole.ui.fragment.bid.publish.my + +import androidx.lifecycle.MutableLiveData +import com.cheng.bole.bean.CompanyEntity +import com.cheng.bole.net.ApiFactory +import com.example.base.extensions.toast +import com.example.base.utils.L +import com.example.base.viewmodel.BaseViewModel + +class MyPublishViewModel: BaseViewModel() { + val companyLiveData = MutableLiveData() + + fun getCompanyInfo() { + showDialog() + launchOnUiTryCatch({ + val response = ApiFactory.apiService.getCompanyInfo() + if (response.status) { + companyLiveData.postValue(response.data) + } else toast(response.message, true) + dismissDialog() + }, { + dismissDialog() + setError(it) + L.d(it) + }) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/home/HomeFragment.kt b/app/src/main/java/com/cheng/bole/ui/fragment/home/HomeFragment.kt index 26d7dea..a535e83 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/home/HomeFragment.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/home/HomeFragment.kt @@ -1,10 +1,9 @@ package com.cheng.bole.ui.fragment.home -import android.text.TextUtils import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.recyclerview.widget.RecyclerView.HORIZONTAL import com.cheng.bole.R -import com.cheng.bole.bean.BidItemBean +import com.cheng.bole.bean.BidItemEntity import com.cheng.bole.bean.MenuEntity import com.cheng.bole.common.Constants import com.cheng.bole.common.EventConstants @@ -38,7 +37,7 @@ import kotlin.math.abs /** * 首页 */ -class HomeFragment : ListFragment() { +class HomeFragment : ListFragment() { private val menuAdapter by lazy { HomeMenuAdapter() } private val keywordAdapter by lazy { HomeKeywordAdapter() } @@ -47,7 +46,7 @@ class HomeFragment : ListFragment() { +class HomeViewModel : ListViewModel() { val totalLiveData = MutableLiveData() - val typeLiveData = MutableLiveData>() - val authLiveData = MutableLiveData() + val typeLiveData = MutableLiveData>() + val authLiveData = MutableLiveData() val recommendLiveData = MutableLiveData>() - override suspend fun requestApi(params: ArrayMap): Result> { + override suspend fun requestApi(params: ArrayMap): Result> { val response = ApiFactory.apiService.getRecommendList(params) if (response.status) { totalLiveData.postValue(response.data.total) diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/home/bszz/BSZZFragment.kt b/app/src/main/java/com/cheng/bole/ui/fragment/home/bszz/BSZZFragment.kt index ec0f89a..eed5dbf 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/home/bszz/BSZZFragment.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/home/bszz/BSZZFragment.kt @@ -1,16 +1,14 @@ package com.cheng.bole.ui.fragment.home.bszz import android.annotation.SuppressLint -import android.graphics.Color import android.text.TextUtils import android.view.ViewTreeObserver import androidx.constraintlayout.widget.ConstraintLayout import com.cheng.bole.R -import com.cheng.bole.bean.AreaBean +import com.cheng.bole.bean.AreaEntity import com.cheng.bole.databinding.FragmentBszzBinding import com.cheng.bole.impl.TextWatcherImpl import com.cheng.bole.ui.dialog.SelectAreaDialog -import com.efs.sdk.memleaksdk.monitor.internal.bi import com.example.base.extensions.onClick import com.example.base.extensions.toast import com.example.base.ui.BaseFragment @@ -22,7 +20,7 @@ import okhttp3.RequestBody.Companion.toRequestBody class BSZZFragment: BaseFragment() { private var timestamp = "" - private var city: AreaBean? = null + private var city: AreaEntity? = null private val textWatcher = object : TextWatcherImpl() { @SuppressLint("SetTextI18n") diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/home/dljz/DLJZFragment.kt b/app/src/main/java/com/cheng/bole/ui/fragment/home/dljz/DLJZFragment.kt index 1f9b508..8a74821 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/home/dljz/DLJZFragment.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/home/dljz/DLJZFragment.kt @@ -2,7 +2,7 @@ package com.cheng.bole.ui.fragment.home.dljz import android.annotation.SuppressLint import android.text.TextUtils -import com.cheng.bole.bean.AreaBean +import com.cheng.bole.bean.AreaEntity import com.cheng.bole.common.Constants import com.cheng.bole.databinding.FragmentDljzBinding import com.cheng.bole.impl.TextWatcherImpl @@ -16,7 +16,7 @@ import okhttp3.RequestBody.Companion.toRequestBody class DLJZFragment: BaseFragment() { private var timestamp = "" - private var city: AreaBean? = null + private var city: AreaEntity? = null private val textWatcher = object : TextWatcherImpl() { @SuppressLint("SetTextI18n") diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/home/qyzc/QYZCFragment.kt b/app/src/main/java/com/cheng/bole/ui/fragment/home/qyzc/QYZCFragment.kt index 8d492e6..602283b 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/home/qyzc/QYZCFragment.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/home/qyzc/QYZCFragment.kt @@ -1,15 +1,13 @@ package com.cheng.bole.ui.fragment.home.qyzc import android.annotation.SuppressLint -import android.graphics.Color import android.text.TextUtils import android.view.ViewTreeObserver import androidx.constraintlayout.widget.ConstraintLayout import com.cheng.bole.R -import com.cheng.bole.bean.AreaBean +import com.cheng.bole.bean.AreaEntity import com.cheng.bole.databinding.FragmentQyzcBinding import com.cheng.bole.ui.dialog.SelectAreaDialog -import com.efs.sdk.memleaksdk.monitor.internal.bi import com.example.base.extensions.onClick import com.example.base.extensions.toast import com.example.base.ui.BaseFragment @@ -23,7 +21,7 @@ import java.util.concurrent.TimeUnit class QYZCFragment : BaseFragment() { private var timestamp = "" - private var city: AreaBean? = null + private var city: AreaEntity? = null private val companyAdapter by lazy { QYZCCompanyAdapter(requireContext(), companyList) } private val companyList = mutableListOf() diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/home/zzdb/ZZDBAdapter.kt b/app/src/main/java/com/cheng/bole/ui/fragment/home/zzdb/ZZDBAdapter.kt index 8ae0f81..3fef69d 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/home/zzdb/ZZDBAdapter.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/home/zzdb/ZZDBAdapter.kt @@ -3,10 +3,10 @@ package com.cheng.bole.ui.fragment.home.zzdb import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.cheng.bole.R -import com.cheng.bole.bean.ZZDBInfoBean +import com.cheng.bole.bean.ZZDBInfoEntity -class ZZDBAdapter: BaseQuickAdapter(R.layout.listitem_zzdb_info) { - override fun convert(holder: BaseViewHolder, item: ZZDBInfoBean) { +class ZZDBAdapter: BaseQuickAdapter(R.layout.listitem_zzdb_info) { + override fun convert(holder: BaseViewHolder, item: ZZDBInfoEntity) { holder.setText(R.id.tv_name, item.name) holder.setGone(R.id.tv_level1, true) holder.setGone(R.id.tv_level2, true) diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/home/zzdb/ZZDBViewModel.kt b/app/src/main/java/com/cheng/bole/ui/fragment/home/zzdb/ZZDBViewModel.kt index 4c27ce8..6f8a0e1 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/home/zzdb/ZZDBViewModel.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/home/zzdb/ZZDBViewModel.kt @@ -1,14 +1,14 @@ package com.cheng.bole.ui.fragment.home.zzdb import androidx.lifecycle.MutableLiveData -import com.cheng.bole.bean.ZZDBInfoBean +import com.cheng.bole.bean.ZZDBInfoEntity import com.cheng.bole.net.ApiFactory import com.example.base.extensions.toast import com.example.base.utils.L import com.example.base.viewmodel.BaseViewModel class ZZDBViewModel: BaseViewModel() { - val listLiveData = MutableLiveData>() + val listLiveData = MutableLiveData>() fun getAgencyList(page: Int, name: String) { launchOnUiTryCatch({ diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/home/zzdb/detail/ZZDBDetailFragment.kt b/app/src/main/java/com/cheng/bole/ui/fragment/home/zzdb/detail/ZZDBDetailFragment.kt index 2f60f8c..51f4566 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/home/zzdb/detail/ZZDBDetailFragment.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/home/zzdb/detail/ZZDBDetailFragment.kt @@ -5,8 +5,8 @@ import android.os.Build import android.text.TextUtils import androidx.constraintlayout.widget.ConstraintLayout import com.cheng.bole.R -import com.cheng.bole.bean.AreaBean -import com.cheng.bole.bean.ZZDBInfoBean +import com.cheng.bole.bean.AreaEntity +import com.cheng.bole.bean.ZZDBInfoEntity import com.cheng.bole.common.Constants import com.cheng.bole.databinding.FragmentZzdbDetailBinding import com.cheng.bole.ui.dialog.SelectAreaDialog @@ -22,8 +22,8 @@ import com.gyf.immersionbar.ktx.actionBarHeight import okhttp3.RequestBody.Companion.toRequestBody class ZZDBDetailFragment : BaseFragment() { - private var info: ZZDBInfoBean? = null - private var childInfo: ZZDBInfoBean? = null + private var info: ZZDBInfoEntity? = null + private var childInfo: ZZDBInfoEntity? = null private val deviceAdapter by lazy { ZZDBDeviceAdapter() } @@ -31,7 +31,7 @@ class ZZDBDetailFragment : BaseFragment= Build.VERSION_CODES.TIRAMISU) { - arguments?.getSerializable("item", ZZDBInfoBean::class.java) + arguments?.getSerializable("item", ZZDBInfoEntity::class.java) } else { - arguments?.getSerializable("item") as? ZZDBInfoBean + arguments?.getSerializable("item") as? ZZDBInfoEntity } setBaseData() } @@ -179,7 +179,7 @@ class ZZDBDetailFragment : BaseFragment() - val areaLiveData = MutableLiveData>() + val areaLiveData = MutableLiveData>() val getCouponLiveData = MutableLiveData() fun userInfo() { diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/merchant/MerchantContactsAdapter.kt b/app/src/main/java/com/cheng/bole/ui/fragment/merchant/MerchantContactsAdapter.kt index 0143ad9..9d5a700 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/merchant/MerchantContactsAdapter.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/merchant/MerchantContactsAdapter.kt @@ -3,15 +3,15 @@ package com.cheng.bole.ui.fragment.merchant import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.cheng.bole.R -import com.cheng.bole.bean.ContactsInfoBean +import com.cheng.bole.bean.ContactsEntity -class MerchantContactsAdapter: BaseQuickAdapter(R.layout.listitem_merchant_contacts) { +class MerchantContactsAdapter: BaseQuickAdapter(R.layout.listitem_merchant_contacts) { init { addChildClickViewIds(R.id.iv_call) } - override fun convert(holder: BaseViewHolder, item: ContactsInfoBean) { + override fun convert(holder: BaseViewHolder, item: ContactsEntity) { holder.setText(R.id.tv_phone, item.phone) holder.setText(R.id.tv_name, "${item.name} | ${item.job}") } diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/merchant/MerchantFragment.kt b/app/src/main/java/com/cheng/bole/ui/fragment/merchant/MerchantFragment.kt index 5701687..4f565b1 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/merchant/MerchantFragment.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/merchant/MerchantFragment.kt @@ -10,7 +10,7 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentStatePagerAdapter import com.angcyo.tablayout.delegate.ViewPager1Delegate import com.cheng.bole.R -import com.cheng.bole.bean.AreaBean +import com.cheng.bole.bean.AreaEntity import com.cheng.bole.common.Constants import com.cheng.bole.common.EventConstants import com.cheng.bole.databinding.FragmentMerchantBinding @@ -31,6 +31,7 @@ class MerchantFragment : BaseFragment() } private val pageAdapter by lazy { BasePageAdapter( @@ -41,7 +42,7 @@ class MerchantFragment : BaseFragment() { - private var goodsInfo: MerchantGoodsBean? = null + private var goodsInfo: MerchantGoodsEntity? = null private val contactsAdapter by lazy { MerchantContactsAdapter() } private val imageAdapter by lazy { MerchantGoodsImageAdapter() } @@ -54,9 +56,9 @@ class MerchantGoodsDetailFragment : BaseFragment= Build.VERSION_CODES.TIRAMISU) { - arguments?.getSerializable("item", MerchantGoodsBean::class.java) + arguments?.getSerializable("item", MerchantGoodsEntity::class.java) } else { - arguments?.getSerializable("item") as? MerchantGoodsBean + arguments?.getSerializable("item") as? MerchantGoodsEntity } setData() mViewModel.sendAuth() @@ -99,10 +101,15 @@ class MerchantGoodsDetailFragment : BaseFragment() { - private var goodsInfo: MerchantGoodsBean? = null + private var goodsInfo: MerchantGoodsEntity? = null private val tabText = listOf("全部", "服务", "产品", "其他") private val fragmentList by lazy { mutableListOf() } @@ -35,9 +33,9 @@ class MerchantHomeFragment : BaseFragment= Build.VERSION_CODES.TIRAMISU) { - arguments?.getSerializable("item", MerchantGoodsBean::class.java) + arguments?.getSerializable("item", MerchantGoodsEntity::class.java) } else { - arguments?.getSerializable("item") as? MerchantGoodsBean + arguments?.getSerializable("item") as? MerchantGoodsEntity } binding.tvTitle.text = goodsInfo?.company?.company_name diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/merchant/list/MerchantGoodsAdapter.kt b/app/src/main/java/com/cheng/bole/ui/fragment/merchant/list/MerchantGoodsAdapter.kt index ee43354..7196677 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/merchant/list/MerchantGoodsAdapter.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/merchant/list/MerchantGoodsAdapter.kt @@ -7,13 +7,16 @@ import coil.load import coil.transform.RoundedCornersTransformation import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.cheng.bole.R -import com.cheng.bole.bean.MerchantGoodsBean +import com.cheng.bole.bean.MerchantGoodsEntity import com.cheng.bole.common.Constants import com.example.base.ui.list.LoadMoreAdapter import com.example.base.utils.DensityUtils -class MerchantGoodsAdapter: LoadMoreAdapter(R.layout.listitem_merchant_goods) { - override fun convert(holder: BaseViewHolder, item: MerchantGoodsBean) { +class MerchantGoodsAdapter: LoadMoreAdapter(R.layout.listitem_merchant_goods) { + override fun convert(holder: BaseViewHolder, item: MerchantGoodsEntity) { + holder.getView(R.id.tv_price).typeface = Constants.dDIN_PRO_M + holder.getView(R.id.tv_company_avatar).typeface = Constants.almmsht + if (item.file.isNotEmpty()) { holder.getView(R.id.iv_cover).load(item.file[0].url){ transformations(RoundedCornersTransformation(DensityUtils.dp2px(8f).toFloat())) @@ -22,11 +25,20 @@ class MerchantGoodsAdapter: LoadMoreAdapter(R.layout.listitem holder.setText(R.id.tv_name, item.goods_name) holder.setText(R.id.tv_desc, item.goods_description) holder.setText(R.id.tv_price, item.goods_price_show) - holder.setText(R.id.tv_location, if (TextUtils.isEmpty(item.city_name)) "全国" else item.city_name) - holder.setText(R.id.tv_company_avatar, item.company.company_name.take(2) + "\n" + item.company.company_name.substring(2, 4)) - holder.setText(R.id.tv_company_name, item.company.company_name) holder.setText(R.id.tv_view_count, "已浏览 ${if (!TextUtils.isEmpty(item.view_count)) item.view_count else 0}") - holder.getView(R.id.tv_price).typeface = Constants.dDIN_PRO_M - holder.getView(R.id.tv_company_avatar).typeface = Constants.almmsht + + holder.setGone(R.id.tv_company_avatar, true) + holder.setGone(R.id.tv_company_name, true) + holder.setGone(R.id.tv_location, true) + if (!TextUtils.isEmpty(item.company.company_name)) { + holder.setText(R.id.tv_company_avatar, item.company.company_name!!.take(2) + "\n" + item.company.company_name.substring(2, 4)) + holder.setText(R.id.tv_company_name, item.company.company_name) + holder.setVisible(R.id.tv_company_avatar, true) + holder.setVisible(R.id.tv_company_name, true) + } + if (!TextUtils.isEmpty(item.company.city_name)) { + holder.setText(R.id.tv_location, if (TextUtils.isEmpty(item.city_name)) "全国" else item.city_name) + holder.setVisible(R.id.tv_location, true) + } } } \ No newline at end of file diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/merchant/list/MerchantGoodsListFragment.kt b/app/src/main/java/com/cheng/bole/ui/fragment/merchant/list/MerchantGoodsListFragment.kt index 83566f0..2213961 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/merchant/list/MerchantGoodsListFragment.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/merchant/list/MerchantGoodsListFragment.kt @@ -2,7 +2,7 @@ package com.cheng.bole.ui.fragment.merchant.list import android.os.Bundle import com.cheng.bole.R -import com.cheng.bole.bean.MerchantGoodsBean +import com.cheng.bole.bean.MerchantGoodsEntity import com.cheng.bole.databinding.FragmentMerchantGoodsListBinding import com.cheng.bole.ui.activity.PublicActivity import com.cheng.bole.ui.fragment.merchant.detail.MerchantGoodsDetailFragment @@ -11,13 +11,13 @@ import com.example.base.decoration.FirstItemOffsetDecoration import com.example.base.ui.list.ListFragment import com.example.base.utils.DensityUtils -class MerchantGoodsListFragment : ListFragment() { +class MerchantGoodsListFragment : ListFragment() { private val type by lazy { arguments?.getString("type") ?: "" } private val userId by lazy { arguments?.getString("userId") ?: "" } private var keyword: String = "" - private var item: MerchantGoodsBean? = null + private var item: MerchantGoodsEntity? = null companion object { fun newInstance(type: String, userId: String = ""): MerchantGoodsListFragment { diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/merchant/list/MerchantGoodsListViewModel.kt b/app/src/main/java/com/cheng/bole/ui/fragment/merchant/list/MerchantGoodsListViewModel.kt index aee6965..beb5a3a 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/merchant/list/MerchantGoodsListViewModel.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/merchant/list/MerchantGoodsListViewModel.kt @@ -2,20 +2,20 @@ package com.cheng.bole.ui.fragment.merchant.list import androidx.collection.ArrayMap import androidx.lifecycle.MutableLiveData -import com.cheng.bole.bean.MerchantGoodsBean -import com.cheng.bole.bean.UserAuthBean +import com.cheng.bole.bean.MerchantGoodsEntity +import com.cheng.bole.bean.UserAuthEntity import com.cheng.bole.net.ApiFactory import com.cheng.bole.net.model.toListResult import com.example.base.extensions.toast import com.example.base.utils.L import com.example.base.viewmodel.ListViewModel -class MerchantGoodsListViewModel: ListViewModel() { - override suspend fun requestApi(params: ArrayMap): Result> { +class MerchantGoodsListViewModel: ListViewModel() { + override suspend fun requestApi(params: ArrayMap): Result> { return ApiFactory.apiService.searchSupplier(params).toListResult() } - val authLiveData = MutableLiveData() + val authLiveData = MutableLiveData() fun checkAuth() { launchOnUiTryCatch({ diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/mine/MineFragment.kt b/app/src/main/java/com/cheng/bole/ui/fragment/mine/MineFragment.kt index 882724c..35ac1eb 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/mine/MineFragment.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/mine/MineFragment.kt @@ -18,6 +18,7 @@ import com.cheng.bole.manager.UserConfigManager import com.cheng.bole.ui.activity.LoginActivity import com.cheng.bole.ui.activity.PublicActivity import com.cheng.bole.ui.dialog.ShareDialog +import com.cheng.bole.ui.fragment.bid.publish.my.MyPublishFragment import com.cheng.bole.ui.fragment.mine.auth.CompanyAuthFragment import com.cheng.bole.ui.fragment.mine.favorite.FavoriteFragment import com.cheng.bole.ui.fragment.mine.feedback.FeedbackFragment @@ -121,7 +122,8 @@ class MineFragment : BaseFragment() { } binding.tvMyPublish.onClick { - + PublicActivity.start(requireContext(), MyPublishFragment::class.java) + EventReportManager.eventReport(EventConstants.JUMP_TO_MY_PUBLISH, "", "") } binding.tvAuth.onClick { diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/mine/MineViewModel.kt b/app/src/main/java/com/cheng/bole/ui/fragment/mine/MineViewModel.kt index 034cfb8..cde3759 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/mine/MineViewModel.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/mine/MineViewModel.kt @@ -1,8 +1,7 @@ package com.cheng.bole.ui.fragment.mine import androidx.lifecycle.MutableLiveData -import com.cheng.bole.bean.CompanyBean -import com.cheng.bole.bean.UploadFileEntity +import com.cheng.bole.bean.CompanyEntity import com.cheng.bole.bean.UserEntity import com.cheng.bole.bean.WxServiceEntity import com.cheng.bole.common.Constants @@ -17,7 +16,7 @@ import com.tencent.mm.opensdk.openapi.WXAPIFactory class MineViewModel : BaseViewModel() { val userInfoLiveData = MutableLiveData() - val companyLiveData = MutableLiveData() + val companyLiveData = MutableLiveData() fun userInfo(showLoading: Boolean = false) { if (showLoading) showDialog() diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/mine/auth/CompanyAuthFragment.kt b/app/src/main/java/com/cheng/bole/ui/fragment/mine/auth/CompanyAuthFragment.kt index 84e446c..7b518e4 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/mine/auth/CompanyAuthFragment.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/mine/auth/CompanyAuthFragment.kt @@ -8,8 +8,8 @@ import androidx.constraintlayout.widget.ConstraintLayout import coil.load import coil.transform.RoundedCornersTransformation import com.cheng.bole.R -import com.cheng.bole.bean.AreaBean -import com.cheng.bole.bean.CompanyBean +import com.cheng.bole.bean.AreaEntity +import com.cheng.bole.bean.CompanyEntity import com.cheng.bole.bean.UploadFileEntity import com.cheng.bole.common.Constants import com.cheng.bole.databinding.FragmentCompanyAuthBinding @@ -18,7 +18,7 @@ import com.cheng.bole.manager.UserConfigManager import com.cheng.bole.ui.activity.PublicActivity import com.cheng.bole.ui.dialog.SelectAreaDialog import com.cheng.bole.ui.dialog.SelectContactsDialog -import com.cheng.bole.ui.fragment.bid.publish.bid.AddBidContactsAdapter +import com.cheng.bole.ui.fragment.bid.publish.AddBidContactsAdapter import com.cheng.bole.ui.fragment.mine.vip.VipFragment import com.cheng.bole.ui.fragment.photo.PhotoViewFragment import com.cheng.bole.utils.FileProviderUtils @@ -35,13 +35,13 @@ import com.google.gson.JsonObject import okhttp3.RequestBody.Companion.toRequestBody class CompanyAuthFragment : BaseFragment() { - private var companyDetail: CompanyBean? = null + private var companyDetail: CompanyEntity? = null private var image: UploadFileEntity? = null private val contactsAdapter by lazy { AddBidContactsAdapter() } - private var city: AreaBean? = null + private var city: AreaEntity? = null private val imageLauncher = registerForActivityResult(ActivityResultContracts.GetContent()) { it?.let { @@ -202,7 +202,7 @@ class CompanyAuthFragment : BaseFragment { binding.etName.isEnabled = false diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/mine/auth/CompanyAuthViewModel.kt b/app/src/main/java/com/cheng/bole/ui/fragment/mine/auth/CompanyAuthViewModel.kt index 7e990c3..4cb983b 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/mine/auth/CompanyAuthViewModel.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/mine/auth/CompanyAuthViewModel.kt @@ -2,7 +2,7 @@ package com.cheng.bole.ui.fragment.mine.auth import android.content.Context import androidx.lifecycle.MutableLiveData -import com.cheng.bole.bean.CompanyBean +import com.cheng.bole.bean.CompanyEntity import com.cheng.bole.bean.UploadFileEntity import com.cheng.bole.net.ApiFactory import com.cheng.bole.utils.BitmapUtils @@ -14,7 +14,7 @@ import okhttp3.MultipartBody import okhttp3.RequestBody class CompanyAuthViewModel: BaseViewModel() { - val companyLiveData = MutableLiveData() + val companyLiveData = MutableLiveData() val addLiveData = MutableLiveData() val imageLiveData = MutableLiveData() diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/mine/favorite/FavoriteFragment.kt b/app/src/main/java/com/cheng/bole/ui/fragment/mine/favorite/FavoriteFragment.kt index 5f11058..b693750 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/mine/favorite/FavoriteFragment.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/mine/favorite/FavoriteFragment.kt @@ -1,7 +1,7 @@ package com.cheng.bole.ui.fragment.mine.favorite import com.cheng.bole.R -import com.cheng.bole.bean.BidItemBean +import com.cheng.bole.bean.BidItemEntity import com.cheng.bole.databinding.FragmentFavoriteBinding import com.cheng.bole.event.FavoriteEvent import com.cheng.bole.ui.activity.PublicActivity @@ -11,8 +11,8 @@ import com.cheng.bole.ui.fragment.mine.vip.VipFragment import com.example.base.common.RxBus import com.example.base.ui.list.ListFragment -class FavoriteFragment: ListFragment() { - private var item: BidItemBean? = null +class FavoriteFragment: ListFragment() { + private var item: BidItemEntity? = null override fun noDataClick() { diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/mine/favorite/FavoriteViewModel.kt b/app/src/main/java/com/cheng/bole/ui/fragment/mine/favorite/FavoriteViewModel.kt index b15364b..e7f7e3b 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/mine/favorite/FavoriteViewModel.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/mine/favorite/FavoriteViewModel.kt @@ -2,20 +2,20 @@ package com.cheng.bole.ui.fragment.mine.favorite import androidx.collection.ArrayMap import androidx.lifecycle.MutableLiveData -import com.cheng.bole.bean.BidItemBean -import com.cheng.bole.bean.UserAuthBean +import com.cheng.bole.bean.BidItemEntity +import com.cheng.bole.bean.UserAuthEntity import com.cheng.bole.net.ApiFactory import com.cheng.bole.net.model.toListResult import com.example.base.extensions.toast import com.example.base.utils.L import com.example.base.viewmodel.ListViewModel -class FavoriteViewModel: ListViewModel() { - override suspend fun requestApi(params: ArrayMap): Result> { +class FavoriteViewModel: ListViewModel() { + override suspend fun requestApi(params: ArrayMap): Result> { return ApiFactory.apiService.getFavoriteList().toListResult() } - val authLiveData = MutableLiveData() + val authLiveData = MutableLiveData() fun checkAuth() { launchOnUiTryCatch({ diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/mine/history/HistoryAdapter.kt b/app/src/main/java/com/cheng/bole/ui/fragment/mine/history/HistoryAdapter.kt index e459b92..23db7ef 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/mine/history/HistoryAdapter.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/mine/history/HistoryAdapter.kt @@ -3,15 +3,15 @@ package com.cheng.bole.ui.fragment.mine.history import android.text.TextUtils import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.cheng.bole.R -import com.cheng.bole.bean.BidDetailBean +import com.cheng.bole.bean.BidDetailEntity import com.cheng.bole.utils.BidTypeUtils import com.cheng.bole.widget.CommonShapeView import com.example.base.ui.list.LoadMoreAdapter import java.text.DecimalFormat -class HistoryAdapter: LoadMoreAdapter(R.layout.listitem_bid) { +class HistoryAdapter: LoadMoreAdapter(R.layout.listitem_bid) { - override fun convert(holder: BaseViewHolder, item: BidDetailBean) { + override fun convert(holder: BaseViewHolder, item: BidDetailEntity) { val tvTag = holder.getView(R.id.tv_tag) tvTag.setBgColor(BidTypeUtils.getTypeColor(item.type_name)) tvTag.text = BidTypeUtils.getShortName(item.type_name) diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/mine/history/HistoryFragment.kt b/app/src/main/java/com/cheng/bole/ui/fragment/mine/history/HistoryFragment.kt index 3014346..be85e79 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/mine/history/HistoryFragment.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/mine/history/HistoryFragment.kt @@ -1,15 +1,15 @@ package com.cheng.bole.ui.fragment.mine.history import com.cheng.bole.R -import com.cheng.bole.bean.BidDetailBean +import com.cheng.bole.bean.BidDetailEntity import com.cheng.bole.databinding.FragmentHistoryBinding import com.cheng.bole.ui.activity.PublicActivity import com.cheng.bole.ui.fragment.bid.detail.BidDetailFragment import com.cheng.bole.ui.fragment.mine.vip.VipFragment import com.example.base.ui.list.ListFragment -class HistoryFragment: ListFragment() { - private var item: BidDetailBean? = null +class HistoryFragment: ListFragment() { + private var item: BidDetailEntity? = null override fun noDataClick() { diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/mine/history/HistoryViewModel.kt b/app/src/main/java/com/cheng/bole/ui/fragment/mine/history/HistoryViewModel.kt index d8a0438..7621c23 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/mine/history/HistoryViewModel.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/mine/history/HistoryViewModel.kt @@ -2,20 +2,20 @@ package com.cheng.bole.ui.fragment.mine.history import androidx.collection.ArrayMap import androidx.lifecycle.MutableLiveData -import com.cheng.bole.bean.BidDetailBean -import com.cheng.bole.bean.UserAuthBean +import com.cheng.bole.bean.BidDetailEntity +import com.cheng.bole.bean.UserAuthEntity import com.cheng.bole.net.ApiFactory import com.cheng.bole.net.model.toListResult import com.example.base.extensions.toast import com.example.base.utils.L import com.example.base.viewmodel.ListViewModel -class HistoryViewModel: ListViewModel() { - override suspend fun requestApi(params: ArrayMap): Result> { +class HistoryViewModel: ListViewModel() { + override suspend fun requestApi(params: ArrayMap): Result> { return ApiFactory.apiService.getViewHistoryList().toListResult() } - val authLiveData = MutableLiveData() + val authLiveData = MutableLiveData() fun checkAuth() { launchOnUiTryCatch({ diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/mine/message/MessageAdapter.kt b/app/src/main/java/com/cheng/bole/ui/fragment/mine/message/MessageAdapter.kt index b0a791c..794210f 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/mine/message/MessageAdapter.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/mine/message/MessageAdapter.kt @@ -3,15 +3,15 @@ package com.cheng.bole.ui.fragment.mine.message import android.text.TextUtils import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.cheng.bole.R -import com.cheng.bole.bean.SubscriptionMessageBean +import com.cheng.bole.bean.SubscriptionMessageEntity import com.cheng.bole.utils.BidTypeUtils import com.cheng.bole.utils.StringUtils import com.cheng.bole.widget.CommonShapeView import com.example.base.ui.list.LoadMoreAdapter import java.text.DecimalFormat -class MessageAdapter: LoadMoreAdapter(R.layout.listitem_message) { - override fun convert(holder: BaseViewHolder, item: SubscriptionMessageBean) { +class MessageAdapter: LoadMoreAdapter(R.layout.listitem_message) { + override fun convert(holder: BaseViewHolder, item: SubscriptionMessageEntity) { val tvTag = holder.getView(R.id.tv_tag) tvTag.setBgColor(BidTypeUtils.getTypeColor(item.extra.typeName)) tvTag.text = BidTypeUtils.getShortName(item.extra.typeName) diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/mine/message/MessageFragment.kt b/app/src/main/java/com/cheng/bole/ui/fragment/mine/message/MessageFragment.kt index 5602435..b3d6eeb 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/mine/message/MessageFragment.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/mine/message/MessageFragment.kt @@ -2,15 +2,15 @@ package com.cheng.bole.ui.fragment.mine.message import android.graphics.Color import com.cheng.bole.R -import com.cheng.bole.bean.SubscriptionMessageBean +import com.cheng.bole.bean.SubscriptionMessageEntity import com.cheng.bole.databinding.FragmentMessageBinding import com.cheng.bole.ui.activity.PublicActivity import com.cheng.bole.ui.fragment.bid.detail.BidDetailFragment import com.cheng.bole.ui.fragment.mine.vip.VipFragment import com.example.base.ui.list.ListFragment -class MessageFragment: ListFragment() { - private var item: SubscriptionMessageBean? = null +class MessageFragment: ListFragment() { + private var item: SubscriptionMessageEntity? = null override fun noDataClick() { } diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/mine/message/MessageViewModel.kt b/app/src/main/java/com/cheng/bole/ui/fragment/mine/message/MessageViewModel.kt index a24fc90..95899ff 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/mine/message/MessageViewModel.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/mine/message/MessageViewModel.kt @@ -2,20 +2,20 @@ package com.cheng.bole.ui.fragment.mine.message import androidx.collection.ArrayMap import androidx.lifecycle.MutableLiveData -import com.cheng.bole.bean.SubscriptionMessageBean -import com.cheng.bole.bean.UserAuthBean +import com.cheng.bole.bean.SubscriptionMessageEntity +import com.cheng.bole.bean.UserAuthEntity import com.cheng.bole.net.ApiFactory import com.cheng.bole.net.model.toListResult import com.example.base.extensions.toast import com.example.base.utils.L import com.example.base.viewmodel.ListViewModel -class MessageViewModel: ListViewModel() { - override suspend fun requestApi(params: ArrayMap): Result> { +class MessageViewModel: ListViewModel() { + override suspend fun requestApi(params: ArrayMap): Result> { return ApiFactory.apiService.getSubscriptionMessage(params).toListResult() } - val authLiveData = MutableLiveData() + val authLiveData = MutableLiveData() fun checkAuth() { launchOnUiTryCatch({ diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/mine/order/cert/CertificateFragment.kt b/app/src/main/java/com/cheng/bole/ui/fragment/mine/order/cert/CertificateFragment.kt index a22398a..039bdb9 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/mine/order/cert/CertificateFragment.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/mine/order/cert/CertificateFragment.kt @@ -5,7 +5,7 @@ import android.text.TextUtils import androidx.activity.result.contract.ActivityResultContracts import coil.load import coil.transform.RoundedCornersTransformation -import com.cheng.bole.bean.OrderBean +import com.cheng.bole.bean.OrderEntity import com.cheng.bole.databinding.FragmentCertificateBinding import com.cheng.bole.event.OrderEvent import com.cheng.bole.ui.activity.PublicActivity @@ -28,8 +28,8 @@ import java.text.DecimalFormat class CertificateFragment: BaseFragment() { private val orderId by lazy { arguments?.getString("orderId") ?: "" } - private var orderInfo: OrderBean? = null - private var transInfo: OrderBean.TransInfo? = null + private var orderInfo: OrderEntity? = null + private var transInfo: OrderEntity.TransInfo? = null private var imagePath: String? = null @@ -97,7 +97,7 @@ class CertificateFragment: BaseFragment() + val orderLiveData = MutableLiveData() val updateLiveData = MutableLiveData() val imageLiveData = MutableLiveData() diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/mine/order/invoice/InvoiceFragment.kt b/app/src/main/java/com/cheng/bole/ui/fragment/mine/order/invoice/InvoiceFragment.kt index 4be2cab..49cfa91 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/mine/order/invoice/InvoiceFragment.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/mine/order/invoice/InvoiceFragment.kt @@ -4,7 +4,7 @@ import android.graphics.Color import android.os.Build import android.text.TextUtils import com.cheng.bole.R -import com.cheng.bole.bean.OrderBean +import com.cheng.bole.bean.OrderEntity import com.cheng.bole.databinding.FragmentInvoiceBinding import com.cheng.bole.event.OrderEvent import com.example.base.common.RxBus @@ -21,7 +21,7 @@ class InvoiceFragment : BaseFragment() private var userType = 0 // 0 企业 1 个人 private var invoiceType = 0 // 0 普票 1 专票 - private var orderInfo: OrderBean? = null + private var orderInfo: OrderEntity? = null override fun initView() { super.initView() @@ -32,9 +32,9 @@ class InvoiceFragment : BaseFragment() override fun initData() { super.initData() orderInfo = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { - arguments?.getSerializable("item", OrderBean::class.java) + arguments?.getSerializable("item", OrderEntity::class.java) } else { - arguments?.getSerializable("item") as? OrderBean + arguments?.getSerializable("item") as? OrderEntity } binding.tvAmount.text = DecimalFormat("0.00").format(orderInfo!!.total_fee.toFloat()) diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/mine/order/list/OrderAdapter.kt b/app/src/main/java/com/cheng/bole/ui/fragment/mine/order/list/OrderAdapter.kt index a96450c..226d7e0 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/mine/order/list/OrderAdapter.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/mine/order/list/OrderAdapter.kt @@ -5,17 +5,17 @@ import android.text.TextUtils import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.cheng.bole.R -import com.cheng.bole.bean.OrderBean +import com.cheng.bole.bean.OrderEntity import com.cheng.bole.widget.CommonShapeView import java.text.DecimalFormat -class OrderAdapter : BaseQuickAdapter(R.layout.listitem_order) { +class OrderAdapter : BaseQuickAdapter(R.layout.listitem_order) { init { addChildClickViewIds(R.id.btn_invoice, R.id.btn_certificate) } - override fun convert(holder: BaseViewHolder, item: OrderBean) { + override fun convert(holder: BaseViewHolder, item: OrderEntity) { holder.setText(R.id.tv_name, item.goods_name) holder.setText(R.id.tv_order_no, item.out_trade_no) holder.setText( diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/mine/order/list/OrderListViewModel.kt b/app/src/main/java/com/cheng/bole/ui/fragment/mine/order/list/OrderListViewModel.kt index d3e1f6f..7ee8658 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/mine/order/list/OrderListViewModel.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/mine/order/list/OrderListViewModel.kt @@ -1,14 +1,14 @@ package com.cheng.bole.ui.fragment.mine.order.list import androidx.lifecycle.MutableLiveData -import com.cheng.bole.bean.OrderBean +import com.cheng.bole.bean.OrderEntity import com.cheng.bole.net.ApiFactory import com.example.base.extensions.toast import com.example.base.utils.L import com.example.base.viewmodel.BaseViewModel class OrderListViewModel : BaseViewModel() { - val orderLiveData = MutableLiveData>() + val orderLiveData = MutableLiveData>() fun getOrderList(status: String) { showDialog() diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/mine/seat/SeatManageAdapter.kt b/app/src/main/java/com/cheng/bole/ui/fragment/mine/seat/SeatManageAdapter.kt index 366f48d..4822334 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/mine/seat/SeatManageAdapter.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/mine/seat/SeatManageAdapter.kt @@ -7,15 +7,15 @@ import coil.transform.CircleCropTransformation import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.cheng.bole.R -import com.cheng.bole.bean.SeatItemBean +import com.cheng.bole.bean.SeatItemEntity -class SeatManageAdapter: BaseQuickAdapter(R.layout.listitem_seat_manage) { +class SeatManageAdapter: BaseQuickAdapter(R.layout.listitem_seat_manage) { init { addChildClickViewIds(R.id.btn_delete) } - override fun convert(holder: BaseViewHolder, item: SeatItemBean) { + override fun convert(holder: BaseViewHolder, item: SeatItemEntity) { holder.getView(R.id.iv_avatar).load(item.avatar) { transformations(CircleCropTransformation()) } diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/mine/seat/SeatManageFragment.kt b/app/src/main/java/com/cheng/bole/ui/fragment/mine/seat/SeatManageFragment.kt index 09f55a7..0319f71 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/mine/seat/SeatManageFragment.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/mine/seat/SeatManageFragment.kt @@ -2,7 +2,7 @@ package com.cheng.bole.ui.fragment.mine.seat import android.annotation.SuppressLint import com.cheng.bole.R -import com.cheng.bole.bean.CorpInfoBean +import com.cheng.bole.bean.CorpEntity import com.cheng.bole.databinding.FragmentSeatManageBinding import com.cheng.bole.event.PaySuccessEvent import com.cheng.bole.manager.DialogEnum @@ -22,7 +22,7 @@ class SeatManageFragment: BaseFragment>() - val corpInfoLiveData = MutableLiveData() - val seatListLiveData = MutableLiveData>() + val corpInfoLiveData = MutableLiveData() + val seatListLiveData = MutableLiveData>() val addLiveData = MutableLiveData() val deleteLiveData = MutableLiveData() diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/mine/vip/VipFragment.kt b/app/src/main/java/com/cheng/bole/ui/fragment/mine/vip/VipFragment.kt index 0b21dbd..e91fd64 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/mine/vip/VipFragment.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/mine/vip/VipFragment.kt @@ -10,7 +10,7 @@ import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.cheng.bole.R -import com.cheng.bole.bean.CorpInfoBean +import com.cheng.bole.bean.CorpEntity import com.cheng.bole.bean.OrderPayEntity import com.cheng.bole.bean.UserEntity import com.cheng.bole.bean.VipGoodsEntity @@ -76,7 +76,7 @@ class VipFragment : BaseFragment() { private var userInfo: UserEntity? = null private var goodsEntity: VipGoodsEntity? = null private var orderEntity: OrderPayEntity? = null - private var corpInfo: CorpInfoBean? = null + private var corpInfo: CorpEntity? = null private var payTypeCheckedRes = R.mipmap.ic_pay_checked1 diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/mine/vip/VipViewModel.kt b/app/src/main/java/com/cheng/bole/ui/fragment/mine/vip/VipViewModel.kt index 763d21d..f023cc9 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/mine/vip/VipViewModel.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/mine/vip/VipViewModel.kt @@ -1,7 +1,7 @@ package com.cheng.bole.ui.fragment.mine.vip import androidx.lifecycle.MutableLiveData -import com.cheng.bole.bean.CorpInfoBean +import com.cheng.bole.bean.CorpEntity import com.cheng.bole.bean.CouponEntity import com.cheng.bole.bean.OrderPayEntity import com.cheng.bole.bean.UserEntity @@ -17,7 +17,7 @@ import okhttp3.RequestBody.Companion.toRequestBody class VipViewModel : BaseViewModel() { val userInfoLiveData = MutableLiveData() val goodsListLiveData = MutableLiveData>() - val corpInfoLiveData = MutableLiveData() + val corpInfoLiveData = MutableLiveData() val createOrderLiveData = MutableLiveData() val payTipsLiveData = MutableLiveData>() val couponListLiveData = MutableLiveData>() diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/push/PushViewModel.kt b/app/src/main/java/com/cheng/bole/ui/fragment/push/PushViewModel.kt index da8fc6c..9f0ad15 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/push/PushViewModel.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/push/PushViewModel.kt @@ -1,16 +1,16 @@ package com.cheng.bole.ui.fragment.push import androidx.lifecycle.MutableLiveData -import com.cheng.bole.bean.BidTypeBean -import com.cheng.bole.bean.SubscriptionBean +import com.cheng.bole.bean.BidTypeEntity +import com.cheng.bole.bean.SubscriptionEntity import com.cheng.bole.net.ApiFactory import com.example.base.extensions.toast import com.example.base.utils.L import com.example.base.viewmodel.BaseViewModel class PushViewModel : BaseViewModel() { - val subscribeLiveData = MutableLiveData>() - val typeLiveData = MutableLiveData>() + val subscribeLiveData = MutableLiveData>() + val typeLiveData = MutableLiveData>() fun getSubscriptionList() { showDialog() diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/push/list/PushListFragment.kt b/app/src/main/java/com/cheng/bole/ui/fragment/push/list/PushListFragment.kt index fd0825a..d8b58a4 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/push/list/PushListFragment.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/push/list/PushListFragment.kt @@ -6,8 +6,8 @@ import android.view.Gravity import android.widget.TextView import com.angcyo.tablayout.DslTabLayout import com.cheng.bole.R -import com.cheng.bole.bean.BidItemBean -import com.cheng.bole.bean.BidTypeBean +import com.cheng.bole.bean.BidItemEntity +import com.cheng.bole.bean.BidTypeEntity import com.cheng.bole.common.Constants import com.cheng.bole.common.EventConstants import com.cheng.bole.databinding.FragmentPushListBinding @@ -24,11 +24,11 @@ import com.example.base.utils.DensityUtils import com.example.base.widget.PageStatus import androidx.core.view.isNotEmpty -class PushListFragment : ListFragment() { +class PushListFragment : ListFragment() { private val subId by lazy { arguments?.getString("subId") ?: "" } private val bidType by lazy { UserConfigManager.getBidTypes() } - private var item: BidItemBean? = null + private var item: BidItemEntity? = null companion object { fun newInstance(subId: String): PushListFragment { @@ -101,7 +101,7 @@ class PushListFragment : ListFragment() { - override suspend fun requestApi(params: ArrayMap): Result> { +class PushListViewModel: ListViewModel() { + override suspend fun requestApi(params: ArrayMap): Result> { return ApiFactory.apiService.getRecommendList(params).toListResult() } - val authLiveData = MutableLiveData() + val authLiveData = MutableLiveData() fun checkAuth() { launchOnUiTryCatch({ diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/SubscribeAdapter.kt b/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/SubscribeAdapter.kt index d8eb33f..bf4457e 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/SubscribeAdapter.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/SubscribeAdapter.kt @@ -4,16 +4,16 @@ import androidx.recyclerview.widget.RecyclerView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.cheng.bole.R -import com.cheng.bole.bean.SubscriptionBean +import com.cheng.bole.bean.SubscriptionEntity import com.cheng.bole.manager.UserConfigManager -class SubscribeAdapter: BaseQuickAdapter(R.layout.listitem_subscribe) { +class SubscribeAdapter: BaseQuickAdapter(R.layout.listitem_subscribe) { init { addChildClickViewIds(R.id.tv_delete, R.id.tv_edit) } - override fun convert(holder: BaseViewHolder, item: SubscriptionBean) { + override fun convert(holder: BaseViewHolder, item: SubscriptionEntity) { holder.setText(R.id.tv_name, item.name) val rvKeyword = holder.getView(R.id.rv_keywords) diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/SubscribeViewModel.kt b/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/SubscribeViewModel.kt index 16b4436..18a0e9c 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/SubscribeViewModel.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/SubscribeViewModel.kt @@ -1,14 +1,14 @@ package com.cheng.bole.ui.fragment.push.subscribe import androidx.lifecycle.MutableLiveData -import com.cheng.bole.bean.SubscriptionBean +import com.cheng.bole.bean.SubscriptionEntity import com.cheng.bole.net.ApiFactory import com.example.base.extensions.toast import com.example.base.utils.L import com.example.base.viewmodel.BaseViewModel class SubscribeViewModel: BaseViewModel() { - val subscribeLiveData = MutableLiveData>() + val subscribeLiveData = MutableLiveData>() val deleteLiveData = MutableLiveData() fun getSubscriptionList() { diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/add/AddSubscribeFragment.kt b/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/add/AddSubscribeFragment.kt index 751200d..7c97387 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/add/AddSubscribeFragment.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/add/AddSubscribeFragment.kt @@ -7,10 +7,10 @@ import android.text.TextUtils import android.view.View import android.view.animation.RotateAnimation import com.cheng.bole.R -import com.cheng.bole.bean.AreaBean -import com.cheng.bole.bean.HotWordBean -import com.cheng.bole.bean.SourceBean -import com.cheng.bole.bean.SubscriptionBean +import com.cheng.bole.bean.AreaEntity +import com.cheng.bole.bean.HotWordEntity +import com.cheng.bole.bean.SourceEntity +import com.cheng.bole.bean.SubscriptionEntity import com.cheng.bole.databinding.FragmentAddSubscribeBinding import com.cheng.bole.event.SourceDataEvent import com.cheng.bole.event.SubscriptionEvent @@ -42,13 +42,13 @@ import okhttp3.RequestBody.Companion.toRequestBody class AddSubscribeFragment : BaseFragment() { private val type by lazy { arguments?.getInt("type") ?: 1 } // 1 地区 2 数据源 - private var subscription: SubscriptionBean? = null + private var subscription: SubscriptionEntity? = null private val selectedKeywordAdapter by lazy { SelectedKeywordAdapter() } private val keywordAdapter by lazy { RecommendKeywordAdapter() } - private val selectedCity = arrayListOf() - private val selectedSource = arrayListOf() + private val selectedCity = arrayListOf() + private val selectedSource = arrayListOf() private var pushType = 3 //1 短信 2 邮箱 3 app推送 @@ -70,9 +70,9 @@ class AddSubscribeFragment : BaseFragment= Build.VERSION_CODES.TIRAMISU) { - arguments?.getSerializable("item", SubscriptionBean::class.java) + arguments?.getSerializable("item", SubscriptionEntity::class.java) } else { - arguments?.getSerializable("item") as? SubscriptionBean + arguments?.getSerializable("item") as? SubscriptionEntity } setData() @@ -205,9 +205,9 @@ class AddSubscribeFragment : BaseFragment() + val list = mutableListOf() it.forEach { keyword -> - list.add(HotWordBean.Child(name = keyword)) + list.add(HotWordEntity.Child(name = keyword)) } keywordAdapter.setList(list) } diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/add/AddSubscribeViewModel.kt b/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/add/AddSubscribeViewModel.kt index fd93528..df4b3ad 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/add/AddSubscribeViewModel.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/add/AddSubscribeViewModel.kt @@ -1,7 +1,7 @@ package com.cheng.bole.ui.fragment.push.subscribe.add import androidx.lifecycle.MutableLiveData -import com.cheng.bole.bean.UserAuthBean +import com.cheng.bole.bean.UserAuthEntity import com.cheng.bole.net.ApiFactory import com.example.base.extensions.toast import com.example.base.utils.L @@ -57,7 +57,7 @@ class AddSubscribeViewModel : BaseViewModel() { }) } - val authLiveData = MutableLiveData() + val authLiveData = MutableLiveData() fun checkAuth() { launchOnUiTryCatch({ diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/add/RecommendKeywordAdapter.kt b/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/add/RecommendKeywordAdapter.kt index fc744a6..944bc6b 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/add/RecommendKeywordAdapter.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/add/RecommendKeywordAdapter.kt @@ -3,10 +3,10 @@ package com.cheng.bole.ui.fragment.push.subscribe.add import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.cheng.bole.R -import com.cheng.bole.bean.HotWordBean +import com.cheng.bole.bean.HotWordEntity -class RecommendKeywordAdapter: BaseQuickAdapter(R.layout.listitem_recommend_keywords) { - override fun convert(holder: BaseViewHolder, item: HotWordBean.Child) { +class RecommendKeywordAdapter: BaseQuickAdapter(R.layout.listitem_recommend_keywords) { + override fun convert(holder: BaseViewHolder, item: HotWordEntity.Child) { holder.setText(R.id.tv_name, item.name) } } \ No newline at end of file diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/source/RecommendSourceAdapter.kt b/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/source/RecommendSourceAdapter.kt index 2580607..2f7840e 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/source/RecommendSourceAdapter.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/source/RecommendSourceAdapter.kt @@ -3,10 +3,10 @@ package com.cheng.bole.ui.fragment.push.subscribe.source import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.cheng.bole.R -import com.cheng.bole.bean.SourceBean +import com.cheng.bole.bean.SourceEntity -class RecommendSourceAdapter: BaseQuickAdapter(R.layout.listitem_recommend_source) { - override fun convert(holder: BaseViewHolder, item: SourceBean) { +class RecommendSourceAdapter: BaseQuickAdapter(R.layout.listitem_recommend_source) { + override fun convert(holder: BaseViewHolder, item: SourceEntity) { holder.setText(R.id.tv_name, item.name) when(holder.layoutPosition) { 0 -> { diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/source/SearchSourceAdapter.kt b/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/source/SearchSourceAdapter.kt index fd66d82..7334461 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/source/SearchSourceAdapter.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/source/SearchSourceAdapter.kt @@ -3,14 +3,14 @@ package com.cheng.bole.ui.fragment.push.subscribe.source import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.cheng.bole.R -import com.cheng.bole.bean.SourceBean +import com.cheng.bole.bean.SourceEntity import com.example.base.extensions.getColor import com.example.base.utils.SpanUtils -class SearchSourceAdapter: BaseQuickAdapter(R.layout.listitem_search_source_result) { +class SearchSourceAdapter: BaseQuickAdapter(R.layout.listitem_search_source_result) { private var keyword: String = "" - override fun convert(holder: BaseViewHolder, item: SourceBean) { + override fun convert(holder: BaseViewHolder, item: SourceEntity) { val name = item.name val index = name.indexOf(keyword) if (index != -1) { diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/source/SelectedSourceAdapter.kt b/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/source/SelectedSourceAdapter.kt index 40fcfd0..d6c8947 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/source/SelectedSourceAdapter.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/source/SelectedSourceAdapter.kt @@ -3,15 +3,15 @@ package com.cheng.bole.ui.fragment.push.subscribe.source import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.cheng.bole.R -import com.cheng.bole.bean.SourceBean +import com.cheng.bole.bean.SourceEntity -class SelectedSourceAdapter: BaseQuickAdapter(R.layout.listitem_selected_source) { +class SelectedSourceAdapter: BaseQuickAdapter(R.layout.listitem_selected_source) { init { addChildClickViewIds(R.id.iv_delete) } - override fun convert(holder: BaseViewHolder, item: SourceBean) { + override fun convert(holder: BaseViewHolder, item: SourceEntity) { holder.setText(R.id.tv_name, item.name) } } \ No newline at end of file diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/source/SourceSearchFragment.kt b/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/source/SourceSearchFragment.kt index e243d25..a234f7f 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/source/SourceSearchFragment.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/source/SourceSearchFragment.kt @@ -2,7 +2,7 @@ package com.cheng.bole.ui.fragment.push.subscribe.source import android.text.TextUtils import com.cheng.bole.R -import com.cheng.bole.bean.SourceBean +import com.cheng.bole.bean.SourceEntity import com.cheng.bole.databinding.FragmentSourceSearchBinding import com.cheng.bole.event.SourceDataEvent import com.cheng.bole.impl.TextWatcherImpl @@ -56,7 +56,7 @@ class SourceSearchFragment: BaseFragment>() {}.type)) + selectedAdapter.setList(Gson().fromJson(listStr, object : TypeToken>() {}.type)) if (selectedAdapter.data.isNotEmpty()) { SpanUtils.with(binding.tvSelectedCount) .append("(") diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/source/SourceSearchViewModel.kt b/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/source/SourceSearchViewModel.kt index b0362f8..65d5412 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/source/SourceSearchViewModel.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/push/subscribe/source/SourceSearchViewModel.kt @@ -1,15 +1,15 @@ package com.cheng.bole.ui.fragment.push.subscribe.source import androidx.lifecycle.MutableLiveData -import com.cheng.bole.bean.SourceBean +import com.cheng.bole.bean.SourceEntity import com.cheng.bole.net.ApiFactory import com.example.base.extensions.toast import com.example.base.utils.L import com.example.base.viewmodel.BaseViewModel class SourceSearchViewModel: BaseViewModel() { - val hotLiveData = MutableLiveData>() - val searchLiveData = MutableLiveData>() + val hotLiveData = MutableLiveData>() + val searchLiveData = MutableLiveData>() fun getHotSources() { showDialog() diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/search/list/SearchListFragment.kt b/app/src/main/java/com/cheng/bole/ui/fragment/search/list/SearchListFragment.kt index 41a1942..758f7ba 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/search/list/SearchListFragment.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/search/list/SearchListFragment.kt @@ -7,8 +7,8 @@ import android.view.KeyEvent import android.view.View import androidx.core.animation.addListener import com.cheng.bole.R -import com.cheng.bole.bean.BidItemBean -import com.cheng.bole.bean.SearchOptionBean +import com.cheng.bole.bean.BidItemEntity +import com.cheng.bole.bean.SearchOptionEntity import com.cheng.bole.databinding.FragmentSearchListBinding import com.cheng.bole.impl.TextWatcherImpl import com.cheng.bole.manager.SearchHistoryManager @@ -26,16 +26,16 @@ import com.example.base.extensions.toast import com.example.base.extensions.visible import com.example.base.ui.list.ListFragment -class SearchListFragment : ListFragment() { +class SearchListFragment : ListFragment() { private val keyword by lazy { arguments?.getString("keyword") ?: "" } private val typeId by lazy { arguments?.getString("typeId") ?: "" } - private val cityList = mutableListOf() - private val typeList = mutableListOf() - private var timeOption: SearchOptionBean.OptionItem? = null - private var sortOption: SearchOptionBean.OptionItem? = null + private val cityList = mutableListOf() + private val typeList = mutableListOf() + private var timeOption: SearchOptionEntity.OptionItem? = null + private var sortOption: SearchOptionEntity.OptionItem? = null - private var item: BidItemBean? = null + private var item: BidItemEntity? = null override fun noDataClick() { @@ -65,7 +65,7 @@ class SearchListFragment : ListFragment item.id }.joinToString(",") } } diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/search/list/SearchListViewModel.kt b/app/src/main/java/com/cheng/bole/ui/fragment/search/list/SearchListViewModel.kt index 207161d..8f30996 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/search/list/SearchListViewModel.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/search/list/SearchListViewModel.kt @@ -2,20 +2,20 @@ package com.cheng.bole.ui.fragment.search.list import androidx.collection.ArrayMap import androidx.lifecycle.MutableLiveData -import com.cheng.bole.bean.BidItemBean -import com.cheng.bole.bean.UserAuthBean +import com.cheng.bole.bean.BidItemEntity +import com.cheng.bole.bean.UserAuthEntity import com.cheng.bole.net.ApiFactory import com.cheng.bole.net.model.toListResult import com.example.base.extensions.toast import com.example.base.utils.L import com.example.base.viewmodel.ListViewModel -class SearchListViewModel: ListViewModel() { - override suspend fun requestApi(params: ArrayMap): Result> { +class SearchListViewModel: ListViewModel() { + override suspend fun requestApi(params: ArrayMap): Result> { return ApiFactory.apiService.search(params).toListResult() } - val authLiveData = MutableLiveData() + val authLiveData = MutableLiveData() fun checkAuth() { launchOnUiTryCatch({ diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/search/list/SearchOptionChildAdapter.kt b/app/src/main/java/com/cheng/bole/ui/fragment/search/list/SearchOptionChildAdapter.kt index e803fe1..0206160 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/search/list/SearchOptionChildAdapter.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/search/list/SearchOptionChildAdapter.kt @@ -3,13 +3,13 @@ package com.cheng.bole.ui.fragment.search.list import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.cheng.bole.R -import com.cheng.bole.bean.SearchOptionBean +import com.cheng.bole.bean.SearchOptionEntity import com.example.base.extensions.getColor import com.example.base.utils.DensityUtils class SearchOptionChildAdapter(private val hasParent: Boolean) : - BaseQuickAdapter(R.layout.listitem_search_option_child) { - override fun convert(holder: BaseViewHolder, item: SearchOptionBean.OptionItem) { + BaseQuickAdapter(R.layout.listitem_search_option_child) { + override fun convert(holder: BaseViewHolder, item: SearchOptionEntity.OptionItem) { holder.setText(R.id.tv_name, item.name) holder.setTextColor(R.id.tv_name, if (item.isChecked) getColor(R.color.color_125ffe) else getColor(R.color.color_1a1a1a)) holder.setVisible(R.id.iv_check, item.isChecked) diff --git a/app/src/main/java/com/cheng/bole/ui/fragment/search/list/SearchOptionParentAdapter.kt b/app/src/main/java/com/cheng/bole/ui/fragment/search/list/SearchOptionParentAdapter.kt index 7f4af9f..0e6c83d 100644 --- a/app/src/main/java/com/cheng/bole/ui/fragment/search/list/SearchOptionParentAdapter.kt +++ b/app/src/main/java/com/cheng/bole/ui/fragment/search/list/SearchOptionParentAdapter.kt @@ -4,10 +4,10 @@ import android.graphics.Color import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.cheng.bole.R -import com.cheng.bole.bean.SearchOptionBean +import com.cheng.bole.bean.SearchOptionEntity -class SearchOptionParentAdapter: BaseQuickAdapter(R.layout.listitem_search_option_parent) { - override fun convert(holder: BaseViewHolder, item: SearchOptionBean) { +class SearchOptionParentAdapter: BaseQuickAdapter(R.layout.listitem_search_option_parent) { + override fun convert(holder: BaseViewHolder, item: SearchOptionEntity) { holder.setText(R.id.tv_name, item.title) holder.setVisible(R.id.view_tag, item.isChecked) holder.itemView.setBackgroundColor(if (item.isChecked) Color.WHITE else Color.TRANSPARENT) diff --git a/app/src/main/res/drawable/shape_fff5f3_cor6.xml b/app/src/main/res/drawable/shape_fff5f3_cor6.xml new file mode 100644 index 0000000..9f00438 --- /dev/null +++ b/app/src/main/res/drawable/shape_fff5f3_cor6.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_publish_status_bg1.xml b/app/src/main/res/drawable/shape_publish_status_bg1.xml new file mode 100644 index 0000000..7695026 --- /dev/null +++ b/app/src/main/res/drawable/shape_publish_status_bg1.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_publish_status_bg2.xml b/app/src/main/res/drawable/shape_publish_status_bg2.xml new file mode 100644 index 0000000..4722a2d --- /dev/null +++ b/app/src/main/res/drawable/shape_publish_status_bg2.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_publish_status_bg3.xml b/app/src/main/res/drawable/shape_publish_status_bg3.xml new file mode 100644 index 0000000..081725e --- /dev/null +++ b/app/src/main/res/drawable/shape_publish_status_bg3.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_bind_phone.xml b/app/src/main/res/layout/dialog_bind_phone.xml index 7c62674..607a76b 100644 --- a/app/src/main/res/layout/dialog_bind_phone.xml +++ b/app/src/main/res/layout/dialog_bind_phone.xml @@ -132,7 +132,7 @@ + + + + + + + android:layout_height="0.5dp" + android:background="@color/color_eeeeee" + app:layout_constraintBottom_toTopOf="@id/layout_bottom" /> + android:layout_height="0.5dp" + android:background="@color/color_eeeeee" + app:layout_constraintBottom_toTopOf="@id/layout_bottom" /> + android:layout_height="0.5dp" + android:background="@color/color_eeeeee" + app:layout_constraintBottom_toTopOf="@id/layout_bottom" /> + + + android:layout_height="0.5dp" + android:background="@color/color_eeeeee" + app:layout_constraintBottom_toTopOf="@id/layout_bottom" /> + + + + @@ -361,6 +362,12 @@ app:navigationIcon="@drawable/ic_back_black" app:title=" " /> + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_my_goods.xml b/app/src/main/res/layout/fragment_my_goods.xml new file mode 100644 index 0000000..0a36a7b --- /dev/null +++ b/app/src/main/res/layout/fragment_my_goods.xml @@ -0,0 +1,110 @@ + +> + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_my_publish.xml b/app/src/main/res/layout/fragment_my_publish.xml new file mode 100644 index 0000000..720dbe9 --- /dev/null +++ b/app/src/main/res/layout/fragment_my_publish.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_publish_bid_message.xml b/app/src/main/res/layout/fragment_publish_bid_message.xml index 7a3ba83..d4147eb 100644 --- a/app/src/main/res/layout/fragment_publish_bid_message.xml +++ b/app/src/main/res/layout/fragment_publish_bid_message.xml @@ -596,6 +596,12 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/listitem_my_goods.xml b/app/src/main/res/layout/listitem_my_goods.xml new file mode 100644 index 0000000..1a93597 --- /dev/null +++ b/app/src/main/res/layout/listitem_my_goods.xml @@ -0,0 +1,217 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/popup_search_options.xml b/app/src/main/res/layout/popup_search_options.xml index 86d5f33..0fd8d3f 100644 --- a/app/src/main/res/layout/popup_search_options.xml +++ b/app/src/main/res/layout/popup_search_options.xml @@ -125,7 +125,7 @@ #DCE4F3 #F7EBE2 #FF8518 + #FFF5F3 + #D0D0D0 + #FFF4EA + #FF9234 + #E3FAE7 + #FFEDE7 \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index ff676fd..5902252 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -89,5 +89,6 @@ 116dp 52dp 68dp + 66dp \ No newline at end of file