return NULL;
}
-void wechat_actId_screen_delete(lv_watch_Activity_Id_t act_id)
-{
- lv_obj_t * activity_obj = lv_watch_get_activity_obj(act_id);
- if(NULL == activity_obj)
- return NULL;
-
- lv_watch_activity_ext_t * ext = lv_obj_get_ext_attr(activity_obj);
- //LV_ASSERT_MEM(ext);
- if(ext->prepare_destory)
- {
- ext->prepare_destory(activity_obj);
- }
- lv_obj_del(activity_obj);
-
- return;
-}
-
void wechat_common_screen_prepare_destory(lv_obj_t * activity_obj)
{
WECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
//delete sending screen
//lv_watch_del_interface(ACT_ID_WECHAT_SENDING);
- lv_obj_t * activity_obj = lv_watch_get_activity_obj(ACT_ID_WECHAT_SENDING);
- if(NULL == activity_obj)
- {
- lv_obj_del(activity_obj);
- }
+ wechat_msg_sending_screen_prepare_destory(NULL);
//return main list screen
wechat_main_screen_refresh();
sending_ext->sending_anim.var = NULL;
}
}
+
+ lv_obj_t * obj = lv_watch_get_activity_obj(ACT_ID_WECHAT_SENDING);
+ if(NULL != obj)
+ {
+ lv_obj_del(obj);
+ }
}
lv_obj_t * wechat_msg_sending_screen_create(lv_obj_t * activity_obj)
Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_5);
//wechat_chat_list_set_slide_enable(&ext->old_ext, true); /*reset slide_enable at the end of recording*/
- lv_watch_del_interface(ACT_ID_WECHAT_RECORDING);
+ //lv_watch_del_interface(ACT_ID_WECHAT_RECORDING);
+ lv_obj_t * activity_obj = lv_watch_get_activity_obj(ACT_ID_WECHAT_RECORDING);
+ if(NULL != activity_obj)
+ {
+ lv_obj_del(activity_obj);
+ }
wechat_msg_sending_screen_create(NULL);
}
else
}
Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_5);
- lv_watch_del_interface(ACT_ID_WECHAT_RECORDING);
-
+ //lv_watch_del_interface(ACT_ID_WECHAT_RECORDING);
+ lv_obj_t * activity_obj = lv_watch_get_activity_obj(ACT_ID_WECHAT_RECORDING);
+ if(NULL != activity_obj)
+ {
+ lv_obj_del(activity_obj);
+ }
+
lv_wechat_ext_t * ext = wechat_actId_ext_get(ACT_ID_WECHAT_MAIN);
if(NULL != ext)
{
}
wechat_chat_list_set_slide_enable(&ext->old_ext, false); /*prevent to slide out while recording*/
+ lv_obj_t * activity_obj = NULL;
switch(ext->event)
{
case MCI_EVENT_EOS:
wechat_chat_list_set_slide_enable(&ext->old_ext, true); /*reset slide_enable at the end of recording*/
- lv_watch_del_interface(ACT_ID_WECHAT_RECORDING);
+ //lv_watch_del_interface(ACT_ID_WECHAT_RECORDING);
+ activity_obj = lv_watch_get_activity_obj(ACT_ID_WECHAT_RECORDING);
+ if(NULL != activity_obj)
+ {
+ lv_obj_del(activity_obj);
+ }
wechat_msg_sending_screen_create(NULL);
break;
}
Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_5);
lv_fs_remove(s_wechat_msg_item_info.msg_data_full_file_name);
- lv_watch_del_interface(ACT_ID_WECHAT_RECORDING);
+ //lv_watch_del_interface(ACT_ID_WECHAT_RECORDING);
+ activity_obj = lv_watch_get_activity_obj(ACT_ID_WECHAT_RECORDING);
+ if(NULL != activity_obj)
+ {
+ lv_obj_del(activity_obj);
+ }
wechat_chat_list_set_slide_enable(&ext->old_ext, true); /*reset slide_enable at the end of recording*/
break;
}
}
+void wechat_msg_recording_screen_prepare_destory(lv_obj_t * activity_obj)
+{
+ printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+
+ lv_watch_png_cache_all_free();
+
+ lv_obj_t * obj = lv_watch_get_activity_obj(ACT_ID_WECHAT_RECORDING);
+ if(NULL != obj)
+ {
+ lv_obj_del(obj);
+ }
+}
+
void wechat_msg_recording_screen_create(void)
{
WECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
recording_ext->file_size = 0;
Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_5);
lv_fs_remove(s_wechat_msg_item_info.msg_data_full_file_name);
- lv_watch_del_interface(ACT_ID_WECHAT_RECORDING);
+ //lv_watch_del_interface(ACT_ID_WECHAT_RECORDING);
+ lv_obj_t * activity_obj = lv_watch_get_activity_obj(ACT_ID_WECHAT_RECORDING);
+ if(NULL != activity_obj)
+ {
+ lv_obj_del(activity_obj);
+ }
//return main list screen
wechat_main_screen_refresh();
Hal_File_Record_Stop_Req(&(recording_ext->file_size));
recording_ext->file_size = 0;
Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_5);
- lv_watch_del_interface(ACT_ID_WECHAT_RECORDING);
+ //lv_watch_del_interface(ACT_ID_WECHAT_RECORDING);
+ lv_obj_t * activity_obj = lv_watch_get_activity_obj(ACT_ID_WECHAT_RECORDING);
+ if(NULL != activity_obj)
+ {
+ lv_obj_del(activity_obj);
+ }
wechat_msg_sending_screen_create(NULL);
}
}
projects / mirrors / ASR3603_Z5.git / commitdiff
