From e13b0eeb9bd77f8e21536da6082f114317260ad3 Mon Sep 17 00:00:00 2001
From: duqingquan <duqingquan@dcloud.io>
Date: Thu, 1 Sep 2022 12:23:16 +0800
Subject: [PATCH] add res button

---
 manifest.json                                    |  4 ++--
 pages/advance/advance.vue                        |  4 ++--
 pages/resource/resource.vue                      | 14 +++++++++-----
 .../uts-advance/utssdk/app-android/config.json   |  2 +-
 .../uts-advance/utssdk/app-android/index.uts     | 16 ++++++++++++----
 .../utssdk/app-android/res/value-zh/strings.xml  |  3 +++
 .../utssdk/app-android/res/values-en/strings.xml |  3 +++
 7 files changed, 32 insertions(+), 14 deletions(-)
 create mode 100644 uni_modules/uts-advance/utssdk/app-android/res/value-zh/strings.xml
 create mode 100644 uni_modules/uts-advance/utssdk/app-android/res/values-en/strings.xml

diff --git a/manifest.json b/manifest.json
index 40d7b27..9d076ea 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "HelloUTS",
     "appid" : "__UNI__70BE9D0",
     "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
+    "versionName" : "1.0.1",
+    "versionCode" : "101",
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/advance/advance.vue b/pages/advance/advance.vue
index 0d888f5..596bf28 100644
--- a/pages/advance/advance.vue
+++ b/pages/advance/advance.vue
@@ -10,7 +10,7 @@
 		<view class="uni-btn-v uni-common-mt">
 			<button type="primary" @tap="testAddToDecorView">添加TextView至视图顶层</button>
 			<button type="primary" @tap="testRemoveToDecorView">移除视图顶层的TextView</button>
-			<button type="primary" @tap="testLoadImage">资源加载示例</button>
+			<button type="primary" @tap="testResource">资源加载示例</button>
 			<button type="primary" @tap="testLifecyle">activity生命周期监听</button>
 		</view>
 		
@@ -84,7 +84,7 @@
 				removeViewToDecorView();
 			},
 			
-			testLoadImage: function () {
+			testResource: function () {
 				uni.navigateTo({
 					url:'/pages/resource/resource'
 				})
diff --git a/pages/resource/resource.vue b/pages/resource/resource.vue
index d52769a..9f3522f 100644
--- a/pages/resource/resource.vue
+++ b/pages/resource/resource.vue
@@ -3,14 +3,15 @@
 		<page-head :title="title"></page-head>
 			<image :src="logo" mode="aspectFit" style="width: 100%;"></image>
 			<view class="uni-btn-v uni-common-mt">
-				<button type="primary" >插件内置图片</button>
-				<button type="primary" @tap="testAssetLoad" >asset资源加载</button>
+				<button type="primary" >展示插件内置图片</button>
+				<button type="primary" @tap="testAssetLoad" >播放asset音频(需自定义基座)</button>
+				<button type="primary" @tap="testResText" >获取res目录资源(需自定义基座)</button>
 			</view>
 	</view>
 </template>
 <script>
 	
-	import { getLogoPath,getAssetAPath } from '../../uni_modules/uts-advance'
+	import { getLogoPath,playAssetAudio,getResText } from '../../uni_modules/uts-advance'
 	
 	export default {
 		
@@ -25,8 +26,11 @@
 		},
 		methods: {
 			testAssetLoad(){
-				let aseetPath = getAssetAPath();
-				console.log(aseetPath);
+				playAssetAudio();
+			},
+			testResText(){
+				let resText = getResText();
+				console.log(resText);
 			}
 			
 		}
diff --git a/uni_modules/uts-advance/utssdk/app-android/config.json b/uni_modules/uts-advance/utssdk/app-android/config.json
index b8606f6..61cf4e9 100644
--- a/uni_modules/uts-advance/utssdk/app-android/config.json
+++ b/uni_modules/uts-advance/utssdk/app-android/config.json
@@ -4,4 +4,4 @@
 	"dependencies": [{
 	}],
 	"minSdkVersion": 21
-},
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/uni_modules/uts-advance/utssdk/app-android/index.uts b/uni_modules/uts-advance/utssdk/app-android/index.uts
index 699b927..1516b87 100644
--- a/uni_modules/uts-advance/utssdk/app-android/index.uts
+++ b/uni_modules/uts-advance/utssdk/app-android/index.uts
@@ -113,17 +113,25 @@ export function getLogoPath(): string {
 }
 
 
-export function getAssetAPath() {
+export function playAssetAudio() {
 	
-	var assetManager = getAppContext()!.getAssets();
-	var afd = assetManager.openFd("free.mp3");
-	var mediaPlayer = new MediaPlayer();
+	let assetManager = getAppContext()!.getAssets();
+	let afd = assetManager.openFd("free.mp3");
+	let mediaPlayer = new MediaPlayer();
 	mediaPlayer.setDataSource(afd.getFileDescriptor(),afd.getStartOffset(), afd.getLength());
 	mediaPlayer.prepare();
 	mediaPlayer.start();
 	
 }
 
+const RTEXT:number = 10020;
+
+export function getResText() :string{
+	// let text = "aaa " + com.sina.weibo.sdk.R2.string.com_sina_weibo_sdk_logout;
+	// let resText = getAppContext()!.getString(io.dcloud.uni_modules.uts_advance.R.string.dcloud_common_app_res_download_failed)
+	return "222";
+}
+
 
 
 
diff --git a/uni_modules/uts-advance/utssdk/app-android/res/value-zh/strings.xml b/uni_modules/uts-advance/utssdk/app-android/res/value-zh/strings.xml
new file mode 100644
index 0000000..08100b9
--- /dev/null
+++ b/uni_modules/uts-advance/utssdk/app-android/res/value-zh/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="uts_resource_text">Chinese Text</string>
+</resources>
\ No newline at end of file
diff --git a/uni_modules/uts-advance/utssdk/app-android/res/values-en/strings.xml b/uni_modules/uts-advance/utssdk/app-android/res/values-en/strings.xml
new file mode 100644
index 0000000..5775c64
--- /dev/null
+++ b/uni_modules/uts-advance/utssdk/app-android/res/values-en/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="uts_resource_text">English Text</string>
+</resources>
\ No newline at end of file
-- 
GitLab