From 8dab7a78683fffe4742746b3615e0c4fd4a61b68 Mon Sep 17 00:00:00 2001
From: itgaojian <itgaojian@163.com>
Date: Mon, 20 Feb 2023 11:08:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0areaCode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetDropDown.xml              | 17 +++++++++++++++++
 app/build.gradle                                |  2 +-
 .../retrofit_net/conver/AreaInterceptor.java    |  4 ++--
 .../core/widget/base/DicSelAdapter.java         |  2 +-
 4 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 .idea/deploymentTargetDropDown.xml

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..6ce8978
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <runningDeviceTargetSelectedWithDropDown>
+      <Target>
+        <type value="RUNNING_DEVICE_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="SERIAL_NUMBER" />
+            <value value="10HC690BJT0005G" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </runningDeviceTargetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2023-02-20T02:01:43.345089Z" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index a218faa..a320ea9 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -54,7 +54,7 @@ android {
             dimension 'market'
             resValue "string", "APP_CHANNEL", "sangzhuzi"
             manifestPlaceholders = [CHANNEL_VALUE: "sangzhuzi",
-                                    APP_LOGO     : "@drawable/app_logoo",
+                                    APP_LOGO     : "@drawable/app_logo",
                                     CITY_ID      : "640676",
                                     CITY_CODE    : "540202000000",
                                     BD_KEY       : "ipb1ae32sNDRMbwOOpApG6bVBji9K86R",
diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/conver/AreaInterceptor.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/conver/AreaInterceptor.java
index cf6d377..fd30d99 100755
--- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/conver/AreaInterceptor.java
+++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/conver/AreaInterceptor.java
@@ -30,7 +30,7 @@ public class AreaInterceptor implements Interceptor {
             cityLevel = PathConfig.CITY_DEFAULT_LEVEL;
         }
         String name = "area" + cityLevel;
-        String areaId = UserLgUtils.getCurrentCityCode();
+        String areaCode = UserLgUtils.getCityCode();
 //        if (TextUtils.isEmpty(areaId)) {
 //            areaId = PathConfig.CITY_DEFAULT_CODE;
 //        }
@@ -40,7 +40,7 @@ public class AreaInterceptor implements Interceptor {
         if (baseUrlName.size() <= 0) {
             //需要添加
             HttpUrl modifiedUrl = originalRequest.url().newBuilder()
-                    .addPathSegment(areaId)
+                    .addPathSegment(areaCode)
                     .build();
             request = originalRequest.newBuilder().url(modifiedUrl).build();
         } else {
diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/DicSelAdapter.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/DicSelAdapter.java
index 9eff23a..644df4d 100755
--- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/DicSelAdapter.java
+++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/DicSelAdapter.java
@@ -23,7 +23,7 @@ public class DicSelAdapter extends BaseRecyclerAdapter<BaseDictionaryBean, DicHo
     @Override
     public DicHolder createHolder(ViewGroup parent, int viewType) {
         View itemView = LayoutInflater.from(mContext)
-                .inflate(R.layout.item_show_photo, parent, false);
+                .inflate(R.layout.item_dic_check, parent, false);
         return new DicHolder(itemView);
     }