左晓为主开发手持机充值管理机
zuoxiao
2024-03-07 389d1e5aedc99a3909c61db855b18a2936919942
修复设置电量单价时没有保留三位小数的bug
5个文件已修改
72 ■■■■ 已修改文件
app/src/main/aidl/woyou/aidlservice/jiuiv5/IWoyouService.aidl 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/dayu/recharge/MyApplication.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/dayu/recharge/activity/AdminSetupActivity.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/dayu/recharge/activity/ElectricPriceActivity.java 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/dayu/recharge/net/SocketNet.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/aidl/woyou/aidlservice/jiuiv5/IWoyouService.aidl
@@ -9,6 +9,7 @@
import android.graphics.Bitmap;
import com.dayu.recharge.bean.TransBean;
interface IWoyouService
{
    /**
app/src/main/java/com/dayu/recharge/MyApplication.java
@@ -74,7 +74,11 @@
    public void initEasySocket(boolean isCreate, SocketNet.CreateBack createBack) {
        try {
            this.createBack = createBack;
            ipBean = BaseDaoSingleton.getInstance(MyApplication.myApplication).ipDao().findFirst();
            try {
                ipBean = BaseDaoSingleton.getInstance(MyApplication.myApplication).ipDao().findFirst();
            } catch (Exception e) {
              e.printStackTrace();
            }
            if (ipBean == null) {
                ipBean = new IpBean();
                ipBean.setIp("dayuyanjiuyuan.top");
app/src/main/java/com/dayu/recharge/activity/AdminSetupActivity.java
@@ -1,5 +1,6 @@
package com.dayu.recharge.activity;
import android.annotation.SuppressLint;
import android.content.Context;
import android.os.Build;
import android.os.Bundle;
@@ -160,6 +161,7 @@
        }
    }
    @SuppressLint("MissingPermission")
    public static String getSN() {
        String serial = null;
        try {
app/src/main/java/com/dayu/recharge/activity/ElectricPriceActivity.java
@@ -1,7 +1,9 @@
package com.dayu.recharge.activity;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.LayoutInflater;
import android.view.View;
@@ -25,7 +27,43 @@
        super.onCreate(savedInstanceState);
        electricPriceBinding = ActivityElectricPriceBinding.inflate(LayoutInflater.from(this));
        setContentView(electricPriceBinding.getRoot());
        initView();
        initData();
    }
    private void initView() {
        //保留三位小数
        electricPriceBinding.electricNewNum.addTextChangedListener(new TextWatcher() {
            @Override
            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
            }
            @Override
            public void onTextChanged(CharSequence s, int start, int before, int count) {
            }
            @Override
            public void afterTextChanged(Editable s) {
                // 删除额外的小数位
                String text = s.toString();
                if (text.contains(".")) {
                    int decimalIndex = text.indexOf(".");
                    int decimalCount = text.length() - decimalIndex - 1;
                    if (decimalCount > 3) {
                        s.delete(decimalIndex + 4, s.length());
                    }
                }
            }
        });
        electricPriceBinding.electricOk.setOnClickListener(new View.OnClickListener() {
            @Override
@@ -40,8 +78,6 @@
                }
            }
        });
    }
    private void initData() {
app/src/main/java/com/dayu/recharge/net/SocketNet.java
@@ -18,6 +18,7 @@
import com.easysocket.interfaces.conn.SocketActionListener;
import com.dayu.recharge.MyApplication;
import com.easysocket.utils.HexUtil;
import com.tencent.bugly.crashreport.CrashReport;
/**
@@ -104,18 +105,22 @@
        public void onSocketConnSuccess(SocketAddress socketAddress) {
            Log.i("SocketActionListener1111", "连接成功");
            MyApplication.myApplication.isConncet = true;
            AdminDataBean adminData = BaseDaoSingleton.getInstance(MyApplication.myApplication).adminDao().findFirst();
            Log.i("SocketActionListener1111", "isDoInitMachine==" + MyApplication.myApplication.isDoInitMachine + "");
            if (!MyApplication.myApplication.isDoInitMachine) {
                Log.i("SocketActionListener1111", "isDoInitMachine");
                if (MyApplication.myApplication.ipBean != null && adminData != null) {
                    if (!TextUtils.isEmpty(adminData.getAddressCode())) {
                        Log.i("SocketActionListener1111", "initMachineRequestBean");
                        MyApplication.myApplication.initMachineRequestBean(MyApplication.myApplication.ipBean.getIp(), MyApplication.myApplication.ipBean.getPort(), adminData.getAddressCode());
            try {
                AdminDataBean adminData = BaseDaoSingleton.getInstance(MyApplication.myApplication).adminDao().findFirst();
                Log.i("SocketActionListener1111", "isDoInitMachine==" + MyApplication.myApplication.isDoInitMachine + "");
                if (!MyApplication.myApplication.isDoInitMachine) {
                    Log.i("SocketActionListener1111", "isDoInitMachine");
                    if (MyApplication.myApplication.ipBean != null && adminData != null) {
                        if (!TextUtils.isEmpty(adminData.getAddressCode())) {
                            Log.i("SocketActionListener1111", "initMachineRequestBean");
                            MyApplication.myApplication.initMachineRequestBean(MyApplication.myApplication.ipBean.getIp(), MyApplication.myApplication.ipBean.getPort(), adminData.getAddressCode());
                        }
                    }
                }
                }
            } catch (Exception e) {
                CrashReport.postCatchedException(e);
            }
            rushState();
        }