Browse Source

update to petclassification

update to petclassification
tags/v1.2.0-rc1
hukang hwx963878 4 years ago
parent
commit
afdd7ed951
100 changed files with 70 additions and 83 deletions
  1. BIN
      model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style0.jpg
  2. BIN
      model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style1.jpg
  3. BIN
      model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style10.jpg
  4. BIN
      model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style11.jpg
  5. BIN
      model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style12.jpg
  6. BIN
      model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style13.jpg
  7. BIN
      model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style14.jpg
  8. BIN
      model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style15.jpg
  9. BIN
      model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style16.jpg
  10. BIN
      model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style17.jpg
  11. BIN
      model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style18.jpg
  12. BIN
      model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style19.jpg
  13. BIN
      model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style2.jpg
  14. BIN
      model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style3.jpg
  15. BIN
      model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style4.jpg
  16. BIN
      model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style5.jpg
  17. BIN
      model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style6.jpg
  18. BIN
      model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style7.jpg
  19. BIN
      model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style8.jpg
  20. BIN
      model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style9.jpg
  21. +0
    -2
      model_zoo/official/lite/car_classification/settings.gradle
  22. +0
    -0
      model_zoo/official/lite/pet_classification/.gitignore
  23. +0
    -0
      model_zoo/official/lite/pet_classification/app/.gitignore
  24. +9
    -10
      model_zoo/official/lite/pet_classification/app/CMakeLists.txt
  25. +1
    -1
      model_zoo/official/lite/pet_classification/app/build.gradle
  26. +0
    -0
      model_zoo/official/lite/pet_classification/app/download.gradle
  27. +0
    -0
      model_zoo/official/lite/pet_classification/app/proguard-rules.pro
  28. +1
    -1
      model_zoo/official/lite/pet_classification/app/src/androidTest/java/com/mindspore/classificationforpet/ExampleInstrumentedTest.java
  29. +4
    -4
      model_zoo/official/lite/pet_classification/app/src/main/AndroidManifest.xml
  30. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/assets/model/car.ms
  31. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/assets/model/mobilenetv2.ms
  32. +4
    -4
      model_zoo/official/lite/pet_classification/app/src/main/cpp/ImageMindSporeNetnative.cpp
  33. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/cpp/ImageMindSporeNetnative.h
  34. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/cpp/MSNetWork.cpp
  35. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/cpp/MSNetWork.h
  36. +10
    -18
      model_zoo/official/lite/pet_classification/app/src/main/cpp/MindSporeNetnative.cpp
  37. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/cpp/MindSporeNetnative.h
  38. +1
    -1
      model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/gallery/classify/BitmapUtils.java
  39. +1
    -1
      model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/gallery/classify/CompareSizesByArea.java
  40. +1
    -1
      model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/gallery/classify/ImageTrackingMobile.java
  41. +1
    -1
      model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/gallery/classify/RecognitionImageBean.java
  42. +1
    -1
      model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/gallery/classify/TrackingMobile.java
  43. +1
    -1
      model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/widget/AutoFitTextureView.java
  44. +9
    -9
      model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/widget/CameraActivity.java
  45. +4
    -4
      model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/widget/CameraFragment.java
  46. +13
    -15
      model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/widget/MainActivity.java
  47. +1
    -1
      model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/widget/OnBackgroundImageListener.java
  48. +2
    -2
      model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/widget/RecyclerViewAdapter.java
  49. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
  50. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/logo.png
  51. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/logo2.png
  52. BIN
      model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style0.jpg
  53. BIN
      model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style1.jpg
  54. BIN
      model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style2.jpg
  55. BIN
      model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style3.jpg
  56. BIN
      model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style4.jpg
  57. BIN
      model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style5.jpg
  58. BIN
      model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style6.jpg
  59. BIN
      model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style7.jpg
  60. BIN
      model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style8.jpg
  61. BIN
      model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style9.jpg
  62. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/res/drawable/ic_launcher_background.xml
  63. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/res/drawable/progressbar.xml
  64. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/res/drawable/rectangle.xml
  65. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/res/drawable/switch_thumb.xml
  66. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/res/drawable/switch_track.xml
  67. +2
    -2
      model_zoo/official/lite/pet_classification/app/src/main/res/layout/activity_camera.xml
  68. +1
    -1
      model_zoo/official/lite/pet_classification/app/src/main/res/layout/activity_main.xml
  69. +1
    -1
      model_zoo/official/lite/pet_classification/app/src/main/res/layout/fragment_camera.xml
  70. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/res/layout/image_item.xml
  71. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/res/layout/layout_hor_text_view.xml
  72. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
  73. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
  74. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-hdpi/ic_launcher.png
  75. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
  76. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
  77. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-mdpi/ic_launcher.png
  78. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
  79. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
  80. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xhdpi/ic_launcher.png
  81. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
  82. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
  83. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
  84. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
  85. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
  86. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xxhdpi/logo.png
  87. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
  88. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
  89. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
  90. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/res/values/colors.xml
  91. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/res/values/dimens.xml
  92. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/res/values/ic_launcher_background.xml
  93. +1
    -1
      model_zoo/official/lite/pet_classification/app/src/main/res/values/strings.xml
  94. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/res/values/styles.xml
  95. +0
    -0
      model_zoo/official/lite/pet_classification/app/src/main/res/xml/file_paths.xml
  96. +1
    -1
      model_zoo/official/lite/pet_classification/app/src/test/java/com/mindspore/classificationforpet/ExampleUnitTest.java
  97. +0
    -0
      model_zoo/official/lite/pet_classification/build.gradle
  98. +0
    -0
      model_zoo/official/lite/pet_classification/gradle.properties
  99. +0
    -0
      model_zoo/official/lite/pet_classification/gradle/wrapper/gradle-wrapper.jar
  100. +0
    -0
      model_zoo/official/lite/pet_classification/gradle/wrapper/gradle-wrapper.properties

