From 67728a2315a1514a8fca4e48dd0a6f9590f93fb5 Mon Sep 17 00:00:00 2001
From: Zhou Shuqi <366469786@qq.com>
Date: Wed, 29 Apr 2020 11:50:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=B9=8B=E5=89=8D?=
 =?UTF-8?q?=E8=8B=B1=E6=96=87make=20an=20appointment=20=E5=92=8Creservatio?=
 =?UTF-8?q?n=E5=AD=97=E6=95=B0=E5=A4=AA=E9=95=BF=E5=BD=B1=E5=93=8D?=
 =?UTF-8?q?=E7=BE=8E=E8=A7=82=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                           |  4 ++--
 app/src/main/res/values-en-rUS/strings.xml | 12 ++++++------
 app/src/main/res/values/strings.xml        | 12 ++++++------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5e1951b..78d4add 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,8 +1,8 @@
 ext {
     //本地服务端测试地址，把ip地址部分改成ipconfig /all找到的内网地址
-    API_HOST = 'http://192.168.3.132:8080/'
+    API_HOST = 'http://192.168.3.14:8080/'
     //本地rap2服务端测试地址，把ip地址部分改成ipconfig /all找到的内网地址
-    RAP2_API_HOST = 'http://192.168.101.3:38080/app/mock/1'
+    RAP2_API_HOST = 'http://192.168.3.14:38080/app/mock/1'
 }
 apply plugin: 'com.android.application'
 apply plugin: 'multi-languages'
diff --git a/app/src/main/res/values-en-rUS/strings.xml b/app/src/main/res/values-en-rUS/strings.xml
index 1e4f9ce..12e1175 100644
--- a/app/src/main/res/values-en-rUS/strings.xml
+++ b/app/src/main/res/values-en-rUS/strings.xml
@@ -33,8 +33,8 @@
     <string name="forum_new">new</string>
     <string name="forum_post">post</string>
     <string name="forum_my">my</string>
-    <string name="visitor_appointment">Making an Appointment</string>
-    <string name="visitor_reservation">My Reservation</string>
+    <string name="visitor_appointment">APPOINTMENT</string>
+    <string name="visitor_reservation">RESERVATION</string>
     <string name="visitor_visitor">My  Visitor</string>
     <string name="nick_name">nickname:%1$s</string>
     <string name="credit_score">credit score:%1$d</string>
@@ -110,10 +110,10 @@
     <string name="invalid_time">invalid time</string>
     <string name="invalid_notes">invalid notes</string>
     <string name="choose_time_error">please choose people before time</string>
-    <string name="visitor_appointment_people_ok">search people success</string>
-    <string name="visitor_appointment_people_fail">search people fail</string>
-    <string name="visitor_appointment_time_ok">search time OK</string>
-    <string name="visitor_appointment_time_fail">search time fail</string>
+    <string name="visitor_appointment_people_ok">search succeeded</string>
+    <string name="visitor_appointment_people_fail">search failed</string>
+    <string name="visitor_appointment_time_ok">search succeeded</string>
+    <string name="visitor_appointment_time_fail">search failed</string>
     <string name="load_data_err">load data error</string>
     <string name="visitor_tag">visitor_tag</string>
     <string name="invalid_title">title error</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dada805..d71f08e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -34,8 +34,8 @@
     <string name="forum_new">new</string>
     <string name="forum_post">post</string>
     <string name="forum_my">my</string>
-    <string name="visitor_appointment">Making an Appointment</string>
-    <string name="visitor_reservation">My Reservation</string>
+    <string name="visitor_appointment">APPOINTMENT</string>
+    <string name="visitor_reservation">RESERVATION</string>
     <string name="visitor_visitor">My  Visitor</string>
     <string name="nick_name">nickname:%1$s</string>
     <string name="credit_score">credit score:%1$d</string>
@@ -111,10 +111,10 @@
     <string name="invalid_time">invalid time</string>
     <string name="invalid_notes">invalid notes</string>
     <string name="choose_time_error">please choose people before time</string>
-    <string name="visitor_appointment_people_ok">search people success</string>
-    <string name="visitor_appointment_people_fail">search people fail</string>
-    <string name="visitor_appointment_time_ok">search time OK</string>
-    <string name="visitor_appointment_time_fail">search time fail</string>
+    <string name="visitor_appointment_people_ok">search succeeded</string>
+    <string name="visitor_appointment_people_fail">search failed</string>
+    <string name="visitor_appointment_time_ok">search secceeded</string>
+    <string name="visitor_appointment_time_fail">search failed</string>
     <string name="load_data_err">load data error</string>
     <string name="visitor_tag">visitor_tag</string>
     <string name="invalid_title">title error</string>