Commit cf6083c3 authored by 周尚's avatar 周尚

remove paytype ui

parent 3c81f021
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2013 # Visual Studio 2010
VisualStudioVersion = 12.0.21005.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "V1_0_0", "V1_0_0.vcxproj", "{4D0804EF-455B-44D1-B0C7-74E9B14E37B0}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "V1_0_0", "V1_0_0.vcxproj", "{4D0804EF-455B-44D1-B0C7-74E9B14E37B0}"
EndProject EndProject
Global Global
......
No preview for this file type
This diff is collapsed.
No preview for this file type
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="include\ExFuncs.h" />
<ClInclude Include="include\HttpApi.h" /> <ClInclude Include="include\HttpApi.h" />
<ClInclude Include="include\sslapi.h" /> <ClInclude Include="include\sslapi.h" />
<ClInclude Include="include\zx_code.h" /> <ClInclude Include="include\zx_code.h" />
...@@ -47,8 +48,8 @@ ...@@ -47,8 +48,8 @@
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc> <UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset> <PlatformToolset>v120</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">
</ImportGroup> </ImportGroup>
...@@ -109,8 +110,8 @@ ...@@ -109,8 +110,8 @@
</DataExecutionPrevention> </DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
<IgnoreSpecificDefaultLibraries>libc.lib;libcd.lib</IgnoreSpecificDefaultLibraries> <IgnoreSpecificDefaultLibraries>libc.lib;libcd.lib</IgnoreSpecificDefaultLibraries>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link> </Link>
<Bscmake> <Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>.\Debug/V1_0_0.bsc</OutputFile> <OutputFile>.\Debug/V1_0_0.bsc</OutputFile>
......
...@@ -47,6 +47,9 @@ ...@@ -47,6 +47,9 @@
<ClInclude Include="include\zx_wifi.h"> <ClInclude Include="include\zx_wifi.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="include\ExFuncs.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="src\main.c"> <ClCompile Include="src\main.c">
......
...@@ -15,6 +15,6 @@ uchar l_to_dec(uchar *inbuf); ...@@ -15,6 +15,6 @@ uchar l_to_dec(uchar *inbuf);
void zx_common_asc2amt(const uchar *str, uchar *amtstr); void zx_common_asc2amt(const uchar *str, uchar *amtstr);
void zx_common_disp_str(uchar const *mess, uchar line, uchar loc, uchar inkey, uchar back); void zx_common_disp_str(uchar const *mess, uchar line, uchar loc, uchar inkey, uchar back);
void zx_common_print2port(const char *sendbuf); void zx_common_print2port(const char *sendbuf);
void zx_common_utf8_to_gb2312(const char *utf8, int len, char *temp); void zx_common_utf8_to_gb2312(const char *utf8, int len, char *temp);
#endif /* ZX_COMMON_H */ #endif /* ZX_COMMON_H */
/* This file was automatically generated. Do not edit! */ /* This file was automatically generated. Do not edit! */
#ifndef ZX_MD5_H #ifndef ZX_MD5_H
#define ZX_MD5_H #define ZX_MD5_H
#include "zx_define.h" #include "zx_define.h"
void BCC_MD5_gen_encrypt(uchar *text,int text_len,uchar *key,int key_len,uchar *out_digest32); void BCC_MD5_gen_encrypt(uchar *text,int text_len,uchar *key,int key_len,uchar *out_digest32);
......
...@@ -16,4 +16,6 @@ typedef struct WIFI_ST { ...@@ -16,4 +16,6 @@ typedef struct WIFI_ST {
int zx_wifi_connect(); int zx_wifi_connect();
int zx_wifi_init(); int zx_wifi_init();
void zx_wifi_disconnect(); void zx_wifi_disconnect();
int zx_wifi_check();
#endif // ZX_WIFI_H #endif // ZX_WIFI_H
No preview for this file type
...@@ -30,6 +30,8 @@ const APPINFO AppInfo = { ...@@ -30,6 +30,8 @@ const APPINFO AppInfo = {
0, 0,
""}; ""};
void zx_disp_submenu();
int event_main(ST_EVENT_MSG *msg) int event_main(ST_EVENT_MSG *msg)
{ {
SystemInit(); SystemInit();
...@@ -83,15 +85,12 @@ int zx_getpayamt() ...@@ -83,15 +85,12 @@ int zx_getpayamt()
memset(buff, 0, sizeof(buff)); memset(buff, 0, sizeof(buff));
memset(amtStr, 0, sizeof(amtStr)); memset(amtStr, 0, sizeof(amtStr));
ucKey = 0x00; ucKey = 0x00;
for (; ucKey != KEYENTER || strlen(amtStr) == 0;) {
if (strcmp(pay_st.payWay, "1") == 0)
zx_common_disp_str((uchar *)" 微信支付 ", 0, LEFT, 0, 1);
else if (strcmp(pay_st.payWay, "2") == 0)
zx_common_disp_str((uchar *)" 支付宝支付 ", 0, LEFT, 0, 1);
zx_common_disp_str((uchar *)"请输入金额: ", 4, LEFT, 0, 0);
ucKey = getkey(); for (; ucKey != KEYENTER;) {
zx_common_disp_str((uchar *)"请输入金额: ", 0, LEFT, 0, 1);
zx_common_disp_str(amtStr, 8, LEFT, 0, 0);
ucKey = getkey();
switch (ucKey) { switch (ucKey) {
case KEY0: case KEY0:
case KEY1: case KEY1:
...@@ -121,15 +120,28 @@ int zx_getpayamt() ...@@ -121,15 +120,28 @@ int zx_getpayamt()
case KEYCANCEL: case KEYCANCEL:
return KEYCANCEL; return KEYCANCEL;
case KEYENTER:
if (strlen(buff) == 0) {
continue;
}
zx_common_asc2amt(buff, amtStr);
strcpy(pay_st.transAmount, amtStr);
ret = zx_getqrcode();
if (ret == KEYCANCEL) {
continue;
} else if (ret > 0) {
ret = zx_trans_biz(TRANS_POSPAY);
if (strcmp(pay_st.status, "2") == 0 && strcmp(pay_st.isMember, "0") == 0) {
ret = zx_trans_biz(TRANS_GETPOINT);
}
}
break;
default: default:
break; break;
} }
zx_common_asc2amt(buff, amtStr);
zx_common_disp_str(amtStr, 8, LEFT, 0, 0);
} }
strcpy(pay_st.transAmount, amtStr);
return ret; return ret;
} }
...@@ -195,7 +207,7 @@ void setup() ...@@ -195,7 +207,7 @@ void setup()
zx_config_read_host(); zx_config_read_host();
RouteSetDefault(12); RouteSetDefault(12);
/* zx_wifi_init(); */ // zx_wifi_init();
} }
void zx_disp_submenu() void zx_disp_submenu()
...@@ -251,22 +263,75 @@ end: ...@@ -251,22 +263,75 @@ end:
int main(void) int main(void)
{ {
uchar ucKey = 0x00;
uchar buff[12] = {0};
uchar amtStr[12] = {0};
int ret = 0;
SystemInit(); SystemInit();
setup(); setup();
ScrCls();
while (1) { while (1) {
zx_disp_paymenu(); memset(buff, 0, sizeof(buff));
memset(amtStr, 0, sizeof(amtStr));
ucKey = 0x00;
// disp_mainmenu(); for (; ucKey != KEYENTER;) {
/* zx_getpaytype(pay_st.payWay); */ ScrCls();
/* zx_getpayamt(amtStr); */ zx_common_disp_str((uchar *)"请输入金额: ", 0, 0, 0, 1);
/* zx_getqrcode(); */ zx_common_asc2amt(buff, amtStr);
zx_common_disp_str(amtStr, 8, LEFT, 0, 0);
/* zx_trans_send_pay(&pay_st, sendbuf); */ ucKey = getkey();
/* send_and_receive(0, sendbuf, strlen(sendbuf), recvbuf, &recvlen); */ switch (ucKey) {
case KEY0:
case KEY1:
case KEY2:
case KEY3:
case KEY4:
case KEY5:
case KEY6:
case KEY7:
case KEY8:
case KEY9:
if (strlen(buff) < sizeof(buff) - 1)
sprintf(buff + strlen(buff), "%c", ucKey);
break;
case KEYBACKSPACE:
buff[strlen(buff) - 1] = 0;
break;
case KEYCLEAR:
case KEYCANCEL:
memset(buff, 0, sizeof(buff));
break;
case KEYFN:
zx_disp_submenu();
case KEYENTER:
if (strlen(buff) == 0) {
continue;
}
break;
default:
break;
}
}
strcpy(pay_st.transAmount, amtStr);
ret = zx_getqrcode();
if (ret == KEYCANCEL) {
continue;
} else if (ret > 0) {
ret = zx_trans_biz(TRANS_POSPAY);
if (strcmp(pay_st.status, "2") == 0 && strcmp(pay_st.isMember, "0") == 0) {
ret = zx_trans_biz(TRANS_GETPOINT);
}
}
} }
return 0; return 0;
} }
...@@ -101,8 +101,8 @@ void zx_common_disp_str(uchar const *mess, uchar line, uchar loc, uchar inkey, u ...@@ -101,8 +101,8 @@ void zx_common_disp_str(uchar const *mess, uchar line, uchar loc, uchar inkey, u
void zx_common_print2port(const char *sendbuf) void zx_common_print2port(const char *sendbuf)
{ {
return; /* log */
#if 1
int ret = 0; int ret = 0;
char buf[20]; char buf[20];
char portbuf[2048]; char portbuf[2048];
...@@ -137,4 +137,5 @@ void zx_common_print2port(const char *sendbuf) ...@@ -137,4 +137,5 @@ void zx_common_print2port(const char *sendbuf)
zx_common_disp_str("PortClose", 2, 0, 0, 0); zx_common_disp_str("PortClose", 2, 0, 0, 0);
zx_err_port(ret); zx_err_port(ret);
} }
#endif
} }
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#include <posapi.h> #include <posapi.h>
#include <posapi_all.h> #include <posapi_all.h>
#include "zx_code.h"
#include "zx_common.h" #include "zx_common.h"
#include "zx_config.h" #include "zx_config.h"
#include "zx_define.h" #include "zx_define.h"
...@@ -27,22 +28,18 @@ int zx_config_read_shop() ...@@ -27,22 +28,18 @@ int zx_config_read_shop()
ret = seek(fd, 0, SEEK_SET); ret = seek(fd, 0, SEEK_SET);
if (ret < 0) { if (ret < 0) {
zx_common_disp_str((uchar *)"seek", 4, 0, 0, 0); zx_common_disp_str((uchar *)"seek", 4, 0, 0, 0);
zx_err_file(); // zx_err_file();
goto end; goto end;
} }
ret = read(fd, (void *)buf, sizeof(SHOP_ST)); ret = read(fd, (void *)buf, sizeof(SHOP_ST));
if (ret == -1) { if (ret == -1) {
zx_common_disp_str((uchar *)"read", 4, 0, 0, 0); zx_common_disp_str((uchar *)"read", 4, 0, 0, 0);
zx_err_file(); // zx_err_file();
goto end; goto end;
} else if (ret == sizeof(SHOP_ST)) } else if (ret == sizeof(SHOP_ST))
memcpy(&shop_st, buf, sizeof(SHOP_ST)); memcpy(&shop_st, buf, sizeof(SHOP_ST));
zx_common_print2port("posKey: ");
zx_common_print2port(shop_st.posKey);
zx_common_print2port("\n");
end: end:
if (fd > 0) { if (fd > 0) {
close(fd); close(fd);
...@@ -58,18 +55,14 @@ int zx_config_write_shop() ...@@ -58,18 +55,14 @@ int zx_config_write_shop()
fd = open("shopData", O_CREATE | O_RDWR); fd = open("shopData", O_CREATE | O_RDWR);
if (fd < 0) { if (fd < 0) {
zx_common_disp_str((uchar *)"open", 4, 0, 0, 0); zx_common_disp_str((uchar *)"open", 4, 0, 0, 0);
zx_err_file(); // zx_err_file();
goto end; goto end;
} }
zx_common_print2port("posKey: ");
zx_common_print2port(shop_st.posKey);
zx_common_print2port("\n");
ret = write(fd, (void *)&shop_st, sizeof(SHOP_ST)); ret = write(fd, (void *)&shop_st, sizeof(SHOP_ST));
if (ret == -1) { if (ret == -1) {
zx_common_disp_str((uchar *)"write", 4, 0, 0, 0); zx_common_disp_str((uchar *)"write", 4, 0, 0, 0);
zx_err_file(); // zx_err_file();
goto end; goto end;
} }
...@@ -144,14 +137,14 @@ int zx_config_read_wifi() ...@@ -144,14 +137,14 @@ int zx_config_read_wifi()
ret = seek(fd, 0, SEEK_SET); ret = seek(fd, 0, SEEK_SET);
if (ret < 0) { if (ret < 0) {
zx_common_disp_str((uchar *)"seek", 4, 0, 0, 0); zx_common_disp_str((uchar *)"seek", 4, 0, 0, 0);
zx_err_file(); // zx_err_file();
goto end; goto end;
} }
ret = read(fd, (void *)buf, sizeof(WIFI_ST)); ret = read(fd, (void *)buf, sizeof(WIFI_ST));
if (ret == -1) { if (ret == -1) {
zx_common_disp_str((uchar *)"read", 4, 0, 0, 0); zx_common_disp_str((uchar *)"read", 4, 0, 0, 0);
zx_err_file(); // zx_err_file();
goto end; goto end;
} else if (ret == sizeof(WIFI_ST)) { } else if (ret == sizeof(WIFI_ST)) {
memcpy(&wifi_st, buf, sizeof(WIFI_ST)); memcpy(&wifi_st, buf, sizeof(WIFI_ST));
...@@ -174,13 +167,13 @@ int zx_config_write_wifi() ...@@ -174,13 +167,13 @@ int zx_config_write_wifi()
fd = open("wifi", O_CREATE | O_RDWR); fd = open("wifi", O_CREATE | O_RDWR);
if (fd < 0) { if (fd < 0) {
zx_common_disp_str((uchar *)"open", 4, 0, 0, 0); zx_common_disp_str((uchar *)"open", 4, 0, 0, 0);
zx_err_file(); // zx_err_file();
goto end; goto end;
} }
ret = write(fd, (void *)&wifi_st, sizeof(WIFI_ST)); ret = write(fd, (void *)&wifi_st, sizeof(WIFI_ST));
if (ret == -1) { if (ret == -1) {
zx_common_disp_str((uchar *)"write", 4, 0, 0, 0); zx_common_disp_str((uchar *)"write", 4, 0, 0, 0);
zx_err_file(); // zx_err_file();
goto end; goto end;
} }
...@@ -207,14 +200,14 @@ int zx_config_read_host() ...@@ -207,14 +200,14 @@ int zx_config_read_host()
ret = seek(fd, 0, SEEK_SET); ret = seek(fd, 0, SEEK_SET);
if (ret < 0) { if (ret < 0) {
zx_common_disp_str((uchar *)"seek", 4, 0, 0, 0); zx_common_disp_str((uchar *)"seek", 4, 0, 0, 0);
zx_err_file(); // zx_err_file();
goto end; goto end;
} }
ret = read(fd, (void *)buf, HOSTLEN); ret = read(fd, (void *)buf, HOSTLEN);
if (ret == -1) { if (ret == -1) {
zx_common_disp_str((uchar *)"read", 4, 0, 0, 0); zx_common_disp_str((uchar *)"read", 4, 0, 0, 0);
zx_err_file(); // zx_err_file();
goto end; goto end;
} else if (ret == HOSTLEN) { } else if (ret == HOSTLEN) {
strcpy(hosturl, buf); strcpy(hosturl, buf);
...@@ -235,7 +228,7 @@ int zx_config_write_host() ...@@ -235,7 +228,7 @@ int zx_config_write_host()
fd = open("hosturl", O_CREATE | O_RDWR); fd = open("hosturl", O_CREATE | O_RDWR);
if (fd < 0) { if (fd < 0) {
zx_common_disp_str((uchar *)"open", 4, 0, 0, 0); zx_common_disp_str((uchar *)"open", 4, 0, 0, 0);
zx_err_file(); // zx_err_file();
goto end; goto end;
} }
......
...@@ -6,6 +6,9 @@ ...@@ -6,6 +6,9 @@
*************************************************************************/ *************************************************************************/
#include "zx_md5.h" #include "zx_md5.h"
#include <posapi.h>
#include <posapi_all.h>
/* #include <posapi.h> */ /* #include <posapi.h> */
/* #include <posapi_all.h> */ /* #include <posapi_all.h> */
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include "zx_global.h" #include "zx_global.h"
#include "zx_md5.h" #include "zx_md5.h"
// #include "ExFuncs.h"
#include "HttpApi.h" #include "HttpApi.h"
int zx_trans_send_shop(const SHOP_ST *shop_st, uchar *out) int zx_trans_send_shop(const SHOP_ST *shop_st, uchar *out)
...@@ -24,11 +25,9 @@ int zx_trans_send_shop(const SHOP_ST *shop_st, uchar *out) ...@@ -24,11 +25,9 @@ int zx_trans_send_shop(const SHOP_ST *shop_st, uchar *out)
{ {
// ptr = shop_st->apiDistrict; // ptr = shop_st->apiDistrict;
ptr = "01"; ptr = "01";
zx_common_print2port(ptr);
zx_code_urlstr_keyval_set("apiDistrict", ptr, out, &len); zx_code_urlstr_keyval_set("apiDistrict", ptr, out, &len);
ptr = shop_st->serialNo; ptr = shop_st->serialNo;
zx_common_print2port("serialNo");
zx_common_print2port(ptr);
zx_code_urlstr_keyval_set("serialNo", ptr, out, &len); zx_code_urlstr_keyval_set("serialNo", ptr, out, &len);
out[--len] = 0; out[--len] = 0;
} }
...@@ -54,40 +53,28 @@ int zx_trans_send_activate(const ACT_ST *act_st, uchar *out) ...@@ -54,40 +53,28 @@ int zx_trans_send_activate(const ACT_ST *act_st, uchar *out)
{ {
// ptr = act_st->apiDistrict; // ptr = act_st->apiDistrict;
ptr = "02"; ptr = "02";
zx_common_print2port(ptr);
ret |= zx_code_urlstr_keyval_set("apiDistrict", ptr, signbuf, &len); ret |= zx_code_urlstr_keyval_set("apiDistrict", ptr, signbuf, &len);
ptr = shop_st.serialNo; ptr = shop_st.serialNo;
zx_common_print2port("serialNo");
zx_common_print2port(ptr);
ret |= zx_code_urlstr_keyval_set("serialNo", ptr, signbuf, &len); ret |= zx_code_urlstr_keyval_set("serialNo", ptr, signbuf, &len);
ptr = shop_st.shopId; ptr = shop_st.shopId;
zx_common_print2port("shopId");
zx_common_print2port(ptr);
ret |= zx_code_urlstr_keyval_set("shopId", ptr, signbuf, &len); ret |= zx_code_urlstr_keyval_set("shopId", ptr, signbuf, &len);
ptr = shop_st.shopName; ptr = shop_st.shopName;
zx_common_print2port("shopName");
zx_common_print2port(ptr);
ret |= zx_code_urlstr_keyval_set("shopName", ptr, signbuf, &len); ret |= zx_code_urlstr_keyval_set("shopName", ptr, signbuf, &len);
strcpy((char *)out, (char *)signbuf); // apiDistrict=val1&serialNo=val2&shopId=val3&shopName=val4& strcpy((char *)out, (char *)signbuf); // apiDistrict=val1&serialNo=val2&shopId=val3&shopName=val4&
ptr = shop_st.posKey; ptr = shop_st.posKey;
zx_common_print2port("posKey");
zx_common_print2port(ptr);
ret |= zx_code_urlstr_keyval_set("key", ptr, signbuf, &len); ret |= zx_code_urlstr_keyval_set("key", ptr, signbuf, &len);
signbuf[len - 1] = 0; signbuf[len - 1] = 0;
zx_common_print2port("signbuf:");
zx_common_print2port(signbuf);
} }
{ {
BCC_MD5_gen(signbuf, md5buf); BCC_MD5_gen(signbuf, md5buf);
zx_common_print2port("md5buf:");
zx_common_print2port(md5buf);
zx_code_upper_str(md5buf, strlen(md5buf)); zx_code_upper_str(md5buf, strlen(md5buf));
zx_code_urlstr_keyval_set("sign", md5buf, out, &len); zx_code_urlstr_keyval_set("sign", md5buf, out, &len);
out[--len] = 0; out[--len] = 0;
...@@ -110,55 +97,35 @@ int zx_trans_send_pay(const PAY_ST *pay_st, uchar *out) ...@@ -110,55 +97,35 @@ int zx_trans_send_pay(const PAY_ST *pay_st, uchar *out)
{ {
ptr = "03"; ptr = "03";
zx_common_print2port(ptr);
zx_code_urlstr_keyval_set("apiDistrict", ptr, signbuf, &len); zx_code_urlstr_keyval_set("apiDistrict", ptr, signbuf, &len);
ptr = pay_st->authCode; ptr = pay_st->authCode;
zx_common_print2port("authCode");
zx_common_print2port(ptr);
zx_code_urlstr_keyval_set("authCode", ptr, signbuf, &len); zx_code_urlstr_keyval_set("authCode", ptr, signbuf, &len);
ptr = pay_st->payWay;
zx_common_print2port("payWay");
zx_common_print2port(ptr);
zx_code_urlstr_keyval_set("payWay", ptr, signbuf, &len);
ptr = shop_st.serialNo; ptr = shop_st.serialNo;
zx_common_print2port("serialNo");
zx_common_print2port(ptr);
zx_code_urlstr_keyval_set("serialNo", ptr, signbuf, &len); zx_code_urlstr_keyval_set("serialNo", ptr, signbuf, &len);
ptr = shop_st.shopId; ptr = shop_st.shopId;
zx_common_print2port("shopId");
zx_common_print2port(ptr);
zx_code_urlstr_keyval_set("shopId", ptr, signbuf, &len); zx_code_urlstr_keyval_set("shopId", ptr, signbuf, &len);
ptr = pay_st->spbillCreateIp; ptr = pay_st->spbillCreateIp;
zx_common_print2port("spbillCreateIp");
zx_common_print2port(ptr);
zx_code_urlstr_keyval_set("spbillCreateIp", ptr, signbuf, &len); zx_code_urlstr_keyval_set("spbillCreateIp", ptr, signbuf, &len);
ptr = pay_st->transAmount; ptr = pay_st->transAmount;
zx_common_print2port("transAmount");
zx_common_print2port(ptr);
zx_code_urlstr_keyval_set("transAmount", ptr, signbuf, &len); zx_code_urlstr_keyval_set("transAmount", ptr, signbuf, &len);
strcpy((char *)out, (char *)signbuf); strcpy((char *)out, (char *)signbuf);
ptr = shop_st.posKey; ptr = shop_st.posKey;
zx_common_print2port("posKey");
zx_common_print2port(ptr);
zx_code_urlstr_keyval_set("key", ptr, signbuf, &len); zx_code_urlstr_keyval_set("key", ptr, signbuf, &len);
signbuf[len - 1] = 0; signbuf[len - 1] = 0;
} }
{ {
zx_common_print2port("signbuf");
zx_common_print2port(signbuf);
BCC_MD5_gen(signbuf, md5buf); BCC_MD5_gen(signbuf, md5buf);
zx_code_upper_str(md5buf, strlen(md5buf)); zx_code_upper_str(md5buf, strlen(md5buf));
zx_code_urlstr_keyval_set("sign", md5buf, out, &len); zx_code_urlstr_keyval_set("sign", md5buf, out, &len);
out[--len] = 0; out[--len] = 0;
} }
...@@ -175,55 +142,36 @@ int zx_trans_recv_pay(const uchar *in, PAY_ST *pay_st) ...@@ -175,55 +142,36 @@ int zx_trans_recv_pay(const uchar *in, PAY_ST *pay_st)
{ {
ptr = pay_st->rspCode; ptr = pay_st->rspCode;
ret |= zx_code_urlstr_keyval_get(in, "&", "responseCode", ptr); ret |= zx_code_urlstr_keyval_get(in, "&", "responseCode", ptr);
zx_common_print2port("rspCode");
zx_common_print2port(ptr);
} }
{ {
ptr = pay_st->orderId; ptr = pay_st->orderId;
ret |= zx_code_urlstr_keyval_get(in, "&", "orderId", ptr); ret |= zx_code_urlstr_keyval_get(in, "&", "orderId", ptr);
zx_common_print2port("orderId");
zx_common_print2port(ptr);
ptr = pay_st->isMember; ptr = pay_st->isMember;
ret |= zx_code_urlstr_keyval_get(in, "&", "isMember", ptr); ret |= zx_code_urlstr_keyval_get(in, "&", "isMember", ptr);
zx_common_print2port("isMember");
zx_common_print2port(ptr);
ptr = pay_st->transTime; ptr = pay_st->transTime;
ret |= zx_code_urlstr_keyval_get(in, "&", "transTime", ptr); ret |= zx_code_urlstr_keyval_get(in, "&", "transTime", ptr);
zx_common_print2port("transTime");
zx_common_print2port(ptr);
ptr = pay_st->receivedPoint; ptr = pay_st->receivedPoint;
ret |= zx_code_urlstr_keyval_get(in, "&", "receivedPoint", ptr); ret |= zx_code_urlstr_keyval_get(in, "&", "receivedPoint", ptr);
zx_common_print2port("receivedPoint");
zx_common_print2port(ptr);
ptr = pay_st->userId; ptr = pay_st->userId;
ret |= zx_code_urlstr_keyval_get(in, "&", "userId", ptr); ret |= zx_code_urlstr_keyval_get(in, "&", "userId", ptr);
zx_common_print2port("userId");
zx_common_print2port(ptr);
ptr = userName; ptr = userName;
ret |= zx_code_urlstr_keyval_get(in, "&", "userName", ptr); ret |= zx_code_urlstr_keyval_get(in, "&", "userName", ptr);
zx_common_print2port("userName");
zx_common_print2port(ptr);
HttpEscapeEncode(userName, sizeof(userName), pay_st->userName, sizeof(pay_st->userName)); HttpEscapeEncode(userName, sizeof(userName), pay_st->userName, sizeof(pay_st->userName));
ptr = pay_st->thirdPartyUseId; ptr = pay_st->thirdPartyUseId;
ret |= zx_code_urlstr_keyval_get(in, "&", "thirdPartyUsed", ptr); ret |= zx_code_urlstr_keyval_get(in, "&", "thirdPartyUsed", ptr);
zx_common_print2port("thirdPartyUseId");
zx_common_print2port(ptr);
ptr = pay_st->status; ptr = pay_st->status;
ret |= zx_code_urlstr_keyval_get(in, "&", "status", ptr); ret |= zx_code_urlstr_keyval_get(in, "&", "status", ptr);
zx_common_print2port("status");
zx_common_print2port(ptr);
ptr = pay_st->getPointsUrl; ptr = pay_st->getPointsUrl;
ret |= zx_code_urlstr_keyval_get(in, "&", "getPointsUrl", ptr); ret |= zx_code_urlstr_keyval_get(in, "&", "getPointsUrl", ptr);
zx_common_print2port("getPointsUrl");
zx_common_print2port(ptr);
} }
return ret; return ret;
} }
...@@ -240,31 +188,23 @@ int zx_trans_points_qrcode() ...@@ -240,31 +188,23 @@ int zx_trans_points_qrcode()
ScrCls(); ScrCls();
memset(&tBitmap, 0, sizeof(BITMAP_T)); memset(&tBitmap, 0, sizeof(BITMAP_T));
zx_common_print2port("=================== POINTS_QRCODE ====================");
ret = CLcdGetInfo(&stLcdInfo); ret = CLcdGetInfo(&stLcdInfo);
sprintf(log, "LcdInfo: %d, %d", stLcdInfo.width, stLcdInfo.height); sprintf(log, "LcdInfo: %d, %d", stLcdInfo.width, stLcdInfo.height);
zx_common_print2port(log);
tBitmap.data = malloc(stLcdInfo.width * stLcdInfo.height * sizeof(int)); tBitmap.data = malloc(stLcdInfo.width * stLcdInfo.height * sizeof(int));
if (tBitmap.data == NULL ) { if (tBitmap.data == NULL) {
zx_common_print2port("MEM FAIL");
} }
tBitmap.size = stLcdInfo.width * stLcdInfo.height * sizeof(int); tBitmap.size = stLcdInfo.width * stLcdInfo.height * sizeof(int);
zx_common_print2port(pay_st.getPointsUrl); ret = GetQRCode(pay_st.getPointsUrl, strlen(pay_st.getPointsUrl), 4, 0, &tBitmap);
ret = GetQRCode(pay_st.getPointsUrl, strlen(pay_st.getPointsUrl), 4, 0, &tBitmap);
sprintf(log, "GetQRCode: %d", ret); sprintf(log, "GetQRCode: %d", ret);
zx_common_print2port(log);
ret = DrawBarcode(x_res, y_res, &tBitmap); ret = DrawBarcode(x_res, y_res, &tBitmap);
sprintf(log, "DrawBarcode: %d", ret); sprintf(log, "DrawBarcode: %d", ret);
zx_common_print2port(log);
sprintf(log, "bitmap: %d, %d", tBitmap.width, tBitmap.height); sprintf(log, "bitmap: %d, %d", tBitmap.width, tBitmap.height);
zx_common_print2port(log);
free(tBitmap.data); free(tBitmap.data);
...@@ -291,6 +231,11 @@ int zx_trans_biz(int trans_no) ...@@ -291,6 +231,11 @@ int zx_trans_biz(int trans_no)
ScrCls(); ScrCls();
zx_common_disp_str(" 交易处理中 ", 0, LEFT, 0, 1); zx_common_disp_str(" 交易处理中 ", 0, LEFT, 0, 1);
ret = zx_wifi_check();
if (ret < 0) {
return ret;
}
if (!shop_st.posKey[0] && trans_no != TRANS_POSKEY) { if (!shop_st.posKey[0] && trans_no != TRANS_POSKEY) {
zx_common_disp_str("无KEY", 4, LEFT, 0, 0); zx_common_disp_str("无KEY", 4, LEFT, 0, 0);
getkey(); getkey();
...@@ -302,7 +247,6 @@ int zx_trans_biz(int trans_no) ...@@ -302,7 +247,6 @@ int zx_trans_biz(int trans_no)
getkey(); getkey();
return -1; return -1;
} }
zx_common_print2port(hosturl);
// send buffer // send buffer
switch (trans_no) { switch (trans_no) {
...@@ -322,12 +266,8 @@ int zx_trans_biz(int trans_no) ...@@ -322,12 +266,8 @@ int zx_trans_biz(int trans_no)
default: default:
return -1; return -1;
} }
zx_common_print2port("tempbuf:");
zx_common_print2port(tempbuf);
// HttpEscapeEncode(tempbuf, templen, sendbuf, sendlen);
BCC_url_encode(tempbuf, templen, sendbuf, sendlen); BCC_url_encode(tempbuf, templen, sendbuf, sendlen);
zx_common_print2port("sendbuf:");
zx_common_print2port(sendbuf);
s = HttpCreate(); s = HttpCreate();
if (s < 0) { if (s < 0) {
...@@ -355,9 +295,6 @@ int zx_trans_biz(int trans_no) ...@@ -355,9 +295,6 @@ int zx_trans_biz(int trans_no)
goto end; goto end;
} }
zx_common_print2port("recvbuf: ");
zx_common_print2port(recvbuf);
// parse recv buffer // parse recv buffer
switch (trans_no) { switch (trans_no) {
case TRANS_POSKEY: case TRANS_POSKEY:
......
...@@ -126,6 +126,19 @@ void zx_wifi_set_param(ST_WIFI_PARAM *wifi_para, ST_WIFI_AP *apNow) ...@@ -126,6 +126,19 @@ void zx_wifi_set_param(ST_WIFI_PARAM *wifi_para, ST_WIFI_AP *apNow)
return; return;
} }
int zx_wifi_check()
{
int ret = 0;
ST_WIFI_AP checkAp;
memset(&checkAp, 0, sizeof(ST_WIFI_AP));
ret = WifiCheck(&checkAp);
if (ret < 0) {
zx_err_wifi(ret);
}
return ret;
}
int zx_wifi_connect() int zx_wifi_connect()
{ {
int ret = 0; int ret = 0;
...@@ -253,6 +266,7 @@ void zx_wifi_disconnect() ...@@ -253,6 +266,7 @@ void zx_wifi_disconnect()
} }
} }
// NOT WORK as expected
int zx_wifi_init() int zx_wifi_init()
{ {
int ret = 0; int ret = 0;
...@@ -276,6 +290,7 @@ int zx_wifi_init() ...@@ -276,6 +290,7 @@ int zx_wifi_init()
if (ret < 0) { if (ret < 0) {
goto end; goto end;
} }
ret = WifiCheck(&apNow); ret = WifiCheck(&apNow);
if (ret < 0) { if (ret < 0) {
goto end; goto end;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment