From 0d0150cde56472ac6b6e9df2082d072b5602e336 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=93=88=E5=93=88=E5=93=88=E5=93=88=E5=93=88=E5=A3=AB?= =?UTF-8?q?=E5=A5=87?= <1045352474@qq.com> Date: Fri, 25 Oct 2019 00:51:59 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' # Conflicts: # app/src/main/res/layout/activity_main.xml --- .../cmknowledgegraph/LoginActivity.java | 13 ++++++++++-- .../cmknowledgegraph/PersonContent.java | 20 ++++++++++++++++--- .../PersonalityCenterActivity.java | 14 ++----------- .../cmknowledgegraph/RegisterActivity.java | 2 +- .../layout/activity_personality_center.xml | 12 ++++++++++- app/src/main/res/layout/activity_search.xml | 1 + 6 files changed, 43 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/example/cmknowledgegraph/LoginActivity.java b/app/src/main/java/com/example/cmknowledgegraph/LoginActivity.java index 1490488..d5dba1b 100644 --- a/app/src/main/java/com/example/cmknowledgegraph/LoginActivity.java +++ b/app/src/main/java/com/example/cmknowledgegraph/LoginActivity.java @@ -3,6 +3,7 @@ package com.example.cmknowledgegraph; import android.content.Intent; import android.os.Bundle; import android.util.Log; +import android.view.LayoutInflater; import android.view.View; import android.widget.Button; import android.widget.EditText; @@ -18,6 +19,7 @@ import Schema.OperaSchema; public class LoginActivity extends AppCompatActivity { public static String username; public static int usersuccess = 0; + public static boolean isLogin=false;//登录属性，true登陆成功，false未登录 @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -29,7 +31,12 @@ public class LoginActivity extends AppCompatActivity { /** * 登录按钮，传递参数：手机号(int)、密码(string) */ - Button login_btn=findViewById(R.id.login_btn); + + LayoutInflater inflater = getLayoutInflater(); + View layout = inflater.inflate(R.layout.activity_personality_center, null); + final Button welcom_btn= layout.findViewById(R.id.welcom_btn); + + final Button login_btn=findViewById(R.id.login_btn); login_btn.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -49,7 +56,7 @@ public class LoginActivity extends AppCompatActivity { String password = password_edit.getText().toString(); //调用数据库类中的方法进行登录 // boolean isLogin= OperaSchema.longin(tel,password);//原来的数据库 - Login login = new Login(tel, password); + final Login login = new Login(tel, password); new Thread(new Runnable() { @Override @@ -69,6 +76,8 @@ public class LoginActivity extends AppCompatActivity { } if (!LoginActivity.username.equals("")) { + //改变个人中心的登录状态， + isLogin=true; finish();//返回个人中心Activity //刷新个人中心Activity Log.i("成功", "成功了"); diff --git a/app/src/main/java/com/example/cmknowledgegraph/PersonContent.java b/app/src/main/java/com/example/cmknowledgegraph/PersonContent.java index 83ded31..352895e 100644 --- a/app/src/main/java/com/example/cmknowledgegraph/PersonContent.java +++ b/app/src/main/java/com/example/cmknowledgegraph/PersonContent.java @@ -12,6 +12,7 @@ import androidx.fragment.app.Fragment; public class PersonContent extends Fragment { + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { // Inflate the layout for this fragment @@ -25,10 +26,23 @@ public class PersonContent extends Fragment { login_pc_btn.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { //跳转到LoginActivity - Intent intent=new Intent(); - intent.setClass(getActivity(),LoginActivity.class); - startActivity(intent); + if(!LoginActivity.isLogin){ + Intent intent=new Intent(); + intent.setClass(getActivity(),LoginActivity.class); + startActivity(intent); + } } }); } + + @Override + public void onResume() { + super.onResume(); + if(LoginActivity.isLogin){ + Button longin_pc_btn=(Button) getActivity().findViewById(R.id.login_pc_button); + longin_pc_btn.setText("欢迎"); + } + + + } } diff --git a/app/src/main/java/com/example/cmknowledgegraph/PersonalityCenterActivity.java b/app/src/main/java/com/example/cmknowledgegraph/PersonalityCenterActivity.java index 20bcc2d..6e23a51 100644 --- a/app/src/main/java/com/example/cmknowledgegraph/PersonalityCenterActivity.java +++ b/app/src/main/java/com/example/cmknowledgegraph/PersonalityCenterActivity.java @@ -16,17 +16,7 @@ public class PersonalityCenterActivity extends AppCompatActivity { Log.i("PersonalityCenterActivity","个人中心"); super.onCreate(savedInstanceState); setContentView(R.layout.activity_personality_center); - - Button longin_pc_btn=(Button) findViewById(R.id.login_pc_button); - longin_pc_btn.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - //跳转到LoginActivity - Intent intent=new Intent(); - intent.setClass(PersonalityCenterActivity.this,LoginActivity.class); - startActivity(intent); - Log.i("PersonalityCenterActivity","点击"); - } - }); } + + } diff --git a/app/src/main/java/com/example/cmknowledgegraph/RegisterActivity.java b/app/src/main/java/com/example/cmknowledgegraph/RegisterActivity.java index 71dc408..bd99740 100644 --- a/app/src/main/java/com/example/cmknowledgegraph/RegisterActivity.java +++ b/app/src/main/java/com/example/cmknowledgegraph/RegisterActivity.java @@ -55,7 +55,7 @@ public class RegisterActivity extends AppCompatActivity { String NickName = nickname_edit.getText().toString(); //调用数据库类方法进行注册 // boolean isRegister= OperaSchema.register(tel,NickName,password);//原来的数据连接 - Register register = new Register(tel, NickName, password); + final Register register = new Register(tel, NickName, password); new Thread(new Runnable() { @Override diff --git a/app/src/main/res/layout/activity_personality_center.xml b/app/src/main/res/layout/activity_personality_center.xml index 49ba48c..27e31ae 100644 --- a/app/src/main/res/layout/activity_personality_center.xml +++ b/app/src/main/res/layout/activity_personality_center.xml @@ -22,8 +22,18 @@ android:text="登录" android:textSize="20sp" android:background="#FFDAB9" - android:layout_marginLeft="157dp"/> + android:layout_marginLeft="157dp" + android:visibility="visible"/> +