Skip to content

Commit 6ea12c3

Browse files
HMS-MLKitHMS-MLKit
authored
Merge pull request #12 from gwwhuawei/master
[TicketNo:] #1
2 parents 35569fe + 70184a0 commit 6ea12c3

File tree

87 files changed

+959
-969
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+959
-969
lines changed

‎app/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ android {
44
compileSdkVersion 28
55
buildToolsVersion "28.0.3"
66
defaultConfig {
7-
applicationId "com.huawei.hms.mlkit.vision.sample"
7+
applicationId "com.huawei.hms.mlkit.sample"
88
minSdkVersion 19
99
targetSdkVersion 28
1010
versionCode 1
@@ -13,11 +13,11 @@ android {
1313
}
1414
signingConfigs {
1515
release {
16-
storeFile file("./mlkitSampleTest.jks")
17-
storePassword '111111'
18-
keyAlias 'mlkit'
19-
keyPassword '111111'
20-
v2SigningEnabled false
16+
storeFile file("./mlkitSampleTest.jks")
17+
storePassword '111111'
18+
keyAlias 'mlkit'
19+
keyPassword '111111'
20+
v2SigningEnabled false
2121
}
2222
}
2323
buildTypes {

‎app/sample-agconnect-services.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"client_id":"268600551012363200",
1010
"client_secret":"4819981CE7939A526B71AC3092D35C5CB77DF8341C6986559AA9211",
1111
"app_id":"1015883",
12-
"package_name":"com.huawei.hms.mlkit.vision.sample",
12+
"package_name":"com.huawei.hms.mlkit.sample",
1313
"api_key":"CV46Xu0Y3+YFDS832xvOY69LHiAtZ2SviYUSZyELicm2NrxUesZE1TO"
1414
},
1515
"service":{

‎app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.huawei.hms.mlkit.vision.sample">
3+
package="com.huawei.hms.mlkit.sample">
44

55
<uses-permission android:name="android.permission.CAMERA" />
66
<uses-permission android:name="android.permission.INTERNET" />

‎app/src/main/java/com/huawei/hms/mlkit/vision/sample/activity/AllFunctionActivity.java‎ renamed to ‎app/src/main/java/com/huawei/hms/mlkit/sample/activity/AllFunctionActivity.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.huawei.hms.mlkit.vision.sample.activity;
17+
package com.huawei.hms.mlkit.sample.activity;
1818

1919
import android.graphics.Color;
2020
import android.os.Bundle;
2121
import android.view.View;
2222

2323
import android.widget.TextView;
2424

25-
import com.huawei.hms.mlkit.vision.sample.R;
26-
import com.huawei.hms.mlkit.vision.sample.activity.adapter.TabFragmentAdapter;
27-
import com.huawei.hms.mlkit.vision.sample.activity.fragment.LanguageCategoryFragment;
28-
import com.huawei.hms.mlkit.vision.sample.activity.fragment.OtherCategoryFragment;
29-
import com.huawei.hms.mlkit.vision.sample.activity.fragment.PictureCategoryFragment;
25+
import com.huawei.hms.mlkit.sample.R;
26+
import com.huawei.hms.mlkit.sample.activity.adapter.TabFragmentAdapter;
27+
import com.huawei.hms.mlkit.sample.activity.fragment.LanguageCategoryFragment;
28+
import com.huawei.hms.mlkit.sample.activity.fragment.OtherCategoryFragment;
29+
import com.huawei.hms.mlkit.sample.activity.fragment.PictureCategoryFragment;
3030

3131
import java.util.ArrayList;
3232
import java.util.List;

‎app/src/main/java/com/huawei/hms/mlkit/vision/sample/activity/BaseActivity.java‎ renamed to ‎app/src/main/java/com/huawei/hms/mlkit/sample/activity/BaseActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.huawei.hms.mlkit.vision.sample.activity;
17+
package com.huawei.hms.mlkit.sample.activity;
1818

1919
import android.app.Activity;
2020
import android.graphics.Color;

‎app/src/main/java/com/huawei/hms/mlkit/vision/sample/activity/FaceDetectionActivity.java‎ renamed to ‎app/src/main/java/com/huawei/hms/mlkit/sample/activity/FaceDetectionActivity.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.huawei.hms.mlkit.vision.sample.activity;
17+
package com.huawei.hms.mlkit.sample.activity;
1818

1919
import android.hardware.Camera;
2020
import android.os.Bundle;
@@ -24,14 +24,14 @@
2424
import android.widget.Toast;
2525
import android.widget.ToggleButton;
2626

27-
import com.huawei.hms.mlkit.vision.sample.R;
28-
import com.huawei.hms.mlkit.vision.sample.camera.CameraConfiguration;
29-
import com.huawei.hms.mlkit.vision.sample.camera.LensEngine;
30-
import com.huawei.hms.mlkit.vision.sample.camera.LensEnginePreview;
31-
import com.huawei.hms.mlkit.vision.sample.transactor.LocalFaceTransactor;
32-
import com.huawei.hms.mlkit.vision.sample.util.Constant;
33-
import com.huawei.hms.mlkit.vision.sample.views.SwitchButton;
34-
import com.huawei.hms.mlkit.vision.sample.views.overlay.GraphicOverlay;
27+
import com.huawei.hms.mlkit.sample.R;
28+
import com.huawei.hms.mlkit.sample.camera.CameraConfiguration;
29+
import com.huawei.hms.mlkit.sample.camera.LensEngine;
30+
import com.huawei.hms.mlkit.sample.camera.LensEnginePreview;
31+
import com.huawei.hms.mlkit.sample.transactor.LocalFaceTransactor;
32+
import com.huawei.hms.mlkit.sample.util.Constant;
33+
import com.huawei.hms.mlkit.sample.views.SwitchButton;
34+
import com.huawei.hms.mlkit.sample.views.overlay.GraphicOverlay;
3535
import com.huawei.hms.mlsdk.face.MLFaceAnalyzerSetting;
3636

3737
import java.io.IOException;

‎app/src/main/java/com/huawei/hms/mlkit/vision/sample/activity/IDCardRecognitionActivity.java‎ renamed to ‎app/src/main/java/com/huawei/hms/mlkit/sample/activity/IDCardRecognitionActivity.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.huawei.hms.mlkit.vision.sample.activity;
17+
package com.huawei.hms.mlkit.sample.activity;
1818

1919
import android.Manifest;
2020
import android.content.pm.PackageManager;
@@ -30,8 +30,8 @@
3030
import android.widget.TextView;
3131
import android.widget.Toast;
3232

33-
import com.huawei.hms.mlkit.vision.sample.R;
34-
import com.huawei.hms.mlkit.vision.sample.views.SwitchButton;
33+
import com.huawei.hms.mlkit.sample.R;
34+
import com.huawei.hms.mlkit.sample.views.SwitchButton;
3535
import com.huawei.hms.mlplugin.card.icr.cn.MLCnIcrCapture;
3636
import com.huawei.hms.mlplugin.card.icr.cn.MLCnIcrCaptureConfig;
3737
import com.huawei.hms.mlplugin.card.icr.cn.MLCnIcrCaptureFactory;
@@ -44,7 +44,7 @@ public class IDCardRecognitionActivity extends AppCompatActivity implements View
4444
SwitchButton.OnSwitchButtonStateChangeListener {
4545
private static final String TAG = "IDCardRecognition";
4646

47-
private boolean lastType = false; // false: 表示反面， true：表示正面
47+
private boolean lastType = false; // false: front， true：back.
4848
private static final int REQUEST_CODE = 10;
4949
private static final String[] PERMISSIONS = {Manifest.permission.CAMERA,
5050
Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE,

‎app/src/main/java/com/huawei/hms/mlkit/vision/sample/activity/ImageClassificationActivity.java‎ renamed to ‎app/src/main/java/com/huawei/hms/mlkit/sample/activity/ImageClassificationActivity.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.huawei.hms.mlkit.vision.sample.activity;
17+
package com.huawei.hms.mlkit.sample.activity;
1818

1919
import android.content.Intent;
2020
import android.hardware.Camera;
@@ -27,15 +27,15 @@
2727
import android.widget.Toast;
2828
import android.widget.ToggleButton;
2929

30-
import com.huawei.hms.mlkit.vision.sample.R;
31-
import com.huawei.hms.mlkit.vision.sample.activity.dialog.AddPictureDialog;
32-
import com.huawei.hms.mlkit.vision.sample.camera.CameraConfiguration;
33-
import com.huawei.hms.mlkit.vision.sample.camera.LensEngine;
34-
import com.huawei.hms.mlkit.vision.sample.camera.LensEnginePreview;
30+
import com.huawei.hms.mlkit.sample.R;
31+
import com.huawei.hms.mlkit.sample.activity.dialog.AddPictureDialog;
32+
import com.huawei.hms.mlkit.sample.camera.CameraConfiguration;
33+
import com.huawei.hms.mlkit.sample.camera.LensEngine;
34+
import com.huawei.hms.mlkit.sample.camera.LensEnginePreview;
3535

36-
import com.huawei.hms.mlkit.vision.sample.transactor.LocalImageClassificationTransactor;
37-
import com.huawei.hms.mlkit.vision.sample.util.Constant;
38-
import com.huawei.hms.mlkit.vision.sample.views.overlay.GraphicOverlay;
36+
import com.huawei.hms.mlkit.sample.transactor.LocalImageClassificationTransactor;
37+
import com.huawei.hms.mlkit.sample.util.Constant;
38+
import com.huawei.hms.mlkit.sample.views.overlay.GraphicOverlay;
3939

4040
import java.io.IOException;
4141

@@ -85,15 +85,15 @@ public void onClick(View view) {
8585
if (view.getId() == R.id.classification_back) {
8686
this.finish();
8787
} else if (view.getId() == R.id.imageSwitch) {
88-
showDialog();
88+
this.showDialog();
8989
}
9090
}
9191

9292
private void crateDialog(){
93-
addPictureDialog = new AddPictureDialog(this);
93+
this.addPictureDialog = new AddPictureDialog(this);
9494
final Intent intent = new Intent(ImageClassificationActivity.this, RemoteDetectionActivity.class);
9595
intent.putExtra(Constant.MODEL_TYPE, Constant.CLOUD_IMAGE_CLASSIFICATION);
96-
addPictureDialog.setClickListener(new AddPictureDialog.ClickListener() {
96+
this.addPictureDialog.setClickListener(new AddPictureDialog.ClickListener() {
9797
@Override
9898
public void takePicture() {
9999
intent.putExtra(Constant.ADD_PICTURE_TYPE, Constant.TYPE_TAKE_PHOTO);
@@ -109,7 +109,7 @@ public void selectImage() {
109109
}
110110

111111
private void showDialog() {
112-
addPictureDialog.show();
112+
this.addPictureDialog.show();
113113
}
114114

115115
@Override

‎app/src/main/java/com/huawei/hms/mlkit/vision/sample/activity/ObjectDetectionActivity.java‎ renamed to ‎app/src/main/java/com/huawei/hms/mlkit/sample/activity/ObjectDetectionActivity.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.huawei.hms.mlkit.vision.sample.activity;
17+
package com.huawei.hms.mlkit.sample.activity;
1818

1919
import android.hardware.Camera;
2020
import android.os.Bundle;
@@ -24,13 +24,13 @@
2424
import android.widget.Toast;
2525
import android.widget.ToggleButton;
2626

27-
import com.huawei.hms.mlkit.vision.sample.R;
28-
import com.huawei.hms.mlkit.vision.sample.camera.CameraConfiguration;
29-
import com.huawei.hms.mlkit.vision.sample.camera.LensEngine;
30-
import com.huawei.hms.mlkit.vision.sample.camera.LensEnginePreview;
31-
import com.huawei.hms.mlkit.vision.sample.transactor.LocalObjectTransactor;
32-
import com.huawei.hms.mlkit.vision.sample.util.Constant;
33-
import com.huawei.hms.mlkit.vision.sample.views.overlay.GraphicOverlay;
27+
import com.huawei.hms.mlkit.sample.R;
28+
import com.huawei.hms.mlkit.sample.camera.CameraConfiguration;
29+
import com.huawei.hms.mlkit.sample.camera.LensEngine;
30+
import com.huawei.hms.mlkit.sample.camera.LensEnginePreview;
31+
import com.huawei.hms.mlkit.sample.transactor.LocalObjectTransactor;
32+
import com.huawei.hms.mlkit.sample.util.Constant;
33+
import com.huawei.hms.mlkit.sample.views.overlay.GraphicOverlay;
3434
import com.huawei.hms.mlsdk.objects.MLObjectAnalyzerSetting;
3535

3636
import java.io.IOException;

‎app/src/main/java/com/huawei/hms/mlkit/vision/sample/activity/RemoteDetectionActivity.java‎ renamed to ‎app/src/main/java/com/huawei/hms/mlkit/sample/activity/RemoteDetectionActivity.java‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.huawei.hms.mlkit.vision.sample.activity;
17+
package com.huawei.hms.mlkit.sample.activity;
1818

1919
import android.app.Activity;
2020
import android.app.Dialog;
@@ -41,19 +41,19 @@
4141
import android.widget.TextView;
4242
import android.widget.Toast;
4343

44-
import com.huawei.hms.mlkit.vision.sample.R;
45-
import com.huawei.hms.mlkit.vision.sample.activity.dialog.AddPictureDialog;
46-
import com.huawei.hms.mlkit.vision.sample.callback.CouldInfoResultCallBack;
47-
import com.huawei.hms.mlkit.vision.sample.manager.CloudDataManager;
48-
import com.huawei.hms.mlkit.vision.sample.util.BitmapUtils;
49-
import com.huawei.hms.mlkit.vision.sample.util.Constant;
50-
import com.huawei.hms.mlkit.vision.sample.views.overlay.ZoomImageView;
51-
import com.huawei.hms.mlkit.vision.sample.views.overlay.GraphicOverlay;
52-
import com.huawei.hms.mlkit.vision.sample.transactor.ImageTransactor;
53-
import com.huawei.hms.mlkit.vision.sample.transactor.RemoteImageClassificationTransactor;
54-
import com.huawei.hms.mlkit.vision.sample.transactor.RemoteLandmarkTransactor;
55-
import com.huawei.hms.mlkit.vision.sample.transactor.DocumentTextTransactor;
56-
import com.huawei.hms.mlkit.vision.sample.transactor.RemoteTextTransactor;
44+
import com.huawei.hms.mlkit.sample.R;
45+
import com.huawei.hms.mlkit.sample.activity.dialog.AddPictureDialog;
46+
import com.huawei.hms.mlkit.sample.callback.CouldInfoResultCallBack;
47+
import com.huawei.hms.mlkit.sample.manager.CloudDataManager;
48+
import com.huawei.hms.mlkit.sample.util.BitmapUtils;
49+
import com.huawei.hms.mlkit.sample.util.Constant;
50+
import com.huawei.hms.mlkit.sample.views.overlay.ZoomImageView;
51+
import com.huawei.hms.mlkit.sample.views.overlay.GraphicOverlay;
52+
import com.huawei.hms.mlkit.sample.transactor.ImageTransactor;
53+
import com.huawei.hms.mlkit.sample.transactor.RemoteImageClassificationTransactor;
54+
import com.huawei.hms.mlkit.sample.transactor.RemoteLandmarkTransactor;
55+
import com.huawei.hms.mlkit.sample.transactor.DocumentTextTransactor;
56+
import com.huawei.hms.mlkit.sample.transactor.RemoteTextTransactor;
5757
import com.huawei.hms.mlsdk.document.MLDocument;
5858
import com.huawei.hms.mlsdk.text.MLText;
5959

@@ -168,7 +168,7 @@ protected void onCreate(Bundle savedInstanceState) {
168168
this.selectedMode = intent.getStringExtra(Constant.MODEL_TYPE);
169169
type = intent.getStringExtra(Constant.ADD_PICTURE_TYPE);
170170
} catch (RuntimeException e) {
171-
Log.e(TAG, "Get intent value failed: " + e.getMessage());
171+
Log.e(RemoteDetectionActivity.TAG, "Get intent value failed: " + e.getMessage());
172172
}
173173
if (savedInstanceState != null) {
174174
this.imageUri = savedInstanceState.getParcelable(RemoteDetectionActivity.KEY_IMAGE_URI);
@@ -191,7 +191,7 @@ protected void onCreate(Bundle savedInstanceState) {
191191
this.isLandScape = (this.getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE);
192192
this.setStatusBar();
193193
if (type == null) {
194-
selectLocalImage();
194+
this.selectLocalImage();
195195
} else if (type.equals(Constant.TYPE_SELECT_IMAGE)) {
196196
this.selectLocalImage();
197197
} else {
@@ -229,31 +229,31 @@ private void reloadAndDetectImage() {
229229
@Override
230230
public void onClick(View view) {
231231
if (view.getId() == R.id.getImageButton) {
232-
showDialog();
232+
this.showDialog();
233233
} else if (view.getId() == R.id.back) {
234234
this.finish();
235235
}
236236
}
237237

238238
private void createDialog(){
239-
addPictureDialog = new AddPictureDialog(this);
239+
this.addPictureDialog = new AddPictureDialog(this);
240240
final Intent intent = new Intent(RemoteDetectionActivity.this, RemoteDetectionActivity.class);
241241
intent.putExtra(Constant.MODEL_TYPE, Constant.CLOUD_IMAGE_CLASSIFICATION);
242-
addPictureDialog.setClickListener(new AddPictureDialog.ClickListener() {
242+
this.addPictureDialog.setClickListener(new AddPictureDialog.ClickListener() {
243243
@Override
244244
public void takePicture() {
245-
startCamera();
245+
RemoteDetectionActivity.this.startCamera();
246246
}
247247

248248
@Override
249249
public void selectImage() {
250-
selectLocalImage();
250+
RemoteDetectionActivity.this.selectLocalImage();
251251
}
252252
});
253253
}
254254

255255
private void showDialog() {
256-
addPictureDialog.show();
256+
this.addPictureDialog.show();
257257
}
258258

259259
@Override
@@ -407,7 +407,7 @@ public void onSuccessForText(Bitmap originalCameraImage, MLText text, GraphicOve
407407
RemoteDetectionActivity.this.changeImageView.setVisibility(View.VISIBLE);
408408
RemoteDetectionActivity.this.bitmapCopy = Bitmap.createBitmap(originalCameraImage).copy(Bitmap.Config.ARGB_8888, true);
409409
RemoteDetectionActivity.this.bitmapCopyForTap = Bitmap.createBitmap(originalCameraImage).copy(Bitmap.Config.ARGB_8888, true);
410-
RemoteDetectionActivity.this.cloudDataManager = new CloudDataManager(graphicOverlay, bitmapCopyForTap, text);
410+
RemoteDetectionActivity.this.cloudDataManager = new CloudDataManager(graphicOverlay, RemoteDetectionActivity.this.bitmapCopyForTap, text);
411411
RemoteDetectionActivity.this.changeImageView.setImageBitmap(RemoteDetectionActivity.this.bitmapCopy);
412412
Canvas canvas = new Canvas(RemoteDetectionActivity.this.bitmapCopy);
413413
RemoteDetectionActivity.this.cloudDataManager.drawView(canvas, true);
@@ -428,7 +428,7 @@ private class MyOnDoubleTapListener implements GestureDetector.OnDoubleTapListen
428428
@Override
429429
public boolean onSingleTapConfirmed(MotionEvent motionEvent) {
430430
if (!RemoteDetectionActivity.this.selectedMode.equals(Constant.CLOUD_TEXT_DETECTION)) {
431-
Log.d(TAG, "selectedMode:" + RemoteDetectionActivity.this.selectedMode);
431+
Log.d(RemoteDetectionActivity.TAG, "selectedMode:" + RemoteDetectionActivity.this.selectedMode);
432432
return false;
433433
}
434434
RemoteDetectionActivity.this.changeImageView.setImageBitmap(RemoteDetectionActivity.this.bitmapCopyForTap);

0 commit comments

Comments
 (0)