From 1b4835badb3ca32402b6544c668a700c5334d90f Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 26 三月 2024 16:48:31 +0800
Subject: [PATCH] 添加中安身份证识别模块 把IP设置移动到参数设置界面
---
app/src/main/java/com/dayu/recharge/activity/MyActivity.java | 7 -------
app/src/main/java/com/dayu/recharge/activity/ParameterActivity.java | 8 ++++++++
ocridcardlibrary/src/main/assets/idcardocr/authmode.lsc | 0
settings.gradle | 1 +
app/src/main/res/values/strings.xml | 2 +-
app/src/main/res/layout/activity_my.xml | 9 +--------
app/src/main/res/layout/activity_parameter.xml | 9 +++++++++
app/build.gradle | 1 +
8 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index ecd5b26..5c1cf3e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -75,6 +75,7 @@
//鍦板潃閫夋嫨
implementation project(':pickerviewlibrary')
implementation project(':easysocket')
+ implementation project(':ocridcardlibrary')
implementation 'com.tencent.bugly:crashreport:4.1.9.3'
// 澶勭悊鍥剧墖
diff --git a/app/src/main/java/com/dayu/recharge/activity/MyActivity.java b/app/src/main/java/com/dayu/recharge/activity/MyActivity.java
index 1d1fe5a..650fe26 100644
--- a/app/src/main/java/com/dayu/recharge/activity/MyActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/MyActivity.java
@@ -113,14 +113,7 @@
}
});
- myBinding.sysIp.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- PassWordDialog passWordDialog = new PassWordDialog(MyActivity.this, new Intent(MyActivity.this, SysIpActivity.class));
- passWordDialog.show();
- }
- });
}
diff --git a/app/src/main/java/com/dayu/recharge/activity/ParameterActivity.java b/app/src/main/java/com/dayu/recharge/activity/ParameterActivity.java
index 283e26a..2108b03 100644
--- a/app/src/main/java/com/dayu/recharge/activity/ParameterActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/ParameterActivity.java
@@ -6,6 +6,7 @@
import android.view.View;
import com.dayu.recharge.databinding.ActivityParameterBinding;
+import com.dayu.recharge.view.PassWordDialog;
/**
* Copyright (C), 2023,
@@ -57,5 +58,12 @@
startActivity(intent);
}
});
+ binding.sysIp.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent intent = new Intent(ParameterActivity.this, SysIpActivity.class);
+ startActivity(intent);
+ }
+ });
}
}
diff --git a/app/src/main/res/layout/activity_my.xml b/app/src/main/res/layout/activity_my.xml
index 393fe26..e1fec48 100644
--- a/app/src/main/res/layout/activity_my.xml
+++ b/app/src/main/res/layout/activity_my.xml
@@ -123,14 +123,7 @@
</RelativeLayout>
- <TextView
- android:id="@+id/sys_ip"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="15dp"
- android:text="IP璁剧疆"
- android:textColor="@color/text_selecter"
- android:textSize="@dimen/text_size" />
+
<TextView
android:id="@+id/card_replacement"
diff --git a/app/src/main/res/layout/activity_parameter.xml b/app/src/main/res/layout/activity_parameter.xml
index f59a95d..c13d8d5 100644
--- a/app/src/main/res/layout/activity_parameter.xml
+++ b/app/src/main/res/layout/activity_parameter.xml
@@ -14,6 +14,15 @@
app:leftImage="@mipmap/icon_back" />
<TextView
+ android:id="@+id/sys_ip"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="15dp"
+ android:text="IP璁剧疆"
+ android:textColor="@color/text_selecter"
+ android:textSize="@dimen/text_size" />
+
+ <TextView
android:id="@+id/parameter_domain"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9078b7a..fb0e8e0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -26,5 +26,5 @@
<string name="toast_8">涓や釜浜岀淮鐮佸昂瀵告渶澶т负7</string>
<string name="toast_9">鏉＄爜绫诲瀷鎴栧唴瀹逛笉姝ｇ‘!</string>
<string name="login_title">澶х鑺傛按\n鏅鸿兘鍏呭�肩鐞嗙郴缁�</string>
-
+ <string name="company_name"></string>
</resources>
diff --git a/ocridcardlibrary/src/main/assets/idcardocr/authmode.lsc b/ocridcardlibrary/src/main/assets/idcardocr/authmode.lsc
new file mode 100644
index 0000000..b13015b
--- /dev/null
+++ b/ocridcardlibrary/src/main/assets/idcardocr/authmode.lsc
Binary files differ
diff --git a/settings.gradle b/settings.gradle
index 55ce102..e39cb66 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -16,3 +16,4 @@
}
rootProject.name = "Recharge"
include ':app',':pickerviewlibrary',':easysocket'
+include ':ocridcardlibrary'
--
Gitblit v1.8.0