Prechádzať zdrojové kódy

一个手机只能使用一个账号

詹子聪 6 rokov pred
rodič
commit
de204bb54d

+ 12 - 9
app/src/main/java/com/miekir/eden/ui/mine/login/LoginActivity.java

@@ -2,6 +2,7 @@ package com.miekir.eden.ui.mine.login;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.provider.Settings;
 import android.text.TextUtils;
 import android.view.View;
 
@@ -22,7 +23,7 @@ import com.miekir.mvp.presenter.InjectPresenter;
  * Description: 登录界面
  */
 public class LoginActivity extends BaseBeiActivity implements View.OnClickListener, ILoginView {
-    private TextInputEditText et_email;
+    //private TextInputEditText et_email;
     private TextInputEditText et_password;
 
     @InjectPresenter
@@ -36,14 +37,14 @@ public class LoginActivity extends BaseBeiActivity implements View.OnClickListen
     @Override
     public void initViews(Bundle savedInstanceState) {
         setTitle("伊甸园登录", false);
-        et_email = findViewById(R.id.et_email);
+        //et_email = findViewById(R.id.et_email);
         et_password = findViewById(R.id.et_password);
         ViewTool.setOnClickListener(this, this, new int[]{R.id.btn_login, R.id.tv_forget});
 
-        BeiUser user = UserInfoManager.getInstance().getBeiUser();
-        if (user != null && !TextUtils.isEmpty(user.email)) {
-            et_email.setText(user.email);
-        }
+        //BeiUser user = UserInfoManager.getInstance().getBeiUser();
+        //if (user != null && !TextUtils.isEmpty(user.email)) {
+        //    et_email.setText(user.email);
+        //}
     }
 
     @Override
@@ -54,10 +55,11 @@ public class LoginActivity extends BaseBeiActivity implements View.OnClickListen
                 break;
 
             case R.id.btn_login:
-                String email = et_email.getEditableText().toString();
+                //String email = et_email.getEditableText().toString();
+                String email = Settings.Secure.getString(getContentResolver(), Settings.Secure.ANDROID_ID);
                 String password = et_password.getEditableText().toString();
                 if (TextUtils.isEmpty(email)) {
-                    ToastTool.showShort("账号不能为空");
+                    ToastTool.showShort("暂不支持本手机");
                     return;
                 }
                 if (TextUtils.isEmpty(password)) {
@@ -66,7 +68,8 @@ public class LoginActivity extends BaseBeiActivity implements View.OnClickListen
                 }
 
                 password = StringTool.getEncodeString(password);
-                if (TextUtils.isEmpty(password)) {
+                email = StringTool.getEncodeString(email);
+                if (TextUtils.isEmpty(email) || TextUtils.isEmpty(password)) {
                     ToastTool.showShort("该手机不支持加密算法");
                     return;
                 }

+ 2 - 1
app/src/main/java/com/miekir/eden/ui/welcome/WelcomeActivity.java

@@ -34,7 +34,8 @@ public class WelcomeActivity extends BaseBeiActivity implements ILoginView {
 
     @Override
     public void initViews(Bundle savedInstanceState) {
-
+        //String uniqueID = UUID.randomUUID().toString();
+        //Log.e(WelcomeActivity.class.getName(), "ID: " + androidId);
     }
 
     @Override

+ 3 - 2
app/src/main/res/layout/activity_login.xml

@@ -26,7 +26,8 @@
         app:boxCornerRadiusTopStart="4dp"
         app:boxStrokeWidth="@dimen/width_stroke"
         app:boxStrokeWidthFocused="@dimen/width_stroke"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+        android:visibility="gone">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/et_email"
@@ -44,7 +45,7 @@
         android:layout_marginStart="@dimen/margin_default"
         android:layout_marginEnd="@dimen/margin_default"
         android:layout_marginTop="@dimen/margin_default"
-        android:hint="请输入密码"
+        android:hint="请输入并牢记本机密码"
         app:boxBackgroundMode="outline"
         app:boxCornerRadiusBottomEnd="4dp"
         app:boxCornerRadiusBottomStart="4dp"

+ 12 - 1
app/src/main/res/layout/fragment_about.xml

@@ -43,6 +43,16 @@
             android:textStyle="bold" />
     </LinearLayout>
 
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="@dimen/margin_default"
+        android:paddingEnd="@dimen/margin_default"
+        android:text="注意:会员仅限本手机使用,请牢记首次进入APP时设置的密码。不要轻易对本机进行刷机、root等操作,请勿重复卸载安装本应用,否则可能造成会员失效。"
+        android:textColor="@color/red_2"
+        android:textSize="@dimen/text_normal"
+        android:layout_marginTop="@dimen/margin_s"/>
+
     <TextView
         android:id="@+id/tv_desc"
         android:layout_width="match_parent"
@@ -51,7 +61,8 @@
         android:paddingEnd="@dimen/margin_default"
         android:text="点击下方的“立即激活”进行转账,备注当前要升级的账号(非常重要),退出应用稍等片刻重新打开APP,即可完成激活。一定要在备注填写需要激活的账号,否则无法完成激活。"
         android:textColor="@color/black_droid_text"
-        android:textSize="@dimen/text_normal" />
+        android:textSize="@dimen/text_normal"
+        android:layout_marginTop="@dimen/margin_s"/>
 
     <TextView
         android:id="@+id/tv_feedback"