Explorar el Código

尝试修复各种可能的空指针;
butterknife统一优化

zengjiebin hace 7 años
padre
commit
540d5ad9ac
Se han modificado 37 ficheros con 136 adiciones y 589 borrados
  1. 1 1
      app/build.gradle
  2. BIN
      app/libs/PhotoPicker-release-201809201501.aar
  3. 0 3
      app/src/main/AndroidManifest.xml
  4. 0 11
      app/src/main/java/com/sheep/gamegroup/absBase/BaseActivity.java
  5. 1 1
      app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java
  6. 6 0
      app/src/main/java/com/sheep/gamegroup/util/GlideImageLoader.java
  7. 29 18
      app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java
  8. 2 11
      app/src/main/java/com/sheep/gamegroup/view/activity/ActGameAgencyRecharge.java
  9. 0 3
      app/src/main/java/com/sheep/gamegroup/view/activity/ActGuideDeblocked.java
  10. 0 4
      app/src/main/java/com/sheep/gamegroup/view/activity/ActGuideOnHook.java
  11. 6 0
      app/src/main/java/com/sheep/gamegroup/view/activity/ActInvitation.java
  12. 10 9
      app/src/main/java/com/sheep/gamegroup/view/activity/ActMain.java
  13. 4 7
      app/src/main/java/com/sheep/gamegroup/view/activity/ActMiDong.java
  14. 6 3
      app/src/main/java/com/sheep/gamegroup/view/activity/ActModifyThird.java
  15. 3 2
      app/src/main/java/com/sheep/gamegroup/view/activity/ActPlayGameDetail.java
  16. 5 1
      app/src/main/java/com/sheep/gamegroup/view/activity/ActSignCard.java
  17. 4 6
      app/src/main/java/com/sheep/gamegroup/view/activity/ActWeb.java
  18. 3 0
      app/src/main/java/com/sheep/gamegroup/view/activity/ActXinwanWeb.java
  19. 0 3
      app/src/main/java/com/sheep/gamegroup/view/activity/BaseListActivity.java
  20. 0 8
      app/src/main/java/com/sheep/gamegroup/view/activity/GameCertificationActivity.java
  21. 0 7
      app/src/main/java/com/sheep/gamegroup/view/activity/GamemakeMoneyAct.java
  22. 0 398
      app/src/main/java/com/sheep/gamegroup/view/activity/InvitationActivity.java
  23. 0 8
      app/src/main/java/com/sheep/gamegroup/view/activity/LoginAct.java
  24. 8 10
      app/src/main/java/com/sheep/gamegroup/view/activity/MessageInteractionDetailActivity.java
  25. 0 3
      app/src/main/java/com/sheep/gamegroup/view/activity/PersonalInfoAct.java
  26. 1 12
      app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java
  27. 0 7
      app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAddQQAct.java
  28. 0 9
      app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailCreditCardAct.java
  29. 1 10
      app/src/main/java/com/sheep/gamegroup/view/activity/TryMakeMoneyact.java
  30. 3 0
      app/src/main/java/com/sheep/gamegroup/view/fragment/AbsFgtMyMoney.java
  31. 3 6
      app/src/main/java/com/sheep/gamegroup/view/fragment/BaseListFragment2.java
  32. 9 2
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtAskGetMoneyRank.java
  33. 3 0
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtAudit.java
  34. 5 1
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtSmallSheep.java
  35. 3 16
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtTryMakeMoney.java
  36. 11 9
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtWatchFocus.java
  37. 9 0
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtWelfareCenter.java

+ 1 - 1
app/build.gradle

