bugly list fixed

app/src/main/java/com/kfzs/duanduan/utils/ApkUtils.java

@@ -104,11 +104,12 @@ public class ApkUtils {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new AbsObserver<ApkFileInfo>() {
                     private boolean doneNext;
+
                     @Override
                     public void onComplete() {
-                        if(doneNext)
+                        if (doneNext)
                             return;
-                        if(apkFileInfo.isAppInstalled()){//在onNext中未处理且应用已经安装的情况下，直接打开应用
+                        if (apkFileInfo.isAppInstalled()) {//在onNext中未处理且应用已经安装的情况下，直接打开应用
                             PackageUtil.startApp(context, apkFileInfo.getPackageName());
                         } else {//有些手机会进入这里，很奇怪，暂未复现，直接安装吧
                             checkAndInstall(apkFileInfo);
@@ -125,10 +126,13 @@ public class ApkUtils {
                         doneNext = true;
                         checkAndInstall(item);
                     }
-                    private void checkAndInstall(ApkFileInfo item){
+
+                    private void checkAndInstall(ApkFileInfo item) {
                         if (!item.isAppInstalled() || (item.isEqualsSignMd5() && item.isCanInstallVersion())) {
                             PackageUtil.installApk(context, item.getPath());
-                            DataUtil.putAsString(DataKey.KEY_INSTALL_APK_PACKAGE_NAME, item.getPackageName());
+                            if (item.getPackageName() != null) {
+                                DataUtil.putAsString(DataKey.KEY_INSTALL_APK_PACKAGE_NAME, item.getPackageName());
+                            }
                         } else {//签名不同，则提示卸载
                             ViewUtil.showMsgDialog(SheepApp.getInstance(), new DialogConfig()
                                     .setTitle("提示").setMsg("需要卸载当前应用才能继续安装，是否继续").setBtnLeftText("不用了")
@@ -193,7 +197,7 @@ public class ApkUtils {
     public static String getSignMd5(PackageInfo packageInfo) {
         Signature[] signs = packageInfo.signatures;
         Signature sign = signs[0];
-       return encryptionMD5(sign.toByteArray());
+        return encryptionMD5(sign.toByteArray());
     }
 
     /**

app/src/main/java/com/sheep/gamegroup/module/game/activity/ActGameGroupOrGameDetail.java

@@ -407,6 +407,7 @@ public class ActGameGroupOrGameDetail extends BaseActivity {
 
     //刷新数据
     public void refreshData(int position) {
+        if (mAdapter.getCount() == 0) return;
         initDetailFromNet();
         boolean isRefresh = false;
         if (refreshDataCount != 0) {
@@ -423,6 +424,7 @@ public class ActGameGroupOrGameDetail extends BaseActivity {
 
     //加载更多数据
     private void loadMoreData() {
+        if (mAdapter.getCount() == 0) return;
         Fragment item = mAdapter.getItem(viewPager.getCurrentItem());
         if (item instanceof ILoadMore) {//可加载更多，就调用当前fragment刷新数据
             ((ILoadMore) item).loadMoreData();

app/src/main/java/com/sheep/gamegroup/module/search/FgtSearch.java

@@ -148,35 +148,39 @@ public class FgtSearch extends BaseFragment implements ISearch {
                             } else {
                                 listAdapter.appendItems(items);
                             }
-                            if(listAdapter.getItemCount()>0){
+                            if (listAdapter.getItemCount() > 0) {
                                 hideEmpty();
-                            } else{
+                            } else {
                                 showEmpty();
                             }
                         } catch (JSONException e) {
                             e.printStackTrace();
                             G.showToast("数据解析出错");
-                        }finally {
-                            listView.loadMoreComplete();
-                            listView.refreshComplete();
+                        } finally {
+                            if (listView != null) {
+                                listView.loadMoreComplete();
+                                listView.refreshComplete();
+                            }
                         }
                     }
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
                         G.showToast("查询出错：" + baseMessage.getMsg() + " " + baseMessage.getErrorMsg());
-                        listView.loadMoreComplete();
-                        listView.refreshComplete();
+                        if (listView != null) {
+                            listView.loadMoreComplete();
+                            listView.refreshComplete();
+                        }
                     }
                 });
     }
 
-    private void showEmpty(){
-        empty_view.setVisibility(View.VISIBLE);
+    private void showEmpty() {
+        ViewUtil.setVisibility(empty_view, View.VISIBLE);
     }
 
-    private void hideEmpty(){
-        empty_view.setVisibility(View.GONE);
+    private void hideEmpty() {
+        ViewUtil.setVisibility(empty_view, View.GONE);
     }
 
 }

app/src/main/java/com/sheep/gamegroup/util/CertificationUtil.java

@@ -88,14 +88,14 @@ public class CertificationUtil {
      * 验证获取数据
      */
     public void authCertificationCode(final Activity activity, final String token) {
-        ViewUtil.newInstance().showProgress((Activity) activity);
+        ViewUtil.newInstance().showProgress(activity);
         SheepApp.getInstance().getNetComponent().getApiService().verificationAuth(token, SheepApp.getInstance().getGameCode())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        ViewUtil.newInstance().hideProgress((Activity) activity);
+                        ViewUtil.newInstance().hideProgress(activity);
                         if (baseMessage != null && baseMessage.getData() != null) {
                             doCertification(activity, token, SheepApp.getInstance().getGamePackgeName(), baseMessage.getData() + "");
                         } else {
@@ -106,7 +106,7 @@ public class CertificationUtil {
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        ViewUtil.newInstance().hideProgress((Activity) activity);
+                        ViewUtil.newInstance().hideProgress(activity);
                         showCertificationErrorAndExitApp(activity, "请求授权错误 " + baseMessage.getMsg(), 1000);
                     }
                 });

app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java

@@ -2392,7 +2392,7 @@ public class ViewUtil {
 
     public void hideProgress(Activity activity) {
         activity.runOnUiThread(() -> {
-            if (mPd != null && mPd.get() != null) {
+            if (mPd != null && mPd.get() != null && mPd.get().isShowing()) {
                 mPd.get().dismiss();
             }
         });

app/src/main/java/com/sheep/gamegroup/util/js/KFZSJs.java

@@ -76,6 +76,7 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
+import cn.finalteam.rxgalleryfinal.utils.CameraUtil;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
 import rx.functions.Action1;
@@ -678,6 +679,11 @@ public class KFZSJs {
     }
 
     @JavascriptInterface
+    public boolean checkCameraPermission() {
+        return CameraUtil.checkCameraPermission(activity);
+    }
+
+    @JavascriptInterface
     public void loginThirdPartApp(String type) {
         UMShareAPI.get(SheepApp.getInstance()).doOauthVerify(activity,
                 "wx".equals(type) ? SHARE_MEDIA.WEIXIN : SHARE_MEDIA.QQ,

app/src/main/java/com/sheep/gamegroup/view/activity/GameCertificationActivity.java

@@ -144,6 +144,12 @@ public class GameCertificationActivity extends BaseActivity {
         }
     }
 
+    @Override
+    public void onDestroy(){
+        ViewUtil.newInstance().hideProgress(this);
+        super.onDestroy();
+    }
+
     @OnClick({R.id.change_account_tv})
     public void onChangeAccount(View view) {
         Jump2View.getInstance().goLoginViewWithoutFinish(this, SheepApp.getInstance().getGameCode());

app/src/main/java/com/sheep/gamegroup/view/activity/SplashAct.java

@@ -27,6 +27,7 @@ import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.RxjavaCountDownTimer;
 import com.sheep.gamegroup.util.SysAppUtil;
 import com.sheep.gamegroup.util.TestUtil;
+import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.activity.helper.SplashHelper;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -184,7 +185,7 @@ public class SplashAct extends BaseActivity {
                     .setOnTickListener(new RxjavaCountDownTimer.OnTickListener() {
                         @Override
                         public void onFinish() {
-                            if(!isDestroyed()) {
+                            if (!isDestroyed()) {
                                 splash_skip.setVisibility(View.INVISIBLE);//设置为INVISIBLE代表定时器结束
                                 if (!goLink) {
                                     sendHandlerMessages(10);
@@ -194,7 +195,7 @@ public class SplashAct extends BaseActivity {
 
                         @Override
                         public void onTicker(long time) {
-                            splash_skip.setText(getString(R.string.tip_skip, time));
+                            ViewUtil.setText(splash_skip, getString(R.string.tip_skip, time));
                         }
                     }).start();
         } else {

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtSmallSheep.java

@@ -926,9 +926,9 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
                         CharSequence award = new SpannableSb().append("你还有").append(NumberFormatUtils.retainMost2(cashAwarsEntity.getAward()) + "元", "#FF2D4B").append("的奖励未领取", "#333333").getSsb();
                         String cash = String.format(activity.getResources().getString(R.string.homepage_cash), NumberFormatUtils.retainMost2(cashAwarsEntity.getCash()));
                         String welfare = String.format(activity.getResources().getString(R.string.homepage_welfare), NumberFormatUtils.retainMost2(cashAwarsEntity.getWelfare()));
-                        homepage_item_get_award_name_tv.setText(award);
-                        homepage_item_money_tv.setText(cash);
-                        homepage_item_juan_tv.setText(welfare);
+                        ViewUtil.setText(homepage_item_get_award_name_tv, award);
+                        ViewUtil.setText(homepage_item_money_tv, cash);
+                        ViewUtil.setText(homepage_item_juan_tv, welfare);
                     }
                 }
             });

app/src/main/java/com/sheep/jiuyan/samllsheep/ui/activity/SignActivity.java

@@ -268,12 +268,14 @@ public class SignActivity extends BaseUMActivity {
                                     lastUserSign = item;
                                 }
                                 /* 设置已签到的天数状态 */
-                                TextView childAt = (TextView) signDayList.getChildAt(item.getDay() - 1);
-                                childAt.setBackground(getResources().getDrawable(R.drawable.shape_sign_bg_select));
-                                if (item.getDay() == SIGN_PERIOD) {
-                                    childAt.setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, null, getResources().getDrawable(R.drawable.giftbox_open));
-                                } else {
-                                    childAt.setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, null, getResources().getDrawable(R.drawable.qiandao));
+                                if (signDayList != null) {
+                                    TextView childAt = (TextView) signDayList.getChildAt(item.getDay() - 1);
+                                    childAt.setBackground(getResources().getDrawable(R.drawable.shape_sign_bg_select));
+                                    if (item.getDay() == SIGN_PERIOD) {
+                                        childAt.setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, null, getResources().getDrawable(R.drawable.giftbox_open));
+                                    } else {
+                                        childAt.setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, null, getResources().getDrawable(R.drawable.qiandao));
+                                    }
                                 }
                             }
                             /* 判断是否有漏签 */