diff --git a/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml b/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml index 1fd028b..ac7fff2 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml +++ b/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml @@ -18,18 +18,19 @@ 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/LoginActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/LoginActivity.java index 5aedc53..3f04a95 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 @@ -18,6 +18,7 @@ import com.example.leudaemialikeme.Model.Owner; import com.example.leudaemialikeme.Model.User; import com.example.leudaemialikeme.R; import com.example.leudaemialikeme.Utils.OkHttpUtil; +import com.example.leudaemialikeme.Utils.TimeUtil; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; @@ -193,15 +194,15 @@ public class LoginActivity extends BaseActivity { final String message=(String) jsonMap.get("message"); if (message.equals("success")){ //进行本地消息存储 - List msgList = gson.fromJson(jsonMap.get("msgList"), new TypeToken >(){}.getType()); + List> msgList = gson.fromJson(jsonMap.get("messageList"), new TypeToken >>(){}.getType()); for (int i=0;i unReadMsg = msgList.get(i); // System.out.println(unReadMsg.getSenderNetId()); - String content = unReadMsg.getContent(); - int messageType = unReadMsg.getMessageType(); - int receiverId = unReadMsg.getReceiverNetId(); - int senderId = unReadMsg.getSenderNetId(); - Long createTime = unReadMsg.getCreateTime(); + String content = unReadMsg.get("content"); + int messageType = Integer.parseInt(unReadMsg.get("messageType")); + int receiverId = Integer.parseInt(unReadMsg.get("receiverNetId")); + int senderId = Integer.parseInt(unReadMsg.get("senderNetId")); + Long createTime = TimeUtil.stringToTime(unReadMsg.get("createTime")).getTime(); Message newMessage=new Message(senderId,receiverId,messageType,content,createTime); messageDao.insert(newMessage); getNewFriendRequest(senderId); 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 new file mode 100644 index 0000000..32aae02 --- /dev/null +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/MyInfoActivity.java @@ -0,0 +1,29 @@ +package com.example.leudaemialikeme.Activity; + +import android.content.Intent; +import android.os.Bundle; +import android.widget.EditText; + +import androidx.appcompat.app.AppCompatActivity; + +import com.example.leudaemialikeme.Model.User; +import com.example.leudaemialikeme.R; + +public class MyInfoActivity extends AppCompatActivity { + private User user; + private EditText edit_id; + private EditText edit_username; + private EditText edit_password; + private EditText edit_confirm_password; + private EditText phone; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_my_info); + Intent intent = getIntent(); + user = (User)intent.getSerializableExtra("user"); + + + } +} \ No newline at end of file diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/MyFragment.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/MyFragment.java index 23fdb71..197c504 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/MyFragment.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/MyFragment.java @@ -5,6 +5,7 @@ import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; @@ -20,6 +21,7 @@ import com.example.leudaemialikeme.Activity.EventActivity; import com.example.leudaemialikeme.Activity.HistoryActivity; import com.example.leudaemialikeme.Activity.LoginActivity; import com.example.leudaemialikeme.Activity.MdctRmdActivity; +import com.example.leudaemialikeme.Activity.MyInfoActivity; import com.example.leudaemialikeme.Activity.MyQuestionActivity; import com.example.leudaemialikeme.Activity.SafetyActivity; import com.example.leudaemialikeme.Model.User; @@ -105,6 +107,19 @@ public class MyFragment extends Fragment { TextView invitation = view.findViewById(R.id.my_invitation); TextView consent = view.findViewById(R.id.my_consent); TextView attention = view.findViewById(R.id.attention); + //个人信息更多 + ImageView img_go_my_info = view.findViewById(R.id.img_go_my_info); + + //个人信息管理跳转 + img_go_my_info.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(getActivity(), MyInfoActivity.class); + intent.putExtra("user", user); + startActivity(intent); + } + }); + //设置文本点击之后的跳转 answer.setOnClickListener(new View.OnClickListener() { @Override diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Model/User.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Model/User.java index e966b97..c7109b6 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Model/User.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Model/User.java @@ -1,6 +1,8 @@ package com.example.leudaemialikeme.Model; -public class User { +import java.io.Serializable; + +public class User implements Serializable { private int iduser; private String username; private String password; diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_my_info.xml b/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_my_info.xml new file mode 100644 index 0000000..a34bb67 --- /dev/null +++ b/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_my_info.xml @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +