修改bug

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

@@ -10,6 +10,7 @@ import android.text.Editable;
import android.text.TextWatcher;
import android.view.View;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
@@ -68,6 +69,7 @@ public class ChargingPileActivity extends AppCompatActivity implements EasyPermi
    private static final int RC_TELL_PERM = 124;
    private static final int startInterface = 2;
    private static final String numType = "2";
    private ImageView iv_back;
    @Override
    protected void onCreate(@Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
@@ -87,19 +89,23 @@ public class ChargingPileActivity extends AppCompatActivity implements EasyPermi
        rootView = findViewById(R.id.rootView);
        rvHistory = findViewById(R.id.rvHistory);
        tvCoding = findViewById(R.id.tvCoding);
        iv_back = findViewById(R.id.iv_back);
        alertDialog = new AlertDialogTwo(this);
        loadingDialog = new LoadingDialog(this);
        loadingDialog.setCanceledOnTouchOutside(false);
        tvCoding.setText("充电桩编码："+pileId);
    }
    private void initOnClick() {
        rvHistory.setLayoutManager(new GridLayoutManager(this,3));
        mAdapter = new LicensePlateHistoryAdapter();
        mAdapter.setListener(str->{
            mDialog.setLicensePlate(str);
            mDialog.show(getSupportFragmentManager());
            editText.setText(str);
            editText.setSelection(str.length());
        });
        rvHistory.setAdapter(mAdapter);
        mAdapter.setList();
@@ -111,6 +117,10 @@ public class ChargingPileActivity extends AppCompatActivity implements EasyPermi
            mAdapter.setList();
        });
        iv_back.setOnClickListener(v->{
            finish();
        });
        tvStartCharge.setOnClickListener(v->{
            String str = editText.getText().toString();
            if (str.equals("")){
@@ -137,7 +147,7 @@ public class ChargingPileActivity extends AppCompatActivity implements EasyPermi
        kingKeyboard = new KingKeyboard(this,mKeyboardParent);
        //然后将EditText注册到KingKeyboard即可
        kingKeyboard.setBringToFront(true);
        kingKeyboard.register(editText, KingKeyboard.KeyboardType.LICENSE_PLATE_PROVINCE);
        kingKeyboard.register(editText, KingKeyboard.KeyboardType.LICENSE_PLATE);
        editText.addTextChangedListener(new TextWatcher() {
            @Override
@@ -149,11 +159,11 @@ public class ChargingPileActivity extends AppCompatActivity implements EasyPermi
            public void onTextChanged(CharSequence s, int start, int before, int count) {
                int length = s.toString().length();
                if (length == 0){
                    if(kingKeyboard.getKeyboardType() != KingKeyboard.KeyboardType.LICENSE_PLATE_PROVINCE){
                    if(kingKeyboard.getKeyboardType() != KingKeyboard.KeyboardType.LICENSE_PLATE){
                        kingKeyboard.sendKey(KingKeyboard.KEYCODE_BACK);
                    }
                }else if (length == 1){
                    if(beforeCount == 0 && kingKeyboard.getKeyboardType() == KingKeyboard.KeyboardType.LICENSE_PLATE_PROVINCE){
                    if(beforeCount == 0 && kingKeyboard.getKeyboardType() == KingKeyboard.KeyboardType.LICENSE_PLATE){
                        kingKeyboard.sendKey(KingKeyboard.KEYCODE_MODE_CHANGE);
                    }
                }else if (length >= 8){

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

@@ -230,7 +230,7 @@ public class ConfirmOrderActivity extends AppCompatActivity implements View.OnCl
    }
    private void  requestComment() {
        if (this != null && !this.isFinishing()) {
        if (this != null && !this.isFinishing() && !mDialog.isShowing()) {
            mDialog.show();
        }
      //  Log.e("TAG_hcy", "requestComment: "+mRedEnvelopeId);
@@ -270,6 +270,10 @@ public class ConfirmOrderActivity extends AppCompatActivity implements View.OnCl
    }
    private void pollingChargingStats() {
        try_count++;
        if (this != null && !isFinishing() && !mDialog.isShowing()) {
            mDialog.show();
        }
        OkHttpUtils.get().url(UrlConstants.CHARGING_STATUS_URL)
                .addParams(com.electric.chargingpile.constant.ChargingConstants.USERID, MainApplication.userId)
                .addParams(com.electric.chargingpile.constant.ChargingConstants.PWD, MainApplication.userPassword)
@@ -281,8 +285,8 @@ public class ConfirmOrderActivity extends AppCompatActivity implements View.OnCl
                .execute(new StringCallback() {
                    @Override
                    public void onError(Call call, Exception e) {
//                        dismissDialog();
//                        ToastUtil.showToast(getApplicationContext(),"网络异常，请检查您的网络连接",Toast.LENGTH_SHORT);
                        dismissDialog();
                        ToastUtil.showToast(getApplicationContext(),"网络异常，请检查您的网络连接",Toast.LENGTH_SHORT);
                        CrashReport.postCatchedException(e);
                    }
@@ -335,8 +339,8 @@ public class ConfirmOrderActivity extends AppCompatActivity implements View.OnCl
                                startActivity(new Intent(getApplicationContext(), DelayInfoActivity.class));
                                finish();
                            } else {
//                                dismissDialog();
//                                ToastUtil.showToast(getApplicationContext(),rtnMsg,Toast.LENGTH_SHORT);
                                dismissDialog();
                                ToastUtil.showToast(getApplicationContext(),rtnMsg,Toast.LENGTH_SHORT);
                            }
                        }
                    }

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

@@ -498,8 +498,8 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                                if (key.length - 1 > 2) {
                                    permissionTask();
                                } else {
//                                    dialogup();
                                    permissionTask();
                                    dialogup();
//                                    permissionTask();
                                }
                            }

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

@@ -282,6 +282,7 @@ public class MyWebViewActivity extends Activity implements PlatformActionListene
        runOnUiThread(new Runnable() {
            @Override
            public void run() {
                Log.e(TAG, "hyc run: "+show);
                if (show.equals("yes")) {
                    tv_webShare.setVisibility(View.VISIBLE);
                    tv_webShare.setText("分享");
@@ -1315,6 +1316,7 @@ public class MyWebViewActivity extends Activity implements PlatformActionListene
                WebBackForwardList mWebBackForwardList = webView.copyBackForwardList();
                Log.e("tag", "mWebBackForwardList.getSize() " + mWebBackForwardList.getSize());
                if (webView.canGoBack()) {
                    showsharebtn("no");
                    webView.goBack();
                    iv_webClose.setVisibility(View.VISIBLE);
                } else {

app/src/main/java/com/electric/chargingpile/application/MainApplication.java

@@ -100,13 +100,13 @@ public class MainApplication extends MultiDexApplication implements CameraXConfi
    public static String firstPoint = "";
    public static Boolean firstSsyd;
    public static String password = "";
    public static String url = "http://59.110.68.162";// 充电桩测试环境
    public static String pic_url = "http://59.110.68.162/zhannew/uploadfile/";
//    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
//    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
//    public static String url = "http://59.110.68.162";// 充电桩测试环境
//    public static String pic_url = "http://59.110.68.162/zhannew/uploadfile/";
    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
        public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
//    public static String urlNew = "https://api.touchev.com:83/api/0300";// 一电正式环境
//        public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
    public static String urlNew = "https://api.touchev.com:83/api/0300";// 一电正式环境
    public static String d1evUrl = "https://d1ev-new.yiduyongche.com";// 评论上传视频
    public static String CDN = "https://cdn-fs.d1ev.com";

app/src/main/java/com/electric/chargingpile/data/ChargingBean.java

@@ -21,6 +21,7 @@ public class ChargingBean implements Serializable {
     * status : 充电中
     * endInfo : 手动结束
     * zhanname : 自定义站
     * plate_number : 车牌号
     */
    private String orderId;

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

@@ -131,7 +131,7 @@
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginTop="12dp"
            android:text="*输入正确车牌号充电结束可获取停车优惠（注意大写）"
            android:text="*输入正确车牌号充电结束可减免最多两小时停车费用（注意大写）"
            android:textColor="#ff3ec34c"
            android:textSize="12sp"
            app:layout_constraintStart_toStartOf="parent"

zxing/src/main/java/com/google/zxing/client/android/constant/UrlConstants.java

@@ -1,8 +1,8 @@
package com.google.zxing.client.android.constant;
public interface UrlConstants {
//    String HOST_URL = "http://cdz.evcharge.cc/zhannew/basic/web/index.php/";
    String HOST_URL = "http://59.110.68.162/zhannew/basic/web/index.php/"; //测试链接
    String HOST_URL = "http://cdz.evcharge.cc/zhannew/basic/web/index.php/";
//    String HOST_URL = "http://59.110.68.162/zhannew/basic/web/index.php/"; //测试链接
    String USER_CHARGING_CHECK_URL = HOST_URL + "api/charge/check-user";
    String START_CHARGING_URL = HOST_URL + "api/charge/start";