From 58a4a54c62c65cab92c85fd3edeff832e4572ead Mon Sep 17 00:00:00 2001
From: nilupeng <qingingrunt2010@qq.com>
Date: Tue, 09 Aug 2022 10:59:47 +0000
Subject: [PATCH] gson 转换日期问题 接入登录接口 修改图标和启动页

---
 app/src/main/java/com/runt/open/mvvm/ui/login/RegisterLoginActivity.java |   35 +++++++++++++++++------------------
 1 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/runt/open/mvvm/ui/login/RegisterLoginActivity.java b/app/src/main/java/com/runt/open/mvvm/ui/login/RegisterLoginActivity.java
index 224b886..eb3eb99 100644
--- a/app/src/main/java/com/runt/open/mvvm/ui/login/RegisterLoginActivity.java
+++ b/app/src/main/java/com/runt/open/mvvm/ui/login/RegisterLoginActivity.java
@@ -34,29 +34,28 @@
         mBinding.txtLogin.setOnClickListener(onclick);
         mBinding.txtRegister.setOnClickListener(onclick);
         mBinding.txtPrivacy.setOnClickListener(onclick);
+        mBinding.button.setOnClickListener(onclick);
         mBinding.editPhone.setText(getStringProjectPrefrence(Configuration.KEY_USERNAME));
-        mViewModel.getVerifyResult().observe(this, stringApiResult -> {
-           if(stringApiResult.code == 200){
-
+        mViewModel.getVerifyResult().observe(this, result -> {
+           if(result == 0){
+               putLongProjectPrefrence(VERIFY_CODE,new Date().getTime());
+               CodeTimer codeTimer = new CodeTimer(60000, 1000, mBinding.txtGetVerify);
+               codeTimer.startUp();
            }else{
-               showToast(stringApiResult.msg);
+
            }
         });
         mViewModel.getLoginResult().observe(this, loggedInUser -> {
-            if(loggedInUser.code == 200){
-                putBooleanProjectPrefrence(Configuration.IS_LOGIN,true);
-                putStringProjectPrefrence(Configuration.KEY_USERNAME, mBinding.editPhone.getText().toString());
+            putBooleanProjectPrefrence(Configuration.IS_LOGIN,true);
+            putStringProjectPrefrence(Configuration.KEY_USERNAME, mBinding.editPhone.getText().toString());
 
-                UserBean user = new Gson().fromJson(new Gson().toJson(loggedInUser.data) ,UserBean.class);
-                UserBean.setUser(user);
-                putStringProjectPrefrence(Configuration.KEY_TOKEN, user.getToken());
-                MyLog.i("registerlogin",user.toString());
-                showToast(R.string.login_success);
-                setResult(RESULT_CODE_SUCESS);
-                finish();
-            }else{
-                showToast(loggedInUser.msg);
-            }
+            UserBean user = new Gson().fromJson(new Gson().toJson(loggedInUser) ,UserBean.class);
+            UserBean.setUser(user);
+            putStringProjectPrefrence(Configuration.KEY_TOKEN, user.getToken());
+            MyLog.i("registerlogin",user.toString());
+            showToast(R.string.login_success);
+            setResult(RESULT_CODE_SUCESS);
+            finish();
         });
     }
 
@@ -65,7 +64,7 @@
         long getTime = getLongProjectPrefrence(VERIFY_CODE);
         long cha = new Date().getTime() - getTime;
         if(cha <1000*60){
-            CodeTimer codeTimer = new CodeTimer(cha, 1000, mBinding.txtGetVerify);
+            CodeTimer codeTimer = new CodeTimer((60) * 1000-cha, 1000, mBinding.txtGetVerify);
             codeTimer.startUp();
         }
         changeView();

--
Gitblit v1.9.1