From 41b23417cd62af3cd77b695a2b03446243431fc1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 14:11:54 +0800
Subject: [PATCH] '完善'
---
MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/mine/OrderActivity33.java | 21 +++------------------
1 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/mine/OrderActivity33.java b/MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/mine/OrderActivity33.java
index 786d654..0b5ceba 100644
--- a/MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/mine/OrderActivity33.java
+++ b/MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/mine/OrderActivity33.java
@@ -120,9 +120,7 @@
String helpUrl;
String findOrderHelpUrl;//璁㈠崟鎵惧洖甯姪閾炬帴
boolean isLoad = false;
- //鏄剧ず娌℃湁缁熻璁㈠崟鎸夐挳
- private FrameLayout ll_orderfl;
- private TextView ll_orderhelp;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -194,10 +192,6 @@
srl_rebate_order.setColorSchemeColors(getResources().getColor(R.color.theme));
findViewById(R.id.fl_order_category).setVisibility(View.VISIBLE);
-
- ll_orderfl = findViewById(R.id.ll_orderfl);
- ll_orderhelp = findViewById(R.id.ll_orderhelp);
- ToolUtil.setShape_bg(ll_orderfl.getContext(), 12, "#ffe5005c", ll_orderhelp);
}
@@ -218,7 +212,6 @@
iv_open_taobao_order.setOnClickListener(this);
iv_three_red_point.setOnClickListener(this);
v_cover.setOnClickListener(this);
- ll_orderhelp.setOnClickListener(this);
tv_go_scan.setOnClickListener(this);
mChangeHelper = new ConnectivityChangeHelper(this,
@@ -483,15 +476,12 @@
helpUrl = jsonObject.optJSONObject("data").optString("helpUrl");
findOrderHelpUrl = jsonObject.optJSONObject("data").optString("findOrderHelpUrl");///璁㈠崟鎵惧洖甯姪閾炬帴
requestState(mList.size() == 0 ? 1 : 0);
- if (ll_orderfl.getVisibility() == View.GONE && StringUtils.isEmpty(findOrderHelpUrl))
- ll_orderfl.setVisibility(View.GONE);
- else
- ll_orderfl.setVisibility(View.VISIBLE);
+
if (mList.size() == count) {
bottom.setVisibility(View.VISIBLE);
iv_loading.setVisibility(View.GONE);
- tv_loading.setText("-鍒板簳浜�*^_^*-");
+ tv_loading.setText(getResources().getString(R.string.list_no_more));
}
Log.i("mResult", jsonObject.toString());
} else {
@@ -816,11 +806,6 @@
break;
case R.id.ll_slid_to_top:
mFilterPopupWindow.dismiss();
- break;
- case R.id.ll_orderhelp://璁㈠崟娌℃湁琚粺璁�
- Intent intent2 = new Intent(OrderActivity33.this, ShareBrowserActivity.class);
- intent2.putExtra("url", findOrderHelpUrl);
- startActivity(intent2);
break;
default:
break;
--
Gitblit v1.8.0