Просмотр исходного кода

充值,view null bug修改、webview 被销毁 null修改

liujiangyao лет назад: 7
Родитель
Сommit
b88cb1647a

+ 3 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/ActWeb.java

@@ -523,7 +523,9 @@ public class ActWeb extends BaseActivity {
         runOnUiThread(new Runnable() {
         runOnUiThread(new Runnable() {
             @Override
             @Override
             public void run() {
             public void run() {
-                mWebView.loadUrl(url);
+                if (mWebView != null && !TextUtils.isEmpty(url)) {
+                    mWebView.loadUrl(url);
+                }
             }
             }
         });
         });
     }
     }

+ 0 - 14
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtMyGame.java

@@ -2,10 +2,7 @@ package com.sheep.gamegroup.view.fragment;
 
 
 import android.app.Activity;
 import android.app.Activity;
 import android.os.Bundle;
 import android.os.Bundle;
-import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup;
@@ -26,7 +23,6 @@ import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp;
 import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp;
-import com.sheep.gamegroup.view.customview.SheepmSwipeRefreshLayout;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
@@ -39,8 +35,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Locale;
 
 
 import butterknife.BindView;
 import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.Unbinder;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 import rx.schedulers.Schedulers;
 
 
@@ -58,7 +52,6 @@ public class FgtMyGame extends BaseFragment {
     XRecyclerView recyclerview;
     XRecyclerView recyclerview;
     @BindView(R.id.empty_view)
     @BindView(R.id.empty_view)
     View empty_view;
     View empty_view;
-    Unbinder unbinder;
     private Activity activity;
     private Activity activity;
     private TryMakeMoneyAdp tryMakeMoneyAdp;
     private TryMakeMoneyAdp tryMakeMoneyAdp;
     private int page = 1;//页数
     private int page = 1;//页数
@@ -185,7 +178,6 @@ public class FgtMyGame extends BaseFragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         // TODO: inflate a fragment view
         // TODO: inflate a fragment view
         View rootView = super.onCreateView(inflater, container, savedInstanceState);
         View rootView = super.onCreateView(inflater, container, savedInstanceState);
-        unbinder = ButterKnife.bind(this, rootView);
         Bundle bundle = getArguments();
         Bundle bundle = getArguments();
         if(bundle != null){
         if(bundle != null){
             type = bundle.getInt("type", 0);
             type = bundle.getInt("type", 0);
@@ -193,12 +185,6 @@ public class FgtMyGame extends BaseFragment {
         return rootView;
         return rootView;
     }
     }
 
 
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-    }
-
     private int onResumeCount = 0;
     private int onResumeCount = 0;
     @Override
     @Override
     public void onResume() {
     public void onResume() {

+ 10 - 0
app/src/main/java/com/sheep/jiuyan/samllsheep/base/BaseFragment.java

@@ -10,6 +10,9 @@ import android.view.ViewGroup;
 
 
 import com.sheep.gamegroup.view.dialog.DialogLoading;
 import com.sheep.gamegroup.view.dialog.DialogLoading;
 
 
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+
 /**
 /**
  * @ Created by Dlg
  * @ Created by Dlg
  * @ <p>TiTle:  BaseFragment</p>
  * @ <p>TiTle:  BaseFragment</p>
@@ -27,6 +30,7 @@ public abstract class BaseFragment extends Fragment {
     protected boolean mIsFirstInit = true;
     protected boolean mIsFirstInit = true;
 
 
     protected DialogLoading dialogLoading;
     protected DialogLoading dialogLoading;
+    protected Unbinder unbinder;
 
 
 
 
 
 
@@ -84,6 +88,7 @@ public abstract class BaseFragment extends Fragment {
         } else {
         } else {
             mIsFirstInit = false;
             mIsFirstInit = false;
         }
         }
+        unbinder = ButterKnife.bind(this, mView);
         return mView;
         return mView;
     }
     }
 
 
@@ -126,4 +131,9 @@ public abstract class BaseFragment extends Fragment {
         return (T)mView.findViewById(id);
         return (T)mView.findViewById(id);
     }
     }
 
 
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        unbinder.unbind();
+    }
 }
 }

+ 4 - 29
app/src/main/res/layout/fgt_try_makemoney_layout.xml

@@ -12,35 +12,10 @@
         android:layout_width="match_parent"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
         android:layout_height="match_parent" />
 
 
-    <!--<com.jcodecraeer.xrecyclerview.XRecyclerView-->
-        <!--android:id="@+id/recyclerview"-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="match_parent"-->
-        <!--android:descendantFocusability="blocksDescendants" />-->
-
-    <com.scwang.smartrefresh.layout.SmartRefreshLayout
-        android:id="@+id/refreshLayout"
+    <com.jcodecraeer.xrecyclerview.XRecyclerView
+        android:id="@+id/recyclerview"
         android:layout_width="match_parent"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <android.support.v7.widget.RecyclerView
-                android:id="@+id/recyclerview"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:background="#fff"
-                android:overScrollMode="never" />
-
-            <include layout="@layout/find_item_bottom"
-                android:layout_below="@+id/refreshLayout"
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"/>
-
-        </LinearLayout>
+        android:layout_height="match_parent"
+        android:descendantFocusability="blocksDescendants" />
 
 
-    </com.scwang.smartrefresh.layout.SmartRefreshLayout>
 </RelativeLayout>
 </RelativeLayout>

+ 1 - 1
app/src/main/res/layout/find_item_bottom.xml

@@ -6,7 +6,7 @@
     android:gravity="center"
     android:gravity="center"
     android:padding="@dimen/content_padding_20"
     android:padding="@dimen/content_padding_20"
     android:orientation="horizontal"
     android:orientation="horizontal"
-    android:visibility="gone">
+    android:visibility="visible">
 
 
     <ImageView
     <ImageView
         android:layout_width="30dp"
         android:layout_width="30dp"