diff --git a/model_zoo/official/lite/Himindspore/app/build.gradle b/model_zoo/official/lite/Himindspore/app/build.gradle index 0d86b0e828..6ff55793c1 100644 --- a/model_zoo/official/lite/Himindspore/app/build.gradle +++ b/model_zoo/official/lite/Himindspore/app/build.gradle @@ -8,16 +8,15 @@ android { applicationId "com.mindspore.himindspore" minSdkVersion 21 targetSdkVersion 30 - versionCode 3 - versionName "1.1.1" + versionCode 4 + versionName "1.1.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" javaCompileOptions { annotationProcessorOptions { - arguments = [moduleName: project.getName()] + arguments = [AROUTER_MODULE_NAME: project.getName()] } } - } buildTypes { @@ -69,10 +68,11 @@ dependencies { implementation 'com.squareup.okhttp3:logging-interceptor:4.9.0' implementation 'org.greenrobot:eventbus:3.0.0' - implementation 'com.alibaba:arouter-api:1.2.1' - annotationProcessor 'com.alibaba:arouter-compiler:1.1.2' + implementation 'com.alibaba:arouter-api:1.5.1' + annotationProcessor 'com.alibaba:arouter-compiler:1.5.1' implementation project(':posenet') implementation project(':imageObject') implementation project(':styletransfer') + implementation project(':segmentation') } diff --git a/model_zoo/official/lite/Himindspore/app/src/androidTest/java/com/mindspore/himindspore/ExampleInstrumentedTest.java b/model_zoo/official/lite/Himindspore/app/src/androidTest/java/com/mindspore/himindspore/ExampleInstrumentedTest.java deleted file mode 100644 index 840c4d2eb4..0000000000 --- a/model_zoo/official/lite/Himindspore/app/src/androidTest/java/com/mindspore/himindspore/ExampleInstrumentedTest.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.mindspore.himindspore; - -import android.content.Context; - -import androidx.test.ext.junit.runners.AndroidJUnit4; -import androidx.test.platform.app.InstrumentationRegistry; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.assertEquals; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith(AndroidJUnit4.class) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - assertEquals("com.mindspore.himindspore", appContext.getPackageName()); - } -} \ No newline at end of file diff --git a/model_zoo/official/lite/Himindspore/app/src/main/java/com/mindspore/himindspore/SplashActivity.java b/model_zoo/official/lite/Himindspore/app/src/main/java/com/mindspore/himindspore/SplashActivity.java index eb5fce60e8..a6669d60aa 100644 --- a/model_zoo/official/lite/Himindspore/app/src/main/java/com/mindspore/himindspore/SplashActivity.java +++ b/model_zoo/official/lite/Himindspore/app/src/main/java/com/mindspore/himindspore/SplashActivity.java @@ -206,6 +206,14 @@ public class SplashActivity extends BaseActivity implements MainC } } + public void onClickSegmentation(View view) { + if (isAllGranted) { + ARouter.getInstance().build("/segmentation/SegmentationMainActivity").navigation(this); + } else { + requestPermissions(); + } + } + public void onClickSouceCode(View view) { openBrowser(CODE_URL); } @@ -343,4 +351,5 @@ public class SplashActivity extends BaseActivity implements MainC } + } \ No newline at end of file diff --git a/model_zoo/official/lite/Himindspore/app/src/main/res/layout/activity_splash.xml b/model_zoo/official/lite/Himindspore/app/src/main/res/layout/activity_splash.xml index 20eda83547..764d97d1d6 100644 --- a/model_zoo/official/lite/Himindspore/app/src/main/res/layout/activity_splash.xml +++ b/model_zoo/official/lite/Himindspore/app/src/main/res/layout/activity_splash.xml @@ -14,7 +14,7 @@ android:layout_height="wrap_content" android:layout_marginTop="68dp" android:drawableTop="@drawable/logo" - android:drawablePadding="30dp" + android:drawablePadding="20dp" android:gravity="center_horizontal" android:maxLines="1" android:text="@string/app_name" @@ -133,11 +133,28 @@ app:layout_constraintEnd_toEndOf="@+id/btn_image_garbage" app:layout_constraintWidth_percent="0.43" /> +