代码优化

app/src/main/java/com/electric/chargingpile/activity/LoginActivity.java

@@ -12,6 +12,7 @@ import android.view.inputmethod.InputMethodManager;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
@@ -41,7 +42,9 @@ import okhttp3.Call;
public class LoginActivity extends Activity implements View.OnClickListener {
    private static final String TAG = "LoginActivity";
    private EditText phone, password;
    private TextView login, forgetPassword, newUser;
    private TextView login, forgetPassword, newUser, tv_xieyi, tv_yinsi;
    ImageView iv_tongyi;
    LinearLayout ll_tongyi;
    private ImageView back;
    private Button btn_clear, username_clear;
    InputMethodManager imm;
@@ -57,6 +60,7 @@ public class LoginActivity extends Activity implements View.OnClickListener {
    String encode_token;
    Context mContext;
    public static final int RESULT_SUCCESS = 0;
    private Boolean flag = true;
    public void createDialog() {
        if (pd_info == null) {
@@ -193,6 +197,16 @@ public class LoginActivity extends Activity implements View.OnClickListener {
        username_clear.setOnClickListener(this);
        imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
        sp();
        tv_yinsi = findViewById(R.id.tv_yinsi);
        tv_yinsi.setOnClickListener(this);
        tv_xieyi = findViewById(R.id.tv_xieyi);
        tv_xieyi.setOnClickListener(this);
        ll_tongyi = (LinearLayout) findViewById(R.id.ll_tongyi);
        ll_tongyi.setOnClickListener(this);
        iv_tongyi = (ImageView) findViewById(R.id.iv_tongyi);
    }
    private void sp() {
@@ -231,7 +245,31 @@ public class LoginActivity extends Activity implements View.OnClickListener {
            case R.id.username_clear:
                phone.setText("");
                break;
            case R.id.tv_xieyi:
                Intent xieyiintent = new Intent(getApplication(), MyWebViewActivity.class);
                xieyiintent.putExtra("url", "http://evcharge.cc/activity/user-proto.html");
                startActivity(xieyiintent);
                break;
            case R.id.tv_yinsi:
                Intent yinsintent = new Intent(getApplication(), MyWebViewActivity.class);
                yinsintent.putExtra("url", "http://evcharge.cc/pc/privacy.html");
                startActivity(yinsintent);
                break;
            case R.id.ll_tongyi:
                if (flag) {
                    iv_tongyi.setImageResource(R.drawable.icon_login_select);
                    flag = false;
                    login.setBackgroundResource(R.drawable.textview_1green);
                    login.setEnabled(false);
                } else {
                    iv_tongyi.setImageResource(R.drawable.icon_login_selected);
                    flag = true;
                    if (!phone.getText().toString().equals("") && !password.getText().toString().equals("")) {
                        login.setBackgroundResource(R.drawable.textview_greenstyle);
                        login.setEnabled(true);
                    }
                }
        }
    }
@@ -242,9 +280,15 @@ public class LoginActivity extends Activity implements View.OnClickListener {
        } else if (!CheckMobileNum.isMobileNum(phone.getText().toString())) {
            Toast.makeText(this, "手机号码错误,您输入的是一个无效手机号码", Toast.LENGTH_SHORT).show();
            return;
        } else if (!flag) {
            Toast.makeText(this, "请勾选协议与隐私政策", Toast.LENGTH_SHORT).show();
            login.setEnabled(false);
            login.setBackgroundResource(R.drawable.textview_1green);
        } else {
            createDialog();
            getUserInfo();
            login.setEnabled(true);
            login.setBackgroundResource(R.drawable.textview_greenstyle);
        }
    }

app/src/main/java/com/electric/chargingpile/activity/PermissionAgreementActivity.java

@@ -83,43 +83,56 @@ public class PermissionAgreementActivity extends Activity implements EasyPermiss
    @Override
    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
        EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
//        EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
        if (requestCode == RC_PHONE_PERM) {
            requestStoragePermission();
        } else if (requestCode == RC_STORAGE_PERM) {
            startActivity(new Intent(PermissionAgreementActivity.this, WelcomeActivity.class));
            finish();
        }
    }
    @Override
    public void onPermissionsGranted(int requestCode, List<String> perms) {
//        if (requestCode == RC_PHONE_PERM) {
//            requestStoragePermission();
//        } else if (requestCode == RC_STORAGE_PERM) {
//            startActivity(new Intent(PermissionAgreementActivity.this, WelcomeActivity.class));
//            finish();
//        }
    }
    @Override
    public void onPermissionsDenied(int requestCode, List<String> perms) {
        if (requestCode == RC_PHONE_PERM) {
            new AlertDialogCommon(PermissionAgreementActivity.this).builder()
                    .setMsg("为保证您正常、安全的使用充电桩，需要获取您的电话使用权限，是否前往开启?")
                    .setPositiveButton("去开启", new View.OnClickListener() {
                        @Override
                        public void onClick(View v) {
                            SystemTypeUtil.goToPermissionManager(PermissionAgreementActivity.this);
                        }
                    }).setNegativeButton("取消", new View.OnClickListener() {
                @Override
                public void onClick(View v) {
                    android.os.Process.killProcess(android.os.Process.myPid());
                }
            }).show();
//            requestStoragePermission();
//            new AlertDialogCommon(PermissionAgreementActivity.this).builder()
//                    .setMsg("为保证您正常、安全的使用充电桩，需要获取您的电话使用权限，是否前往开启?")
//                    .setPositiveButton("去开启", new View.OnClickListener() {
//                        @Override
//                        public void onClick(View v) {
//                            SystemTypeUtil.goToPermissionManager(PermissionAgreementActivity.this);
//                        }
//                    }).setNegativeButton("取消", new View.OnClickListener() {
//                @Override
//                public void onClick(View v) {
//                }
//            }).show();
        } else if (requestCode == RC_STORAGE_PERM) {
            new AlertDialogCommon(PermissionAgreementActivity.this).builder()
                    .setMsg("为保证您正常、安全的使用充电桩，需要获取您的存储权限，是否前往开启?")
                    .setPositiveButton("去开启", new View.OnClickListener() {
                        @Override
                        public void onClick(View v) {
                            SystemTypeUtil.goToPermissionManager(PermissionAgreementActivity.this);
                        }
                    }).setNegativeButton("取消", new View.OnClickListener() {
                @Override
                public void onClick(View v) {
                    android.os.Process.killProcess(android.os.Process.myPid());
                }
            }).show();
//            startActivity(new Intent(PermissionAgreementActivity.this, WelcomeActivity.class));
//            finish();
//            new AlertDialogCommon(PermissionAgreementActivity.this).builder()
//                    .setMsg("为保证您正常、安全的使用充电桩，需要获取您的存储权限，是否前往开启?")
//                    .setPositiveButton("去开启", new View.OnClickListener() {
//                        @Override
//                        public void onClick(View v) {
//                            SystemTypeUtil.goToPermissionManager(PermissionAgreementActivity.this);
//                        }
//                    }).setNegativeButton("取消", new View.OnClickListener() {
//                @Override
//                public void onClick(View v) {
//                }
//            }).show();
        }
    }

app/src/main/java/com/electric/chargingpile/activity/RegisterActivity.java

@@ -360,7 +360,7 @@ public class RegisterActivity extends Activity implements OnClickListener {
                if (checkTextSubmit()) {
                    if (!flag) {
//                        Toast.makeText(this, "请勾选保密协议", Toast.LENGTH_SHORT).show();
                        Toast.makeText(this, "请勾选协议与隐私政策", Toast.LENGTH_SHORT).show();
                        tvSure.setEnabled(false);
                        tvSure.setBackgroundResource(R.drawable.textview_1green);

app/src/main/res/layout/activity_login.xml

@@ -132,6 +132,64 @@
        </com.zhy.autolayout.AutoLinearLayout>
        <com.zhy.autolayout.AutoLinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:background="@color/white"
            android:orientation="vertical">
            <com.zhy.autolayout.AutoLinearLayout
                android:id="@+id/ll_tongyi"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:orientation="horizontal"
                android:layout_marginTop="20dp"
                android:layout_gravity="left">
                <ImageView
                    android:id="@+id/iv_tongyi"
                    android:layout_width="48px"
                    android:layout_height="48px"
                    android:src="@drawable/icon_login_selected"
                    android:layout_gravity="center"
                    android:layout_marginLeft="58px"
                    android:layout_marginBottom="1dp"/>
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="登录即代表您同意"
                    android:textSize="13sp"
                    android:textColor="@color/ui_69"
                    android:layout_marginLeft="10px"
                    android:layout_marginBottom="1dp"
                    android:layout_gravity="center" />
            </com.zhy.autolayout.AutoLinearLayout>
            <TextView
                android:id="@+id/tv_xieyi"
                android:layout_marginTop="5dp"
                android:layout_marginLeft="64px"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:text="《充电桩APP用户使用协议》"
                android:textColor="#3190e8"
                android:textSize="13sp"
                android:layout_gravity="center"
                android:layout_marginBottom="1dp"/>
            <TextView
                android:id="@+id/tv_yinsi"
                android:layout_marginTop="5dp"
                android:layout_marginLeft="64px"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:text="《充电桩隐私政策》"
                android:textColor="#3190e8"
                android:textSize="13sp"
                android:layout_gravity="center"
                android:layout_marginBottom="1dp"/>
        </com.zhy.autolayout.AutoLinearLayout>
        <TextView
            android:id="@+id/tv_userLogin"