Merge branch 'master' of https://github.com/zlgopen/awtk

zlgopen · Jan 30, 2024 · 22f5038 · 22f5038
2 parents 96b68d4 + 5b5e8f0
commit 22f5038
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/docs/changes.md b/docs/changes.md
@@ -1,5 +1,8 @@
 # 最新动态
 
+2024/01/26
+  * 小程序名称（applet_name属性）支持长度大于31(感谢雨欣提供补丁
+
 2024/01/23
   * 完善 event\_from\_name（感谢志鹏提供补丁）
   * 修复edit控件输入类型为uint时，最大值设为4294967295导致溢出的问题(感谢雨欣提供补丁）

diff --git a/src/base/ui_loader.c b/src/base/ui_loader.c
@@ -40,11 +40,11 @@ widget_t* ui_loader_load_widget(const char* name) {
 widget_t* ui_loader_load_widget_with_parent(const char* name, widget_t* parent) {
   widget_t* root = NULL;
   char rname[128] = {0};
-  char applet_name[TK_NAME_LEN + 1] = {0};
-  const asset_info_t* ui = NULL;
   ui_builder_t* builder = NULL;
-  ui_loader_t* loader = default_ui_loader();
+  const asset_info_t* ui = NULL;
+  char applet_name[MAX_PATH + 1] = {0};
   assets_manager_t* am = assets_manager();
+  ui_loader_t* loader = default_ui_loader();
   if (strncmp(name, STR_SCHEMA_FILE, strlen(STR_SCHEMA_FILE)) != 0 &&
       assets_managers_is_applet_assets_supported()) {
     const char* p = strchr(name, '.');

diff --git a/src/platforms/pc/thread_with_pthread.c b/src/platforms/pc/thread_with_pthread.c
@@ -425,8 +425,9 @@ ret_t tk_thread_start(tk_thread_t* thread) {
 
     thread->param.sched_priority = thread->priority;
     pthread_attr_setschedparam(&thread->attr, &thread->param);
-
+#ifndef ANDROID
     pthread_attr_setinheritsched(&thread->attr, PTHREAD_EXPLICIT_SCHED);
+#endif/*ANDROID*/    
   }
   if (thread->stack_size > 0) {
     pthread_attr_setstacksize(&thread->attr, thread->stack_size);