From 755aa6f3f818ff42a288a26af746b912a7c3f590 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 12 五月 2021 18:36:50 +0800
Subject: [PATCH] 特价新版UI改造
---
app/src/main/java/com/tejia/lijin/app/ui/mine/LoginSelectActivity.java | 203 +++++++++++++++++++++++++++++++-------------------
1 files changed, 126 insertions(+), 77 deletions(-)
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/mine/LoginSelectActivity.java b/app/src/main/java/com/tejia/lijin/app/ui/mine/LoginSelectActivity.java
index b6ea247..79420de 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/mine/LoginSelectActivity.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/mine/LoginSelectActivity.java
@@ -4,6 +4,7 @@
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
+import android.graphics.Color;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextWatcher;
@@ -15,8 +16,14 @@
import android.widget.TextView;
import android.widget.Toast;
+import com.androidquery.AQuery;
+import com.mobile.auth.gatewayauth.AuthUIConfig;
+import com.mobile.auth.gatewayauth.PhoneNumberAuthHelper;
+import com.mobile.auth.gatewayauth.TokenResultListener;
+import com.tejia.lijin.app.util.user.AliyunSmsOneKeyLoginManager;
import com.tencent.mm.opensdk.modelmsg.SendAuth;
import com.umeng.analytics.MobclickAgent;
+import com.wpc.library.util.common.DimenUtils;
import com.wpc.library.util.common.StringUtils;
import com.wpc.library.widget.PhoneNumberClearEditText;
import com.tejia.lijin.app.BasicTextHttpResponseHandler;
@@ -47,13 +54,12 @@
public final static int TYPE_LOGIN = 1;//鐧诲綍
public final static int TYPE_BIND = 2;//缁戝畾
public final static int TYPE_BIND_WITHOUT_LOGINED = 3;//鏈櫥褰曠粦瀹�
- private ImageView iv_close, iv_contact_kefu, iv_login_wechat;
- private TextView tv_user_agreement, tv_other_login, tv_mobile_hint, tv_privacy_policies,
- tv_login_top_hint, tv_mobile_type;
- FrameLayout fl_login_gain_sms;
+ private TextView tv_login_gain_sms, tv_user_agreement, tv_other_login, tv_privacy_policies,
+ tv_mobile_type;
private PhoneNumberClearEditText et_mobile_num;
LinearLayout ll_user_agreement;
private ImageView et_mobile_numimg;
+ private AQuery mAquery;
String uid;
boolean isWXLogin = false;
@@ -61,22 +67,81 @@
int type;
String key;//寰俊鐧诲綍灏氭湭缁戝畾鎵嬫満鏃跺洖浼犵殑鏍囪瘑
- private static String TAG="LoginSelectActivity";
+ private static String TAG = "LoginSelectActivity";
+
+ private AliyunSmsOneKeyLoginManager aliyunSmsOneKeyLoginManager;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_login_select);
+ mAquery = new AQuery(this);
TopStatusSettings.setStatusViewAndDeepColorNoView(this);
-// tv_user_agreement.getPaint().setFlags(Paint.UNDERLINE_TEXT_FLAG);
initData(getIntent());
String from = getIntent().getStringExtra("from");
UserCustomEvent.userLogin(this, StringUtils.isEmpty(from) ? "鍏跺畠" : from);
EventBus.getDefault().register(this);
+ aliyunSmsOneKeyLoginManager = new AliyunSmsOneKeyLoginManager(this, null);
+ aliyunSmsOneKeyLoginManager.init(new AliyunSmsOneKeyLoginManager.IOneKeyLoginListener() {
+
+ @Override
+ public void onFail(String st) {
+
+ }
+
+ @Override
+ public void onCancel() {
+
+ }
+
+ @Override
+ public void onEnvCheckSuccess() {
+
+ }
+
+ @Override
+ public void onStartAuthPageSuccess() {
+
+ }
+
+ @Override
+ public void onToken(String token) {
+
+ }
+ });
+ }
+
+ private synchronized void openOneKeyLogin(final boolean notify) {
+ ShoppingApi.allowOneKeyLogin(this, UserUtil.getLoginUid(this), new BasicTextHttpResponseHandler() {
+
+ @Override
+ public void onStart() {
+ DialogUtil.show(loadingDialog);
+ }
+
+ @Override
+ public void onSuccessPerfect(int statusCode, Header[] headers, JSONObject jsonObject) throws Exception {
+ if (jsonObject.optBoolean("IsPost")) {
+ aliyunSmsOneKeyLoginManager.checkEnv();
+ } else {
+ if (notify) {
+ Toast.makeText(PhoneLoginActivity.this, jsonObject.optString("Error"), Toast.LENGTH_SHORT).show();
+ }
+ }
+ }
+
+ @Override
+ public void onFinish() {
+ DialogUtil.dismiss(loadingDialog);
+ }
+ });
+
+
}
private void initData(Intent intent) {
- type =intent.getIntExtra("type", TYPE_LOGIN);
+ type = intent.getIntExtra("type", TYPE_LOGIN);
init(intent);
addListener();
}
@@ -84,7 +149,7 @@
@Override
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);
- Log.i(TAG,"onNewIntent");
+ Log.i(TAG, "onNewIntent");
initData(intent);
}
@@ -92,30 +157,19 @@
鍒濆鍖栨帶浠�
*/
private void init(Intent intent) {
- iv_close = findViewById(R.id.iv_close);
- iv_contact_kefu = findViewById(R.id.iv_contact_kefu);
- tv_mobile_hint = findViewById(R.id.tv_mobile_hint);
tv_user_agreement = findViewById(R.id.tv_user_agreement);
- iv_login_wechat = findViewById(R.id.iv_login_wechat);
- fl_login_gain_sms = findViewById(R.id.fl_login_gain_sms);
+ tv_login_gain_sms = findViewById(R.id.tv_login_gain_sms);
et_mobile_num = findViewById(R.id.et_mobile_num);
tv_other_login = findViewById(R.id.tv_other_login);
tv_privacy_policies = findViewById(R.id.tv_privacy_policies);
- tv_login_top_hint = findViewById(R.id.tv_login_top_hint);
tv_mobile_type = findViewById(R.id.tv_mobile_type);
ll_user_agreement = findViewById(R.id.ll_user_agreement);
et_mobile_numimg = findViewById(R.id.et_mobile_numimg);
et_mobile_numimg.setColorFilter(getResources().getColor(R.color.black));
-
- tv_mobile_hint.setTextColor(getResources().getColor(R.color.gray));
- tv_mobile_hint.setText(String.format("鏂扮殑鎵嬫満鍙峰繀椤绘病鏈夌粦瀹氳繃鍏朵粬%s甯愬彿",getResources().getString(R.string.app_name)));
-
- fl_login_gain_sms.setEnabled(false);
- fl_login_gain_sms.setBackgroundResource(R.drawable.shape_login_gain_sms);
SharedPreferences sp = getSharedPreferences("user", MODE_PRIVATE);
sp.edit().putBoolean("first", true).commit();
uid = intent.getStringExtra("uid");
- key =intent.getStringExtra("key");
+ key = intent.getStringExtra("key");
getUserConfig();
}
@@ -124,10 +178,6 @@
*/
private void addListener() {
tv_user_agreement.setOnClickListener(this);
- iv_close.setOnClickListener(this);
- iv_contact_kefu.setOnClickListener(this);
- fl_login_gain_sms.setOnClickListener(this);
- iv_login_wechat.setOnClickListener(this);
tv_other_login.setOnClickListener(this);
tv_privacy_policies.setOnClickListener(this);
et_mobile_num.addTextChangedListener(new TextWatcher() {
@@ -145,10 +195,6 @@
canSend = true;
}
}
-
- fl_login_gain_sms.setEnabled(canSend);
- fl_login_gain_sms.setBackgroundResource(canSend ?
- R.drawable.shape_mobile_login_light : R.drawable.shape_login_gain_sms);
}
@Override
@@ -163,37 +209,42 @@
@Override
protected void onResume() {
super.onResume();
- Log.i(TAG,"onResume");
+ Log.i(TAG, "onResume");
MobclickAgent.onResume(this);
- SharedPreferences sp = getSharedPreferences("user", MODE_PRIVATE);
- boolean isLogin = sp.getBoolean("isLogin", false);
+ boolean isLogin = UserUtil.isLogin(getApplicationContext());
if (isLogin) {//鐢ㄦ埛宸茬粡鐧诲綍
if (isWXLogin) {
finish();
return;
}
- tv_login_top_hint.setText("璇风粦瀹氫綘鐨勫父鐢ㄦ墜鏈哄彿");
-// tv_login_top_hint.setVisibility(View.INVISIBLE);
- ll_user_agreement.setVisibility(View.INVISIBLE);
- tv_other_login.setVisibility(View.INVISIBLE);
- iv_login_wechat.setVisibility(View.INVISIBLE);
- tv_mobile_type.setText("缁戝畾"+getResources().getString(R.string.app_name));
- tv_mobile_hint.setText(String.format("鏂扮殑鎵嬫満鍙峰繀椤绘病鏈夌粦瀹氳繃鍏朵粬%s甯愬彿",getResources().getString(R.string.app_name)));
- tv_mobile_hint.setVisibility(View.INVISIBLE);
- } else {
- if (type == TYPE_BIND_WITHOUT_LOGINED) {//鐢ㄦ埛灏氭湭鐧诲綍缁戝畾鐢佃瘽鍙风爜
- tv_login_top_hint.setText("璇风粦瀹氫綘鐨勫父鐢ㄦ墜鏈哄彿");
-// tv_login_top_hint.setVisibility(View.INVISIBLE);
-// ll_user_agreement.setVisibility(View.INVISIBLE);
- tv_other_login.setVisibility(View.INVISIBLE);
- iv_login_wechat.setVisibility(View.INVISIBLE);
- ll_user_agreement.setVisibility(View.INVISIBLE);
- tv_mobile_type.setText("缁戝畾"+getResources().getString(R.string.app_name));
- tv_mobile_hint.setText(String.format("鏂扮殑鎵嬫満鍙峰繀椤绘病鏈夌粦瀹氳繃鍏朵粬%s甯愬彿",getResources().getString(R.string.app_name)));
- tv_mobile_hint.setVisibility(View.INVISIBLE);
- }
}
+ initView(type);
}
+
+
+ private void initView(int type) {
+ switch (type) {
+ case TYPE_LOGIN:
+ mAquery.id(R.id.iv_login_mark).visibility(View.VISIBLE);
+ mAquery.id(R.id.tv_bind_mark).visibility(View.GONE);
+ mAquery.id(R.id.tv_other_login).visibility(View.VISIBLE);
+ mAquery.id(R.id.ll_other_login).visibility(View.VISIBLE);
+ mAquery.id(R.id.tv_login_onekey).text("鏈満鍙风爜涓�閿櫥褰�");
+ mAquery.id(R.id.tv_mobile_hint).text(String.format("鏂扮殑鎵嬫満鍙峰繀椤绘病鏈夌粦瀹氳繃鍏朵粬%s甯愬彿", getResources().getString(R.string.app_name)));
+ break;
+ case TYPE_BIND:
+ case TYPE_BIND_WITHOUT_LOGINED:
+ mAquery.id(R.id.iv_login_mark).visibility(View.GONE);
+ mAquery.id(R.id.tv_bind_mark).visibility(View.VISIBLE);
+ mAquery.id(R.id.tv_other_login).visibility(View.GONE);
+ mAquery.id(R.id.ll_other_login).visibility(View.GONE);
+ mAquery.id(R.id.tv_login_onekey).text("鏈満鍙风爜涓�閿粦瀹�");
+ mAquery.id(R.id.tv_mobile_hint).text(String.format("鏂扮殑鎵嬫満鍙峰繀椤绘病鏈夌粦瀹氳繃鍏朵粬%s甯愬彿", getResources().getString(R.string.app_name)));
+ break;
+ }
+
+ }
+
@Override
public void onClick(View view) {
@@ -204,14 +255,7 @@
case R.id.iv_contact_kefu:
KeFuUtil.jumpKeFu(LoginSelectActivity.this, "鐧诲綍");
break;
- case R.id.tv_other_login:
- tv_other_login.setCompoundDrawablesWithIntrinsicBounds(0, 0,
- iv_login_wechat.getVisibility() == View.VISIBLE ?
- R.drawable.ic_other_login_close :
- R.drawable.ic_other_login_open, 0);
- iv_login_wechat.setVisibility(iv_login_wechat.getVisibility() == View.VISIBLE
- ? View.INVISIBLE : View.VISIBLE);
- break;
+
case R.id.tv_user_agreement:
UserCustomEvent.userLoginProtocol(LoginSelectActivity.this);
if (StringUtils.isEmpty(serviceProtocolLink))
@@ -220,9 +264,6 @@
intent.putExtra("url", serviceProtocolLink);
startActivity(intent);
break;
- //闅愮鏀跨瓥
-// serviceProtocolLink = jsonObject.optJSONObject("data").optString("serviceProtocolLink");
-// privacyProtocolLink = jsonObject.optJSONObject("data").optString("privacyProtocolLink");
case R.id.tv_privacy_policies:
UserCustomEvent.userLoginProtocol(LoginSelectActivity.this);
if (StringUtils.isEmpty(privacyProtocolLink))
@@ -231,7 +272,7 @@
intent1.putExtra("url", privacyProtocolLink);
startActivity(intent1);
break;
- case R.id.iv_login_wechat:
+ case R.id.tv_login_wx:
UserCustomEvent.userLoginWeixin(LoginSelectActivity.this);
if (ShoppingApplication.application.mWxApi.isWXAppInstalled()) {
isWXLogin = true;
@@ -243,8 +284,12 @@
Toast.makeText(LoginSelectActivity.this, "璇峰厛瀹夎寰俊瀹㈡埛绔�", Toast.LENGTH_SHORT).show();
}
break;
- case R.id.fl_login_gain_sms:
- fl_login_gain_sms.setEnabled(false);
+ case R.id.tv_login_qq:
+ //TODO QQ鐧诲綍
+
+ break;
+ case R.id.tv_login_gain_sms:
+ tv_login_gain_sms.setEnabled(false);
UserCustomEvent.userLoginSms(LoginSelectActivity.this);
isWXLogin = false;
if (type == TYPE_BIND || type == TYPE_BIND_WITHOUT_LOGINED) {
@@ -252,6 +297,10 @@
} else if (type == TYPE_LOGIN) {
getVerificationCode();
}
+ break;
+
+ case R.id.tv_login_onekey:
+ //TODO 涓�閿櫥褰�
break;
}
}
@@ -287,8 +336,8 @@
@Override
public void onSuccessPerfect(int statusCode, Header[] headers, JSONObject jsonObject) throws Exception {
if (jsonObject.optString("code").equalsIgnoreCase("0")) {
- tv_mobile_hint.setTextColor(getResources().getColor(R.color.gray));
- tv_mobile_hint.setText(String.format("鏂扮殑鎵嬫満鍙峰繀椤绘病鏈夌粦瀹氳繃鍏朵粬%s甯愬彿",getResources().getString(R.string.app_name)));
+ mAquery.id(R.id.tv_mobile_hint).textColorId(R.color.gray);
+ mAquery.id(R.id.tv_mobile_hint).text(String.format("鏂扮殑鎵嬫満鍙峰繀椤绘病鏈夌粦瀹氳繃鍏朵粬%s甯愬彿", getResources().getString(R.string.app_name)));
Intent intent = new Intent(LoginSelectActivity.this, LoginVerifyCodeActivity.class);
intent.putExtra("title", "鐧诲綍");
@@ -320,8 +369,8 @@
}
}).create().show();
} else {
- tv_mobile_hint.setTextColor(getResources().getColor(R.color.detail_sharelist_reward_num));
- tv_mobile_hint.setText(jsonObject.optString("msg"));
+ mAquery.id(R.id.tv_mobile_hint).textColorId(R.color.detail_sharelist_reward_num);
+ mAquery.id(R.id.tv_mobile_hint).text(jsonObject.optString("msg"));
Toast.makeText(LoginSelectActivity.this, jsonObject.optString("msg"), Toast.LENGTH_SHORT).show();
}
}
@@ -329,7 +378,7 @@
@Override
public void onFinish() {
super.onFinish();
- fl_login_gain_sms.setEnabled(true);
+ tv_login_gain_sms.setEnabled(true);
pd.dismiss();
}
});
@@ -344,12 +393,12 @@
}
pd.show();
final String mobileNum = et_mobile_num.getText().toString().trim();
- ShoppingApi.sendMSMBind(LoginSelectActivity.this, slideVerify + "", mobileNum,UserUtil.getUid(getApplicationContext()), new BasicTextHttpResponseHandler() {
+ ShoppingApi.sendMSMBind(LoginSelectActivity.this, slideVerify + "", mobileNum, UserUtil.getUid(getApplicationContext()), new BasicTextHttpResponseHandler() {
@Override
public void onSuccessPerfect(int statusCode, Header[] headers, JSONObject jsonObject) throws Exception {
if (jsonObject.optString("code").equalsIgnoreCase("0")) {
- tv_mobile_hint.setTextColor(getResources().getColor(R.color.gray));
- tv_mobile_hint.setText(String.format("鏂扮殑鎵嬫満鍙峰繀椤绘病鏈夌粦瀹氳繃鍏朵粬%s甯愬彿",getResources().getString(R.string.app_name)));
+ mAquery.id(R.id.tv_mobile_hint).textColorId(R.color.gray);
+ mAquery.id(R.id.tv_mobile_hint).text(String.format("鏂扮殑鎵嬫満鍙峰繀椤绘病鏈夌粦瀹氳繃鍏朵粬%s甯愬彿", getResources().getString(R.string.app_name)));
Intent intent = new Intent(LoginSelectActivity.this, LoginVerifyCodeActivity.class);
intent.putExtra("title", "缁戝畾");
intent.putExtra("uid", uid);
@@ -392,8 +441,8 @@
}
}).create().show();
} else {
- tv_mobile_hint.setTextColor(getResources().getColor(R.color.detail_sharelist_reward_num));
- tv_mobile_hint.setText(jsonObject.optString("msg"));
+ mAquery.id(R.id.tv_mobile_hint).textColorId(R.color.detail_sharelist_reward_num);
+ mAquery.id(R.id.tv_mobile_hint).text(jsonObject.optString("msg"));
Toast.makeText(LoginSelectActivity.this, jsonObject.optString("msg"), Toast.LENGTH_SHORT).show();
}
}
@@ -401,7 +450,7 @@
@Override
public void onFinish() {
super.onFinish();
- fl_login_gain_sms.setEnabled(true);
+ tv_login_gain_sms.setEnabled(true);
if (pd.isShowing())
pd.dismiss();
}
--
Gitblit v1.8.0