@@ -245,7 +245,7 @@ dependencies {
     compile 'com.github.ithedan:TextViewDrawable:v1.0'
 //    compile 'com.github.zhangkexpz:LayoutScroll:v1.0'
 //    compile 'me.iwf.photopicker:PhotoPicker:0.9.12@aar'
-    compile(name: 'PhotoPicker-release-201809201501', ext: 'aar')
+    compile(name: 'PhotoPicker-release-201810081154', ext: 'aar')
     compile 'com.github.bumptech.glide:glide:4.1.1'
 
     //    compile 'com.github.yalantis:ucrop:2.2.1-native'

BIN
app/libs/PhotoPicker-release-201809201501.aar


+ 0 - 3
app/src/main/AndroidManifest.xml

@@ -663,9 +663,6 @@
             android:name="com.sheep.gamegroup.view.activity.ActSysNfDetail"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.sheep.gamegroup.view.activity.InvitationActivity"
-            android:screenOrientation="portrait" />
-        <activity
             android:name="com.sheep.gamegroup.view.activity.ActInvitation"
             android:screenOrientation="portrait" />
 

+ 0 - 11
app/src/main/java/com/sheep/gamegroup/absBase/BaseActivity.java

@@ -34,17 +34,6 @@ public abstract class BaseActivity extends AppCompatActivity {
         initListener();
         initData();
     }
-    public void reBindView(){
-        if(unbinder != null){
-            try {
-                unbinder.unbind();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-            unbinder = null;
-        }
-        unbinder = ButterKnife.bind(this);
-    }
     public boolean isShowing() {
         return dialogLoading != null && dialogLoading.getAlertDialog() != null && dialogLoading.getAlertDialog().isShowing();
     }

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -1836,7 +1836,7 @@ public class CommonUtil {
 
     //设置无数据显示 为加载中
     public void resetEmptyView(View empty_view) {
-        if (empty_view.getVisibility() == View.VISIBLE) {
+        if (empty_view != null && empty_view.getVisibility() == View.VISIBLE) {
             ImageView empty_view_img = empty_view.findViewById(R.id.empty_view_img);
             if (empty_view_img == null) {
                 if (BuildConfig.DEBUG) G.showToast("无数据layout中找不到ImageView");

+ 6 - 0
app/src/main/java/com/sheep/gamegroup/util/GlideImageLoader.java

@@ -247,6 +247,9 @@ public class GlideImageLoader {
         GlideImageLoader.downLoadImage(name, link, new Action1<File>() {
             @Override
             public void call(File file) {
+                if(file == null){
+                    return;
+                }
                 BitmapFactory.Options options = FileUtil.getImageOptions(file);
                 int w = options.outWidth;
                 int h = options.outHeight;
@@ -270,6 +273,9 @@ public class GlideImageLoader {
         GlideImageLoader.downLoadImage(name, link, new Action1<File>() {
             @Override
             public void call(File file) {
+                if(file == null){
+                    return;
+                }
                 BitmapFactory.Options options = FileUtil.getImageOptions(file);
                 int w = options.outWidth;
                 int h = options.outHeight;

+ 29 - 18
app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java

@@ -74,6 +74,7 @@ import com.sheep.gamegroup.view.dialog.DialogPayAccount;
 import com.sheep.gamegroup.view.dialog.DialogPayGame;
 import com.sheep.gamegroup.view.dialog.DialogShare;
 import com.sheep.gamegroup.view.fragment.FgtPersonalCenter;
+import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
@@ -156,16 +157,21 @@ public class ViewUtil {
             @Override
             public void onClick(View view) {
                 QR_SAVE.onEvent();
-                File file = ViewUtil.saveImage((View) iv_qr.getParent(), ClassFileHelper.DIR, System.currentTimeMillis() + ".jpg");
-                if (file != null) {
-                    Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
-                    Uri uri = Uri.fromFile(file);
-                    intent.setData(uri);
-                    activity.sendBroadcast(intent); // 发送广播通知相册
-                } else {
-                    ViewUtil.sysSaveImage((View) iv_qr.getParent(), "小绵羊", "二维码分享");
+                try {
+                    File file = ViewUtil.saveImage((View) iv_qr.getParent(), ClassFileHelper.DIR, System.currentTimeMillis() + ".jpg");
+                    if (file != null) {
+                        Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
+                        Uri uri = Uri.fromFile(file);
+                        intent.setData(uri);
+                        activity.sendBroadcast(intent); // 发送广播通知相册
+                    } else {
+                        ViewUtil.sysSaveImage((View) iv_qr.getParent(), "小绵羊", "二维码分享");
+                    }
+                    G.showToast("已保存");
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    G.showToast(BuildConfig.DEBUG ? e.getMessage() : "暂不支持");
                 }
-                G.showToast("已保存");
             }
         });
         try {
@@ -666,16 +672,21 @@ public class ViewUtil {
             @Override
             public void onClick(View v) {
                 QR_SAVE.onEvent();
-                File file = ViewUtil.saveImage((View) iv_qr.getParent(), ClassFileHelper.DIR, System.currentTimeMillis() + ".jpg");
-                if (file != null) {
-                    Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
-                    Uri uri = Uri.fromFile(file);
-                    intent.setData(uri);
-                    activity.sendBroadcast(intent); // 发送广播通知相册
-                } else {
-                    ViewUtil.sysSaveImage((View) iv_qr.getParent(), "小绵羊", "二维码分享");
+                try{
+                    File file = ViewUtil.saveImage((View) iv_qr.getParent(), ClassFileHelper.DIR, System.currentTimeMillis() + ".jpg");
+                    if (file != null) {
+                        Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
+                        Uri uri = Uri.fromFile(file);
+                        intent.setData(uri);
+                        activity.sendBroadcast(intent); // 发送广播通知相册
+                    } else {
+                        ViewUtil.sysSaveImage((View) iv_qr.getParent(), "小绵羊", "二维码分享");
+                    }
+                    G.showToast("已保存");
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    G.showToast(BuildConfig.DEBUG ? e.getMessage() : "暂不支持");
                 }
-                G.showToast("已保存");
             }
         });
         try {

+ 2 - 11
app/src/main/java/com/sheep/gamegroup/view/activity/ActGameAgencyRecharge.java

@@ -1,28 +1,26 @@
 package com.sheep.gamegroup.view.activity;
 
 import android.app.Activity;
-import android.os.Bundle;
 import android.support.design.widget.TabLayout;
 import android.support.v4.view.ViewPager;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
-import com.sheep.gamegroup.view.fragment.FgtGameAgencyRecharge;
-import com.sheep.gamegroup.view.adapter.TitleFragmentListAdapter;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.GridViewEntity;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyGridview;
 import com.sheep.gamegroup.util.ViewUtil;
+import com.sheep.gamegroup.view.adapter.TitleFragmentListAdapter;
 import com.sheep.gamegroup.view.customview.SheepmSwipeRefreshLayout;
+import com.sheep.gamegroup.view.fragment.FgtGameAgencyRecharge;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import java.util.ArrayList;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.GAME_INSTEAD_OF_RECHARGE_HELP;
 
@@ -92,13 +90,6 @@ public class ActGameAgencyRecharge extends BaseActivity {
     @Override
     public void initData() {}
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        // TODO: add setContentView(...) invocation
-        ButterKnife.bind(this);
-    }
-
     /**
      *
      */

+ 0 - 3
app/src/main/java/com/sheep/gamegroup/view/activity/ActGuideDeblocked.java

@@ -14,10 +14,8 @@ import com.tencent.smtt.sdk.WebView;
 import com.tencent.smtt.sdk.WebViewClient;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
 
-import static com.sheep.gamegroup.util.Jump2View.EXTRA_WEBVIEW_NO_TITLE;
 import static com.sheep.gamegroup.util.Jump2View.EXTRA_WEBVIEW_TITLE;
 import static com.sheep.gamegroup.util.Jump2View.EXTRA_WEBVIEW_URL;
 
@@ -46,7 +44,6 @@ public class ActGuideDeblocked extends BaseActivity {
         extraUrl = getIntent().getStringExtra(EXTRA_WEBVIEW_URL);
         String extraTitle = getIntent().getStringExtra(EXTRA_WEBVIEW_TITLE);
 
-        ButterKnife.bind(this);
         TitleBarUtils
                 .getInstance()
                 .setTitle(this, extraTitle)

+ 0 - 4
app/src/main/java/com/sheep/gamegroup/view/activity/ActGuideOnHook.java

@@ -1,6 +1,5 @@
 package com.sheep.gamegroup.view.activity;
 
-import android.os.Bundle;
 import android.view.View;
 
 import com.sheep.gamegroup.absBase.BaseActivity;
@@ -13,10 +12,8 @@ import com.tencent.smtt.sdk.WebView;
 import com.tencent.smtt.sdk.WebViewClient;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
 
-import static com.sheep.gamegroup.util.Jump2View.EXTRA_WEBVIEW_NO_TITLE;
 import static com.sheep.gamegroup.util.Jump2View.EXTRA_WEBVIEW_TITLE;
 import static com.sheep.gamegroup.util.Jump2View.EXTRA_WEBVIEW_URL;
 
@@ -42,7 +39,6 @@ public class ActGuideOnHook extends BaseActivity {
         extraUrl = getIntent().getStringExtra(EXTRA_WEBVIEW_URL);
         String extraTitle = getIntent().getStringExtra(EXTRA_WEBVIEW_TITLE);
 
-        ButterKnife.bind(this);
         TitleBarUtils
                 .getInstance()
                 .setTitle(this, extraTitle)

+ 6 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/ActInvitation.java

@@ -243,6 +243,9 @@ public class ActInvitation extends BaseActivity {
             GlideImageLoader.downLoadImage(name, item.getPicture(), new Action1<File>() {
                 @Override
                 public void call(File file) {
+                    if(file == null){
+                        return;
+                    }
                     BitmapFactory.Options options = FileUtil.getImageOptions(file);
                     final int w = options.outWidth;
                     final int h = options.outHeight;
@@ -307,6 +310,9 @@ public class ActInvitation extends BaseActivity {
         viewPager.postDelayed(new Runnable() {
             @Override
             public void run() {
+                if(image_container == null || viewPager == null || image_bottom == null || image_logo == null || image_bottom_top == null || image_tip == null){
+                    return;
+                }
                 image_container.setVisibility(View.VISIBLE);
                 int vWidth = viewPager.getWidth();
                 int vHeight = viewPager.getHeight();

+ 10 - 9
app/src/main/java/com/sheep/gamegroup/view/activity/ActMain.java

@@ -12,19 +12,18 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.sheep.gamegroup.model.entity.SystemNotification;
-import com.sheep.gamegroup.view.adapter.ViewPagerFragmentAdapter;
-import com.sheep.gamegroup.event.BigEvent;
-import com.sheep.gamegroup.view.fragment.FgtAudit;
-import com.sheep.gamegroup.view.fragment.FgtFind;
-import com.sheep.gamegroup.util.MainTab;
 import com.kfzs.duanduan.utils.StatusBarUtils;
 import com.kfzs.duanduan.view.DialogStorageLow;
 import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.event.BigEvent;
 import com.sheep.gamegroup.model.entity.Container;
+import com.sheep.gamegroup.model.entity.SystemNotification;
 import com.sheep.gamegroup.util.DrawablesHelper;
 import com.sheep.gamegroup.util.ListUtil;
+import com.sheep.gamegroup.util.MainTab;
 import com.sheep.gamegroup.util.UMConfigUtils;
+import com.sheep.gamegroup.view.adapter.ViewPagerFragmentAdapter;
+import com.sheep.gamegroup.view.fragment.FgtFind;
 import com.sheep.gamegroup.view.fragment.FgtMainAudit;
 import com.sheep.gamegroup.view.fragment.FgtSmallSheep;
 import com.sheep.jiuyan.samllsheep.R;
@@ -39,7 +38,6 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import rx.Observable;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
@@ -73,7 +71,6 @@ public class ActMain extends BaseActivity {
 
     @Override
     public void initView() {
-        ButterKnife.bind(this);
         EventBus.getDefault().register(this);
         initViewPager();
         initFind();
@@ -220,7 +217,11 @@ public class ActMain extends BaseActivity {
         if (System.currentTimeMillis() - mLastBackTime < 1000) {
             SheepApp.getInstance().quit();
         } else {
-            G.showToast(R.string.toast_double_click_exit_app);
+            try {
+                G.showToast(R.string.toast_double_click_exit_app);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
         mLastBackTime = System.currentTimeMillis();
     }

+ 4 - 7
app/src/main/java/com/sheep/gamegroup/view/activity/ActMiDong.java

@@ -6,19 +6,19 @@ import android.support.design.widget.TabLayout;
 import android.support.v4.view.ViewPager;
 import android.view.View;
 
-import com.sheep.gamegroup.event.BigEvent;
-import com.sheep.gamegroup.event.EventTypes;
-import com.sheep.gamegroup.view.fragment.FgtMiDong;
-import com.sheep.gamegroup.view.adapter.TitleFragmentListAdapter;
 import com.mdad.sdk.mdsdk.AdManager;
 import com.mdad.sdk.mdsdk.AppDownloadListener;
 import com.mdad.sdk.mdsdk.RewardListener;
 import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.event.BigEvent;
+import com.sheep.gamegroup.event.EventTypes;
 import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.ViewUtil;
+import com.sheep.gamegroup.view.adapter.TitleFragmentListAdapter;
+import com.sheep.gamegroup.view.fragment.FgtMiDong;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
@@ -31,7 +31,6 @@ import java.util.List;
 import java.util.Locale;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 
 /**
  * 幂动科技 任务
@@ -148,8 +147,6 @@ public class ActMiDong extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        // TODO: add setContentView(...) invocation
-        ButterKnife.bind(this);
         if(!EventBus.getDefault().isRegistered(this))
              EventBus.getDefault().register(this);
     }

+ 6 - 3
app/src/main/java/com/sheep/gamegroup/view/activity/ActModifyThird.java

@@ -12,13 +12,11 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.SelfCountDownTimer;
 import com.sheep.gamegroup.util.StringUtils;
-import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -36,7 +34,6 @@ import java.util.Map;
 import butterknife.BindView;
 import butterknife.OnClick;
 import rx.android.schedulers.AndroidSchedulers;
-import rx.functions.Action1;
 import rx.schedulers.Schedulers;
 
 /**
@@ -308,4 +305,10 @@ public class ActModifyThird extends BaseActivity {
             e.printStackTrace();
         }
     }
+    @Override
+    protected void onDestroy() {
+        if(selfCountDownTimer != null)
+            selfCountDownTimer.cancel();
+        super.onDestroy();
+    }
 }

+ 3 - 2
app/src/main/java/com/sheep/gamegroup/view/activity/ActPlayGameDetail.java

@@ -209,7 +209,8 @@ public class ActPlayGameDetail extends BaseActivity implements Action1<Integer>
         ViewUtil.setText(find_game_name_tv);
         ViewUtil.setText(find_game_info_tv);
         ViewUtil.setText(find_game_down_tv);
-        find_game_xin.setRating(0.0f);
+        if(find_game_xin != null)
+            find_game_xin.setRating(0.0f);
         //游戏介绍
     }
 
@@ -237,7 +238,7 @@ public class ActPlayGameDetail extends BaseActivity implements Action1<Integer>
     private void loadData(GameEntity gameEntity) {
         this.gameEntity = gameEntity;
         playGameEntity = gameEntity.getApp();
-        if(gameEntity == null ||playGameEntity == null){
+        if(gameEntity == null || playGameEntity == null){
             return;
         }
         //游戏简介与下载

+ 5 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/ActSignCard.java

@@ -242,6 +242,9 @@ public class ActSignCard extends BaseActivity {
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
+                        if(sign_card_users == null){
+                            return;
+                        }
                         punchAndSign = baseMessage.getData(PunchAndSign.class);
                         userList.clear();
                         if (ListUtil.isEmpty(punchAndSign.getAvatar())) {
@@ -267,7 +270,8 @@ public class ActSignCard extends BaseActivity {
                     public void onError(BaseMessage baseMessage) {
                         userList.clear();
                         userList.add(null);
-                        sign_card_users.getAdapter().notifyDataSetChanged();
+                        if(sign_card_users != null)
+                            sign_card_users.getAdapter().notifyDataSetChanged();
                     }
                 });
     }

+ 4 - 6
app/src/main/java/com/sheep/gamegroup/view/activity/ActWeb.java

@@ -39,9 +39,6 @@ import java.util.HashMap;
 import java.util.Map;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
-
-import static com.sheep.gamegroup.util.Jump2View.EXTRA_WEBVIEW_NO_TITLE;
 
 
 /**
@@ -72,7 +69,6 @@ public class ActWeb extends BaseActivity {
         if (!TextUtils.isEmpty(url)) {
             url = url.trim();
         }
-        ButterKnife.bind(this);
         TitleBarUtils
                 .getInstance()
                 .setTitle(this, TextUtils.isEmpty(title) ? "加载中" : title)
@@ -404,7 +400,8 @@ public class ActWeb extends BaseActivity {
             runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
-                    layout_navigationBar.setVisibility(isShow ? View.VISIBLE : View.GONE);
+                    if(layout_navigationBar != null)
+                        layout_navigationBar.setVisibility(isShow ? View.VISIBLE : View.GONE);
                 }
             });
         }
@@ -509,7 +506,8 @@ public class ActWeb extends BaseActivity {
     }
 
     private void imgReset() {
-        mWebView.loadUrl("javascript:(function(){" +
+        if(mWebView != null)
+            mWebView.loadUrl("javascript:(function(){" +
                 "var objs = document.getElementsByTagName('img'); " +
                 "for(var i=0;i<objs.length;i++)  " +
                 "{"

+ 3 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/ActXinwanWeb.java

@@ -117,6 +117,9 @@ public class ActXinwanWeb extends BaseActivity {
     }
 
     private void loadUrl() {
+        if(mWebView == null){
+            return;
+        }
         mWebView.setWebChromeClient(new WebChromeClient(){
             @Override
             public void onReceivedTitle(WebView view, String title) {

+ 0 - 3
app/src/main/java/com/sheep/gamegroup/view/activity/BaseListActivity.java

@@ -23,7 +23,6 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import java.util.List;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import rx.Observable;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
@@ -53,8 +52,6 @@ public abstract class BaseListActivity<T> extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        // TODO: add setContentView(...) invocation
-        ButterKnife.bind(this);
         activity = this;
         getType();
         initView();

+ 0 - 8
app/src/main/java/com/sheep/gamegroup/view/activity/GameCertificationActivity.java

@@ -22,7 +22,6 @@ import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
 import rx.functions.Action1;
 
@@ -88,13 +87,6 @@ public class GameCertificationActivity extends BaseActivity {
         }
     }
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        // TODO: add setContentView(...) invocation
-        ButterKnife.bind(this);
-    }
-
     @OnClick({R.id.icon_iv, R.id.change_account_tv})
     public void onViewClicked(View view) {
         switch (view.getId()) {

+ 0 - 7
app/src/main/java/com/sheep/gamegroup/view/activity/GamemakeMoneyAct.java

@@ -105,13 +105,6 @@ public class GamemakeMoneyAct extends BaseActivity {
 
     }
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        // TODO: add setContentView(...) invocation
-        ButterKnife.bind(this);
-    }
-
     /**
      * 获取is_succession,是否是连续任务
      */

+ 0 - 398
app/src/main/java/com/sheep/gamegroup/view/activity/InvitationActivity.java

@@ -1,398 +0,0 @@
-package com.sheep.gamegroup.view.activity;
-
-import android.app.Activity;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.PagerSnapHelper;
-import android.support.v7.widget.RecyclerView;
-import android.text.TextUtils;
-import android.util.Log;
-import android.util.SparseArray;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.alibaba.fastjson.JSONObject;
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.DataSource;
-import com.bumptech.glide.load.engine.GlideException;
-import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
-import com.bumptech.glide.request.RequestListener;
-import com.bumptech.glide.request.RequestOptions;
-import com.bumptech.glide.request.target.Target;
-import com.kfzs.appstore.utils.adapter.recyclerview.RecyclerViewAdapter;
-import com.kfzs.duanduan.cardview.CardLinearSnapHelper;
-import com.kfzs.duanduan.cardview.CardScaleHelper;
-import com.sheep.gamegroup.helper.ScalableCardHelper;
-import com.sheep.gamegroup.model.api.ICallBack;
-import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.DialogConfig;
-import com.sheep.gamegroup.model.entity.FriendAndAwardEntity;
-import com.sheep.gamegroup.model.entity.PictureInvitationEntity;
-import com.sheep.gamegroup.model.entity.UserEntity;
-import com.sheep.gamegroup.model.util.SheepSubscriber;
-import com.sheep.gamegroup.util.CommonUtil;
-import com.sheep.gamegroup.util.DataUtil;
-import com.sheep.gamegroup.util.FastJsonUtils;
-import com.sheep.gamegroup.util.GlideImageLoader;
-import com.sheep.gamegroup.util.ListUtil;
-import com.sheep.gamegroup.util.StringUtils;
-import com.sheep.gamegroup.util.ViewHolder;
-import com.sheep.gamegroup.util.ViewUtil;
-import com.sheep.gamegroup.view.adapter.AdbCommonRecycler;
-import com.sheep.gamegroup.view.dialog.DialogShare;
-import com.sheep.jiuyan.samllsheep.BuildConfig;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
-import com.sheep.jiuyan.samllsheep.utils.G;
-import com.umeng.socialize.ShareAction;
-import com.umeng.socialize.bean.SHARE_MEDIA;
-import com.umeng.socialize.media.UMImage;
-import com.umeng.socialize.media.UMWeb;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.functions.Action1;
-import rx.schedulers.Schedulers;
-
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.LINK_SHARE;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.QR_COPY;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.SHARE_TO_QQ;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.SHARE_TO_WEIXIN_CIRCLE;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.SHARE_TO_WX;
-import static com.sheep.gamegroup.util.ViewUtil.getNetImgByName;
-
-/**
- * created on:2018/9/4 on 15:09
- * created by: YSL
- * 描述:
- */
-public class InvitationActivity extends AppCompatActivity implements ScalableCardHelper.OnPageChangeListener {
-    @BindView(R.id.ask_share_list)
-    RecyclerView ask_share_list;
-    @BindView(R.id.recyclerView)
-    RecyclerView mRecyclerView;
-    @BindView(R.id.img_baseactivity_title)
-    ImageView ivBack;
-
-    GridLayoutManager gridLayoutManager;
-    UserEntity userEntity = DataUtil.getInstance().getUserEntity();
-    private FriendAndAwardEntity mEntity;
-    private List<PictureInvitationEntity> mPictureList = new ArrayList<>();
-
-    @Override
-
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_invitation);
-        ButterKnife.bind(this);
-        initView();
-        initListener();
-        initData();
-        getPictureList();
-    }
-
-    private void initView() {
-//        tvTitle.setText("邀请赚钱");
-        ivBack.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                InvitationActivity.this.finish();
-            }
-        });
-    }
-    private RecyclerViewAdapter<PictureInvitationEntity> mRecyclerViewAdapter;
-    private void initListener() {
-        mRecyclerView.setLayoutManager(new LinearLayoutManager(mRecyclerView.getContext(), LinearLayoutManager.HORIZONTAL, false));
-        mRecyclerView.setNestedScrollingEnabled(false);
-
-        mRecyclerViewAdapter = new RecyclerViewAdapter<PictureInvitationEntity>(mRecyclerView.getContext(), R.layout.item_image2, mPictureList) {
-            @Override
-            public void convert(com.kfzs.appstore.utils.adapter.recyclerview.ViewHolder viewHolder, final PictureInvitationEntity item, int i) {
-                ImageView image_full = viewHolder.getView(R.id.image_full);
-                ImageView image_bottom = viewHolder.getView(R.id.image_bottom);
-//                GlideImageLoader.roundedCornersImage1(image_full, item.getPicture(), (int) getResources().getDimension(R.dimen.content_padding_8));
-                viewList.put(i, viewHolder.itemView);
-                Glide.with(SheepApp.getInstance())
-                        .load(item.getPicture())
-                        .listener(new RequestListener<Drawable>() {
-                            @Override
-                            public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
-                                item.setLoaded(false);
-                                return false;
-                            }
-
-                            @Override
-                            public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) {
-                                item.setLoaded(true);
-                                return false;
-                            }
-                        })
-                        .apply(new RequestOptions().centerCrop().transform(new RoundedCorners((int) getResources().getDimension(R.dimen.content_padding_8))))
-                        .into(image_full);
-                GlideImageLoader.saveAndSetRqImage(image_bottom, item.getLink(), 800);
-            }
-
-        };
-        mRecyclerView.setAdapter(mRecyclerViewAdapter);
-//        CardLinearSnapHelper cardLinearSnapHelper = new CardLinearSnapHelper();
-//        cardLinearSnapHelper.attachToRecyclerView(mRecyclerView);
-        CardScaleHelper cardLinearSnapHelper = new CardScaleHelper();
-        cardLinearSnapHelper.attachToRecyclerView(mRecyclerView);
-//        PagerSnapHelper cardLinearSnapHelper = new PagerSnapHelper();
-//        cardLinearSnapHelper.attachToRecyclerView(mRecyclerView);
-//        ScalableCardHelper cardHelper = new ScalableCardHelper(this);
-//        cardHelper.attachToRecyclerView(mRecyclerView);
-    }
-    private SparseArray<View> viewList = new SparseArray<>();
-
-    private void init(final String url, final String description) {
-        gridLayoutManager = new GridLayoutManager(this, 5);
-        ask_share_list.setLayoutManager(gridLayoutManager);
-        final List<String> list = ListUtil.emptyList();
-        list.add(DialogShare.FACE_TO_FACE);
-        list.add(DialogShare.WX);
-        list.add(DialogShare.QQ);
-        list.add(DialogShare.WEIXIN_CIRCLE);
-        list.add(DialogShare.COPY_SHARE_LINK);
-        final List<String> imgList = ListUtil.emptyList();
-        imgList.add("share_face_to_face");
-        imgList.add("share_wx");
-        imgList.add("share_qq");
-        imgList.add("share_weixin_circle");
-        imgList.add("share_copy_share_link");
-        final List<String> nameList = ListUtil.emptyList();
-        nameList.add("面对面");
-        nameList.add("微信");
-        nameList.add("QQ好友");
-        nameList.add("朋友圈");
-        nameList.add("复制链接");
-        AdbCommonRecycler<String> adapter = new AdbCommonRecycler<String>(this, list) {
-            @Override
-            public int getViewIdByType(int type) {
-                return R.layout.ask_to_share_item;
-            }
-
-            @Override
-            public void convert(ViewHolder holder, final String item) {
-                View itemView = holder.itemView;
-                if (item == null)
-                    return;
-                ImageView ask_to_share_item_img = itemView.findViewById(R.id.ask_to_share_item_img);
-                TextView ask_to_share_item_name = itemView.findViewById(R.id.ask_to_share_item_name);
-                final int position = holder.getAdapterPosition();
-                GlideImageLoader.setImage(ask_to_share_item_img, getNetImgByName(imgList.get(position)));
-                ask_to_share_item_name.setText(nameList.get(position));
-                itemView.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        File file = null;
-                        switch (position){
-                            case 1://qq
-                            case 2://wx
-                                PictureInvitationEntity picItem = ListUtil.getItem(mPictureList, curPosition);
-                                if(picItem != null && picItem.isLoaded()) {
-                                    try {
-                                        String fileName = String.format(Locale.CHINA, "share%d%s%d.jpg", position, BuildConfig.FLAVOR, picItem.getPicture().hashCode());
-                                        file = new File(ClassFileHelper.DIR, fileName);
-                                        if (!file.exists()) {
-                                            file = ViewUtil.saveImage(viewList.get(curPosition), ClassFileHelper.DIR, fileName);
-                                        }
-                                    } catch (Exception e) {
-                                        e.printStackTrace();
-                                    }
-                                } else {
-                                    G.showToast("图片正在加载中,请稍等");
-                                    return;
-                                }
-                                break;
-
-                        }
-                        popShare(InvitationActivity.this, url, item, description, file);
-                    }
-                });
-            }
-        };
-        ask_share_list.setAdapter(adapter);
-    }
-
-
-    /**
-     * 分享 url type 拼接
-     */
-    public String jointString(String url, @DialogShare.SHARE_TYPE String type) {
-        if (url.contains("&type="))
-            return url;
-        switch (type) {
-            case "qq":
-                return url + "&type=2";
-            case "wx":
-                return url + "&type=1";
-            default:
-                return url + "&type=4";
-        }
-    }
-
-    /**
-     * 分享
-     *
-     * @param activity
-     * @param url
-     * @param type        qq wx all
-     * @param description
-     */
-    public void popShare(Activity activity, final String url, @DialogShare.SHARE_TYPE String type, String description, File file) {
-        if (activity == null || TextUtils.isEmpty(type) || TextUtils.isEmpty(url)) {
-            return;
-        }
-        final String realUrl = jointString(url, type);
-        SHARE_MEDIA share_media;
-        switch (type) {
-            case DialogShare.ALL:
-                ViewUtil.newInstance().showShare(activity, realUrl, description);
-                return;
-            case DialogShare.FACE_TO_FACE:
-                ViewUtil.showQR(activity, realUrl);
-                return;
-            case DialogShare.COPY_SHARE_LINK:
-                LINK_SHARE.onEvent();
-                ViewUtil.showMsgDialog(activity, new DialogConfig().setTitle("分享链接").setMsg(realUrl)
-                        .setMsgMore("他人通过该链接加入小绵羊即可成为你的好友").setMsgMoreColor(R.color.txt_black_9e9c9c)
-                        .setBtnLeftText("复制链接").setBtnLeftOnClickListener(new View.OnClickListener() {
-                            @Override
-                            public void onClick(View view) {
-                                QR_COPY.onEvent();
-                                StringUtils.CopyText(realUrl);
-                                G.showToast("复制链接成功");
-                            }
-                        }));
-                return;
-            case DialogShare.QQ:
-                SHARE_TO_QQ.onEvent();
-                share_media = SHARE_MEDIA.QQ;
-                break;
-            case DialogShare.WX:
-                SHARE_TO_WX.onEvent();
-                share_media = SHARE_MEDIA.WEIXIN;
-                break;
-            case DialogShare.WEIXIN_CIRCLE:
-            default:
-                SHARE_TO_WEIXIN_CIRCLE.onEvent();
-                share_media = SHARE_MEDIA.WEIXIN_CIRCLE;
-                break;
-        }
-        UMImage umImage;
-        switch (type){
-            case DialogShare.QQ:
-            case DialogShare.WX:
-                umImage = new UMImage(activity, file);
-                break;
-            default:
-                umImage = new UMImage(activity, R.mipmap.icon);
-                break;
-        }
-        UMWeb umWeb = new UMWeb(realUrl);
-        umWeb.setTitle(activity.getResources().getString(R.string.app_name));
-        umWeb.setThumb(umImage);
-        umWeb.setDescription(TextUtils.isEmpty(description) ? activity.getResources().getString(R.string.app_name) : description);
-        switch (type){
-            case DialogShare.QQ:
-            case DialogShare.WX:
-                new ShareAction(activity)
-                        .setPlatform(share_media)
-                        .withMedia(umImage)
-                        .setCallback(new CommonUtil.UMShareListener())
-                        .share();
-                break;
-            default:
-                new ShareAction(activity)
-                        .setPlatform(share_media)
-                        .withMedia(umWeb)
-                        .setCallback(new CommonUtil.UMShareListener())
-                        .share();
-                break;
-        }
-    }
-
-    public void initData() {
-        ViewUtil.newInstance().showProgress(this);
-        SheepApp.getInstance().getNetComponent().getApiService().FriendCountAndAward()
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
-                    @Override
-                    public void onError(BaseMessage baseMessage) {
-                        ViewUtil.newInstance().hideProgress(InvitationActivity.this);
-                        if (BuildConfig.DEBUG)
-                            G.showToast(baseMessage);
-                    }
-
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        if (baseMessage != null) {
-                            mEntity = baseMessage.getData(FriendAndAwardEntity.class);
-                            ViewUtil.newInstance().hideProgress(InvitationActivity.this);
-                            getmEntity();
-                        }
-
-                    }
-                });
-
-
-    }
-
-    private void getmEntity() {
-        CommonUtil.getInstance().updateUserInfo(new Action1<UserEntity>() {
-            @Override
-            public void call(UserEntity result) {
-                if (result != null) {
-                    userEntity = result;
-                    init(userEntity.getShareLink(), mEntity.getShare_desc());
-                }
-            }
-        });
-    }
-
-    private int curPosition = 0;
-    @Override
-    public void onPageSelected(int position) {
-        curPosition = position;
-    }
-
-    /**
-     * 来获取邀请图片,
-     */
-    private void getPictureList() {
-        SheepApp
-                .getInstance()
-                .getNetComponent()
-                .getApiService()
-                .getSharePicture()
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        mPictureList.addAll(baseMessage.getDataList(PictureInvitationEntity.class));
-                        mRecyclerViewAdapter.notifyDataSetChanged();
-                    }
-
-                    @Override
-                    public void onError(BaseMessage baseMessage) {
-                    }
-                });
-    }
-
-
-}

+ 0 - 8
app/src/main/java/com/sheep/gamegroup/view/activity/LoginAct.java

@@ -1,6 +1,5 @@
 package com.sheep.gamegroup.view.activity;
 
-import android.os.Bundle;
 import android.support.v7.widget.AppCompatCheckBox;
 import android.support.v7.widget.AppCompatEditText;
 import android.text.Editable;
@@ -47,7 +46,6 @@ import java.util.Map;
 import javax.inject.Inject;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
@@ -453,12 +451,6 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
     }
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        // TODO: add setContentView(...) invocation
-        ButterKnife.bind(this);
-    }
-    @Override
     protected void onDestroy() {
         super.onDestroy();
         if (selfCountDownTimer != null) {

+ 8 - 10
app/src/main/java/com/sheep/gamegroup/view/activity/MessageInteractionDetailActivity.java

@@ -1,14 +1,12 @@
 package com.sheep.gamegroup.view.activity;
 
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.OrientationHelper;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.widget.TextView;
 
+import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.FaqMsg;
 import com.sheep.gamegroup.model.entity.MessageReplyDetailEntity;
@@ -24,7 +22,6 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import java.util.List;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
@@ -34,7 +31,7 @@ import rx.schedulers.Schedulers;
  * created by: YSL
  * 描述:互动消息详情Activity------用户反馈或者faq
  */
-public class MessageInteractionDetailActivity extends AppCompatActivity {
+public class MessageInteractionDetailActivity extends BaseActivity {
     @BindView(R.id.txt_baseactivity_title)
     TextView tvTitle;
     @BindView(R.id.recycle_view)
@@ -45,12 +42,13 @@ public class MessageInteractionDetailActivity extends AppCompatActivity {
     private MessageReplyDetailEntity entity;
 
     @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_message_interaction);
-        ButterKnife.bind(this);
-        tvTitle.setText("回复详情");
+    protected int getLayoutId() {
+        return R.layout.activity_message_interaction;
+    }
 
+    @Override
+    public void initView() {
+        tvTitle.setText("回复详情");
         int id = getIntent().getIntExtra("id", -1);
         loadData(id);
     }

+ 0 - 3
app/src/main/java/com/sheep/gamegroup/view/activity/PersonalInfoAct.java

@@ -9,7 +9,6 @@ import android.widget.PopupWindow;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONObject;
-import com.google.gson.JsonObject;
 import com.sheep.gamegroup.absBase.AbsChooseImageActivity;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.UserEntity;
@@ -31,7 +30,6 @@ import com.umeng.socialize.bean.SHARE_MEDIA;
 import java.util.Map;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
@@ -88,7 +86,6 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
     public void initView() {
         activity = this;
         setShowCamera(false);
-        ButterKnife.bind(this);
         TitleBarUtils
                 .getInstance()
                 .setTitle(this, "个人资料")

+ 1 - 12
app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java

@@ -3,7 +3,6 @@ package com.sheep.gamegroup.view.activity;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Build;
-import android.os.Bundle;
 import android.support.annotation.RequiresApi;
 import android.text.TextUtils;
 import android.view.View;
@@ -91,7 +90,6 @@ import java.util.Map;
 import javax.inject.Inject;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
@@ -817,15 +815,6 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         action1.call(buttonStr);
     }
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if(savedInstanceState != null){
-            if(BuildConfig.DEBUG) G.showToast("重启了,应用自动审核悲剧了");
-        }
-        ButterKnife.bind(this);
-    }
-
     /**
      * 下载模块修改
      */
@@ -1693,7 +1682,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         hideProgress();
         if (taskReleaseEty != null) {
             if(empty_view == null){
-                reBindView();
+                return;
             }
             empty_view.setVisibility(View.GONE);
             loadData();

+ 0 - 7
app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAddQQAct.java

@@ -133,13 +133,6 @@ public class TaskDetailAddQQAct extends AbsChooseImageActivity {
             btnTaskItem.setVisibility(View.GONE);
     }
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        // TODO: add setContentView(...) invocation
-        ButterKnife.bind(this);
-    }
-
     @OnClick({R.id.btn_up_imag})
     public void onViewClicked(View view) {
         switch (view.getId()) {

+ 0 - 9
app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailCreditCardAct.java

@@ -2,7 +2,6 @@ package com.sheep.gamegroup.view.activity;
 
 import android.app.Activity;
 import android.os.Build;
-import android.os.Bundle;
 import android.support.annotation.RequiresApi;
 import android.text.TextUtils;
 import android.view.View;
@@ -37,7 +36,6 @@ import com.tencent.smtt.sdk.WebViewClient;
 import java.util.Locale;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
@@ -206,13 +204,6 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
                 });
     }
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        // TODO: add setContentView(...) invocation
-        ButterKnife.bind(this);
-    }
-
     @OnClick({R.id.detail_task_tv, R.id.web_text, R.id.ll_infos, R.id.btn_task_item, R.id.btn_up_imag})
     public void onViewClicked(View view) {
         switch (view.getId()) {

+ 1 - 10
app/src/main/java/com/sheep/gamegroup/view/activity/TryMakeMoneyact.java

@@ -2,13 +2,12 @@ package com.sheep.gamegroup.view.activity;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.os.Bundle;
 import android.support.design.widget.TabLayout;
 import android.support.v4.view.ViewPager;
 import android.view.View;
 
-import com.sheep.gamegroup.event.BigEvent;
 import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.event.BigEvent;
 import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.util.ViewUtil;
@@ -21,7 +20,6 @@ import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 
 /**
  * 试着赚钱页面
@@ -96,13 +94,6 @@ public class TryMakeMoneyact extends BaseActivity {
         //真tm神经病 需求改了无数次
     }
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        // TODO: add setContentView(...) invocation
-        ButterKnife.bind(this);
-    }
-
     /**
      * 获取is_succession,是否是连续任务
      */

+ 3 - 0
app/src/main/java/com/sheep/gamegroup/view/fragment/AbsFgtMyMoney.java

@@ -167,6 +167,9 @@ public abstract class AbsFgtMyMoney extends BaseFragment {
     protected abstract Observable<BaseMessage> initObservable(int page, int per_page);
 
     private void notifyDataSetChanged() {
+        if(empty_view == null || swipe_container == null){
+            return;
+        }
         CommonUtil.getInstance().updateEmptyView(empty_view, list.isEmpty());
         adapter.notifyDataSetChanged();
         swipe_container.setRefreshing(false);

+ 3 - 6
app/src/main/java/com/sheep/gamegroup/view/fragment/BaseListFragment2.java

@@ -274,12 +274,9 @@ public abstract class BaseListFragment2<T> extends BaseFragment {
         notifyDataSetChanged();
     }
     public void notifyDataSetChanged(){
-        if(refreshLayout == null)
-            refreshLayout = findViewById(R.id.refreshLayout);
-        if(empty_view == null)
-            empty_view = findViewById(R.id.empty_view);
-        if(view_list == null)
-            view_list = findViewById(R.id.empty_view);
+        if(refreshLayout == null || view_list == null || empty_view == null){
+            return;
+        }
         loadMore = false;
         if(list.isEmpty()){
             refreshLayout.setVisibility(View.GONE);

+ 9 - 2
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtAskGetMoneyRank.java

@@ -185,6 +185,9 @@ public class FgtAskGetMoneyRank extends BaseFragment {
                                 }
                             }
                         }
+                        if(askTop5NotYou == null){
+                            return;
+                        }
                         if(hasMe){
                             askTop5NotYou.setText(String.format(Locale.CHINA ,activity.getString(R.string.congratulation_you_in_rank_top), i+""));
                         }else {
@@ -196,14 +199,18 @@ public class FgtAskGetMoneyRank extends BaseFragment {
                     @Override
                     public void onError(BaseMessage baseMessage) {
                         notifyDataSetChanged();
+                        if(askTop5NotYou == null){
+                            return;
+                        }
                         askTop5NotYou.setVisibility(View.VISIBLE);
                     }
                 });
     }
 
     private void notifyDataSetChanged() {
-        hideProgress();
-        ViewUtil.newInstance().hideProgress(activity);
+        if(emptyView == null){
+            return;
+        }
         CommonUtil.getInstance().updateEmptyView(emptyView, list.size() == 1, true);
         while (list.size() < 6) {
             list.add(null);

+ 3 - 0
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtAudit.java

@@ -98,6 +98,9 @@ public class FgtAudit extends BaseFragment {
                     new Handler().postDelayed(new Runnable() {
                         @Override
                         public void run() {
+                            if(swipe_container == null){
+                                return;
+                            }
                             swipe_container.setRefreshing(false);
                         }
                     },1000);

+ 5 - 1
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtSmallSheep.java

@@ -640,7 +640,11 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
 
 
     public void initView() {
-        EventBus.getDefault().register(this);
+        try {
+            EventBus.getDefault().register(this);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         DaggerSmallSheepComponent.builder()
                 .netComponent(SheepApp.getInstance().getNetComponent())
                 .smallSheepModule(new SmallSheepModule(this))

+ 3 - 16
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtTryMakeMoney.java

@@ -61,7 +61,6 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     XRecyclerView view_list;
     @BindView(R.id.empty_view)
     View empty_view;
-    Unbinder unbinder;
 
     @Inject
     TryMakeMoneyPresenter presenter;
@@ -77,19 +76,6 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     private boolean isFromHome = false;//来自主页
     private int is_succession;//0:一般任务 1:连续任务
 
-    private void checkAndInitView() {
-        if (empty_view == null) {
-            if(unbinder != null){
-                try {
-                    unbinder.unbind();
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                unbinder = null;
-            }
-            unbinder = ButterKnife.bind(this, mView);
-        }
-    }
 
     private static final int LIST_COUNT = 3;//tryMakeMoneyAdp 总共有3条数据
     private static final RecyleObj NULL = RecyleObj.make(RecyleType.NONE, null);//空数据
@@ -100,7 +86,9 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         }
     };
     private void notifyDataSetChanged() {
-        checkAndInitView();
+        if(empty_view == null || view_list == null){
+            return;
+        }
         tryMakeMoneyAdp.clear();
         if (!ListUtil.isEmpty(acceptedEtyList))
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, acceptedEtyList));
@@ -166,7 +154,6 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View rootView = super.onCreateView(inflater, container, savedInstanceState);
-        unbinder = ButterKnife.bind(this, rootView);
         Bundle bundle = getArguments();
         if (bundle != null) {
             about_to_begin = bundle.getInt("type", 0);

+ 11 - 9
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtWatchFocus.java

@@ -215,16 +215,18 @@ public class FgtWatchFocus extends BaseListFragment<RouserArticlesEntity> {
     @Override
     protected void updateEmptyView(){
         if(onlyShowInstalledApp) {
-            for (RouserArticlesEntity item : newList) {
-                if (!TextUtils.isEmpty(item.getPackage_name())) {
-                    ArrayList<RouserArticlesEntity> entityList;
-                    if(map.containsKey(item.getPackage_name())){
-                        entityList = map.get(item.getPackage_name());
-                    } else {
-                        entityList = new ArrayList<>();
-                        map.put(item.getPackage_name(), entityList);
+            if(newList != null) {
+                for (RouserArticlesEntity item : newList) {
+                    if (!TextUtils.isEmpty(item.getPackage_name())) {
+                        ArrayList<RouserArticlesEntity> entityList;
+                        if (map.containsKey(item.getPackage_name())) {
+                            entityList = map.get(item.getPackage_name());
+                        } else {
+                            entityList = new ArrayList<>();
+                            map.put(item.getPackage_name(), entityList);
+                        }
+                        entityList.add(item);
                     }
-                    entityList.add(item);
                 }
             }
             showList.clear();

+ 9 - 0
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtWelfareCenter.java

@@ -183,6 +183,9 @@ public class FgtWelfareCenter extends BaseFragment{
                     .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                         @Override
                         public void onNext(BaseMessage baseMessage) {
+                            if(wcHotWelfareList == null){
+                                return;
+                            }
                             refreshHotWelfare = false;
                             ArrayList<TaskReleaseEty> newList = baseMessage.getDataList(TaskReleaseEty.class);
                             hotWelfareList.clear();
@@ -193,6 +196,9 @@ public class FgtWelfareCenter extends BaseFragment{
 
                         @Override
                         public void onError(BaseMessage baseMessage) {
+                            if(wcHotWelfareList == null){
+                                return;
+                            }
                             refreshHotWelfare = false;
                             hotWelfareList.clear();
                             wcHotWelfareList.getAdapter().notifyDataSetChanged();
@@ -253,6 +259,9 @@ public class FgtWelfareCenter extends BaseFragment{
     }
 
     private void notifyDataSetChanged() {
+        if(refresh == null || wc_gift_center_title_container == null || wc_gift_center_title_line == null){
+            return;
+        }
         if(!refreshHotWelfare && !refreshDownloadWelfare && !refreshGiftCenter)
             refresh.setRefreshing(false);
         wc_gift_center_title_container.setVisibility(giftCenterList.isEmpty() ? View.GONE : View.VISIBLE);