From 3a1e871b8ade5e49ea3251e60c5996b879668925 Mon Sep 17 00:00:00 2001
From: duqingquan <duqingquan@dcloud.io>
Date: Tue, 30 Aug 2022 16:29:31 +0800
Subject: [PATCH] utssdk dir add

---
 pages/tabBar/Advance/Advance.vue              |  15 ++-
 uni_modules/uts-advance/app-android/index.uts |  44 --------
 uni_modules/uts-advance/package.json          |  13 +--
 .../{ => utssdk}/app-android/config.json      |   0
 .../uts-advance/utssdk/app-android/index.uts  | 100 ++++++++++++++++++
 .../{ => utssdk}/app-android/utils.uts        |   0
 uni_modules/uts-helloworld/package.json       |  11 +-
 .../{ => utssdk}/app-android/config.json      |   0
 .../{ => utssdk}/app-android/index.uts        |   0
 uni_modules/uts-osapi/package.json            |  12 +--
 .../{ => utssdk}/app-android/config.json      |   0
 .../{ => utssdk}/app-android/index.uts        |   0
 12 files changed, 118 insertions(+), 77 deletions(-)
 delete mode 100644 uni_modules/uts-advance/app-android/index.uts
 rename uni_modules/uts-advance/{ => utssdk}/app-android/config.json (100%)
 create mode 100644 uni_modules/uts-advance/utssdk/app-android/index.uts
 rename uni_modules/uts-advance/{ => utssdk}/app-android/utils.uts (100%)
 rename uni_modules/uts-helloworld/{ => utssdk}/app-android/config.json (100%)
 rename uni_modules/uts-helloworld/{ => utssdk}/app-android/index.uts (100%)
 rename uni_modules/uts-osapi/{ => utssdk}/app-android/config.json (100%)
 rename uni_modules/uts-osapi/{ => utssdk}/app-android/index.uts (100%)

diff --git a/pages/tabBar/Advance/Advance.vue b/pages/tabBar/Advance/Advance.vue
index 9eb6715..28f3481 100644
--- a/pages/tabBar/Advance/Advance.vue
+++ b/pages/tabBar/Advance/Advance.vue
@@ -7,6 +7,11 @@
 			<button type="primary"  @tap="testClearInterval">关闭定时任务</button>
 		</view>
 		
+		<view class="uni-btn-v uni-common-mt">
+			<button type="primary" @tap="testAddToDecorView">添加TextView至视图顶层</button>
+			<button type="primary" @tap="testRemoveToDecorView">移除视图顶层的TextView</button>
+		</view>
+		
 	</view>
 </template>
 <script>
@@ -14,7 +19,8 @@
 	  doTimerTask,
 	  doIntervalTask,
 	  clearIntervalTask,
-	  getDecorViewInfo
+	  addViewToDecorView,
+	  removeViewToDecorView
 	} from "../../../uni_modules/uts-advance";
 	
 	export default {
@@ -66,6 +72,13 @@
 				clearIntervalTask(this.taskId);
 			},
 			
+			testAddToDecorView: function () {
+				addViewToDecorView();
+			},
+						
+			testRemoveToDecorView: function () {
+				removeViewToDecorView();
+			},
 			
 			
 		}
diff --git a/uni_modules/uts-advance/app-android/index.uts b/uni_modules/uts-advance/app-android/index.uts
deleted file mode 100644
index 36be3a1..0000000
--- a/uni_modules/uts-advance/app-android/index.uts
+++ /dev/null
@@ -1,44 +0,0 @@
-
-import { getActivity } from "io.dcloud.uts.android";
-import Rect from "android.graphics.Rect";
-import Color from "android.graphics.Color";
-import TextView from "android.widget.TextView";
-import FrameLayout from "android.widget.FrameLayout";
-
-type TimerOptions = {
-  start: (res: string) => void;
-  work: (res: string) => void;
-};
-
-
-
-export function doTimerTask(opts:TimerOptions) {
-	opts.start('doTimerTask start');
-	setTimeout(function() {
-		opts.work("doTimerTask work");
-	}, 2000);
-  
-  return { name: "doTimerTask" };
-}
-
-
-export function doIntervalTask(opts:TimerOptions) {
-	
-	var taskRet = setInterval(function() {
-		opts.work("doIntervalTask work");
-	}, 2000);
-	opts.start('doIntervalTask start');
-  
-  return { name: "doIntervalTask",taskId:taskRet};
-}
-
-export function clearIntervalTask(taskId:number) {
-	
-	clearInterval(taskId);
-  
-  return { name: "clearIntervalTask"};
-}
-
-
-
-
diff --git a/uni_modules/uts-advance/package.json b/uni_modules/uts-advance/package.json
index 5f452d5..f59c9dc 100644
--- a/uni_modules/uts-advance/package.json
+++ b/uni_modules/uts-advance/package.json
@@ -76,16 +76,7 @@
           "联盟": "u"
         }
       }
-    },
-	"type": "uts",
-	   "uts": {
-	       "android": {
-	           "libs": [],
-	           "dependencies": []
-	       },
-	       "ios": {
-	           "libs": []
-	       }
-	   }
+    }
+	
   }
 }
