master
ongbo 5 years ago
parent e6288af322
commit 5e14975ba7

@ -64,32 +64,33 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
LoginActivity loginActivity = (LoginActivity) weakReference.get(); LoginActivity loginActivity = (LoginActivity) weakReference.get();
Bundle bundle = msg.getData(); Bundle bundle = msg.getData();
ReturnData messageJSON = (ReturnData) bundle.getSerializable("msg"); ReturnData messageJSON = (ReturnData) bundle.getSerializable("msg");
Log.i("msg",messageJSON+"");
if(messageJSON.getCode() == ConditionCode.loginsucess) { if(messageJSON.getCode() == ConditionCode.loginsucess) {
weakReference.get().mName.setVisibility(View.INVISIBLE); // weakReference.get().mName.setVisibility(View.INVISIBLE);
weakReference.get().mPsw.setVisibility(View.INVISIBLE); // weakReference.get().mPsw.setVisibility(View.INVISIBLE);
int mWidth = weakReference.get().mBtnLogin.getMeasuredWidth(); // int mWidth = weakReference.get().mBtnLogin.getMeasuredWidth();
int mHeight =weakReference.get().mBtnLogin.getMeasuredHeight(); // int mHeight =weakReference.get().mBtnLogin.getMeasuredHeight();
//
weakReference.get().inputAnimator(weakReference.get().mInputLayout, mWidth, mHeight); // weakReference.get().inputAnimator(weakReference.get().mInputLayout, mWidth, mHeight);
String ReturnUsername = (String) messageJSON.getData(); String ReturnUsername = (String) messageJSON.getData();
ToolTip.FadeCenter(weakReference.get(),"登陆成功");
User.setLogin(true); User.setLogin(true);
User.getUser().setUsername(ReturnUsername); User.getUser().setUsername(ReturnUsername);
try { loginActivity.finish();
Thread.sleep(500);
loginActivity.finish();
} catch (InterruptedException e) {
e.printStackTrace();
}
}else { }else {
Log.i("fjldsk==","fasf++++");
// 这里要让那个输入输出框还原 // 这里要让那个输入输出框还原
// weakReference.get().animatorSet.cancel();
// weakReference.get().recovery(); weakReference.get().recovery();//执行复原动作
ToolTip.FadeCenter(weakReference.get(),messageJSON.getMsg()); ToolTip.FadeCenter(weakReference.get(),messageJSON.getMsg());
} }
@ -158,15 +159,28 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
ToolTip.FlyTocenter(this,"请输入正确手机号码"); ToolTip.FlyTocenter(this,"请输入正确手机号码");
}else { }else {
// 基本没错误,就要请求登陆了 // 基本没错误,就要请求登陆了
mName.setVisibility(View.INVISIBLE);
mPsw.setVisibility(View.INVISIBLE);
int mWidth = mBtnLogin.getMeasuredWidth();
int mHeight =mBtnLogin.getMeasuredHeight();
animatorSet = inputAnimator(mInputLayout, mWidth, mHeight);
new Thread(new Runnable() { new Thread(new Runnable() {
@Override @Override
public void run() { public void run() {
String argslogin = "phonenumber="+phonenumber+"&password="+password; String argslogin = "phonenumber="+phonenumber+"&password="+password;
ReturnData retuData = cmkgWebServiceGet.executeHttpGet(argslogin, publicStringUtil.loginURL); ReturnData retuData = cmkgWebServiceGet.executeHttpGet(argslogin, publicStringUtil.loginURL);
try {
Thread.sleep(2000);
} catch (InterruptedException e) {
e.printStackTrace();
}
Log.i("returndat--", "-----" + retuData); Log.i("returndat--", "-----" + retuData);
Message m = new Message(); Message m = new Message();
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putSerializable("msg",retuData); b.putSerializable("msg",retuData);
m.setData(b); m.setData(b);
loginHandler.sendMessage(m); loginHandler.sendMessage(m);
} }
@ -212,10 +226,11 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
ObjectAnimator animator2 = ObjectAnimator.ofFloat(mInputLayout, ObjectAnimator animator2 = ObjectAnimator.ofFloat(mInputLayout,
"scaleX", 1f, 0.5f); "scaleX", 1f, 0.5f);
set.setDuration(500); set.setDuration(500);
set.setInterpolator(new AccelerateDecelerateInterpolator()); set.setInterpolator(new AccelerateDecelerateInterpolator());
set.playTogether(animator, animator2); set.playTogether(animator,animator2);
set.start();
set.addListener(new Animator.AnimatorListener() { set.addListener(new Animator.AnimatorListener() {
@ -231,22 +246,27 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
@Override @Override
public void onAnimationEnd(Animator animation) { public void onAnimationEnd(Animator animation) {
/** Log.i("hkfd","End方法调用了");
*
*/
progress.setVisibility(View.VISIBLE); progress.setVisibility(View.VISIBLE);
// progress.setVisibility(View.GONE); // progress.setVisibility(View.GONE);
// progressAnimator(progress); progressAnimator(progress);
mInputLayout.setVisibility(View.INVISIBLE); mInputLayout.setVisibility(View.INVISIBLE);
/**
*
*/
} }
@Override @Override
public void onAnimationCancel(Animator animation) { public void onAnimationCancel(Animator animation) {
Log.i("jie","=====Cancle方法");
progress.setVisibility(View.GONE); progress.setVisibility(View.GONE);
recovery();
} }
}); });
set.start();
return set; return set;
} }
@ -257,7 +277,7 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
0.5f, 1f); 0.5f, 1f);
ObjectAnimator animator3 = ObjectAnimator.ofPropertyValuesHolder(view, ObjectAnimator animator3 = ObjectAnimator.ofPropertyValuesHolder(view,
animator, animator2); animator, animator2);
animator3.setDuration(1000); animator3.setDuration(500);
animator3.setInterpolator(new JellyInterpolator()); animator3.setInterpolator(new JellyInterpolator());
animator3.start(); animator3.start();
// animator3.cancel(); // animator3.cancel();
@ -265,7 +285,7 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
} }
//登录错误,恢复初始状态 //登录错误,恢复初始状态
private void recovery() { private void recovery() {
progress.setVisibility(View.GONE); progress.setVisibility(View.INVISIBLE);
mInputLayout.setVisibility(View.VISIBLE); mInputLayout.setVisibility(View.VISIBLE);
mName.setVisibility(View.VISIBLE); mName.setVisibility(View.VISIBLE);
mPsw.setVisibility(View.VISIBLE); mPsw.setVisibility(View.VISIBLE);
@ -277,7 +297,7 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
ObjectAnimator animator2 = ObjectAnimator.ofFloat(mInputLayout, "scaleX", 0.5f,1f ); ObjectAnimator animator2 = ObjectAnimator.ofFloat(mInputLayout, "scaleX", 0.5f,1f );
animator2.setDuration(500); animator2.setDuration(1000);
animator2.setInterpolator(new AccelerateDecelerateInterpolator()); animator2.setInterpolator(new AccelerateDecelerateInterpolator());
animator2.start(); animator2.start();
} }

