diff --git a/app_main/src/main/java/cn/rrg/rdv/fragment/tools/AbsMfOperatesFragment.java b/app_main/src/main/java/cn/rrg/rdv/fragment/tools/AbsMfOperatesFragment.java
index d66d1675..07c4fb8f 100644
--- a/app_main/src/main/java/cn/rrg/rdv/fragment/tools/AbsMfOperatesFragment.java
+++ b/app_main/src/main/java/cn/rrg/rdv/fragment/tools/AbsMfOperatesFragment.java
@@ -5,24 +5,23 @@ import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.AppCompatCheckBox;
-import androidx.appcompat.widget.SwitchCompat;
-
import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
+import android.widget.CompoundButton;
import android.widget.EditText;
+import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.SwitchCompat;
+
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
@@ -113,14 +112,16 @@ public abstract class AbsMfOperatesFragment
//读卡区域选项
private EditText edtInputReadTagSingleSector = null;
- private AppCompatCheckBox ckBoxReadTagIsSingleSectorMode = null;
+ private SwitchCompat ckBoxReadTagIsSingleSectorMode = null;
+ private LinearLayout llInputReadTagSingleSector = null;
//写卡区域选项
private SwitchCompat swOpenWriteStart2EndMode = null;
private EditText edtInputWriteTagSingleSector = null;
private EditText edtInputWriteTagSingleBlock = null;
private EditText edtInputWriteTagSingleBlockData = null;
- private AppCompatCheckBox ckBoxWriteTagIsSingleSectorMode = null;
+ private SwitchCompat ckBoxWriteTagIsSingleSectorMode = null;
+ private LinearLayout llInputWriteTagSingleSector = null;
/*
* 维护一个读取成功的数据的缓存集合
@@ -234,6 +235,7 @@ public abstract class AbsMfOperatesFragment
//读取区域
edtInputReadTagSingleSector = view.findViewById(R.id.edtInputReadTagSingleSector);
ckBoxReadTagIsSingleSectorMode = view.findViewById(R.id.ckBoxReadTagIsSingleSectorMode);
+ llInputReadTagSingleSector = view.findViewById(R.id.llInputReadTagSingleSector);
//写卡区域
swAllowWriteZero = view.findViewById(R.id.swAllowWriteZero);
swOpenWriteStart2EndMode = view.findViewById(R.id.swOpenWriteStart2EndMode);
@@ -241,9 +243,31 @@ public abstract class AbsMfOperatesFragment
edtInputWriteTagSingleBlock = view.findViewById(R.id.edtInputWriteTagSingleBlock);
edtInputWriteTagSingleBlockData = view.findViewById(R.id.edtInputWriteTagSingleBlockData);
ckBoxWriteTagIsSingleSectorMode = view.findViewById(R.id.ckBoxWriteTagIsSingleSectorMode);
+ llInputWriteTagSingleSector = view.findViewById(R.id.llInputWriteTagSingleSector);
}
private void initActions() {
+ ckBoxReadTagIsSingleSectorMode.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+ @Override
+ public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
+ if (b) {
+ llInputReadTagSingleSector.setVisibility(View.VISIBLE);
+ } else {
+ llInputReadTagSingleSector.setVisibility(View.GONE);
+ }
+ }
+ });
+ ckBoxWriteTagIsSingleSectorMode.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+ @Override
+ public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
+ if (b) {
+ llInputWriteTagSingleSector.setVisibility(View.VISIBLE);
+ } else {
+ llInputWriteTagSingleSector.setVisibility(View.GONE);
+ }
+ }
+ });
+
// 选择读卡操作!
btnRead.setOnClickListener(new View.OnClickListener() {
@Override
@@ -584,6 +608,8 @@ public abstract class AbsMfOperatesFragment
dismissWorkDialogNotEnableBtn();
setCanScrollPager(false);
//直接读卡
+ boolean isReadSingleSectorMode = ckBoxReadTagIsSingleSectorMode.isChecked();
+ type = isReadSingleSectorMode ? Type.ONE : Type.ALL;
if (type == Type.ALL) {
tagReadPresenter.readSpecialAll();
} else {
@@ -594,6 +620,8 @@ public abstract class AbsMfOperatesFragment
dismissWorkDialogNotEnableBtn();
setCanScrollPager(false);
//直接写卡!
+ boolean isReadSingleSectorMode = ckBoxWriteTagIsSingleSectorMode.isChecked();
+ type = isReadSingleSectorMode ? Type.ONE : Type.ALL;
if (type == Type.ALL) {
tagWritePresenter.writeSpecialAll();
} else {
diff --git a/app_main/src/main/res/layout/act_chameleon_main.xml b/app_main/src/main/res/layout/act_chameleon_main.xml
index 16ef1237..a6783eef 100644
--- a/app_main/src/main/res/layout/act_chameleon_main.xml
+++ b/app_main/src/main/res/layout/act_chameleon_main.xml
@@ -46,7 +46,7 @@
android:layout_height="30dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
- android:background="@drawable/btn_selectot_blue"
+ android:background="@drawable/btn_selector_blue"
android:text="@string/aliases"
android:textAllCaps="false"
android:textColor="@color/md_white_1000" />
@@ -214,7 +214,7 @@
android:layout_height="30dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
- android:background="@drawable/btn_selectot_blue"
+ android:background="@drawable/btn_selector_blue"
android:text="@string/open"
android:textColor="@color/md_white_1000" />
@@ -260,7 +260,7 @@
android:layout_width="76dp"
android:layout_height="30dp"
android:layout_marginStart="16dp"
- android:background="@drawable/btn_selectot_blue"
+ android:background="@drawable/btn_selector_blue"
android:text="@string/flash"
android:textColor="@color/md_white_1000" />
@@ -284,7 +284,7 @@
android:layout_width="wrap_content"
android:layout_height="128dp"
android:layout_margin="16dp"
- android:background="@drawable/btn_selectot_blue"
+ android:background="@drawable/btn_selector_blue"
android:drawableTop="@drawable/download"
android:paddingTop="38dp"
android:paddingBottom="6dp"
@@ -297,7 +297,7 @@
android:layout_width="wrap_content"
android:layout_height="128dp"
android:layout_margin="16dp"
- android:background="@drawable/btn_selectot_blue"
+ android:background="@drawable/btn_selector_blue"
android:drawableTop="@drawable/info"
android:paddingTop="38dp"
android:paddingBottom="6dp"
@@ -310,7 +310,7 @@
android:layout_width="wrap_content"
android:layout_height="128dp"
android:layout_margin="16dp"
- android:background="@drawable/btn_selectot_blue"
+ android:background="@drawable/btn_selector_blue"
android:drawableTop="@drawable/reset"
android:paddingTop="38dp"
android:paddingBottom="6dp"
@@ -324,7 +324,7 @@
android:layout_width="wrap_content"
android:layout_height="128dp"
android:layout_margin="16dp"
- android:background="@drawable/btn_selectot_blue"
+ android:background="@drawable/btn_selector_blue"
android:drawableTop="@drawable/all"
android:paddingTop="38dp"
android:paddingBottom="6dp"
@@ -337,7 +337,7 @@
android:layout_width="wrap_content"
android:layout_height="128dp"
android:layout_margin="16dp"
- android:background="@drawable/btn_selectot_blue"
+ android:background="@drawable/btn_selector_blue"
android:drawableTop="@drawable/single"
android:paddingTop="38dp"
android:paddingBottom="6dp"
@@ -350,7 +350,7 @@
android:layout_width="wrap_content"
android:layout_height="128dp"
android:layout_margin="16dp"
- android:background="@drawable/btn_selectot_blue"
+ android:background="@drawable/btn_selector_blue"
android:drawableTop="@drawable/log"
android:paddingTop="38dp"
android:paddingBottom="6dp"
@@ -363,7 +363,7 @@
android:layout_width="wrap_content"
android:layout_height="128dp"
android:layout_margin="16dp"
- android:background="@drawable/btn_selectot_blue"
+ android:background="@drawable/btn_selector_blue"
android:drawableTop="@drawable/data"
android:paddingTop="38dp"
android:paddingBottom="6dp"
@@ -376,7 +376,7 @@
android:layout_width="wrap_content"
android:layout_height="128dp"
android:layout_margin="16dp"
- android:background="@drawable/btn_selectot_blue"
+ android:background="@drawable/btn_selector_blue"
android:drawableTop="@drawable/upload"
android:paddingTop="38dp"
android:paddingBottom="6dp"
@@ -389,7 +389,7 @@
android:layout_width="wrap_content"
android:layout_height="128dp"
android:layout_margin="16dp"
- android:background="@drawable/btn_selectot_blue"
+ android:background="@drawable/btn_selector_blue"
android:drawableTop="@drawable/clear"
android:paddingTop="38dp"
android:paddingBottom="6dp"
diff --git a/app_main/src/main/res/layout/act_chameleon_slot_aliases.xml b/app_main/src/main/res/layout/act_chameleon_slot_aliases.xml
index 94258e37..f0916ff9 100644
--- a/app_main/src/main/res/layout/act_chameleon_slot_aliases.xml
+++ b/app_main/src/main/res/layout/act_chameleon_slot_aliases.xml
@@ -226,7 +226,7 @@
android:layout_height="match_parent"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
- android:background="@drawable/btn_selectot_blue"
+ android:background="@drawable/btn_selector_blue"
android:text="保存"
android:textColor="@color/md_white_1000" />
diff --git a/app_main/src/main/res/layout/act_mf_main.xml b/app_main/src/main/res/layout/act_mf_main.xml
index e91b850c..ef3bcb6e 100644
--- a/app_main/src/main/res/layout/act_mf_main.xml
+++ b/app_main/src/main/res/layout/act_mf_main.xml
@@ -60,13 +60,28 @@
android:background="@drawable/gradual"
android:orientation="vertical">
-
+ android:background="@color/md_grey_200">
+
+
+
+
+
+
+ android:paddingLeft="16dp"
+ android:visibility="gone">
-
-
+ android:maxLength="3"
+ android:text="0" />
@@ -162,51 +170,6 @@
android:layout_height="1dp"
android:background="@color/md_grey_200" />
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app_main/src/main/res/layout/dialog_msg_layout.xml b/app_main/src/main/res/layout/dialog_msg_layout.xml
index 8b43ae95..2c0d80a5 100644
--- a/app_main/src/main/res/layout/dialog_msg_layout.xml
+++ b/app_main/src/main/res/layout/dialog_msg_layout.xml
@@ -23,7 +23,7 @@
android:layout_height="36dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
- android:background="@drawable/btn_selectot_blue"
+ android:background="@drawable/btn_selector_blue"
android:text="发送"
android:textColor="@color/md_white_1000" />
diff --git a/app_main/src/main/res/layout/item_act_guide_banner2.xml b/app_main/src/main/res/layout/item_act_guide_banner2.xml
index f61c3ebc..73035a40 100644
--- a/app_main/src/main/res/layout/item_act_guide_banner2.xml
+++ b/app_main/src/main/res/layout/item_act_guide_banner2.xml
@@ -35,7 +35,7 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
- android:background="@drawable/btn_selectot_blue"
+ android:background="@drawable/btn_selector_blue"
android:text="@string/agree"
android:textAllCaps="false"
android:textColor="@color/md_white_1000" />
diff --git a/app_main/src/main/res/values-en/strings.xml b/app_main/src/main/res/values-en/strings.xml
index 0ef9e4da..30ea5522 100644
--- a/app_main/src/main/res/values-en/strings.xml
+++ b/app_main/src/main/res/values-en/strings.xml
@@ -275,5 +275,7 @@
OS flash successful.
OS flash failed.
PM3 failed to enter flash mode!
+ Read One Sector
+ Write One Block
\ No newline at end of file
diff --git a/app_main/src/main/res/values-zh/strings.xml b/app_main/src/main/res/values-zh/strings.xml
index 7ac1f98b..db0b5137 100644
--- a/app_main/src/main/res/values-zh/strings.xml
+++ b/app_main/src/main/res/values-zh/strings.xml
@@ -281,5 +281,7 @@
操作系统刷写成功
操作系统刷写失败
PM3进入刷写模式失败!
+ 读取一个扇区
+ 写入一个块
\ No newline at end of file
diff --git a/app_main/src/main/res/values/strings.xml b/app_main/src/main/res/values/strings.xml
index b73cd991..34994a8c 100644
--- a/app_main/src/main/res/values/strings.xml
+++ b/app_main/src/main/res/values/strings.xml
@@ -274,5 +274,7 @@
OS flash successful.
OS flash failed.
PM3 failed to enter flash mode!
+ Read One Sector
+ Write One Block
\ No newline at end of file
diff --git a/utils/src/main/res/drawable/btn_selectot_blue.xml b/utils/src/main/res/drawable/btn_selector_blue.xml
similarity index 100%
rename from utils/src/main/res/drawable/btn_selectot_blue.xml
rename to utils/src/main/res/drawable/btn_selector_blue.xml
diff --git a/utils/src/main/res/layout/file_selector.xml b/utils/src/main/res/layout/file_selector.xml
index a96a6279..1b696abc 100644
--- a/utils/src/main/res/layout/file_selector.xml
+++ b/utils/src/main/res/layout/file_selector.xml
@@ -53,7 +53,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:background="@drawable/btn_selectot_blue"
+ android:background="@drawable/btn_selector_blue"
android:text="@string/cancel"
android:textAllCaps="false"
android:textColor="@color/md_white_1000" />
@@ -65,7 +65,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:background="@drawable/btn_selectot_blue"
+ android:background="@drawable/btn_selector_blue"
android:text="@string/up_path"
android:textAllCaps="false"
android:textColor="@color/md_white_1000" />
@@ -77,7 +77,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:background="@drawable/btn_selectot_blue"
+ android:background="@drawable/btn_selector_blue"
android:text="@string/ok"
android:textAllCaps="false"
android:textColor="@color/md_white_1000" />