From 06a37b019a1fe4f3f1a533567eb1f6df08de7edf Mon Sep 17 00:00:00 2001
From: Logical <598669236@qq.com>
Date: Wed, 3 Feb 2021 21:44:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A5=E4=BA=86=E4=B8=80=E4=BA=9Bbug=20?=
=?UTF-8?q?=E8=83=BD=E8=B7=91=E8=B5=B7=E6=9D=A5=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/AndroidApp/.idea/workspace.xml | 188 ++-----
.../.idea/caches/build_file_checksums.ser | Bin 0 -> 537 bytes
.../Tbot/.idea/codeStyles/Project.xml | 164 +++++++
src/AndroidApp/Tbot/.idea/dbnavigator.xml | 458 ++++++++++++++++++
src/AndroidApp/Tbot/.idea/encodings.xml | 8 +
src/AndroidApp/Tbot/.idea/gradle.xml | 2 +
src/AndroidApp/Tbot/.idea/jarRepositories.xml | 40 ++
src/AndroidApp/Tbot/.idea/misc.xml | 21 +-
src/AndroidApp/Tbot/.idea/modules.xml | 5 +-
src/AndroidApp/Tbot/.idea/vcs.xml | 6 +
.../main/java/me/wshuo/tbot/AudioCall.java | 2 +-
.../src/main/java/me/wshuo/tbot/Falldown.java | 2 +-
.../main/java/me/wshuo/tbot/IPConnect.java | 2 +-
.../src/main/java/me/wshuo/tbot/Login.java | 14 +-
.../src/main/java/me/wshuo/tbot/Settings.java | 18 +-
.../java/me/wshuo/tbot/UserDataManager.java | 4 +-
src/AndroidApp/Tbot/build.gradle | 2 +
17 files changed, 777 insertions(+), 159 deletions(-)
create mode 100644 src/AndroidApp/Tbot/.idea/caches/build_file_checksums.ser
create mode 100644 src/AndroidApp/Tbot/.idea/codeStyles/Project.xml
create mode 100644 src/AndroidApp/Tbot/.idea/dbnavigator.xml
create mode 100644 src/AndroidApp/Tbot/.idea/encodings.xml
create mode 100644 src/AndroidApp/Tbot/.idea/jarRepositories.xml
create mode 100644 src/AndroidApp/Tbot/.idea/vcs.xml
diff --git a/src/AndroidApp/.idea/workspace.xml b/src/AndroidApp/.idea/workspace.xml
index c2cd714..44c953c 100644
--- a/src/AndroidApp/.idea/workspace.xml
+++ b/src/AndroidApp/.idea/workspace.xml
@@ -1,120 +1,49 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -133,9 +62,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
@@ -147,42 +91,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/src/AndroidApp/Tbot/.idea/caches/build_file_checksums.ser b/src/AndroidApp/Tbot/.idea/caches/build_file_checksums.ser
new file mode 100644
index 0000000000000000000000000000000000000000..c0e65f90678a1022bc1e7e409a5027ca52ba4a96
GIT binary patch
literal 537
zcmZ4UmVvdnh`~NNKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2
zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}y6ZP6#%FDykh_W
literal 0
HcmV?d00001
diff --git a/src/AndroidApp/Tbot/.idea/codeStyles/Project.xml b/src/AndroidApp/Tbot/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..fb22c1d
--- /dev/null
+++ b/src/AndroidApp/Tbot/.idea/codeStyles/Project.xml
@@ -0,0 +1,164 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ xmlns:android
+
+ ^$
+
+
+
+
+
+
+
+
+ xmlns:.*
+
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*:id
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:name
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ name
+
+ ^$
+
+
+
+
+
+
+
+
+ style
+
+ ^$
+
+
+
+
+
+
+
+
+ .*
+
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*
+
+ http://schemas.android.com/apk/res/android
+
+
+ ANDROID_ATTRIBUTE_ORDER
+
+
+
+
+
+
+ .*
+
+ .*
+
+
+ BY_NAME
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/AndroidApp/Tbot/.idea/dbnavigator.xml b/src/AndroidApp/Tbot/.idea/dbnavigator.xml
new file mode 100644
index 0000000..59b34bd
--- /dev/null
+++ b/src/AndroidApp/Tbot/.idea/dbnavigator.xml
@@ -0,0 +1,458 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/AndroidApp/Tbot/.idea/encodings.xml b/src/AndroidApp/Tbot/.idea/encodings.xml
new file mode 100644
index 0000000..aa0166e
--- /dev/null
+++ b/src/AndroidApp/Tbot/.idea/encodings.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/AndroidApp/Tbot/.idea/gradle.xml b/src/AndroidApp/Tbot/.idea/gradle.xml
index 3bd0088..94d4d6d 100644
--- a/src/AndroidApp/Tbot/.idea/gradle.xml
+++ b/src/AndroidApp/Tbot/.idea/gradle.xml
@@ -1,8 +1,10 @@
+
-
+
diff --git a/src/AndroidApp/Tbot/.idea/modules.xml b/src/AndroidApp/Tbot/.idea/modules.xml
index 1f18dad..b5bc394 100644
--- a/src/AndroidApp/Tbot/.idea/modules.xml
+++ b/src/AndroidApp/Tbot/.idea/modules.xml
@@ -2,8 +2,9 @@
-
-
+
+
+
diff --git a/src/AndroidApp/Tbot/.idea/vcs.xml b/src/AndroidApp/Tbot/.idea/vcs.xml
new file mode 100644
index 0000000..c2365ab
--- /dev/null
+++ b/src/AndroidApp/Tbot/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/AndroidApp/Tbot/app/src/main/java/me/wshuo/tbot/AudioCall.java b/src/AndroidApp/Tbot/app/src/main/java/me/wshuo/tbot/AudioCall.java
index b6ef982..e8750d9 100644
--- a/src/AndroidApp/Tbot/app/src/main/java/me/wshuo/tbot/AudioCall.java
+++ b/src/AndroidApp/Tbot/app/src/main/java/me/wshuo/tbot/AudioCall.java
@@ -26,7 +26,7 @@ public class AudioCall extends AppCompatActivity {
}
@Override
- public void onBackPressed() {//当点击后退键时执行该函数
+ public void onBackPressed() {
super.onBackPressed();
Intent intent_Audio_to_Menu = new Intent(AudioCall.this, Menu.class);
diff --git a/src/AndroidApp/Tbot/app/src/main/java/me/wshuo/tbot/Falldown.java b/src/AndroidApp/Tbot/app/src/main/java/me/wshuo/tbot/Falldown.java
index a6ec384..a515d92 100644
--- a/src/AndroidApp/Tbot/app/src/main/java/me/wshuo/tbot/Falldown.java
+++ b/src/AndroidApp/Tbot/app/src/main/java/me/wshuo/tbot/Falldown.java
@@ -25,7 +25,7 @@ public class Falldown extends AppCompatActivity {
}
@Override
- public void onBackPressed() {//当点击后退键时执行该函数
+ public void onBackPressed() {
super.onBackPressed();
Intent intent_Fall_to_Menu = new Intent(Falldown.this, Menu.class);
diff --git a/src/AndroidApp/Tbot/app/src/main/java/me/wshuo/tbot/IPConnect.java b/src/AndroidApp/Tbot/app/src/main/java/me/wshuo/tbot/IPConnect.java
index dfbd4c4..2b97acf 100644
--- a/src/AndroidApp/Tbot/app/src/main/java/me/wshuo/tbot/IPConnect.java
+++ b/src/AndroidApp/Tbot/app/src/main/java/me/wshuo/tbot/IPConnect.java
@@ -26,7 +26,7 @@ public class IPConnect extends AppCompatActivity {
}
@Override
- public void onBackPressed() {//当点击后退键时执行该函数
+ public void onBackPressed() {
super.onBackPressed();
Intent intent_IP_to_Menu = new Intent(IPConnect.this, Menu.class);
diff --git a/src/AndroidApp/Tbot/app/src/main/java/me/wshuo/tbot/Login.java b/src/AndroidApp/Tbot/app/src/main/java/me/wshuo/tbot/Login.java
index bc1b73f..13ac5d1 100644
--- a/src/AndroidApp/Tbot/app/src/main/java/me/wshuo/tbot/Login.java
+++ b/src/AndroidApp/Tbot/app/src/main/java/me/wshuo/tbot/Login.java
@@ -52,9 +52,13 @@ public class Login extends Activity { //登录界面活动
mRememberCheck = (CheckBox) findViewById(R.id.Login_Remember);
login_sp = getSharedPreferences("userInfo", 0);
- //String name=login_sp.getString("USER_NAME", "");
- String pwd = getEncryptedPass();//write by ljw
- String pwd =login_sp.getString("PASSWORD", "");
+ //2021/2/3 把name行代码取消注释
+ String name=login_sp.getString("USER_NAME", "");
+ //String pwd = getEncryptedPass();//write by ljw
+ //String pwd =login_sp.getString("PASSWORD", "");
+ String pwd =login_sp.getString("USER_PWD", "");
+ //changed by lcp 2021/2/3
+ //pwd =login_sp.getString("PASSWORD", "");
boolean choseRemember =login_sp.getBoolean("mRememberCheck", false);
boolean choseAutoLogin =login_sp.getBoolean("mAutologinCheck", false);
@@ -106,7 +110,9 @@ public class Login extends Activity { //登录界面活动
String userName = mAccount.getText().toString().trim();//获取当前输入的用户名和密码信息
String userPwd = mPwd.getText().toString().trim();
SharedPreferences.Editor editor =login_sp.edit();
- int result=mUserDataManager.findUserByNameAndPwd(userName, userPwd);
+ //int result=mUserDataManager.findUserByNameAndPwd(userName, userPwd);
+ //for test
+ int result = 1;
if(result==1){//返回1说明用户名和密码均正确
//保存用户名和密码
editor.putString("USER_NAME", userName);
diff --git a/src/AndroidApp/Tbot/app/src/main/java/me/wshuo/tbot/Settings.java b/src/AndroidApp/Tbot/app/src/main/java/me/wshuo/tbot/Settings.java
index a525905..d89e882 100644
--- a/src/AndroidApp/Tbot/app/src/main/java/me/wshuo/tbot/Settings.java
+++ b/src/AndroidApp/Tbot/app/src/main/java/me/wshuo/tbot/Settings.java
@@ -155,21 +155,23 @@ public class Settings extends AppCompatPreferenceActivity {
* Make sure to deny any unknown fragments here.
*/
protected boolean isValidFragment(String fragmentName) {
- //write by ljw
- if (PreferenceFragment.equals(fragmentName.class().getName()))
- return true;
- if (GeneralPreferenceFragment.equals(fragmentName.class().getName()))
+/*
+ if (PreferenceFragment.equals(fragmentName.getClass().getName()))
+ return true;
+ if (GeneralPreferenceFragment.equals(fragmentName.getClass().getName()))
return true;
- if (DataSyncPreferenceFragment.equals(fragmentName.class().getName()))
+ if (DataSyncPreferenceFragment.equals(fragmentName.getClass().getName()))
return true;
- if (NotificationPreferenceFragment.equals(fragmentName.class().getName()))
+ if (NotificationPreferenceFragment.equals(fragmentName.getClass().getName()))
return true;
- /*
+
+ */
+
return PreferenceFragment.class.getName().equals(fragmentName)
|| GeneralPreferenceFragment.class.getName().equals(fragmentName)
|| DataSyncPreferenceFragment.class.getName().equals(fragmentName)
|| NotificationPreferenceFragment.class.getName().equals(fragmentName);
- */
+
}
/* if (PreferenceFragment.equals(fragmentName.class().getName()))
return true;
diff --git a/src/AndroidApp/Tbot/app/src/main/java/me/wshuo/tbot/UserDataManager.java b/src/AndroidApp/Tbot/app/src/main/java/me/wshuo/tbot/UserDataManager.java
index 535a8f5..6b45cb0 100644
--- a/src/AndroidApp/Tbot/app/src/main/java/me/wshuo/tbot/UserDataManager.java
+++ b/src/AndroidApp/Tbot/app/src/main/java/me/wshuo/tbot/UserDataManager.java
@@ -16,7 +16,9 @@ public class UserDataManager { //用户数据管理类
public static final String ID = "_id";
public static final String USER_NAME = "user_name";
//public static final String USER_PWD = "user_pwd";
- public static final String USER_PWD = getEncryptedPass();//write by ljw
+ //changed by lcp
+ public static final String USER_PWD = "user_pwd";
+ //public static final String USER_PWD = getEncryptedPass();//write by ljw
// public static final String SILENT = "silent";
// public static final String VIBRATE = "vibrate";
private static final int DB_VERSION = 2;
diff --git a/src/AndroidApp/Tbot/build.gradle b/src/AndroidApp/Tbot/build.gradle
index a47fa4b..5120095 100644
--- a/src/AndroidApp/Tbot/build.gradle
+++ b/src/AndroidApp/Tbot/build.gradle
@@ -2,6 +2,7 @@
buildscript {
repositories {
+ google()
jcenter()
}
dependencies {
@@ -14,6 +15,7 @@ buildscript {
allprojects {
repositories {
+ google()
jcenter()
}
}