From 687f0c8225342eb2455a7ddd4943ae483af3f5a6 Mon Sep 17 00:00:00 2001
From: lijia <john_095130@163.com>
Date: Tue, 11 Feb 2025 16:42:19 +0800
Subject: [PATCH] =?UTF-8?q?oss=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                                 |  1 +
 app/build.gradle                                 |  2 +-
 .../com/dhsd/glowner/oss/OssServiceUtil.java     |  4 +++-
 .../glowner/ui/mine/activity/KnowCarsActivity.kt |  2 +-
 .../com/dahe/mylibrary/utils/BaseSPUtils.java    | 16 ++++++++--------
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 7e86ee0..0c6db23 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,6 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="#JAVA_HOME" />
         <option name="modules">
diff --git a/app/build.gradle b/app/build.gradle
index 7f726d9..3f823c2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -83,7 +83,7 @@ android {
                                     //暂时填写默认值即可.
                                     JPUSH_CHANNEL: "developer-n",
             ]
-            buildConfigField("String", "BASE_URL", "\"http://192.168.1.118:18080/\"")
+            buildConfigField("String", "BASE_URL", "\"http://192.168.1.118:8082/devApi/\"")
 //            buildConfigField("String", "BASE_URL", "\"https://platform.test.v2.dahehuoyun.com/devApi/\"")
             buildConfigField "boolean", "isTest", "true"
 //            //APP名称，可以在androidMainfest中引用
diff --git a/app/src/main/java/com/dhsd/glowner/oss/OssServiceUtil.java b/app/src/main/java/com/dhsd/glowner/oss/OssServiceUtil.java
index 033552d..66a2103 100644
--- a/app/src/main/java/com/dhsd/glowner/oss/OssServiceUtil.java
+++ b/app/src/main/java/com/dhsd/glowner/oss/OssServiceUtil.java
@@ -25,6 +25,7 @@ import com.alibaba.sdk.android.oss.model.OSSRequest;
 import com.alibaba.sdk.android.oss.model.PutObjectRequest;
 import com.alibaba.sdk.android.oss.model.PutObjectResult;
 import com.dahe.mylibrary.utils.LoadingUtils;
+import com.dhsd.glowner.BuildConfig;
 import com.dhsd.glowner.base.App;
 import com.lxj.xpopup.impl.LoadingPopupView;
 
@@ -79,7 +80,8 @@ public class OssServiceUtil {
     //初始化使用参数
     public void init() {
         bucket = OssConfigBean.bucket;
-        String stsServer = "http://platform.test.v2.dahehuoyun.com/devApi/file/aliyun/oss/getToken";
+//        String stsServer = "http://platform.test.v2.dahehuoyun.com/devApi/file/aliyun/oss/getToken";
+        String stsServer = BuildConfig.BASE_URL + "file/aliyun/oss/getToken";
         credentialProvider = new OSSAuthCredentialsProvider(stsServer);
         conf = new ClientConfiguration();
         conf.setConnectionTimeout(15 * 1000); // 连接超时，默认15秒
diff --git a/app/src/main/java/com/dhsd/glowner/ui/mine/activity/KnowCarsActivity.kt b/app/src/main/java/com/dhsd/glowner/ui/mine/activity/KnowCarsActivity.kt
index 5a16fec..daecc0c 100644
--- a/app/src/main/java/com/dhsd/glowner/ui/mine/activity/KnowCarsActivity.kt
+++ b/app/src/main/java/com/dhsd/glowner/ui/mine/activity/KnowCarsActivity.kt
@@ -34,7 +34,7 @@ class KnowCarsActivity : BaseActivity<ActivityKnowCarsBinding>() {
         setTitleBar("我的熟车", true)
 
         binding.run {
-            recycler.run {
+            adapter =recycler.run {
                 layoutManager = LinearLayoutManager(mContext, RecyclerView.VERTICAL, false)
                 addItemDecoration(
                     RecycleViewDivider(
diff --git a/mylibrary/src/main/java/com/dahe/mylibrary/utils/BaseSPUtils.java b/mylibrary/src/main/java/com/dahe/mylibrary/utils/BaseSPUtils.java
index 6c8a7f5..bf55a92 100644
--- a/mylibrary/src/main/java/com/dahe/mylibrary/utils/BaseSPUtils.java
+++ b/mylibrary/src/main/java/com/dahe/mylibrary/utils/BaseSPUtils.java
@@ -16,15 +16,15 @@ public class BaseSPUtils {
     /**
      * 保存在手机里面的文件名
      */
-    public static final String FILE_NAME = "sp_data";
-    public static final String USER_INFO_KEY = "user_info_key";
+    public static final String FILE_NAME = "owner_sp_data";
+    public static final String USER_INFO_KEY = "owner_user_info_key";
 
-    public static final String USER_TOKEN_KEY = "user_token_key";
-    public static final String NET_SERVICE_TEST = "net_service_test";
-    public static final String SEARRH_CACHE = "search_cache";
-    public static final String NAVI_PH_EDIT_CACHE = "navi_ph_edit_cache";
-    public static final String FIRST_OPEN = "first_open";
-    public static final String KEY_PRIVACY_AGREEMENT = "privacy_agreement";
+    public static final String USER_TOKEN_KEY = "owner_user_token_key";
+    public static final String NET_SERVICE_TEST = "owner_net_service_test";
+    public static final String SEARRH_CACHE = "owner_search_cache";
+    public static final String NAVI_PH_EDIT_CACHE = "owner_navi_ph_edit_cache";
+    public static final String FIRST_OPEN = "owner_first_open";
+    public static final String KEY_PRIVACY_AGREEMENT = "owner_privacy_agreement";
 
     /**
      * 保存数据的方法，我们需要拿到保存数据的具体类型，然后根据类型调用不同的保存方法