Skip to content

Commit fa47889

Browse files
HMS-MLKitHMS-MLKit
authored
Merge pull request #14 from gwwhuawei/master
[TicketNo:] #1
2 parents d3cc6eb + 2dfbe82 commit fa47889

File tree

121 files changed

+980
-1184
lines changed

Some content is hidden

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

121 files changed

+980
-1184
lines changed

‎app/build.gradle‎

Lines changed: 1 addition & 1 deletion
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.sample"
7+
applicationId "com.huawei.hms.mlkit.vision.sample"
88
minSdkVersion 19
99
targetSdkVersion 28
1010
versionCode 1

‎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.sample",
12+
"package_name":"com.huawei.hms.mlkit.vision.sample",
1313
"api_key":"CV46Xu0Y3+YFDS832xvOY69LHiAtZ2SviYUSZyELicm2NrxUesZE1TO"
1414
},
1515
"service":{

‎app/src/main/AndroidManifest.xml‎

Lines changed: 3 additions & 2 deletions
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.sample">
3+
package="com.huawei.hms.mlkit.vision.sample">
44

55
<uses-permission android:name="android.permission.CAMERA" />
66
<uses-permission android:name="android.permission.INTERNET" />
@@ -12,7 +12,7 @@
1212
<application
1313
android:allowBackup="false"
1414
android:icon="@drawable/icon"
15-
android:label="@string/app_name"
15+
android:label="ML Kit"
1616
android:theme="@style/MaterialTheme">
1717
<activity android:name=".activity.AllFunctionActivity"></activity>
1818
<activity android:name=".activity.ImageClassificationActivity" />
@@ -36,6 +36,7 @@
3636
<activity
3737
android:name=".activity.SettingActivity"
3838
android:exported="true" />
39+
3940
<activity android:name=".activity.TranslatorActivity" />
4041

4142
<activity

‎app/src/main/java/com/huawei/hms/mlkit/sample/activity/AllFunctionActivity.java‎ renamed to ‎app/src/main/java/com/huawei/hms/mlkit/vision/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.sample.activity;
17+
package com.huawei.hms.mlkit.vision.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.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;
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;
3030

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

‎app/src/main/java/com/huawei/hms/mlkit/sample/activity/BaseActivity.java‎ renamed to ‎app/src/main/java/com/huawei/hms/mlkit/vision/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.sample.activity;
17+
package com.huawei.hms.mlkit.vision.sample.activity;
1818

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

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

Lines changed: 10 additions & 10 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.sample.activity;
17+
package com.huawei.hms.mlkit.vision.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.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;
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;
3535
import com.huawei.hms.mlsdk.face.MLFaceAnalyzerSetting;
3636

3737
import java.io.IOException;
@@ -93,7 +93,7 @@ private void setDetectorOptions(boolean isOpen) {
9393
.setKeyPointType(MLFaceAnalyzerSetting.TYPE_KEYPOINTS)
9494
.create();
9595
}
96-
this.lensEngine.setMachineLearningFrameTransactor(new LocalFaceTransactor(detectorOptions, getApplicationContext(), isOpen));
96+
this.lensEngine.setMachineLearningFrameTransactor(new LocalFaceTransactor(detectorOptions, this.getApplicationContext(), isOpen));
9797
}
9898

9999
@Override

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

Lines changed: 3 additions & 3 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.sample.activity;
17+
package com.huawei.hms.mlkit.vision.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.sample.R;
34-
import com.huawei.hms.mlkit.sample.views.SwitchButton;
33+
import com.huawei.hms.mlkit.vision.sample.R;
34+
import com.huawei.hms.mlkit.vision.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;

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

Lines changed: 12 additions & 12 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.sample.activity;
17+
package com.huawei.hms.mlkit.vision.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.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;
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;
3535

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;
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;
3939

4040
import java.io.IOException;
4141

@@ -97,13 +97,13 @@ private void crateDialog(){
9797
@Override
9898
public void takePicture() {
9999
intent.putExtra(Constant.ADD_PICTURE_TYPE, Constant.TYPE_TAKE_PHOTO);
100-
startActivity(intent);
100+
ImageClassificationActivity.this.startActivity(intent);
101101
}
102102

103103
@Override
104104
public void selectImage() {
105105
intent.putExtra(Constant.ADD_PICTURE_TYPE, Constant.TYPE_SELECT_IMAGE);
106-
startActivity(intent);
106+
ImageClassificationActivity.this.startActivity(intent);
107107
}
108108
});
109109
}
@@ -149,7 +149,7 @@ private void createLensEngine() {
149149
this.lensEngine = new LensEngine(this, this.cameraConfiguration, this.graphicOverlay);
150150
}
151151
try {
152-
this.lensEngine.setMachineLearningFrameTransactor(new LocalImageClassificationTransactor());
152+
this.lensEngine.setMachineLearningFrameTransactor(new LocalImageClassificationTransactor(this.getApplicationContext()));
153153
} catch (Exception e) {
154154
Toast.makeText(
155155
this,

‎app/src/main/java/com/huawei/hms/mlkit/sample/activity/ObjectDetectionActivity.java‎ renamed to ‎app/src/main/java/com/huawei/hms/mlkit/vision/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.sample.activity;
17+
package com.huawei.hms.mlkit.vision.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.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;
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;
3434
import com.huawei.hms.mlsdk.objects.MLObjectAnalyzerSetting;
3535

3636
import java.io.IOException;

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

Lines changed: 16 additions & 16 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.sample.activity;
17+
package com.huawei.hms.mlkit.vision.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.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;
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;
5757
import com.huawei.hms.mlsdk.document.MLDocument;
5858
import com.huawei.hms.mlsdk.text.MLText;
5959

@@ -148,7 +148,7 @@ public void run() {
148148
if (RemoteDetectionActivity.this.progressDialog != null) {
149149
RemoteDetectionActivity.this.progressDialog.dismiss();
150150
}
151-
Toast.makeText(getApplicationContext(), RemoteDetectionActivity.this.getString(R.string.get_data_failed), Toast.LENGTH_SHORT).show();
151+
Toast.makeText(RemoteDetectionActivity.this.getApplicationContext(), RemoteDetectionActivity.this.getString(R.string.get_data_failed), Toast.LENGTH_SHORT).show();
152152
}
153153
};
154154

@@ -358,7 +358,7 @@ private Integer getMaxHeightOfImage() {
358358
private void createImageTransactor() {
359359
switch (this.selectedMode) {
360360
case Constant.CLOUD_IMAGE_CLASSIFICATION:
361-
this.imageTransactor = new RemoteImageClassificationTransactor(this.mHandler);
361+
this.imageTransactor = new RemoteImageClassificationTransactor(this.getApplicationContext(), this.mHandler);
362362
break;
363363
case Constant.CLOUD_LANDMARK_DETECTION:
364364
this.imageTransactor = new RemoteLandmarkTransactor(this.mHandler);

0 commit comments

Comments
 (0)