gengxin

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_jrtc_client_hzch.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_jrtc_client_hzch.c
index be3c0df..2dcff45 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_jrtc_client_hzch.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_jrtc_client_hzch.c
@@ -50,8 +50,10 @@ void mmi_video_call_jrtc_config_init_00(void)
 void mmi_video_call_jrtc_config_init_01(char * t_tokens)
 {
 #ifndef __VIDEO_CALL_TEST__
-       char appkey[24+1] = "21b649200a62dd8cde334097";
-       char key[16+1] = "41042Jxz17m69E16";
+       //char appkey[24+1] = "21b649200a62dd8cde334097";
+       //char key[16+1] = "41042Jxz17m69E16";
+       char appkey[24+1] = "30caab608238fd8ce3334095";
+       char key[16+1] = "172q76141506bnb9";
        char uid[64+1] = {0};
        char tokens[128+1] = {0};
        
@@ -192,8 +194,8 @@ static int8_t mmi_video_call_jrtc_open(const char* roomid, MODEM_VIDEO_CALL_TYPE
        
     if (MODEM_VIDEO_CALL_TYPE_VIDEO == calltype) 
        {
-        s_video_call_jrtc.rxframe.width  = s_video_call_jrtc.txframe.width  = 176;
-        s_video_call_jrtc.rxframe.height = s_video_call_jrtc.txframe.height = 144;
+        s_video_call_jrtc.rxframe.width  = s_video_call_jrtc.txframe.width  = canvas_width; // 176;
+        s_video_call_jrtc.rxframe.height = s_video_call_jrtc.txframe.height = canvas_heigh; // 144;
         s_video_call_jrtc.rxframe.fps    = s_video_call_jrtc.txframe.fps    = 8; // 10;
         s_video_call_jrtc.rxframe.kbps   = s_video_call_jrtc.txframe.kbps   = 120; // 240;
 
@@ -312,11 +314,12 @@ static uint8_t voip_jrtc_get_image(void * preview_buf)
         frame = &s_video_call_jrtc.txframe;
 
     if (frame->put != frame->get) {
-#if (ENABLE_VIDEO_SCALE == 0)
-        yuv420_2_rgb565(frame->width, frame->height, frame->data, preview_buf, frame->format);
-#else
-        Hal_Yuv420_Render(frame->width, frame->height, canvas_width, canvas_heigh, frame->data, preview_buf, frame->format);
-#endif
+//#if (ENABLE_VIDEO_SCALE == 0)
+//        yuv420_2_rgb565(frame->width, frame->height, frame->data, preview_buf, frame->format);
+//#else
+//        Hal_Yuv420_Render(frame->width, frame->height, canvas_width, canvas_heigh, frame->data, preview_buf, frame->format);
+//#endif
+               rgb565_scale(frame->width, frame->height, canvas_width, canvas_heigh, frame->data, preview_buf);
 
         frame->get = frame->put;
         ret = 1;

diff --git a/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_tcp/mmi_modem_tcp_net.c b/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_tcp/mmi_modem_tcp_net.c
index 077fb54..794e9d0 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_tcp/mmi_modem_tcp_net.c
+++ b/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_tcp/mmi_modem_tcp_net.c
@@ -20,7 +20,7 @@ void tcp_connect_cb(int t)
 
 #ifdef __MMI_ZHSX_SUPPORT__
 #define MMI_TCP_FIRST_CONNECT_TIME_INTERVAL            (1000 * 5) // ms
-#define MMI_TCP_FIRST_CONNECT_TIMEOUT          (1000 * 60) // ms
+#define MMI_TCP_FIRST_CONNECT_TIMEOUT          (1000 * 60 * 3) // ms
 
 static void * s_tcp_first_connect_timer_id = NULL;
 static uint32_t s_tcp_first_connect_time = 0;