Merge pull request #16 from xianglin1998/master

update version code and update to google play store.

.idea/modules.xml

@@ -13,7 +13,6 @@
       <module fileurl="file://$PROJECT_DIR$/mifaretag/mifaretag.iml" filepath="$PROJECT_DIR$/mifaretag/mifaretag.iml" />
       <module fileurl="file://$PROJECT_DIR$/pm3iceman/pm3iceman.iml" filepath="$PROJECT_DIR$/pm3iceman/pm3iceman.iml" />
       <module fileurl="file://$PROJECT_DIR$/pm3official/pm3official.iml" filepath="$PROJECT_DIR$/pm3official/pm3official.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pm3parser/pm3parser.iml" filepath="$PROJECT_DIR$/pm3parser/pm3parser.iml" />
       <module fileurl="file://$PROJECT_DIR$/pm3rdv4rrg/pm3rdv4rrg.iml" filepath="$PROJECT_DIR$/pm3rdv4rrg/pm3rdv4rrg.iml" />
       <module fileurl="file://$PROJECT_DIR$/pn53x/pn53x.iml" filepath="$PROJECT_DIR$/pn53x/pn53x.iml" />
       <module fileurl="file://$PROJECT_DIR$/utils/utils.iml" filepath="$PROJECT_DIR$/utils/utils.iml" />

app/build.gradle

@@ -8,8 +8,8 @@ android {
         minSdkVersion 18
         targetSdkVersion 29
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
-        versionCode 5
-        versionName "1.3.2"
+        versionCode 6
+        versionName "1.3.3"
     }
     buildTypes {
         release {

app/src/main/res/values-en/strings.xml

@@ -162,7 +162,7 @@
     <string name="illegal_filenames">Illegal filenames!</string>
     <string name="dump_parse_failed">Failure to parse data!</string>
     <string name="dump_4k_no_support">4K Tag not supported.</string>
-    <string name="data_parse_err">Parse data package…</string>
+    <string name="data_parse_err">Parse data package failed</string>
     <string name="data_fragmentary">Fragmentary data, can not show in view, must have 1k or 2k or 4k!</string>
     <string name="file_err">File exception.</string>
     <string name="format_no_support">Format not supported.</string>

app/src/main/res/values-zh/strings.xml

@@ -158,7 +158,7 @@
     <string name="illegal_filenames">非法的文件名!</string>
     <string name="dump_parse_failed">解析数据失败!</string>
     <string name="dump_4k_no_support">抱歉，4K卡比较特殊，暂未支持解析</string>
-    <string name="data_parse_err">解析数据封包出错…</string>
+    <string name="data_parse_err">解析数据封包出错</string>
     <string name="data_fragmentary">无可用数据能被映射到视图当中，点击返回键可以返回到上级操作进行操作步骤查看问题!</string>
     <string name="file_err">文件异常</string>
     <string name="format_no_support">格式不支持</string>
@@ -283,9 +283,9 @@
     <string name="mag_read_failed">读取失败，请检查卡片秘钥或卡片信号!</string>
     <string name="msg_failed_merge_data">合并扇区数据的时候失败了！</string>
     <string name="msg_temp_file_noexists">模板文件不存在!</string>
+    <string name="msg_tag_noutfound">卡片不存在，请放置卡片到手机背面！</string>
     <string name="msg_app_permission_request">程序运行时需要一些权限，请给与，否则可能会出现一些导致软件不可用的问题！</string>
     <string name="pm3_not_respone">PM3 未响应</string>
-    <string name="msg_tag_noutfound">卡片不存在，请放置卡片到手机背面！</string>
     <string name="aliases">别名</string>
     <string name="title_slot_pos">卡位:</string>
     <string name="title_mode">模式:</string>

app/src/main/res/values/strings.xml

@@ -161,7 +161,7 @@
     <string name="illegal_filenames">Illegal filenames!</string>
     <string name="dump_parse_failed">Failure to parse data!</string>
     <string name="dump_4k_no_support">4K Tag not supported.</string>
-    <string name="data_parse_err">Parse data package…</string>
+    <string name="data_parse_err">Parse data package failed</string>
     <string name="data_fragmentary">Fragmentary data, can not show in view, must have 1k or 2k or 4k!</string>
     <string name="file_err">File exception.</string>
     <string name="format_no_support">Format not supported.</string>

settings.gradle

@@ -1 +1 @@
-include ':app', ':pm3parser', ':utils', ':freo', ':crapto1', ':mfkey', ':console', ':chameleon', ':commapping', ':pn53x', ':pm3official', ':pm3iceman', ':pm3rdv4rrg', ':mifaretag'
+include ':app', ':utils', ':freo', ':crapto1', ':mfkey', ':console', ':chameleon', ':commapping', ':pn53x', ':pm3official', ':pm3iceman', ':pm3rdv4rrg', ':mifaretag'

update_note.txt

@@ -14,4 +14,7 @@
 
 6.Add signature configuration input windows.
 
-7.fixed signature configuration input.
+7.fixed signature configuration input.
+
+2019/12/21 ver1.3.2:
+Temporary addition of compatibility support for Android 10.