Commit fe08f20f fe08f20f373f291c922f0dd03c81bcbb70a6b31e by jinwawa

0626

1 parent 3d0bb0dc
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
26 <new_guide_step>4</new_guide_step> 26 <new_guide_step>4</new_guide_step>
27 <is_feiyanzoubi_game_guide>1</is_feiyanzoubi_game_guide> 27 <is_feiyanzoubi_game_guide>1</is_feiyanzoubi_game_guide>
28 <feiyanzoubi_best>376</feiyanzoubi_best> 28 <feiyanzoubi_best>376</feiyanzoubi_best>
29 <uid>1030100010142923</uid> 29 <uid>1030100010142914</uid>
30 <is_bird_game_guide>1</is_bird_game_guide> 30 <is_bird_game_guide>1</is_bird_game_guide>
31 <bird_best>1008</bird_best> 31 <bird_best>1008</bird_best>
32 <is_haidao_game_guide>1</is_haidao_game_guide> 32 <is_haidao_game_guide>1</is_haidao_game_guide>
......
...@@ -140,6 +140,7 @@ end ...@@ -140,6 +140,7 @@ end
140 140
141 -- 天津联通支付 141 -- 天津联通支付
142 function ShopModel.payCucc(productId, productName, productPrice, callBack, timeoutCallBack, gameid) 142 function ShopModel.payCucc(productId, productName, productPrice, callBack, timeoutCallBack, gameid)
143 --logUI("ShopModel------------------------------>"..productId);
143 local function onGetPayIDSuccessFun(_params) 144 local function onGetPayIDSuccessFun(_params)
144 local data = json.decode(_params); 145 local data = json.decode(_params);
145 if data.pay_id == "" then 146 if data.pay_id == "" then
...@@ -205,6 +206,8 @@ function ShopModel.payCucc(productId, productName, productPrice, callBack, timeo ...@@ -205,6 +206,8 @@ function ShopModel.payCucc(productId, productName, productPrice, callBack, timeo
205 local get_pay_id_url = string.gsub(GAME_LOGIN_URL, "login", "pay_get_id"); 206 local get_pay_id_url = string.gsub(GAME_LOGIN_URL, "login", "pay_get_id");
206 if CHANNEL == "cucc" and cc.Application:getInstance():getTargetPlatform() == cc.PLATFORM_OS_ANDROID then 207 if CHANNEL == "cucc" and cc.Application:getInstance():getTargetPlatform() == cc.PLATFORM_OS_ANDROID then
207 local paramsStr = "uid=" .. UserModel.getStringUID() .. "&product=" .. productId .. "&account=" .. UserModel.account .. "&gameid=" .. gameid; 208 local paramsStr = "uid=" .. UserModel.getStringUID() .. "&product=" .. productId .. "&account=" .. UserModel.account .. "&gameid=" .. gameid;
209 --logUI("ShopModel sendHttpRequest------------------------------>");
210 --logUI("ShopModel sendHttpRequest------------------------------>".."POST," .. get_pay_id_url .. "," .. PROXY_HTTP_ADDR .. "," .. paramsStr);
208 DeviceUtil.sendHttpRequest("POST," .. get_pay_id_url .. "," .. PROXY_HTTP_ADDR .. "," .. paramsStr, onGetPayIDSuccessFun); 211 DeviceUtil.sendHttpRequest("POST," .. get_pay_id_url .. "," .. PROXY_HTTP_ADDR .. "," .. paramsStr, onGetPayIDSuccessFun);
209 else 212 else
210 HttpRequest:getInstance():post(get_pay_id_url, { uid = UserModel.getStringUID(), product = productId, account = UserModel.account, gameid = gameid }, onGetPayIDSuccessFun, onGetPayIDFaildFun); 213 HttpRequest:getInstance():post(get_pay_id_url, { uid = UserModel.getStringUID(), product = productId, account = UserModel.account, gameid = gameid }, onGetPayIDSuccessFun, onGetPayIDFaildFun);
...@@ -275,7 +278,7 @@ end ...@@ -275,7 +278,7 @@ end
275 -- 上海电信支付 278 -- 上海电信支付
276 function ShopModel.payShdx(productId, productName, productPrice, callBack, timeoutCallBack, gameid) 279 function ShopModel.payShdx(productId, productName, productPrice, callBack, timeoutCallBack, gameid)
277 --logD("支付类型---------------------------->"..MEMBER_TYPE); 280 --logD("支付类型---------------------------->"..MEMBER_TYPE);
278 local pay_params = ""; 281 local pay_params =productId .. "," .. productName .. "," .. productPrice;
279 --local payInfo = ShopInfo.getPayInfoByProduct(productId); 282 --local payInfo = ShopInfo.getPayInfoByProduct(productId);
280 283
281 local function callbackLua(params) 284 local function callbackLua(params)
...@@ -303,7 +306,6 @@ function ShopModel.payShdx(productId, productName, productPrice, callBack, timeo ...@@ -303,7 +306,6 @@ function ShopModel.payShdx(productId, productName, productPrice, callBack, timeo
303 --if payInfo.id == 301 then 306 --if payInfo.id == 301 then
304 -- DeviceUtil.cycleBilling(pay_params, payCallbackFromJava); 307 -- DeviceUtil.cycleBilling(pay_params, payCallbackFromJava);
305 --else 308 --else
306 --logD("ShopModel------------------------------>");
307 DeviceUtil.sendBilling(pay_params, payCallbackFromJava); 309 DeviceUtil.sendBilling(pay_params, payCallbackFromJava);
308 --end 310 --end
309 end 311 end
......
...@@ -407,7 +407,7 @@ function UserModel.login(host, port, _account, _session) ...@@ -407,7 +407,7 @@ function UserModel.login(host, port, _account, _session)
407 SocketClient:getInstance():connect(host, port, UserModel.onConnectSuccess, UserModel.onConnectFaild); 407 SocketClient:getInstance():connect(host, port, UserModel.onConnectSuccess, UserModel.onConnectFaild);
408 end 408 end
409 409
410 -- 连接服务器成功 410 -- 连接服务器成功(鉴权并向服务端发送鉴权结果)
411 function UserModel.onConnectSuccess(params) 411 function UserModel.onConnectSuccess(params)
412 logUI("on connect success"); 412 logUI("on connect success");
413 --APK容易崩溃,查找原因中。。。 413 --APK容易崩溃,查找原因中。。。
...@@ -415,15 +415,21 @@ function UserModel.onConnectSuccess(params) ...@@ -415,15 +415,21 @@ function UserModel.onConnectSuccess(params)
415 local targetPlatform = cc.Application:getInstance():getTargetPlatform(); 415 local targetPlatform = cc.Application:getInstance():getTargetPlatform();
416 if CHANNEL == "shdx" and targetPlatform == cc.PLATFORM_OS_ANDROID then 416 if CHANNEL == "shdx" and targetPlatform == cc.PLATFORM_OS_ANDROID then
417 local function callbackLua(params) 417 local function callbackLua(params)
418 logUI("on connect success callbackLua"); 418 local arr = StringUtil.split(params,",");
419 SocketClient:getInstance():send("gateway_msg.login_msg", 419 if arr[1] and arr[1] == "success" and arr[2] then --支付成功
420 { 420 logUI("on connect success callbackLua");
421 platform = PLATFORM, 421 IS_MEMBER = 1; --初始化会员全局变量
422 account = account, 422 SocketClient:getInstance():send("gateway_msg.login_msg",
423 session = session, 423 {
424 shanghai_dianxin_pay_id=tonumber(params), 424 platform = PLATFORM,
425 } ); 425 account = account,
426 logUI("从服务端返回会员类型:" .. params); 426 session = session,
427 shanghai_dianxin_pay_id=tonumber(arr[2]),
428 } );
429 logUI("从服务端返回会员类型:" .. arr[2]);
430 else
431 logUI("鉴权失败!");
432 end
427 end 433 end
428 local luaj = require "cocos.cocos2d.luaj"; --引入luaj 434 local luaj = require "cocos.cocos2d.luaj"; --引入luaj
429 local className = "org/cocos2dx/lua/AppActivity"; 435 local className = "org/cocos2dx/lua/AppActivity";
...@@ -435,7 +441,8 @@ function UserModel.onConnectSuccess(params) ...@@ -435,7 +441,8 @@ function UserModel.onConnectSuccess(params)
435 -- luaj.callStaticMethod() 会返回两个值 441 -- luaj.callStaticMethod() 会返回两个值
436 -- 当成功时,第一个值为 true,第二个值是 Java 方法的返回值(如果有) 442 -- 当成功时,第一个值为 true,第二个值是 Java 方法的返回值(如果有)
437 -- 当失败时,第一个值为 false,第二个值是错误代码 443 -- 当失败时,第一个值为 false,第二个值是错误代码
438 local ok, ret = luaj.callStaticMethod(className, "sendPayInfo", args, sigs); 444 --local ok, ret = luaj.callStaticMethod(className, "sendPayInfo", args, sigs);
445 local ok, ret = luaj.callStaticMethod(className, "authPermission", args, sigs);
439 if not ok then 446 if not ok then
440 print("sendPayInfo error:" .. ret); 447 print("sendPayInfo error:" .. ret);
441 end 448 end
......
...@@ -169,6 +169,9 @@ function GameStartView:onStart() ...@@ -169,6 +169,9 @@ function GameStartView:onStart()
169 if CHANNEL=="shdx" then 169 if CHANNEL=="shdx" then
170 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun); 170 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
171 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 171 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
172 elseif CHANNEL=="cucc" then
173 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
174 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
172 else 175 else
173 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun); 176 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
174 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 177 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
......
...@@ -123,6 +123,9 @@ function GameStartView:onStart() ...@@ -123,6 +123,9 @@ function GameStartView:onStart()
123 if CHANNEL=="shdx" then 123 if CHANNEL=="shdx" then
124 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun); 124 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
125 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 125 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
126 elseif CHANNEL=="cucc" then
127 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
128 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
126 else 129 else
127 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun); 130 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
128 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 131 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
......
...@@ -123,6 +123,9 @@ function GameStartView:onStart() ...@@ -123,6 +123,9 @@ function GameStartView:onStart()
123 if CHANNEL=="shdx" then 123 if CHANNEL=="shdx" then
124 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun); 124 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
125 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 125 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
126 elseif CHANNEL=="cucc" then
127 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
128 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
126 else 129 else
127 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun); 130 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
128 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 131 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
......
...@@ -159,6 +159,9 @@ function GameStartView:onStart() ...@@ -159,6 +159,9 @@ function GameStartView:onStart()
159 if CHANNEL=="shdx" then 159 if CHANNEL=="shdx" then
160 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun); 160 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
161 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 161 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
162 elseif CHANNEL=="cucc" then
163 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
164 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
162 else 165 else
163 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun); 166 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
164 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 167 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
......
...@@ -129,6 +129,9 @@ function GameStartView:onStart() ...@@ -129,6 +129,9 @@ function GameStartView:onStart()
129 if CHANNEL=="shdx" then 129 if CHANNEL=="shdx" then
130 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun); 130 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
131 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 131 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
132 elseif CHANNEL=="cucc" then
133 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
134 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
132 else 135 else
133 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun); 136 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
134 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 137 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
......
...@@ -117,6 +117,9 @@ function GameStartView:onStart() ...@@ -117,6 +117,9 @@ function GameStartView:onStart()
117 if CHANNEL=="shdx" then 117 if CHANNEL=="shdx" then
118 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun); 118 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
119 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 119 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
120 elseif CHANNEL=="cucc" then
121 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
122 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
120 else 123 else
121 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun); 124 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
122 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 125 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
......
...@@ -117,6 +117,9 @@ function GameStartView:onStart() ...@@ -117,6 +117,9 @@ function GameStartView:onStart()
117 if CHANNEL=="shdx" then 117 if CHANNEL=="shdx" then
118 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun); 118 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
119 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 119 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
120 elseif CHANNEL=="cucc" then
121 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
122 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
120 else 123 else
121 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun); 124 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
122 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 125 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
......
...@@ -169,6 +169,9 @@ function GameStartView:onStart() ...@@ -169,6 +169,9 @@ function GameStartView:onStart()
169 if CHANNEL=="shdx" then 169 if CHANNEL=="shdx" then
170 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun); 170 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
171 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 171 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
172 elseif CHANNEL=="cucc" then
173 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
174 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
172 else 175 else
173 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun); 176 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
174 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 177 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
......
...@@ -170,6 +170,9 @@ function GameStartView:onStart() ...@@ -170,6 +170,9 @@ function GameStartView:onStart()
170 if CHANNEL=="shdx" then 170 if CHANNEL=="shdx" then
171 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun); 171 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
172 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 172 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
173 elseif CHANNEL=="cucc" then
174 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
175 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
173 else 176 else
174 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun); 177 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
175 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 178 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
......
...@@ -142,6 +142,9 @@ function GameStartView:onStart() ...@@ -142,6 +142,9 @@ function GameStartView:onStart()
142 if CHANNEL=="shdx" then 142 if CHANNEL=="shdx" then
143 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun); 143 local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
144 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 144 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
145 elseif CHANNEL=="cucc" then
146 local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
147 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
145 else 148 else
146 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun); 149 local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
147 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever); 150 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
......
...@@ -136,7 +136,7 @@ function XyxPayView:onBuyClick(ref,event) ...@@ -136,7 +136,7 @@ function XyxPayView:onBuyClick(ref,event)
136 -- 天津联通支付,支持连续包月 136 -- 天津联通支付,支持连续包月
137 local function authCallbackLua(result) 137 local function authCallbackLua(result)
138 -- if nil~=result then 138 -- if nil~=result then
139 logUI("ActivityVipView:onGetContinueClick------------------>" .. result); 139 --logUI("ActivityVipView:onGetContinueClick------------------>" .. result);
140 ShopModel.pay(result, shopInfo.name, shopInfo.costList[1].num); 140 ShopModel.pay(result, shopInfo.name, shopInfo.costList[1].num);
141 -- end 141 -- end
142 end 142 end
......
...@@ -233,6 +233,7 @@ function DeviceUtil.cycleBilling(params,callbackLua) --调用android的方法 ...@@ -233,6 +233,7 @@ function DeviceUtil.cycleBilling(params,callbackLua) --调用android的方法
233 end 233 end
234 234
235 function DeviceUtil.sendHttpRequest(params,callbackLua) --调用android的方法实现 235 function DeviceUtil.sendHttpRequest(params,callbackLua) --调用android的方法实现
236 --logUI("sendHttpRequest------------------->"..params);
236 local targetPlatform = cc.Application:getInstance():getTargetPlatform() 237 local targetPlatform = cc.Application:getInstance():getTargetPlatform()
237 if targetPlatform == cc.PLATFORM_OS_WINDOWS or targetPlatform == cc.PLATFORM_OS_ANDROID then 238 if targetPlatform == cc.PLATFORM_OS_WINDOWS or targetPlatform == cc.PLATFORM_OS_ANDROID then
238 local luaj = require "cocos.cocos2d.luaj" --引入luaj 239 local luaj = require "cocos.cocos2d.luaj" --引入luaj
...@@ -245,6 +246,7 @@ function DeviceUtil.sendHttpRequest(params,callbackLua) --调用android的方 ...@@ -245,6 +246,7 @@ function DeviceUtil.sendHttpRequest(params,callbackLua) --调用android的方
245 --luaj.callStaticMethod() 会返回两个值 246 --luaj.callStaticMethod() 会返回两个值
246 --当成功时,第一个值为 true,第二个值是 Java 方法的返回值(如果有) 247 --当成功时,第一个值为 true,第二个值是 Java 方法的返回值(如果有)
247 --当失败时,第一个值为 false,第二个值是错误代码 248 --当失败时,第一个值为 false,第二个值是错误代码
249 --logUI("sendHttpRequest callStaticMethod------------------->"..params);
248 local ok,ret = luaj.callStaticMethod(className,"sendHttpRequest",args,sigs) 250 local ok,ret = luaj.callStaticMethod(className,"sendHttpRequest",args,sigs)
249 if not ok then 251 if not ok then
250 print("sendHttpRequest error:"..ret) 252 print("sendHttpRequest error:"..ret)
......
...@@ -47,17 +47,19 @@ local function main() ...@@ -47,17 +47,19 @@ local function main()
47 print("本地配置 平台号PLATFORM:" .. PLATFORM); 47 print("本地配置 平台号PLATFORM:" .. PLATFORM);
48 end 48 end
49 49
50 --[[
51 local targetPlatform = cc.Application:getInstance():getTargetPlatform();
50 if CHANNEL == "shdx" and targetPlatform == cc.PLATFORM_OS_ANDROID then 52 if CHANNEL == "shdx" and targetPlatform == cc.PLATFORM_OS_ANDROID then
51 self:isMember(); 53 self:isMember();
52 end 54 end--]]
53 55
54 cc.Director:getInstance():setAnimationInterval(1 / 30); 56 cc.Director:getInstance():setAnimationInterval(1 / 30);
55 require("app.MyApp"):create():run("LoadingScene"); 57 require("app.MyApp"):create():run("LoadingScene");
56 end 58 end
57 59
58 -- 判断是不是会员 60 -- 判断是不是会员(在UserModel里判断)
59 function isMember() 61 --[[function isMember()
60 local targetPlatform = cc.Application:getInstance():getTargetPlatform(); 62
61 local function callbackLua(params) 63 local function callbackLua(params)
62 logUI("IS MEMEBER---->" .. params); 64 logUI("IS MEMEBER---->" .. params);
63 if params == "success" then 65 if params == "success" then
...@@ -83,7 +85,7 @@ function isMember() ...@@ -83,7 +85,7 @@ function isMember()
83 end 85 end
84 86
85 end 87 end
86 88 --]]
87 function reloadGame() 89 function reloadGame()
88 for k, _ in pairs(package.loaded) do 90 for k, _ in pairs(package.loaded) do
89 local has_k = false; 91 local has_k = false;
......
...@@ -28,16 +28,5 @@ ...@@ -28,16 +28,5 @@
28 <LastRunType Value="Windows" /> 28 <LastRunType Value="Windows" />
29 </Value> 29 </Value>
30 </Item> 30 </Item>
31 <Item Key="TabsParamsKey">
32 <Value ctype="TabsInfo">
33 <OpenedDocuments>
34 <FilePathData Path="ui/dress/BusinessView.csd" />
35 <FilePathData Path="ui/dress/DressLayer.csd" />
36 <FilePathData Path="ui/achievement/AchievementItem.csd" />
37 <FilePathData Path="ui/Activity/tianjin_cucc/ActivityVip.csd" />
38 </OpenedDocuments>
39 <ActiveDocument Path="ui/Activity/tianjin_cucc/ActivityVip.csd" />
40 </Value>
41 </Item>
42 </Properties> 31 </Properties>
43 </UserData> 32 </UserData>
...\ No newline at end of file ...\ No newline at end of file
......