diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style0.jpg b/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style0.jpg deleted file mode 100644 index a15c66e731..0000000000 Binary files a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style0.jpg and /dev/null differ diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style1.jpg b/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style1.jpg deleted file mode 100644 index 2953c88e6c..0000000000 Binary files a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style1.jpg and /dev/null differ diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style10.jpg b/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style10.jpg deleted file mode 100644 index d40cc299af..0000000000 Binary files a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style10.jpg and /dev/null differ diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style11.jpg b/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style11.jpg deleted file mode 100644 index 0c795c3cc2..0000000000 Binary files a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style11.jpg and /dev/null differ diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style12.jpg b/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style12.jpg deleted file mode 100644 index 0ed9d3eaf9..0000000000 Binary files a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style12.jpg and /dev/null differ diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style13.jpg b/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style13.jpg deleted file mode 100644 index da48fa48eb..0000000000 Binary files a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style13.jpg and /dev/null differ diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style14.jpg b/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style14.jpg deleted file mode 100644 index 3ec23af0ca..0000000000 Binary files a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style14.jpg and /dev/null differ diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style15.jpg b/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style15.jpg deleted file mode 100644 index 96ed6d63aa..0000000000 Binary files a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style15.jpg and /dev/null differ diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style16.jpg b/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style16.jpg deleted file mode 100644 index 54aa5dbbb7..0000000000 Binary files a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style16.jpg and /dev/null differ diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style17.jpg b/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style17.jpg deleted file mode 100644 index ab7fe41ae5..0000000000 Binary files a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style17.jpg and /dev/null differ diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style18.jpg b/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style18.jpg deleted file mode 100644 index d17a5c2a73..0000000000 Binary files a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style18.jpg and /dev/null differ diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style19.jpg b/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style19.jpg deleted file mode 100644 index 1aaac971f2..0000000000 Binary files a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style19.jpg and /dev/null differ diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style2.jpg b/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style2.jpg deleted file mode 100644 index 9be984259a..0000000000 Binary files a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style2.jpg and /dev/null differ diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style3.jpg b/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style3.jpg deleted file mode 100644 index 030c07c76d..0000000000 Binary files a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style3.jpg and /dev/null differ diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style4.jpg b/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style4.jpg deleted file mode 100644 index 4d1344ba5d..0000000000 Binary files a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style4.jpg and /dev/null differ diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style5.jpg b/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style5.jpg deleted file mode 100644 index 0ce9254ec2..0000000000 Binary files a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style5.jpg and /dev/null differ diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style6.jpg b/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style6.jpg deleted file mode 100644 index abfa2a17b6..0000000000 Binary files a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style6.jpg and /dev/null differ diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style7.jpg b/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style7.jpg deleted file mode 100644 index 7404ec8d98..0000000000 Binary files a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style7.jpg and /dev/null differ diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style8.jpg b/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style8.jpg deleted file mode 100644 index cc6cc8dd9c..0000000000 Binary files a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style8.jpg and /dev/null differ diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style9.jpg b/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style9.jpg deleted file mode 100644 index 5412d6730b..0000000000 Binary files a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/style9.jpg and /dev/null differ diff --git a/model_zoo/official/lite/car_classification/settings.gradle b/model_zoo/official/lite/car_classification/settings.gradle deleted file mode 100644 index f761014d56..0000000000 --- a/model_zoo/official/lite/car_classification/settings.gradle +++ /dev/null @@ -1,2 +0,0 @@ -include ':app' -rootProject.name = "CarClassification" \ No newline at end of file diff --git a/model_zoo/official/lite/car_classification/.gitignore b/model_zoo/official/lite/pet_classification/.gitignore similarity index 100% rename from model_zoo/official/lite/car_classification/.gitignore rename to model_zoo/official/lite/pet_classification/.gitignore diff --git a/model_zoo/official/lite/car_classification/app/.gitignore b/model_zoo/official/lite/pet_classification/app/.gitignore similarity index 100% rename from model_zoo/official/lite/car_classification/app/.gitignore rename to model_zoo/official/lite/pet_classification/app/.gitignore diff --git a/model_zoo/official/lite/car_classification/app/CMakeLists.txt b/model_zoo/official/lite/pet_classification/app/CMakeLists.txt similarity index 86% rename from model_zoo/official/lite/car_classification/app/CMakeLists.txt rename to model_zoo/official/lite/pet_classification/app/CMakeLists.txt index 7aebd0a5a1..08b01d83aa 100644 --- a/model_zoo/official/lite/car_classification/app/CMakeLists.txt +++ b/model_zoo/official/lite/pet_classification/app/CMakeLists.txt @@ -6,9 +6,9 @@ cmake_minimum_required(VERSION 3.4.1) 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. ============= 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}/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 ${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. # 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. 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 # completing its build. -find_library( # Sets the name of the path variable. +find_library(# Sets the name of the path variable. log-lib - # Specifies the name of the NDK library that # 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 # can link multiple libraries, such as libraries you define in this diff --git a/model_zoo/official/lite/car_classification/app/build.gradle b/model_zoo/official/lite/pet_classification/app/build.gradle similarity index 97% rename from model_zoo/official/lite/car_classification/app/build.gradle rename to model_zoo/official/lite/pet_classification/app/build.gradle index 54cfef0c67..eea533d92a 100644 --- a/model_zoo/official/lite/car_classification/app/build.gradle +++ b/model_zoo/official/lite/pet_classification/app/build.gradle @@ -5,7 +5,7 @@ android { buildToolsVersion "30.0.1" defaultConfig { - applicationId "com.mindspore.classificationforcar" + applicationId "com.mindspore.classificationforpet" minSdkVersion 21 targetSdkVersion 30 versionCode 1 diff --git a/model_zoo/official/lite/car_classification/app/download.gradle b/model_zoo/official/lite/pet_classification/app/download.gradle similarity index 100% rename from model_zoo/official/lite/car_classification/app/download.gradle rename to model_zoo/official/lite/pet_classification/app/download.gradle diff --git a/model_zoo/official/lite/car_classification/app/proguard-rules.pro b/model_zoo/official/lite/pet_classification/app/proguard-rules.pro similarity index 100% rename from model_zoo/official/lite/car_classification/app/proguard-rules.pro rename to model_zoo/official/lite/pet_classification/app/proguard-rules.pro diff --git a/model_zoo/official/lite/car_classification/app/src/androidTest/java/com/mindspore/classificationforcar/ExampleInstrumentedTest.java b/model_zoo/official/lite/pet_classification/app/src/androidTest/java/com/mindspore/classificationforpet/ExampleInstrumentedTest.java similarity index 96% rename from model_zoo/official/lite/car_classification/app/src/androidTest/java/com/mindspore/classificationforcar/ExampleInstrumentedTest.java rename to model_zoo/official/lite/pet_classification/app/src/androidTest/java/com/mindspore/classificationforpet/ExampleInstrumentedTest.java index 02166db6a0..fba0e2c36c 100644 --- a/model_zoo/official/lite/car_classification/app/src/androidTest/java/com/mindspore/classificationforcar/ExampleInstrumentedTest.java +++ b/model_zoo/official/lite/pet_classification/app/src/androidTest/java/com/mindspore/classificationforpet/ExampleInstrumentedTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.mindspore.classificationforcar; +package com.mindspore.classificationforpet; import android.content.Context; diff --git a/model_zoo/official/lite/car_classification/app/src/main/AndroidManifest.xml b/model_zoo/official/lite/pet_classification/app/src/main/AndroidManifest.xml similarity index 89% rename from model_zoo/official/lite/car_classification/app/src/main/AndroidManifest.xml rename to model_zoo/official/lite/pet_classification/app/src/main/AndroidManifest.xml index 29ea0e0bca..d1bf88980f 100644 --- a/model_zoo/official/lite/car_classification/app/src/main/AndroidManifest.xml +++ b/model_zoo/official/lite/pet_classification/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ @@ -21,7 +21,7 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> - @@ -30,13 +30,13 @@ diff --git a/model_zoo/official/lite/car_classification/app/src/main/assets/model/car.ms b/model_zoo/official/lite/pet_classification/app/src/main/assets/model/car.ms similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/assets/model/car.ms rename to model_zoo/official/lite/pet_classification/app/src/main/assets/model/car.ms diff --git a/model_zoo/official/lite/car_classification/app/src/main/assets/model/mobilenetv2.ms b/model_zoo/official/lite/pet_classification/app/src/main/assets/model/mobilenetv2.ms similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/assets/model/mobilenetv2.ms rename to model_zoo/official/lite/pet_classification/app/src/main/assets/model/mobilenetv2.ms diff --git a/model_zoo/official/lite/car_classification/app/src/main/cpp/ImageMindSporeNetnative.cpp b/model_zoo/official/lite/pet_classification/app/src/main/cpp/ImageMindSporeNetnative.cpp similarity index 99% rename from model_zoo/official/lite/car_classification/app/src/main/cpp/ImageMindSporeNetnative.cpp rename to model_zoo/official/lite/pet_classification/app/src/main/cpp/ImageMindSporeNetnative.cpp index 61d9217711..4c89c26342 100644 --- a/model_zoo/official/lite/car_classification/app/src/main/cpp/ImageMindSporeNetnative.cpp +++ b/model_zoo/official/lite/pet_classification/app/src/main/cpp/ImageMindSporeNetnative.cpp @@ -313,7 +313,7 @@ static const char *labels_name_map[RET_CATEGORY_SUM] = { "Crochet", "Sailboat", "Newspaper", - "Santa claus", + "Santa Claus", "Swamp", "Skyscraper", "Skin", @@ -672,7 +672,7 @@ bool ImagePreProcessImageData(const LiteMat &lite_mat_bgr, LiteMat *lite_norm_ma */ extern "C" 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 model_buffer, jint num_thread) { @@ -722,7 +722,7 @@ Java_com_mindspore_classificationforcar_gallery_classify_ImageTrackingMobile_loa * sending a picture to the model and run inference. */ 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, jlong netEnv, jobject srcBitmap) { @@ -796,7 +796,7 @@ Java_com_mindspore_classificationforcar_gallery_classify_ImageTrackingMobile_run } 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, jlong netEnv) { MS_PRINT("MindSpore release net."); diff --git a/model_zoo/official/lite/car_classification/app/src/main/cpp/ImageMindSporeNetnative.h b/model_zoo/official/lite/pet_classification/app/src/main/cpp/ImageMindSporeNetnative.h similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/cpp/ImageMindSporeNetnative.h rename to model_zoo/official/lite/pet_classification/app/src/main/cpp/ImageMindSporeNetnative.h diff --git a/model_zoo/official/lite/car_classification/app/src/main/cpp/MSNetWork.cpp b/model_zoo/official/lite/pet_classification/app/src/main/cpp/MSNetWork.cpp similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/cpp/MSNetWork.cpp rename to model_zoo/official/lite/pet_classification/app/src/main/cpp/MSNetWork.cpp diff --git a/model_zoo/official/lite/car_classification/app/src/main/cpp/MSNetWork.h b/model_zoo/official/lite/pet_classification/app/src/main/cpp/MSNetWork.h similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/cpp/MSNetWork.h rename to model_zoo/official/lite/pet_classification/app/src/main/cpp/MSNetWork.h diff --git a/model_zoo/official/lite/car_classification/app/src/main/cpp/MindSporeNetnative.cpp b/model_zoo/official/lite/pet_classification/app/src/main/cpp/MindSporeNetnative.cpp similarity index 93% rename from model_zoo/official/lite/car_classification/app/src/main/cpp/MindSporeNetnative.cpp rename to model_zoo/official/lite/pet_classification/app/src/main/cpp/MindSporeNetnative.cpp index a18c538180..5632d58301 100644 --- a/model_zoo/official/lite/car_classification/app/src/main/cpp/MindSporeNetnative.cpp +++ b/model_zoo/official/lite/pet_classification/app/src/main/cpp/MindSporeNetnative.cpp @@ -36,18 +36,10 @@ using mindspore::dataset::LDataType; #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(outputTensor->MutableData()); float max = 0.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) { max = temp_scores[i]; maxIndex = i; @@ -164,7 +156,7 @@ bool PreProcessImageData(const LiteMat &lite_mat_bgr, LiteMat *lite_norm_mat_ptr */ extern "C" 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 model_buffer, jint num_thread) { @@ -214,7 +206,7 @@ Java_com_mindspore_classificationforcar_gallery_classify_TrackingMobile_loadMode * sending a picture to the model and run inference. */ 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, jobject srcBitmap) { 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{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(); return (env)->NewStringUTF(resultCharData); } 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, jlong netEnv) { MS_PRINT("MindSpore release net."); diff --git a/model_zoo/official/lite/car_classification/app/src/main/cpp/MindSporeNetnative.h b/model_zoo/official/lite/pet_classification/app/src/main/cpp/MindSporeNetnative.h similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/cpp/MindSporeNetnative.h rename to model_zoo/official/lite/pet_classification/app/src/main/cpp/MindSporeNetnative.h diff --git a/model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/gallery/classify/BitmapUtils.java b/model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/gallery/classify/BitmapUtils.java similarity index 99% rename from model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/gallery/classify/BitmapUtils.java rename to model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/gallery/classify/BitmapUtils.java index 5cdc7e6179..f4b677c5d4 100644 --- a/model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/gallery/classify/BitmapUtils.java +++ b/model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/gallery/classify/BitmapUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.mindspore.classificationforcar.gallery.classify; +package com.mindspore.classificationforpet.gallery.classify; import android.app.Activity; import android.content.ContentResolver; diff --git a/model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/gallery/classify/CompareSizesByArea.java b/model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/gallery/classify/CompareSizesByArea.java similarity index 94% rename from model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/gallery/classify/CompareSizesByArea.java rename to model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/gallery/classify/CompareSizesByArea.java index 3a187fb842..a6c8d0ab86 100644 --- a/model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/gallery/classify/CompareSizesByArea.java +++ b/model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/gallery/classify/CompareSizesByArea.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.mindspore.classificationforcar.gallery.classify; +package com.mindspore.classificationforpet.gallery.classify; import android.util.Size; import java.util.Comparator; diff --git a/model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/gallery/classify/ImageTrackingMobile.java b/model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/gallery/classify/ImageTrackingMobile.java similarity index 98% rename from model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/gallery/classify/ImageTrackingMobile.java rename to model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/gallery/classify/ImageTrackingMobile.java index ac951e8a1f..a65905ca5e 100644 --- a/model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/gallery/classify/ImageTrackingMobile.java +++ b/model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/gallery/classify/ImageTrackingMobile.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.mindspore.classificationforcar.gallery.classify; +package com.mindspore.classificationforpet.gallery.classify; import android.content.Context; import android.graphics.Bitmap; diff --git a/model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/gallery/classify/RecognitionImageBean.java b/model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/gallery/classify/RecognitionImageBean.java similarity index 94% rename from model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/gallery/classify/RecognitionImageBean.java rename to model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/gallery/classify/RecognitionImageBean.java index 4fb7c6e6f9..018088bf50 100644 --- a/model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/gallery/classify/RecognitionImageBean.java +++ b/model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/gallery/classify/RecognitionImageBean.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.mindspore.classificationforcar.gallery.classify; +package com.mindspore.classificationforpet.gallery.classify; public class RecognitionImageBean { diff --git a/model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/gallery/classify/TrackingMobile.java b/model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/gallery/classify/TrackingMobile.java similarity index 98% rename from model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/gallery/classify/TrackingMobile.java rename to model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/gallery/classify/TrackingMobile.java index bcc96730fe..8c91fe94fc 100644 --- a/model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/gallery/classify/TrackingMobile.java +++ b/model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/gallery/classify/TrackingMobile.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.mindspore.classificationforcar.gallery.classify; +package com.mindspore.classificationforpet.gallery.classify; import android.content.Context; import android.graphics.Bitmap; diff --git a/model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/widget/AutoFitTextureView.java b/model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/widget/AutoFitTextureView.java similarity index 98% rename from model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/widget/AutoFitTextureView.java rename to model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/widget/AutoFitTextureView.java index f2123c6ebe..ee90a9bd66 100644 --- a/model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/widget/AutoFitTextureView.java +++ b/model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/widget/AutoFitTextureView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.mindspore.classificationforcar.widget; +package com.mindspore.classificationforpet.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/widget/CameraActivity.java b/model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/widget/CameraActivity.java similarity index 92% rename from model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/widget/CameraActivity.java rename to model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/widget/CameraActivity.java index f68ba3606c..7aa59d89e5 100644 --- a/model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/widget/CameraActivity.java +++ b/model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/widget/CameraActivity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.mindspore.classificationforcar.widget; +package com.mindspore.classificationforpet.widget; import android.graphics.Bitmap; import android.os.Bundle; @@ -26,10 +26,10 @@ import androidx.annotation.Nullable; import androidx.annotation.UiThread; 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.Collections; @@ -44,7 +44,7 @@ public class CameraActivity extends AppCompatActivity { private static final String IMAGE_SCENE_MS = "model/mobilenetv2.ms"; private String filePath; - private boolean isCarModel; + private boolean isPetModel; private TrackingMobile trackingMobile; private ImageTrackingMobile imageTrackingMobile; @@ -58,10 +58,10 @@ public class CameraActivity extends AppCompatActivity { setContentView(R.layout.activity_camera); filePath = getIntent().getStringExtra("FILEPATH"); - isCarModel = getIntent().getBooleanExtra("ISHASCARMODELFILE", false); + isPetModel = getIntent().getBooleanExtra("ISHASPetMODELFILE", false); resultText = findViewById(R.id.textResult); - if (isCarModel) { + if (isPetModel) { trackingMobile = new TrackingMobile(this); boolean ret = trackingMobile.loadModelFromBuf(filePath); if (!ret) { @@ -92,7 +92,7 @@ public class CameraActivity extends AppCompatActivity { private void initMindspore(Bitmap bitmap) { // run net. - if (isCarModel) { + if (isPetModel) { long startTime = System.currentTimeMillis(); String result = trackingMobile.MindSpore_runnet(bitmap); long endTime = System.currentTimeMillis(); diff --git a/model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/widget/CameraFragment.java b/model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/widget/CameraFragment.java similarity index 99% rename from model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/widget/CameraFragment.java rename to model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/widget/CameraFragment.java index cc598441c0..c027e00155 100644 --- a/model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/widget/CameraFragment.java +++ b/model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/widget/CameraFragment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.mindspore.classificationforcar.widget; +package com.mindspore.classificationforpet.widget; import android.annotation.SuppressLint; import android.app.Activity; @@ -56,9 +56,9 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; 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.util.ArrayList; diff --git a/model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/widget/MainActivity.java b/model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/widget/MainActivity.java similarity index 93% rename from model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/widget/MainActivity.java rename to model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/widget/MainActivity.java index fd986c8386..673dfd4dd1 100644 --- a/model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/widget/MainActivity.java +++ b/model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/widget/MainActivity.java @@ -1,4 +1,4 @@ -package com.mindspore.classificationforcar.widget; +package com.mindspore.classificationforpet.widget; import android.Manifest; import android.content.DialogInterface; @@ -31,11 +31,11 @@ import androidx.core.content.FileProvider; import androidx.recyclerview.widget.GridLayoutManager; 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.FileNotFoundException; @@ -52,18 +52,16 @@ public class MainActivity extends AppCompatActivity implements OnBackgroundImage 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, - 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_CAMERA = 2; private static final String IMAGE_SCENE_MS = "model/mobilenetv2.ms"; 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 Uri imageUri; @@ -153,7 +151,7 @@ public class MainActivity extends AppCompatActivity implements OnBackgroundImage builder.show(); } - public boolean isHasCarModelFile() { + public boolean isHasPetModelFile() { if (DIR_FILE.exists()) { return true; } else { @@ -183,7 +181,7 @@ public class MainActivity extends AppCompatActivity implements OnBackgroundImage public void onClickScene(View view) { Intent intent = new Intent(MainActivity.this, CameraActivity.class); intent.putExtra("FILEPATH", DIR_FILE.getPath()); - intent.putExtra("ISHASCARMODELFILE", isHasCarModelFile()); + intent.putExtra("ISHASPetMODELFILE", isHasPetModelFile()); startActivity(intent); } @@ -256,7 +254,7 @@ public class MainActivity extends AppCompatActivity implements OnBackgroundImage private void initMindspore(Bitmap bitmap) { progressBar.setVisibility(View.VISIBLE); - if (isHasCarModelFile()) { + if (isHasPetModelFile()) { boolean ret = trackingMobile.loadModelFromBuf(DIR_FILE.getPath()); if (!ret) { textResult.setText("Load model error."); diff --git a/model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/widget/OnBackgroundImageListener.java b/model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/widget/OnBackgroundImageListener.java similarity index 75% rename from model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/widget/OnBackgroundImageListener.java rename to model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/widget/OnBackgroundImageListener.java index 2eab47c9c7..a8b416e114 100644 --- a/model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/widget/OnBackgroundImageListener.java +++ b/model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/widget/OnBackgroundImageListener.java @@ -1,4 +1,4 @@ -package com.mindspore.classificationforcar.widget; +package com.mindspore.classificationforpet.widget; import android.view.View; diff --git a/model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/widget/RecyclerViewAdapter.java b/model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/widget/RecyclerViewAdapter.java similarity index 96% rename from model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/widget/RecyclerViewAdapter.java rename to model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/widget/RecyclerViewAdapter.java index 99462d8146..79f18661fd 100644 --- a/model_zoo/official/lite/car_classification/app/src/main/java/com/mindspore/classificationforcar/widget/RecyclerViewAdapter.java +++ b/model_zoo/official/lite/pet_classification/app/src/main/java/com/mindspore/classificationforpet/widget/RecyclerViewAdapter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.mindspore.classificationforcar.widget; +package com.mindspore.classificationforpet.widget; import android.content.Context; import android.view.LayoutInflater; @@ -25,7 +25,7 @@ import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; -import com.mindspore.classificationforcar.R; +import com.mindspore.classificationforpet.R; public class RecyclerViewAdapter extends RecyclerView.Adapter { diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/model_zoo/official/lite/pet_classification/app/src/main/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/res/drawable-v24/ic_launcher_foreground.xml rename to model_zoo/official/lite/pet_classification/app/src/main/res/drawable-v24/ic_launcher_foreground.xml diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/logo.png b/model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/logo.png similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/logo.png rename to model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/logo.png diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/logo2.png b/model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/logo2.png similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/res/drawable-xxhdpi/logo2.png rename to model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/logo2.png diff --git a/model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style0.jpg b/model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style0.jpg new file mode 100644 index 0000000000..1b15ce8ab7 Binary files /dev/null and b/model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style0.jpg differ diff --git a/model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style1.jpg b/model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style1.jpg new file mode 100644 index 0000000000..4c8d57864c Binary files /dev/null and b/model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style1.jpg differ diff --git a/model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style2.jpg b/model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style2.jpg new file mode 100644 index 0000000000..8184f44bd1 Binary files /dev/null and b/model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style2.jpg differ diff --git a/model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style3.jpg b/model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style3.jpg new file mode 100644 index 0000000000..54d4a2a24f Binary files /dev/null and b/model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style3.jpg differ diff --git a/model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style4.jpg b/model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style4.jpg new file mode 100644 index 0000000000..5408c8a840 Binary files /dev/null and b/model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style4.jpg differ diff --git a/model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style5.jpg b/model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style5.jpg new file mode 100644 index 0000000000..553efa6b4c Binary files /dev/null and b/model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style5.jpg differ diff --git a/model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style6.jpg b/model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style6.jpg new file mode 100644 index 0000000000..a6a878c189 Binary files /dev/null and b/model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style6.jpg differ diff --git a/model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style7.jpg b/model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style7.jpg new file mode 100644 index 0000000000..3aa16aa86f Binary files /dev/null and b/model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style7.jpg differ diff --git a/model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style8.jpg b/model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style8.jpg new file mode 100644 index 0000000000..72877cc980 Binary files /dev/null and b/model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style8.jpg differ diff --git a/model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style9.jpg b/model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style9.jpg new file mode 100644 index 0000000000..713a4fcd96 Binary files /dev/null and b/model_zoo/official/lite/pet_classification/app/src/main/res/drawable-xxhdpi/style9.jpg differ diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/drawable/ic_launcher_background.xml b/model_zoo/official/lite/pet_classification/app/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/res/drawable/ic_launcher_background.xml rename to model_zoo/official/lite/pet_classification/app/src/main/res/drawable/ic_launcher_background.xml diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/drawable/progressbar.xml b/model_zoo/official/lite/pet_classification/app/src/main/res/drawable/progressbar.xml similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/res/drawable/progressbar.xml rename to model_zoo/official/lite/pet_classification/app/src/main/res/drawable/progressbar.xml diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/drawable/rectangle.xml b/model_zoo/official/lite/pet_classification/app/src/main/res/drawable/rectangle.xml similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/res/drawable/rectangle.xml rename to model_zoo/official/lite/pet_classification/app/src/main/res/drawable/rectangle.xml diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/drawable/switch_thumb.xml b/model_zoo/official/lite/pet_classification/app/src/main/res/drawable/switch_thumb.xml similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/res/drawable/switch_thumb.xml rename to model_zoo/official/lite/pet_classification/app/src/main/res/drawable/switch_thumb.xml diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/drawable/switch_track.xml b/model_zoo/official/lite/pet_classification/app/src/main/res/drawable/switch_track.xml similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/res/drawable/switch_track.xml rename to model_zoo/official/lite/pet_classification/app/src/main/res/drawable/switch_track.xml diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/layout/activity_camera.xml b/model_zoo/official/lite/pet_classification/app/src/main/res/layout/activity_camera.xml similarity index 94% rename from model_zoo/official/lite/car_classification/app/src/main/res/layout/activity_camera.xml rename to model_zoo/official/lite/pet_classification/app/src/main/res/layout/activity_camera.xml index 153f51149e..17131c9f18 100644 --- a/model_zoo/official/lite/car_classification/app/src/main/res/layout/activity_camera.xml +++ b/model_zoo/official/lite/pet_classification/app/src/main/res/layout/activity_camera.xml @@ -16,7 +16,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@android:color/black" - tools:context="com.mindspore.classificationforcar.widget.CameraActivity" /> + tools:context="com.mindspore.classificationforpet.widget.CameraActivity" /> diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/layout/activity_main.xml b/model_zoo/official/lite/pet_classification/app/src/main/res/layout/activity_main.xml similarity index 98% rename from model_zoo/official/lite/car_classification/app/src/main/res/layout/activity_main.xml rename to model_zoo/official/lite/pet_classification/app/src/main/res/layout/activity_main.xml index b5c433283b..16ba421aa7 100644 --- a/model_zoo/official/lite/car_classification/app/src/main/res/layout/activity_main.xml +++ b/model_zoo/official/lite/pet_classification/app/src/main/res/layout/activity_main.xml @@ -19,7 +19,7 @@ android:drawablePadding="5dp" android:gravity="center_vertical" android:maxLines="1" - android:text="MS Car Classification" + android:text="MS Pet Classification" android:textColor="#ffffff" android:textSize="20sp" /> diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/layout/fragment_camera.xml b/model_zoo/official/lite/pet_classification/app/src/main/res/layout/fragment_camera.xml similarity index 86% rename from model_zoo/official/lite/car_classification/app/src/main/res/layout/fragment_camera.xml rename to model_zoo/official/lite/pet_classification/app/src/main/res/layout/fragment_camera.xml index 6e0897de31..c569114bc7 100644 --- a/model_zoo/official/lite/car_classification/app/src/main/res/layout/fragment_camera.xml +++ b/model_zoo/official/lite/pet_classification/app/src/main/res/layout/fragment_camera.xml @@ -5,7 +5,7 @@ android:background="@color/white" android:orientation="vertical"> - diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/layout/image_item.xml b/model_zoo/official/lite/pet_classification/app/src/main/res/layout/image_item.xml similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/res/layout/image_item.xml rename to model_zoo/official/lite/pet_classification/app/src/main/res/layout/image_item.xml diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/layout/layout_hor_text_view.xml b/model_zoo/official/lite/pet_classification/app/src/main/res/layout/layout_hor_text_view.xml similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/res/layout/layout_hor_text_view.xml rename to model_zoo/official/lite/pet_classification/app/src/main/res/layout/layout_hor_text_view.xml diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/mipmap-hdpi/ic_launcher.png b/model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png rename to model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/mipmap-mdpi/ic_launcher.png b/model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png rename to model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/res/mipmap-mdpi/ic_launcher_round.png rename to model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png rename to model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png rename to model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png rename to model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png rename to model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/mipmap-xxhdpi/logo.png b/model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xxhdpi/logo.png similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/res/mipmap-xxhdpi/logo.png rename to model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xxhdpi/logo.png diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png rename to model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png rename to model_zoo/official/lite/pet_classification/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/values/colors.xml b/model_zoo/official/lite/pet_classification/app/src/main/res/values/colors.xml similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/res/values/colors.xml rename to model_zoo/official/lite/pet_classification/app/src/main/res/values/colors.xml diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/values/dimens.xml b/model_zoo/official/lite/pet_classification/app/src/main/res/values/dimens.xml similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/res/values/dimens.xml rename to model_zoo/official/lite/pet_classification/app/src/main/res/values/dimens.xml diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/values/ic_launcher_background.xml b/model_zoo/official/lite/pet_classification/app/src/main/res/values/ic_launcher_background.xml similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/res/values/ic_launcher_background.xml rename to model_zoo/official/lite/pet_classification/app/src/main/res/values/ic_launcher_background.xml diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/values/strings.xml b/model_zoo/official/lite/pet_classification/app/src/main/res/values/strings.xml similarity index 96% rename from model_zoo/official/lite/car_classification/app/src/main/res/values/strings.xml rename to model_zoo/official/lite/pet_classification/app/src/main/res/values/strings.xml index 88ed5903bf..67ee8c22e9 100644 --- a/model_zoo/official/lite/car_classification/app/src/main/res/values/strings.xml +++ b/model_zoo/official/lite/pet_classification/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - CarClassification + PetClassification 设置 This sample needs camera permission. diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/values/styles.xml b/model_zoo/official/lite/pet_classification/app/src/main/res/values/styles.xml similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/res/values/styles.xml rename to model_zoo/official/lite/pet_classification/app/src/main/res/values/styles.xml diff --git a/model_zoo/official/lite/car_classification/app/src/main/res/xml/file_paths.xml b/model_zoo/official/lite/pet_classification/app/src/main/res/xml/file_paths.xml similarity index 100% rename from model_zoo/official/lite/car_classification/app/src/main/res/xml/file_paths.xml rename to model_zoo/official/lite/pet_classification/app/src/main/res/xml/file_paths.xml diff --git a/model_zoo/official/lite/car_classification/app/src/test/java/com/mindspore/classificationforcar/ExampleUnitTest.java b/model_zoo/official/lite/pet_classification/app/src/test/java/com/mindspore/classificationforpet/ExampleUnitTest.java similarity index 95% rename from model_zoo/official/lite/car_classification/app/src/test/java/com/mindspore/classificationforcar/ExampleUnitTest.java rename to model_zoo/official/lite/pet_classification/app/src/test/java/com/mindspore/classificationforpet/ExampleUnitTest.java index be8d4b887f..2e2b7efbe8 100644 --- a/model_zoo/official/lite/car_classification/app/src/test/java/com/mindspore/classificationforcar/ExampleUnitTest.java +++ b/model_zoo/official/lite/pet_classification/app/src/test/java/com/mindspore/classificationforpet/ExampleUnitTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.mindspore.classificationforcar; +package com.mindspore.classificationforpet; import org.junit.Test; diff --git a/model_zoo/official/lite/car_classification/build.gradle b/model_zoo/official/lite/pet_classification/build.gradle similarity index 100% rename from model_zoo/official/lite/car_classification/build.gradle rename to model_zoo/official/lite/pet_classification/build.gradle diff --git a/model_zoo/official/lite/car_classification/gradle.properties b/model_zoo/official/lite/pet_classification/gradle.properties similarity index 100% rename from model_zoo/official/lite/car_classification/gradle.properties rename to model_zoo/official/lite/pet_classification/gradle.properties diff --git a/model_zoo/official/lite/car_classification/gradle/wrapper/gradle-wrapper.jar b/model_zoo/official/lite/pet_classification/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from model_zoo/official/lite/car_classification/gradle/wrapper/gradle-wrapper.jar rename to model_zoo/official/lite/pet_classification/gradle/wrapper/gradle-wrapper.jar diff --git a/model_zoo/official/lite/car_classification/gradle/wrapper/gradle-wrapper.properties b/model_zoo/official/lite/pet_classification/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from model_zoo/official/lite/car_classification/gradle/wrapper/gradle-wrapper.properties rename to model_zoo/official/lite/pet_classification/gradle/wrapper/gradle-wrapper.properties diff --git a/model_zoo/official/lite/car_classification/gradlew b/model_zoo/official/lite/pet_classification/gradlew similarity index 100% rename from model_zoo/official/lite/car_classification/gradlew rename to model_zoo/official/lite/pet_classification/gradlew diff --git a/model_zoo/official/lite/car_classification/gradlew.bat b/model_zoo/official/lite/pet_classification/gradlew.bat similarity index 100% rename from model_zoo/official/lite/car_classification/gradlew.bat rename to model_zoo/official/lite/pet_classification/gradlew.bat diff --git a/model_zoo/official/lite/pet_classification/settings.gradle b/model_zoo/official/lite/pet_classification/settings.gradle new file mode 100644 index 0000000000..2c8486e4f2 --- /dev/null +++ b/model_zoo/official/lite/pet_classification/settings.gradle @@ -0,0 +1,2 @@ +include ':app' +rootProject.name = "PetClassification" \ No newline at end of file