From d6eaaab53e153435f95ef03950e5ca997d7d8eea Mon Sep 17 00:00:00 2001
From: itgaojian <itgaojian@163.com>
Date: Thu, 24 Jun 2021 18:18:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/runConfigurations.xml                      |  1 +
 app/release/output.json                          |  2 +-
 build.gradle                                     |  4 ++--
 .../cm_utils/constant/PathConfig.java            | 16 ++++++++--------
 .../cm_utils/core/retrofit_net/BaseUrlApi.java   | 16 +++++++++-------
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
index 7f68460..e497da9 100755
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -3,6 +3,7 @@
   <component name="RunConfigurationProducerService">
     <option name="ignoredProducers">
       <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
diff --git a/app/release/output.json b/app/release/output.json
index 8d80215..bed9bf9 100755
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":39,"versionName":"1.3.3","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":34,"versionName":"1.3.4","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 0d22525..5404e2a 100755
--- a/build.gradle
+++ b/build.gradle
@@ -61,8 +61,8 @@ ext {
     gTargetSdkVersion = 28
 //    gVersionCode = 2
 //    gVersionName = '1.0.2'
-    gVersionCode=39
-    gVersionName='1.3.3'
+    gVersionCode=34
+    gVersionName='1.3.4'
     //Router编译版本
     gRouterApiVersion = '1.4.1'
     gRouterCompileVersion = '1.2.2'
diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java
index 4434306..a61bf12 100755
--- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java
+++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java
@@ -53,20 +53,20 @@ public class PathConfig {
     public static final String DIC_EDU = "d6b9f026-6ea9-456a-b48b-0c18d502523b";//学历
 
     public static final String DEFAULT_AREA_CODE = "0";//地区
-//        public static final String APP_VERSION_ID = "402e60d8-8270-4bb9-8850-83d30a39a53f";/* 包头版本一 */
-    public static final String APP_VERSION_ID = "f2e91bec-7e77-4b90-9f10-dcce29c71dfc";/* 包头版本二*/
-//    public static final String APP_VERSION_ID = "402e60d8-8270-4bb9-8850-83d30a39a53f";/* 测试 */
+            public static final String APP_VERSION_ID = "402e60d8-8270-4bb9-8850-83d30a39a53f";/* 包头版本一 */
+//    public static final String APP_VERSION_ID = "6c8b1cfc-0477-49c3-840b-f6be46278743";/* 包头测试 */
+
     //    public static final String APP_VERSION_ID = "04f35ca3-a269-445a-b39f-9146c9b6bfde";/*集宁*/
     //包头坐标 109.926934,40.574501
     //呼市坐标 40.823879   111.771815
     public static final double LA = 40.574501;
     public static final double LO = 109.926934;
 
-//    public static final double LA = 40.984219;
+    //    public static final double LA = 40.984219;
 //    public static final double LO = 113.0972;
 //113.0972,40.984219 集宁区环保
-/*============Socket信息码====================*/
-public static final int MSG_REGISTER = 100;
+    /*============Socket信息码====================*/
+    public static final int MSG_REGISTER = 100;
     public static final int MSG_MESSAGE = 101;
     public static final int MSG_GROUP_MESSAGE = 102;
     public static final int MSG_SYSTEM_MESSAGE = 103;
@@ -76,8 +76,8 @@ public static final int MSG_REGISTER = 100;
     public static final int MSG_NOTICE_GROUP = 107;
     public static final int MSG_NOTICE_TARGET = 108;
     public static final int MSG_SEND_STATUS = 1100;
-            public static final  String mDefaultCityCode = "229";//TODO  包头 229
-//    public static final String mDefaultCityCode = "321";//TODO 呼和浩特 321
+//    public static final String mDefaultCityCode = "229";//TODO  包头 229
+        public static final String mDefaultCityCode = "321";//TODO 呼和浩特 321
     //    public static final String mDefaultCityCode = "168";//TODO 乌兰察布 168
     //    区直领导：b01dac8e-c516-4974-b513-f1352ca40202
 //    片长：e483f019-d971-49ac-b5fa-3314220da703
diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java
index 2ca8628..cee81d6 100755
--- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java
+++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java
@@ -9,11 +9,11 @@ import com.sucstepsoft.cm_utils.constant.PathConfig;
  */
 public class BaseUrlApi {
 
-    //public static final String IP = "http://219.147.99.164:8081/";/* 正式IP 版本一 */
-    public static final String IP = "http://219.147.99.164:8082/usercenter/"; /* 正式IP 版本二 */
+    //    public static final String IP = "http://219.147.99.164:8081/";/* 正式IP 版本一 */
+//    public static final String IP = "http://219.147.99.164:8082/usercenter/"; /* 正式IP 版本二 */
     //        public static final String IP = "http://124.67.110.246:8081/usercenter/"; /* 集宁 版本一 */
-//        public static final String IP = "http://192.168.0.103:7001/usercenter/";/* 本地测试IP */
-//    public static final String IP = "http://49.233.36.36:8868/usercenter/";/* 测试IP */
+    public static final String IP = "http://192.168.0.101:7001/usercenter/";/* 本地测试IP */
+    //    public static final String IP = "http://49.233.36.36:8868/usercenter/";/* 测试IP */
     public static final String PROJECT_NAME = "app/";
     public static final String BASE_URL = IP;
     //    public static final String BASE_URL = IP + PROJECT_NAME;
@@ -24,9 +24,11 @@ public class BaseUrlApi {
 //    http://39.104.74.123:8084/servicecity
     public static final int PHOTO_REQUEST = 233;
     public static final int CAMERA_REQUEST = 123;
-    public static final String BASE_IP_P = "http://219.147.99.164:8082/";
+    //    "http://2277c412x2.iask.in:12758/servicecity
+//        public static final String BASE_IP_P = "http://219.147.99.164:8082/"; /*正式*/
+    public static final String BASE_IP_P = "http://192.168.0.101:8083/";/*测试*/
     //                public static final String BASE_IP = "http://219.147.99.164:8081/servicecity/";/* 正式IP 版本一*/
-//    public static final String BASE_IP_P = "http://192.168.0.111:8084/";/* 本地测试IP */
+//    public static final String BASE_IP_P = "http://192.168.1.176:8083/";/* 本地测试IP */
     //    public static final String BASE_IP = "http://219.147.99.164:8082/servicecity/";/*正式IP 版本二*/
 //    public static final String BASE_IP = "http://124.67.110.246:8081/servicecity/";/*集宁 版本二*/
     public static final String BASE_IP = BASE_IP_P + "servicecity/";/* 测试IP */
@@ -36,4 +38,4 @@ public class BaseUrlApi {
 
     public static final String APP_DOWNLOAD_URL = BASE_URL + "app/appversion/downloadapp/" + PathConfig.APP_VERSION_ID;
 
-}
+}
\ No newline at end of file