fix for latest awtk

zlgopen · Sep 8, 2024 · f5ae2d9 · f5ae2d9
1 parent ad77eb1
commit f5ae2d9
Show file tree

Hide file tree

Showing 95 changed files with 1,056 additions and 777 deletions.
diff --git a/demos/cppdemo12/home_view_model.cpp b/demos/cppdemo12/home_view_model.cpp
@@ -38,7 +38,6 @@ static ret_t home_view_model_get_prop(tk_object_t* obj, const char* name, value_
 
 static bool_t home_view_model_can_exec(tk_object_t* obj, const char* name, const char* args) {
   home_view_model_t* vm = (home_view_model_t*)(obj);
-  Home* aHome = vm->aHome;
   if (tk_str_ieq("AdjustBedRoom", name)) {
     return TRUE;
 

diff --git a/demos/cppdemo12/room_settings_view_model.cpp b/demos/cppdemo12/room_settings_view_model.cpp
@@ -47,7 +47,6 @@ static ret_t room_settings_view_model_get_prop(tk_object_t* obj, const char* nam
 static bool_t room_settings_view_model_can_exec(tk_object_t* obj, const char* name,
                                                 const char* args) {
   room_settings_view_model_t* vm = (room_settings_view_model_t*)(obj);
-  RoomSettings* aRoomSettings = vm->aRoomSettings;
   if (tk_str_ieq("Return", name)) {
     return TRUE;
   }

diff --git a/demos/demo10/gen.sh b/demos/demo10/gen.sh
@@ -1,5 +1,3 @@
-cp ../demo6/temperature.h .
-cp ../demo6/temperature.c .
 rm -f *view_model.*
 
 node ../../../awtk/tools/idl_gen/index.js idl.json .

diff --git a/demos/demo10/idl.json b/demos/demo10/idl.json
@@ -77,6 +77,15 @@
           "readable": true,
           "writable": true
         }
+      },
+      {
+        "name": "timer",
+        "desc": "计时（倒数）。",
+        "type": "uint32_t",
+        "annotation": {
+          "readable": true,
+          "writable": true
+        }
       }
     ],
     "header": "demo10/temperature.h",

diff --git a/demos/demo10/temperature_view_model.c b/demos/demo10/temperature_view_model.c
@@ -11,15 +11,18 @@ static ret_t temperature_view_model_set_prop(tk_object_t* obj, const char* name,
 
   if (tk_str_ieq("value", name)) {
     atemperature->value = value_double(v);
+
     return RET_OK;
   } else if (tk_str_ieq("timer", name)) {
     atemperature->timer = value_uint32(v);
+
     return RET_OK;
   }
-
+  
   return RET_NOT_FOUND;
 }
 
+
 static ret_t temperature_view_model_get_prop(tk_object_t* obj, const char* name, value_t* v) {
   temperature_t* atemperature = ((temperature_view_model_t*)(obj))->atemperature;
 
@@ -34,8 +37,9 @@ static ret_t temperature_view_model_get_prop(tk_object_t* obj, const char* name,
   return RET_NOT_FOUND;
 }
 
-static bool_t temperature_view_model_can_exec(tk_object_t* obj, const char* name,
-                                              const char* args) {
+
+static bool_t temperature_view_model_can_exec(tk_object_t* obj, const char* name, const char* args) {
+
   temperature_view_model_t* vm = (temperature_view_model_t*)(obj);
   temperature_t* atemperature = vm->atemperature;
   if (tk_str_ieq("apply", name)) {
@@ -45,6 +49,7 @@ static bool_t temperature_view_model_can_exec(tk_object_t* obj, const char* name
 }
 
 static ret_t temperature_view_model_exec(tk_object_t* obj, const char* name, const char* args) {
+
   temperature_view_model_t* vm = (temperature_view_model_t*)(obj);
   temperature_t* atemperature = vm->atemperature;
   if (tk_str_ieq("apply", name)) {
@@ -57,23 +62,30 @@ static ret_t temperature_view_model_on_destroy(tk_object_t* obj) {
   temperature_view_model_t* vm = (temperature_view_model_t*)(obj);
   return_value_if_fail(vm != NULL, RET_BAD_PARAMS);
 
+
   temperature_destroy(vm->atemperature);
 
   return view_model_deinit(VIEW_MODEL(obj));
 }
 
-static const object_vtable_t s_temperature_view_model_vtable = {"temperature_view_model_t",
-                                                                "temperature_view_model_t",
-                                                                sizeof(temperature_view_model_t),
-                                                                FALSE,
-                                                                temperature_view_model_on_destroy,
-                                                                NULL,
-                                                                temperature_view_model_get_prop,
-                                                                temperature_view_model_set_prop,
-                                                                NULL,
-                                                                NULL,
-                                                                temperature_view_model_can_exec,
-                                                                temperature_view_model_exec};
+static const object_vtable_t s_temperature_view_model_vtable = {
+  .type = "temperature_view_model_t",
+  .desc = "temperature_view_model_t",
+  .size = sizeof(temperature_view_model_t),
+  .is_collection = FALSE,
+  .on_destroy = temperature_view_model_on_destroy,
+  .compare = NULL,
+  .get_prop = temperature_view_model_get_prop,
+  .set_prop = temperature_view_model_set_prop,
+  .remove_prop = NULL,
+  .foreach_prop = NULL,
+  .clear_props = NULL,
+  .find_prop = NULL,
+  .find_props = NULL,
+  .can_exec = temperature_view_model_can_exec,
+  .exec = temperature_view_model_exec,
+  .clone = NULL
+};
 
 view_model_t* temperature_view_model_create_with(temperature_t* atemperature) {
   tk_object_t* obj = tk_object_create(&s_temperature_view_model_vtable);
@@ -83,6 +95,7 @@ view_model_t* temperature_view_model_create_with(temperature_t* atemperature) {
   return_value_if_fail(vm != NULL, NULL);
 
   temperature_view_model->atemperature = atemperature;
+
 
   return vm;
 }

diff --git a/demos/demo11/gen.sh b/demos/demo11/gen.sh
diff --git a/demos/demo11/humidity_view_model.c b/demos/demo11/humidity_view_model.c
@@ -14,10 +14,11 @@ static ret_t humidity_view_model_set_prop(tk_object_t* obj, const char* name, co
 
     return RET_OK;
   }
-
+  
   return RET_NOT_FOUND;
 }
 
+
 static ret_t humidity_view_model_get_prop(tk_object_t* obj, const char* name, value_t* v) {
   humidity_t* ahumidity = ((humidity_view_model_t*)(obj))->ahumidity;
 
@@ -29,7 +30,9 @@ static ret_t humidity_view_model_get_prop(tk_object_t* obj, const char* name, va
   return RET_NOT_FOUND;
 }
 
+
 static bool_t humidity_view_model_can_exec(tk_object_t* obj, const char* name, const char* args) {
+
   humidity_view_model_t* vm = (humidity_view_model_t*)(obj);
   humidity_t* ahumidity = vm->ahumidity;
   if (tk_str_ieq("apply", name)) {
@@ -39,6 +42,7 @@ static bool_t humidity_view_model_can_exec(tk_object_t* obj, const char* name, c
 }
 
 static ret_t humidity_view_model_exec(tk_object_t* obj, const char* name, const char* args) {
+
   humidity_view_model_t* vm = (humidity_view_model_t*)(obj);
   humidity_t* ahumidity = vm->ahumidity;
   if (tk_str_ieq("apply", name)) {
@@ -51,23 +55,30 @@ static ret_t humidity_view_model_on_destroy(tk_object_t* obj) {
   humidity_view_model_t* vm = (humidity_view_model_t*)(obj);
   return_value_if_fail(vm != NULL, RET_BAD_PARAMS);
 
+
   humidity_destroy(vm->ahumidity);
 
   return view_model_deinit(VIEW_MODEL(obj));
 }
 
-static const object_vtable_t s_humidity_view_model_vtable = {"humidity_view_model_t",
-                                                             "humidity_view_model_t",
-                                                             sizeof(humidity_view_model_t),
-                                                             FALSE,
-                                                             humidity_view_model_on_destroy,
-                                                             NULL,
-                                                             humidity_view_model_get_prop,
-                                                             humidity_view_model_set_prop,
-                                                             NULL,
-                                                             NULL,
-                                                             humidity_view_model_can_exec,
-                                                             humidity_view_model_exec};
+static const object_vtable_t s_humidity_view_model_vtable = {
+  .type = "humidity_view_model_t",
+  .desc = "humidity_view_model_t",
+  .size = sizeof(humidity_view_model_t),
+  .is_collection = FALSE,
+  .on_destroy = humidity_view_model_on_destroy,
+  .compare = NULL,
+  .get_prop = humidity_view_model_get_prop,
+  .set_prop = humidity_view_model_set_prop,
+  .remove_prop = NULL,
+  .foreach_prop = NULL,
+  .clear_props = NULL,
+  .find_prop = NULL,
+  .find_props = NULL,
+  .can_exec = humidity_view_model_can_exec,
+  .exec = humidity_view_model_exec,
+  .clone = NULL
+};
 
 view_model_t* humidity_view_model_create_with(humidity_t* ahumidity) {
   tk_object_t* obj = tk_object_create(&s_humidity_view_model_vtable);
@@ -77,6 +88,7 @@ view_model_t* humidity_view_model_create_with(humidity_t* ahumidity) {
   return_value_if_fail(vm != NULL, NULL);
 
   humidity_view_model->ahumidity = ahumidity;
+
 
   return vm;
 }

diff --git a/demos/demo11/temperature_view_model.c b/demos/demo11/temperature_view_model.c
@@ -14,10 +14,11 @@ static ret_t temperature_view_model_set_prop(tk_object_t* obj, const char* name,
 
     return RET_OK;
   }
-
+  
   return RET_NOT_FOUND;
 }
 
+
 static ret_t temperature_view_model_get_prop(tk_object_t* obj, const char* name, value_t* v) {
   temperature_t* atemperature = ((temperature_view_model_t*)(obj))->atemperature;
 
@@ -29,8 +30,9 @@ static ret_t temperature_view_model_get_prop(tk_object_t* obj, const char* name,
   return RET_NOT_FOUND;
 }
 
-static bool_t temperature_view_model_can_exec(tk_object_t* obj, const char* name,
-                                              const char* args) {
+
+static bool_t temperature_view_model_can_exec(tk_object_t* obj, const char* name, const char* args) {
+
   temperature_view_model_t* vm = (temperature_view_model_t*)(obj);
   temperature_t* atemperature = vm->atemperature;
   if (tk_str_ieq("apply", name)) {
@@ -40,6 +42,7 @@ static bool_t temperature_view_model_can_exec(tk_object_t* obj, const char* name
 }
 
 static ret_t temperature_view_model_exec(tk_object_t* obj, const char* name, const char* args) {
+
   temperature_view_model_t* vm = (temperature_view_model_t*)(obj);
   temperature_t* atemperature = vm->atemperature;
   if (tk_str_ieq("apply", name)) {
@@ -52,23 +55,30 @@ static ret_t temperature_view_model_on_destroy(tk_object_t* obj) {
   temperature_view_model_t* vm = (temperature_view_model_t*)(obj);
   return_value_if_fail(vm != NULL, RET_BAD_PARAMS);
 
+
   temperature_destroy(vm->atemperature);
 
   return view_model_deinit(VIEW_MODEL(obj));
 }
 
-static const object_vtable_t s_temperature_view_model_vtable = {"temperature_view_model_t",
-                                                                "temperature_view_model_t",
-                                                                sizeof(temperature_view_model_t),
-                                                                FALSE,
-                                                                temperature_view_model_on_destroy,
-                                                                NULL,
-                                                                temperature_view_model_get_prop,
-                                                                temperature_view_model_set_prop,
-                                                                NULL,
-                                                                NULL,
-                                                                temperature_view_model_can_exec,
-                                                                temperature_view_model_exec};
+static const object_vtable_t s_temperature_view_model_vtable = {
+  .type = "temperature_view_model_t",
+  .desc = "temperature_view_model_t",
+  .size = sizeof(temperature_view_model_t),
+  .is_collection = FALSE,
+  .on_destroy = temperature_view_model_on_destroy,
+  .compare = NULL,
+  .get_prop = temperature_view_model_get_prop,
+  .set_prop = temperature_view_model_set_prop,
+  .remove_prop = NULL,
+  .foreach_prop = NULL,
+  .clear_props = NULL,
+  .find_prop = NULL,
+  .find_props = NULL,
+  .can_exec = temperature_view_model_can_exec,
+  .exec = temperature_view_model_exec,
+  .clone = NULL
+};
 
 view_model_t* temperature_view_model_create_with(temperature_t* atemperature) {
   tk_object_t* obj = tk_object_create(&s_temperature_view_model_vtable);
@@ -78,6 +88,7 @@ view_model_t* temperature_view_model_create_with(temperature_t* atemperature) {
   return_value_if_fail(vm != NULL, NULL);
 
   temperature_view_model->atemperature = atemperature;
+
 
   return vm;
 }

diff --git a/demos/demo12/gen.sh b/demos/demo12/gen.sh
diff --git a/demos/demo12/home_view_model.c b/demos/demo12/home_view_model.c
@@ -10,14 +10,17 @@ static ret_t home_view_model_set_prop(tk_object_t* obj, const char* name, const
   home_t* ahome = ((home_view_model_t*)(obj))->ahome;
 
   if (tk_str_ieq("bed_room_info", name)) {
+
     return RET_OK;
   } else if (tk_str_ieq("living_room_info", name)) {
+
     return RET_OK;
   }
-
+  
   return RET_NOT_FOUND;
 }
 
+
 static ret_t home_view_model_get_prop(tk_object_t* obj, const char* name, value_t* v) {
   home_t* ahome = ((home_view_model_t*)(obj))->ahome;
 
@@ -32,7 +35,9 @@ static ret_t home_view_model_get_prop(tk_object_t* obj, const char* name, value_
   return RET_NOT_FOUND;
 }
 
+
 static bool_t home_view_model_can_exec(tk_object_t* obj, const char* name, const char* args) {
+
   home_view_model_t* vm = (home_view_model_t*)(obj);
   home_t* ahome = vm->ahome;
   if (tk_str_ieq("adjustBedRoom", name)) {
@@ -45,6 +50,7 @@ static bool_t home_view_model_can_exec(tk_object_t* obj, const char* name, const
 }
 
 static ret_t home_view_model_exec(tk_object_t* obj, const char* name, const char* args) {
+
   home_view_model_t* vm = (home_view_model_t*)(obj);
   home_t* ahome = vm->ahome;
   if (tk_str_ieq("adjustBedRoom", name)) {
@@ -66,18 +72,24 @@ static ret_t home_view_model_on_destroy(tk_object_t* obj) {
   return view_model_deinit(VIEW_MODEL(obj));
 }
 
-static const object_vtable_t s_home_view_model_vtable = {"home_view_model_t",
-                                                         "home_view_model_t",
-                                                         sizeof(home_view_model_t),
-                                                         FALSE,
-                                                         home_view_model_on_destroy,
-                                                         NULL,
-                                                         home_view_model_get_prop,
-                                                         home_view_model_set_prop,
-                                                         NULL,
-                                                         NULL,
-                                                         home_view_model_can_exec,
-                                                         home_view_model_exec};
+static const object_vtable_t s_home_view_model_vtable = {
+  .type = "home_view_model_t",
+  .desc = "home_view_model_t",
+  .size = sizeof(home_view_model_t),
+  .is_collection = FALSE,
+  .on_destroy = home_view_model_on_destroy,
+  .compare = NULL,
+  .get_prop = home_view_model_get_prop,
+  .set_prop = home_view_model_set_prop,
+  .remove_prop = NULL,
+  .foreach_prop = NULL,
+  .clear_props = NULL,
+  .find_prop = NULL,
+  .find_props = NULL,
+  .can_exec = home_view_model_can_exec,
+  .exec = home_view_model_exec,
+  .clone = NULL
+};
 
 view_model_t* home_view_model_create_with(home_t* ahome) {
   tk_object_t* obj = tk_object_create(&s_home_view_model_vtable);
@@ -87,8 +99,10 @@ view_model_t* home_view_model_create_with(home_t* ahome) {
   return_value_if_fail(vm != NULL, NULL);
 
   home_view_model->ahome = ahome;
+
+  emitter_on(EMITTER(ahome), EVT_PROPS_CHANGED, emitter_forward_retarget, vm);
+  emitter_on(EMITTER(ahome), EVT_ITEMS_CHANGED, emitter_forward_retarget, vm);
 
-  emitter_on(EMITTER(ahome), EVT_PROPS_CHANGED, emitter_forward, vm);
 
   return vm;
 }