15,7 → 15,7 |
#include <clayer/http.h> |
#include <clayer/libimg.h> |
|
#define VERSION "Weather 1.2b" |
#define VERSION "Weather 1.3" |
|
enum BUTTONS{ |
BTN_QUIT = 1, |
22,51 → 22,58 |
BTN_UPDATE = 2 |
}; |
|
#define JSON_OBJ(X) value->u.object.values[X] |
#define OK 200 |
#define API "http://api.openweathermap.org/data/2.5/weather?q=%s&appid=%s&units=metric" |
#define IMAGE_URL "http://openweathermap.org/img/w/%s.png" |
#define START_YPOS 34 |
#define UTF8_W 8 |
#define CP866_W 6 |
#define JSON_OBJ(X) value->u.object.values[X] |
#define OK 200 |
|
#define WINDOW_W 200 |
unsigned WINDOW_W = 200; |
|
#define API "api.openweathermap.org/data/2.5/weather?q=%s&appid=%s&units=%s&lang=%s" |
#define IMAGE_URL "openweathermap.org/img/w/%s.png" |
|
Image *image; |
Image *blend; |
char *units; |
unsigned char char_size=1; |
|
char *wind_speed_str, *pressure_str, *visibility_str, *humidity_str, *update_str; |
|
char lang[3]="en"; |
char format_temp_str[6]; |
char full_url[512]; |
char full_url_image[256]; |
|
char temp_char='K'; |
|
struct kolibri_system_colors sys_color_table; |
|
pos_t win_pos; |
|
#pragma pack(push,1) |
typedef struct { |
char City[256]; |
struct open_weather_data{ |
char City[100]; |
int wind_speed; |
//int wind_deg; |
int wind_deg; |
int pressure; |
int humidity; |
//char weath_main[256]; |
char weath_desc[256]; |
char weath_desc[100]; |
int visibility; |
int timezone; |
char image_code[4]; |
int temp; |
}open_weather_data; |
}myw; |
#pragma pack(pop) |
|
open_weather_data myw; |
|
void notify_show(char *text) |
{ |
start_app("/sys/@notify", text); |
} |
|
void* safe_malloc(size_t size) // Безопасный malloc. Показывает уведомление об ошибке и закрывает программу если память не была выделена |
void* safe_malloc(size_t size) |
{ |
void *p=malloc(size); |
void *p=user_alloc(size); |
if(p==NULL){ |
notify_show("'Memory allocation error!' -E"); |
exit(0); |
86,7 → 93,7 |
draw_text_sys(tmp_buff, x, y , 0, color); |
} |
|
void find_and_set(json_value *value, open_weather_data* weather) |
void find_and_set(json_value *value, struct open_weather_data* weather) |
{ |
for(int i=0; i<value->u.object.length; i++){ |
if(!strcmp(JSON_OBJ(i).name, "main")){ |
124,19 → 131,21 |
char *errmsg = safe_malloc(weather->timezone = JSON_OBJ(i).value->u.string.length+6); |
sprintf(errmsg,"'%s!' -E", JSON_OBJ(i).value->u.string.ptr); |
notify_show(errmsg); |
free(errmsg); |
user_free(errmsg); |
} |
} |
} |
|
http_msg* get_json(char *City, char *Token) |
http_msg* get_json(char *City, char *Token, char* Units) |
{ |
sprintf(full_url, API, City, Token); |
sprintf(full_url, API, City, Token, Units, lang); |
http_msg *h = http_get(full_url, 0, HTTP_FLAG_BLOCK, ""); |
http_long_receive(h); |
if (h->status == OK || h->status == 404) { |
return h; |
} else { |
user_free(h->content_ptr); |
user_free(h); |
return NULL; |
} |
} |
155,8 → 164,6 |
exit(0); |
} |
} |
user_free(h->content_ptr); |
user_free(h); |
blend = img_create(64, 64, IMAGE_BPP32); // Create an empty layer |
img_fill_color(blend, 64, 64, sys_color_table.work_area); // Fill the layer with one color |
Image* image2 = img_scale(image, 0, 0, 50, 50, NULL, LIBIMG_SCALE_STRETCH , LIBIMG_INTER_BILINEAR, 64, 64); |
166,18 → 173,20 |
}else{ |
notify_show("'Image not loaded!!' -W"); |
} |
user_free(h->content_ptr); |
user_free(h); |
} |
|
void RedrawGUI() //Рисуем окно |
void RedrawGUI() |
{ |
begin_draw(); //Начинаем рисование интерфейса ) |
begin_draw(); |
|
int new_win_w = (strlen(myw.City)+11)*UTF8_W; |
int new_win_w = (strlen(myw.City)/char_size+10)*(UTF8_W+char_size-1); |
if(new_win_w<WINDOW_W){ |
new_win_w=WINDOW_W; |
} |
|
sys_create_window(win_pos.x, win_pos.y, new_win_w, START_YPOS+200, VERSION, sys_color_table.work_area, 0x14); // Создаём окно. |
sys_create_window(win_pos.x, win_pos.y, new_win_w, START_YPOS+200, VERSION, sys_color_table.work_area, 0x14); |
|
draw_format_text_sys(20, START_YPOS, 0xB0000000 | sys_color_table.work_text, "%s (UTC%+d)", myw.City, myw.timezone); |
draw_format_text_sys(21, START_YPOS, 0xB0000000 | sys_color_table.work_text, "%s (UTC%+d)", myw.City, myw.timezone); |
187,16 → 196,16 |
draw_format_text_sys(20, START_YPOS+20, 0xb0000000 | sys_color_table.work_text, myw.weath_desc); |
draw_format_text_sys(21, START_YPOS+20, 0xb0000000 | sys_color_table.work_text, myw.weath_desc); |
|
draw_format_text_sys(100, START_YPOS+45, 0xB1000000 | sys_color_table.work_text, "%+d°C", myw.temp); |
draw_format_text_sys(101, START_YPOS+46, 0xB1000000 | sys_color_table.work_text, "%+d°C", myw.temp); |
draw_format_text_sys(100, START_YPOS+45, 0xb1000000 | sys_color_table.work_text, format_temp_str, myw.temp); |
draw_format_text_sys(101, START_YPOS+46, 0xb1000000 | sys_color_table.work_text, format_temp_str, myw.temp); |
|
draw_format_text_sys(20, START_YPOS+80, 0x90000000 | sys_color_table.work_text, "Pressure: %d hPa",myw.pressure); |
draw_format_text_sys(20, START_YPOS+100, 0x90000000 | sys_color_table.work_text, "Humidity: %d %s", myw.humidity, "%"); |
draw_format_text_sys(20, START_YPOS+120, 0x90000000 | sys_color_table.work_text, "Wind speed: %d m/s", myw.wind_speed); |
draw_format_text_sys(20, START_YPOS+140, 0x90000000 | sys_color_table.work_text, "Visibility: %d m", myw.visibility); |
draw_format_text_sys(20, START_YPOS+80, 0xb0000000 | sys_color_table.work_text, pressure_str,myw.pressure); |
draw_format_text_sys(20, START_YPOS+100, 0xb0000000 | sys_color_table.work_text, humidity_str, myw.humidity, "%"); |
draw_format_text_sys(20, START_YPOS+120, 0xb0000000 | sys_color_table.work_text, wind_speed_str, myw.wind_speed); |
draw_format_text_sys(20, START_YPOS+140, 0xb0000000 | sys_color_table.work_text, visibility_str, myw.visibility); |
|
define_button(X_W(new_win_w/2-40,80), Y_H(START_YPOS+160,30), BTN_UPDATE, sys_color_table.work_button); |
draw_text_sys("Update", (new_win_w/2)-(CP866_W*4), START_YPOS+170, 0, 0x90000000 | sys_color_table.work_button_text); |
define_button(X_W(new_win_w/2-60,120), Y_H(START_YPOS+160,30), BTN_UPDATE, sys_color_table.work_button); |
draw_text_sys(update_str, (new_win_w/2)-(UTF8_W*strlen(update_str)/2/char_size), START_YPOS+170, 0, 0xb0000000 | sys_color_table.work_button_text); |
end_draw(); |
} |
|
221,12 → 230,24 |
if(!strcmp(JSON_OBJ(i).name, "Token")){ |
*Token = JSON_OBJ(i).value->u.string.ptr; |
} |
if(!strcmp(JSON_OBJ(i).name, "Celsius")){ |
if(JSON_OBJ(i).value->u.boolean){ |
units = "metric"; |
temp_char = 'C'; |
}else{ |
units = "imperial"; |
temp_char = 'F'; |
} |
} |
if(!strcmp(JSON_OBJ(i).name, "Lang")){ |
strncpy(lang, JSON_OBJ(i).value->u.string.ptr,2); |
} |
} |
if(*City==NULL || *Token ==NULL){ |
notify_show("'Invalid config!!' -E"); |
notify_show("'Invalid config!' -E"); |
exit(0); |
} |
free(config_buff); |
user_free(config_buff); |
fclose(config_j); |
} |
|
234,24 → 255,51 |
{ |
if(blend!=NULL){ |
img_destroy(blend); |
blend = NULL; |
} |
memset(&myw, 0, sizeof myw); |
strcpy(myw.City,"None"); |
strcpy(myw.weath_desc,"unknown"); |
http_msg *json_file = get_json(city, token); |
http_msg *json_file = get_json(city, token, units); |
if(json_file != NULL){ |
json_value* value=json_parse (json_file->content_ptr, json_file->content_length); |
find_and_set(value, &myw); |
sprintf(format_temp_str, "%s°%c","%d",temp_char); |
get_image(); |
json_value_free(value); |
user_free(json_file->content_ptr); |
user_free(json_file); |
|
}else{ |
notify_show("'Connection error!' -E"); |
} |
} |
|
void set_lang() |
{ |
if(!strcmp(lang, "ru")){ |
wind_speed_str = "Скорость ветра: %d м/с"; |
pressure_str = "Давление: %d гПa"; |
visibility_str = "Видимость: %d м"; |
humidity_str = "Влажность: %d%s"; |
update_str = "Обновить"; |
char_size = 2; |
WINDOW_W = 230; |
}else if(!strcmp(lang, "de")){ |
wind_speed_str = "Windgeschwindigkeit: %d m/s"; |
pressure_str = "Druck: %d hPa"; |
visibility_str = "Sichtbarkeit: %d m"; |
humidity_str = "Luftfeuchtigkeit: %d%s"; |
WINDOW_W = 270; |
update_str = "Aktualisieren"; |
}else{ |
pressure_str = "Pressure: %d hPa"; |
humidity_str = "Humidity: %d%s"; |
visibility_str = "Visibility: %d m"; |
wind_speed_str = "Wind speed: %d m/s"; |
update_str = "Refresh"; |
} |
} |
|
int main(){ |
win_pos = get_mouse_pos(0); |
if(!kolibri_libimg_init()){ |
261,7 → 309,9 |
get_system_colors(&sys_color_table); |
char *City = NULL; |
char *Token = NULL; |
|
get_config(&City, &Token); |
set_lang(); |
Update(City,Token); |
|
while(1){ |
271,7 → 321,7 |
case KOLIBRI_EVENT_REDRAW: |
RedrawGUI(); |
break; |
case KOLIBRI_EVENT_BUTTON: // Событие обработки кнопок |
case KOLIBRI_EVENT_BUTTON: |
switch (get_os_button()){ |
case BTN_UPDATE: |
Update(City, Token); |