Merge branch 'feature/dev_5.25.0/taohome' into dev_5.25.0

野松 · 野松 · commit f05eb6138322 · 2017-06-22T20:48:32.000+08:00
diff --git a/Android/LuaViewSDK/src/com/taobao/luaview/scriptbundle/asynctask/ScriptBundleUltimateLoadTask.java b/Android/LuaViewSDK/src/com/taobao/luaview/scriptbundle/asynctask/ScriptBundleUltimateLoadTask.java
@@ -230,8 +230,8 @@ protected void onPostExecute(ScriptBundle unzippedScripts) {
      * @param args
      */
     private void callLoaderCallbackOnEvent(LuaScriptLoader.LuaScriptLoadEvent event, Object args){
-        if(mScriptLoaderCallback instanceof LuaScriptLoader.ScriptExecuteCallback2){
-            ((LuaScriptLoader.ScriptExecuteCallback2) mScriptLoaderCallback).onEvent(event, args);
+        if(mScriptLoaderCallback instanceof LuaScriptLoader.ScriptLoaderCallback2){
+            ((LuaScriptLoader.ScriptLoaderCallback2) mScriptLoaderCallback).onEvent(event, args);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -230,8 +230,8 @@ protected void onPostExecute(ScriptBundle unzippedScripts) {`
`230`	`230`	`* @param args`
`231`	`231`	`*/`
`232`	`232`	`private void callLoaderCallbackOnEvent(LuaScriptLoader.LuaScriptLoadEvent event, Object args){`
`233`		`- if(mScriptLoaderCallback instanceof LuaScriptLoader.ScriptExecuteCallback2){`
`234`		`- ((LuaScriptLoader.ScriptExecuteCallback2) mScriptLoaderCallback).onEvent(event, args);`
	`233`	`+ if(mScriptLoaderCallback instanceof LuaScriptLoader.ScriptLoaderCallback2){`
	`234`	`+ ((LuaScriptLoader.ScriptLoaderCallback2) mScriptLoaderCallback).onEvent(event, args);`
`235`	`235`	`}`
`236`	`236`	`}`
`237`	`237`