From a44c47bc7f37245612635866adaddf5c98d41747 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 16 八月 2024 11:03:49 +0800
Subject: [PATCH] 添加补打逻辑 联调修复bug
---
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/PricePlanResult.java | 2
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/CardSearchActivity.java | 55 ++-
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/CardInfoResult.java | 22 +
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/dbBean/RechargeBean.java | 9
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NewCardListActivity.java | 2
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeDetailActivity.java | 38 ++
qiheonlinelibrary/src/main/res/layout/dialog_replace_price.xml | 3
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/adapter/RechargeAdapter.java | 12
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/OpenCardResult.java | 2
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/LoginResult.java | 10
qiheonlinelibrary/src/main/res/layout/activity_my_qhl.xml | 2
qiheonlinelibrary/src/main/res/layout/qihe_line_item_recharge.xml | 1
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ReadCardAcitivy.java | 19
qiheonlinelibrary/src/main/res/layout/activity_newcard_list_qhl.xml | 2
qiheonlinelibrary/src/main/res/layout/activity_recharge_qhl.xml | 8
qiheonlinelibrary/src/main/res/layout/activity_admin_qhl.xml | 2
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/UserListResult.java | 2
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/dao/RechargeDao.java | 8
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/net/ApiManager.java | 61 ++--
app/build.gradle | 4
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerWriteActivity.java | 8
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/adapter/CardAdapter.java | 6
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NewCardActivity.java | 4
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/net/Constants.java | 2
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/CardInfoListResult.java | 2
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerReadActivity.java | 46 ++-
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/QHOnLineApplication.java | 63 +++-
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/utils/PrintUtils.java | 57 ++++
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NFCWreatActivity.java | 93 +++---
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/BaseResult.java | 11
qiheonlinelibrary/src/main/res/layout/activity_recharge_detail_qhl.xml | 42 ++
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/UserSearchActivity.java | 24 +
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/card/ManageCard.java | 24 +
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/MyActivity.java | 2
app/src/main/res/layout/activity_login.xml | 2
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeActivity.java | 66 +++--
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/AddUserResult.java | 2
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeListActivity.java | 25 +
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/ReplaceCardResult.java | 2
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/tools/NfcReadHelper.java | 6
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/RechargeResult.java | 2
41 files changed, 504 insertions(+), 249 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index c32469c..edf6e9e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@
applicationId "com.dayu.recharge"
minSdk 23
targetSdk 26
- versionCode 256
- versionName "2.5.6"
+ versionCode 260
+ versionName "2.6.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
ndk {
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index e0cbb16..7297574 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -43,6 +43,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="璇疯緭鍏ヨ处鍙�"
+ android:maxLines="1"
+ android:singleLine="true"
android:text="zuoxiao" />
</LinearLayout>
<LinearLayout
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/QHOnLineApplication.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/QHOnLineApplication.java
index 201e430..da18b55 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/QHOnLineApplication.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/QHOnLineApplication.java
@@ -5,6 +5,7 @@
import android.content.Context;
import android.content.Intent;
+import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.baselibrary.utils.ToastUtil;
import com.dayu.qiheonlinelibrary.bean.LoginResult;
import com.dayu.qiheonlinelibrary.bean.PricePlanResult;
@@ -40,6 +41,8 @@
public String electriclePriceStr;//鐢典环
+ public String adminId;//鐧诲綍鐨勮处鍙穒d
+
public static QHOnLineApplication getInstance(Application context) {
if (qhAloneApplication == null) {
qhAloneApplication = new QHOnLineApplication();
@@ -61,11 +64,13 @@
Map<String, Object> data = new HashMap<>();
data.put("loginType", "account");
- ApiManager.getInstance().requestPostLoading(context, "api/login/getPubKey", String.class, null, new SubscriberListener<BaseResponse<String>>() {
+ ApiManager.getInstance().requestPostLoading(context, "http://120.46.45.35:20081/api/login/getPubKey", String.class, null, new SubscriberListener<BaseResponse<String>>() {
@Override
public void onNext(BaseResponse<String> t) {
if (t.isSuccess()) {
- getToken(context, name, pw, t.getData());
+ if (t.getData() != null) {
+ getToken(context, name, pw, t.getData());
+ }
}
}
});
@@ -79,12 +84,14 @@
String dateString = sdf.format(new Date());
data.put("password", RSAUtile.encryptByPublicKey(pw + "@TIME@" + dateString, pubKey));
data.put("username", name);
- ApiManager.getInstance().requestPostLoading(application, "api/login/login/getToken", String.class, data, new SubscriberListener<BaseResponse<String>>() {
+ ApiManager.getInstance().requestPostLoading(application, "http://120.46.45.35:20081/api/login/login/getToken", String.class, data, new SubscriberListener<BaseResponse<String>>() {
@Override
public void onNext(BaseResponse<String> t) {
if (t.isSuccess()) {
- tokenStr = t.getData();
- login(context, name, pw, pubKey);
+ if (t.getData() != null) {
+ tokenStr = t.getData();
+ login(context, name, pw, pubKey);
+ }
} else {
ToastUtil.show(t.getMsg());
}
@@ -100,25 +107,34 @@
String dateString = sdf.format(new Date());
data.put("password", RSAUtile.encryptByPublicKey(pw + "@TIME@" + dateString, pubKey));
data.put("username", name);
- ApiManager.getInstance().requestPostLoading(application, "api/login/login", LoginResult.class, data, new SubscriberListener<BaseResponse<LoginResult>>() {
+ ApiManager.getInstance().requestPostLoading(application, "http://120.46.45.35:20081/api/login/login", LoginResult.class, data, new SubscriberListener<BaseResponse<LoginResult>>() {
@Override
public void onNext(BaseResponse<LoginResult> t) {
if (t.isSuccess()) {
- if (t.getData() != null && t.getData().getOtherData() != null) {
- LoginResult.OtherData otherData = t.getData().getOtherData();
- String tenantAdnm = otherData.getTenantAdnm();
- List<String> adnmList = otherData.getAdnmList();
- if (tenantAdnm != null && adnmList != null && !adnmList.isEmpty()) {
- addressName = tenantAdnm + adnmList.get(0);
+ try {
+ if (t.getData() != null && t.getData().getOtherData() != null) {
+
+ LoginResult.OtherData otherData = t.getData().getOtherData();
+ String tenantAdnm = otherData.getTenantAdnm();
+ List<String> adnmList = otherData.getAdnmList();
+ if (tenantAdnm != null && adnmList != null && !adnmList.isEmpty()) {
+ addressName = tenantAdnm + adnmList.get(0);
+ }
+ List<String> adcdList = otherData.getAdnmList();
+ if (adcdList != null && !adcdList.isEmpty()) {
+ adcd = t.getData().getOtherData().getAdcdList().get(0);
+ arerNumber = t.getData().getOtherData().getAdcdList().get(0).substring(4);
+ }
+ adminId = t.getData().getUserId();
+ context.startActivity(new Intent(context, com.dayu.qiheonlinelibrary.activity.HomeActivity.class));
+ ((Activity) context).finish();
+ } else {
+ TipUtil.show((Activity) context, "鐧诲綍澶辫触锛岃閲嶈瘯");
}
- List<String> adcdList = otherData.getAdnmList();
- if (adcdList != null && !adcdList.isEmpty()) {
- adcd = t.getData().getOtherData().getAdcdList().get(0);
- arerNumber = t.getData().getOtherData().getAdcdList().get(0).substring(4);
- }
+ } catch (Exception e) {
+ e.printStackTrace();
}
- context.startActivity(new Intent(context, com.dayu.qiheonlinelibrary.activity.HomeActivity.class));
- ((Activity) context).finish();
+
} else {
ToastUtil.show(t.getMsg());
}
@@ -132,13 +148,14 @@
public void getPricePlanVo(Context context) {
Map<String, Object> data = new HashMap<>();
data.put("priceMethod", 2);
-
- ApiManager.getInstance().requestPost(context, "api/sjgg/water/waterPricePlan/pageWaterPricePlanVo", PricePlanResult.class, data, new SubscriberListener<BaseResponse<PricePlanResult>>() {
+ ApiManager.getInstance().requestPostHideLoading(context, "water/waterPricePlan/pageWaterPricePlanVo", PricePlanResult.class, data, new SubscriberListener<BaseResponse<PricePlanResult>>() {
@Override
public void onNext(BaseResponse<PricePlanResult> t) {
if (t.isSuccess()) {
- planId = t.getData().getRecords().get(0).getPlanId();
- electriclePriceStr = t.getData().getRecords().get(0).getElectricityPrice();
+ if (t.getData() != null) {
+ planId = t.getData().getRecords().get(0).getPlanId();
+ electriclePriceStr = t.getData().getRecords().get(0).getElectricityPrice();
+ }
}
}
});
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/CardSearchActivity.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/CardSearchActivity.java
index 8048fa1..c4fbd08 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/CardSearchActivity.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/CardSearchActivity.java
@@ -6,7 +6,6 @@
import androidx.recyclerview.widget.LinearLayoutManager;
-import com.dayu.baselibrary.activity.BaseActivity;
import com.dayu.baselibrary.utils.BaseCommon;
import com.dayu.baselibrary.utils.DeviceUtils;
import com.dayu.baselibrary.utils.TipUtil;
@@ -16,6 +15,7 @@
import com.dayu.qiheonlinelibrary.bean.CardInfoListResult;
import com.dayu.qiheonlinelibrary.bean.UserListResult;
import com.dayu.qiheonlinelibrary.databinding.ActivityCardSearchQhlBinding;
+import com.dayu.qiheonlinelibrary.dbBean.UserCardBean;
import com.dayu.qiheonlinelibrary.net.ApiManager;
import com.dayu.qiheonlinelibrary.net.BaseResponse;
import com.dayu.qiheonlinelibrary.net.subscribers.SubscriberListener;
@@ -50,6 +50,8 @@
ConfirmDialog confirmDialog;
CardInfoListResult.Records mRecord;
+ UserCardBean userCardBean;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -57,6 +59,7 @@
setContentView(binding.getRoot());
pearsontId = this.getIntent().getStringExtra("pearsontId");
type = this.getIntent().getIntExtra("type", 0);
+ userCardBean = (UserCardBean) this.getIntent().getSerializableExtra("dbUserCard");
initView();
selectUser(true);
}
@@ -142,20 +145,24 @@
data.put("peasantId", pearsontId);
data.put("current", page);
data.put("pageSize", size);
- ApiManager.getInstance().requestPostLoading(this, "api/sjgg/iccard/info/getIccardPeasantVoList", CardInfoListResult.class, data, new SubscriberListener<BaseResponse<CardInfoListResult>>() {
+ ApiManager.getInstance().requestPostLoading(this, "iccard/info/getIccardPeasantVoList", CardInfoListResult.class, data, new SubscriberListener<BaseResponse<CardInfoListResult>>() {
@Override
public void onNext(BaseResponse<CardInfoListResult> t) {
if (t.isSuccess()) {
- if (t.getData().getTotal() == records.size()) {
- myRefreshLayout.finishLoadMoreWithNoMoreData();
- } else {
+ if (t.getData() != null) {
+ if (t.getData().getTotal() == records.size() || size > t.getData().getTotal()) {
+ myRefreshLayout.finishLoadMoreWithNoMoreData();
+ }
records.addAll(t.getData().getRecords());
+ adapter.notifyDataSetChanged();
+ myRefreshLayout.finishLoadMore();
+ if (isRefresh) {
+ myRefreshLayout.finishRefresh();
+ }
}
- adapter.notifyDataSetChanged();
- myRefreshLayout.finishLoadMore();
- if (isRefresh) {
- myRefreshLayout.finishRefresh();
- }
+
+ } else {
+ TipUtil.show(CardSearchActivity.this, t.getMsg());
}
}
});
@@ -169,20 +176,25 @@
Map<String, Object> data = new HashMap<>();
data.put("iccardInfoId", iccardInfoId);
data.put("equipCode", DeviceUtils.getSN());
- ApiManager.getInstance().requestPostLoading(this, "api/sjgg/iccard/recharge/reportLossCard", UserListResult.class, data, new SubscriberListener<BaseResponse<UserListResult>>() {
+ ApiManager.getInstance().requestPostLoading(this, "iccard/recharge/reportLossCard", UserListResult.class, data, new SubscriberListener<BaseResponse<UserListResult>>() {
@Override
public void onNext(BaseResponse<UserListResult> t) {
if (t.isSuccess()) {
- if (type == BaseCommon.LOSS_CARD) {
- TipUtil.show(CardSearchActivity.this, "鎸傚け鎴愬姛", () -> {
- CardSearchActivity.this.finish();
- });
- } else if (type == BaseCommon.REPLACE_NO_CARD) {
- startNFCActivit(iccardInfoId);
- } else if (type == BaseCommon.REPLACE_HAS_CARD) {
- startNFCActivit(iccardInfoId);
+ if (t.getData() != null) {
+ if (type == BaseCommon.LOSS_CARD) {
+ TipUtil.show(CardSearchActivity.this, "鎸傚け鎴愬姛", () -> {
+ CardSearchActivity.this.finish();
+ if (UserSearchActivity.userSearchActivity != null) {
+ UserSearchActivity.userSearchActivity.finish();
+ UserSearchActivity.userSearchActivity = null;
+ }
+ });
+ } else if (type == BaseCommon.REPLACE_NO_CARD) {
+ startNFCActivit(iccardInfoId);
+ } else if (type == BaseCommon.REPLACE_HAS_CARD) {
+ startManagerActivity(iccardInfoId, mRecord.getIccardNum());
+ }
}
-
} else {
ToastUtil.show(t.getMsg());
}
@@ -198,7 +210,7 @@
Map<String, Object> data = new HashMap<>();
data.put("iccardInfoId", iccardInfoId);
data.put("equipCode", DeviceUtils.getSN());
- ApiManager.getInstance().requestPostLoading(this, "api/sjgg/iccard/recharge/releaseLossCard", UserListResult.class, data, new SubscriberListener<BaseResponse<UserListResult>>() {
+ ApiManager.getInstance().requestPostLoading(this, "iccard/recharge/releaseLossCard", UserListResult.class, data, new SubscriberListener<BaseResponse<UserListResult>>() {
@Override
public void onNext(BaseResponse<UserListResult> t) {
if (t.isSuccess()) {
@@ -222,6 +234,7 @@
Intent intent = new Intent(CardSearchActivity.this, NFCWreatActivity.class);
intent.putExtra("iccardInfoId", iccardInfoId);
intent.putExtra("replaceType", type);
+ intent.putExtra("userCardBean", userCardBean);
startActivity(intent);
CardSearchActivity.this.finish();
}
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerReadActivity.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerReadActivity.java
index 91c4c32..2a47e87 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerReadActivity.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerReadActivity.java
@@ -5,12 +5,14 @@
import android.os.Bundle;
import android.view.LayoutInflater;
+import com.dayu.baselibrary.tools.HexUtil;
import com.dayu.baselibrary.utils.BaseCommon;
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.qiheonlinelibrary.QHOnLineApplication;
import com.dayu.qiheonlinelibrary.bean.CardInfoResult;
import com.dayu.qiheonlinelibrary.card.ManagerToUserCard;
import com.dayu.qiheonlinelibrary.databinding.ActivityManagerReadQhlBinding;
+import com.dayu.qiheonlinelibrary.dbBean.UserCardBean;
import com.dayu.qiheonlinelibrary.net.ApiManager;
import com.dayu.qiheonlinelibrary.net.BaseResponse;
import com.dayu.qiheonlinelibrary.net.subscribers.SubscriberListener;
@@ -26,7 +28,7 @@
* author: zuo
* Date: 2024-08-12
* Time: 20:10
- * 澶囨敞锛�
+ * 澶囨敞锛� 璇诲彇绠＄悊鍗★紝浠庢帶鍒跺櫒璇诲崱鍚庡湪姝ょ晫闈㈣鍗�
*/
public class ManagerReadActivity extends BaseNfcActivity {
@@ -39,6 +41,8 @@
CardInfoResult cardInfoResult;
ManagerToUserCard managerToUserCard;
+
+ UserCardBean userCardBean = new UserCardBean();
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -56,8 +60,8 @@
intent.putExtra("replaceType", BaseCommon.REPLACE_HAS_CARD);
startActivity(intent);
ManagerReadActivity.this.finish();
- }else {
- TipUtil.show(ManagerReadActivity.this,"璇峰埛绠＄悊鍗�");
+ } else {
+ TipUtil.show(ManagerReadActivity.this, "璇峰埛绠＄悊鍗�");
}
});
}
@@ -79,7 +83,10 @@
managerToUserCard = NfcReadHelper.getInstence(intent, this).getManagerToUserCardData();
if (managerToUserCard != null) {
if (QHOnLineApplication.getInstance().arerNumber.equalsIgnoreCase(String.valueOf(managerToUserCard.getArerNumber()))) {
- getUserInfoAndCardInfo(managerToUserCard.getOldCardNumber());
+ String oldCardNumber = managerToUserCard.getOldCardNumber();
+ oldCardNumber = HexUtil.spaceHex(oldCardNumber);
+ oldCardNumber = HexUtil.HighLowHex(oldCardNumber);
+ getUserInfoAndCardInfo(oldCardNumber);
} else {
TipUtil.show(this, "涓嶆槸鏈尯鍩熷崱锛�");
}
@@ -105,20 +112,31 @@
Map<String, Object> data = new HashMap<>();
//ic鍗′俊鎭痠d
data.put("iccardNum", iccardCode);
- ApiManager.getInstance().requestPostLoading(this, "api/sjgg/iccard/peasant/getIccardInfoVoByCardCode", CardInfoResult.class, data, new SubscriberListener<BaseResponse<CardInfoResult>>() {
+ ApiManager.getInstance().requestPostLoading(this, "iccard/peasant/getIccardInfoVoByCardCode", CardInfoResult.class, data, new SubscriberListener<BaseResponse<CardInfoResult>>() {
@Override
public void onNext(BaseResponse<CardInfoResult> t) {
String state = "";
if (t.isSuccess()) {
- cardInfoResult = t.getData();
- isReadSuccess = true;
- TipUtil.show(ManagerReadActivity.this, "璇诲崱鎴愬姛锛屼笅涓�姝ュ皢鍐欏崱锛�", () -> {
- Intent intent = new Intent(ManagerReadActivity.this, NFCWreatActivity.class);
- intent.putExtra("iccardInfoId", cardInfoResult.getIccardInfoId());
- intent.putExtra("replaceType", BaseCommon.REPLACE_HAS_CARD);
- startActivity(intent);
- ManagerReadActivity.this.finish();
- });
+ if (t.getData() != null) {
+ cardInfoResult = t.getData();
+ userCardBean.setUserName(cardInfoResult.getPeasantName());
+ userCardBean.setUserID(cardInfoResult.getPeasantIdNumber());
+ userCardBean.setPhone(cardInfoResult.getPeasantPhone());
+ userCardBean.setPersonId(cardInfoResult.getPeasantId());
+ userCardBean.setAddressCode(cardInfoResult.getAdcd());
+ userCardBean.setAddressName(cardInfoResult.getAdcdName());
+ isReadSuccess = true;
+ TipUtil.show(ManagerReadActivity.this, "璇诲崱鎴愬姛锛屼笅涓�姝ュ皢鍐欏崱锛�", () -> {
+ Intent intent = new Intent(ManagerReadActivity.this, NFCWreatActivity.class);
+ intent.putExtra("iccardInfoId", cardInfoResult.getIccardInfoId());
+ intent.putExtra("replaceType", BaseCommon.REPLACE_HAS_CARD);
+ intent.putExtra("userCardBean", userCardBean);
+ startActivity(intent);
+ ManagerReadActivity.this.finish();
+ });
+ } else {
+ TipUtil.show(ManagerReadActivity.this, "鏈煡璇㈠埌璇ュ崱淇℃伅锛岃妫�鏌ャ��");
+ }
}
}
});
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerWriteActivity.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerWriteActivity.java
index 73a2a7d..d12b24f 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerWriteActivity.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerWriteActivity.java
@@ -8,6 +8,7 @@
import android.view.LayoutInflater;
import android.view.View;
+import com.dayu.baselibrary.tools.HexUtil;
import com.dayu.baselibrary.utils.BaseCommon;
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.baselibrary.view.ConfirmDialog;
@@ -64,6 +65,11 @@
} else {
TipUtil.show(this, "璇峰湪鎺у埗鍣ㄧ鍒峰崱鍚庡湪棣栭〉鐐瑰嚮娉垫湭鍏冲啓鍗″悗缁х画琛ュ崱锛�", () -> {
ManagerWriteActivity.this.finish();
+ if (UserSearchActivity.userSearchActivity != null) {
+ UserSearchActivity.userSearchActivity.finish();
+ UserSearchActivity.userSearchActivity = null;
+ }
+
});
}
@@ -95,6 +101,8 @@
}
ManageCard manageCard = new ManageCard();
manageCard.setArerNumber(Integer.valueOf(QHOnLineApplication.getInstance().arerNumber));
+ oldCardNumber = HexUtil.spaceHex(oldCardNumber);
+ oldCardNumber = HexUtil.HighLowHex(oldCardNumber);
manageCard.setUserCard(oldCardNumber);
manageCard.setCardWriteState((byte) 0);
if (NFCWriteHelper.getInstence(intent, this).writeData(manageCard.toByte(baseDao), 1, 0)) {
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/MyActivity.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/MyActivity.java
index 661efbb..b71122b 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/MyActivity.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/MyActivity.java
@@ -149,7 +149,7 @@
List listData = new ArrayList();
try {
if (isRechargeList) {
- listData = asynchBaseDao.rechargeDao().ansyFindByTime(beginTime, endTime);
+ listData = asynchBaseDao.rechargeDao().ansyFindByTime(QHOnLineApplication.getInstance().adminId, beginTime, endTime);
} else {
listData = asynchBaseDao.userCardDao().findByTime(beginTime, endTime);
}
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NFCWreatActivity.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NFCWreatActivity.java
index f066485..d6c4ad9 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NFCWreatActivity.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NFCWreatActivity.java
@@ -15,6 +15,7 @@
import com.dayu.baselibrary.utils.DeviceUtils;
import com.dayu.baselibrary.utils.MornyUtil;
import com.dayu.baselibrary.utils.TipUtil;
+import com.dayu.baselibrary.utils.ToastUtil;
import com.dayu.baselibrary.view.ConfirmDialog;
import com.dayu.baselibrary.view.TitleBar;
import com.dayu.qiheonlinelibrary.QHOnLineApplication;
@@ -44,10 +45,12 @@
import com.dayu.qiheonlinelibrary.tools.WriteCardUtils;
import com.dayu.qiheonlinelibrary.utils.CardCommon;
import com.dayu.qiheonlinelibrary.utils.NFCWreatUtils;
+import com.dayu.qiheonlinelibrary.utils.PrintUtils;
import com.dayu.qiheonlinelibrary.view.ReplacementPriceDialog;
import com.tencent.bugly.crashreport.CrashReport;
import java.util.Calendar;
+import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -176,6 +179,9 @@
userCardBean = (UserCardBean) this.getIntent().getSerializableExtra("dbUserCard");
isUser = true;
}
+ if (this.getIntent().hasExtra("userCardBean")) {
+ userCardBean = (UserCardBean) this.getIntent().getSerializableExtra("userCardBean");
+ }
if (this.getIntent().hasExtra("cleanUserCard")) {
cleanUserCard = (CleanUserCard) this.getIntent().getSerializableExtra("cleanUserCard");
binding.cardData.setText("鍒朵綔鍒犻櫎鍏ㄩ儴鐢ㄦ埛鍗�");
@@ -206,9 +212,12 @@
morny = this.getIntent().getStringExtra("morny");
userName = this.getIntent().getStringExtra("userName");
rechargeBean = (RechargeBean) this.getIntent().getSerializableExtra("rechargeBean");
-
-// rechageWater = this.getIntent().getStringExtra("rechageWater");
- binding.cardData.setText("鍏呭�奸噾棰濓細" + morny + " 鍏�");
+ if (MornyUtil.changeY2F(rechargeBean.getDeductionMorny()) == 0) {
+ binding.cardData.setText("鍏呭�奸噾棰濓細" + morny + " 鍏�");
+ } else {
+ int realityMorny = MornyUtil.changeY2F(morny) - MornyUtil.changeY2F(rechargeBean.getDeductionMorny());
+ binding.cardData.setText("鍏呭�奸噾棰濓細" + morny + " 鍏僜n" + "琛ユ墸閲戦锛�" + rechargeBean.getDeductionMorny() + " 鍏僜n瀹為檯鍒拌处閲戦锛�" + MornyUtil.changeF2Y(realityMorny) + " 鍏�");
+ }
}
if (this.getIntent().hasExtra("iccardInfoId")) {
iccardInfoId = this.getIntent().getStringExtra("iccardInfoId");
@@ -365,42 +374,6 @@
}
- /**
- * 鎵撳嵃鏈虹浉鍏充俊鎭�
- *
- * @param rechargeBean
- */
- private void setPrinterData(RechargeBean rechargeBean) {
- try {
- StringBuffer data = new StringBuffer();
- if (rechargeBean != null) {
- data.append("*****************************" + "\n");
- data.append("璁惧搴忓垪鍙凤細" + rechargeBean.getSerial() + "\n");
- data.append("濮� 鍚嶏細" + rechargeBean.getUserName() + "\n");
- data.append("鍗� 鍙凤細" + rechargeBean.getCardNumber() + "\n");
- data.append("鐢ㄦ埛缂栧彿锛�" + rechargeBean.getUserCode() + "\n");
- data.append("鍏呭�奸噾棰濓細" + rechargeBean.getMorny() + " 鍏�" + "\n");
- data.append("鍗″唴浣欓锛�" + rechargeBean.getBalance() + " 鍏�" + "\n");
- data.append("鍏呭�肩數閲忥細" + rechargeBean.getRechargeElectric() + " 搴�" + "\n");
- data.append("鍓╀綑鐢甸噺锛�" + rechargeBean.getRechargeElectric() + " 搴�" + "\n");
- data.append("鏃� 鏈燂細" + DateUtil.dateToStamp(rechargeBean.getRechargeDate(), DateUtil.type2) + "\n\n");
- data.append("*****************************");
- }
- float size = 26;
-
- try {
- AidlUtil.getInstance().printText(data.toString(), size, true, false);
- AidlUtil.getInstance().print3Line();
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- } catch (Exception e) {
- e.printStackTrace();
- CrashReport.postCatchedException(e);
- }
- }
-
void startAnim() {
binding.avi.show();
// or avi.smoothToShow();
@@ -437,7 +410,7 @@
detail.putExtra("statu", statu);
detail.putExtra("userCard", userCard);
if (!TextUtils.isEmpty(morny)) {
- detail.putExtra("morny", morny);
+
detail.putExtra("rechargeBean", rechargeBean);
} else {
detail.putExtra("userCardBean", userCardBean);
@@ -510,9 +483,10 @@
data.put("iccardNum", iccardNum);//鐗╃悊鍗″彿
data.put("iccardType", iccardType);
data.put("peasantId", peasantId);
+ data.put("adcd", QHOnLineApplication.getInstance().adcd);
//宸ユ湰璐�
data.put("rechargeCardMoney", rechargeMoney);
- ApiManager.getInstance().requestPostLoading(this, "api/sjgg/iccard/recharge/openCard", OpenCardResult.class, data, new SubscriberListener<BaseResponse<OpenCardResult>>() {
+ ApiManager.getInstance().requestPostLoading(this, "iccard/recharge/openCard", OpenCardResult.class, data, new SubscriberListener<BaseResponse<OpenCardResult>>() {
@Override
public void onNext(BaseResponse<OpenCardResult> t) {
if (t.isSuccess()) {
@@ -548,7 +522,7 @@
data.put("writeCardStatus", writeCardStatus);
- ApiManager.getInstance().requestPostLoading(this, "api/sjgg/iccard/recharge/openCardResult", LoginResult.class, data, new SubscriberListener<BaseResponse<LoginResult>>() {
+ ApiManager.getInstance().requestPostLoading(this, "iccard/recharge/openCardResult", LoginResult.class, data, new SubscriberListener<BaseResponse<LoginResult>>() {
@Override
public void onNext(BaseResponse<LoginResult> t) {
if (t.isSuccess()) {
@@ -573,7 +547,7 @@
data.put("writeCardStatus", writeCardStatus);
data.put("writeCardStatus", writeCardStatus);
- ApiManager.getInstance().requestPostLoading(this, "api/sjgg/iccard/recharge/rechargeCardResult", LoginResult.class, data, new SubscriberListener<BaseResponse<LoginResult>>() {
+ ApiManager.getInstance().requestPostLoading(this, "iccard/recharge/rechargeCardResult", LoginResult.class, data, new SubscriberListener<BaseResponse<LoginResult>>() {
@Override
public void onNext(BaseResponse<LoginResult> t) {
if (t.isSuccess()) {
@@ -584,12 +558,15 @@
e.printStackTrace();
}
// 鎵撳嵃鐩稿叧
- setPrinterData(rechargeBean);
+ PrintUtils.printerData(rechargeBean);
startDetailActivity("缁堢鍐欏崱");
+ } else {
+ ToastUtil.show(t.getMsg());
}
}
});
}
+
/**
* 琛ュ崱閫昏緫
*/
@@ -620,11 +597,15 @@
data.put("iccardInfoId", iccardInfoId);
//鏂板崱鐨勭墿鐞嗗崱鍙�
data.put("iccardNum", cardNumber);
- //鍗″唴鍓╀綑閲戦
- data.put("iccardBalanceMoney", iccardBalanceMoney);
- //鍗″唴鍓╀綑鐢甸噺
- data.put("iccardBalanceElectric", iccardBalanceElectric);
- ApiManager.getInstance().requestPostLoading(this, "api/sjgg/iccard/recharge/reissueOpenCard", ReplaceCardResult.class, data, new SubscriberListener<BaseResponse<ReplaceCardResult>>() {
+ if (!TextUtils.isEmpty(iccardBalanceMoney)) {
+ //鍗″唴鍓╀綑閲戦
+ data.put("iccardBalanceMoney", iccardBalanceMoney);
+ }
+ if (!TextUtils.isEmpty(iccardBalanceElectric)) {
+ //鍗″唴鍓╀綑鐢甸噺
+ data.put("iccardBalanceElectric", iccardBalanceElectric);
+ }
+ ApiManager.getInstance().requestPostLoading(this, "iccard/recharge/reissueOpenCard", ReplaceCardResult.class, data, new SubscriberListener<BaseResponse<ReplaceCardResult>>() {
@Override
public void onNext(BaseResponse<ReplaceCardResult> t) {
if (t.isSuccess()) {
@@ -642,6 +623,10 @@
userCard.setRechargeDate(Calendar.getInstance());
userCard.setElectricPrice(Float.valueOf(QHOnLineApplication.getInstance().electriclePriceStr));
if (WriteCardUtils.setUser(intent, userCard, NFCWreatActivity.this)) {
+ userCardBean.setCardNumber(cardNumber);
+ userCardBean.setUserCode(userCode);
+ userCardBean.setDate(System.currentTimeMillis());
+ baseDao.userCardDao().insert(userCardBean);
confromReplaceCard(replaceCardResult.getIccardRechargeRecordId(), 0);
} else {
TipUtil.show(NFCWreatActivity.this, "鍐欏崱澶辫触锛岃閲嶈瘯");
@@ -649,6 +634,8 @@
// 鎵撳嵃鐩稿叧
// setPrinterData(rechargeBean);
// startDetailActivity(rechargeBean.getUserName(), "缁堢鍐欏崱");
+ } else {
+ ToastUtil.show(t.getMsg());
}
}
});
@@ -663,15 +650,19 @@
private void confromReplaceCard(String iccardRechargeRecordId, int writeCardStatus) {
Map<String, Object> data = new HashMap<>();
data.put("equipCode", DeviceUtils.getSN());
-// data.put("iccardRechargeRecordId", iccardRechargeRecordId);
+ data.put("iccardRechargeRecordId", iccardRechargeRecordId);
//鍐欏崱鐘舵�� 0 鍐欏崱鎴愬姛 1 寰呭啓鍗� 2 鍐欏崱澶辫触
data.put("writeCardStatus", writeCardStatus);
- ApiManager.getInstance().requestPostLoading(this, "api/sjgg/iccard/recharge/reissueOpenCardResult", LoginResult.class, data, new SubscriberListener<BaseResponse<LoginResult>>() {
+ ApiManager.getInstance().requestPostLoading(this, "iccard/recharge/reissueOpenCardResult", LoginResult.class, data, new SubscriberListener<BaseResponse<LoginResult>>() {
@Override
public void onNext(BaseResponse<LoginResult> t) {
if (t.isSuccess()) {
TipUtil.show(NFCWreatActivity.this, "琛ュ崱鎴愬姛锛�", () -> {
+ if (UserSearchActivity.userSearchActivity != null) {
+ UserSearchActivity.userSearchActivity.finish();
+ UserSearchActivity.userSearchActivity = null;
+ }
NFCWreatActivity.this.finish();
});
}
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NewCardActivity.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NewCardActivity.java
index a05548b..0eec837 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NewCardActivity.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NewCardActivity.java
@@ -311,7 +311,7 @@
data.put("peasantIdNumber", peasantIdNumber);
data.put("current", 1);
data.put("pageSize", 10);
- ApiManager.getInstance().requestPostLoading(this, "api/sjgg/base/peasant/pagePeasantVo", UserListResult.class, data, new SubscriberListener<BaseResponse<UserListResult>>() {
+ ApiManager.getInstance().requestPostLoading(this, "base/peasant/pagePeasantVo", UserListResult.class, data, new SubscriberListener<BaseResponse<UserListResult>>() {
@Override
public void onNext(BaseResponse<UserListResult> t) {
if (t.isSuccess()) {
@@ -379,7 +379,7 @@
data.put("peasantCode", "");
data.put("peasantName", peasantName);
data.put("peasantPhone", peasantPhone);
- ApiManager.getInstance().requestPostLoading(this, "api/sjgg/base/peasant/savePeasant", AddUserResult.class, data, new SubscriberListener<BaseResponse<AddUserResult>>() {
+ ApiManager.getInstance().requestPostLoading(this, "base/peasant/savePeasant", AddUserResult.class, data, new SubscriberListener<BaseResponse<AddUserResult>>() {
@Override
public void onNext(BaseResponse<AddUserResult> t) {
if (t.isSuccess()) {
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NewCardListActivity.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NewCardListActivity.java
index 26da207..05e0fcd 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NewCardListActivity.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NewCardListActivity.java
@@ -78,7 +78,7 @@
newcardListBinding.recyclerView.setLayoutManager(layoutManager);
newcardListBinding.recyclerView.setAdapter(adapter);
int totale = baseDao.userCardDao().getUserTotale();
- newcardListBinding.userTotal.setText("寮�鎴锋暟锛�" + totale + "");
+ newcardListBinding.userTotal.setText("寮�鍗℃暟锛�" + totale + "");
}
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ReadCardAcitivy.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ReadCardAcitivy.java
index 3e65674..fb8b5e7 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ReadCardAcitivy.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ReadCardAcitivy.java
@@ -115,11 +115,12 @@
break;
case CardCommon.MANAGE_CRAD://绠＄悊鍗�
ManageCard manageCard = ManageCard.getBean(data);
- viweGone(false);
- userCardStr = manageCard.getUserCard().toUpperCase();
- redCardBinding.readCardTypeTV.setText("褰撳墠涓虹鐞嗗崱" + "\n\n"
- + "鍘熷鍗″彿锛�" + userCardStr);
-
+ if (manageCard != null) {
+ viweGone(false);
+ userCardStr = manageCard.getUserCard().toUpperCase();
+ redCardBinding.readCardTypeTV.setText("褰撳墠涓虹鐞嗗崱" + "\n\n"
+ + "鍘熷鍗″彿锛�" + userCardStr);
+ }
break;
case CardCommon.CLEAN_CARD_TYPE:
viweGone(false);
@@ -230,12 +231,14 @@
Map<String, Object> data = new HashMap<>();
//ic鍗′俊鎭痠d
data.put("iccardNum", iccardCode);
- ApiManager.getInstance().requestPostLoading(this, "api/sjgg/iccard/peasant/getIccardInfoVoByCardCode", CardInfoResult.class, data, new SubscriberListener<BaseResponse<CardInfoResult>>() {
+ ApiManager.getInstance().requestPostLoading(this, "iccard/peasant/getIccardInfoVoByCardCode", CardInfoResult.class, data, new SubscriberListener<BaseResponse<CardInfoResult>>() {
@Override
public void onNext(BaseResponse<CardInfoResult> t) {
String state = "";
- if (t.isSuccess()) {
+ if (t.isSuccess() && t.getData() instanceof CardInfoResult) {
setUserData(t.getData());
+ } else {
+ TipUtil.show(ReadCardAcitivy.this, "浠庤幏鍙栧钩鍙板崱淇℃伅澶辫触锛�");
}
}
});
@@ -249,7 +252,7 @@
redCardBinding.redUserCode.setText(cardInfoResult.getIccardCode());
redCardBinding.redBlance.setText(MornyUtil.changeF2Y(userCard.getBalance()) + "鍏�");
redCardBinding.redElectric.setText(MornyUtil.changeF2Y(userCard.getSurplusElecticity()) + "搴�");
- redCardBinding.redTotalMorny.setText(MornyUtil.changeF2Y(userCard.getTotalMorny()) + "鍏�");
+ redCardBinding.redTotalMorny.setText(cardInfoResult.getTotalRechargeMoney() + "鍏�");
redCardBinding.redPhone.setText(cardInfoResult.getPeasantPhone());
redCardBinding.redCodeId.setText(cardInfoResult.getPeasantIdNumber());
if (cardInfoResult.getIccardStatus() == 0) {
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeActivity.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeActivity.java
index 2743c68..cf6f23f 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeActivity.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeActivity.java
@@ -112,15 +112,15 @@
}
- private void setUserData(String cardNumber, String userName, String lastRechargeTime, float iccardBalanceMoney, List<byte[]> data) {
- String state = "";
+ private void setUserData(String cardNumber, String userName, String lastRechargeTime, List<byte[]> data) {
if (cardType.equalsIgnoreCase(CardCommon.USER_CARD_TYPE_1)) {
- state = "缁堢鍐欏崱";
+ setCardState("缁堢鍐欏崱");
binding.rechargeLL.setVisibility(View.VISIBLE);
binding.rechargeRegistBtn.setVisibility(View.VISIBLE);
binding.redStatu.setTextColor(this.getResources().getColor(R.color.black));
} else if (cardType.equalsIgnoreCase(CardCommon.USER_CARD_TYPE_2)) {
setCardState("鏈埛鍗″叧娉�,褰撳墠涓嶅彲鍏呭��");
+ TipUtil.show(RechargeActivity.this, "鏈埛鍗″叧娉�,褰撳墠涓嶅彲鍏呭��");
} else if (cardType.equalsIgnoreCase(CardCommon.USER_CARD_TYPE_3)) {
setCardState("鍙犲姞鍏呭��");
} else {
@@ -135,15 +135,13 @@
binding.rechargeReadLL.setVisibility(View.GONE);
binding.rechargeTextLL.setVisibility(View.VISIBLE);
binding.userName.setText(userName);
- binding.redStatu.setText(state);
binding.redInitCode.setText(cardNumber);
binding.redRechargeDate.setText("鏈崱鏈�鍚庤喘姘存棩鏈燂細\n\n" + lastRechargeTime);
binding.redUserCode.setText(cardInfoResult.getIccardCode());
if (userCard != null) {
-
- binding.redRemainderBlance.setText(String.valueOf(iccardBalanceMoney) + " 鍏�");
+ binding.redRemainderBlance.setText(MornyUtil.changeF2Y(userCard.getBalance()) + " 鍏�");
+ binding.redBalanceElectric.setText("鍏呭�煎悗鍓╀綑鐢甸噺锛�" + MornyUtil.changeF2Y(userCard.getSurplusElecticity()) + " 搴�");
}
-
binding.redRechargeElectric.setText("鐢甸噺鍗曚环锛�" + QHOnLineApplication.getInstance().electriclePriceStr + "鍏�/搴�");
} else {
@@ -229,6 +227,10 @@
//鍏呭�艰ˉ鎵ｉ噾棰�=鍏呭�奸噾棰�+鍏呭�煎墠璇诲彇鐨勫崱鍐呬綑棰�-鍏呭�煎洖璋冭繑鍥炲崱鍐呬綑棰�
int deductionMorny = MornyUtil.changeY2F(morny) + mOldUserCard.getBalance() - MornyUtil.changeY2F(balance);
+ if (MornyUtil.changeY2F(morny) < deductionMorny) {
+ TipUtil.show(RechargeActivity.this, "褰撳墠鍏呭�奸噾棰濆皬浜庤ˉ鎵ｉ噾棰濓紝琛ユ墸閲戦涓�" + MornyUtil.changeF2Y(deductionMorny) + "鍏冿紝鍏呭�奸噾棰濆簲澶т簬琛ユ墸閲戦锛�");
+ return;
+ }
//娣诲姞鍏呭�间俊鎭�
rechargeBean = new RechargeBean();
@@ -250,6 +252,8 @@
rechargeBean.setState(1);
rechargeBean.setOrderId(iccardRechargeRecordId);
rechargeBean.setDeductionMorny(MornyUtil.changeF2Y(deductionMorny));
+ rechargeBean.setAdminId(QHOnLineApplication.getInstance().adminId);
+
userCard.setCardWriteState(0);
userCard.setCardState(1);
@@ -257,8 +261,7 @@
calendar.setTimeInMillis(time);
userCard.setBalance(MornyUtil.changeY2F(String.valueOf(balance)));
userCard.setSurplusElecticity(MornyUtil.changeY2F(String.valueOf(iccardBalanceElectric)));
- String sumMorny = MornyUtil.sumPrice(Float.valueOf(MornyUtil.changeF2Y(userCard.getTotalMorny())), Float.valueOf(morny));
- userCard.setTotalMorny(MornyUtil.changeY2F(sumMorny));
+ userCard.setTotalMorny(MornyUtil.changeY2F(String.valueOf(totalMorny)));
userCard.setRechargeDate(calendar);
userCard.setElectricPrice(Float.valueOf(QHOnLineApplication.getInstance().electriclePriceStr));
if (deductionMorny == 0) {
@@ -302,12 +305,18 @@
data.put("iccardBalanceAmonunt", "0");
//鍗″唴鍓╀綑鐢甸噺
data.put("iccardBalanceElectric", MornyUtil.changeF2Y(userCard.getSurplusElecticity()));
- ApiManager.getInstance().requestPostLoading(this, "api/sjgg/iccard/recharge/rechargeCard", RechargeResult.class, data, new SubscriberListener<BaseResponse<RechargeResult>>() {
+ ApiManager.getInstance().requestPostLoading(this, "iccard/recharge/rechargeCard", RechargeResult.class, data, new SubscriberListener<BaseResponse<RechargeResult>>() {
@Override
public void onNext(BaseResponse<RechargeResult> t) {
if (t.isSuccess()) {
- RechargeResult rechargeResult = t.getData();
- startNfcActivity(morny, rechargeResult.getIccardBalanceMoney(), rechargeResult.getRechargeElectricAmount(), rechargeResult.getIccardBalanceElectric(), rechargeResult.getTotalRechargeMoney(), rechargeResult.getIccardRechargeRecordId());
+ if (t.getData() != null) {
+ RechargeResult rechargeResult = t.getData();
+ startNfcActivity(morny, rechargeResult.getIccardBalanceMoney(), rechargeResult.getRechargeElectricAmount(), rechargeResult.getIccardBalanceElectric(), rechargeResult.getTotalRechargeMoney(), rechargeResult.getIccardRechargeRecordId());
+ } else {
+ TipUtil.show(RechargeActivity.this, "鍏呭�煎け璐ヨ閲嶈瘯锛�");
+ }
+ } else {
+ TipUtil.show(RechargeActivity.this, t.getMsg());
}
}
});
@@ -323,31 +332,36 @@
Map<String, Object> data = new HashMap<>();
//ic鍗′俊鎭痠d
data.put("iccardNum", iccardCode);
- ApiManager.getInstance().requestPostLoading(this, "api/sjgg/iccard/peasant/getIccardInfoVoByCardCode", CardInfoResult.class, data, new SubscriberListener<BaseResponse<CardInfoResult>>() {
+ ApiManager.getInstance().requestPostLoading(this, "iccard/peasant/getIccardInfoVoByCardCode", CardInfoResult.class, data, new SubscriberListener<BaseResponse<CardInfoResult>>() {
@Override
public void onNext(BaseResponse<CardInfoResult> t) {
String state = "";
if (t.isSuccess()) {
- //ic鍗＄姸鎬� 0 姝ｅ父 1 宸叉敞閿� 2 宸叉寕澶�
- if (t.getData().getIccardStatus() == 0) {
- List<byte[]> data = NfcReadHelper.getInstence(intent, RechargeActivity.this).getOnesectorData();
- if (!data.isEmpty()) {
- if (!TextUtils.isEmpty(cardNumber)) {
- cardInfoResult = t.getData();
- setUserData(cardNumber, cardInfoResult.getPeasantName(), cardInfoResult.getLastRechargeTime(), cardInfoResult.getIccardBalanceMoney(), data);
+ if (t.getData() != null) {
+ //ic鍗＄姸鎬� 0 姝ｅ父 1 宸叉敞閿� 2 宸叉寕澶�
+ if (t.getData().getIccardStatus() == 0) {
+ List<byte[]> data = NfcReadHelper.getInstence(intent, RechargeActivity.this).getOnesectorData();
+ if (!data.isEmpty()) {
+ if (!TextUtils.isEmpty(cardNumber)) {
+ cardInfoResult = t.getData();
+ setUserData(cardNumber, cardInfoResult.getPeasantName(), cardInfoResult.getLastRechargeTime(), data);
+ } else {
+ TipUtil.show(RechargeActivity.this, "璇诲彇鍗＄墖澶辫触锛岃閲嶆柊璐村崱");
+ }
} else {
- TipUtil.show(RechargeActivity.this, "璇诲彇鍗＄墖澶辫触锛岃閲嶆柊璐村崱");
+ TipUtil.show(RechargeActivity.this, "鍗＄墖璇嗗埆閿欒,璇烽噸璇曪紒");
}
+ } else if (t.getData().getIccardStatus() == 1) {
+ TipUtil.show(RechargeActivity.this, "褰撳墠鍗″凡娉ㄩ攢");
} else {
- TipUtil.show(RechargeActivity.this, "鍗＄墖璇嗗埆閿欒,璇烽噸璇曪紒");
+ TipUtil.show(RechargeActivity.this, "褰撳墠鍗″凡鎸傚け");
}
- } else if (t.getData().getIccardStatus() == 1) {
- TipUtil.show(RechargeActivity.this, "褰撳墠鍗″凡娉ㄩ攢");
} else {
- TipUtil.show(RechargeActivity.this, "褰撳墠鍗″凡鎸傚け");
+ TipUtil.show(RechargeActivity.this, "褰撳墠鍗＄墖閿欒锛屾湭鑳芥煡鍒拌鍗′俊鎭紒");
}
-
+ } else {
+ TipUtil.show(RechargeActivity.this, t.getMsg());
}
}
});
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeDetailActivity.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeDetailActivity.java
index b787dc1..93e786e 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeDetailActivity.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeDetailActivity.java
@@ -10,6 +10,7 @@
import com.dayu.qiheonlinelibrary.databinding.ActivityRechargeDetailQhlBinding;
import com.dayu.qiheonlinelibrary.dbBean.RechargeBean;
import com.dayu.qiheonlinelibrary.dbBean.UserCardBean;
+import com.dayu.qiheonlinelibrary.utils.PrintUtils;
import java.util.Calendar;
@@ -38,10 +39,13 @@
setContentView(binding.getRoot());
try {
- userCard = (UserCard) getIntent().getSerializableExtra("userCard");
- statu = getIntent().getStringExtra("statu");
- if (getIntent().hasExtra("morny")) {
- morny = getIntent().getStringExtra("morny");
+ if (getIntent().hasExtra("userCard")) {
+ userCard = (UserCard) getIntent().getSerializableExtra("userCard");
+ }
+ if (getIntent().hasExtra("statu")) {
+ statu = getIntent().getStringExtra("statu");
+ }
+ if (getIntent().hasExtra("rechargeBean")) {
rechargeBean = (RechargeBean) getIntent().getSerializableExtra("rechargeBean");
}
if (getIntent().hasExtra("userCardBean")) {
@@ -55,18 +59,27 @@
}
private void setUserData(String statu) {
- int balance = userCard.getBalance();
- if (!TextUtils.isEmpty(morny)) {
+
+ if (rechargeBean != null) {
binding.tip.setText("鍏呭�兼垚鍔燂紒");
- balance = userCard.getBalance();
binding.redName.setText("濮撳悕锛�" + rechargeBean.getUserName());
- binding.redRemainderMorny.setText("鍏呭�奸噾棰濓細" + morny + " 鍏�");
- binding.redRechargeBalance.setText("鍓╀綑閲戦锛�" + MornyUtil.changeF2Y(balance) + " 鍏�");
+ binding.redRemainderMorny.setText("鍏呭�奸噾棰濓細" + rechargeBean.getMorny() + " 鍏�");
+ binding.redRechargeBalance.setText("鍓╀綑閲戦锛�" + rechargeBean.getBalance() + " 鍏�");
binding.redRechargeElectric.setText("鍏呭�肩數閲忥細" + rechargeBean.getRechargeElectric() + " 搴�");
binding.redSurplusElectric.setText("鍓╀綑鐢甸噺锛�" + rechargeBean.getSurplusElectic() + " 搴�");
binding.redInitCode.setText("鍗″彿锛�" + rechargeBean.getCardNumber());
binding.redUserCode.setText("鐢ㄦ埛缂栧彿锛�" + rechargeBean.getUserCode());
+ if (MornyUtil.changeY2F(rechargeBean.getDeductionMorny()) > 0) {
+ binding.redDeductionMorny.setText("琛ユ墸閲戦锛�" + rechargeBean.getDeductionMorny());
+ } else {
+ binding.redDeductionMorny.setVisibility(View.GONE);
+ }
+ binding.readBtn.setVisibility(View.VISIBLE);
+ binding.readBtn.setOnClickListener(v -> {
+ PrintUtils.printerData(rechargeBean);
+ });
} else {
+ int balance = userCard.getBalance();
binding.redName.setText("濮撳悕锛�" + userCardBean.getUserName());
binding.tip.setText("寮�鍗℃垚鍔燂紒");
binding.redInitCode.setText("鍗″彿锛�" + userCardBean.getCardNumber());
@@ -75,8 +88,13 @@
binding.redRechargeBalance.setVisibility(View.GONE);
binding.redRechargeElectric.setVisibility(View.GONE);
binding.redSurplusElectric.setVisibility(View.GONE);
+ binding.redDeductionMorny.setVisibility(View.GONE);
}
- binding.redStatu.setText("鍗＄姸鎬侊細" + statu);
+ if (TextUtils.isEmpty(statu)) {
+ binding.redStatu.setVisibility(View.GONE);
+ } else {
+ binding.redStatu.setText("鍗＄姸鎬侊細" + statu);
+ }
if (userCard != null) {
Calendar calendar = userCard.getRechargeDate();
if (calendar != null) {
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeListActivity.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeListActivity.java
index f1b3245..eda28d5 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeListActivity.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/RechargeListActivity.java
@@ -3,6 +3,7 @@
import static com.dayu.baselibrary.view.TitleBar.ClickType_RIGHT_TEXT;
+import android.content.Intent;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
@@ -15,6 +16,7 @@
import com.dayu.baselibrary.view.datepicker.CustomDatePicker;
import com.dayu.baselibrary.view.datepicker.DateFormatUtils;
+import com.dayu.qiheonlinelibrary.QHOnLineApplication;
import com.dayu.qiheonlinelibrary.adapter.RechargeAdapter;
import com.dayu.qiheonlinelibrary.databinding.ActivityRechargeListQhlBinding;
import com.dayu.qiheonlinelibrary.dbBean.RechargeBean;
@@ -74,7 +76,11 @@
getList();
}
});
- adapter = new RechargeAdapter(this, rechargeList);
+ adapter = new RechargeAdapter(this, rechargeList, position -> {
+ Intent intent = new Intent(RechargeListActivity.this, RechargeDetailActivity.class);
+ intent.putExtra("rechargeBean", rechargeList.get(position));
+ startActivity(intent);
+ });
LinearLayoutManager layoutManager = new LinearLayoutManager(this);
rechargeListBinding.recyclerView.setLayoutManager(layoutManager);
rechargeListBinding.recyclerView.setAdapter(adapter);
@@ -98,9 +104,9 @@
// 鍦ㄨ繖閲屾墽琛屽紓姝ユ搷浣�
List<RechargeBean> beanList;
if (beginTime == 0 && endTime == 0) {
- beanList = asynchBaseDao.rechargeDao().findAll(page * limit, limit);
+ beanList = asynchBaseDao.rechargeDao().findAll(QHOnLineApplication.qhAloneApplication.adminId, page * limit, limit);
} else {
- beanList = asynchBaseDao.rechargeDao().ansyFindByTime(beginTime, endTime);
+ beanList = asynchBaseDao.rechargeDao().ansyFindByTime(QHOnLineApplication.qhAloneApplication.adminId, beginTime, endTime);
}
// 灏嗙粨鏋滃彂閫佺粰瑙傚療鑰�
emitter.onNext(beanList);
@@ -113,11 +119,16 @@
result -> {
// 鍦ㄨ繖閲屽鐞嗙粨鏋滐紝杩欓噷鏄湪涓荤嚎绋嬩腑
// System.out.println("Result: " + result);
- if (result.size() < limit) {
- myRefreshLayout.finishLoadMoreWithNoMoreData();
- }
- if (result != null && result.size() > 0) {
+ if (beginTime == 0 && endTime == 0) {
+ if (result.size() < limit) {
+ myRefreshLayout.finishLoadMoreWithNoMoreData();
+ }
+ if (result != null && result.size() > 0) {
+ rechargeList.addAll(result);
+ }
+ } else {
rechargeList.addAll(result);
+ myRefreshLayout.finishLoadMoreWithNoMoreData();
}
adapter.notifyDataSetChanged();
getTotal();
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/UserSearchActivity.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/UserSearchActivity.java
index b45759d..3a3b79e 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/UserSearchActivity.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/UserSearchActivity.java
@@ -12,6 +12,7 @@
import com.dayu.qiheonlinelibrary.adapter.UserSearchAdapter;
import com.dayu.qiheonlinelibrary.bean.UserListResult;
import com.dayu.qiheonlinelibrary.databinding.ActivityUserSearchQhlBinding;
+import com.dayu.qiheonlinelibrary.dbBean.UserCardBean;
import com.dayu.qiheonlinelibrary.net.ApiManager;
import com.dayu.qiheonlinelibrary.net.BaseResponse;
import com.dayu.qiheonlinelibrary.net.subscribers.SubscriberListener;
@@ -32,6 +33,8 @@
* 澶囨敞锛氱敤鎴锋悳绱�
*/
public class UserSearchActivity extends BaseActivity {
+ public static UserSearchActivity userSearchActivity;
+
ActivityUserSearchQhlBinding binding;
UserSearchDialog userSearchDialog;
RefreshLayout myRefreshLayout;
@@ -45,9 +48,12 @@
int type;//褰撳墠鎿嶄綔绫诲瀷
+ UserCardBean userCardBean = new UserCardBean();
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ userSearchActivity = this;
binding = ActivityUserSearchQhlBinding.inflate(LayoutInflater.from(this));
setContentView(binding.getRoot());
type = this.getIntent().getIntExtra("type", 0);
@@ -69,11 +75,18 @@
adapter = new UserSearchAdapter(this, records, new UserSearchAdapter.OnItemClickListener() {
@Override
public void onItemClick(int position) {
+ UserListResult.Records record = records.get(position);
+ userCardBean.setUserName(record.getPeasantName());
+ userCardBean.setUserID(record.getPeasantIdNumber());
+ userCardBean.setPhone(record.getPeasantPhone());
+ userCardBean.setPersonId(record.getPeasantId());
+ userCardBean.setAddressCode(record.getAdcd());
+ userCardBean.setAddressName(record.getAdcdName());
Intent intent = new Intent(UserSearchActivity.this, CardSearchActivity.class);
- intent.putExtra("pearsontId", records.get(position).getPeasantId());
+ intent.putExtra("pearsontId", record.getPeasantId());
intent.putExtra("type", type);
+ intent.putExtra("dbUserCard", userCardBean);
UserSearchActivity.this.startActivity(intent);
- UserSearchActivity.this.finish();
}
});
LinearLayoutManager layoutManager = new LinearLayoutManager(this);
@@ -113,15 +126,14 @@
data.put("peasantName", name);
data.put("current", page);
data.put("pageSize", size);
- ApiManager.getInstance().requestPostLoading(this, "api/sjgg/base/peasant/pagePeasantVo", UserListResult.class, data, new SubscriberListener<BaseResponse<UserListResult>>() {
+ ApiManager.getInstance().requestPostLoading(this, "base/peasant/pagePeasantVo", UserListResult.class, data, new SubscriberListener<BaseResponse<UserListResult>>() {
@Override
public void onNext(BaseResponse<UserListResult> t) {
if (t.isSuccess()) {
- if (t.getData().getTotal() == records.size()) {
+ if (t.getData().getTotal() == records.size() || size > t.getData().getTotal()) {
myRefreshLayout.finishLoadMoreWithNoMoreData();
- } else {
- records.addAll(t.getData().getRecords());
}
+ records.addAll(t.getData().getRecords());
adapter.notifyDataSetChanged();
myRefreshLayout.finishLoadMore();
}
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/adapter/CardAdapter.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/adapter/CardAdapter.java
index 6ecc6fa..6d63cec 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/adapter/CardAdapter.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/adapter/CardAdapter.java
@@ -62,9 +62,9 @@
CardInfoListResult.Records record = records.get(position);
((ViewHolder) holder).getBinding().cardId.setText(record.getIccardNum());
((ViewHolder) holder).getBinding().userCode.setText(record.getIccardCode());
- ((ViewHolder) holder).getBinding().balance.setText(record.getIccardBalanceMoney() + "鍏�");
- ((ViewHolder) holder).getBinding().totalMorny.setText(record.getTotalRechargeMoney() + "鍏�");
- ((ViewHolder) holder).getBinding().balanceElectic.setText(record.getIccardBalanceElectric());
+ ((ViewHolder) holder).getBinding().balance.setText(record.getIccardBalanceMoney() + " 鍏�");
+ ((ViewHolder) holder).getBinding().totalMorny.setText(record.getTotalRechargeMoney() + " 鍏�");
+ ((ViewHolder) holder).getBinding().balanceElectic.setText(record.getIccardBalanceElectric()+" 搴�");
((ViewHolder) holder).getBinding().lastRechargeTime.setText("鏈�鍚庡厖鍊兼椂闂达細" + record.getLastRechargeTime());
if (record.getIccardStatus() == 0) {
((ViewHolder) holder).getBinding().state.setText("姝ｅ父");
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/adapter/RechargeAdapter.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/adapter/RechargeAdapter.java
index 99ac7e7..2f1dc3c 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/adapter/RechargeAdapter.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/adapter/RechargeAdapter.java
@@ -25,10 +25,17 @@
List<RechargeBean> rechargeList;
Context mContext;
+ OnItemClickListener onItemClickListener;
- public RechargeAdapter(Context context, List<RechargeBean> rechargeList) {
+ public interface OnItemClickListener {
+ void onItemClick(int position);
+ }
+
+
+ public RechargeAdapter(Context context, List<RechargeBean> rechargeList, OnItemClickListener onItemClickListener) {
mContext = context;
this.rechargeList = rechargeList;
+ this.onItemClickListener = onItemClickListener;
}
@@ -49,12 +56,11 @@
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
if (holder instanceof ViewHolder) {
if (rechargeList.size() > 0) {
+ ((ViewHolder) holder).getBinding().item.setOnClickListener(v -> onItemClickListener.onItemClick(position));
((ViewHolder) holder).getBinding().userName.setText("濮撳悕:" + rechargeList.get(position).getUserName());
((ViewHolder) holder).getBinding().userNo.setText("鍗″彿:" + rechargeList.get(position).getCardNumber());
((ViewHolder) holder).getBinding().morny.setText("鍏呭�奸噾棰�:" + rechargeList.get(position).getMorny() + " 鍏�");
-// ((ViewHolder) holder).getBinding().rachagerWater.setText("鍏呭�兼按閲�:" + rechargeList.get(position).getRechargeWater() + " 鍚�");
((ViewHolder) holder).getBinding().balance.setText("鍏呭�兼椂浣欓:" + rechargeList.get(position).getBalance() + " 鍏�");
-// ((ViewHolder) holder).getBinding().surplusWater.setText("鍓╀綑姘撮噺:" + rechargeList.get(position).getSurplusWater() + " 鍚�");
((ViewHolder) holder).getBinding().date.setText("鏃ユ湡:" + DateUtil.dateToStamp(rechargeList.get(position).getRechargeDate(), DateUtil.type1));
}
}
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/AddUserResult.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/AddUserResult.java
index 64eaef3..ad2c208 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/AddUserResult.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/AddUserResult.java
@@ -6,7 +6,7 @@
* Time: 16:13
* 澶囨敞锛�
*/
-public class AddUserResult {
+public class AddUserResult extends BaseResult{
// {"state":1,"updatedTime":"2024-08-05 16:12:29","accountType":0,"planId":"","preRechargeMoney":0.00,"adcdName":"鐒﹀簷鏉戝浼�","iccardBalanceMoney":"","updatedBy":"1816297106145103873","peasantType":"","compensateMoney":0.00,"createdTime":"2024-08-05 16:12:29","refunds":0.00,"peasantId":"1820372286394867713","priceType":"","createdBy":"1816297106145103873","adcd":"371425102301","peasantIdNumber":"130107199210160023","peasantCode":"37142510230100013","peasantName":"娴嬭瘯","peasantPhone":"15802220723","contractedLandArea":"","address":"","planName":""}
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/BaseResult.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/BaseResult.java
new file mode 100644
index 0000000..7d418cf
--- /dev/null
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/BaseResult.java
@@ -0,0 +1,11 @@
+package com.dayu.qiheonlinelibrary.bean;
+
+/**
+ * Created by Android Studio.
+ * author: zuo
+ * Date: 2024-08-14
+ * Time: 15:29
+ * 澶囨敞锛�
+ */
+public class BaseResult {
+}
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/CardInfoListResult.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/CardInfoListResult.java
index 69d41a1..791bc9e 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/CardInfoListResult.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/CardInfoListResult.java
@@ -8,7 +8,7 @@
* Time: 14:43
* 澶囨敞锛�
*/
-public class CardInfoListResult {
+public class CardInfoListResult extends BaseResult{
int total;//鎬绘暟
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/CardInfoResult.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/CardInfoResult.java
index 217d9c2..f514cc8 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/CardInfoResult.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/CardInfoResult.java
@@ -6,7 +6,7 @@
* Time: 16:51
* 澶囨敞锛氶�氳繃瀹炰綋鍗″彿鏌ヨ鍒扮殑淇℃伅
*/
-public class CardInfoResult {
+public class CardInfoResult extends BaseResult {
//{"chargeMethod":"","iccardCancelTime":"","lastRechargeTime":"2024-08-06 15:21:59","thisSaleMoney":"","totalRechargeWaterAmount":0.00,"iccardBalanceAmonunt":0.00,"iccardInfoId":"1820721965431267330","iccardProtocolName":"","totalRechargeElectricAmount":0.00,"logicState":1,"username":"","state":1,"familySize":"","yearRechargeMoney":0.00,"thisSaleAmount":"","onlyRechargeMoney":"","identityCard":"","iccardBrand":"","iccardBalanceMoney":0.00,"openOperatorUsername":"","adName":"","rechargeWaterAmount":"","openOperatorUserId":"1816297106145103873","lastSwipeTime":"","address":"","yearCompensateMoney":0.00,"iccardProtocolOpenMoney":"","peasantId":"1820374742679953410","reissueTimes":0,"iccardProtocolReissueMoney":"","iccardProtocolId":"","yearRechargeWaterAmount":0.00,"iccardBalanceElectric":0.00,"iccardStatus":0,"phone":"","lastRechargeMoney":0.00,"iccardOpenTime":"2024-08-06 15:21:59","yearRechargeElectricAmount":0.00,"reissueRechargeRecordId":"","iccardPrice":1.50,"iccardNum":"3714251023011","accountType":0,"equipCode":"","rechargeWaterMoney":"","totalRechargeMoney":0.00,"executeWaterPrice":"","iccardType":1,"iccardCode":"4440DABA"}
int iccardStatus;//ic鍗＄姸鎬� 0 姝ｅ父 1 宸叉敞閿� 2 宸叉寕澶�
@@ -31,6 +31,26 @@
String iccardBalanceElectric;// 鍗″唴鍓╀綑鐢甸噺
+ String adcd;
+
+ String adcdName;
+
+ public String getAdcd() {
+ return adcd;
+ }
+
+ public void setAdcd(String adcd) {
+ this.adcd = adcd;
+ }
+
+ public String getAdcdName() {
+ return adcdName;
+ }
+
+ public void setAdcdName(String adcdName) {
+ this.adcdName = adcdName;
+ }
+
public String getIccardBalanceElectric() {
return iccardBalanceElectric;
}
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/LoginResult.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/LoginResult.java
index 64cf5c4..258a142 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/LoginResult.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/LoginResult.java
@@ -8,9 +8,9 @@
* Time: 16:06
* 澶囨敞锛�
*/
-public class LoginResult {
+public class LoginResult extends BaseResult{
//{"code":"0","msg":"鎿嶄綔鎴愬姛","data":{"chargeMethod":"","iccardCancelTime":"","lastRechargeTime":"2024-08-05 17:04:15","thisSaleMoney":"","totalRechargeWaterAmount":0.00,"iccardBalanceAmonunt":0.00,"iccardInfoId":"1820385315354320898","iccardProtocolName":"","totalRechargeElectricAmount":0.00,"logicState":1,"username":"","state":1,"familySize":"","yearRechargeMoney":0.00,"thisSaleAmount":"","onlyRechargeMoney":"","identityCard":"","iccardBrand":"","iccardBalanceMoney":0.00,"openOperatorUsername":"","adName":"","rechargeWaterAmount":"","openOperatorUserId":"1816297106145103873","lastSwipeTime":"","address":"","yearCompensateMoney":0.00,"iccardProtocolOpenMoney":"","peasantId":"1820374742679953410","reissueTimes":0,"iccardProtocolReissueMoney":"","iccardProtocolId":"","yearRechargeWaterAmount":0.00,"iccardBalanceElectric":0.00,"iccardStatus":0,"phone":"","lastRechargeMoney":0.00,"iccardOpenTime":"","yearRechargeElectricAmount":0.00,"reissueRechargeRecordId":"","iccardPrice":1.50,"iccardNum":"3714251023011","accountType":0,"equipCode":"","rechargeWaterMoney":"","totalRechargeMoney":0.00,"executeWaterPrice":"","iccardType":1,"iccardCode":"BADA4044"}}
-
+ public String userId;//鐢ㄦ埛id
OtherData otherData;
@@ -52,5 +52,11 @@
}
}
+ public String getUserId() {
+ return userId;
+ }
+ public void setUserId(String userId) {
+ this.userId = userId;
+ }
}
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/OpenCardResult.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/OpenCardResult.java
index 9230906..ad86c9b 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/OpenCardResult.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/OpenCardResult.java
@@ -6,7 +6,7 @@
* Time: 16:23
* 澶囨敞锛�
*/
-public class OpenCardResult {
+public class OpenCardResult extends BaseResult{
// {"code":"0","msg":"鎿嶄綔鎴愬姛","data":{"iccardBalanceMoney":0,"lastSwipeTime":"","rechargeOperatorUsername":"","rechargeType":0,"iccardCode":"3714251023010002","rechargeCallbackType":"","iccardNum":"","lastRechargeTime":"","iccardBalanceAmonunt":0,"thisSaleAmount":"","remark":"寰呭啓鍗★紝寮�鍗′氦鏄撲腑","username":"","rechargeRecordNum":"1821459146525384704","totalRechargeMoney":"","iccardType":"","reissueTimes":"","yearRechargeElectricAmount":"","rechargeWaterAmount":"","iccardRechargeRecordId":"1821459146567327745","rechargeOperatorUserId":"1816297106145103873","chargeMethod":"","yearRechargeMoney":"","rechargeElectricAmount":"","iccardProtocolName":"","equipCode":"","thisSaleMoney":"","iccardBalanceElectric":"","rechargeCardMoney":5,"peasantId":"1821458177314004994","totalRechargeElectricAmount":"","rechargeStatus":1,"writeCardStatus":1,"lastRechargeMoney":"","totalRechargeWaterAmount":"","executeWaterPrice":"","adName":"","yearCompensateMoney":"","iccardBrand":"","rechargeWaterMoney":"","yearRechargeWaterAmount":"","rechargeMoney":5,"iccardInfoId":"1821459146349223937","rechargeTime":"","iccardPrice":1.50016}}
String iccardRechargeRecordId;//ic鍗′氦鏄撹褰昳d
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/PricePlanResult.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/PricePlanResult.java
index 6fbb818..8c28777 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/PricePlanResult.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/PricePlanResult.java
@@ -10,7 +10,7 @@
* Time: 16:00
* 澶囨敞锛氭按浠风鐞嗗垪琛�
*/
-public class PricePlanResult {
+public class PricePlanResult extends BaseResult{
// {
// "code": "0",
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/RechargeResult.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/RechargeResult.java
index 8d092bb..b6abf38 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/RechargeResult.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/RechargeResult.java
@@ -6,7 +6,7 @@
* Time: 11:08
* 澶囨敞锛�
*/
-public class RechargeResult {
+public class RechargeResult extends BaseResult{
//{"iccardBalanceMoney":2,"lastSwipeTime":"","rechargeOperatorUsername":"","rechargeType":1,"iccardCode":"4440DABA","rechargeCallbackType":"","iccardNum":"","lastRechargeTime":"","iccardBalanceAmonunt":6.25,"thisSaleAmount":"","remark":"寰呭啓鍗★紝鍏呭�间氦鏄撲腑","username":"","rechargeRecordNum":"1821020394581663744","totalRechargeMoney":0.00,"iccardType":"","reissueTimes":"","yearRechargeElectricAmount":0.00,"rechargeWaterAmount":6.25,"iccardRechargeRecordId":"1821020394594246658","rechargeOperatorUserId":"1816297106145103873","chargeMethod":"","yearRechargeMoney":0.00,"rechargeElectricAmount":1.33,"iccardProtocolName":"","equipCode":"","thisSaleMoney":"","iccardBalanceElectric":1.33,"rechargeCardMoney":"","peasantId":"1820374742679953410","totalRechargeElectricAmount":0.00,"rechargeStatus":1,"writeCardStatus":1,"lastRechargeMoney":"","totalRechargeWaterAmount":0.00,"executeWaterPrice":"","adName":"","yearCompensateMoney":"","iccardBrand":"","rechargeWaterMoney":2,"yearRechargeWaterAmount":0.00,"rechargeMoney":2,"iccardInfoId":"","rechargeTime":"","iccardPrice":1.50}
String iccardBalanceMoney;//鍗″唴鍓╀綑閲戦锛堝厓锛�
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/ReplaceCardResult.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/ReplaceCardResult.java
index 7164176..92bd6e2 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/ReplaceCardResult.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/ReplaceCardResult.java
@@ -6,7 +6,7 @@
* Time: 16:29
* 澶囨敞锛氳ˉ鍗¤繑鍥炲弬鏁�
*/
-public class ReplaceCardResult {
+public class ReplaceCardResult extends BaseResult{
//{"code":"0","msg":"鎿嶄綔鎴愬姛","data":{"iccardBalanceMoney":5.00,"lastSwipeTime":"","rechargeOperatorUsername":"","rechargeType":0,"iccardCode":"3714251023010005","rechargeCallbackType":"","iccardNum":"","lastRechargeTime":"","iccardBalanceAmonunt":15.63,"thisSaleAmount":"","remark":"寰呭啓鍗★紝琛ュ崱寮�鍗′氦鏄撲腑","username":"","rechargeRecordNum":"1821825921016406016","totalRechargeMoney":"","iccardType":"","reissueTimes":"","yearRechargeElectricAmount":"","rechargeWaterAmount":"","iccardRechargeRecordId":"1821825921020600321","rechargeOperatorUserId":"1816297106145103873","chargeMethod":"","yearRechargeMoney":"","rechargeElectricAmount":"","iccardProtocolName":"","equipCode":"","thisSaleMoney":"","iccardBalanceElectric":3.33,"rechargeCardMoney":4,"peasantId":"1821458177314004994","totalRechargeElectricAmount":"","rechargeStatus":1,"writeCardStatus":1,"lastRechargeMoney":"","totalRechargeWaterAmount":"","executeWaterPrice":"","adName":"","yearCompensateMoney":"","iccardBrand":"","rechargeWaterMoney":"","yearRechargeWaterAmount":"","rechargeMoney":4,"iccardInfoId":"1821825920739581954","rechargeTime":"","iccardPrice":1.50}}
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/UserListResult.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/UserListResult.java
index c31efa2..34c123c 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/UserListResult.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/bean/UserListResult.java
@@ -8,7 +8,7 @@
* Time: 15:28
* 澶囨敞锛�
*/
-public class UserListResult {
+public class UserListResult extends BaseResult{
int total;//鎬绘暟
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/card/ManageCard.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/card/ManageCard.java
index 6ce82f5..04ba3e4 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/card/ManageCard.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/card/ManageCard.java
@@ -55,16 +55,20 @@
public static ManageCard getBean(List<byte[]> data) {
if (data != null) {
- ManageCard manageCard = new ManageCard();
- byte[] zero = data.get(0);
- byte[] arerNumberByte = new byte[4];
- System.arraycopy(zero, 1, arerNumberByte, 0, arerNumberByte.length);
- manageCard.arerNumber = HexUtil.get16To10LowHightByBytes(arerNumberByte);
- byte[] passWordByte = new byte[4];
- System.arraycopy(zero, 5, passWordByte, 0, passWordByte.length);
- manageCard.setUserCard(HexUtil.bytesToHex(passWordByte));
- manageCard.setCardWriteState(zero[13]);
- return manageCard;
+ try {
+ ManageCard manageCard = new ManageCard();
+ byte[] zero = data.get(0);
+ byte[] arerNumberByte = new byte[4];
+ System.arraycopy(zero, 1, arerNumberByte, 0, arerNumberByte.length);
+ manageCard.arerNumber = HexUtil.get16To10LowHightByBytes(arerNumberByte);
+ byte[] passWordByte = new byte[4];
+ System.arraycopy(zero, 5, passWordByte, 0, passWordByte.length);
+ manageCard.setUserCard(HexUtil.bytesToHex(passWordByte));
+ manageCard.setCardWriteState(zero[13]);
+ return manageCard;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
return null;
}
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/dao/RechargeDao.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/dao/RechargeDao.java
index b057c8e..437c794 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/dao/RechargeDao.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/dao/RechargeDao.java
@@ -37,9 +37,9 @@
@Query("select * from RechargeBean where rechargeDate>=:beginTime and rechargeDate<=:endTime")
LiveData<List<RechargeBean>> findByTime(long beginTime, long endTime);
- @Query("select * from RechargeBean where rechargeDate>=:beginTime and rechargeDate<=:endTime")
- List<RechargeBean> ansyFindByTime(long beginTime, long endTime);
+ @Query("select * from RechargeBean where rechargeDate>=:beginTime and rechargeDate<=:endTime and adminId =:adminId")
+ List<RechargeBean> ansyFindByTime(String adminId,long beginTime, long endTime);
- @Query("select * from RechargeBean order by rechargeDate desc LIMIT :limit OFFSET :offset")
- List<RechargeBean> findAll(int offset,int limit);
+ @Query("select * from RechargeBean where adminId =:adminId order by rechargeDate desc LIMIT :limit OFFSET :offset")
+ List<RechargeBean> findAll(String adminId,int offset,int limit);
}
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/dbBean/RechargeBean.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/dbBean/RechargeBean.java
index 1987c09..f789bfa 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/dbBean/RechargeBean.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/dbBean/RechargeBean.java
@@ -46,6 +46,15 @@
private String deductionMorny;//琛ユ墸閽辨 鍏呭�艰ˉ鎵ｉ噾棰�=鍏呭�奸噾棰�+鍏呭�煎墠璇诲彇鐨勫崱鍐呬綑棰�-鍏呭�煎洖璋冭繑鍥炲崱鍐呬綑棰�
+ private String adminId;//褰撳墠鐧诲綍鐨勭敤鎴穒d
+
+ public String getAdminId() {
+ return adminId;
+ }
+
+ public void setAdminId(String adminId) {
+ this.adminId = adminId;
+ }
public String getDeductionMorny() {
return deductionMorny;
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/net/ApiManager.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/net/ApiManager.java
index 6746ef3..89194be 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/net/ApiManager.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/net/ApiManager.java
@@ -2,9 +2,11 @@
import android.content.Context;
import android.content.Intent;
+import android.text.TextUtils;
import com.dayu.baselibrary.business.BusinessProvider;
+import com.dayu.qiheonlinelibrary.bean.BaseResult;
import com.dayu.qiheonlinelibrary.net.subscribers.BaseProgressSubscriber;
import com.dayu.qiheonlinelibrary.net.subscribers.ProgressSubscriber;
import com.dayu.qiheonlinelibrary.net.subscribers.SubscriberListener;
@@ -117,8 +119,8 @@
BaseResponse tem = (BaseResponse) o;
BaseResponse<T> response = new BaseResponse<>();
//鏈櫥褰曟垨鐧诲綍瓒呮椂锛岃閲嶆柊鐧诲綍
- if (tem.getCode()==100401){
- if (BusinessProvider.getBusinessProvider()!=null){
+ if (tem.getCode() == 100401) {
+ if (BusinessProvider.getBusinessProvider() != null) {
BusinessProvider.getBusinessProvider().startLoginNavigotor.navigateToLogin(context);
}
@@ -126,35 +128,40 @@
response.setCode(tem.getCode());
response.setMsg(tem.getMsg());
- if (tClass!= null) {
- if ( tem.getData() instanceof Map) {
- try {
+ if (tClass != null) {
+ if (TextUtils.isEmpty(tem.getData().toString()) && BaseResult.class.isAssignableFrom(tClass)) {
+ response.setData(null);
+ return response;
+ }
+ if (tem.getData() instanceof Map) {
+ try {
// response.setData(MyJsonParser.getBeanFromMap((Map<String, Object>) tem.getData(), tClass));
- String jsonData = MyJsonParser.getJsontoMap((Map) tem.getData());
- response.setData(MyJsonParser.getBeanFromJson(jsonData, tClass));
- } catch (Exception e) {
- e.printStackTrace();
- }
- } else if ( tem.getData() instanceof List) {
- try {
- response.setData((T) MyJsonParser.getListByJson(MyJsonParser.getJsonbyList((List) tem.getData()), tClass));
- } catch (Exception e) {
- e.printStackTrace();
- }
- } else if ( tem.getData() instanceof Integer) {
- response.setData((T) tem.getData());
- } else if (tem.getData() instanceof Boolean){
- response.setData((T) tem.getData());
- }
- if ( tClass.getName() instanceof String && tem.getData() instanceof String) {
- try {
+ String jsonData = MyJsonParser.getJsontoMap((Map) tem.getData());
+ response.setData(MyJsonParser.getBeanFromJson(jsonData, tClass));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ } else if (tem.getData() instanceof List) {
+ try {
+ response.setData((T) MyJsonParser.getListByJson(MyJsonParser.getJsonbyList((List) tem.getData()), tClass));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ } else if (tem.getData() instanceof Integer) {
response.setData((T) tem.getData());
- } catch (Exception e) {
- e.printStackTrace();
+ } else if (tem.getData() instanceof Boolean) {
+ response.setData((T) tem.getData());
}
+ if (tClass.getName() instanceof String && tem.getData() instanceof String) {
+ try {
+ response.setData((T) tem.getData());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ return response;
}
- return response;
- }}
+ }
return null;
}
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/net/Constants.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/net/Constants.java
index fe00c70..fc8f768 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/net/Constants.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/net/Constants.java
@@ -7,7 +7,7 @@
* Description:
*/
public class Constants {
- public static final String BASE_URL = "http://120.46.45.35:20081/";
+ public static final String BASE_URL = "http://120.46.45.35:20081/api/sjggqhtest/";
/**
* 浠ｈ〃璇锋眰鎴愬姛
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/tools/NfcReadHelper.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/tools/NfcReadHelper.java
index 10eaebd..424c0d1 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/tools/NfcReadHelper.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/tools/NfcReadHelper.java
@@ -136,8 +136,8 @@
byte[] data = mfc.readBlock(bIndex + 0);
if (data != null && data.length > 0) {
String hex = HexUtil.bytesToHex(Arrays.copyOfRange(data, 0, 4));
-// hex = HexUtil.spaceHex(hex);
-// hex = HexUtil.HighLowHex(hex);
+ hex = HexUtil.spaceHex(hex);
+ hex = HexUtil.HighLowHex(hex);
Log.i("NFCWreatActivity", "hex===" + hex);
return hex.toUpperCase();
}
@@ -179,6 +179,8 @@
byte[] data = mfc.readBlock(bIndex + 0);
if (data != null && data.length > 0) {
String hex = HexUtil.bytesToHex(Arrays.copyOfRange(data, 0, 4));
+ hex = HexUtil.spaceHex(hex);
+ hex = HexUtil.HighLowHex(hex);
strData.append(hex);
strData.append(",");
Log.i("NFCWreatActivity", "hex===" + hex);
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/utils/PrintUtils.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/utils/PrintUtils.java
new file mode 100644
index 0000000..9d0d1b3
--- /dev/null
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/utils/PrintUtils.java
@@ -0,0 +1,57 @@
+package com.dayu.qiheonlinelibrary.utils;
+
+import android.text.TextUtils;
+
+import com.dayu.baselibrary.utils.AidlUtil;
+import com.dayu.baselibrary.utils.DateUtil;
+import com.dayu.baselibrary.utils.MornyUtil;
+import com.dayu.qiheonlinelibrary.dbBean.RechargeBean;
+import com.tencent.bugly.crashreport.CrashReport;
+
+/**
+ * Created by Android Studio.
+ * author: zuo
+ * Date: 2024-08-14
+ * Time: 10:57
+ * 澶囨敞锛�
+ */
+public class PrintUtils {
+
+ /**
+ * 鎵撳嵃鏈虹浉鍏充俊鎭�
+ *
+ * @param rechargeBean
+ */
+ public static void printerData(RechargeBean rechargeBean) {
+ try {
+ StringBuffer data = new StringBuffer();
+ if (rechargeBean != null) {
+ data.append("*****************************" + "\n");
+ data.append("璁惧搴忓垪鍙凤細" + rechargeBean.getSerial() + "\n");
+ data.append("濮� 鍚嶏細" + rechargeBean.getUserName() + "\n");
+ data.append("鍗� 鍙凤細" + rechargeBean.getCardNumber() + "\n");
+ data.append("鐢ㄦ埛缂栧彿锛�" + rechargeBean.getUserCode() + "\n");
+ data.append("鍏呭�奸噾棰濓細" + rechargeBean.getMorny() + " 鍏�" + "\n");
+ if (MornyUtil.changeY2F(rechargeBean.getDeductionMorny()) > 0) {
+ data.append("琛ユ墸閲戦锛�" + rechargeBean.getDeductionMorny() + " 鍏�" + "\n");
+ }
+ data.append("鍏呭�煎悗鍗″唴浣欓锛�" + rechargeBean.getBalance() + " 鍏�" + "\n");
+ data.append("鍏呭�肩數閲忥細" + rechargeBean.getRechargeElectric() + " 搴�" + "\n");
+ data.append("鍏呭�煎悗鍗″唴鐢甸噺锛�" + rechargeBean.getSurplusElectic() + " 搴�" + "\n");
+ data.append("鏃� 鏈燂細" + DateUtil.dateToStamp(rechargeBean.getRechargeDate(), DateUtil.type2) + "\n\n");
+ data.append("*****************************");
+ }
+ float size = 26;
+ try {
+ AidlUtil.getInstance().printText(data.toString(), size, true, false);
+// AidlUtil.getInstance().print3Line();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ CrashReport.postCatchedException(e);
+ }
+ }
+}
diff --git a/qiheonlinelibrary/src/main/res/layout/activity_admin_qhl.xml b/qiheonlinelibrary/src/main/res/layout/activity_admin_qhl.xml
index 21543a8..01e36aa 100644
--- a/qiheonlinelibrary/src/main/res/layout/activity_admin_qhl.xml
+++ b/qiheonlinelibrary/src/main/res/layout/activity_admin_qhl.xml
@@ -92,7 +92,7 @@
android:layout_marginTop="20dp"
android:padding="5dp"
android:text="鍒朵綔鐢ㄦ埛鐢甸噺鍗曚环鍗�"
- android:visibility="gone"
+ android:visibility="visible"
android:textColor="@color/text_selecter_color"
android:textSize="@dimen/text_size" />
</LinearLayout>
diff --git a/qiheonlinelibrary/src/main/res/layout/activity_my_qhl.xml b/qiheonlinelibrary/src/main/res/layout/activity_my_qhl.xml
index 2a8c7c8..27f07ff 100644
--- a/qiheonlinelibrary/src/main/res/layout/activity_my_qhl.xml
+++ b/qiheonlinelibrary/src/main/res/layout/activity_my_qhl.xml
@@ -124,7 +124,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toStartOf="@+id/my_newCardOut"
- android:text="寮�鎴疯褰�"
+ android:text="寮�鍗¤褰�"
android:textColor="@color/text_selecter_color"
android:textSize="@dimen/text_size" />
diff --git a/qiheonlinelibrary/src/main/res/layout/activity_newcard_list_qhl.xml b/qiheonlinelibrary/src/main/res/layout/activity_newcard_list_qhl.xml
index 08244d6..7e8f7ba 100644
--- a/qiheonlinelibrary/src/main/res/layout/activity_newcard_list_qhl.xml
+++ b/qiheonlinelibrary/src/main/res/layout/activity_newcard_list_qhl.xml
@@ -10,7 +10,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dimen_title_height"
android:background="@color/title_bar_bg"
- app:centerText="寮�鎴疯褰�"
+ app:centerText="寮�鍗¤褰�"
app:leftImage="@mipmap/icon_back"
app:rightText="绛涢��" />
diff --git a/qiheonlinelibrary/src/main/res/layout/activity_recharge_detail_qhl.xml b/qiheonlinelibrary/src/main/res/layout/activity_recharge_detail_qhl.xml
index 9a73c6d..262a752 100644
--- a/qiheonlinelibrary/src/main/res/layout/activity_recharge_detail_qhl.xml
+++ b/qiheonlinelibrary/src/main/res/layout/activity_recharge_detail_qhl.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -16,7 +16,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:layout_above="@id/read_btn"
android:orientation="vertical"
+ android:layout_below="@id/titleBar"
android:padding="30dp">
<TextView
@@ -34,6 +36,7 @@
android:layout_marginTop="15dp"
android:text="褰撳墠鍗″彿锛�"
android:textSize="@dimen/text_size" />
+
<TextView
android:id="@+id/red_userCode"
android:layout_width="match_parent"
@@ -49,6 +52,15 @@
android:layout_marginTop="15dp"
android:text="鍏呭�奸噾棰濓細"
android:textSize="@dimen/text_size" />
+
+ <TextView
+ android:id="@+id/red_deductionMorny"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="15dp"
+ android:text="鍏呭�奸噾棰濓細"
+ android:textSize="@dimen/text_size" />
+
<TextView
android:id="@+id/red_recharge_balance"
android:layout_width="match_parent"
@@ -56,14 +68,15 @@
android:layout_marginTop="15dp"
android:text="鍓╀綑閲戦锛�"
android:textSize="@dimen/text_size" />
+
<TextView
android:id="@+id/red_remainder_blance"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="鍓╀綑閲戦锛�"
- android:visibility="gone"
- android:textSize="@dimen/text_size" />
+ android:textSize="@dimen/text_size"
+ android:visibility="gone" />
<TextView
android:id="@+id/red_rechargeElectric"
@@ -71,16 +84,18 @@
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="鍏呭�肩數閲忥細"
- android:visibility="visible"
- android:textSize="@dimen/text_size" />
+ android:textSize="@dimen/text_size"
+ android:visibility="visible" />
+
<TextView
android:id="@+id/red_surplusElectric"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="鍓╀綑鐢甸噺锛�"
- android:visibility="visible"
- android:textSize="@dimen/text_size" />
+ android:textSize="@dimen/text_size"
+ android:visibility="visible" />
+
<TextView
android:id="@+id/red_rechargeDate"
android:layout_width="match_parent"
@@ -118,4 +133,15 @@
android:textSize="@dimen/text_size" />
</LinearLayout>
-</LinearLayout>
\ No newline at end of file
+ <TextView
+ android:id="@+id/read_btn"
+ android:layout_width="match_parent"
+ android:layout_height="50dp"
+ android:layout_alignParentBottom="true"
+ android:background="@color/title_bg"
+ android:gravity="center"
+ android:text="鍐嶆鎵撳嵃鍑潯"
+ android:textColor="#000000"
+ android:textSize="@dimen/new_card_size"
+ android:visibility="invisible" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/qiheonlinelibrary/src/main/res/layout/activity_recharge_qhl.xml b/qiheonlinelibrary/src/main/res/layout/activity_recharge_qhl.xml
index e108d05..83d92d5 100644
--- a/qiheonlinelibrary/src/main/res/layout/activity_recharge_qhl.xml
+++ b/qiheonlinelibrary/src/main/res/layout/activity_recharge_qhl.xml
@@ -151,7 +151,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="鍓╀綑閲戦锛�"
+ android:text="鍏呭�煎悗鍓╀綑閲戦锛�"
android:textSize="@dimen/text_size" />
<TextView
@@ -163,13 +163,13 @@
</LinearLayout>
<TextView
- android:id="@+id/red_remainder_water"
+ android:id="@+id/red_balance_electric"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
- android:text="鍓╀綑姘撮噺锛�"
+ android:text="鍓╀綑鐢甸噺锛�"
android:textSize="@dimen/text_size"
- android:visibility="gone" />
+ android:visibility="visible" />
<TextView
android:id="@+id/red_rechargeDate"
diff --git a/qiheonlinelibrary/src/main/res/layout/dialog_replace_price.xml b/qiheonlinelibrary/src/main/res/layout/dialog_replace_price.xml
index e1184e8..d99be34 100644
--- a/qiheonlinelibrary/src/main/res/layout/dialog_replace_price.xml
+++ b/qiheonlinelibrary/src/main/res/layout/dialog_replace_price.xml
@@ -38,6 +38,7 @@
android:layout_marginRight="20dp"
android:background="@drawable/editbg"
android:hint="璇疯緭鍏ヨˉ鍗″伐鏈垂锛堝厓锛�"
+ android:inputType="numberDecimal"
android:paddingLeft="10dp"
android:textColor="#000000" />
@@ -53,8 +54,6 @@
android:gravity="center_horizontal"
android:orientation="horizontal"
android:padding="5dp">
-
-
<TextView
diff --git a/qiheonlinelibrary/src/main/res/layout/qihe_line_item_recharge.xml b/qiheonlinelibrary/src/main/res/layout/qihe_line_item_recharge.xml
index 198d4c8..7f59b5a 100644
--- a/qiheonlinelibrary/src/main/res/layout/qihe_line_item_recharge.xml
+++ b/qiheonlinelibrary/src/main/res/layout/qihe_line_item_recharge.xml
@@ -8,6 +8,7 @@
android:orientation="vertical">
<LinearLayout
+ android:id="@+id/item"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
--
Gitblit v1.8.0