From 4ffdfce27dc0aa7354d65354c54a7d2e4694eeb6 Mon Sep 17 00:00:00 2001
From: wlt233 <1486185683@qq.com>
Date: Tue, 25 Apr 2023 16:22:34 +0800
Subject: [PATCH] add compatible mode; fix strings

---
 .../java/moe/tqlwsl/aicemu/MainActivity.kt    | 38 ++++++++++++++-----
 app/src/main/res/menu/toolbar_menu.xml        |  3 ++
 app/src/main/res/values-zh/strings.xml        |  4 ++
 app/src/main/res/values/strings.xml           |  4 ++
 4 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/moe/tqlwsl/aicemu/MainActivity.kt b/app/src/main/java/moe/tqlwsl/aicemu/MainActivity.kt
index 56c6d21..256f57a 100644
--- a/app/src/main/java/moe/tqlwsl/aicemu/MainActivity.kt
+++ b/app/src/main/java/moe/tqlwsl/aicemu/MainActivity.kt
@@ -34,11 +34,12 @@ class MainActivity : AppCompatActivity() {
     private var nfcAdapter: NfcAdapter? = null
     private var nfcFCardEmulation: NfcFCardEmulation? = null
     private var nfcPendingIntent: PendingIntent? = null
-    private val gson = Gson()
     private var cards = mutableListOf<Card>()
+    private val gson = Gson()
     private val cardsJsonPath = "card.json"
-    private var showCardID: Boolean = false
     private val TAG = "AICEmu"
+    private var showCardID: Boolean = false
+    private var compatibleID: Boolean = false
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -69,13 +70,13 @@ class MainActivity : AppCompatActivity() {
         if (nfcAdapter == null) {
             Log.e(TAG, "NFC not supported")
             AlertDialog.Builder(this)
-                .setTitle(R.string.error).setMessage("NFC not supported").setCancelable(false).show()
+                .setTitle(R.string.error).setMessage(R.string.nfc_not_supported).setCancelable(false).show()
             return
         }
         if (!nfcAdapter!!.isEnabled) {
             Log.e(TAG, "NFC is off")
             AlertDialog.Builder(this)
-                .setTitle(R.string.error).setMessage("NFC is off").setCancelable(false).show()
+                .setTitle(R.string.error).setMessage(R.string.nfc_not_on).setCancelable(false).show()
             return
         }
 
@@ -126,15 +127,25 @@ class MainActivity : AppCompatActivity() {
         return when (item.itemId) {
             R.id.toolbar_menu_hide_id -> {
                 showCardID = !showCardID
-                item.title = if (showCardID) {
-                    "Hide IDm"
+                item.setTitle(if (showCardID) {
+                    R.string.hide_idm
                 }
                 else {
-                    "Show IDm"
-                }
+                    R.string.show_idm
+                })
                 checkCardIDShadow()
                 true
             }
+            R.id.toolbar_menu_compatible -> {
+                compatibleID = !compatibleID
+                item.setTitle(if (compatibleID) {
+                    R.string.compatible_off
+                }
+                else {
+                    R.string.compatible_on
+                })
+                true
+            }
             R.id.toolbar_menu_settings -> {
                 Toast.makeText(applicationContext, "还没做（）\nUnder constuction...", Toast.LENGTH_LONG).show()
                 // TODO
@@ -218,8 +229,15 @@ class MainActivity : AppCompatActivity() {
         val globalVar = this.applicationContext as GlobalVar
         val cardIDmTextView = cardView.findViewById<TextView>(R.id.card_id)
         globalVar.IDm = cardIDmTextView.text.toString()
-        //val resultIdm = setIDm(IDm)
-        val resultIdm = setIDm("02fe000000000000") // hardcoded idm for sbga
+        var resultIdm = if (compatibleID) {
+            // hardcoded idm for specific model e.g. Samsung S8
+            // idm needs to start with 02, or syscode won't be added to polling ack
+            // konmai reader read this idm while sbga reader do not check this
+            setIDm("02fe001145141919")
+        }
+        else {
+            setIDm(globalVar.IDm)
+        }
         val resultSys = setSys("88B4") // hardcoded syscode for sbga
 
         val cardNameTextView = cardView.findViewById<TextView>(R.id.card_name)
diff --git a/app/src/main/res/menu/toolbar_menu.xml b/app/src/main/res/menu/toolbar_menu.xml
index 47c0529..773ba78 100644
--- a/app/src/main/res/menu/toolbar_menu.xml
+++ b/app/src/main/res/menu/toolbar_menu.xml
@@ -5,6 +5,9 @@
     <item
         android:id="@+id/toolbar_menu_hide_id"
         android:title="@string/show_idm" />
+    <item
+        android:id="@+id/toolbar_menu_compatible"
+        android:title="@string/compatible_on" />
     <item
         android:id="@+id/toolbar_menu_settings"
         android:title="@string/settings" />
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 6aac06f..cbce90b 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -7,4 +7,8 @@
     <string name="show_idm">展示卡号</string>
     <string name="hide_idm">隐藏卡号</string>
     <string name="error">出错了！</string>
+    <string name="compatible_on">打开兼容模式</string>
+    <string name="compatible_off">关闭兼容模式</string>
+    <string name="nfc_not_on">NFC 没开...</string>
+    <string name="nfc_not_supported">设备不支持 NFC...</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 590591d..7c09854 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4,11 +4,15 @@
     <string name="delete">Delete</string>
     <string name="show_idm">Show IDm</string>
     <string name="hide_idm">Hide IDm</string>
+    <string name="compatible_on">Compatible mode on</string>
+    <string name="compatible_off">Compatible mode off</string>
     <string name="settings">Settings</string>
     <string name="error">Error!</string>
     <string name="dummy_card_name">AIC Card</string>
     <string name="dummy_card_id" translatable="false">012EXXXXXXXXXXXX</string>
     <string name="read_card_tip">Please touch your AIC Card!</string>
+    <string name="nfc_not_supported">NFC not supported</string>
+    <string name="nfc_not_on">NFC is off...</string>
     <string name="desc_add_card" translatable="false">add card</string>
     <string name="desc_edit_card" translatable="false">edit card</string>
     <string name="desc_close_popup" translatable="false">close</string>