BIN
model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style0.jpg View File

Before After
Width: 977  |  Height: 709  |  Size: 196 kB

BIN
model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style1.jpg View File

Before After
Width: 4160  |  Height: 2336  |  Size: 3.6 MB

BIN
model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style10.jpg View File

Before After
Width: 1197  |  Height: 773  |  Size: 320 kB

BIN
model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style11.jpg View File

Before After
Width: 1022  |  Height: 617  |  Size: 246 kB

BIN
model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style12.jpg View File

Before After
Width: 1212  |  Height: 789  |  Size: 253 kB

BIN
model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style13.jpg View File

Before After
Width: 598  |  Height: 687  |  Size: 141 kB

BIN
model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style14.jpg View File

Before After
Width: 1001  |  Height: 830  |  Size: 173 kB

BIN
model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style15.jpg View File

Before After
Width: 1024  |  Height: 768  |  Size: 111 kB

BIN
model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style16.jpg View File

Before After
Width: 1280  |  Height: 853  |  Size: 110 kB

BIN
model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style17.jpg View File

Before After
Width: 1050  |  Height: 777  |  Size: 209 kB

BIN
model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style18.jpg View File

Before After
Width: 1205  |  Height: 693  |  Size: 194 kB

BIN
model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style19.jpg View File

Before After
Width: 1237  |  Height: 697  |  Size: 335 kB

BIN
model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style2.jpg View File

Before After
Width: 1018  |  Height: 604  |  Size: 261 kB

BIN
model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style3.jpg View File

Before After
Width: 1100  |  Height: 535  |  Size: 198 kB

BIN
model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style4.jpg View File

Before After
Width: 1259  |  Height: 819  |  Size: 314 kB

BIN
model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style5.jpg View File

Before After
Width: 1253  |  Height: 805  |  Size: 272 kB

BIN
model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style6.jpg View File

Before After
Width: 1200  |  Height: 800  |  Size: 646 kB

BIN
model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style7.jpg View File

Before After
Width: 1284  |  Height: 852  |  Size: 280 kB

BIN
model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style8.jpg View File

Before After
Width: 900  |  Height: 600  |  Size: 294 kB

BIN
model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style9.jpg View File

Before After
Width: 1175  |  Height: 847  |  Size: 260 kB

+ 0
- 2
model_zoo/official/lite/car_classification/settings.gradle View File

@@ -1,2 +0,0 @@
include ':app'
rootProject.name = "CarClassification"

model_zoo/official/lite/car_classification/.gitignore → model_zoo/official/lite/pet_classification/.gitignore View File


model_zoo/official/lite/car_classification/app/.gitignore → model_zoo/official/lite/pet_classification/app/.gitignore View File


model_zoo/official/lite/car_classification/app/CMakeLists.txt → model_zoo/official/lite/pet_classification/app/CMakeLists.txt View File

@@ -6,9 +6,9 @@
cmake_minimum_required(VERSION 3.4.1) cmake_minimum_required(VERSION 3.4.1)


set(CMAKE_VERBOSE_MAKEFILE on) set(CMAKE_VERBOSE_MAKEFILE on)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/libs/${ANDROID_ABI})
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/libs/${ANDROID_ABI})


set(MINDSPORELITE_VERSION mindspore-lite-1.0.1-runtime-arm64-cpu)
set(MINDSPORELITE_VERSION mindspore-lite-1.0.1-runtime-arm64-cpu)