@ -30,7 +30,7 @@ public class WebServicePost {
connection.setRequestMethod("POST"); connection.setRequestMethod("POST");
connection.setReadTimeout(8000); connection.setReadTimeout(8000);
connection.setUseCaches(false); connection.setUseCaches(false);
connection.setRequestProperty("Content-Type","application/x-www-form-urlencoded"); connection.setRequestProperty("Content-Type","application/json");
connection.connect(); connection.connect();
DataOutputStream out = new DataOutputStream(connection.getOutputStream()); DataOutputStream out = new DataOutputStream(connection.getOutputStream());
String data = "username="+ URLEncoder.encode(username,"UTF-8")+"&phonenumber="+URLEncoder.encode(phonenumber,"UTF-8")+"&password="+URLEncoder.encode(password,"UTF-8"); String data = "username="+ URLEncoder.encode(username,"UTF-8")+"&phonenumber="+URLEncoder.encode(phonenumber,"UTF-8")+"&password="+URLEncoder.encode(password,"UTF-8");

@ -33,7 +33,7 @@ public class cmkgWebServicePost {
connection.setRequestMethod("POST"); connection.setRequestMethod("POST");
connection.setReadTimeout(8000); connection.setReadTimeout(8000);
connection.setUseCaches(false); connection.setUseCaches(false);
connection.setRequestProperty("Content-Type","raw"); connection.setRequestProperty("Content-Type","application/json");
connection.connect(); connection.connect();
DataOutputStream out = new DataOutputStream(connection.getOutputStream()); DataOutputStream out = new DataOutputStream(connection.getOutputStream());
// String data = URLEncoder.encode(args, "UTF-8"); // String data = URLEncoder.encode(args, "UTF-8");

@ -3,7 +3,7 @@ package com.example.cmknowledgegraph;
import android.os.Bundle; import android.os.Bundle;
import com.example.PersonalCenter.PersonContent; import com.example.PersonalCenter.PersonContent;
import com.example.cmknowledgegraph.MainContent; //import com.example.cmknowledgegraph.MainContent;
import com.example.SearchCenter.SearchContent; import com.example.SearchCenter.SearchContent;
import com.google.android.material.bottomnavigation.BottomNavigationView; import com.google.android.material.bottomnavigation.BottomNavigationView;

Loading…
Cancel
Save