From cd4485aadae53679084ab54eee671f101e7e160f Mon Sep 17 00:00:00 2001
From: hjw <1632328072@qq.com>
Date: Wed, 12 Jan 2022 19:04:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C+=E4=B8=AA=E4=BA=BA=E4=BF=A1?=
=?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9+=E9=83=A8=E5=88=86ui=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../app/src/main/AndroidManifest.xml | 99 +++++++-----
.../Activity/BaseActivity.java | 2 +-
.../Activity/LoginActivity.java | 10 ++
.../Activity/MyInfoActivity.java | 139 +++++++++++++++-
.../Activity/RegisterActivity.java | 153 +++++++++++++++++-
.../Adapter/QuestionAdapter.java | 4 +
.../Fragment/IndexFragment.java | 20 +--
.../Fragment/InvitationChannelFragment.java | 3 +
.../example/leudaemialikeme/Model/User.java | 8 +
.../app/src/main/res/drawable/add_fill_v2.png | Bin 0 -> 3253 bytes
.../main/res/drawable/background_register.xml | 16 ++
.../app/src/main/res/drawable/blog_image.png | Bin 0 -> 1741 bytes
.../src/main/res/drawable/button_login.xml | 17 ++
.../src/main/res/drawable/community_add.png | Bin 0 -> 4217 bytes
.../main/res/drawable/community_add_v2.png | Bin 0 -> 3719 bytes
.../app/src/main/res/drawable/img_add_v2.png | Bin 0 -> 3253 bytes
.../src/main/res/drawable/lo_background.png | Bin 0 -> 111 bytes
.../app/src/main/res/drawable/login_logo.png | Bin 0 -> 6558 bytes
.../src/main/res/drawable/question_image.png | Bin 0 -> 2198 bytes
.../app/src/main/res/drawable/replace.png | Bin 0 -> 160 bytes
.../app/src/main/res/drawable/search_v2.png | Bin 0 -> 2190 bytes
.../app/src/main/res/drawable/splash_logo.jpg | Bin 0 -> 11277 bytes
.../main/res/layout/activity_blogdetail.xml | 71 ++++----
.../src/main/res/layout/activity_login.xml | 91 +++++++++--
.../src/main/res/layout/activity_my_info.xml | 45 +++---
.../src/main/res/layout/activity_register.xml | 147 +++++++++++------
.../main/res/layout/fragment_community.xml | 10 +-
.../src/main/res/layout/fragment_index.xml | 18 ++-
.../app/src/main/res/layout/question_item.xml | 2 -
.../app/src/main/res/layout/recyclerview.xml | 1 -
.../app/src/main/res/values/arrays.xml | 4 +
31 files changed, 661 insertions(+), 199 deletions(-)
create mode 100644 Code/LeudaemiaLikeMe/app/src/main/res/drawable/add_fill_v2.png
create mode 100644 Code/LeudaemiaLikeMe/app/src/main/res/drawable/background_register.xml
create mode 100644 Code/LeudaemiaLikeMe/app/src/main/res/drawable/blog_image.png
create mode 100644 Code/LeudaemiaLikeMe/app/src/main/res/drawable/button_login.xml
create mode 100644 Code/LeudaemiaLikeMe/app/src/main/res/drawable/community_add.png
create mode 100644 Code/LeudaemiaLikeMe/app/src/main/res/drawable/community_add_v2.png
create mode 100644 Code/LeudaemiaLikeMe/app/src/main/res/drawable/img_add_v2.png
create mode 100644 Code/LeudaemiaLikeMe/app/src/main/res/drawable/lo_background.png
create mode 100644 Code/LeudaemiaLikeMe/app/src/main/res/drawable/login_logo.png
create mode 100644 Code/LeudaemiaLikeMe/app/src/main/res/drawable/question_image.png
create mode 100644 Code/LeudaemiaLikeMe/app/src/main/res/drawable/replace.png
create mode 100644 Code/LeudaemiaLikeMe/app/src/main/res/drawable/search_v2.png
create mode 100644 Code/LeudaemiaLikeMe/app/src/main/res/drawable/splash_logo.jpg
diff --git a/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml b/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml
index 5b5760e..b4b7bb2 100644
--- a/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml
+++ b/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml
@@ -18,68 +18,83 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.LeudaemiaLikeMe">
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/BaseActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/BaseActivity.java
index 5548d3e..c7612f4 100644
--- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/BaseActivity.java
+++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/BaseActivity.java
@@ -31,7 +31,7 @@ public class BaseActivity extends AppCompatActivity {
public static Owner owner;
//服务器链接
- public static String SERVER_IP = "172.30.125.78";
+ public static String SERVER_IP = "172.18.138.225";
// 172.30.118.24 寝:172.18.138.225
// static {
diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/LoginActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/LoginActivity.java
index 3f04a95..eabef98 100644
--- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/LoginActivity.java
+++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/LoginActivity.java
@@ -32,6 +32,7 @@ public class LoginActivity extends BaseActivity {
private EditText edit_username;
private EditText edit_pwd;
private Button bt_login;
+ private Button bt_register;
private String username;
private String pwd;
@@ -42,9 +43,11 @@ public class LoginActivity extends BaseActivity {
//获取数据库
SQLiteDatabase db = LitePal.getDatabase();
+// Log.e("", String.valueOf(Context.getExternalFilesDir()));
edit_username = findViewById(R.id.edit_username);
edit_pwd = findViewById(R.id.edit_pwd);
bt_login = findViewById(R.id.bt_login);
+ bt_register = findViewById(R.id.bt_register);
bt_login.setOnClickListener(new View.OnClickListener() {
@Override
@@ -61,6 +64,13 @@ public class LoginActivity extends BaseActivity {
}
}
});
+ bt_register.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent intent=new Intent(LoginActivity.this,RegisterActivity.class);
+ startActivity(intent);
+ }
+ });
}
private void loginRequest(final Map paramMap){
diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/MyInfoActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/MyInfoActivity.java
index 32aae02..68ba609 100644
--- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/MyInfoActivity.java
+++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/MyInfoActivity.java
@@ -2,28 +2,153 @@ package com.example.leudaemialikeme.Activity;
import android.content.Intent;
import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
import android.widget.EditText;
-
-import androidx.appcompat.app.AppCompatActivity;
+import android.widget.Spinner;
+import android.widget.TextView;
+import android.widget.Toast;
import com.example.leudaemialikeme.Model.User;
import com.example.leudaemialikeme.R;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+
+import java.util.HashMap;
+import java.util.Map;
-public class MyInfoActivity extends AppCompatActivity {
- private User user;
- private EditText edit_id;
+import static com.example.leudaemialikeme.Utils.OkHttpUtil.synPost;
+
+public class MyInfoActivity extends BaseActivity {
+ private User origin_user;
+ private User changed_user;
+ private TextView edit_id;
private EditText edit_username;
private EditText edit_password;
private EditText edit_confirm_password;
- private EditText phone;
+ private EditText edit_phone;
+ private Button commit;
+ private Spinner spinner_sex;
+ private String toast_content;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_my_info);
Intent intent = getIntent();
- user = (User)intent.getSerializableExtra("user");
+ origin_user = (User)intent.getSerializableExtra("user");
+ changed_user = (User)intent.getSerializableExtra("user");
+
+ initView();
+ setSpinner_sex();
+ initData();
+
+ commit.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ toast_content = "";
+ String username=edit_username.getText().toString();
+ changed_user.setUsername(username);
+ String password=edit_password.getText().toString();
+ String confirmPassword=edit_confirm_password.getText().toString();
+ if(password.equals(confirmPassword)){
+ changed_user.setPassword(password);
+ }else{
+ toast_content = toast_content +"确认密码不一致\n";}
+ String phone=edit_phone.getText().toString();
+ changed_user.setPhone(phone);
+ Map paramMap_update=new HashMap();
+ paramMap_update.put("origin_user",origin_user);
+ paramMap_update.put("changed_user",changed_user);
+ Log.e("传入的orgin sex为",origin_user.getSex());
+ Log.e("传入的changed_user sex为",changed_user.getSex());
+ String url_update=BaseActivity.SERVER_URL+"/user-servlet?action=updateUser";
+ //不同时,需要判断username是否已存在
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ String jsonStr_update=synPost(url_update,paramMap_update);
+ Log.e("jsonstr update",jsonStr_update);
+ Gson gson=new Gson();
+ Map jsonMap= gson.fromJson(jsonStr_update, new TypeToken