From 83cd7422f855563bd64d79b0e1b56f78b0ff0f53 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Fri, 16 Sep 2022 00:14:53 +0800
Subject: [PATCH] Use arrayMap

---
 .../com/fongmi/android/tv/model/SiteViewModel.java | 14 +++++++-------
 .../java/com/fongmi/android/tv/net/OKHttp.java     | 10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java b/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java
index b98ea37c4..3b3226c24 100644
--- a/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java
+++ b/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java
@@ -1,7 +1,7 @@
 package com.fongmi.android.tv.model;
 
-import android.content.ContentValues;
 import android.text.TextUtils;
+import android.util.ArrayMap;
 
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
@@ -58,7 +58,7 @@ public class SiteViewModel extends ViewModel {
                 result.setList(Result.fromJson(homeVideoContent).getList());
                 return result;
             } else if (site.getType() == 4) {
-                ContentValues params = new ContentValues();
+                ArrayMap<String, String> params = new ArrayMap<>();
                 params.put("filter", "true");
                 String body = OKHttp.newCall(site.getApi(), params).execute().body().string();
                 SpiderDebug.log(body);
@@ -70,7 +70,7 @@ public class SiteViewModel extends ViewModel {
                 if (result.getList().isEmpty() || result.getList().get(0).getVodPic().length() > 0) return result;
                 ArrayList<String> ids = new ArrayList<>();
                 for (Vod item : result.getList()) ids.add(item.getVodId());
-                ContentValues params = new ContentValues();
+                ArrayMap<String, String> params = new ArrayMap<>();
                 params.put("ac", site.getType() == 0 ? "videolist" : "detail");
                 params.put("ids", TextUtils.join(",", ids));
                 body = OKHttp.newCall(site.getApi(), params).execute().body().string();
@@ -90,7 +90,7 @@ public class SiteViewModel extends ViewModel {
                 SpiderDebug.log(categoryContent);
                 return Result.fromJson(categoryContent);
             } else {
-                ContentValues params = new ContentValues();
+                ArrayMap<String, String> params = new ArrayMap<>();
                 if (site.getType() == 4) params.put("ext", Utils.getBase64(new Gson().toJson(extend)));
                 params.put("ac", site.getType() == 0 ? "videolist" : "detail");
                 params.put("t", tid);
@@ -113,7 +113,7 @@ public class SiteViewModel extends ViewModel {
                 if (!result.getList().isEmpty()) result.getList().get(0).setVodFlags();
                 return result;
             } else {
-                ContentValues params = new ContentValues();
+                ArrayMap<String, String> params = new ArrayMap<>();
                 params.put("ac", site.getType() == 0 ? "videolist" : "detail");
                 params.put("ids", id);
                 String body = OKHttp.newCall(site.getApi(), params).execute().body().string();
@@ -136,7 +136,7 @@ public class SiteViewModel extends ViewModel {
                 if (result.getFlag().isEmpty()) result.setFlag(flag);
                 return result;
             } else if (site.getType() == 4) {
-                ContentValues params = new ContentValues();
+                ArrayMap<String, String> params = new ArrayMap<>();
                 params.put("play", id);
                 params.put("flag", flag);
                 String body = OKHttp.newCall(site.getApi(), params).execute().body().string();
@@ -161,7 +161,7 @@ public class SiteViewModel extends ViewModel {
                 SpiderDebug.log(searchContent);
                 post(site, Result.fromJson(searchContent));
             } else {
-                ContentValues params = new ContentValues();
+                ArrayMap<String, String> params = new ArrayMap<>();
                 params.put("wd", keyword);
                 if (site.getType() != 0) params.put("ac", "detail");
                 String body = OKHttp.newCall(site.getApi(), params).execute().body().string();
diff --git a/app/src/main/java/com/fongmi/android/tv/net/OKHttp.java b/app/src/main/java/com/fongmi/android/tv/net/OKHttp.java
index 47205e480..e28cbaf5c 100644
--- a/app/src/main/java/com/fongmi/android/tv/net/OKHttp.java
+++ b/app/src/main/java/com/fongmi/android/tv/net/OKHttp.java
@@ -1,6 +1,6 @@
 package com.fongmi.android.tv.net;
 
-import android.content.ContentValues;
+import android.util.ArrayMap;
 
 import java.util.Map;
 import java.util.Objects;
@@ -44,13 +44,13 @@ public class OKHttp {
         return get().client().newCall(new Request.Builder().url(url).headers(headers).build());
     }
 
-    public static Call newCall(String url, ContentValues param) {
-        return get().client().newCall(new Request.Builder().url(buildUrl(url, param)).build());
+    public static Call newCall(String url, ArrayMap<String, String> params) {
+        return get().client().newCall(new Request.Builder().url(buildUrl(url, params)).build());
     }
 
-    private static HttpUrl buildUrl(String url, ContentValues param) {
+    private static HttpUrl buildUrl(String url, ArrayMap<String, String> params) {
         HttpUrl.Builder builder = Objects.requireNonNull(HttpUrl.parse(url)).newBuilder();
-        for (Map.Entry<String, Object> entry : param.valueSet()) builder.addQueryParameter(entry.getKey(), entry.getValue().toString());
+        for (Map.Entry<String, String> entry : params.entrySet()) builder.addQueryParameter(entry.getKey(), entry.getValue());
         return builder.build();
     }
 }