Merge remote-tracking branch 'origin/sheep_develop' into sheep_develop

app/src/main/AndroidManifest.xml

@@ -663,6 +663,7 @@
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActReservation"
+            android:theme="@style/AppActionTheme"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActGameAgencyRecharge"
@@ -683,9 +684,11 @@
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActDownloadWelfareList"
+            android:theme="@style/AppActionTheme"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActGiftCenter"
+            android:theme="@style/AppActionTheme"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActMyWelfare"

app/src/main/java/com/sheep/gamegroup/module/login/fragments/EditUserInfoFgt.java

@@ -3,7 +3,9 @@ package com.sheep.gamegroup.module.login.fragments;
 import android.app.Dialog;
 import android.content.Intent;
 import android.net.Uri;
+import android.os.Bundle;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.ImageView;
@@ -72,13 +74,24 @@ public class EditUserInfoFgt extends BaseFragment {
     }
 
     @Override
+    public void onCreate(Bundle bundle) {
+        super.onCreate(bundle);
+        if (bundle != null && bundle.containsKey("login_result")) {
+            mLoginResult = JSONObject.parseObject(bundle.getString("login_result"), LoginEntity.class);
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle bundle) {
+        super.onSaveInstanceState(bundle);
+        String json = JSONObject.toJSONString(mLoginResult);
+        Log.e("EditUserInfo", json);
+        bundle.putString("login_result", json);
+    }
+
+    @Override
     public void onViewCreated() {
-        new Thread() {
-            public void run() {
-                Glide.get(SheepApp.getInstance()).clearDiskCache();
-            }
-        }.start();
-        Glide.get(SheepApp.getInstance()).clearMemory();
+        clearGlideCache();
         if (!TextUtils.isEmpty(mLoginResult.getUser().getAvatar())) {
             GlideImageLoader.circleImage(avaterView, mLoginResult.getUser().getAvatar());
         }
@@ -192,10 +205,20 @@ public class EditUserInfoFgt extends BaseFragment {
                 .start(getActivity(), PhotoPicker.REQUEST_CODE);
     }
 
+    private void clearGlideCache() {
+        new Thread() {
+            public void run() {
+                Glide.get(SheepApp.getInstance()).clearDiskCache();
+            }
+        }.start();
+        Glide.get(SheepApp.getInstance()).clearMemory();
+    }
+
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if (resultCode == RESULT_OK) {
+            clearGlideCache();
             if (requestCode == PhotoPicker.REQUEST_CODE) {//拍照或者选择照片
                 if (data != null) {
                     List<String> photos = data.getStringArrayListExtra(PhotoPicker.KEY_SELECTED_PHOTOS);

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

@@ -24,6 +24,7 @@ public class ActDownloadWelfareList extends BaseActivity {
     @Override
     public void initView() {
         TitleBarUtils.getInstance()
+                .setShowOrHide(this, true)
                 .setTitle(this, "下载福利列表")
                 .setTitleFinish(this);
 

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

@@ -25,6 +25,7 @@ public class ActGiftCenter extends BaseActivity {
     @Override
     public void initView() {
         TitleBarUtils.getInstance()
+                .setShowOrHide(this, true)
                 .setTitle(this, "礼包中心")
                 .setTitleFinish(this);
 

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

@@ -139,7 +139,7 @@ public class ActMain extends BaseActYmPermissionCheck {
 //        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && G.checkDeviceHasNavigationBar(this)) {
 //            main_layout.setPadding(0, 0, 0, G.getHasVirtualKey(this) - G.getNoHasVirtualKey(this));
 //        }
-        if(!TestUtil.isDev())
+        if (!TestUtil.isDev())
             CommonUtil.getInstance().initMiDong(this, DataUtil.getInstance().getUserId());
     }
 
@@ -153,8 +153,6 @@ public class ActMain extends BaseActYmPermissionCheck {
 
     }
 
-    private List<Fragment> fragmentList = new ArrayList<>();
-
     private int lastPosition = MainTab.FgtSmallSheep.ordinal();//默认选中小绵羊
 
     //多次点击预防
@@ -170,8 +168,9 @@ public class ActMain extends BaseActYmPermissionCheck {
             if (fragment == null) {
                 fragment = mainTabs[index].getFragment();
             }
-            fragmentList.add(fragment);
-            transaction.add(R.id.frame_container, fragment, "fragment_" + index);
+            if (!fragment.isAdded()) {
+                transaction.add(R.id.frame_container, fragment, "fragment_" + index);
+            }
             if (index == 0) {
                 transaction.show(fragment);
             } else {
@@ -246,9 +245,7 @@ public class ActMain extends BaseActYmPermissionCheck {
      */
     private void doBackPress() {
         if (System.currentTimeMillis() - mLastBackTime < 1000) {
-            fragmentList.clear();
-            fragmentList = null;
-            fragmentList = getSupportFragmentManager().getFragments();
+            List<Fragment> fragmentList = getSupportFragmentManager().getFragments();
             FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
             for (Fragment fragment : fragmentList) {
                 try {

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

@@ -71,6 +71,7 @@ public class ActReservation extends BaseActivity {
     @Override
     public void initView() {
         TitleBarUtils.getInstance()
+                .setShowOrHide(this, true)
                 .setTitle(this, "游戏预约")
                 .setTitleFinish(this);
 

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

@@ -14,6 +14,7 @@ import android.provider.Settings;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AlertDialog;
+import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -35,6 +36,7 @@ import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
 import org.afinal.simplecache.ApiKey;
 
@@ -61,11 +63,13 @@ import static com.sheep.gamegroup.util.UMConfigUtils.Event.AD_SPLASH;
 
 public class SplashAct extends BaseActivity implements EasyPermissions.PermissionCallbacks {
 
+    @BindView(R.id.login_bg_img)
+    ImageView login_bg_img;
     @BindView(R.id.splash_bg)
     ImageView splash_bg;
     @BindView(R.id.splash_skip)
     TextView splash_skip;
-//    @BindView(R.id.splash_know_ad_tv)
+    //    @BindView(R.id.splash_know_ad_tv)
     TextView splash_know_ad_tv;
 
 
@@ -115,6 +119,7 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
     }
 
     private boolean isRequestCodePermissions = true;//是否正在获取权限或者没有获取到权限
+
     @AfterPermissionGranted(PERMISSON_REQUESTCODE)
     private void requestCodePermissions() {
         if (!EasyPermissions.hasPermissions(this, needPermissions)) {
@@ -129,15 +134,15 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
         @Override
         public void handleMessage(Message msg) {
             super.handleMessage(msg);
-            switch (msg.what){
+            switch (msg.what) {
                 case 0:
-                    if(!isRequestCodePermissions && !isLoadingData && timerIsFinish())
+                    if (!isRequestCodePermissions && !isLoadingData && timerIsFinish())
                         gotoNext();
                     else
                         sendHandlerMessages(100);
                     break;
                 case 1:
-                    if(SysAppUtil.isNewSmallSheep() || TestUtil.isDev()){//新版本只显示引导页面，不展示弹窗和开屏广告
+                    if (SysAppUtil.isNewSmallSheep() || TestUtil.isDev()) {//新版本只显示引导页面，不展示弹窗和开屏广告
                         isLoadingData = false;
                         sendHandlerMessages(200);
                     } else {
@@ -157,7 +162,7 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
                                     .subscribe(new SheepSubscriber<BaseMessage>(activity) {
                                         @Override
                                         public void onNext(BaseMessage baseMessage) {
-                                            DataUtil.getInstance().resetCacheTime(ApiKey.advertisements(1), 3600*5);//开屏广告最多缓存5个小时
+                                            DataUtil.getInstance().resetCacheTime(ApiKey.advertisements(1), 3600 * 5);//开屏广告最多缓存5个小时
                                             isLoadingData = false;
                                             advertising = baseMessage.getData(Advertising.class);
                                             try {
@@ -197,8 +202,6 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
         return R.layout.splash_activity;
     }
 
-    @BindView(R.id.login_bg_img)
-    ImageView login_bg_img;
     @Override
     public void initView() {
         activity = this;
@@ -214,32 +217,34 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
     public void initListener() {
 
     }
+
     private boolean isLoadingData = true;//是否正在获取开屏广告数据
     private Advertising advertising;
+
     @Override
     public void initData() {
         SheepApp.getInstance().getNetComponent().getApiService().checkUserFirst()
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
-                            @Override
-                            public void onNext(BaseMessage baseMessage) {
-                                boolean isNewSmallSheep = baseMessage.getData(Boolean.class);
-                                DataUtil.getInstance().setIsNewSmallSheep(isNewSmallSheep);
-                                mHandler.sendEmptyMessageDelayed(1, 300);
-                            }
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        boolean isNewSmallSheep = baseMessage.getData(Boolean.class);
+                        DataUtil.getInstance().setIsNewSmallSheep(isNewSmallSheep);
+                        mHandler.sendEmptyMessageDelayed(1, 300);
+                    }
 
-                            @Override
-                            public void onError(BaseMessage baseMessage) {
-                                //访问出错时，认为不是新设备
-                                DataUtil.getInstance().setIsNewSmallSheep(false);
-                                mHandler.sendEmptyMessageDelayed(1, 300);
-                            }
-                        });
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        //访问出错时，认为不是新设备
+                        DataUtil.getInstance().setIsNewSmallSheep(false);
+                        mHandler.sendEmptyMessageDelayed(1, 300);
+                    }
+                });
     }
 
     private void loadAdvertising() {
-        if(advertising.isImage()) {
+        if (advertising.isImage()) {
             Glide.with(activity).load(advertising.getDisplay_src()).into(splash_bg);
 //            btnJoin.setVisibility(View.GONE);
             splash_video_view.setVisibility(View.GONE);
@@ -250,10 +255,10 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
             videoView.setOnInfoListener(new MediaPlayer.OnInfoListener() {
                 @Override
                 public boolean onInfo(MediaPlayer mediaPlayer, int what, int extra) {
-                    if(!mediaPlayer.isLooping())
+                    if (!mediaPlayer.isLooping())
                         mediaPlayer.setLooping(true);
                     LogUtil.println("onInfo what = " + what + " extra = " + extra);
-                    if(MediaPlayer.MEDIA_INFO_BUFFERING_START == what){
+                    if (MediaPlayer.MEDIA_INFO_BUFFERING_START == what) {
                         splash_bg.setVisibility(View.GONE);
 //                        btnJoin.setVisibility(View.GONE);
                     }
@@ -265,10 +270,10 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
             videoView.requestFocus();
         }
 
-        if(splash_know_ad_tv != null)
+        if (splash_know_ad_tv != null)
             splash_know_ad_tv.setVisibility(View.VISIBLE);
         mHandler.removeMessages(0);
-        if(advertising.getShow_time() > 0) {
+        if (advertising.getShow_time() > 0) {
             splash_skip.setVisibility(View.VISIBLE);
             timer = RxjavaCountDownTimer.getInstance(/*BuildConfig.DEBUG ? 10 : */advertising.getShow_time())
                     .setOnTickListener(new RxjavaCountDownTimer.OnTickListener() {
@@ -290,12 +295,14 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
             sendHandlerMessages(1000);
         }
     }
+
     private boolean isResume = false;
+
     @Override
     protected void onResume() {
         super.onResume();
         isResume = true;
-        if(videoView != null)
+        if (videoView != null)
             videoView.resume();
     }
 
@@ -303,7 +310,7 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
     protected void onPause() {
         super.onPause();
         isResume = false;
-        if(videoView != null)
+        if (videoView != null)
             videoView.pause();
     }
 
@@ -355,7 +362,7 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
     }
 
 
-    @OnClick({R.id.btn_join, R.id.splash_skip, R.id.splash_know_ad_tv, R.id.splash_bg, R.id.splash_video_view,R.id.splash_click_view})
+    @OnClick({R.id.btn_join, R.id.splash_skip, R.id.splash_know_ad_tv, R.id.splash_bg, R.id.splash_video_view, R.id.splash_click_view})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.btn_join:
@@ -366,10 +373,10 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
             case R.id.splash_video_view:
             case R.id.splash_know_ad_tv:
             case R.id.splash_click_view:
-                if(advertising != null) {
+                if (advertising != null) {
                     goAdLink(activity, advertising);
                     AD_SPLASH.onEvent("ad_id", advertising.getId());
-                }else {
+                } else {
                     gotoNext();
                 }
                 break;
@@ -377,8 +384,15 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
     }
 
     public static void goAdLink(Activity activity, Advertising advertising) {
-        if(advertising != null){
-            switch(advertising.getLinkType()){//转跳类型1：H5外部 2：H5内部 3：试玩赚钱 4:单个任务 5：信用卡 6:微信二维码 7：连续任务 8：打卡赚钱
+        if (TextUtils.isEmpty(SpUtils.getToken(SheepApp.getInstance()))) {
+            Jump2View.getInstance().goLoginView(activity, null);
+            if (activity instanceof SplashAct) {
+                activity.finish();
+            }
+            return;
+        }
+        if (advertising != null) {
+            switch (advertising.getLinkType()) {//转跳类型1：H5外部 2：H5内部 3：试玩赚钱 4:单个任务 5：信用卡 6:微信二维码 7：连续任务 8：打卡赚钱
                 case 1:
                     Jump2View.getInstance().goWeb(activity, advertising.getLink());
                     break;
@@ -428,7 +442,8 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
         isRequestCodePermissions = false;
         sendHandlerMessages(10);
     }
-    private void sendHandlerMessages(int time){
+
+    private void sendHandlerMessages(int time) {
         try {
             mHandler.removeMessages(0);
             mHandler.sendEmptyMessageDelayed(0, /*BuildConfig.DEBUG ? 100 :*/ time);
@@ -440,7 +455,7 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        if(timer != null)
+        if (timer != null)
             timer.clear();
         try {
             mHandler.removeMessages(0);

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

@@ -273,7 +273,12 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     }
 
     private void loadData() {
-        detail_shrae_friend_layout.setVisibility(View.VISIBLE);
+        if (isDestroyed()) {
+            return;
+        }
+        if (detail_shrae_friend_layout != null) {
+            detail_shrae_friend_layout.setVisibility(View.VISIBLE);
+        }
 
         taskEty = taskReleaseEty.getTask();
         if (onResumeCount == 0) {
@@ -851,7 +856,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     onClickSecondBtn();
                     break;
                 case R.id.detail_share_friend_tv:
-                    if(taskReleaseEty != null){
+                    if (taskReleaseEty != null) {
                         Jump2View.getInstance().tryShare(activity, "task_desc_url", "task_id", releaseTaskId);
                     } else {
                         Jump2View.getInstance().tryShare(activity, "task_desc_url", "task_id", releaseTaskId,
@@ -971,7 +976,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                         break;
                     case COMPLETED://有可能之前已经下载完成，但是数据库里已经没有数据了，这时只需要修改状态
                         if (task.getFile() != null) {
-                            if(downloadUtil.checkFinish(downLoadInfo)) {//检查文件是否真的完成
+                            if (downloadUtil.checkFinish(downLoadInfo)) {//检查文件是否真的完成
                                 downloadUtil.setDownloadTaskFinish(task.getUrl(), task.getFile().getAbsolutePath());
                             } else {//重新开始下载
                                 downloadUtil.delete(downLoadInfo);
@@ -1037,9 +1042,9 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 break;
         }
         if (commitScreenShotTaskId > 0) {
-            if(!TextUtils.isEmpty(taskEty.getUnique_identification())){//需要提交自定义字段
+            if (!TextUtils.isEmpty(taskEty.getUnique_identification())) {//需要提交自定义字段
                 Jump2View.getInstance().goActInputAndPickerImg(this, taskEty.getUnique_identification());
-            }else {
+            } else {
                 if (DataUtil.IS_USE_ALL_IMAGE) {//可以上传任意图片
                     showChooseDialog(false, true, DEFAULT_MAX_COUNT);
                 } else if ((DataUtil.IS_USE_SCREEN_SHOT || DataUtil.IS_LISTEN_SCREEN_SHOT) && taskEty.needShotScreen()) {//小绵羊截图方案与监听方案
@@ -1330,15 +1335,17 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     private int commitScreenShotTaskId;
 
     private String unique_identification;
+
     @Override
     protected void onSetNetImageUrl(String data) {
         setLoaddingText("提交中");
         commitScreenShotData(data, unique_identification);
         unique_identification = null;
     }
+
     //提交截图数据
     private void commitScreenShotData(String data, String unique_identification) {
-        presenter.taskStatus(commitScreenShotTaskId, data+"", "",taskEty.getPackage_names(), String.valueOf(TaskAcceptedEty.STATUS_SUBMIT), SysAppUtil.getUserAgentOrDeviceInfo(), unique_identification);
+        presenter.taskStatus(commitScreenShotTaskId, data + "", "", taskEty.getPackage_names(), String.valueOf(TaskAcceptedEty.STATUS_SUBMIT), SysAppUtil.getUserAgentOrDeviceInfo(), unique_identification);
         taskEty.setScreenshots(data);
     }
 
@@ -1370,10 +1377,11 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 isFresh = true;
                 break;
             case RequestCodeConstants.REQUEST_CODE_GE_DATA:
-                if(resultCode == RESULT_OK) {
+                if (resultCode == RESULT_OK) {
                     Object object = DataUtil.getInstance().getData(InputAndUrlList.class.getSimpleName());
-                    if(TestUtil.isDev()) LogUtil.println("GET_DATA", JSONObject.toJSONString(object));
-                    if(object instanceof InputAndUrlList) {
+                    if (TestUtil.isDev())
+                        LogUtil.println("GET_DATA", JSONObject.toJSONString(object));
+                    if (object instanceof InputAndUrlList) {
                         unique_identification = ((InputAndUrlList) object).getInput();
                         //上传图片
                         photoCount = DEFAULT_MAX_COUNT;

app/src/main/java/com/sheep/gamegroup/view/adapter/AdpGcGameAppList.java

@@ -38,7 +38,7 @@ public class AdpGcGameAppList extends RecyclerViewAdapter<Applications> {
             viewHolder.itemView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
-                    Jump2View.getInstance().goPlayGameDetail(null, item.getId());
+                    Jump2View.getInstance().goPlayGameDetail(mContext, item.getId());
                 }
             });
         }

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

@@ -136,7 +136,6 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
 
     @BindView(R.id.upview1)
     MarqueeView upview1;
-    Unbinder unbinder;
     @BindView(R.id.homepage_item_notice_mv)
     MarqueeView homepageItemNoticeMv;
     @BindView(R.id.homepage_item_notice_layout)
@@ -251,7 +250,6 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
         @Override
         public void handleMessage(Message msg) {
             super.handleMessage(msg);
-            checkAndInitView();
             switch (msg.what) {
                 case WHAT_LOAD_USER_INFO:
                     loadUserInfo();
@@ -1259,7 +1257,6 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
 
     @Override
     public void successhomeList(BaseMessage baseMessage) {
-        checkAndInitView();
         boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.home_list);
         if (isNewData) {
             List<HomeListEntity> homeListEntityList = baseMessage.getDataList(HomeListEntity.class);
@@ -1301,23 +1298,8 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
         }
     }
 
-    private void checkAndInitView() {
-        if (recyclerview == null) {
-            if (unbinder != null) {
-                try {
-                    unbinder.unbind();
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                unbinder = null;
-            }
-            unbinder = ButterKnife.bind(this, getView());
-        }
-    }
-
     @Override
     public void failhomeList(BaseMessage baseMessage) {
-        checkAndInitView();
         if (homeListEntitys.isEmpty() && fullHomeList.isEmpty())
             home_list_gridview_layout.setVisibility(View.GONE);
 
@@ -1410,20 +1392,9 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
     @Override
     public void onDestroy() {
         super.onDestroy();
-
         EventBus.getDefault().unregister(this);
     }
 
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        userEntity = DataUtil.getInstance().getUserEntity();
-        if (userEntity != null) {
-            loadUserInfo();
-        }
-    }
-
     @Override
     public void onStart() {
         super.onStart();

app/src/main/java/com/sheep/jiuyan/samllsheep/service/DownloadService.java

@@ -152,11 +152,13 @@ public class DownloadService extends Service {
                         e.printStackTrace();
                     }
                     downLoadInfo = downloadUtil.getDownloadTaskByUrl(task.getUrl());
-                    downLoadInfo.setMStatus(DownloadUtil.STATUS_FAIL);
-                    if(realCause != null)
-                        downLoadInfo.setRealCauseMsg(realCause.getMessage());
-                    DDProviderHelper.getInstance().updateDownload(downLoadInfo);
-                    EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.DOWNLOAD_FAIL).setData(downLoadInfo));
+                    if(downLoadInfo!=null) {
+                        downLoadInfo.setMStatus(DownloadUtil.STATUS_FAIL);
+                        if (realCause != null)
+                            downLoadInfo.setRealCauseMsg(realCause.getMessage());
+                        DDProviderHelper.getInstance().updateDownload(downLoadInfo);
+                        EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.DOWNLOAD_FAIL).setData(downLoadInfo));
+                    }
                     break;
                 case CANCELED://取消下载
                     downLoadInfo = downloadUtil.setDownloadTaskStatus(task.getUrl(), DownloadUtil.STATUS_PAUSE);

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

@@ -166,7 +166,7 @@ public class SignActivity extends BaseUMActivity {
             }
         });
         //如果不添加setFillEnabled和setFillAfter则动画执行结束后会自动回到远点
-        if(sheep_sign_egg_rl != null)
+        if (sheep_sign_egg_rl != null)
             sheep_sign_egg_rl.startAnimation(translateAnimation);
 
     }
@@ -190,7 +190,9 @@ public class SignActivity extends BaseUMActivity {
                         if (result == null) {
                             result = 0.01f;
                         }
-                        sign_etv.setText(String.format(Locale.CHINA, "绵羊币：%s", NumberFormatUtils.retainMost2(result)));
+                        if (sign_etv != null) {
+                            sign_etv.setText(String.format(Locale.CHINA, "绵羊币：%s", NumberFormatUtils.retainMost2(result)));
+                        }
                     }
 
                     @Override

app/src/main/res/layout/net_empty_fresh_list_not_wrap.xml

@@ -2,13 +2,10 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     android:background="@color/bg_gray">
 
     <include
-        android:id="@+id/title"
-        layout="@layout/title"/>
-
-    <include
         android:id="@+id/check_net_ll"
         layout="@layout/check_net_view"
         android:layout_width="match_parent"