GitHub/zTC1
1
0
Fork 0
mirror of https://github.com/oopuuu/zTC1.git synced 2025-12-12 21:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix:默认插口名称在手机上显示乱码的问题

Browse Source 
add:恒定返回插口状态
This commit is contained in:
Zip
2019-03-18 16:14:19 +08:00
parent deaacbeb4b
commit e01def779a
2 changed files with 46 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
TC1/user_function.c
View File

@@ -288,50 +288,50 @@ bool json_plug_analysis( int udp_flag, char x, cJSON * pJsonRoot, cJSON * pJsonS
}
}
}
//<2F><><EFBFBD><EFBFBD>plug<75><67>setting<6E><67>Ŀ----------------------------------------------
cJSON *p_plug_setting = cJSON_GetObjectItem( p_plug, "setting" );
if ( p_plug_setting )
{
cJSON *json_plug_setting_send = cJSON_CreateObject( );
//<2F><><EFBFBD><EFBFBD>plug<75><67>setting<6E><67>name----------------------------------------
cJSON *p_plug_setting_name = cJSON_GetObjectItem( p_plug_setting, "name" );
if ( p_plug_setting_name )
//<2F><><EFBFBD><EFBFBD>plug<75><67>setting<6E><67>Ŀ----------------------------------------------
cJSON *p_plug_setting = cJSON_GetObjectItem( p_plug, "setting" );
if ( p_plug_setting )
{
if ( cJSON_IsString( p_plug_setting_name ) )
cJSON *json_plug_setting_send = cJSON_CreateObject( );
//<2F><><EFBFBD><EFBFBD>plug<75><67>setting<6E><67>name----------------------------------------
cJSON *p_plug_setting_name = cJSON_GetObjectItem( p_plug_setting, "name" );
if ( p_plug_setting_name )
{
return_flag = true;
sprintf( user_config->plug[x].name, p_plug_setting_name->valuestring );
if ( cJSON_IsString( p_plug_setting_name ) )
{
return_flag = true;
sprintf( user_config->plug[x].name, p_plug_setting_name->valuestring );
}
cJSON_AddStringToObject( json_plug_setting_send, "name", user_config->plug[x].name );
}
cJSON_AddStringToObject( json_plug_setting_send, "name", user_config->plug[x].name );
}
//<2F><><EFBFBD><EFBFBD>plug<75><67>setting<6E><67>idx----------------------------------------
cJSON *p_plug_setting_idx = cJSON_GetObjectItem( p_plug_setting, "idx" );
if ( p_plug_setting_idx )
{
if ( cJSON_IsNumber( p_plug_setting_idx ) )
//<2F><><EFBFBD><EFBFBD>plug<75><67>setting<6E><67>idx----------------------------------------
cJSON *p_plug_setting_idx = cJSON_GetObjectItem( p_plug_setting, "idx" );
if ( p_plug_setting_idx )
{
return_flag = true;
user_config->plug[x].idx = p_plug_setting_idx->valueint;
if ( cJSON_IsNumber( p_plug_setting_idx ) )
{
return_flag = true;
user_config->plug[x].idx = p_plug_setting_idx->valueint;
}
cJSON_AddNumberToObject( json_plug_setting_send, "idx", user_config->plug[x].idx );
}
cJSON_AddNumberToObject( json_plug_setting_send, "idx", user_config->plug[x].idx );
}
//<2F><><EFBFBD><EFBFBD>plug<75><67>setting<6E><67>task----------------------------------------
for ( i = 0; i < PLUG_TIME_TASK_NUM; i++ )
{
if ( json_plug_task_analysis( x, i, p_plug_setting, json_plug_setting_send ) )
return_flag = true;
}
//<2F><><EFBFBD><EFBFBD>plug<75><67>setting<6E><67>task----------------------------------------
for ( i = 0; i < PLUG_TIME_TASK_NUM; i++ )
{
if ( json_plug_task_analysis( x, i, p_plug_setting, json_plug_setting_send ) )
return_flag = true;
}
cJSON_AddItemToObject( json_plug_send, "setting", json_plug_setting_send );
cJSON_AddItemToObject( json_plug_send, "setting", json_plug_setting_send );
}
}
}
cJSON *p_nvalue = cJSON_GetObjectItem( pJsonRoot, "nvalue" );
if ( p_plug || p_nvalue )cJSON_AddNumberToObject( json_plug_send, "on", user_config->plug[x].on );
cJSON *p_nvalue = cJSON_GetObjectItem( pJsonRoot, "nvalue" );
// if ( p_plug || p_nvalue )
cJSON_AddNumberToObject( json_plug_send, "on", user_config->plug[x].on );
cJSON_AddItemToObject( pJsonSend, plug_str, json_plug_send );
return return_flag;