0626

@@ -26,7 +26,7 @@
     <new_guide_step>4</new_guide_step>
     <is_feiyanzoubi_game_guide>1</is_feiyanzoubi_game_guide>
     <feiyanzoubi_best>376</feiyanzoubi_best>
-    <uid>1030100010142923</uid>
+    <uid>1030100010142914</uid>
     <is_bird_game_guide>1</is_bird_game_guide>
     <bird_best>1008</bird_best>
     <is_haidao_game_guide>1</is_haidao_game_guide>

@@ -140,6 +140,7 @@ end
 
 -- 天津联通支付
 function ShopModel.payCucc(productId, productName, productPrice, callBack, timeoutCallBack, gameid)
+    --logUI("ShopModel------------------------------>"..productId);
     local function onGetPayIDSuccessFun(_params)
         local data = json.decode(_params);
         if data.pay_id == "" then
@@ -205,6 +206,8 @@ function ShopModel.payCucc(productId, productName, productPrice, callBack, timeo
     local get_pay_id_url = string.gsub(GAME_LOGIN_URL, "login", "pay_get_id");
     if CHANNEL == "cucc" and cc.Application:getInstance():getTargetPlatform() == cc.PLATFORM_OS_ANDROID then
         local paramsStr = "uid=" .. UserModel.getStringUID() .. "&product=" .. productId .. "&account=" .. UserModel.account .. "&gameid=" .. gameid;
+        --logUI("ShopModel sendHttpRequest------------------------------>");
+        --logUI("ShopModel sendHttpRequest------------------------------>".."POST," .. get_pay_id_url .. "," .. PROXY_HTTP_ADDR .. "," .. paramsStr);
         DeviceUtil.sendHttpRequest("POST," .. get_pay_id_url .. "," .. PROXY_HTTP_ADDR .. "," .. paramsStr, onGetPayIDSuccessFun);
     else
         HttpRequest:getInstance():post(get_pay_id_url, { uid = UserModel.getStringUID(), product = productId, account = UserModel.account, gameid = gameid }, onGetPayIDSuccessFun, onGetPayIDFaildFun);
@@ -275,7 +278,7 @@ end
 -- 上海电信支付
 function ShopModel.payShdx(productId, productName, productPrice, callBack, timeoutCallBack, gameid)
     --logD("支付类型---------------------------->"..MEMBER_TYPE);    
-    local pay_params = "";
+    local pay_params =productId .. "," .. productName .. "," .. productPrice;
     --local payInfo = ShopInfo.getPayInfoByProduct(productId);
 
     local function callbackLua(params)
@@ -303,7 +306,6 @@ function ShopModel.payShdx(productId, productName, productPrice, callBack, timeo
     --if payInfo.id == 301 then
     --    DeviceUtil.cycleBilling(pay_params, payCallbackFromJava);
     --else
-        --logD("ShopModel------------------------------>");
         DeviceUtil.sendBilling(pay_params, payCallbackFromJava);
     --end
 end

@@ -407,7 +407,7 @@ function UserModel.login(host, port, _account, _session)
     SocketClient:getInstance():connect(host, port, UserModel.onConnectSuccess, UserModel.onConnectFaild);
 end
 
--- 连接服务器成功
+-- 连接服务器成功（鉴权并向服务端发送鉴权结果）
 function UserModel.onConnectSuccess(params)
     logUI("on connect success");
     --APK容易崩溃，查找原因中。。。
@@ -415,15 +415,21 @@ function UserModel.onConnectSuccess(params)
     local targetPlatform = cc.Application:getInstance():getTargetPlatform();
     if CHANNEL == "shdx" and targetPlatform == cc.PLATFORM_OS_ANDROID then
         local function callbackLua(params)
+            local arr = StringUtil.split(params,","); 
+            if arr[1] and arr[1] == "success" and arr[2] then    --支付成功
                 logUI("on connect success callbackLua");
+                IS_MEMBER = 1;      --初始化会员全局变量
                 SocketClient:getInstance():send("gateway_msg.login_msg",
                 {
                     platform = PLATFORM,
                     account = account,
                     session = session,
-                shanghai_dianxin_pay_id=tonumber(params),
+                    shanghai_dianxin_pay_id=tonumber(arr[2]),
                 } );
-            logUI("从服务端返回会员类型：" .. params);
+                logUI("从服务端返回会员类型：" .. arr[2]);
+            else 
+                logUI("鉴权失败！");
+            end
         end
         local luaj = require "cocos.cocos2d.luaj"; --引入luaj
         local className = "org/cocos2dx/lua/AppActivity";
@@ -435,7 +441,8 @@ function UserModel.onConnectSuccess(params)
         -- luaj.callStaticMethod() 会返回两个值
         -- 当成功时，第一个值为 true，第二个值是 Java 方法的返回值（如果有）
         -- 当失败时，第一个值为 false，第二个值是错误代码
-        local ok, ret = luaj.callStaticMethod(className, "sendPayInfo", args, sigs);
+        --local ok, ret = luaj.callStaticMethod(className, "sendPayInfo", args, sigs);
+        local ok, ret = luaj.callStaticMethod(className, "authPermission", args, sigs);
         if not ok then
             print("sendPayInfo error:" .. ret);
         end

@@ -169,6 +169,9 @@ function GameStartView:onStart()
                 if CHANNEL=="shdx" then
                     local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
                     cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
+                elseif CHANNEL=="cucc" then
+                    local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
+                    cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
                 else
                     local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
                     cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);

@@ -123,6 +123,9 @@ function GameStartView:onStart()
                 if CHANNEL=="shdx" then
                     local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
                     cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
+                elseif CHANNEL=="cucc" then
+                    local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
+                    cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
                 else
                     local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
                     cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);