# ============== Set MindSpore Dependencies. ============= # ============== Set MindSpore Dependencies. =============
include_directories(${CMAKE_SOURCE_DIR}/src/main/cpp) include_directories(${CMAKE_SOURCE_DIR}/src/main/cpp)
@@ -19,9 +19,9 @@ include_directories(${CMAKE_SOURCE_DIR}/src/main/cpp/${MINDSPORELITE_VERSION}/in
include_directories(${CMAKE_SOURCE_DIR}/src/main/cpp/${MINDSPORELITE_VERSION}/include/schema) include_directories(${CMAKE_SOURCE_DIR}/src/main/cpp/${MINDSPORELITE_VERSION}/include/schema)
include_directories(${CMAKE_SOURCE_DIR}/src/main/cpp/${MINDSPORELITE_VERSION}/minddata/include) include_directories(${CMAKE_SOURCE_DIR}/src/main/cpp/${MINDSPORELITE_VERSION}/minddata/include)


add_library(mindspore-lite SHARED IMPORTED )
add_library(minddata-lite SHARED IMPORTED )
add_library(libmindspore-lite-fp16 SHARED IMPORTED )
add_library(mindspore-lite SHARED IMPORTED)
add_library(minddata-lite SHARED IMPORTED)
add_library(libmindspore-lite-fp16 SHARED IMPORTED)


set_target_properties(mindspore-lite PROPERTIES IMPORTED_LOCATION set_target_properties(mindspore-lite PROPERTIES IMPORTED_LOCATION
${CMAKE_SOURCE_DIR}/src/main/cpp/${MINDSPORELITE_VERSION}/lib/libmindspore-lite.so) ${CMAKE_SOURCE_DIR}/src/main/cpp/${MINDSPORELITE_VERSION}/lib/libmindspore-lite.so)
@@ -37,7 +37,7 @@ set_target_properties(libmindspore-lite-fp16 PROPERTIES IMPORTED_LOCATION
# You can define multiple libraries, and CMake builds them for you. # You can define multiple libraries, and CMake builds them for you.
# Gradle automatically packages shared libraries with your APK. # Gradle automatically packages shared libraries with your APK.


file(GLOB_RECURSE cpp_src "src/main/cpp/*.cpp" "src/main/cpp/*.h")
file(GLOB_RECURSE cpp_src "src/main/cpp/*.cpp" "src/main/cpp/*.h")


add_library( # Sets the name of the library. add_library( # Sets the name of the library.
mlkit-label-MS mlkit-label-MS
@@ -55,15 +55,14 @@ add_library( # Sets the name of the library.
# you want to add. CMake verifies that the library exists before # you want to add. CMake verifies that the library exists before
# completing its build. # completing its build.


find_library( # Sets the name of the path variable.
find_library(# Sets the name of the path variable.
log-lib log-lib

# Specifies the name of the NDK library that # Specifies the name of the NDK library that
# you want CMake to locate. # you want CMake to locate.
log )
log)




find_library( jnigraphics-lib jnig·raphics )
find_library(jnigraphics-lib jnig·raphics)


# Specifies libraries CMake should link to your target library. You # Specifies libraries CMake should link to your target library. You
# can link multiple libraries, such as libraries you define in this # can link multiple libraries, such as libraries you define in this

model_zoo/official/lite/car_classification/app/build.gradle → model_zoo/official/lite/pet_classification/app/build.gradle View File

@@ -5,7 +5,7 @@ android {
buildToolsVersion "30.0.1" buildToolsVersion "30.0.1"


defaultConfig { defaultConfig {
applicationId "com.mindspore.classificationforcar"
applicationId "com.mindspore.classificationforpet"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 30 targetSdkVersion 30
versionCode 1 versionCode 1

model_zoo/official/lite/car_classification/app/download.gradle → model_zoo/official/lite/pet_classification/app/download.gradle View File


model_zoo/official/lite/car_classification/app/proguard-rules.pro → model_zoo/official/lite/pet_classification/app/proguard-rules.pro View File


model_zoo/official/lite/car_classification/app/src/androidTest/java/com/mindspore/classificationforcar/ExampleInstrumentedTest.java → model_zoo/official/lite/pet_classification/app/src/androidTest/java/com/mindspore/classificationforpet/ExampleInstrumentedTest.java View File

@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */


package com.mindspore.classificationforcar;
package com.mindspore.classificationforpet;


import android.content.Context; import android.content.Context;



model_zoo/official/lite/car_classification/app/src/main/AndroidManifest.xml → model_zoo/official/lite/pet_classification/app/src/main/AndroidManifest.xml View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="com.mindspore.classificationforcar"
package="com.mindspore.classificationforpet"
android:versionCode="1" android:versionCode="1"
android:versionName="1.0"> android:versionName="1.0">


@@ -21,7 +21,7 @@
android:roundIcon="@mipmap/ic_launcher_round" android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">
<activity android:name="com.mindspore.classificationforcar.widget.MainActivity"
<activity android:name="com.mindspore.classificationforpet.widget.MainActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
> >
<intent-filter> <intent-filter>
@@ -30,13 +30,13 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity <activity
android:name="com.mindspore.classificationforcar.widget.CameraActivity"
android:name="com.mindspore.classificationforpet.widget.CameraActivity"
android:screenOrientation="portrait"> android:screenOrientation="portrait">
</activity> </activity>


<provider <provider
android:name="androidx.core.content.FileProvider" android:name="androidx.core.content.FileProvider"
android:authorities="com.mindspore.classificationforcar.fileprovider"
android:authorities="com.mindspore.classificationforpet.fileprovider"
android:exported="false" android:exported="false"
tools:replace="android:authorities" tools:replace="android:authorities"
android:grantUriPermissions="true"> android:grantUriPermissions="true">

model_zoo/official/lite/car_classification/app/src/main/assets/model/car.ms → model_zoo/official/lite/pet_classification/app/src/main/assets/model/car.ms View File


model_zoo/official/lite/car_classification/app/src/main/assets/model/mobilenetv2.ms → model_zoo/official/lite/pet_classification/app/src/main/assets/model/mobilenetv2.ms View File


model_zoo/official/lite/car_classification/app/src/main/cpp/ImageMindSporeNetnative.cpp → model_zoo/official/lite/pet_classification/app/src/main/cpp/ImageMindSporeNetnative.cpp View File

@@ -313,7 +313,7 @@ static const char *labels_name_map[RET_CATEGORY_SUM] = {
"Crochet", "Crochet",
"Sailboat", "Sailboat",
"Newspaper", "Newspaper",
"Santa claus",
"Santa Claus",
"Swamp", "Swamp",
"Skyscraper", "Skyscraper",
"Skin", "Skin",
@@ -672,7 +672,7 @@ bool ImagePreProcessImageData(const LiteMat &lite_mat_bgr, LiteMat *lite_norm_ma
*/ */
extern "C" extern "C"
JNIEXPORT jlong JNICALL JNIEXPORT jlong JNICALL
Java_com_mindspore_classificationforcar_gallery_classify_ImageTrackingMobile_loadModel(JNIEnv *env,
Java_com_mindspore_classificationforpet_gallery_classify_ImageTrackingMobile_loadModel(JNIEnv *env,
jobject thiz, jobject thiz,
jobject model_buffer, jobject model_buffer,
jint num_thread) { jint num_thread) {
@@ -722,7 +722,7 @@ Java_com_mindspore_classificationforcar_gallery_classify_ImageTrackingMobile_loa
* sending a picture to the model and run inference. * sending a picture to the model and run inference.
*/ */
extern "C" JNIEXPORT jstring JNICALL extern "C" JNIEXPORT jstring JNICALL
Java_com_mindspore_classificationforcar_gallery_classify_ImageTrackingMobile_runNet(JNIEnv *env,
Java_com_mindspore_classificationforpet_gallery_classify_ImageTrackingMobile_runNet(JNIEnv *env,
jclass type, jclass type,
jlong netEnv, jlong netEnv,
jobject srcBitmap) { jobject srcBitmap) {
@@ -796,7 +796,7 @@ Java_com_mindspore_classificationforcar_gallery_classify_ImageTrackingMobile_run
} }


extern "C" JNIEXPORT jboolean JNICALL extern "C" JNIEXPORT jboolean JNICALL
Java_com_mindspore_classificationforcar_gallery_classify_ImageTrackingMobile_unloadModel(JNIEnv *env,
Java_com_mindspore_classificationforpet_gallery_classify_ImageTrackingMobile_unloadModel(JNIEnv *env,
jclass type, jclass type,
jlong netEnv) { jlong netEnv) {
MS_PRINT("MindSpore release net."); MS_PRINT("MindSpore release net.");

model_zoo/official/lite/car_classification/app/src/main/cpp/ImageMindSporeNetnative.h → model_zoo/official/lite/pet_classification/app/src/main/cpp/ImageMindSporeNetnative.h View File


model_zoo/official/lite/car_classification/app/src/main/cpp/MSNetWork.cpp → model_zoo/official/lite/pet_classification/app/src/main/cpp/MSNetWork.cpp View File


model_zoo/official/lite/car_classification/app/src/main/cpp/MSNetWork.h → model_zoo/official/lite/pet_classification/app/src/main/cpp/MSNetWork.h View File


model_zoo/official/lite/car_classification/app/src/main/cpp/MindSporeNetnative.cpp → model_zoo/official/lite/pet_classification/app/src/main/cpp/MindSporeNetnative.cpp View File

@@ -36,18 +36,10 @@ using mindspore::dataset::LDataType;
#define MS_PRINT(format, ...) __android_log_print(ANDROID_LOG_INFO, "MSJNI", format, ##__VA_ARGS__) #define MS_PRINT(format, ...) __android_log_print(ANDROID_LOG_INFO, "MSJNI", format, ##__VA_ARGS__)




static const int RET_CAR_DETAILED_SUM = 10;
static const char *labels_name_car_detailed_map[RET_CAR_DETAILED_SUM] = {
{"大客车"},
{"出租车"},
{"中小型货车"},
{"小轿车"},
{"面包车"},
{"越野车"},
{"SUV"},
{"卡车"},
{"赛车"},
{"消防车"},
static const int RET_PET_DETAILED_SUM = 2;
static const char *labels_name_pet_detailed_map[RET_PET_DETAILED_SUM] = {
{"猫"},
{"狗"}
}; };




@@ -78,7 +70,7 @@ std::string ProcessRunnetResult(const int RET_CATEGORY_SUM, const char *const la
float *temp_scores = static_cast<float *>(outputTensor->MutableData()); float *temp_scores = static_cast<float *>(outputTensor->MutableData());
float max = 0.0; float max = 0.0;
int maxIndex = 0; int maxIndex = 0;
for (int i = 0; i < RET_CAR_DETAILED_SUM; ++i) {
for (int i = 0; i < RET_PET_DETAILED_SUM; ++i) {
if (temp_scores[i] > max) { if (temp_scores[i] > max) {
max = temp_scores[i]; max = temp_scores[i];
maxIndex = i; maxIndex = i;
@@ -164,7 +156,7 @@ bool PreProcessImageData(const LiteMat &lite_mat_bgr, LiteMat *lite_norm_mat_ptr
*/ */
extern "C" extern "C"
JNIEXPORT jlong JNICALL JNIEXPORT jlong JNICALL
Java_com_mindspore_classificationforcar_gallery_classify_TrackingMobile_loadModel(JNIEnv *env,
Java_com_mindspore_classificationforpet_gallery_classify_TrackingMobile_loadModel(JNIEnv *env,
jobject thiz, jobject thiz,
jobject model_buffer, jobject model_buffer,
jint num_thread) { jint num_thread) {
@@ -214,7 +206,7 @@ Java_com_mindspore_classificationforcar_gallery_classify_TrackingMobile_loadMode
* sending a picture to the model and run inference. * sending a picture to the model and run inference.
*/ */
extern "C" JNIEXPORT jstring JNICALL extern "C" JNIEXPORT jstring JNICALL
Java_com_mindspore_classificationforcar_gallery_classify_TrackingMobile_runNet(JNIEnv *env, jclass type,
Java_com_mindspore_classificationforpet_gallery_classify_TrackingMobile_runNet(JNIEnv *env, jclass type,
jlong netEnv, jlong netEnv,
jobject srcBitmap) { jobject srcBitmap) {
LiteMat lite_mat_bgr, lite_norm_mat_cut; LiteMat lite_mat_bgr, lite_norm_mat_cut;
@@ -280,15 +272,15 @@ Java_com_mindspore_classificationforcar_gallery_classify_TrackingMobile_runNet(J
msOutputs.insert(std::pair<std::string, mindspore::tensor::MSTensor *>{name, temp_dat}); msOutputs.insert(std::pair<std::string, mindspore::tensor::MSTensor *>{name, temp_dat});
} }


std::string resultStr = ProcessRunnetResult(::RET_CAR_DETAILED_SUM,
::labels_name_car_detailed_map, msOutputs);
std::string resultStr = ProcessRunnetResult(::RET_PET_DETAILED_SUM,
::labels_name_pet_detailed_map, msOutputs);


const char *resultCharData = resultStr.c_str(); const char *resultCharData = resultStr.c_str();
return (env)->NewStringUTF(resultCharData); return (env)->NewStringUTF(resultCharData);
} }


extern "C" JNIEXPORT jboolean JNICALL extern "C" JNIEXPORT jboolean JNICALL
Java_com_mindspore_classificationforcar_gallery_classify_TrackingMobile_unloadModel(JNIEnv *env,
Java_com_mindspore_classificationforpet_gallery_classify_TrackingMobile_unloadModel(JNIEnv *env,
jclass type, jclass type,
jlong netEnv) { jlong netEnv) {
MS_PRINT("MindSpore release net."); MS_PRINT("MindSpore release net.");

model_zoo/official/lite/car_classification/app/src/main/cpp/MindSporeNetnative.h → model_zoo/official/lite/pet_classification/app/src/main/cpp/MindSporeNetnative.h View File


model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/gallery/classify/BitmapUtils.java → model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/gallery/classify/BitmapUtils.java View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.mindspore.classificationforcar.gallery.classify;
package com.mindspore.classificationforpet.gallery.classify;


import android.app.Activity; import android.app.Activity;
import android.content.ContentResolver; import android.content.ContentResolver;

model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/gallery/classify/CompareSizesByArea.java → model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/gallery/classify/CompareSizesByArea.java View File

@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */


package com.mindspore.classificationforcar.gallery.classify;
package com.mindspore.classificationforpet.gallery.classify;


import android.util.Size; import android.util.Size;
import java.util.Comparator; import java.util.Comparator;

model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/gallery/classify/ImageTrackingMobile.java → model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/gallery/classify/ImageTrackingMobile.java View File

@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */


package com.mindspore.classificationforcar.gallery.classify;
package com.mindspore.classificationforpet.gallery.classify;


import android.content.Context; import android.content.Context;
import android.graphics.Bitmap; import android.graphics.Bitmap;

model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/gallery/classify/RecognitionImageBean.java → model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/gallery/classify/RecognitionImageBean.java View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.mindspore.classificationforcar.gallery.classify;
package com.mindspore.classificationforpet.gallery.classify;


public class RecognitionImageBean { public class RecognitionImageBean {



model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/gallery/classify/TrackingMobile.java → model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/gallery/classify/TrackingMobile.java View File

@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */


package com.mindspore.classificationforcar.gallery.classify;
package com.mindspore.classificationforpet.gallery.classify;


import android.content.Context; import android.content.Context;
import android.graphics.Bitmap; import android.graphics.Bitmap;

model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/widget/AutoFitTextureView.java → model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/widget/AutoFitTextureView.java View File

@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */


package com.mindspore.classificationforcar.widget;
package com.mindspore.classificationforpet.widget;


import android.content.Context; import android.content.Context;
import android.util.AttributeSet; import android.util.AttributeSet;

model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/widget/CameraActivity.java → model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/widget/CameraActivity.java View File

@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */


package com.mindspore.classificationforcar.widget;
package com.mindspore.classificationforpet.widget;


import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.os.Bundle; import android.os.Bundle;
@@ -26,10 +26,10 @@ import androidx.annotation.Nullable;
import androidx.annotation.UiThread; import androidx.annotation.UiThread;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;


import com.mindspore.classificationforcar.R;
import com.mindspore.classificationforcar.gallery.classify.ImageTrackingMobile;
import com.mindspore.classificationforcar.gallery.classify.RecognitionImageBean;
import com.mindspore.classificationforcar.gallery.classify.TrackingMobile;
import com.mindspore.classificationforpet.R;
import com.mindspore.classificationforpet.gallery.classify.ImageTrackingMobile;
import com.mindspore.classificationforpet.gallery.classify.RecognitionImageBean;
import com.mindspore.classificationforpet.gallery.classify.TrackingMobile;


import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@@ -44,7 +44,7 @@ public class CameraActivity extends AppCompatActivity {
private static final String IMAGE_SCENE_MS = "model/mobilenetv2.ms"; private static final String IMAGE_SCENE_MS = "model/mobilenetv2.ms";


private String filePath; private String filePath;
private boolean isCarModel;
private boolean isPetModel;
private TrackingMobile trackingMobile; private TrackingMobile trackingMobile;
private ImageTrackingMobile imageTrackingMobile; private ImageTrackingMobile imageTrackingMobile;


@@ -58,10 +58,10 @@ public class CameraActivity extends AppCompatActivity {
setContentView(R.layout.activity_camera); setContentView(R.layout.activity_camera);


filePath = getIntent().getStringExtra("FILEPATH"); filePath = getIntent().getStringExtra("FILEPATH");
isCarModel = getIntent().getBooleanExtra("ISHASCARMODELFILE", false);
isPetModel = getIntent().getBooleanExtra("ISHASPetMODELFILE", false);
resultText = findViewById(R.id.textResult); resultText = findViewById(R.id.textResult);


if (isCarModel) {
if (isPetModel) {
trackingMobile = new TrackingMobile(this); trackingMobile = new TrackingMobile(this);
boolean ret = trackingMobile.loadModelFromBuf(filePath); boolean ret = trackingMobile.loadModelFromBuf(filePath);
if (!ret) { if (!ret) {
@@ -92,7 +92,7 @@ public class CameraActivity extends AppCompatActivity {


private void initMindspore(Bitmap bitmap) { private void initMindspore(Bitmap bitmap) {
// run net. // run net.
if (isCarModel) {
if (isPetModel) {
long startTime = System.currentTimeMillis(); long startTime = System.currentTimeMillis();
String result = trackingMobile.MindSpore_runnet(bitmap); String result = trackingMobile.MindSpore_runnet(bitmap);
long endTime = System.currentTimeMillis(); long endTime = System.currentTimeMillis();

model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/widget/CameraFragment.java → model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/widget/CameraFragment.java View File

@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */


package com.mindspore.classificationforcar.widget;
package com.mindspore.classificationforpet.widget;


import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.Activity; import android.app.Activity;
@@ -56,9 +56,9 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;


import com.mindspore.classificationforcar.R;
import com.mindspore.classificationforcar.gallery.classify.CompareSizesByArea;
import com.mindspore.classificationforcar.gallery.classify.TrackingMobile;
import com.mindspore.classificationforpet.R;
import com.mindspore.classificationforpet.gallery.classify.CompareSizesByArea;
import com.mindspore.classificationforpet.gallery.classify.TrackingMobile;


import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;

model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/widget/MainActivity.java → model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/widget/MainActivity.java View File

@@ -1,4 +1,4 @@
package com.mindspore.classificationforcar.widget;
package com.mindspore.classificationforpet.widget;


import android.Manifest; import android.Manifest;
import android.content.DialogInterface; import android.content.DialogInterface;
@@ -31,11 +31,11 @@ import androidx.core.content.FileProvider;
import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;


import com.mindspore.classificationforcar.R;
import com.mindspore.classificationforcar.gallery.classify.BitmapUtils;
import com.mindspore.classificationforcar.gallery.classify.ImageTrackingMobile;
import com.mindspore.classificationforcar.gallery.classify.RecognitionImageBean;
import com.mindspore.classificationforcar.gallery.classify.TrackingMobile;
import com.mindspore.classificationforpet.R;
import com.mindspore.classificationforpet.gallery.classify.BitmapUtils;
import com.mindspore.classificationforpet.gallery.classify.ImageTrackingMobile;
import com.mindspore.classificationforpet.gallery.classify.RecognitionImageBean;
import com.mindspore.classificationforpet.gallery.classify.TrackingMobile;


import java.io.File; import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
@@ -52,18 +52,16 @@ public class MainActivity extends AppCompatActivity implements OnBackgroundImage
private static final int REQUEST_PERMISSION = 0; private static final int REQUEST_PERMISSION = 0;


private static final int[] IMAGES = {R.drawable.style0, R.drawable.style1, R.drawable.style2, R.drawable.style3, R.drawable.style4, private static final int[] IMAGES = {R.drawable.style0, R.drawable.style1, R.drawable.style2, R.drawable.style3, R.drawable.style4,
R.drawable.style5, R.drawable.style6, R.drawable.style7, R.drawable.style8, R.drawable.style9,
R.drawable.style10, R.drawable.style11, R.drawable.style12, R.drawable.style13, R.drawable.style14,
R.drawable.style15, R.drawable.style16, R.drawable.style17, R.drawable.style18, R.drawable.style19};
R.drawable.style5, R.drawable.style6, R.drawable.style7, R.drawable.style8, R.drawable.style9};


private static final int RC_CHOOSE_PHOTO = 1; private static final int RC_CHOOSE_PHOTO = 1;
private static final int RC_CHOOSE_CAMERA = 2; private static final int RC_CHOOSE_CAMERA = 2;
private static final String IMAGE_SCENE_MS = "model/mobilenetv2.ms"; private static final String IMAGE_SCENE_MS = "model/mobilenetv2.ms";


private boolean isAllGranted; private boolean isAllGranted;
private static final String CAR_MS = "car.ms";
private File ROOT_FILE = new File(Environment.getExternalStorageDirectory().getAbsoluteFile(), "CarClassification");
private File DIR_FILE = new File(ROOT_FILE, CAR_MS);
private static final String Pet_MS = "pet.ms";
private File ROOT_FILE = new File(Environment.getExternalStorageDirectory().getAbsoluteFile(), "PetClassification");
private File DIR_FILE = new File(ROOT_FILE, Pet_MS);


private ImageView imgPreview; private ImageView imgPreview;
private Uri imageUri; private Uri imageUri;
@@ -153,7 +151,7 @@ public class MainActivity extends AppCompatActivity implements OnBackgroundImage
builder.show(); builder.show();
} }


public boolean isHasCarModelFile() {
public boolean isHasPetModelFile() {
if (DIR_FILE.exists()) { if (DIR_FILE.exists()) {
return true; return true;
} else { } else {
@@ -183,7 +181,7 @@ public class MainActivity extends AppCompatActivity implements OnBackgroundImage
public void onClickScene(View view) { public void onClickScene(View view) {
Intent intent = new Intent(MainActivity.this, CameraActivity.class); Intent intent = new Intent(MainActivity.this, CameraActivity.class);
intent.putExtra("FILEPATH", DIR_FILE.getPath()); intent.putExtra("FILEPATH", DIR_FILE.getPath());
intent.putExtra("ISHASCARMODELFILE", isHasCarModelFile());
intent.putExtra("ISHASPetMODELFILE", isHasPetModelFile());
startActivity(intent); startActivity(intent);
} }


@@ -256,7 +254,7 @@ public class MainActivity extends AppCompatActivity implements OnBackgroundImage
private void initMindspore(Bitmap bitmap) { private void initMindspore(Bitmap bitmap) {
progressBar.setVisibility(View.VISIBLE); progressBar.setVisibility(View.VISIBLE);


if (isHasCarModelFile()) {
if (isHasPetModelFile()) {
boolean ret = trackingMobile.loadModelFromBuf(DIR_FILE.getPath()); boolean ret = trackingMobile.loadModelFromBuf(DIR_FILE.getPath());
if (!ret) { if (!ret) {
textResult.setText("Load model error."); textResult.setText("Load model error.");

model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/widget/OnBackgroundImageListener.java → model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/widget/OnBackgroundImageListener.java View File

@@ -1,4 +1,4 @@
package com.mindspore.classificationforcar.widget;
package com.mindspore.classificationforpet.widget;


import android.view.View; import android.view.View;



model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/widget/RecyclerViewAdapter.java → model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/widget/RecyclerViewAdapter.java View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.mindspore.classificationforcar.widget;
package com.mindspore.classificationforpet.widget;


import android.content.Context; import android.content.Context;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@@ -25,7 +25,7 @@ import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;


import com.bumptech.glide.Glide; import com.bumptech.glide.Glide;
import com.mindspore.classificationforcar.R;
import com.mindspore.classificationforpet.R;


public class RecyclerViewAdapter extends RecyclerView.Adapter<RecyclerViewAdapter.StyleItemViewHolder> { public class RecyclerViewAdapter extends RecyclerView.Adapter<RecyclerViewAdapter.StyleItemViewHolder> {



model_zoo/official/lite/car_classification/app/src/main/res/drawable-v24/ic_launcher_foreground.xml → model_zoo/official/lite/pet_classification/app/src/main/res/drawable-v24/ic_launcher_foreground.xml View File


model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/logo.png → model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/logo.png View File


model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/logo2.png → model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/logo2.png View File


BIN
model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style0.jpg View File

Before After
Width: 312  |  Height: 396  |  Size: 25 kB

BIN
model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style1.jpg View File

Before After
Width: 500  |  Height: 414  |  Size: 38 kB

BIN
model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style2.jpg View File

Before After
Width: 495  |  Height: 499  |  Size: 37 kB

BIN
model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style3.jpg View File

Before After
Width: 499  |  Height: 375  |  Size: 32 kB

BIN
model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style4.jpg View File

Before After
Width: 500  |  Height: 374  |  Size: 30 kB

BIN
model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style5.jpg View File

Before After
Width: 499  |  Height: 375  |  Size: 32 kB

BIN
model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style6.jpg View File

Before After
Width: 327  |  Height: 499  |  Size: 25 kB

BIN
model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style7.jpg View File

Before After
Width: 499  |  Height: 488  |  Size: 32 kB

BIN
model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style8.jpg View File

Before After
Width: 362  |  Height: 428  |  Size: 30 kB

BIN
model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style9.jpg View File

Before After
Width: 500  |  Height: 386  |  Size: 39 kB

model_zoo/official/lite/car_classification/app/src/main/res/drawable/ic_launcher_background.xml → model_zoo/official/lite/pet_classification/app/src/main/res/drawable/ic_launcher_background.xml View File


model_zoo/official/lite/car_classification/app/src/main/res/drawable/progressbar.xml → model_zoo/official/lite/pet_classification/app/src/main/res/drawable/progressbar.xml View File


model_zoo/official/lite/car_classification/app/src/main/res/drawable/rectangle.xml → model_zoo/official/lite/pet_classification/app/src/main/res/drawable/rectangle.xml View File


model_zoo/official/lite/car_classification/app/src/main/res/drawable/switch_thumb.xml → model_zoo/official/lite/pet_classification/app/src/main/res/drawable/switch_thumb.xml View File


model_zoo/official/lite/car_classification/app/src/main/res/drawable/switch_track.xml → model_zoo/official/lite/pet_classification/app/src/main/res/drawable/switch_track.xml View File


model_zoo/official/lite/car_classification/app/src/main/res/layout/activity_camera.xml → model_zoo/official/lite/pet_classification/app/src/main/res/layout/activity_camera.xml View File

@@ -16,7 +16,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@android:color/black" android:background="@android:color/black"
tools:context="com.mindspore.classificationforcar.widget.CameraActivity" />
tools:context="com.mindspore.classificationforpet.widget.CameraActivity" />




<androidx.appcompat.widget.Toolbar <androidx.appcompat.widget.Toolbar
@@ -33,7 +33,7 @@
android:drawablePadding="5dp" android:drawablePadding="5dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:maxLines="1" android:maxLines="1"
android:text="MS Car Classification"
android:text="MS Pet Classification"
android:textColor="#ffffff" android:textColor="#ffffff"
android:textSize="20sp" /> android:textSize="20sp" />
</androidx.appcompat.widget.Toolbar> </androidx.appcompat.widget.Toolbar>

model_zoo/official/lite/car_classification/app/src/main/res/layout/activity_main.xml → model_zoo/official/lite/pet_classification/app/src/main/res/layout/activity_main.xml View File

@@ -19,7 +19,7 @@
android:drawablePadding="5dp" android:drawablePadding="5dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:maxLines="1" android:maxLines="1"
android:text="MS Car Classification"
android:text="MS Pet Classification"
android:textColor="#ffffff" android:textColor="#ffffff"
android:textSize="20sp" /> android:textSize="20sp" />
</androidx.appcompat.widget.Toolbar> </androidx.appcompat.widget.Toolbar>

model_zoo/official/lite/car_classification/app/src/main/res/layout/fragment_camera.xml → model_zoo/official/lite/pet_classification/app/src/main/res/layout/fragment_camera.xml View File

@@ -5,7 +5,7 @@
android:background="@color/white" android:background="@color/white"
android:orientation="vertical"> android:orientation="vertical">


<com.mindspore.classificationforcar.widget.AutoFitTextureView
<com.mindspore.classificationforpet.widget.AutoFitTextureView
android:id="@+id/texture" android:id="@+id/texture"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent" />

model_zoo/official/lite/car_classification/app/src/main/res/layout/image_item.xml → model_zoo/official/lite/pet_classification/app/src/main/res/layout/image_item.xml View File


model_zoo/official/lite/car_classification/app/src/main/res/layout/layout_hor_text_view.xml → model_zoo/official/lite/pet_classification/app/src/main/res/layout/layout_hor_text_view.xml View File


model_zoo/official/lite/car_classification/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml → model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml View File


model_zoo/official/lite/car_classification/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml → model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml View File


model_zoo/official/lite/car_classification/app/src/main/res/mipmap-hdpi/ic_launcher.png → model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-hdpi/ic_launcher.png View File


model_zoo/official/lite/car_classification/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png → model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png View File


model_zoo/official/lite/car_classification/app/src/main/res/mipmap-hdpi/ic_launcher_round.png → model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-hdpi/ic_launcher_round.png View File


model_zoo/official/lite/car_classification/app/src/main/res/mipmap-mdpi/ic_launcher.png → model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-mdpi/ic_launcher.png View File


model_zoo/official/lite/car_classification/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png → model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png View File


model_zoo/official/lite/car_classification/app/src/main/res/mipmap-mdpi/ic_launcher_round.png → model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-mdpi/ic_launcher_round.png View File


model_zoo/official/lite/car_classification/app/src/main/res/mipmap-xhdpi/ic_launcher.png → model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xhdpi/ic_launcher.png View File


model_zoo/official/lite/car_classification/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png → model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png View File


model_zoo/official/lite/car_classification/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png → model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png View File


model_zoo/official/lite/car_classification/app/src/main/res/mipmap-xxhdpi/ic_launcher.png → model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xxhdpi/ic_launcher.png View File


model_zoo/official/lite/car_classification/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png → model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png View File


model_zoo/official/lite/car_classification/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png → model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png View File


model_zoo/official/lite/car_classification/app/src/main/res/mipmap-xxhdpi/logo.png → model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xxhdpi/logo.png View File


model_zoo/official/lite/car_classification/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png → model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png View File


model_zoo/official/lite/car_classification/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png → model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png View File


model_zoo/official/lite/car_classification/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png → model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png View File


model_zoo/official/lite/car_classification/app/src/main/res/values/colors.xml → model_zoo/official/lite/pet_classification/app/src/main/res/values/colors.xml View File


model_zoo/official/lite/car_classification/app/src/main/res/values/dimens.xml → model_zoo/official/lite/pet_classification/app/src/main/res/values/dimens.xml View File


model_zoo/official/lite/car_classification/app/src/main/res/values/ic_launcher_background.xml → model_zoo/official/lite/pet_classification/app/src/main/res/values/ic_launcher_background.xml View File


model_zoo/official/lite/car_classification/app/src/main/res/values/strings.xml → model_zoo/official/lite/pet_classification/app/src/main/res/values/strings.xml View File

@@ -1,5 +1,5 @@
<resources> <resources>
<string name="app_name">CarClassification</string>
<string name="app_name">PetClassification</string>
<string name="action_settings">设置</string> <string name="action_settings">设置</string>


<string name="request_permission">This sample needs camera permission.</string> <string name="request_permission">This sample needs camera permission.</string>

model_zoo/official/lite/car_classification/app/src/main/res/values/styles.xml → model_zoo/official/lite/pet_classification/app/src/main/res/values/styles.xml View File


model_zoo/official/lite/car_classification/app/src/main/res/xml/file_paths.xml → model_zoo/official/lite/pet_classification/app/src/main/res/xml/file_paths.xml View File


model_zoo/official/lite/car_classification/app/src/test/java/com/mindspore/classificationforcar/ExampleUnitTest.java → model_zoo/official/lite/pet_classification/app/src/test/java/com/mindspore/classificationforpet/ExampleUnitTest.java View File

@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */


package com.mindspore.classificationforcar;
package com.mindspore.classificationforpet;


import org.junit.Test; import org.junit.Test;



model_zoo/official/lite/car_classification/build.gradle → model_zoo/official/lite/pet_classification/build.gradle View File


model_zoo/official/lite/car_classification/gradle.properties → model_zoo/official/lite/pet_classification/gradle.properties View File


model_zoo/official/lite/car_classification/gradle/wrapper/gradle-wrapper.jar → model_zoo/official/lite/pet_classification/gradle/wrapper/gradle-wrapper.jar View File


model_zoo/official/lite/car_classification/gradle/wrapper/gradle-wrapper.properties → model_zoo/official/lite/pet_classification/gradle/wrapper/gradle-wrapper.properties View File


Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save