Merge branch 'master' into plugin

bmfe · May 31, 2018 · 2ba60d3 · 2ba60d3
2 parents 5f98bea + 62534a5
commit 2ba60d3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/eros-framework/src/main/java/com/benmu/framework/activity/MainActivity.java b/eros-framework/src/main/java/com/benmu/framework/activity/MainActivity.java
@@ -17,7 +17,7 @@
 
 public class MainActivity extends AbstractWeexActivity {
     private FrameLayout layout_container;
-    private ViewStub vs_tabView;
+    private ViewStub viewStub_tabView;
     private TableView tableView;
 
     @Override
@@ -39,8 +39,8 @@ private void initView() {
     }
 
     private void initTabView() {
-        vs_tabView = (ViewStub) findViewById(R.id.vs_tabView);
-        vs_tabView.inflate();
+        viewStub_tabView = (ViewStub) findViewById(R.id.vs_tabView);
+        viewStub_tabView.inflate();
         tableView = (TableView) findViewById(R.id.tabView);
         tableView.setData(BMWXEnvironment.mPlatformConfig.getTabBar());
 

diff --git a/eros-framework/src/main/java/com/benmu/framework/fragment/AbstractWeexFragment.java b/eros-framework/src/main/java/com/benmu/framework/fragment/AbstractWeexFragment.java
@@ -49,7 +49,6 @@ public class AbstractWeexFragment extends Fragment implements IWXRenderListener
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
-        Log.e(TAG, " isVisibleToUser ->  onCreate");
         super.onCreate(savedInstanceState);
         mAct = getActivity();
         mRouterType = GlobalEventManager.TYPE_OPEN;
@@ -60,15 +59,13 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        Log.e(TAG, " isVisibleToUser ->  onCreateView");
         return super.onCreateView(inflater, container, savedInstanceState);
 
     }
 
     @Override
     public void onResume() {
         super.onResume();
-        Log.e(TAG, " isVisibleToUser ->  onResume");
         if (mWXInstance != null) {
             GlobalEventManager.onViewDidAppear(mWXInstance, mRouterType);
         }
@@ -77,7 +74,6 @@ public void onResume() {
     @Override
     public void onStart() {
         super.onStart();
-        Log.e(TAG, " isVisibleToUser ->  onStart");
         if (mWXInstance != null) {
             GlobalEventManager.onViewWillAppear(mWXInstance, mRouterType);
         }
@@ -86,7 +82,6 @@ public void onStart() {
     @Override
     public void onPause() {
         super.onPause();
-        Log.e(TAG, " isVisibleToUser ->  onPause");
         if (mWXInstance != null) {
             GlobalEventManager.onViewWillDisappear(mWXInstance, mRouterType);
         }
@@ -95,7 +90,6 @@ public void onPause() {
     @Override
     public void onStop() {
         super.onStop();
-        Log.e(TAG, " isVisibleToUser ->  onStop");
         if (mWXInstance != null) {
             GlobalEventManager.onViewDidDisappear(mWXInstance, mRouterType);
         }