Skip to content

Commit 0f9afbf

Browse files
committed
fix: fix transaction record UI logic
1 parent 5b999d4 commit 0f9afbf

4 files changed

Lines changed: 23 additions & 19 deletions

File tree

pos_android_studio_demo/pos_android_app/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@ android {
3232
minSdk 24
3333
targetSdk 34
3434
versionCode 119
35-
versionName "8.2.0-2512221800"
35+
versionName "8.2.0-2512231200"
3636
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
37-
3837
ndk {
3938
// Set up supported SO library architecture
4039
abiFilters 'armeabi-v7a', 'arm64-v8a' //'x86', 'x86_64'

pos_android_studio_demo/pos_android_app/src/main/java/com/dspread/pos/ui/transaction/TransactionFragment.java

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ public int initVariableId() {
7272
@Override
7373
public void initData() {
7474
super.initData();
75-
76-
// 初始化刷新Runnable
7775
refreshRunnable = new Runnable() {
7876
@Override
7977
public void run() {
@@ -118,7 +116,6 @@ public void onChanged(List<Transaction> transactions) {
118116
result -> {
119117
if (result.getResultCode() == FILTER_RECEIVE && result.getData() != null) {
120118
filter = result.getData().getStringExtra("filter");
121-
TRACE.d("go back:"+filter);
122119
viewModel.requestTransactionRequest(filter);
123120
}
124121
}
@@ -144,6 +141,7 @@ public void onClick(View v) {
144141
binding.filterButton.setOnClickListener(new View.OnClickListener() {
145142
@Override
146143
public void onClick(View view) {
144+
hideKeyboard();
147145
Intent intent = new Intent(getActivity(), TransactionFilterActivity.class);
148146
launcher.launch(intent);
149147
}
@@ -159,7 +157,6 @@ public boolean onEditorAction(TextView textView, int actionId, KeyEvent keyEvent
159157
return false;
160158
}
161159
});
162-
163160
setupSwipeRefresh();
164161
}
165162

@@ -276,8 +273,21 @@ private void showTransationListUI(List<Transaction> transactions) {
276273
binding.paymentsAmount.setTextSize(TypedValue.COMPLEX_UNIT_SP, 44);
277274
}
278275

279-
int todayCount = TransactionDateFilter.getTodayTransactions(transactions).size();
280-
binding.paymentsCount.setText(todayCount + " Payments Today");
276+
String filterType = SPUtils.getInstance().getString("filterType", "all");
277+
switch (filterType) {
278+
case "1":
279+
binding.paymentsCount.setText(transactions.size() + " Payments Today");
280+
break;
281+
case "3":
282+
binding.paymentsCount.setText(transactions.size() + " Payments 3Days");
283+
break;
284+
case "all":
285+
default:
286+
binding.paymentsCount.setText(transactions.size() + " Payments All");
287+
break;
288+
}
289+
//int todayCount = TransactionDateFilter.getTodayTransactions(transactions).size();
290+
//binding.paymentsCount.setText(todayCount + " Payments Today");
281291
}
282292

283293
if (transactions == null || transactions.size() < 1) {

pos_android_studio_demo/pos_android_app/src/main/java/com/dspread/pos/ui/transaction/filter/TransactionFilterActivity.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import android.content.Intent;
44
import android.os.Bundle;
55
import android.view.View;
6-
import android.widget.RadioGroup;
7-
import android.widget.Toast;
86

97
import com.dspread.pos.utils.DeviceUtils;
108
import com.dspread.pos_android_app.BR;

pos_android_studio_demo/pos_android_app/src/main/res/layout/item_transaction.xml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
android:layout_width="match_parent"
44
android:layout_height="wrap_content"
5-
android:background="?attr/selectableItemBackground"
65
android:orientation="vertical"
76
android:paddingVertical="@dimen/dp_14">
87

@@ -12,15 +11,14 @@
1211
android:background="?attr/selectableItemBackground"
1312
android:orientation="horizontal">
1413

15-
16-
<!-- 左边部分 -->
14+
<!-- Left Section -->
1715
<LinearLayout
1816
android:layout_width="0dp"
1917
android:layout_height="wrap_content"
2018
android:layout_weight="1"
2119
android:orientation="vertical">
2220

23-
<!-- 第一行: 日期和金额 -->
21+
<!-- First Row: Date and Amount -->
2422
<LinearLayout
2523
android:layout_width="match_parent"
2624
android:layout_height="wrap_content"
@@ -35,7 +33,6 @@
3533
android:textColor="#FF666666"
3634
android:textSize="@dimen/sp_16" />
3735

38-
3936
<TextView
4037
android:id="@+id/amount_text"
4138
android:layout_width="wrap_content"
@@ -46,23 +43,23 @@
4643

4744
</LinearLayout>
4845

49-
<!-- 第二行: 卡片信息 -->
46+
<!-- Second Row: Card Information -->
5047
<LinearLayout
5148
android:layout_width="match_parent"
5249
android:layout_height="wrap_content"
5350
android:layout_marginTop="6dp"
5451
android:gravity="center_vertical"
5552
android:orientation="horizontal">
5653

57-
<!-- 卡片图标 -->
54+
<!-- Card Icon -->
5855
<ImageView
5956
android:id="@+id/card_icon"
6057
android:layout_width="wrap_content"
6158
android:layout_height="wrap_content"
6259
android:layout_marginEnd="4dp"
6360
android:src="@mipmap/ic_visa" />
6461

65-
<!-- 卡号和交易时间 -->
62+
<!-- Card Number and Transaction Time -->
6663
<TextView
6764
android:id="@+id/card_info_text"
6865
android:layout_width="wrap_content"
@@ -75,7 +72,7 @@
7572

7673
</LinearLayout>
7774

78-
<!-- 右边部分: 状态文本 -->
75+
<!-- Right Section: Status Text -->
7976
<TextView
8077
android:id="@+id/status_text"
8178
android:layout_width="wrap_content"

0 commit comments

Comments
 (0)