From 317cce1f5650d0d8d5e49fc9a9096e5fb12235a5 Mon Sep 17 00:00:00 2001
From: chenjuntao <chenjuntao@ghzhushou.com>
Date: Tue, 14 Mar 2023 18:31:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20OPPO=E6=89=8B=E6=9C=BA=E6=8B=A6=E6=88=AA?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85=E7=9B=B8=E5=85=B3=E4=BC=98=E5=8C=96=E2=80=94?=
 =?UTF-8?q?0314=E6=B5=8B=E8=AF=95=20(=E6=9B=B4=E6=AD=A3=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8)=20https://jira.shanqu.cc/browse/GHZS-1622?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/gh/common/constant/Config.java    | 10 ++++++++--
 .../gh/gamecenter/retrofit/service/ApiService.java  | 13 +++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/gh/common/constant/Config.java b/app/src/main/java/com/gh/common/constant/Config.java
index 232a1509ea..3b38eb8b18 100644
--- a/app/src/main/java/com/gh/common/constant/Config.java
+++ b/app/src/main/java/com/gh/common/constant/Config.java
@@ -21,6 +21,7 @@ import com.gh.gamecenter.common.utils.DarkModeUtils;
 import com.gh.gamecenter.common.utils.EnvHelper;
 import com.gh.gamecenter.core.utils.GsonUtils;
 import com.gh.gamecenter.core.utils.SPUtils;
+import com.gh.gamecenter.core.utils.UrlFilterUtils;
 import com.gh.gamecenter.entity.GameGuidePopupEntity;
 import com.gh.gamecenter.entity.NewApiSettingsEntity;
 import com.gh.gamecenter.entity.NewSettingsEntity;
@@ -358,7 +359,7 @@ public class Config {
         getNewSettings(channel);
 
         RetrofitManager.getInstance()
-                .getApi().getSettings(PackageUtils.getGhVersionName(), channel, Build.MANUFACTURER, Build.MODEL, Build.VERSION.SDK_INT)
+                .getApi().getSettings(PackageUtils.getGhVersionName(), channel)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Response<SettingsEntity>() {
@@ -442,8 +443,13 @@ public class Config {
     private static void getNewSettings(String channel) {
         if (mNewApiSettingsEntity == null) {
 
+            String filterString = UrlFilterUtils.getFilterQuery(
+                    "manufacturer", Build.MANUFACTURER,
+                    "model", Build.MODEL,
+                    "android_sdk_version", String.valueOf(Build.VERSION.SDK_INT));
+
             RetrofitManager.getInstance()
-                    .getNewApi().getNewSettings(PackageUtils.getGhVersionName(), channel)
+                    .getNewApi().getNewSettings(PackageUtils.getGhVersionName(), channel, filterString)
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
                     .subscribe(new BiResponse<NewApiSettingsEntity>() {
diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java
index ff9f6e87d0..2337f762b1 100644
--- a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java
+++ b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java
@@ -809,19 +809,16 @@ public interface ApiService {
 
 
     @GET("settings")
-    Observable<SettingsEntity> getSettings(
-            @Query("version") String version,
-            @Query("channel") String channel,
-            @Query("manufacture") String manufacture,
-            @Query("model") String model,
-            @Query("android_sdk_version") int androidSdkVersion
-    );
+    Observable<SettingsEntity> getSettings(@Query("version") String version, @Query("channel") String channel);
 
     /**
      * 新的设置接口
      */
     @GET("settings")
-    Single<NewApiSettingsEntity> getNewSettings(@Query("version") String version, @Query("channel") String channel);
+    Single<NewApiSettingsEntity> getNewSettings(
+            @Query("version") String version,
+            @Query("channel") String channel,
+            @Query("device") String device);
 
     /**
      * 获取新的配置信息，因为旧的已经太大了避免冲突