Browse Source

修改资源文件

Yumin 6 years ago
parent
commit
2b1cc3aa46

+ 4 - 4
app/build.gradle

@@ -13,10 +13,10 @@ android {
     }
     buildTypes {
         debug {
-            buildConfigField "String", "SERVER_HOST", "\"http://minbb.cn/evaluation_system/\""
-            buildConfigField "String", "SERVER_WS_HOST", "\"ws://minbb.cn/evaluation_system/ws/websocket\""
-//            buildConfigField "String", "SERVER_HOST", "\"http://192.168.30.14/evaluation_system/\""
-//            buildConfigField "String", "SERVER_WS_HOST", "\"ws://192.168.30.14/evaluation_system/ws/websocket\""
+//            buildConfigField "String", "SERVER_HOST", "\"http://minbb.cn/evaluation/\""
+//            buildConfigField "String", "SERVER_WS_HOST", "\"ws://minbb.cn/evaluation/ws/websocket\""
+            buildConfigField "String", "SERVER_HOST", "\"http://my.minbb.cn/evaluation/\""
+            buildConfigField "String", "SERVER_WS_HOST", "\"ws://my.minbb.cn/evaluation/ws/websocket\""
         }
 
         release {

+ 2 - 2
app/src/main/AndroidManifest.xml

@@ -27,9 +27,9 @@
     <application
         android:name="cn.minbb.evaluation.ctrl.App"
         android:allowBackup="false"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@drawable/ic_launcher_128"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@drawable/ic_launcher_128"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity

+ 2 - 3
app/src/main/java/cn/minbb/evaluation/utils/Constant.java

@@ -1,6 +1,5 @@
 package cn.minbb.evaluation.utils;
 
-import cn.minbb.evaluation.BuildConfig;
 import okhttp3.MediaType;
 
 public class Constant {
@@ -13,8 +12,8 @@ public class Constant {
     public static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
 
     static {
-        SERVER_HOST = BuildConfig.SERVER_HOST;
-        SERVER_WS_HOST = BuildConfig.SERVER_WS_HOST;
+        SERVER_HOST = "http://my.minbb.cn/evaluation/";
+        SERVER_WS_HOST = "ws://my.minbb.cn/evaluation/ws/websocket";
     }
 
 }

BIN
app/src/main/res/drawable/ic_launcher_128.png


BIN
app/src/main/res/drawable/ic_launcher_white_128.png


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

@@ -52,7 +52,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
-        android:text="Copyright © 2018 minbb.cn All rights reserved."
+        android:text="Copyright © 2018-2019 www.minbb.cn All rights reserved."
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />

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

@@ -175,7 +175,7 @@
 
         </com.google.android.flexbox.FlexboxLayout>
 
-        <cn.minbb.evaluationsystem.controls.ClearTextInputEditText
+        <cn.minbb.evaluation.views.ClearTextInputEditText
             android:id="@+id/problemContent"
             android:layout_width="0dp"
             android:layout_height="wrap_content"

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

@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <cn.minbb.evaluationsystem.controls.PullUpLoadMoreListView
+        <cn.minbb.evaluation.views.PullUpLoadMoreListView
             android:id="@+id/papersView"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />

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

@@ -26,7 +26,7 @@
                 android:layout_margin="48dp"
                 android:fitsSystemWindows="true"
                 android:scaleType="fitCenter"
-                android:src="@mipmap/ic_launcher"
+                android:src="@drawable/ic_launcher_white_128"
                 app:layout_collapseMode="parallax" />
 
             <android.support.v7.widget.Toolbar
@@ -65,7 +65,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <cn.minbb.evaluationsystem.controls.ClearTextInputEditText
+                <cn.minbb.evaluation.views.ClearTextInputEditText
                     android:id="@+id/username"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
@@ -82,7 +82,7 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@id/usernameLayout">
 
-                <cn.minbb.evaluationsystem.controls.ClearTextInputEditText
+                <cn.minbb.evaluation.views.ClearTextInputEditText
                     android:id="@+id/password"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"

+ 4 - 4
app/src/main/res/layout/activity_register.xml

@@ -26,7 +26,7 @@
                 android:layout_margin="48dp"
                 android:fitsSystemWindows="true"
                 android:scaleType="fitCenter"
-                android:src="@mipmap/ic_launcher"
+                android:src="@drawable/ic_launcher_white_128"
                 app:layout_collapseMode="parallax" />
 
             <android.support.v7.widget.Toolbar
@@ -68,7 +68,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
 
-                        <cn.minbb.evaluationsystem.controls.ClearTextInputEditText
+                        <cn.minbb.evaluation.views.ClearTextInputEditText
                             android:id="@+id/username"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
@@ -83,7 +83,7 @@
                         android:layout_height="wrap_content"
                         android:layout_below="@id/usernameLayout">
 
-                        <cn.minbb.evaluationsystem.controls.ClearTextInputEditText
+                        <cn.minbb.evaluation.views.ClearTextInputEditText
                             android:id="@+id/password"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
@@ -100,7 +100,7 @@
                         android:layout_height="wrap_content"
                         android:layout_below="@id/passwordLayout">
 
-                        <cn.minbb.evaluationsystem.controls.ClearTextInputEditText
+                        <cn.minbb.evaluation.views.ClearTextInputEditText
                             android:id="@+id/repeatPassword"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"