Commit 3c7180f7 by 郑鹏

修复优惠券图片显示,升级trage sdk

parent 547bd8a6
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.0","enabled":true,"outputFile":"app-debug.apk","fullName":"debug","baseName":"debug"},"path":"app-debug.apk","properties":{}}]
\ No newline at end of file
...@@ -10,6 +10,7 @@ import com.chad.library.adapter.base.BaseViewHolder; ...@@ -10,6 +10,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
import java.util.List; import java.util.List;
import cn.dankal.basiclib.util.language.SPUtil;
import cn.dankal.entities.user.CouponListEntity; import cn.dankal.entities.user.CouponListEntity;
import cn.dankal.client.R; import cn.dankal.client.R;
...@@ -46,10 +47,19 @@ public class MyCouponAdapter extends BaseQuickAdapter<CouponListEntity.DataBean, ...@@ -46,10 +47,19 @@ public class MyCouponAdapter extends BaseQuickAdapter<CouponListEntity.DataBean,
ImageView imageView = helper.getView(R.id.iv_state); ImageView imageView = helper.getView(R.id.iv_state);
if (imageView != null) { if (imageView != null) {
if (couponVoBean.getCoupon_status() == 2) {//已过期 if (couponVoBean.getCoupon_status() == 2) {//已过期
if (SPUtil.getInstance(mContext).getSelectLanguage() != 1) {//中文
imageView.setImageResource(R.mipmap.pic_home_order_coupon_invalid); imageView.setImageResource(R.mipmap.pic_home_order_coupon_invalid);
} else {//韩文
imageView.setImageResource(R.mipmap.pic_home_order_coupon_invalid_ro);
}
} }
if (item.getIs_use() == 1) {//已使用 if (item.getIs_use() == 1) {//已使用
if (SPUtil.getInstance(mContext).getSelectLanguage() != 1) {//中文
imageView.setImageResource(R.mipmap.pic_home_order_coupon_use); imageView.setImageResource(R.mipmap.pic_home_order_coupon_use);
} else {//韩文
imageView.setImageResource(R.mipmap.pic_home_order_coupon_use_ro);
}
} }
} }
TextView tvUser = helper.getView(R.id.tv_user); TextView tvUser = helper.getView(R.id.tv_user);
......
...@@ -4,4 +4,5 @@ ...@@ -4,4 +4,5 @@
<domain includeSubdomains="true">182.254.116.117</domain> <domain includeSubdomains="true">182.254.116.117</domain>
<domain includeSubdomains="true">pingma.qq.com</domain> <domain includeSubdomains="true">pingma.qq.com</domain>
</domain-config> </domain-config>
<base-config cleartextTrafficPermitted="true" />
</network-security-config> </network-security-config>
\ No newline at end of file
...@@ -33,7 +33,8 @@ public class BaseApi { ...@@ -33,7 +33,8 @@ public class BaseApi {
public static final String BASE_ADDRESS_URL = "https://suggest-bar.daum.net/"; public static final String BASE_ADDRESS_URL = "https://suggest-bar.daum.net/";
public static Retrofit getRetrofit() { public static Retrofit getRetrofit() {
return new Retrofit.Builder().addConverterFactory(FastJsonConverterFactory.create()) return new Retrofit.Builder()
.addConverterFactory(FastJsonConverterFactory.create())
.addCallAdapterFactory(RxJava2CallAdapterFactory.create()) .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
.client(getOkhttpInstance()) .client(getOkhttpInstance())
.baseUrl(BASE_URL) .baseUrl(BASE_URL)
......
...@@ -233,9 +233,9 @@ ext.deps = deps ...@@ -233,9 +233,9 @@ ext.deps = deps
def build_versions = [:] def build_versions = [:]
build_versions.min_sdk = 20 build_versions.min_sdk = 20
build_versions.target_sdk = 23 build_versions.target_sdk = 28
build_versions.compile_sdk = 27 build_versions.compile_sdk = 28
build_versions.build_tools = "27.1.1" build_versions.build_tools = "28.1.1"
ext.build_versions = build_versions ext.build_versions = build_versions
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment