Add triplemu information

ZHEQIUSHUI · Apr 29, 2023 · dd9ba7a · dd9ba7a
1 parent 8137950
commit dd9ba7a
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 7 deletions.
diff --git a/deploy/NCNN/Android/app/build.gradle b/deploy/NCNN/Android/app/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "29.0.2"
 
     defaultConfig {
         applicationId "com.tencent.yolov6ncnn"
@@ -26,4 +25,5 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    namespace 'com.tencent.yolov6ncnn'
 }
diff --git a/deploy/NCNN/Android/app/src/main/AndroidManifest.xml b/deploy/NCNN/Android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.tencent.yolov6ncnn"
-      android:versionCode="1"
+    android:versionCode="1"
       android:versionName="1.1">
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-feature android:name="android.hardware.camera2.full" />

diff --git a/deploy/NCNN/Android/app/src/main/res/layout/main.xml b/deploy/NCNN/Android/app/src/main/res/layout/main.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
               android:layout_width="fill_parent"
               android:layout_height="fill_parent">
 
@@ -15,6 +16,19 @@
         android:layout_height="wrap_content"
         android:text="切换摄像头" />
 
+        <TextView
+            android:id="@+id/textView2"
+            android:layout_width="85dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:accessibilityLiveRegion="none"
+            android:contentDescription="description"
+            android:text="            Modify-By-tripleMu"
+            android:textAppearance="@android:style/TextAppearance.Material.Body1"
+            android:textSize="20sp"
+            android:textStyle="bold|italic"
+            tools:text="description" />
+
     </LinearLayout>
 
     <LinearLayout

diff --git a/deploy/NCNN/Android/app/src/main/res/values/strings.xml b/deploy/NCNN/Android/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">ncnn-yolov6</string>
+    <string name="app_name">ncnn-yolov6-by-tripleMu</string>
     <string-array name="model_array">
         <item>lite-s</item>
         <item>lite-m</item>

diff --git a/deploy/NCNN/Android/build.gradle b/deploy/NCNN/Android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:8.0.0'
     }
 }
 

diff --git a/deploy/NCNN/Android/gradle/wrapper/gradle-wrapper.properties b/deploy/NCNN/Android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists