Merge pull request chukong#311 from htlxyz/feature/integration_umeng_…

…push modifyr depreation function
skyblue · May 14, 2014 · f16a6e4 · f16a6e4
2 parents c256821 + 66ef593
commit f16a6e4
Show file tree

Hide file tree

Showing 18 changed files with 12 additions and 162 deletions.
diff --git a/samples/2048/scripts/update.lua b/samples/2048/scripts/update.lua
@@ -220,21 +220,6 @@ function UpdateScene:onEnter()
 	self:requestFromServer(self.requesting)
 
     self:addNodeEventListener(cc.NODE_ENTER_FRAME_EVENT, function(dt) self:onEnterFrame(dt) end)
-
-    print("device.platform", device.platform)
-    if device.platform ~= "android" then return end
-
-    -- avoid unmeant back
-    self:performWithDelay(function()
-        -- keypad layer, for android
-        local layer = display.newLayer()
-        layer:addKeypadEventListener(function(event)
-            if event == "back" then game.exit() end
-        end)
-        self:addChild(layer)
-
-        layer:setKeypadEnabled(true)
-    end, 0.5)
 end
 
 function UpdateScene:onExit()

diff --git a/samples/chukong_ad/scripts/app/scenes/MainScene.lua b/samples/chukong_ad/scripts/app/scenes/MainScene.lua
@@ -118,19 +118,6 @@ function MainScene:initNoAd()
 end
 
 function MainScene:onEnter()
-    if device.platform == "android" then
-        -- avoid unmeant back
-        self:performWithDelay(function()
-            -- keypad layer, for android
-            local layer = display.newLayer()
-            layer:addKeypadEventListener(function(event)
-                if event == "back" then app.exit() end
-            end)
-            self:addChild(layer)
-
-            layer:setKeypadEnabled(true)
-        end, 0.5)
-    end
 end
 
 function MainScene:onExit()

diff --git a/samples/cocopush/scripts/app/scenes/MainScene.lua b/samples/cocopush/scripts/app/scenes/MainScene.lua
@@ -155,19 +155,6 @@ function MainScene:noPushView()
 end
 
 function MainScene:onEnter()
-    if device.platform == "android" then
-        -- avoid unmeant back
-        self:performWithDelay(function()
-            -- keypad layer, for android
-            local layer = display.newLayer()
-            layer:addKeypadEventListener(function(event)
-                if event == "back" then app.exit() end
-            end)
-            self:addChild(layer)
-
-            layer:setKeypadEnabled(true)
-        end, 0.5)
-    end
 end
 
 function MainScene:onExit()

diff --git a/samples/coinflip/scripts/app/scenes/MenuScene.lua b/samples/coinflip/scripts/app/scenes/MenuScene.lua
@@ -21,7 +21,6 @@ function MenuScene:ctor()
         sound = GAME_SFX.tapButton,
         prepare = function()
             self.menu:setEnabled(false)
-            self.layer:setKeypadEnabled(false)
         end,
         listener = function()
             app:enterMoreGamesScene()
@@ -35,7 +34,6 @@ function MenuScene:ctor()
         sound = GAME_SFX.tapButton,
         prepare = function()
             self.menu:setEnabled(false)
-            self.layer:setKeypadEnabled(false)
         end,
         listener = function()
             app:enterChooseLevelScene()
@@ -44,23 +42,9 @@ function MenuScene:ctor()
 
     self.menu = ui.newMenu({self.moreGamesButton, self.startButton})
     self:addChild(self.menu)
-
-    -- keypad layer, for android
-    self.layer = display.newLayer()
-    self.layer:addKeypadEventListener(function(event)
-        if event == "back" then
-            audio.playSound(GAME_SFX.backButton)
-            app:exit()
-        end
-    end)
-    self:addChild(self.layer)
 end
 
 function MenuScene:onEnter()
-    -- avoid unmeant back
-    self:performWithDelay(function()
-        self.layer:setKeypadEnabled(true)
-    end, 0.5)
 end
 
 return MenuScene
diff --git a/samples/coinflip/scripts/app/scenes/PlayLevelScene.lua b/samples/coinflip/scripts/app/scenes/PlayLevelScene.lua
@@ -50,7 +50,7 @@ function PlayLevelScene:ctor(levelIndex)
 end
 
 function PlayLevelScene:onLevelCompleted()
-    audio.playEffect(GAME_SFX.levelCompleted)
+    audio.playSound(GAME_SFX.levelCompleted)
 
     local dialog = display.newSprite("#LevelCompletedDialogBg.png")
     dialog:setPosition(display.cx, display.top + dialog:getContentSize().height / 2 + 40)

