diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1754b6e..0da94ac 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,6 +8,12 @@
+
+
+
+
+
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1754b6e..0da94ac 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,6 +8,12 @@
+
+
+
+
+
+
diff --git a/app/src/main/java/com/casic/dcms/greendao/DaoSession.java b/app/src/main/java/com/casic/dcms/greendao/DaoSession.java
index d9b9782..6702d3e 100644
--- a/app/src/main/java/com/casic/dcms/greendao/DaoSession.java
+++ b/app/src/main/java/com/casic/dcms/greendao/DaoSession.java
@@ -1,7 +1,6 @@
package com.casic.dcms.greendao;
-import com.casic.dcms.mvvm.model.NoticeBean;
-import com.casic.dcms.mvvm.model.StreetLightLocalBean;
+import java.util.Map;
import org.greenrobot.greendao.AbstractDao;
import org.greenrobot.greendao.AbstractDaoSession;
@@ -9,7 +8,11 @@
import org.greenrobot.greendao.identityscope.IdentityScopeType;
import org.greenrobot.greendao.internal.DaoConfig;
-import java.util.Map;
+import com.casic.dcms.mvvm.model.NoticeBean;
+import com.casic.dcms.mvvm.model.StreetLightLocalBean;
+
+import com.casic.dcms.greendao.NoticeBeanDao;
+import com.casic.dcms.greendao.StreetLightLocalBeanDao;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1754b6e..0da94ac 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,6 +8,12 @@
+
+
+
+
+
+
diff --git a/app/src/main/java/com/casic/dcms/greendao/DaoSession.java b/app/src/main/java/com/casic/dcms/greendao/DaoSession.java
index d9b9782..6702d3e 100644
--- a/app/src/main/java/com/casic/dcms/greendao/DaoSession.java
+++ b/app/src/main/java/com/casic/dcms/greendao/DaoSession.java
@@ -1,7 +1,6 @@
package com.casic.dcms.greendao;
-import com.casic.dcms.mvvm.model.NoticeBean;
-import com.casic.dcms.mvvm.model.StreetLightLocalBean;
+import java.util.Map;
import org.greenrobot.greendao.AbstractDao;
import org.greenrobot.greendao.AbstractDaoSession;
@@ -9,7 +8,11 @@
import org.greenrobot.greendao.identityscope.IdentityScopeType;
import org.greenrobot.greendao.internal.DaoConfig;
-import java.util.Map;
+import com.casic.dcms.mvvm.model.NoticeBean;
+import com.casic.dcms.mvvm.model.StreetLightLocalBean;
+
+import com.casic.dcms.greendao.NoticeBeanDao;
+import com.casic.dcms.greendao.StreetLightLocalBeanDao;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
diff --git a/app/src/main/java/com/casic/dcms/greendao/NoticeBeanDao.java b/app/src/main/java/com/casic/dcms/greendao/NoticeBeanDao.java
index 466d9b5..9a31f06 100644
--- a/app/src/main/java/com/casic/dcms/greendao/NoticeBeanDao.java
+++ b/app/src/main/java/com/casic/dcms/greendao/NoticeBeanDao.java
@@ -3,13 +3,13 @@
import android.database.Cursor;
import android.database.sqlite.SQLiteStatement;
-import com.casic.dcms.mvvm.model.NoticeBean;
-
import org.greenrobot.greendao.AbstractDao;
import org.greenrobot.greendao.Property;
+import org.greenrobot.greendao.internal.DaoConfig;
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import org.greenrobot.greendao.internal.DaoConfig;
+
+import com.casic.dcms.mvvm.model.NoticeBean;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1754b6e..0da94ac 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,6 +8,12 @@
+
+
+
+
+
+
diff --git a/app/src/main/java/com/casic/dcms/greendao/DaoSession.java b/app/src/main/java/com/casic/dcms/greendao/DaoSession.java
index d9b9782..6702d3e 100644
--- a/app/src/main/java/com/casic/dcms/greendao/DaoSession.java
+++ b/app/src/main/java/com/casic/dcms/greendao/DaoSession.java
@@ -1,7 +1,6 @@
package com.casic.dcms.greendao;
-import com.casic.dcms.mvvm.model.NoticeBean;
-import com.casic.dcms.mvvm.model.StreetLightLocalBean;
+import java.util.Map;
import org.greenrobot.greendao.AbstractDao;
import org.greenrobot.greendao.AbstractDaoSession;
@@ -9,7 +8,11 @@
import org.greenrobot.greendao.identityscope.IdentityScopeType;
import org.greenrobot.greendao.internal.DaoConfig;
-import java.util.Map;
+import com.casic.dcms.mvvm.model.NoticeBean;
+import com.casic.dcms.mvvm.model.StreetLightLocalBean;
+
+import com.casic.dcms.greendao.NoticeBeanDao;
+import com.casic.dcms.greendao.StreetLightLocalBeanDao;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
diff --git a/app/src/main/java/com/casic/dcms/greendao/NoticeBeanDao.java b/app/src/main/java/com/casic/dcms/greendao/NoticeBeanDao.java
index 466d9b5..9a31f06 100644
--- a/app/src/main/java/com/casic/dcms/greendao/NoticeBeanDao.java
+++ b/app/src/main/java/com/casic/dcms/greendao/NoticeBeanDao.java
@@ -3,13 +3,13 @@
import android.database.Cursor;
import android.database.sqlite.SQLiteStatement;
-import com.casic.dcms.mvvm.model.NoticeBean;
-
import org.greenrobot.greendao.AbstractDao;
import org.greenrobot.greendao.Property;
+import org.greenrobot.greendao.internal.DaoConfig;
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import org.greenrobot.greendao.internal.DaoConfig;
+
+import com.casic.dcms.mvvm.model.NoticeBean;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/app/src/main/java/com/casic/dcms/greendao/StreetLightLocalBeanDao.java b/app/src/main/java/com/casic/dcms/greendao/StreetLightLocalBeanDao.java
index 4721e56..36cebb3 100644
--- a/app/src/main/java/com/casic/dcms/greendao/StreetLightLocalBeanDao.java
+++ b/app/src/main/java/com/casic/dcms/greendao/StreetLightLocalBeanDao.java
@@ -3,13 +3,13 @@
import android.database.Cursor;
import android.database.sqlite.SQLiteStatement;
-import com.casic.dcms.mvvm.model.StreetLightLocalBean;
-
import org.greenrobot.greendao.AbstractDao;
import org.greenrobot.greendao.Property;
+import org.greenrobot.greendao.internal.DaoConfig;
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import org.greenrobot.greendao.internal.DaoConfig;
+
+import com.casic.dcms.mvvm.model.StreetLightLocalBean;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1754b6e..0da94ac 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,6 +8,12 @@
+
+
+
+
+
+
diff --git a/app/src/main/java/com/casic/dcms/greendao/DaoSession.java b/app/src/main/java/com/casic/dcms/greendao/DaoSession.java
index d9b9782..6702d3e 100644
--- a/app/src/main/java/com/casic/dcms/greendao/DaoSession.java
+++ b/app/src/main/java/com/casic/dcms/greendao/DaoSession.java
@@ -1,7 +1,6 @@
package com.casic.dcms.greendao;
-import com.casic.dcms.mvvm.model.NoticeBean;
-import com.casic.dcms.mvvm.model.StreetLightLocalBean;
+import java.util.Map;
import org.greenrobot.greendao.AbstractDao;
import org.greenrobot.greendao.AbstractDaoSession;
@@ -9,7 +8,11 @@
import org.greenrobot.greendao.identityscope.IdentityScopeType;
import org.greenrobot.greendao.internal.DaoConfig;
-import java.util.Map;
+import com.casic.dcms.mvvm.model.NoticeBean;
+import com.casic.dcms.mvvm.model.StreetLightLocalBean;
+
+import com.casic.dcms.greendao.NoticeBeanDao;
+import com.casic.dcms.greendao.StreetLightLocalBeanDao;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
diff --git a/app/src/main/java/com/casic/dcms/greendao/NoticeBeanDao.java b/app/src/main/java/com/casic/dcms/greendao/NoticeBeanDao.java
index 466d9b5..9a31f06 100644
--- a/app/src/main/java/com/casic/dcms/greendao/NoticeBeanDao.java
+++ b/app/src/main/java/com/casic/dcms/greendao/NoticeBeanDao.java
@@ -3,13 +3,13 @@
import android.database.Cursor;
import android.database.sqlite.SQLiteStatement;
-import com.casic.dcms.mvvm.model.NoticeBean;
-
import org.greenrobot.greendao.AbstractDao;
import org.greenrobot.greendao.Property;
+import org.greenrobot.greendao.internal.DaoConfig;
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import org.greenrobot.greendao.internal.DaoConfig;
+
+import com.casic.dcms.mvvm.model.NoticeBean;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/app/src/main/java/com/casic/dcms/greendao/StreetLightLocalBeanDao.java b/app/src/main/java/com/casic/dcms/greendao/StreetLightLocalBeanDao.java
index 4721e56..36cebb3 100644
--- a/app/src/main/java/com/casic/dcms/greendao/StreetLightLocalBeanDao.java
+++ b/app/src/main/java/com/casic/dcms/greendao/StreetLightLocalBeanDao.java
@@ -3,13 +3,13 @@
import android.database.Cursor;
import android.database.sqlite.SQLiteStatement;
-import com.casic.dcms.mvvm.model.StreetLightLocalBean;
-
import org.greenrobot.greendao.AbstractDao;
import org.greenrobot.greendao.Property;
+import org.greenrobot.greendao.internal.DaoConfig;
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import org.greenrobot.greendao.internal.DaoConfig;
+
+import com.casic.dcms.mvvm.model.StreetLightLocalBean;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/LoginActivity.java
index 48a95d0..fecb045 100644
--- a/app/src/main/java/com/casic/dcms/mvvm/view/LoginActivity.java
+++ b/app/src/main/java/com/casic/dcms/mvvm/view/LoginActivity.java
@@ -1,10 +1,7 @@
package com.casic.dcms.mvvm.view;
import android.content.Context;
-import android.text.Editable;
-import android.text.TextWatcher;
import android.view.View;
-import android.widget.EditText;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
@@ -54,27 +51,6 @@
@Override
protected void initEvent() {
- EditText editText = viewBinding.inputLayout.getEditText();
- editText.addTextChangedListener(new TextWatcher() {
- @Override
- public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-
- }
-
- @Override
- public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-
- }
-
- @Override
- public void afterTextChanged(Editable editable) {
- if (editable.toString().trim().length() > 12) {
- viewBinding.inputLayout.setError("密码长度超出限制");
- } else {
- viewBinding.inputLayout.setError(null);
- }
- }
- });
viewBinding.loginButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1754b6e..0da94ac 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,6 +8,12 @@
+
+
+
+
+
+
diff --git a/app/src/main/java/com/casic/dcms/greendao/DaoSession.java b/app/src/main/java/com/casic/dcms/greendao/DaoSession.java
index d9b9782..6702d3e 100644
--- a/app/src/main/java/com/casic/dcms/greendao/DaoSession.java
+++ b/app/src/main/java/com/casic/dcms/greendao/DaoSession.java
@@ -1,7 +1,6 @@
package com.casic.dcms.greendao;
-import com.casic.dcms.mvvm.model.NoticeBean;
-import com.casic.dcms.mvvm.model.StreetLightLocalBean;
+import java.util.Map;
import org.greenrobot.greendao.AbstractDao;
import org.greenrobot.greendao.AbstractDaoSession;
@@ -9,7 +8,11 @@
import org.greenrobot.greendao.identityscope.IdentityScopeType;
import org.greenrobot.greendao.internal.DaoConfig;
-import java.util.Map;
+import com.casic.dcms.mvvm.model.NoticeBean;
+import com.casic.dcms.mvvm.model.StreetLightLocalBean;
+
+import com.casic.dcms.greendao.NoticeBeanDao;
+import com.casic.dcms.greendao.StreetLightLocalBeanDao;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
diff --git a/app/src/main/java/com/casic/dcms/greendao/NoticeBeanDao.java b/app/src/main/java/com/casic/dcms/greendao/NoticeBeanDao.java
index 466d9b5..9a31f06 100644
--- a/app/src/main/java/com/casic/dcms/greendao/NoticeBeanDao.java
+++ b/app/src/main/java/com/casic/dcms/greendao/NoticeBeanDao.java
@@ -3,13 +3,13 @@
import android.database.Cursor;
import android.database.sqlite.SQLiteStatement;
-import com.casic.dcms.mvvm.model.NoticeBean;
-
import org.greenrobot.greendao.AbstractDao;
import org.greenrobot.greendao.Property;
+import org.greenrobot.greendao.internal.DaoConfig;
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import org.greenrobot.greendao.internal.DaoConfig;
+
+import com.casic.dcms.mvvm.model.NoticeBean;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/app/src/main/java/com/casic/dcms/greendao/StreetLightLocalBeanDao.java b/app/src/main/java/com/casic/dcms/greendao/StreetLightLocalBeanDao.java
index 4721e56..36cebb3 100644
--- a/app/src/main/java/com/casic/dcms/greendao/StreetLightLocalBeanDao.java
+++ b/app/src/main/java/com/casic/dcms/greendao/StreetLightLocalBeanDao.java
@@ -3,13 +3,13 @@
import android.database.Cursor;
import android.database.sqlite.SQLiteStatement;
-import com.casic.dcms.mvvm.model.StreetLightLocalBean;
-
import org.greenrobot.greendao.AbstractDao;
import org.greenrobot.greendao.Property;
+import org.greenrobot.greendao.internal.DaoConfig;
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import org.greenrobot.greendao.internal.DaoConfig;
+
+import com.casic.dcms.mvvm.model.StreetLightLocalBean;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/LoginActivity.java
index 48a95d0..fecb045 100644
--- a/app/src/main/java/com/casic/dcms/mvvm/view/LoginActivity.java
+++ b/app/src/main/java/com/casic/dcms/mvvm/view/LoginActivity.java
@@ -1,10 +1,7 @@
package com.casic.dcms.mvvm.view;
import android.content.Context;
-import android.text.Editable;
-import android.text.TextWatcher;
import android.view.View;
-import android.widget.EditText;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
@@ -54,27 +51,6 @@
@Override
protected void initEvent() {
- EditText editText = viewBinding.inputLayout.getEditText();
- editText.addTextChangedListener(new TextWatcher() {
- @Override
- public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-
- }
-
- @Override
- public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-
- }
-
- @Override
- public void afterTextChanged(Editable editable) {
- if (editable.toString().trim().length() > 12) {
- viewBinding.inputLayout.setError("密码长度超出限制");
- } else {
- viewBinding.inputLayout.setError(null);
- }
- }
- });
viewBinding.loginButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
diff --git a/app/src/main/res/drawable/bg_solid_layout_gray_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_gray_radius_5.xml
new file mode 100644
index 0000000..96eb93e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_gray_radius_5.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1754b6e..0da94ac 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,6 +8,12 @@
+
+
+
+
+
+
diff --git a/app/src/main/java/com/casic/dcms/greendao/DaoSession.java b/app/src/main/java/com/casic/dcms/greendao/DaoSession.java
index d9b9782..6702d3e 100644
--- a/app/src/main/java/com/casic/dcms/greendao/DaoSession.java
+++ b/app/src/main/java/com/casic/dcms/greendao/DaoSession.java
@@ -1,7 +1,6 @@
package com.casic.dcms.greendao;
-import com.casic.dcms.mvvm.model.NoticeBean;
-import com.casic.dcms.mvvm.model.StreetLightLocalBean;
+import java.util.Map;
import org.greenrobot.greendao.AbstractDao;
import org.greenrobot.greendao.AbstractDaoSession;
@@ -9,7 +8,11 @@
import org.greenrobot.greendao.identityscope.IdentityScopeType;
import org.greenrobot.greendao.internal.DaoConfig;
-import java.util.Map;
+import com.casic.dcms.mvvm.model.NoticeBean;
+import com.casic.dcms.mvvm.model.StreetLightLocalBean;
+
+import com.casic.dcms.greendao.NoticeBeanDao;
+import com.casic.dcms.greendao.StreetLightLocalBeanDao;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
diff --git a/app/src/main/java/com/casic/dcms/greendao/NoticeBeanDao.java b/app/src/main/java/com/casic/dcms/greendao/NoticeBeanDao.java
index 466d9b5..9a31f06 100644
--- a/app/src/main/java/com/casic/dcms/greendao/NoticeBeanDao.java
+++ b/app/src/main/java/com/casic/dcms/greendao/NoticeBeanDao.java
@@ -3,13 +3,13 @@
import android.database.Cursor;
import android.database.sqlite.SQLiteStatement;
-import com.casic.dcms.mvvm.model.NoticeBean;
-
import org.greenrobot.greendao.AbstractDao;
import org.greenrobot.greendao.Property;
+import org.greenrobot.greendao.internal.DaoConfig;
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import org.greenrobot.greendao.internal.DaoConfig;
+
+import com.casic.dcms.mvvm.model.NoticeBean;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/app/src/main/java/com/casic/dcms/greendao/StreetLightLocalBeanDao.java b/app/src/main/java/com/casic/dcms/greendao/StreetLightLocalBeanDao.java
index 4721e56..36cebb3 100644
--- a/app/src/main/java/com/casic/dcms/greendao/StreetLightLocalBeanDao.java
+++ b/app/src/main/java/com/casic/dcms/greendao/StreetLightLocalBeanDao.java
@@ -3,13 +3,13 @@
import android.database.Cursor;
import android.database.sqlite.SQLiteStatement;
-import com.casic.dcms.mvvm.model.StreetLightLocalBean;
-
import org.greenrobot.greendao.AbstractDao;
import org.greenrobot.greendao.Property;
+import org.greenrobot.greendao.internal.DaoConfig;
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import org.greenrobot.greendao.internal.DaoConfig;
+
+import com.casic.dcms.mvvm.model.StreetLightLocalBean;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/LoginActivity.java
index 48a95d0..fecb045 100644
--- a/app/src/main/java/com/casic/dcms/mvvm/view/LoginActivity.java
+++ b/app/src/main/java/com/casic/dcms/mvvm/view/LoginActivity.java
@@ -1,10 +1,7 @@
package com.casic.dcms.mvvm.view;
import android.content.Context;
-import android.text.Editable;
-import android.text.TextWatcher;
import android.view.View;
-import android.widget.EditText;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
@@ -54,27 +51,6 @@
@Override
protected void initEvent() {
- EditText editText = viewBinding.inputLayout.getEditText();
- editText.addTextChangedListener(new TextWatcher() {
- @Override
- public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-
- }
-
- @Override
- public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-
- }
-
- @Override
- public void afterTextChanged(Editable editable) {
- if (editable.toString().trim().length() > 12) {
- viewBinding.inputLayout.setError("密码长度超出限制");
- } else {
- viewBinding.inputLayout.setError(null);
- }
- }
- });
viewBinding.loginButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
diff --git a/app/src/main/res/drawable/bg_solid_layout_gray_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_gray_radius_5.xml
new file mode 100644
index 0000000..96eb93e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_gray_radius_5.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 7083de2..3a3af9e 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,6 +1,5 @@
@@ -8,62 +7,71 @@
+ android:layout_above="@id/userNameLayout">
-
+ android:layout_marginBottom="@dimen/dp_5"
+ android:background="@drawable/bg_solid_layout_gray_radius_5"
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
-
+
+
-
+
-
+ android:layout_marginTop="@dimen/dp_5"
+ android:background="@drawable/bg_solid_layout_gray_radius_5"
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
-
+
+
-
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1754b6e..0da94ac 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,6 +8,12 @@
+
+
+
+
+
+
diff --git a/app/src/main/java/com/casic/dcms/greendao/DaoSession.java b/app/src/main/java/com/casic/dcms/greendao/DaoSession.java
index d9b9782..6702d3e 100644
--- a/app/src/main/java/com/casic/dcms/greendao/DaoSession.java
+++ b/app/src/main/java/com/casic/dcms/greendao/DaoSession.java
@@ -1,7 +1,6 @@
package com.casic.dcms.greendao;
-import com.casic.dcms.mvvm.model.NoticeBean;
-import com.casic.dcms.mvvm.model.StreetLightLocalBean;
+import java.util.Map;
import org.greenrobot.greendao.AbstractDao;
import org.greenrobot.greendao.AbstractDaoSession;
@@ -9,7 +8,11 @@
import org.greenrobot.greendao.identityscope.IdentityScopeType;
import org.greenrobot.greendao.internal.DaoConfig;
-import java.util.Map;
+import com.casic.dcms.mvvm.model.NoticeBean;
+import com.casic.dcms.mvvm.model.StreetLightLocalBean;
+
+import com.casic.dcms.greendao.NoticeBeanDao;
+import com.casic.dcms.greendao.StreetLightLocalBeanDao;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
diff --git a/app/src/main/java/com/casic/dcms/greendao/NoticeBeanDao.java b/app/src/main/java/com/casic/dcms/greendao/NoticeBeanDao.java
index 466d9b5..9a31f06 100644
--- a/app/src/main/java/com/casic/dcms/greendao/NoticeBeanDao.java
+++ b/app/src/main/java/com/casic/dcms/greendao/NoticeBeanDao.java
@@ -3,13 +3,13 @@
import android.database.Cursor;
import android.database.sqlite.SQLiteStatement;
-import com.casic.dcms.mvvm.model.NoticeBean;
-
import org.greenrobot.greendao.AbstractDao;
import org.greenrobot.greendao.Property;
+import org.greenrobot.greendao.internal.DaoConfig;
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import org.greenrobot.greendao.internal.DaoConfig;
+
+import com.casic.dcms.mvvm.model.NoticeBean;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/app/src/main/java/com/casic/dcms/greendao/StreetLightLocalBeanDao.java b/app/src/main/java/com/casic/dcms/greendao/StreetLightLocalBeanDao.java
index 4721e56..36cebb3 100644
--- a/app/src/main/java/com/casic/dcms/greendao/StreetLightLocalBeanDao.java
+++ b/app/src/main/java/com/casic/dcms/greendao/StreetLightLocalBeanDao.java
@@ -3,13 +3,13 @@
import android.database.Cursor;
import android.database.sqlite.SQLiteStatement;
-import com.casic.dcms.mvvm.model.StreetLightLocalBean;
-
import org.greenrobot.greendao.AbstractDao;
import org.greenrobot.greendao.Property;
+import org.greenrobot.greendao.internal.DaoConfig;
import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.database.DatabaseStatement;
-import org.greenrobot.greendao.internal.DaoConfig;
+
+import com.casic.dcms.mvvm.model.StreetLightLocalBean;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
diff --git a/app/src/main/java/com/casic/dcms/mvvm/view/LoginActivity.java b/app/src/main/java/com/casic/dcms/mvvm/view/LoginActivity.java
index 48a95d0..fecb045 100644
--- a/app/src/main/java/com/casic/dcms/mvvm/view/LoginActivity.java
+++ b/app/src/main/java/com/casic/dcms/mvvm/view/LoginActivity.java
@@ -1,10 +1,7 @@
package com.casic.dcms.mvvm.view;
import android.content.Context;
-import android.text.Editable;
-import android.text.TextWatcher;
import android.view.View;
-import android.widget.EditText;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
@@ -54,27 +51,6 @@
@Override
protected void initEvent() {
- EditText editText = viewBinding.inputLayout.getEditText();
- editText.addTextChangedListener(new TextWatcher() {
- @Override
- public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-
- }
-
- @Override
- public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-
- }
-
- @Override
- public void afterTextChanged(Editable editable) {
- if (editable.toString().trim().length() > 12) {
- viewBinding.inputLayout.setError("密码长度超出限制");
- } else {
- viewBinding.inputLayout.setError(null);
- }
- }
- });
viewBinding.loginButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
diff --git a/app/src/main/res/drawable/bg_solid_layout_gray_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_gray_radius_5.xml
new file mode 100644
index 0000000..96eb93e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_gray_radius_5.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 7083de2..3a3af9e 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,6 +1,5 @@
@@ -8,62 +7,71 @@
+ android:layout_above="@id/userNameLayout">
-
+ android:layout_marginBottom="@dimen/dp_5"
+ android:background="@drawable/bg_solid_layout_gray_radius_5"
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
-
+
+
-
+
-
+ android:layout_marginTop="@dimen/dp_5"
+ android:background="@drawable/bg_solid_layout_gray_radius_5"
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
-
+
+
-
+
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c6be727..c5e1555 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -3,9 +3,6 @@