From b6779014ad6b2627d0a7e4d170d918d001fc03db Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 08 五月 2024 10:44:01 +0800
Subject: [PATCH] 1.修复16进制低位在前高位在后转换成10进制时的bug 2.完成充值相关功能 3.优化导出记录相关信息
---
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/AdminSetupActivity.java | 165 +++++++-----------------------------------------------
1 files changed, 23 insertions(+), 142 deletions(-)
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/AdminSetupActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/AdminSetupActivity.java
index 5c22d01..978c57f 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/AdminSetupActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/AdminSetupActivity.java
@@ -1,23 +1,13 @@
package com.dayu.qihealonelibrary.activity;
-import android.content.Context;
-import android.os.Build;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.LayoutInflater;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
import com.dayu.baselibrary.utils.TipUtil;
-import com.dayu.qihealonelibrary.databinding.ActivityAdminSetupBinding;
+import com.dayu.qihealonelibrary.databinding.ActivityAdminSetupQhaBinding;
import com.dayu.qihealonelibrary.dbBean.AdminDataBean;
-import com.example.pickerviewlibrary.picker.TeaPickerView;
-import com.example.pickerviewlibrary.picker.entity.PickerData;
-import com.example.pickerviewlibrary.picker.listener.OnPickerClickListener;
import com.tencent.bugly.crashreport.CrashReport;
-
-import java.lang.reflect.Method;
-import java.util.zip.CRC32;
/**
* Copyright (C), 2023,
@@ -25,43 +15,40 @@
* Date: 2023-11-10 19:52
* Description: 绠＄悊鍛樹俊鎭缃�
*/
-public class AdminSetupActivity extends QHAloneBaseActivity {
+public class AdminSetupActivity extends BaseActivity {
- ActivityAdminSetupBinding adminBinding;
+ ActivityAdminSetupQhaBinding adminBinding;
public static AdminSetupActivity adminSetupActivity;
AdminDataBean adminData = new AdminDataBean();
- TeaPickerView pickerView;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
try {
- adminBinding = ActivityAdminSetupBinding.inflate(LayoutInflater.from(this));
+ adminBinding = ActivityAdminSetupQhaBinding.inflate(LayoutInflater.from(this));
setContentView(adminBinding.getRoot());
adminSetupActivity = this;
- setData();
+ setViewData();
initView();
} catch (Exception e) {
CrashReport.postCatchedException(e);
e.printStackTrace();
-
}
}
private void initView() {
- adminBinding.setupOk.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- if (!TextUtils.isEmpty(adminData.getCun())
- && !TextUtils.isEmpty(adminBinding.adminSerial.getText().toString())
- ) {
- if (Integer.valueOf(adminBinding.adminSerial.getText().toString()) <= 16777215) {
- adminBinding.adminAddressCode.setText(adminData.getAddressCode());
- adminData.setSerial(adminBinding.adminSerial.getText().toString());
- baseDao.adminDao().insert(adminData);
- setData();
+ adminBinding.setupOk.setOnClickListener(v -> {
+ String strSerial = adminBinding.adminAddressCode.getText().toString();
+ String strAddressCode = adminBinding.adminAddressCode.getText().toString();
+ if (!TextUtils.isEmpty(strAddressCode)
+ && !TextUtils.isEmpty(strSerial)) {
+// if (Integer.valueOf(strSerial) <= 65535) {
+ if (Integer.valueOf(strAddressCode) <= 65535) {
+ adminData.setAddressCode(strAddressCode);
+ adminData.setSerial(strSerial);
+ baseDao.adminDao().insert(adminData);
TipUtil.show(AdminSetupActivity.this, "璁剧疆鎴愬姛", new TipUtil.TipListener() {
@Override
public void onCancle() {
@@ -69,44 +56,26 @@
}
});
} else {
- TipUtil.show(AdminSetupActivity.this, "杈撳叆鐨勬暟瀛椾笉鑳借秴杩�16777215");
+ TipUtil.show(AdminSetupActivity.this, "杈撳叆鐨勫尯鍩熷彿涓嶈兘瓒呰繃65535");
}
- } else {
- TipUtil.show(AdminSetupActivity.this, "璇疯緭鍏ュ畬鏁村唴瀹�");
- }
+
+// } else {
+// TipUtil.show(AdminSetupActivity.this, "杈撳叆鐨勮澶囩紪鍙蜂笉鑳借秴杩�65535");
+// }
+ } else {
+ TipUtil.show(AdminSetupActivity.this, "璇疯緭鍏ュ畬鏁村唴瀹�");
}
});
- adminBinding.choseAddress.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
- imm.hideSoftInputFromWindow(adminBinding.adminSerial.getWindowToken(), 0);
- intiPickerView();
- }
- });
- pickerView = new TeaPickerView(this);
-
- new Thread(new Runnable() {
- @Override
- public void run() {
- pickerView.initAddressData();
- }
- }).start();
-
}
- private void setData() {
+ private void setViewData() {
try {
AdminDataBean adminData = baseDao.adminDao().findFirst();
-
if (adminData != null) {
this.adminData = adminData;
adminBinding.adminSerial.setText(adminData.getSerial());
adminBinding.adminAddressCode.setText(adminData.getAddressCode());
- adminBinding.adminAddress.setText(adminData.getSheng() + adminData.getShi() + adminData.getXian() + adminData.getZhen() + adminData.getCun());
- } else {
- adminBinding.adminSerial.setText("12" + generateUniqueNumber(getSN()));
}
} catch (Exception e) {
@@ -115,93 +84,5 @@
}
}
-
- private void intiPickerView() {
-
- try {
- pickerView.setScreenH(2)
- .setDiscolourHook(true)
- .setRadius(25)
- .setContentLine(true)
- .setRadius(25)
- .build();
- pickerView.show(adminBinding.choseAddress);
- pickerView.setOnPickerClickListener(new OnPickerClickListener() {
- @Override
- public void OnPickerClick(PickerData pickerData) {
- adminData.setSheng("娌冲崡");
- adminData.setShi(pickerData.getFirstText().getName());
- adminData.setXian(pickerData.getSecondText().getName());
- if (pickerData.getThirdText() != null) {
- adminData.setZhen(pickerData.getThirdText().getName());
- } else {
- adminData.setZhen("");
- }
- if (pickerData.getFourthText() != null) {
- adminData.setCun(pickerData.getFourthText().getName());
- adminData.setAddressCode(pickerData.getFourthText().getCode());
- } else {
- adminData.setCun("");
- adminData.setAddressCode(pickerData.getSecondText().getCode());
- }
- adminBinding.adminAddress.setText(adminData.getSheng() + adminData.getShi() + adminData.getXian() + adminData.getZhen() + adminData.getCun());
- adminBinding.adminAddressCode.setText(adminData.getAddressCode());
- pickerView.dismiss();
- }
- });
- } catch (Exception e) {
- CrashReport.postCatchedException(e);
- e.printStackTrace();
-
- }
- }
-
- public static String getSN() {
- String serial = null;
- try {
- Class<?> c = Class.forName("android.os.SystemProperties");
- Method get = c.getMethod("get", String.class);
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
- try {
- serial = (String) get.invoke(c, "ro.sunmi.serial");
- } catch (Exception e) {
- e.printStackTrace();
- }
- return serial;
- } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
- serial = Build.getSerial();
- return serial;
- } else {
- //瀹夊崜8浠ヤ笅浣跨敤Build.SERIAL鐩稿悓鏂瑰紡
- //return Build.SERIAL;
- try {
- serial = (String) get.invoke(c, "ro.serialno");
- } catch (Exception e) {
- e.printStackTrace();
- }
- return serial;
- }
- } catch (ClassNotFoundException e) {
- throw new RuntimeException(e);
- } catch (NoSuchMethodException e) {
- throw new RuntimeException(e);
- }
- }
-
- public static String generateUniqueNumber(String input) {
- try {
- // 浣跨敤CRC32鍝堝笇鍑芥暟
- CRC32 crc32 = new CRC32();
- crc32.update(input.getBytes());
- long crcValue = crc32.getValue();
- // 灏嗗搱甯屽�兼槧灏勫埌6浣嶆暟瀛楃殑鑼冨洿
- long sixDigitNumber = Math.abs(crcValue) % 1000000;
- // 鏍煎紡鍖栦负6浣嶆暟瀛楃殑瀛楃涓�
- return String.format("%06d", sixDigitNumber);
- } catch (Exception e) {
- e.printStackTrace();
- return null;
- }
- }
}
--
Gitblit v1.8.0