diff --git a/samples/coinflip/scripts/app/ui/ScrollView.lua b/samples/coinflip/scripts/app/ui/ScrollView.lua
@@ -3,7 +3,7 @@ local ScrollView = class("ScrollView", function(rect)
     if not rect then rect = CCRect(0, 0, 0, 0) end
     local node = display.newClippingRegionNode(rect)
     node:setNodeEventEnabled(true)
-    require("framework.api.EventProtocol").extend(node)
+    cc(node):addComponent("components.behavior.EventProtocol"):exportMethods()
     return node
 end)
 
@@ -26,10 +26,10 @@ function ScrollView:ctor(rect, direction)
     self.cells = {}
     self.currentIndex = 0
 
-    self:registerScriptHandler(function(event)
-        if event == "enter" then
+    self:addNodeEventListener(cc.NODE_EVENT, function(event)
+        if event.name == "enter" then
             self:onEnter()
-        elseif event == "exit" then
+        elseif event.name == "exit" then
             self:onExit()
         end
     end)

diff --git a/samples/coinflip/scripts/app/ui/ScrollViewCell.lua b/samples/coinflip/scripts/app/ui/ScrollViewCell.lua
@@ -3,7 +3,7 @@ local ScrollViewCell = class("ScrollViewCell", function(contentSize)
     local node = display.newNode()
     if contentSize then node:setContentSize(contentSize) end
     node:setNodeEventEnabled(true)
-    require("framework.api.EventProtocol").extend(node)
+    cc(node):addComponent("components.behavior.EventProtocol"):exportMethods()
     return node
 end)
 

diff --git a/samples/coinflip/scripts/app/views/Board.lua b/samples/coinflip/scripts/app/views/Board.lua
@@ -47,7 +47,7 @@ function Board:ctor(levelData)
         end
     end
 
-    self:addNodeEventListener(c.NODE_TOUCH_EVENT, function(event)
+    self:addNodeEventListener(cc.NODE_TOUCH_EVENT, function(event)
         return self:onTouch(event.name, event.x, event.y)
     end)
     self:setNodeEventEnabled(true)
@@ -83,7 +83,7 @@ function Board:flipCoin(coin, includeNeighbour)
         end
     end)
     if includeNeighbour then
-        audio.playEffect(GAME_SFX.flipCoin)
+        audio.playSound(GAME_SFX.flipCoin)
         self.batch:reorderChild(coin, COIN_ZORDER + 1)
         self:performWithDelay(function()
             self:flipCoin(self:getCoin(coin.row - 1, coin.col))

diff --git a/samples/editbox/scripts/scenes/MainScene.lua b/samples/editbox/scripts/scenes/MainScene.lua
@@ -85,19 +85,7 @@ function MainScene:onEditBoxChanged(editbox)
 end
 
 function MainScene:onEnter()
-    if device.platform ~= "android" then return end
-
-    -- avoid unmeant back
-    self:performWithDelay(function()
-        -- keypad layer, for android
-        local layer = display.newLayer()
-        layer:addKeypadEventListener(function(event)
-            if event == "back" then game.exit() end
-        end)
-        self:addChild(layer)
-
-        layer:setKeypadEnabled(true)
-    end, 0.5)
+
 end
 
 return MainScene
diff --git a/samples/iap4ios/scripts/services/Store.lua b/samples/iap4ios/scripts/services/Store.lua
@@ -8,7 +8,7 @@ Store.TRANSACTION_FAILED        = "TRANSACTION_FAILED"
 Store.TRANSACTION_UNKNOWN_ERROR = "TRANSACTION_UNKNOWN_ERROR"
 
 function Store:ctor()
-    require("framework.api.EventProtocol").extend(self)
+    cc(self):addComponent("components.behavior.EventProtocol"):exportMethods()
 
     self.provider = require("framework.api.Store")
     self.provider.init(handler(self, self.transactionCallback))

diff --git a/samples/luajavabridge/scripts/scenes/MainScene.lua b/samples/luajavabridge/scripts/scenes/MainScene.lua
@@ -29,19 +29,6 @@ function MainScene:ctor()
 end
 
 function MainScene:onEnter()
-    if device.platform ~= "android" then return end
-
-    -- avoid unmeant back
-    self:performWithDelay(function()
-        -- keypad layer, for android
-        local layer = display.newLayer()
-        layer:addKeypadEventListener(function(event)
-            if event == "back" then game.exit() end
-        end)
-        self:addChild(layer)
-
-        layer:setKeypadEnabled(true)
-    end, 0.5)
 end
 
 return MainScene
diff --git a/samples/mvc/scripts/app/models/Actor.lua b/samples/mvc/scripts/app/models/Actor.lua
@@ -59,7 +59,7 @@ function Actor:ctor(properties, events, callbacks)
         {name = "relive", from = "dead",    to = "idle"},
     }
     -- 如果继承类提供了其他事件，则合并
-    table.insertTo(defaultEvents, checktable(events))
+    table.insertto(defaultEvents, checktable(events))
 
     -- 设定状态机的默认回调
     local defaultCallbacks = {

diff --git a/samples/mvc/scripts/app/scenes/MainScene.lua b/samples/mvc/scripts/app/scenes/MainScene.lua
@@ -28,19 +28,6 @@ function MainScene:ctor()
 end
 
 function MainScene:onEnter()
-    if device.platform == "android" then
-        -- avoid unmeant back
-        self:performWithDelay(function()
-            -- keypad layer, for android
-            local layer = display.newLayer()
-            layer:addKeypadEventListener(function(event)
-                if event == "back" then app.exit() end
-            end)
-            self:addChild(layer)
-
-            layer:setKeypadEnabled(true)
-        end, 0.5)
-    end
 end
 
 function MainScene:onExit()

diff --git a/samples/tests/scripts/scenes/MainScene.lua b/samples/tests/scripts/scenes/MainScene.lua
@@ -19,19 +19,6 @@ function MainScene:openTest(name)
 end
 
 function MainScene:onEnter()
-    if device.platform ~= "android" then return end
-
-    -- avoid unmeant back
-    self:performWithDelay(function()
-        -- keypad layer, for android
-        local layer = display.newLayer()
-        layer:addKeypadEventListener(function(event)
-            if event == "back" then game.exit() end
-        end)
-        self:addChild(layer)
-
-        layer:setKeypadEnabled(true)
-    end, 0.5)
 end
 
 return MainScene
diff --git a/samples/umeng_analytics/scripts/app/scenes/MainScene.lua b/samples/umeng_analytics/scripts/app/scenes/MainScene.lua
@@ -159,20 +159,6 @@ function MainScene:onEnter()
                     args = {sceneName = "MainScene"}}
         -- MobClickCppForLua:beginScene("MainScene");
     end
-
-    if device.platform == "android" then
-        -- avoid unmeant back
-        self:performWithDelay(function()
-            -- keypad layer, for android
-            local layer = display.newLayer()
-            layer:addKeypadEventListener(function(event)
-                if event == "back" then app.exit() end
-            end)
-            self:addChild(layer)
-
-            layer:setKeypadEnabled(true)
-        end, 0.5)
-    end
 end
 
 function MainScene:onExit()

diff --git a/samples/umeng_push/scripts/app/scenes/MainScene.lua b/samples/umeng_push/scripts/app/scenes/MainScene.lua
@@ -182,21 +182,6 @@ function MainScene:noPushView()
 end
 
 function MainScene:onEnter()
-    print("htl, MainScene entry")
-
-    if device.platform == "android" then
-        -- avoid unmeant back
-        self:performWithDelay(function()
-            -- keypad layer, for android
-            local layer = display.newLayer()
-            layer:addKeypadEventListener(function(event)
-                if event == "back" then app.exit() end
-            end)
-            self:addChild(layer)
-
-            layer:setKeypadEnabled(true)
-        end, 0.5)
-    end
 end
 
 function MainScene:onExit()

diff --git a/samples/umeng_share/scripts/app/scenes/MainScene.lua b/samples/umeng_share/scripts/app/scenes/MainScene.lua
@@ -48,19 +48,6 @@ function MainScene:showNotSupport()
 end
 
 function MainScene:onEnter()
-    if device.platform == "android" then
-        -- avoid unmeant back
-        self:performWithDelay(function()
-            -- keypad layer, for android
-            local layer = display.newLayer()
-            layer:addKeypadEventListener(function(event)
-                if event == "back" then app.exit() end
-            end)
-            self:addChild(layer)
-
-            layer:setKeypadEnabled(true)
-        end, 0.5)
-    end
 end
 
 function MainScene:onExit()

diff --git a/samples/websockets/scripts/WebSockets.lua b/samples/websockets/scripts/WebSockets.lua
@@ -11,7 +11,7 @@ WebSockets.CLOSE_EVENT   = "close"
 WebSockets.ERROR_EVENT   = "error"
 
 function WebSockets:ctor(url)
-    require("framework.api.EventProtocol").extend(self)
+    cc(self):addComponent("components.behavior.EventProtocol"):exportMethods()
     self.socket = WebSocket:create(url)
 
     if self.socket then