@@ -123,6 +123,9 @@ function GameStartView:onStart()
                 if CHANNEL=="shdx" then
                     local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
                     cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
+                elseif CHANNEL=="cucc" then
+                    local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
+                    cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
                 else
                     local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
                     cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);

@@ -159,6 +159,9 @@ function GameStartView:onStart()
                 if CHANNEL=="shdx" then
                     local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
                     cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
+                elseif CHANNEL=="cucc" then
+                    local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
+                    cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
                 else
                     local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
                     cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);

@@ -129,6 +129,9 @@ function GameStartView:onStart()
                 if CHANNEL=="shdx" then
                     local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
                     cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
+                elseif CHANNEL=="cucc" then
+                    local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
+                    cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
                 else
                     local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
                     cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);

@@ -117,6 +117,9 @@ function GameStartView:onStart()
                 if CHANNEL=="shdx" then
                     local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
                     cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
+                elseif CHANNEL=="cucc" then
+                    local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
+                    cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
                 else
                     local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
                     cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);

@@ -117,6 +117,9 @@ function GameStartView:onStart()
                 if CHANNEL=="shdx" then
                     local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
                     cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
+                elseif CHANNEL=="cucc" then
+                    local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
+                    cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
                 else
                     local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
                     cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);

@@ -169,6 +169,9 @@ function GameStartView:onStart()
                 if CHANNEL=="shdx" then
                     local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
                     cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
+                elseif CHANNEL=="cucc" then
+                    local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
+                    cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
                 else
                     local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
                     cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);

@@ -170,6 +170,9 @@ function GameStartView:onStart()
                 if CHANNEL=="shdx" then
                     local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
                     cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
+                elseif CHANNEL=="cucc" then
+                    local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
+                    cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
                 else
                     local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
                     cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);

@@ -142,6 +142,9 @@ function GameStartView:onStart()
                 if CHANNEL=="shdx" then
                     local reciever = require("app.views.view.XyxPayView_shdx"):show(game_info.id,paySuccessFun);
                     cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
+                elseif CHANNEL=="cucc" then
+                    local reciever = require("app.views.view.XyxPayView_tianjin_cucc"):show(game_info.id,paySuccessFun);
+                    cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);
                 else
                     local reciever = require("app.views.view.XyxPayView"):show(game_info.id,paySuccessFun);
                     cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(reciever);

@@ -136,7 +136,7 @@ function XyxPayView:onBuyClick(ref,event)
     -- 天津联通支付，支持连续包月
     local function authCallbackLua(result)
         -- if nil~=result then
-        logUI("ActivityVipView:onGetContinueClick------------------>" .. result);
+        --logUI("ActivityVipView:onGetContinueClick------------------>" .. result);
         ShopModel.pay(result, shopInfo.name, shopInfo.costList[1].num);
         -- end
     end

@@ -233,6 +233,7 @@ function DeviceUtil.cycleBilling(params,callbackLua)  --调用android的方法
 end
 
 function DeviceUtil.sendHttpRequest(params,callbackLua)  --调用android的方法实现
+    --logUI("sendHttpRequest------------------->"..params);
     local targetPlatform = cc.Application:getInstance():getTargetPlatform()
     if targetPlatform == cc.PLATFORM_OS_WINDOWS or targetPlatform == cc.PLATFORM_OS_ANDROID then
         local luaj = require "cocos.cocos2d.luaj" --引入luaj
@@ -245,6 +246,7 @@ function DeviceUtil.sendHttpRequest(params,callbackLua)  --调用android的方
         --luaj.callStaticMethod() 会返回两个值
         --当成功时，第一个值为 true，第二个值是 Java 方法的返回值（如果有）
         --当失败时，第一个值为 false，第二个值是错误代码
+        --logUI("sendHttpRequest callStaticMethod------------------->"..params);
         local ok,ret = luaj.callStaticMethod(className,"sendHttpRequest",args,sigs)
         if not ok then
             print("sendHttpRequest error:"..ret)

@@ -47,17 +47,19 @@ local function main()
         print("本地配置 平台号PLATFORM:" .. PLATFORM);
     end
 
+    --[[
+    local targetPlatform = cc.Application:getInstance():getTargetPlatform();
     if CHANNEL == "shdx" and targetPlatform == cc.PLATFORM_OS_ANDROID then
         self:isMember();
-    end
+    end--]]
 
     cc.Director:getInstance():setAnimationInterval(1 / 30);
     require("app.MyApp"):create():run("LoadingScene");
 end
 
--- 判断是不是会员
-function isMember()
-    local targetPlatform = cc.Application:getInstance():getTargetPlatform();
+-- 判断是不是会员(在UserModel里判断)
+--[[function isMember()
+    
     local function callbackLua(params)
         logUI("IS MEMEBER---->" .. params);
         if params == "success" then
@@ -83,7 +85,7 @@ function isMember()
     end
 
 end
-
+--]]
 function reloadGame()
     for k, _ in pairs(package.loaded) do
         local has_k = false;

@@ -28,16 +28,5 @@
         <LastRunType Value="Windows" />
       </Value>
     </Item>
-    <Item Key="TabsParamsKey">
-      <Value ctype="TabsInfo">
-        <OpenedDocuments>
-          <FilePathData Path="ui/dress/BusinessView.csd" />
-          <FilePathData Path="ui/dress/DressLayer.csd" />
-          <FilePathData Path="ui/achievement/AchievementItem.csd" />
-          <FilePathData Path="ui/Activity/tianjin_cucc/ActivityVip.csd" />
-        </OpenedDocuments>
-        <ActiveDocument Path="ui/Activity/tianjin_cucc/ActivityVip.csd" />
-      </Value>
-    </Item>
   </Properties>
 </UserData>
\ No newline at end of file