husong 4 lat temu
rodzic
commit
79b8dcea1e

+ 9 - 3
.idea/gradle.xml

@@ -3,11 +3,17 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <compositeConfiguration>
-          <compositeBuild compositeDefinitionSource="SCRIPT" />
-        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+            <option value="$PROJECT_DIR$/calendar" />
+            <option value="$PROJECT_DIR$/easeui" />
+            <option value="$PROJECT_DIR$/lib-zxing" />
+          </set>
+        </option>
         <option name="resolveModulePerSourceSet" value="false" />
         <option name="testRunner" value="PLATFORM" />
       </GradleProjectSettings>

+ 2 - 2
app/build.gradle

@@ -9,13 +9,13 @@ android {
         release {
             keyAlias 'zdw'
             keyPassword '123456'
-            storeFile file('/Users/tederen/Desktop/gxandroid/tede.keystore')
+            storeFile file('/Users/tederen/Desktop/guangxi/GXXY/tede.keystore')
             storePassword '123456'
         }
         config {
             keyAlias 'zdw'
             keyPassword '123456'
-            storeFile file('/Users/tederen/Desktop/gxandroid/tede.keystore')
+            storeFile file('/Users/tederen/Desktop/guangxi/GXXY/tede.keystore')
             storePassword '123456'
         }
     }

BIN
app/release/app-release.apk


+ 4 - 2
app/src/main/java/com/technology/tederen/http/Api.java

@@ -4,11 +4,13 @@ public class Api {
 
 //    public static final String BASE_WEB_URL = "http://apk.tederen.com/admin";
 //    public static final String BASE_WEB_URL = "http://47.95.221.96:82/admin";
-    public static final String BASE_WEB_URL = "http://111.12.8.69:82/admin";
+//    public static final String BASE_WEB_URL = "http://111.12.8.69:82/admin";
+    public static final String BASE_WEB_URL = "https://lx.gxcbcmjt.com/admin";
     public static final String BASE_WEB_URL_LAUCH_LQ = "http://192.168.0.118:8080/admin";
     public static final String BASE_WEB_URL_LAUCH_LY = "http://192.168.0.119:8080/admin";
 //    public static final String BASE_URL = "http://47.95.221.96:83/api/app/";
-    public static final String BASE_URL = "http://111.12.8.69:83/api/app/";
+//    public static final String BASE_URL = "http://111.12.8.69:83/api/app/";
+    public static final String BASE_URL = "https://lx.gxcbcmjt.com/api/app/";
     //            public static final String BASE_URL = "http://192.168.0.147:83/api/app/";
     public static final String AUTHORIZATION = "Authorization";
 

+ 1 - 1
app/src/main/res/layout/activity_login.xml

@@ -51,7 +51,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
 
-            android:text="欢迎来到灵犀办公"
+            android:text="欢迎来到同岑"
             android:textColor="#000000"
             android:textSize="19sp" />
 

+ 2 - 1
app/src/main/res/values/strings.xml

@@ -1,5 +1,6 @@
 <resources>
-    <string name="app_name">灵犀办公</string>
+<!--    <string name="app_name">灵犀办公</string>-->
+    <string name="app_name">同岑</string>
 
     <string name="data_rsp_error_service">服务器错误(ρ_・).。</string>
     <string name="home">首页</string>