Merge branch 'tb-dev' of github.com:sospartan/weex into tb-dev

alibaba · Oct 11, 2016 · 0e30cf9 · 0e30cf9
2 parents 2000e53 + a65caca
commit 0e30cf9
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/...m/taobao/weex/common/AppCompatModule.java → ...om/taobao/weex/common/WXCompatModule.java b/...m/taobao/weex/common/AppCompatModule.java → ...om/taobao/weex/common/WXCompatModule.java
@@ -217,11 +217,11 @@
  * Created by lixinke on 16/10/10.
  */
 
-public abstract class AppCompatModule extends WXModule implements Destroyable {
+public abstract class WXCompatModule extends WXModule implements Destroyable {
 
   private ModuleReceive mModuleReceive;
 
-  public AppCompatModule() {
+  public WXCompatModule() {
     mModuleReceive = new ModuleReceive(this);
     LocalBroadcastManager.getInstance(WXEnvironment.getApplication())
         .registerReceiver(mModuleReceive, new IntentFilter(WXModule.ACTION_ACTIVITY_RESULT));
@@ -243,10 +243,10 @@ public void destroy() {
 
   static class ModuleReceive extends BroadcastReceiver {
 
-    private AppCompatModule mAppCompatModule;
+    private WXCompatModule mWXCompatModule;
 
-    ModuleReceive(AppCompatModule module) {
-      mAppCompatModule = module;
+    ModuleReceive(WXCompatModule module) {
+      mWXCompatModule = module;
     }
 
     @Override
@@ -256,13 +256,13 @@ public void onReceive(Context context, Intent intent) {
         case WXModule.ACTION_ACTIVITY_RESULT:
           int requestCode = intent.getIntExtra(WXModule.REQUEST_CODE, -1);
           int resultCode = intent.getIntExtra(WXModule.RESULT_CODE, Activity.RESULT_OK);
-          mAppCompatModule.onActivityResult(requestCode, resultCode, intent);
+          mWXCompatModule.onActivityResult(requestCode, resultCode, intent);
           break;
         case WXModule.ACTION_REQUEST_PERMISSIONS_RESULT:
           requestCode = intent.getIntExtra(WXModule.REQUEST_CODE, -1);
           String[] permissions = intent.getStringArrayExtra(WXModule.PERMISSIONS);
           int[] grantResults = intent.getIntArrayExtra(WXModule.GRANT_RESULTS);
-          mAppCompatModule.onRequestPermissionsResult(requestCode, permissions, grantResults);
+          mWXCompatModule.onRequestPermissionsResult(requestCode, permissions, grantResults);
           break;
       }
     }