0

app/src/main/AndroidManifest.xml

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="me.yoqi.android.netauth">
-
-    <!--    获取网络状态-->
+    <!-- 获取网络状态 -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <!--    存储权限-->
+    <uses-permission android:name="android.permission.INTERNET" /> <!-- 存储权限 -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 

app/src/main/java/me/yoqi/android/netauth/ui/login/LoginActivity.java

@@ -33,15 +33,14 @@ public class LoginActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_login);
 
-        loginViewModel = ViewModelProviders.of(this, new LoginViewModelFactory())
-                .get(LoginViewModel.class);
+        loginViewModel = ViewModelProviders.of(this, new LoginViewModelFactory()).get(LoginViewModel.class);
 
 
 //        sp中取得保存的账户密码，填充。多个账户的话下拉提供选择
 
         final EditText usernameEditText = findViewById(R.id.username);
         final EditText passwordEditText = findViewById(R.id.password);
-        final Button loginButton = findViewById(R.id.login);
+        final Button loginButton = findViewById(R.id.login);   //登录按钮
         final ProgressBar loadingProgressBar = findViewById(R.id.loading);
 
         loginViewModel.getLoginFormState().observe(this, new Observer<LoginFormState>() {

app/src/main/java/me/yoqi/android/utils/SPUtils.java

@@ -9,7 +9,7 @@ import java.util.Set;
 
 public class SPUtils {
     private static final String SP_NAME = "common";
-    private SPUtils mSpUtils;
+    private static SPUtils mSpUtils;
     private SharedPreferences sp;
     private Editor editor;
 
@@ -18,7 +18,7 @@ public class SPUtils {
         editor = sp.edit();
     }
 
-    public SPUtils getInstance(Context context) {
+    public static SPUtils getInstance(Context context) {
 
         if (mSpUtils == null) {
             synchronized (SPUtils.class) {

app/src/main/res/layout/activity_main.xml

@@ -10,22 +10,22 @@
         android:id="@+id/tv_status"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="308dp"
-        android:text="登录成功"
+        android:layout_marginTop="250dp"
+        android:text="未登录"
         android:textSize="45dp"
-        app:layout_constraintHorizontal_bias="0.562"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <Button
         android:id="@+id/btn_login"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="56dp"
+        android:layout_marginTop="30dp"
         android:text="登录"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.517"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tv_status" />
 

app/src/main/res/values-zh/strings.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">通大校园网</string>
+    <string name="title_activity_login">登录</string>
+    <string name="prompt_email">账户</string>
+    <string name="prompt_password">密码</string>
+</resources>

app/src/main/res/values/arrays.xml

@@ -0,0 +1,12 @@
+<resources>
+    <!-- Reply Preference -->
+    <string-array name="reply_entries">
+        <item>Reply</item>
+        <item>Reply to all</item>
+    </string-array>
+
+    <string-array name="reply_values">
+        <item>reply</item>
+        <item>reply_all</item>
+    </string-array>
+</resources>

app/src/main/res/values/strings.xml

@@ -3,7 +3,7 @@
     <string name="title_activity_login">LoginActivity</string>
     <string name="prompt_email">Email</string>
     <string name="prompt_password">Password</string>
-    <string name="action_sign_in">Sign in or register</string>
+    <string name="action_sign_in">Sign in</string>
     <string name="action_sign_in_short">Sign in</string>
     <string name="welcome">"Welcome !"</string>
     <string name="invalid_username">Not a valid username</string>
@@ -11,7 +11,6 @@
     <string name="login_failed">"Login failed"</string>
 
 
-
     <string name="tile_label">CdutNet</string>
     <string name="tile_status_check">Checking&#8230;</string>
     <string name="tile_status_loggin">Logining&#8230;</string>