diff --git a/Prj-Android/LICENSE b/Prj-Android/LICENSE
deleted file mode 100644
index 8dada3e..0000000
--- a/Prj-Android/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "{}"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright {yyyy} {name of copyright owner}
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/Prj-Android/README.md b/Prj-Android/README.md
deleted file mode 100644
index 8e11215..0000000
--- a/Prj-Android/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-## HyperLPR3-Android-SDK HyperLPR3-License Plate Recognition Android SDK
-
-[中文文档](README_CH.md)
-
-### Source Code Project
-
-If you need to learn about the build steps in the source code of the project, you can go : [HyperLPR](https://github.com/szad670401/HyperLPR).
-
-### Supporting Platform
-
-- Android: arm64-v8a、armeabi-v7a
-
-### How to Use
-
-TODO
\ No newline at end of file
diff --git a/Prj-Android/README_CH.md b/Prj-Android/README_CH.md
deleted file mode 100644
index 6b5667b..0000000
--- a/Prj-Android/README_CH.md
+++ /dev/null
@@ -1,13 +0,0 @@
-## HyperLPR3-Android-SDK HyperLPR3-车牌识别安卓SDK
-
-### 源码工程
-
-需要了解编译相关源码可移步到[HyperLPR工程](https://github.com/szad670401/HyperLPR)。
-
-### 支持平台
-
-- Android: arm64-v8a、armeabi-v7a
-
-### 如何使用
-
-TODO
\ No newline at end of file
diff --git a/Prj-Android/app/build.gradle b/Prj-Android/app/build.gradle
index 85bd3ad..33546a7 100644
--- a/Prj-Android/app/build.gradle
+++ b/Prj-Android/app/build.gradle
@@ -3,12 +3,12 @@ plugins {
}
android {
- compileSdk 28
+ compileSdk 31
defaultConfig {
- applicationId "com.hyperai.hyperlpr_sdk_demo"
+ applicationId "com.hyperai.example.lpr3_demo"
minSdk 21
- targetSdk 28
+ targetSdk 31
versionCode 1
versionName "1.0"
@@ -29,17 +29,17 @@ android {
dependencies {
+ // Tools
implementation 'org.greenrobot:eventbus:3.0.0'
- implementation 'com.android.support:appcompat-v7:28.0.0'
- implementation 'com.android.support.constraint:constraint-layout:2.0.4'
+ implementation 'com.github.smuyyh:ImageSelector:3.0'
+ implementation 'com.github.bumptech.glide:glide:3.7.0'
+ // HyperLPR3 sdk
+ implementation 'com.github.HyperInspire:hyperlpr3-android-sdk:1.0.2'
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'com.google.android.material:material:1.3.0'
- implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
- implementation project(path: ':hyperlpr3')
+ implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
testImplementation 'junit:junit:4.+'
- androidTestImplementation 'androidx.test.ext:junit:1.1.2'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
- implementation 'com.github.smuyyh:ImageSelector:3.0'
- implementation 'com.github.bumptech.glide:glide:3.7.0'
+ androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
}
\ No newline at end of file
diff --git a/Prj-Android/app/release/hyperlpr3-demo.apk b/Prj-Android/app/release/hyperlpr3-demo.apk
deleted file mode 100644
index 514457c..0000000
Binary files a/Prj-Android/app/release/hyperlpr3-demo.apk and /dev/null differ
diff --git a/Prj-Android/app/release/output-metadata.json b/Prj-Android/app/release/output-metadata.json
deleted file mode 100644
index 71d9496..0000000
--- a/Prj-Android/app/release/output-metadata.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "version": 3,
- "artifactType": {
- "type": "APK",
- "kind": "Directory"
- },
- "applicationId": "com.hyperai.hyperlpr_sdk_demo",
- "variantName": "release",
- "elements": [
- {
- "type": "SINGLE",
- "filters": [],
- "attributes": [],
- "versionCode": 1,
- "versionName": "1.0",
- "outputFile": "app-release.apk"
- }
- ],
- "elementType": "File"
-}
\ No newline at end of file
diff --git a/Prj-Android/app/src/androidTest/java/com/hyperai/hyperlpr_sdk_demo/ExampleInstrumentedTest.java b/Prj-Android/app/src/androidTest/java/com/hyperai/example/lpr3_demo/ExampleInstrumentedTest.java
similarity index 86%
rename from Prj-Android/app/src/androidTest/java/com/hyperai/hyperlpr_sdk_demo/ExampleInstrumentedTest.java
rename to Prj-Android/app/src/androidTest/java/com/hyperai/example/lpr3_demo/ExampleInstrumentedTest.java
index 08c1862..6da3da3 100644
--- a/Prj-Android/app/src/androidTest/java/com/hyperai/hyperlpr_sdk_demo/ExampleInstrumentedTest.java
+++ b/Prj-Android/app/src/androidTest/java/com/hyperai/example/lpr3_demo/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package com.hyperai.hyperlpr_sdk_demo;
+package com.hyperai.example.lpr3_demo;
import android.content.Context;
@@ -21,6 +21,6 @@ public class ExampleInstrumentedTest {
public void useAppContext() {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
- assertEquals("com.hyperai.hyperlpr_sdk_demo", appContext.getPackageName());
+ assertEquals("com.hyperai.example.lpr3_demo", appContext.getPackageName());
}
}
\ No newline at end of file
diff --git a/Prj-Android/app/src/main/AndroidManifest.xml b/Prj-Android/app/src/main/AndroidManifest.xml
index 46656f3..df59871 100644
--- a/Prj-Android/app/src/main/AndroidManifest.xml
+++ b/Prj-Android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
+ package="com.hyperai.example.lpr3_demo">
@@ -38,7 +38,7 @@
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
- android:theme="@style/Theme.HyperLPR_SDK_Demo">
+ android:theme="@style/Theme.HyperLPR3Example">
@@ -49,11 +49,6 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/Prj-Android/app/src/main/java/com/hyperai/hyperlpr_sdk_demo/CameraActivity.java b/Prj-Android/app/src/main/java/com/hyperai/example/lpr3_demo/CameraActivity.java
similarity index 91%
rename from Prj-Android/app/src/main/java/com/hyperai/hyperlpr_sdk_demo/CameraActivity.java
rename to Prj-Android/app/src/main/java/com/hyperai/example/lpr3_demo/CameraActivity.java
index 3c4ee58..fac748e 100755
--- a/Prj-Android/app/src/main/java/com/hyperai/hyperlpr_sdk_demo/CameraActivity.java
+++ b/Prj-Android/app/src/main/java/com/hyperai/example/lpr3_demo/CameraActivity.java
@@ -1,18 +1,14 @@
-package com.hyperai.hyperlpr_sdk_demo;
+package com.hyperai.example.lpr3_demo;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.os.Bundle;
-import android.view.View;
import android.view.Window;
import android.view.WindowManager;
-import android.widget.ArrayAdapter;
import android.widget.FrameLayout;
import android.widget.ImageView;
-import android.widget.ListView;
import android.widget.TextView;
-
import com.hyperai.hyperlpr3.HyperLPR3;
import com.hyperai.hyperlpr3.bean.Plate;
@@ -20,9 +16,6 @@ import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* @author by hs-johnny
@@ -33,7 +26,6 @@ public class CameraActivity extends Activity {
FrameLayout previewFl;
CameraPreviews cameraPreview;
TextView plateTv;
-// TextView regTv;
ImageView image;
@Override
@@ -98,7 +90,6 @@ public class CameraActivity extends Activity {
plateTv.setText(showText);
}
-
-// stopPreview();
}
+
}
diff --git a/Prj-Android/app/src/main/java/com/hyperai/hyperlpr_sdk_demo/CameraPreviews.java b/Prj-Android/app/src/main/java/com/hyperai/example/lpr3_demo/CameraPreviews.java
similarity index 95%
rename from Prj-Android/app/src/main/java/com/hyperai/hyperlpr_sdk_demo/CameraPreviews.java
rename to Prj-Android/app/src/main/java/com/hyperai/example/lpr3_demo/CameraPreviews.java
index 13d4883..e8f0c59 100755
--- a/Prj-Android/app/src/main/java/com/hyperai/hyperlpr_sdk_demo/CameraPreviews.java
+++ b/Prj-Android/app/src/main/java/com/hyperai/example/lpr3_demo/CameraPreviews.java
@@ -1,11 +1,10 @@
-package com.hyperai.hyperlpr_sdk_demo;
+package com.hyperai.example.lpr3_demo;
import android.content.Context;
import android.graphics.Paint;
import android.hardware.Camera;
import android.os.Handler;
import android.os.HandlerThread;
-//import android.support.v4.content.ContextCompat;
import android.util.Log;
import android.view.Display;
import android.view.MotionEvent;
@@ -14,16 +13,15 @@ import android.view.SurfaceHolder;
import android.view.SurfaceView;
import android.view.WindowManager;
+import com.hyperai.hyperlpr3.HyperLPR3;
+import com.hyperai.hyperlpr3.bean.HyperLPRParameter;
+import com.hyperai.hyperlpr3.bean.Plate;
import org.greenrobot.eventbus.EventBus;
import java.io.IOException;
import java.util.List;
-import com.hyperai.hyperlpr3.HyperLPR3;
-import com.hyperai.hyperlpr3.bean.HyperLPRParameter;
-import com.hyperai.hyperlpr3.bean.Plate;
-
/**
* @author by hs-johnny
* Created on 2019/6/17
@@ -50,11 +48,7 @@ public class CameraPreviews extends SurfaceView implements SurfaceHolder.Callbac
mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
mPaint.setStrokeWidth(2);
mPaint.setStyle(Paint.Style.STROKE);
-// mPaint.setColor(ContextCompat.getColor(context, R.color.colorAccent));
- HyperLPRParameter parameter = new HyperLPRParameter();
-// hyperLPR3 = new HyperLPR3();
-// hyperLPR3.init(mContext, parameter);
}
public Camera getCameraInstance(){
if (mCamera == null){
@@ -137,7 +131,6 @@ public class CameraPreviews extends SurfaceView implements SurfaceHolder.Callbac
}
if(!isStopReg && plates.length > 0) {
-// isStopReg = true;
sendPlate(plates);
}
diff --git a/Prj-Android/app/src/main/java/com/hyperai/hyperlpr_sdk_demo/MainActivity.java b/Prj-Android/app/src/main/java/com/hyperai/example/lpr3_demo/MainActivity.java
similarity index 98%
rename from Prj-Android/app/src/main/java/com/hyperai/hyperlpr_sdk_demo/MainActivity.java
rename to Prj-Android/app/src/main/java/com/hyperai/example/lpr3_demo/MainActivity.java
index e99bffb..e01d137 100644
--- a/Prj-Android/app/src/main/java/com/hyperai/hyperlpr_sdk_demo/MainActivity.java
+++ b/Prj-Android/app/src/main/java/com/hyperai/example/lpr3_demo/MainActivity.java
@@ -1,4 +1,4 @@
-package com.hyperai.hyperlpr_sdk_demo;
+package com.hyperai.example.lpr3_demo;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.app.ActivityCompat;
@@ -27,7 +27,6 @@ import com.yuyh.library.imgsel.config.ISListConfig;
import java.util.List;
-
public class MainActivity extends AppCompatActivity {
private Button cameraBtn;
@@ -78,7 +77,6 @@ public class MainActivity extends AppCompatActivity {
verifyStoragePermissions(this);
-
// 车牌识别算法配置参数
HyperLPRParameter parameter = new HyperLPRParameter()
.setDetLevel(HyperLPR3.DETECT_LEVEL_LOW)
@@ -161,6 +159,7 @@ public class MainActivity extends AppCompatActivity {
if (bitmap != null) {
imageView.setImageBitmap(bitmap);
+ // 调用车牌识别
Plate[] plates = HyperLPR3.getInstance().plateRecognition(bitmap, HyperLPR3.CAMERA_ROTATION_0, HyperLPR3.STREAM_BGRA);
for (Plate plate: plates) {
String type = "未知车牌";
diff --git a/Prj-Android/app/src/main/res/mipmap-xxhdpi/logo.png b/Prj-Android/app/src/main/res/mipmap-xxxhdpi/logo.png
similarity index 100%
rename from Prj-Android/app/src/main/res/mipmap-xxhdpi/logo.png
rename to Prj-Android/app/src/main/res/mipmap-xxxhdpi/logo.png
diff --git a/Prj-Android/app/src/main/res/values/strings.xml b/Prj-Android/app/src/main/res/values/strings.xml
index 44ee984..979c379 100644
--- a/Prj-Android/app/src/main/res/values/strings.xml
+++ b/Prj-Android/app/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
- HyperLPR3-App
+ HyperLPR3-Example
\ No newline at end of file
diff --git a/Prj-Android/app/src/main/res/values/themes.xml b/Prj-Android/app/src/main/res/values/themes.xml
index 179ae6b..4449385 100644
--- a/Prj-Android/app/src/main/res/values/themes.xml
+++ b/Prj-Android/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
-