From 2c5b6e472c368e80d85b8ea2b461c9ea62981d9b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期日, 08 十月 2023 11:28:56 +0800
Subject: [PATCH] 广告升级/bug修复
---
BuWanVideo/src/com/weikou/beibeivideo/ui/recent/WatchHistoryFragment.java | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/BuWanVideo/src/com/weikou/beibeivideo/ui/recent/WatchHistoryFragment.java b/BuWanVideo/src/com/weikou/beibeivideo/ui/recent/WatchHistoryFragment.java
index 173c603..aa972ce 100644
--- a/BuWanVideo/src/com/weikou/beibeivideo/ui/recent/WatchHistoryFragment.java
+++ b/BuWanVideo/src/com/weikou/beibeivideo/ui/recent/WatchHistoryFragment.java
@@ -2,8 +2,8 @@
import android.app.Dialog;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.widget.SwipeRefreshLayout;
+import androidx.fragment.app.Fragment;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -15,7 +15,7 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
-import com.lcjian.library.util.RefreshLayout;
+import com.lcjian.library.dialog.DialogUtil;
import com.umeng.analytics.MobclickAgent;
import com.weikou.beibeivideo.BasicTextHttpResponseHandler;
import com.weikou.beibeivideo.BeibeiVideoAPI;
@@ -23,7 +23,9 @@
import com.weikou.beibeivideo.R;
import com.weikou.beibeivideo.entity.vo.WatchHistoryVO;
import com.weikou.beibeivideo.ui.dialog.LoadingDialogUtil;
+import com.weikou.beibeivideo.util.JsonUtil;
import com.weikou.beibeivideo.util.UserUtil;
+import com.weikou.beibeivideo.widget.MySwipeRefreshLayout;
import org.apache.http.Header;
import org.json.JSONObject;
@@ -35,7 +37,7 @@
public class WatchHistoryFragment extends Fragment {
- private RefreshLayout srl;
+ private MySwipeRefreshLayout srl;
private WatchHistoryAdapter mAdapter;
@@ -78,7 +80,7 @@
getWatchHistory(currentPage);
}
});
- srl.setOnLoadListener(new RefreshLayout.OnLoadListener() {
+ srl.setOnLoadListener(new MySwipeRefreshLayout.OnLoadListener() {
@Override
public void onLoad() {
getWatchHistory(currentPage + 1);
@@ -111,13 +113,11 @@
super.onResume();
if (mAdapter != null)
mAdapter.setSelectedMode(false);
- MobclickAgent.onPageStart("涓婚〉闈⑩�斺�旀渶杩戔�斺�旇鐪嬭褰�");
}
@Override
public void onPause() {
super.onPause();
- MobclickAgent.onPageEnd("涓婚〉闈⑩�斺�旀渶杩戔�斺�旇鐪嬭褰�");
}
@@ -153,16 +153,16 @@
@Override
public void onSuccessPerfect(int statusCode, Header[] headers, JSONObject jsonObject) throws Exception {
if (jsonObject.optBoolean("IsPost")) {
- Gson gson = new GsonBuilder().setFieldNamingPolicy(
- FieldNamingPolicy.UPPER_CAMEL_CASE)
- .create();
+
JSONObject data = jsonObject.optJSONObject("Data");
count = data.optLong("count");
Type type = new TypeToken<List<WatchHistoryVO>>() {
}.getType();
- List<WatchHistoryVO> list = gson.fromJson(data.optJSONArray("list").toString(), type);
+ List<WatchHistoryVO> list = JsonUtil.videoGson.fromJson(data.optJSONArray("list").toString(), type);
currentPage = page;
+ if (voList == null)
+ voList = new ArrayList<>();
if (page == 1)
voList.clear();
if (list != null && list.size() > 0) {
@@ -192,15 +192,13 @@
@Override
public void onStart() {
super.onStart();
- if (loadingDialog != null && !loadingDialog.isShowing())
- loadingDialog.show();
+ DialogUtil.show(loadingDialog);
}
@Override
public void onFinish() {
super.onFinish();
- if (loadingDialog != null && loadingDialog.isShowing())
- loadingDialog.dismiss();
+ DialogUtil.dismiss(loadingDialog);
}
@Override
--
Gitblit v1.8.0