Merge branch 'sheep_develop' of 10.8.230.114:xmy_android/small_sheep_android into sheep_develop

app/src/main/AndroidManifest.xml

@@ -848,6 +848,7 @@
         <!-- 小绵羊3.4.5 我的关注 -->
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActMyFocus"
+            android:theme="@style/AppActionTheme"
             android:screenOrientation="portrait" />
         <!-- 小绵羊3.4.5 足迹 -->
         <activity

app/src/main/java/com/sheep/gamegroup/greendao/download/DaoMaster.java

@@ -21,26 +21,26 @@ public class DaoMaster extends AbstractDaoMaster {
 
     /** Creates underlying database table using DAOs. */
     public static void createAllTables(Database db, boolean ifNotExists) {
-        ProcessRecordDao.createTable(db, ifNotExists);
-        AppdownloadBeanDao.createTable(db, ifNotExists);
-        SdkLoginUserDao.createTable(db, ifNotExists);
-        ScreenShotRecordDao.createTable(db, ifNotExists);
         AcceptTaskRecordDao.createTable(db, ifNotExists);
         AccountDao.createTable(db, ifNotExists);
-        SearchRecordDao.createTable(db, ifNotExists);
+        AppdownloadBeanDao.createTable(db, ifNotExists);
         DownLoadInfoDao.createTable(db, ifNotExists);
+        ProcessRecordDao.createTable(db, ifNotExists);
+        ScreenShotRecordDao.createTable(db, ifNotExists);
+        SdkLoginUserDao.createTable(db, ifNotExists);
+        SearchRecordDao.createTable(db, ifNotExists);
     }
 
     /** Drops underlying database table using DAOs. */
     public static void dropAllTables(Database db, boolean ifExists) {
-        ProcessRecordDao.dropTable(db, ifExists);
-        AppdownloadBeanDao.dropTable(db, ifExists);
-        SdkLoginUserDao.dropTable(db, ifExists);
-        ScreenShotRecordDao.dropTable(db, ifExists);
         AcceptTaskRecordDao.dropTable(db, ifExists);
         AccountDao.dropTable(db, ifExists);
-        SearchRecordDao.dropTable(db, ifExists);
+        AppdownloadBeanDao.dropTable(db, ifExists);
         DownLoadInfoDao.dropTable(db, ifExists);
+        ProcessRecordDao.dropTable(db, ifExists);
+        ScreenShotRecordDao.dropTable(db, ifExists);
+        SdkLoginUserDao.dropTable(db, ifExists);
+        SearchRecordDao.dropTable(db, ifExists);
     }
 
     /**
@@ -59,14 +59,14 @@ public class DaoMaster extends AbstractDaoMaster {
 
     public DaoMaster(Database db) {
         super(db, SCHEMA_VERSION);
-        registerDaoClass(ProcessRecordDao.class);
-        registerDaoClass(AppdownloadBeanDao.class);
-        registerDaoClass(SdkLoginUserDao.class);
-        registerDaoClass(ScreenShotRecordDao.class);
         registerDaoClass(AcceptTaskRecordDao.class);
         registerDaoClass(AccountDao.class);
-        registerDaoClass(SearchRecordDao.class);
+        registerDaoClass(AppdownloadBeanDao.class);
         registerDaoClass(DownLoadInfoDao.class);
+        registerDaoClass(ProcessRecordDao.class);
+        registerDaoClass(ScreenShotRecordDao.class);
+        registerDaoClass(SdkLoginUserDao.class);
+        registerDaoClass(SearchRecordDao.class);
     }
 
     public DaoSession newSession() {

app/src/main/java/com/sheep/gamegroup/greendao/download/DaoSession.java

@@ -8,23 +8,23 @@ import org.greenrobot.greendao.database.Database;
 import org.greenrobot.greendao.identityscope.IdentityScopeType;
 import org.greenrobot.greendao.internal.DaoConfig;
 
-import com.sheep.gamegroup.greendao.download.ProcessRecord;
-import com.sheep.gamegroup.greendao.download.AppdownloadBean;
-import com.sheep.gamegroup.greendao.download.SdkLoginUser;
-import com.sheep.gamegroup.greendao.download.ScreenShotRecord;
 import com.sheep.gamegroup.greendao.download.AcceptTaskRecord;
 import com.sheep.gamegroup.greendao.download.Account;
-import com.sheep.gamegroup.greendao.download.SearchRecord;
+import com.sheep.gamegroup.greendao.download.AppdownloadBean;
 import com.sheep.gamegroup.greendao.download.DownLoadInfo;
+import com.sheep.gamegroup.greendao.download.ProcessRecord;
+import com.sheep.gamegroup.greendao.download.ScreenShotRecord;
+import com.sheep.gamegroup.greendao.download.SdkLoginUser;
+import com.sheep.gamegroup.greendao.download.SearchRecord;
 
-import com.sheep.gamegroup.greendao.download.ProcessRecordDao;
-import com.sheep.gamegroup.greendao.download.AppdownloadBeanDao;
-import com.sheep.gamegroup.greendao.download.SdkLoginUserDao;
-import com.sheep.gamegroup.greendao.download.ScreenShotRecordDao;
 import com.sheep.gamegroup.greendao.download.AcceptTaskRecordDao;
 import com.sheep.gamegroup.greendao.download.AccountDao;
-import com.sheep.gamegroup.greendao.download.SearchRecordDao;
+import com.sheep.gamegroup.greendao.download.AppdownloadBeanDao;
 import com.sheep.gamegroup.greendao.download.DownLoadInfoDao;
+import com.sheep.gamegroup.greendao.download.ProcessRecordDao;
+import com.sheep.gamegroup.greendao.download.ScreenShotRecordDao;
+import com.sheep.gamegroup.greendao.download.SdkLoginUserDao;
+import com.sheep.gamegroup.greendao.download.SearchRecordDao;
 
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
 
@@ -35,112 +35,112 @@ import com.sheep.gamegroup.greendao.download.DownLoadInfoDao;
  */
 public class DaoSession extends AbstractDaoSession {
 
-    private final DaoConfig processRecordDaoConfig;
-    private final DaoConfig appdownloadBeanDaoConfig;
-    private final DaoConfig sdkLoginUserDaoConfig;
-    private final DaoConfig screenShotRecordDaoConfig;
     private final DaoConfig acceptTaskRecordDaoConfig;
     private final DaoConfig accountDaoConfig;
-    private final DaoConfig searchRecordDaoConfig;
+    private final DaoConfig appdownloadBeanDaoConfig;
     private final DaoConfig downLoadInfoDaoConfig;
+    private final DaoConfig processRecordDaoConfig;
+    private final DaoConfig screenShotRecordDaoConfig;
+    private final DaoConfig sdkLoginUserDaoConfig;
+    private final DaoConfig searchRecordDaoConfig;
 
-    private final ProcessRecordDao processRecordDao;
-    private final AppdownloadBeanDao appdownloadBeanDao;
-    private final SdkLoginUserDao sdkLoginUserDao;
-    private final ScreenShotRecordDao screenShotRecordDao;
     private final AcceptTaskRecordDao acceptTaskRecordDao;
     private final AccountDao accountDao;
-    private final SearchRecordDao searchRecordDao;
+    private final AppdownloadBeanDao appdownloadBeanDao;
     private final DownLoadInfoDao downLoadInfoDao;
+    private final ProcessRecordDao processRecordDao;
+    private final ScreenShotRecordDao screenShotRecordDao;
+    private final SdkLoginUserDao sdkLoginUserDao;
+    private final SearchRecordDao searchRecordDao;
 
     public DaoSession(Database db, IdentityScopeType type, Map<Class<? extends AbstractDao<?, ?>>, DaoConfig>
             daoConfigMap) {
         super(db);
 
-        processRecordDaoConfig = daoConfigMap.get(ProcessRecordDao.class).clone();
-        processRecordDaoConfig.initIdentityScope(type);
+        acceptTaskRecordDaoConfig = daoConfigMap.get(AcceptTaskRecordDao.class).clone();
+        acceptTaskRecordDaoConfig.initIdentityScope(type);
+
+        accountDaoConfig = daoConfigMap.get(AccountDao.class).clone();
+        accountDaoConfig.initIdentityScope(type);
 
         appdownloadBeanDaoConfig = daoConfigMap.get(AppdownloadBeanDao.class).clone();
         appdownloadBeanDaoConfig.initIdentityScope(type);
 
-        sdkLoginUserDaoConfig = daoConfigMap.get(SdkLoginUserDao.class).clone();
-        sdkLoginUserDaoConfig.initIdentityScope(type);
+        downLoadInfoDaoConfig = daoConfigMap.get(DownLoadInfoDao.class).clone();
+        downLoadInfoDaoConfig.initIdentityScope(type);
+
+        processRecordDaoConfig = daoConfigMap.get(ProcessRecordDao.class).clone();
+        processRecordDaoConfig.initIdentityScope(type);
 
         screenShotRecordDaoConfig = daoConfigMap.get(ScreenShotRecordDao.class).clone();
         screenShotRecordDaoConfig.initIdentityScope(type);
 
-        acceptTaskRecordDaoConfig = daoConfigMap.get(AcceptTaskRecordDao.class).clone();
-        acceptTaskRecordDaoConfig.initIdentityScope(type);
-
-        accountDaoConfig = daoConfigMap.get(AccountDao.class).clone();
-        accountDaoConfig.initIdentityScope(type);
+        sdkLoginUserDaoConfig = daoConfigMap.get(SdkLoginUserDao.class).clone();
+        sdkLoginUserDaoConfig.initIdentityScope(type);
 
         searchRecordDaoConfig = daoConfigMap.get(SearchRecordDao.class).clone();
         searchRecordDaoConfig.initIdentityScope(type);
 
-        downLoadInfoDaoConfig = daoConfigMap.get(DownLoadInfoDao.class).clone();
-        downLoadInfoDaoConfig.initIdentityScope(type);
-
-        processRecordDao = new ProcessRecordDao(processRecordDaoConfig, this);
-        appdownloadBeanDao = new AppdownloadBeanDao(appdownloadBeanDaoConfig, this);
-        sdkLoginUserDao = new SdkLoginUserDao(sdkLoginUserDaoConfig, this);
-        screenShotRecordDao = new ScreenShotRecordDao(screenShotRecordDaoConfig, this);
         acceptTaskRecordDao = new AcceptTaskRecordDao(acceptTaskRecordDaoConfig, this);
         accountDao = new AccountDao(accountDaoConfig, this);
-        searchRecordDao = new SearchRecordDao(searchRecordDaoConfig, this);
+        appdownloadBeanDao = new AppdownloadBeanDao(appdownloadBeanDaoConfig, this);
         downLoadInfoDao = new DownLoadInfoDao(downLoadInfoDaoConfig, this);
+        processRecordDao = new ProcessRecordDao(processRecordDaoConfig, this);
+        screenShotRecordDao = new ScreenShotRecordDao(screenShotRecordDaoConfig, this);
+        sdkLoginUserDao = new SdkLoginUserDao(sdkLoginUserDaoConfig, this);
+        searchRecordDao = new SearchRecordDao(searchRecordDaoConfig, this);
 
-        registerDao(ProcessRecord.class, processRecordDao);
-        registerDao(AppdownloadBean.class, appdownloadBeanDao);
-        registerDao(SdkLoginUser.class, sdkLoginUserDao);
-        registerDao(ScreenShotRecord.class, screenShotRecordDao);
         registerDao(AcceptTaskRecord.class, acceptTaskRecordDao);
         registerDao(Account.class, accountDao);
-        registerDao(SearchRecord.class, searchRecordDao);
+        registerDao(AppdownloadBean.class, appdownloadBeanDao);
         registerDao(DownLoadInfo.class, downLoadInfoDao);
+        registerDao(ProcessRecord.class, processRecordDao);
+        registerDao(ScreenShotRecord.class, screenShotRecordDao);
+        registerDao(SdkLoginUser.class, sdkLoginUserDao);
+        registerDao(SearchRecord.class, searchRecordDao);
     }
     
     public void clear() {
-        processRecordDaoConfig.clearIdentityScope();
-        appdownloadBeanDaoConfig.clearIdentityScope();
-        sdkLoginUserDaoConfig.clearIdentityScope();
-        screenShotRecordDaoConfig.clearIdentityScope();
         acceptTaskRecordDaoConfig.clearIdentityScope();
         accountDaoConfig.clearIdentityScope();
-        searchRecordDaoConfig.clearIdentityScope();
+        appdownloadBeanDaoConfig.clearIdentityScope();
         downLoadInfoDaoConfig.clearIdentityScope();
+        processRecordDaoConfig.clearIdentityScope();
+        screenShotRecordDaoConfig.clearIdentityScope();
+        sdkLoginUserDaoConfig.clearIdentityScope();
+        searchRecordDaoConfig.clearIdentityScope();
     }
 
-    public ProcessRecordDao getProcessRecordDao() {
-        return processRecordDao;
+    public AcceptTaskRecordDao getAcceptTaskRecordDao() {
+        return acceptTaskRecordDao;
+    }
+
+    public AccountDao getAccountDao() {
+        return accountDao;
     }
 
     public AppdownloadBeanDao getAppdownloadBeanDao() {
         return appdownloadBeanDao;
     }
 
-    public SdkLoginUserDao getSdkLoginUserDao() {
-        return sdkLoginUserDao;
+    public DownLoadInfoDao getDownLoadInfoDao() {
+        return downLoadInfoDao;
     }
 
-    public ScreenShotRecordDao getScreenShotRecordDao() {
-        return screenShotRecordDao;
+    public ProcessRecordDao getProcessRecordDao() {
+        return processRecordDao;
     }
 
-    public AcceptTaskRecordDao getAcceptTaskRecordDao() {
-        return acceptTaskRecordDao;
+    public ScreenShotRecordDao getScreenShotRecordDao() {
+        return screenShotRecordDao;
     }
 
-    public AccountDao getAccountDao() {
-        return accountDao;
+    public SdkLoginUserDao getSdkLoginUserDao() {
+        return sdkLoginUserDao;
     }
 
     public SearchRecordDao getSearchRecordDao() {
         return searchRecordDao;
     }
 
-    public DownLoadInfoDao getDownLoadInfoDao() {
-        return downLoadInfoDao;
-    }
-
 }

app/src/main/java/com/sheep/gamegroup/model/entity/UserFootprint.java

@@ -114,9 +114,31 @@ public class UserFootprint {
         return this.user_id;
     }
 
+
+
+//    足迹类型 1:游戏,应用 2:任务 3:咨询
+    public static final int TYPE_APP = 1;
+    public static final int TYPE_TASK = 2;
+    public static final int TYPE_ARTICLE = 3;
+
+    public boolean isApp(){
+        return type == TYPE_APP;
+    }
+    public boolean isTask(){
+        return type == TYPE_TASK;
+    }
+    public boolean isArticle(){
+        return type == TYPE_ARTICLE;
+    }
+
     public CharSequence getInfo() {
-        return new SpannableSb().append(name, R.dimen.text_size_15, "#333333").checkAndBr()
-                .append(String.format(Locale.CHINA, "+%s元", NumberFormatUtils.retainMost2(bonus)), R.dimen.text_size_15, "#FD2D54")
-                .getSsb();
+        SpannableSb spannableSb = new SpannableSb().append(name, R.dimen.text_size_15, "#333333");
+        switch (type){
+            case TYPE_TASK:
+                spannableSb
+                        .checkAndBr()
+                        .append(String.format(Locale.CHINA, "+%s元", NumberFormatUtils.retainMost2(bonus)), R.dimen.text_size_15, "#FD2D54");
+        }
+        return spannableSb.getSsb();
     }
 }

app/src/main/java/com/sheep/gamegroup/model/util/SheepSubscriber.java

@@ -36,7 +36,7 @@ public abstract class SheepSubscriber<T> implements Observer<T> {
     @Override
     public void onSubscribe(Disposable d) {
         if (!NetUtil.isConnected(context)) {
-            G.shortToast("当前网络不可用，请检查网络情况");
+            ActivityManager.getInstance().currentActivity().runOnUiThread(() -> G.shortToast("当前网络不可用，请检查网络情况"));
             // 一定好主动调用下面这一句,取消本次Subscriber订阅
             if (!d.isDisposed()) {
                 d.dispose();

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

@@ -11,6 +11,7 @@ import android.widget.ImageView;
 
 import com.sheep.gamegroup.module.login.controller.LoginController;
 import com.sheep.gamegroup.util.StringUtils;
+import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 import com.sheep.jiuyan.samllsheep.utils.G;
@@ -55,7 +56,7 @@ public class FindAccountFgt extends BaseFragment {
 
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
-                textDeleteBtn.setVisibility(TextUtils.isEmpty(s) ? View.GONE : View.VISIBLE);
+                ViewUtil.setVisibility(textDeleteBtn, !TextUtils.isEmpty(s));
             }
 
             @Override

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

@@ -112,7 +112,7 @@ public class KFZSJs {
         shareLink(link, iconUrl, title, des, ShareLinkConfig.ALL);
     }
     private void shareLink(String link, String iconUrl, String title, String des,@ShareLinkConfig.SHARE_TYPE String shareType) {
-        new ShareLinkConfig().setLink(link).setIconUrl(iconUrl).setTitle(title).setDes(des).setShareType(shareType).toShare(activity);
+        activity.runOnUiThread(() -> new ShareLinkConfig().setLink(link).setIconUrl(iconUrl).setTitle(title).setDes(des).setShareType(shareType).toShare(activity));
     }
 
     @JavascriptInterface

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

@@ -32,7 +32,9 @@ public class ActMyFocus extends BaseActivity {
 
     @Override
     public void initView() {
-        TitleBarUtils.getInstance().setTitle(this, "我的关注")
+        TitleBarUtils.getInstance()
+                .setShowOrHide(this, true)
+                .setTitle(this, "我的关注")
                 .setTitleFinish(this);
 
     }

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

@@ -250,7 +250,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         adpTaskDetailChildListview = new AdpTaskDetailChildListview(taskChildList, activity);
         detail_task_listview.setAdapter(adpTaskDetailChildListview);
         adpTaskDetailChildListview.notifyDataSetChanged();
-        bottom_btn_layout.setVisibility(View.GONE);
+        ViewUtil.setVisibility(bottom_btn_layout, false);
         ViewUtil.setDefaultText(nameTv);
         ViewUtil.setDefaultText(priceTv);
         ViewUtil.setDefaultText(dateTv);
@@ -303,7 +303,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         GlideImageLoader.setGameImage(iconIv, taskEty.getIcon());
 
 
-        detailTaskTv.setVisibility(View.GONE);
+        ViewUtil.setVisibility(detailTaskTv, false);
 
 
         setSonVuewShow();
@@ -319,9 +319,9 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     AppUsageManager.getInstance().openLookAppUsageStatsPermission();
                 }
             });
-            taskdetail_explain_layout.setVisibility(View.VISIBLE);
+            ViewUtil.setVisibility(taskdetail_explain_layout, true);
         } else {
-            taskdetail_explain_layout.setVisibility(View.GONE);
+            ViewUtil.setVisibility(taskdetail_explain_layout, false);
         }
         /**
          * detail_task_tv 游戏任务，显示
@@ -1265,7 +1265,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     @Override
     public void taskDescSuccess(BaseMessage baseMessage) {
         hideProgress();
-        empty_view.setVisibility(View.GONE);
+        ViewUtil.setVisibility(empty_view, false);
         taskReleaseEty = baseMessage.getData(Release_task.class);
         loadData();
     }
@@ -1633,7 +1633,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     if (empty_view == null) {
                         return;
                     }
-                    empty_view.setVisibility(View.GONE);
+                    ViewUtil.setVisibility(empty_view, false);
                     loadData();
                 }
             }
@@ -1647,7 +1647,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             if (empty_view == null) {
                 return;
             }
-            empty_view.setVisibility(View.GONE);
+            ViewUtil.setVisibility(empty_view, false);
             loadData();
         }
         presenter.taskDesc(releaseTaskId);

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

@@ -20,11 +20,13 @@ import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.FootprintCountRespons;
 import com.sheep.gamegroup.model.entity.UserFootprint;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.util.share.ShareLinkConfig;
+import com.sheep.gamegroup.util.string.SpannableSb;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
@@ -81,17 +83,35 @@ public class FgtFootprint extends BaseListFragment4<UserFootprint> {
                 .setShowOrHide(getActivity(), true)
                 .setTitleFinish(activity)
                 .setTitle(activity, "足迹")
-                .setRightImgBotton(activity, R.mipmap.share, new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        new ShareLinkConfig().toShare(activity);
-                    }
-                });
+//                .setRightImgBotton(activity, R.mipmap.share, new View.OnClickListener() {
+//                    @Override
+//                    public void onClick(View view) {
+//                        new ShareLinkConfig().toShare(activity);
+//                    }
+//                })
+        ;
 
         view_list = mRecyclerView;
         initAdapter();
         mRecyclerView.setLayoutManager(new LinearLayoutManager(SheepApp.getInstance()));
         mRecyclerView.setAdapter(adapter);
+        adapter.setOnItemClickListener((adapter, view, position) -> {
+            UserFootprint item = ListUtil.getItem(list, position);
+            if(item != null){
+                switch (item.getType()){
+                    default:
+                    case UserFootprint.TYPE_APP:
+                        Jump2View.getInstance().goPlayGameDetail(activity, item.getRelation_id());
+                        break;
+                    case UserFootprint.TYPE_ARTICLE:
+                        Jump2View.getInstance().goFindItem(activity, item.getRelation_id());
+                        break;
+                    case UserFootprint.TYPE_TASK:
+                        Jump2View.getInstance().goTaskDetailView(activity, item.getRelation_id());
+                        break;
+                }
+            }
+        });
 
         int maxYear = mCalendarView.getCurYear();
         int maxYearMonth = mCalendarView.getCurMonth();

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

@@ -56,6 +56,8 @@ public class FgtFriendExtractPage extends BaseFragment {
     public static int per_page = 5;
     private int page = 1;
     private void notifyDataSetChanged(){
+        if(friend_list_ll == null)
+            return;
         int size = list.size();
         for (int i = 0; i < friend_list_ll.getChildCount(); ) {
             View line = friend_list_ll.getChildAt(i);

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

@@ -86,7 +86,11 @@ public class FgtMainAudit extends BaseFragment {
     @Override
     public void onViewCreated() {
         activity = getActivity();
-        EventBus.getDefault().register(this);
+        try {
+            EventBus.getDefault().register(this);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         if(activity instanceof ActMain){
             TitleBarUtils.getInstance()
                     .setTitle(getActivity(), "审核中心")

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

@@ -100,17 +100,21 @@ public class ListenerShotNewService extends Service {
             //初始化获取当前应用的工具类
             runningTaskUtil = new RunningTaskUtil(getApplicationContext());
         }
-        if(manager == null) {
-            //开启监听
-            manager = ScreenShotListenManager.newInstance(getApplicationContext());
-            manager.setListener(
-                    new ScreenShotListenManager.OnScreenShotListener() {
-                        public void onShot(String imagePath) {
-                            addPng(imagePath);
+        try {
+            if(manager == null) {
+                //开启监听
+                manager = ScreenShotListenManager.newInstance(getApplicationContext());
+                manager.setListener(
+                        new ScreenShotListenManager.OnScreenShotListener() {
+                            public void onShot(String imagePath) {
+                                addPng(imagePath);
+                            }
                         }
-                    }
-            );
-            manager.startListen();
+                );
+                manager.startListen();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
         return super.onStartCommand(intent, flags, startId);
     }

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

@@ -166,7 +166,8 @@ public class SignActivity extends BaseUMActivity {
             }
         });
         //如果不添加setFillEnabled和setFillAfter则动画执行结束后会自动回到远点
-        sheep_sign_egg_rl.startAnimation(translateAnimation);
+        if(sheep_sign_egg_rl != null)
+            sheep_sign_egg_rl.startAnimation(translateAnimation);
 
     }
 

app/src/main/java/com/sheep/jiuyan/samllsheep/utils/PackageUtil.java

@@ -185,7 +185,11 @@ public class PackageUtil {
             ComponentName cn = new ComponentName(packageName, className);
             intent.setComponent(cn);
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            context.startActivity(intent);
+            try {
+                context.startActivity(intent);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
         UMConfigUtils.onEvent(UMConfigUtils.Event.TASK_START_APP);
     }

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

@@ -73,7 +73,7 @@
 
         <ImageView
             style="@style/style_item_img"
-            android:src="@mipmap/order_manager" />
+            android:src="@mipmap/ic_focus" />
 
         <TextView
             style="@style/style_item_label"