From 6462b649f5ec3b0e72db9e8e7d291ce60629979a Mon Sep 17 00:00:00 2001
From: itgaojian163 <itgaojian@163.com>
Date: Sat, 1 Aug 2020 11:54:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=9F=8E?=
 =?UTF-8?q?=E5=B8=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/retrofit_net/BaseUrlApi.java         |  4 +-
 .../main/res/layout/activity_choose_city.xml  | 38 +++++++++++++++++++
 2 files changed, 40 insertions(+), 2 deletions(-)

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 fd47902..dc248b5 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
@@ -11,8 +11,8 @@ import retrofit2.http.GET;
  */
 public class BaseUrlApi {
 
-        public static final String IP = "http://192.168.0.113:7001/usercenter/";/* 正式IP */
-//    public static final String IP = "https://www.wgink.ink/usercenter/";/* 测试IP */
+//        public static final String IP = "http://192.168.0.113:7001/usercenter/";/* 测试IP */
+    public static final String IP = "https://www.wgink.ink/usercenter/";/* 正式IP */
     public static final String BASE_SYSTEM_IP = "https://www.wgink.ink/";
     //    public static final String IP = "http://192.168.0.113:7001/usercenter/";/* 测试IP */
     public static final String PROJECT_NAME = "app/";
diff --git a/modulemain/src/main/res/layout/activity_choose_city.xml b/modulemain/src/main/res/layout/activity_choose_city.xml
index d887bbb..7d0f15f 100644
--- a/modulemain/src/main/res/layout/activity_choose_city.xml
+++ b/modulemain/src/main/res/layout/activity_choose_city.xml
@@ -217,6 +217,44 @@
                         android:textSize="16sp" />
                 </RelativeLayout>
 
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:padding="10dp">
+
+                    <View
+                        android:layout_width="3dp"
+                        android:layout_height="14dp"
+                        android:background="@color/app_title" />
+
+                    <com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="3dp"
+                        android:layout_weight="1"
+                        android:text="市"
+                        android:textColor="#242424"
+                        android:textSize="16sp" />
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/tv_default_city"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginRight="15dp"
+                    android:background="@drawable/shape_search_input_box"
+                    android:paddingLeft="10dp"
+                    android:paddingTop="3dp"
+                    android:paddingRight="10dp"
+                    android:paddingBottom="3dp"
+                    android:textColor="@color/app_title"
+                    android:textSize="16sp"
+                    tools:text="日喀则" />
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"