\ No newline at end of file
diff --git a/uni_modules/uts-advance/app-android/config.json b/uni_modules/uts-advance/utssdk/app-android/config.json
similarity index 100%
rename from uni_modules/uts-advance/app-android/config.json
rename to uni_modules/uts-advance/utssdk/app-android/config.json
diff --git a/uni_modules/uts-advance/utssdk/app-android/index.uts b/uni_modules/uts-advance/utssdk/app-android/index.uts
new file mode 100644
index 0000000..5a1ec1b
--- /dev/null
+++ b/uni_modules/uts-advance/utssdk/app-android/index.uts
@@ -0,0 +1,100 @@
+
+import { getUniActivity } from "io.dcloud.uts.android";
+import Rect from "android.graphics.Rect";
+import Color from "android.graphics.Color";
+import TextView from "android.widget.TextView";
+import FrameLayout from "android.widget.FrameLayout";
+import ViewGroup from "android.view.ViewGroup";
+import Gravity from "android.view.Gravity";
+
+type TimerOptions = {
+  start: (res: string) => void;
+  work: (res: string) => void;
+};
+
+
+
+export function doTimerTask(opts:TimerOptions) {
+	opts.start('doTimerTask start');
+	setTimeout(function() {
+		opts.work("doTimerTask work");
+	}, 2000);
+  
+  return { name: "doTimerTask" };
+}
+
+
+export function doIntervalTask(opts:TimerOptions) {
+	
+	var taskRet = setInterval(function() {
+		opts.work("doIntervalTask work");
+	}, 2000);
+	opts.start('doIntervalTask start');
+  
+  return { name: "doIntervalTask",taskId:taskRet};
+}
+
+export function clearIntervalTask(taskId:number) {
+	
+	clearInterval(taskId);
+  
+  return { name: "clearIntervalTask"};
+}
+
+
+
+class AddUIRunnable extends Runnable {
+
+    override run():void {
+		
+        var textView = TextView(getUniActivity())
+        textView.text = "HELLO WORLD"
+        textView.textSize =  30.0.toFloat();
+        textView.setBackgroundColor(Color.RED)
+        textView.tag = "helloText"
+        textView.gravity = Gravity.CENTER
+
+        var decorView = getUniActivity()!.window.decorView;
+
+
+        var frameContent = decorView.findViewById(android.R.id.content) as FrameLayout
+        var layoutParam = FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,ViewGroup.LayoutParams.WRAP_CONTENT);
+        layoutParam.topMargin = 200;
+
+         frameContent.addView(textView,layoutParam)
+
+
+    }
+};
+
+class RemoveUIRunnable extends Runnable {
+
+    override run():void {
+
+        var decorView = getUniActivity()!.window.decorView;
+        var frameContent = decorView.findViewById(android.R.id.content) as FrameLayout
+
+		var targetTV = frameContent.findViewWithTag("helloText") as TextView
+        if(targetTV != null){
+            frameContent.removeView(targetTV)
+        }
+
+
+    }
+};
+
+
+export function addViewToDecorView() {
+    var uiRunable = AddUIRunnable();
+    // 获取android环境下 宿主decorview的基本信息
+    getUniActivity()!.runOnUiThread(uiRunable)
+
+}
+
+export function removeViewToDecorView() {
+    var uiRunable = RemoveUIRunnable();
+    // 获取android环境下 宿主decorview的基本信息
+    getUniActivity()!.runOnUiThread(uiRunable)
+}
+
+
diff --git a/uni_modules/uts-advance/app-android/utils.uts b/uni_modules/uts-advance/utssdk/app-android/utils.uts
similarity index 100%
rename from uni_modules/uts-advance/app-android/utils.uts
rename to uni_modules/uts-advance/utssdk/app-android/utils.uts
diff --git a/uni_modules/uts-helloworld/package.json b/uni_modules/uts-helloworld/package.json
index ff30cd6..378853e 100644
--- a/uni_modules/uts-helloworld/package.json
+++ b/uni_modules/uts-helloworld/package.json
@@ -76,16 +76,7 @@
           "联盟": "u"
         }
       }
-    },
-    "type": "uts",
-    "uts": {
-        "android": {
-            "libs": [],
-            "dependencies": []
-        },
-        "ios": {
-            "libs": []
-        }
     }
+    
   }
 }
diff --git a/uni_modules/uts-helloworld/app-android/config.json b/uni_modules/uts-helloworld/utssdk/app-android/config.json
similarity index 100%
rename from uni_modules/uts-helloworld/app-android/config.json
rename to uni_modules/uts-helloworld/utssdk/app-android/config.json
diff --git a/uni_modules/uts-helloworld/app-android/index.uts b/uni_modules/uts-helloworld/utssdk/app-android/index.uts
similarity index 100%
rename from uni_modules/uts-helloworld/app-android/index.uts
rename to uni_modules/uts-helloworld/utssdk/app-android/index.uts
diff --git a/uni_modules/uts-osapi/package.json b/uni_modules/uts-osapi/package.json
index 74f48a3..8a75762 100644
--- a/uni_modules/uts-osapi/package.json
+++ b/uni_modules/uts-osapi/package.json
@@ -76,17 +76,7 @@
           "联盟": "u"
         }
       }
-    },
-     "type": "uts",
-        "uts": {
-            "android": {
-                "libs": [],
-                "dependencies": []
-            },
-            "ios": {
-                "libs": []
-            }
-        }
+    }
 
   }
 }
\ No newline at end of file
diff --git a/uni_modules/uts-osapi/app-android/config.json b/uni_modules/uts-osapi/utssdk/app-android/config.json
similarity index 100%
rename from uni_modules/uts-osapi/app-android/config.json
rename to uni_modules/uts-osapi/utssdk/app-android/config.json
diff --git a/uni_modules/uts-osapi/app-android/index.uts b/uni_modules/uts-osapi/utssdk/app-android/index.uts
similarity index 100%
rename from uni_modules/uts-osapi/app-android/index.uts
rename to uni_modules/uts-osapi/utssdk/app-android/index.uts
-- 
GitLab