修复h5连续任务提交截图失败的bug；

分享添加qq空间分享功能；
截图监听中暂时不筛选图片大小与路径；
礼包中心图片显示

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

@@ -113,6 +113,7 @@ import static com.sheep.gamegroup.util.UMConfigUtils.Event.QR_COPY;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.RECEIVE_AWARD_GAME_TASK;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.SHARE_SYS_SEND;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.SHARE_TO_QQ;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.SHARE_TO_QZONE;
 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.UMConfigUtils.Event.XIAOMI_GAME_RECEIVE;
@@ -825,6 +826,10 @@ public class CommonUtil {
                 SHARE_TO_QQ.onEvent();
                 share_media = SHARE_MEDIA.QQ;
                 break;
+            case DialogShare.QZONE:
+                SHARE_TO_QZONE.onEvent();
+                share_media = SHARE_MEDIA.QZONE;
+                break;
             case DialogShare.WX:
                 SHARE_TO_WX.onEvent();
                 share_media = SHARE_MEDIA.WEIXIN;

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

@@ -378,7 +378,7 @@ public class DataUtil {
      * @return
      */
     @SuppressLint("NewApi")
-    public String getPackageNameInForeground() {
+    public static String getPackageNameInForeground() {
         if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
             UsageStatsManager mUsageStatsManager = (UsageStatsManager) SheepApp.getInstance().getSystemService(Context.USAGE_STATS_SERVICE);//usagestats
             long time = System.currentTimeMillis();
@@ -404,7 +404,7 @@ public class DataUtil {
         return null;
     }
 
-    private android.app.ActivityManager.RunningAppProcessInfo getAppProcessInfoInForeground() {
+    private static android.app.ActivityManager.RunningAppProcessInfo getAppProcessInfoInForeground() {
         android.app.ActivityManager manager = (android.app.ActivityManager) SheepApp.getInstance().getSystemService(Context.ACTIVITY_SERVICE);
         List<android.app.ActivityManager.RunningAppProcessInfo> processList = manager == null ? null : manager.getRunningAppProcesses();
         if (!ListUtil.isEmpty(processList)) {

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

@@ -73,7 +73,7 @@ public class ScreenShotListenManager {
     private static final String[] KEYWORDS = {
             "screenshot", "screen_shot", "screen-shot", "screen shot",
             "screencapture", "screen_capture", "screen-capture", "screen capture",
-            "screencap", "screen_cap", "screen-cap", "screen cap"
+            "screencap", "screen_cap", "screen-cap", "screen cap", "截屏"
     };
 
     private static Point sScreenRealSize;
@@ -243,7 +243,6 @@ public class ScreenShotListenManager {
         BitmapFactory.decodeFile(imagePath, options);
         return new Point(options.outWidth, options.outHeight);
     }
-
     /**
      * 处理获取到的一行数据
      */
@@ -261,6 +260,17 @@ public class ScreenShotListenManager {
         }
     }
 
+    private boolean isCheckScreenShotSize = false;//检查图片是否为截图
+    private boolean isCheckScreenShotWord = false;//检查图片是否为截图
+
+    public void setCheckScreenShotSize(boolean checkScreenShotSize) {
+        isCheckScreenShotSize = checkScreenShotSize;
+    }
+
+    public void setCheckScreenShotWord(boolean checkScreenShotWord) {
+        isCheckScreenShotWord = checkScreenShotWord;
+    }
+
     /**
      * 判断指定的数据行是否符合截屏条件
      */
@@ -276,7 +286,7 @@ public class ScreenShotListenManager {
         /*
          * 判断依据二: 尺寸判断
          */
-        if (sScreenRealSize != null) {
+        if (isCheckScreenShotSize && sScreenRealSize != null) {
             // 如果图片尺寸超出屏幕, 则认为当前没有截屏
             if (
                     !(
@@ -294,6 +304,9 @@ public class ScreenShotListenManager {
         if (TextUtils.isEmpty(data)) {
             return false;
         }
+        if(!isCheckScreenShotWord){
+            return true;
+        }
         data = data.toLowerCase();
         // 判断图片路径是否含有指定的关键字之一, 如果有, 则认为当前截屏了
         for (String keyWork : KEYWORDS) {

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

@@ -174,6 +174,7 @@ public class UMConfigUtils {
         SYSTEM_NOTIFICATION_DETAIL("消息详情页面"),
         ASK_MAKE_MONEY_INVITATION("邀请赚钱分享页面"),
         SHARE_SYS_SEND("通过系统分享文件"),
+        SHARE_TO_QZONE("分享到QQ空间"),
         ;
         private String tag;
 

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

@@ -1407,28 +1407,31 @@ public class ViewUtil {
                 .create();
 //        TextView ask_share_title = dialog_parent.findViewById(R.id.ask_share_title);
         RecyclerView ask_share_list = dialog_parent.findViewById(R.id.ask_share_list);
-        GridLayoutManager gridLayoutManager = new GridLayoutManager(activity, 5);
-        ask_share_list.setLayoutManager(gridLayoutManager);
 //        ask_share_list.setHasFixedSize(true);
 //        ask_share_list.setNestedScrollingEnabled(false);
         List<String> list = ListUtil.emptyList();
-        list.add(DialogShare.SYS_SEND);
+//        list.add(DialogShare.SYS_SEND);
         list.add(DialogShare.WX);
         list.add(DialogShare.QQ);
         list.add(DialogShare.WEIXIN_CIRCLE);
-        list.add(DialogShare.COPY_SHARE_LINK);
+        list.add(DialogShare.QZONE);
+//        list.add(DialogShare.COPY_SHARE_LINK);
         final List<String> imgList = ListUtil.emptyList();
-        imgList.add("share_face_to_face");
+//        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");
+        imgList.add("share_qzone");
+//        imgList.add("share_copy_share_link");
         final List<String> nameList = ListUtil.emptyList();
-        nameList.add("分享app");
+//        nameList.add("分享app");
         nameList.add("微信");
         nameList.add("QQ好友");
         nameList.add("朋友圈");
-        nameList.add("复制链接");
+        nameList.add("QQ空间");
+//        nameList.add("复制链接");
+        GridLayoutManager gridLayoutManager = new GridLayoutManager(activity, list.size());
+        ask_share_list.setLayoutManager(gridLayoutManager);
         AdbCommonRecycler<String> adapter = new AdbCommonRecycler<String>(activity, list) {
 
             @Override

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

@@ -73,7 +73,6 @@ public class ActGiftDetail extends BaseActivity {
         item_download_welfare_iv2.setVisibility(View.GONE);
         item_download_welfare_money.setVisibility(View.GONE);
         item_download_welfare_num_tv.setVisibility(View.GONE);
-        item_download_welfare_iv.setVisibility(View.GONE);
         item_download_welfare_btn_bottom.setVisibility(View.GONE);
         ViewUtil.setDefaultText(item_download_welfare_name_tv);
         item_download_welfare_btn_center.setVisibility(View.VISIBLE);

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

@@ -433,10 +433,10 @@ public class ActSignCard extends BaseActivity {
         if(punchAndSign != null && initCanSignUp == SUCCESS && punchType > SUCCESS){//初始化成功
             if (punchType == 3) {//可以打卡
                 sign_card_join.setEnabled(true);
-                sign_card_join.setText("参加打卡挑战");
+                sign_card_join.setText("立即打卡");
             } else if (isCanSignUp) {//可以报名
                 sign_card_join.setEnabled(true);
-                sign_card_join.setText("报名打卡");
+                sign_card_join.setText("参加打卡挑战");
             } else if(totalTime == INIT) {//只设置一次
                 sign_card_join.setEnabled(false);
                 totalTime = punchAndSign.getCountdown();

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

@@ -1069,11 +1069,9 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 //                            onGetNetImageUrl(data);
         dismissLoaddingDialog();
         G.showToast("提交成功，等待审核!");
-        if (DataUtil.IS_USE_SCREEN_SHOT || DataUtil.IS_LISTEN_SCREEN_SHOT) {//小绵羊截图方案或者监听方案：上传截图成功后删除之前的截图
-            if (DataUtil.IS_USE_SCREEN_SHOT) {//小绵羊截图方案：上传截图成功后删除之前的截图
-                if(!TextUtils.isEmpty(taskEty.getPackage_names())){
-                    DataUtil.getInstance().clearScreenShots(taskEty.getPackage_names());
-                }
+        if ((DataUtil.IS_USE_SCREEN_SHOT || DataUtil.IS_LISTEN_SCREEN_SHOT) && taskEty.needShotScreen()) {//小绵羊截图方案或者监听方案：上传截图成功后删除之前的截图
+            if(!TextUtils.isEmpty(taskEty.getPackage_names())){
+                DataUtil.getInstance().clearScreenShots(taskEty.getPackage_names());
             }
         }
         UMConfigUtils.finishTask();
@@ -1140,7 +1138,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
      * @return
      */
     protected ICallBack<String> getCallBack(){
-        if (DataUtil.IS_USE_SCREEN_SHOT || DataUtil.IS_LISTEN_SCREEN_SHOT) {
+        if ((DataUtil.IS_USE_SCREEN_SHOT || DataUtil.IS_LISTEN_SCREEN_SHOT) && taskEty.needShotScreen()) {//小绵羊截图方案或者监听方案：上传截图成功后删除之前的截图
             return callBack;
         }
         return null;

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogShare.java

@@ -28,13 +28,14 @@ public class DialogShare {
     public final static String FACE_TO_FACE = "face_to_face";
     public final static String COPY_SHARE_LINK = "copy_share_link";
     public final static String WEIXIN_CIRCLE = "weixin_circle";
+    public final static String QZONE = "qzone";
     public final static String QQ = "qq";
     public final static String WX = "wx";
     public final static String ALL = "all";
     public final static String SYS_SEND = "sys_send";
     public final static String OTHER = "other";
 
-    @StringDef({FACE_TO_FACE, COPY_SHARE_LINK, WEIXIN_CIRCLE, QQ, WX, OTHER, SYS_SEND, ALL})
+    @StringDef({FACE_TO_FACE, COPY_SHARE_LINK, WEIXIN_CIRCLE, QZONE, QQ, WX, OTHER, SYS_SEND, ALL})
     @Retention(RetentionPolicy.SOURCE)
     public @interface SHARE_TYPE {
     }