Merge remote-tracking branch 'origin/master' into sheep_tinker_3.0.2

app/src/main/java/com/kfzs/duanduan/fragment/FgtPersonalCenter.java

@@ -184,14 +184,19 @@ public class FgtPersonalCenter extends BaseCompatFragment {
      * @return 是否显示红包
      */
     private void isShowRedPackage() {
-         // DataUtil.getInstance().是官方包吗();
+        // DataUtil.getInstance().是官方包吗();
         if (userEntity == null) {
             userEntity = DataUtil.getInstance().getUserEntity();
         }
-        if (!userEntity.getParent_code().equals("") || (userEntity.getCreate_time_line() < 2) || (userEntity.getPackage_cate() == 1)) {
+        if (userEntity.getParent_code() != null) {
             ivRedpackage.setVisibility(View.GONE);
+            return;
         } else {
-            ivRedpackage.setVisibility(View.VISIBLE);
+            if (!userEntity.getParent_code().equals("") || (userEntity.getCreate_time_line() < 2) || (userEntity.getPackage_cate() == 1)) {
+                ivRedpackage.setVisibility(View.GONE);
+            } else {
+                ivRedpackage.setVisibility(View.VISIBLE);
+            }
         }
     }
 
@@ -315,7 +320,7 @@ public class FgtPersonalCenter extends BaseCompatFragment {
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.ibtn_baseactivity_message://消息
-               // startActivity(new Intent(activity, ActivityMessages.class));
+                // startActivity(new Intent(activity, ActivityMessages.class));
                 break;
             case R.id.iv_redpackage://邀请成功后有可领红包
                 ViewUtil.changeRedPackage(getActivity(), getView(), FgtPersonalCenter.this);

app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -26,6 +26,7 @@ import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.view.animation.Animation;
 import android.view.animation.OvershootInterpolator;
 import android.view.animation.TranslateAnimation;
@@ -233,15 +234,15 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                     tryMakeMoneyAdp.clear();
                     //正在进行中的任务列表
                     boolean isAcceptedTaskListEmpty = ListUtil.isEmpty(allTaskAcceptedTaskList);
-                    if(!isAcceptedTaskListEmpty){
+                    if (!isAcceptedTaskListEmpty) {
                         tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, allTaskAcceptedTaskList));
                     }
                     //正在进行中的任务下面的线是否显示
-                    if(recyclerview_line != null)
+                    if (recyclerview_line != null)
                         recyclerview_line.setVisibility(isAcceptedTaskListEmpty ? View.GONE : View.VISIBLE);
 
                     //发布的任务列表----注：3.0开始已经没有展示，使用viewpager展示
-                    if(!ListUtil.isEmpty(releaseEtyLists)) {
+                    if (!ListUtil.isEmpty(releaseEtyLists)) {
                         tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyLists));
                     }
                     tryMakeMoneyAdp.notifyDataSetChanged();
@@ -249,12 +250,12 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                     break;
                 case WHAT_UPDATE_VP_HEIGHT:
                     FgtTryMakeMoney item = (FgtTryMakeMoney) adpViewPagerDetail.getItem(curPosition);
-                    if(mViewPager == null || item == null){
+                    if (mViewPager == null || item == null) {
                         return;
                     }
                     int count = item.getDataCount();
                     ViewGroup.LayoutParams params = mViewPager.getLayoutParams();
-                    params.height = count == 0 ? G.HEIGHT / 2 : (count * getResources().getDimensionPixelSize(R.dimen.content_padding_96)+getResources().getDimensionPixelSize(R.dimen.content_padding));
+                    params.height = count == 0 ? G.HEIGHT / 2 : (count * getResources().getDimensionPixelSize(R.dimen.content_padding_96) + getResources().getDimensionPixelSize(R.dimen.content_padding));
                     mViewPager.setLayoutParams(params);
                     break;
                 case WHAT_TRY_SHOW_HB:
@@ -264,6 +265,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
         }
     };
+
     /**
      * @return 是否显示兑换邀请码红包
      */
@@ -272,12 +274,17 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         if (userEntity == null) {
             userEntity = DataUtil.getInstance().getUserEntity();
         }
-        if (!userEntity.getParent_code().equals("") || (userEntity.getCreate_time_line() < 2) || (userEntity.getPackage_cate() == 1)) {
-
+        if (userEntity.getParent_code() != null) {
+            return;
         } else {
-           changeRedPackage(getActivity(),LayoutInflater.from(getContext()).inflate(R.layout.activity_main,null),this);
+            if (!userEntity.getParent_code().equals("") || (userEntity.getCreate_time_line() < 2) || (userEntity.getPackage_cate() == 1)) {
+
+            } else {
+                changeRedPackage(getActivity(), LayoutInflater.from(getContext()).inflate(R.layout.activity_main, null), this);
+            }
         }
     }
+
     /**
      * 兑换红包弹窗
      *
@@ -324,6 +331,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         });
 
     }
+
     /**
      * 兑换红包
      *
@@ -342,7 +350,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        showRedPackageAfterInvitation(activity, LayoutInflater.from(getContext()).inflate(R.layout.activity_main,null), baseMessage);
+                        showRedPackageAfterInvitation(activity, LayoutInflater.from(getContext()).inflate(R.layout.activity_main, null), baseMessage);
                         if (popupWindow.isShowing()) {
                             popupWindow.dismiss();
                         }
@@ -350,6 +358,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                     }
                 });
     }
+
     /**
      * 邀请成功后在个人资料显示领红包弹窗
      *
@@ -426,7 +435,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     }
 
 
-
     /**
      * 新手任务对话框中，注册账号并登录得红包，这里判断是否已经领取过了，如果领取过了就不显示，不然就显示
      *
@@ -438,6 +446,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         }
         if (((userEntity.getNewbie_task_status() & 16) == 0) && userEntity.getIs_new() == 1) {
             showRedPackage(obj);
+
         }
 
     }
@@ -451,7 +460,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         }
 
         if (SpUtils.getFirst("first" + userEntity.getId())) {//不是第一次进入APP
-            isShowRedPackageWithCode();//虽然不是第一次，但是邀请码的那个红包还是让它显示
             return;
         }
         SpUtils.saveFirst("first" + userEntity.getId(), true);//第一次登录成功后保存起来，下次进来就不再弹新人红包
@@ -499,7 +507,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
          */
         adpViewPagerDetail = new AdpTryMakemoney(getChildFragmentManager(), activity);
         adpViewPagerDetail.add(FgtTryMakeMoney.newInstance(0, "is_hot"), "每日必做");
-        adpViewPagerDetail.add(FgtTryMakeMoney.newInstance(1,"about_to_begin"), "即将开始");
+        adpViewPagerDetail.add(FgtTryMakeMoney.newInstance(1, "about_to_begin"), "即将开始");
 
 //        mViewPager.setOffscreenPageLimit(2);
         mViewPager.setAdapter(adpViewPagerDetail);
@@ -531,7 +539,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
     /**
      * 给请红包浮标设置动画，达到左右晃动
-     * @param imageView  设置动画的imageview
+     *
+     * @param imageView 设置动画的imageview
      */
     private void setAnimation(ImageView imageView) {
         TranslateAnimation animation = new TranslateAnimation(0, -5, 0, 0);
@@ -620,7 +629,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
         //用户信息
         userEntity = DataUtil.getInstance().getUserEntity();
-        if(userEntity != null){
+        if (userEntity != null) {
             loadUserInfo();
         }
         //任务
@@ -633,13 +642,13 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
         //实时动态
         List<MoreDataEntity> cacheMoreDataEtyList = DataUtil.getInstance().getCacheList(ApiKey.award_detail, MoreDataEntity.class);
-        if(!ListUtil.isEmpty(cacheMoreDataEtyList)){
+        if (!ListUtil.isEmpty(cacheMoreDataEtyList)) {
             invite(cacheMoreDataEtyList);
         }
 
         //公告
         List<BulletinEnty> cacheBulletinEtyList = DataUtil.getInstance().getCacheList(ApiKey.bulletin, BulletinEnty.class);
-        if(ListUtil.isEmpty(cacheBulletinEtyList)){
+        if (ListUtil.isEmpty(cacheBulletinEtyList)) {
             homepageItemNoticeLayout.setVisibility(View.GONE);
         } else {
             bulletinEntyLists.clear();
@@ -648,7 +657,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         }
         //轮播
         List<SlideshowEty> cacheSlideshowEtyList = DataUtil.getInstance().getCacheList(ApiKey.slideshow, SlideshowEty.class);
-        if(ListUtil.isEmpty(cacheSlideshowEtyList)){
+        if (ListUtil.isEmpty(cacheSlideshowEtyList)) {
             banner.setVisibility(View.GONE);
         } else {
             for (SlideshowEty slideshowEty : cacheSlideshowEtyList) {
@@ -660,7 +669,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         }
         //首页list
         List<HomeListEntity> cacheHomeListEtyList = DataUtil.getInstance().getCacheList(ApiKey.home_list, HomeListEntity.class);
-        if(ListUtil.isEmpty(cacheHomeListEtyList)){
+        if (ListUtil.isEmpty(cacheHomeListEtyList)) {
             home_list_gridview_layout.setVisibility(View.GONE);
         } else {
             home_list_gridview_layout.setVisibility(View.VISIBLE);
@@ -717,7 +726,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             homepageItemNoticeMv.stopFlipping();
             homepageItemNoticeMv.startFlipping();
         }
-        if(onResumeCount > 0 || userEntity == null)//非第一次才更新用户信息
+        if (onResumeCount > 0 || userEntity == null)//非第一次才更新用户信息
             pagePresenter.getUserInfo();
 
         if (views.size() < 1) {
@@ -732,21 +741,21 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             @Override
             public void call(BaseMessage o) {
 
-                if(o != null){
+                if (o != null) {
                     CashAwarsEntity cashAwarsEntity = o.getData(CashAwarsEntity.class);
-                    if(cashAwarsEntity != null){
-
-                        String award = String.format(activity.getResources().getString(R.string.homepage_award), FormatAny.getInstance().formatString(cashAwarsEntity.getAward()+""));
-                        String cash = String.format(activity.getResources().getString(R.string.homepage_cash), FormatAny.getInstance().formatString(cashAwarsEntity.getCash()+""));
-                        String welfare = String.format(activity.getResources().getString(R.string.homepage_welfare), FormatAny.getInstance().formatString(cashAwarsEntity.getWelfare()+""));
-                        homepage_item_get_award_name_tv.setText(award+"");
-                        homepage_item_money_tv.setText(cash+"");
-                        homepage_item_juan_tv.setText(welfare+"");
+                    if (cashAwarsEntity != null) {
+
+                        String award = String.format(activity.getResources().getString(R.string.homepage_award), FormatAny.getInstance().formatString(cashAwarsEntity.getAward() + ""));
+                        String cash = String.format(activity.getResources().getString(R.string.homepage_cash), FormatAny.getInstance().formatString(cashAwarsEntity.getCash() + ""));
+                        String welfare = String.format(activity.getResources().getString(R.string.homepage_welfare), FormatAny.getInstance().formatString(cashAwarsEntity.getWelfare() + ""));
+                        homepage_item_get_award_name_tv.setText(award + "");
+                        homepage_item_money_tv.setText(cash + "");
+                        homepage_item_juan_tv.setText(welfare + "");
                     }
                 }
             }
         });
-        if(!isFirst){
+        if (!isFirst) {
             for (int i = 0; i < adpViewPagerDetail.getCount(); i++) {
                 FgtTryMakeMoney item = (FgtTryMakeMoney) adpViewPagerDetail.getItem(i);
                 item.refreshData();
@@ -782,14 +791,14 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         home_list_gridview_gv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                HomeListEntity homeListEntity= ListUtil.getItem(homeListEntitysGridview, position);
-                if(homeListEntity == null){
+                HomeListEntity homeListEntity = ListUtil.getItem(homeListEntitysGridview, position);
+                if (homeListEntity == null) {
                     return;
                 }
                 UMConfigUtils.IdEvent.HOME_LIST.commit(homeListEntity.getId());
-                if("-2".equals(homeListEntity.getJump())){
+                if ("-2".equals(homeListEntity.getJump())) {
                     setValueList(!homeListEntity.isSelect());
-                }else {
+                } else {
                     CommonUtil.getInstance()
                             .goWhere(activity, homeListEntity, "首页");
                 }
@@ -808,7 +817,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                                 1,
                                 0,
                                 0,
-                                 "-1",
+                                "-1",
                                 3));
 //        tryMakeMoneyPresenter.releaseTask(parameEty);
     }
@@ -855,7 +864,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         }
         BaseMessage baseMessage = (BaseMessage) o;
         userEntity = baseMessage.getData(UserEntity.class);
-        if(userEntity == null){
+        if (userEntity == null) {
             return;
         }
         DataUtil.getInstance().setUserEntity(userEntity);
@@ -898,7 +907,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     @Override
     public void returnTaskTaskUpdataView(Object object) {
         boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.new_run_task(is_succession, show_game_task));
-        if(isNewData) {
+        if (isNewData) {
             BaseMessage baseMessage = (BaseMessage) object;
             allTaskAcceptedTaskList = baseMessage.getDataList(TaskAcceptedEty.class);
             AutoTaskListUtil.getInstance().loadList(allTaskAcceptedTaskList);
@@ -932,7 +941,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     @Override
     public void releaseTaskTaskUpdataView(Object object) {
         boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.release_task);
-        if(isNewData && object instanceof BaseMessage) {
+        if (isNewData && object instanceof BaseMessage) {
             List<TaskReleaseEty> releaseEtyList = ((BaseMessage) object).getDataList(TaskReleaseEty.class);
             if (releaseEtyList != null) {
                 releaseEtyLists = releaseEtyList;
@@ -970,7 +979,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     @Override
     public void successSlideshow(BaseMessage baseMessage) {
         boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.slideshow);
-        if(isNewData){
+        if (isNewData) {
             List<SlideshowEty> slideshowEtyList = baseMessage.getDataList(SlideshowEty.class);
             if (ListUtil.isEmpty(slideshowEtyList)) {
                 banner.setVisibility(View.GONE);
@@ -995,7 +1004,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     @Override
     public void successbulletin(BaseMessage baseMessage) {
         boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.bulletin);
-        if(isNewData){
+        if (isNewData) {
             List<BulletinEnty> bulletinEntyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), BulletinEnty.class);
             if (ListUtil.isEmpty(bulletinEntyList)) {
                 homepageItemNoticeLayout.setVisibility(View.GONE);
@@ -1011,7 +1020,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     public void successhomeList(BaseMessage baseMessage) {
         checkAndInitView();
         boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.home_list);
-        if(isNewData){
+        if (isNewData) {
             List<HomeListEntity> homeListEntityList = baseMessage.getDataList(HomeListEntity.class);
             if (ListUtil.isEmpty(homeListEntityList)) {
                 home_list_gridview_layout.setVisibility(View.GONE);
@@ -1071,11 +1080,11 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     public void onResume() {
         super.onResume();
         UserEntity result = DataUtil.getInstance().getUserEntity();
-        if(result == null) {
+        if (result == null) {
             CommonUtil.getInstance().updateUserInfo(new Action1<UserEntity>() {
                 @Override
                 public void call(UserEntity item) {
-                    if(item != null) {
+                    if (item != null) {
                         userEntity = item;
                         loadUserInfo();
                     }
@@ -1085,7 +1094,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             userEntity = result;
             loadUserInfo();
         }
-        if(onResumeCount > 0)
+        if (onResumeCount > 0)
             refreshTaskList();
         onResumeCount++;
         setAnimation(ivDuty);
@@ -1350,7 +1359,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
      * 点击一条公告
      */
     private void onClickNotice(BulletinEnty item) {
-        switch (item.getJumpType()){// 跳转类型:11,任务 98,内部h5 99,外部h5
+        switch (item.getJumpType()) {// 跳转类型:11,任务 98,内部h5 99,外部h5
             case 11:
                 Jump2View.getInstance().goTaskDetailView(activity, NumberFormatUtils.parseInteger(item.getJumpValue()));
                 break;
@@ -1400,7 +1409,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
      * 邀请成功后在个人资料显示领红包弹窗
      */
     public void showRedPackage(Context context) {
-        Activity mActivity = (Activity)context;
+        Activity mActivity = (Activity) context;
         View viewAnchor = LayoutInflater.from(context).inflate(R.layout.homepage_act_layout, null, false);
         View view = LayoutInflater.from(context).inflate(R.layout.dialog_redpackage_after_invitation, null, false);
         TextView tvGetRedPackage = view.findViewById(R.id.tv_get_redpackage);
@@ -1422,7 +1431,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         } catch (Exception e) {
             e.printStackTrace();
         }
-        popupWindow.setOnDismissListener(new ViewUtil.PopDismissListener(mActivity));
+        popupWindow.setOnDismissListener(new PopDismissListener(mActivity));
         tvMoney.setText("1.8");
         tvNew.setText("新人红包");
         tvGetRedPackage.setOnClickListener(new View.OnClickListener() {
@@ -1430,19 +1439,49 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             public void onClick(View v) {
                 popupWindow.dismiss();
                 getRedPackage(popupWindow);
+
             }
         });
         ivClose.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 popupWindow.dismiss();
-                isShowRedPackageWithCode();//关闭新人注册红包后，弹出邀请红包
+
+
             }
         });
 
     }
 
     /**
+     * popwindow消失监听类，消失恢复window透明度
+     */
+      class PopDismissListener implements PopupWindow.OnDismissListener {
+        Activity mActivity;
+
+        public PopDismissListener(Activity activity) {
+            mActivity = activity;
+        }
+
+        @Override
+        public void onDismiss() {
+            backgroundAlpha(1f, mActivity);
+            isShowRedPackageWithCode();//邀请红包
+        }
+
+    }
+
+    /**
+     * @param bgAlpha  ，透明度值
+     * @param activity 恢复透明度
+     */
+    public static void backgroundAlpha(float bgAlpha, Activity activity) {
+        WindowManager.LayoutParams lp = activity.getWindow().getAttributes();
+        lp.alpha = bgAlpha;
+        activity.getWindow().setAttributes(lp);
+    }
+
+    /**
      * 兑换红包
      *
      * @param popupWindow
@@ -1460,9 +1499,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        if (popupWindow.isShowing()){
+                        if (popupWindow.isShowing()) {
                             popupWindow.dismiss();
-                            isShowRedPackageWithCode();//兑换成功后弹出邀请红包
                         }
                         CommonUtil.getInstance().updateUserInfo(null);
                     }
@@ -1472,9 +1510,9 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     /**
      * 新手任务
      */
-    private void addNewTask(){
+    private void addNewTask() {
 
-        if(onResumeCount == 0 && CommonUtil.getInstance().addNewTask(activity,userEntity) && homeListEntitysGridview != null)//第一次才调用
+        if (onResumeCount == 0 && CommonUtil.getInstance().addNewTask(activity, userEntity) && homeListEntitysGridview != null)//第一次才调用
         {
             HomeListEntity homeListEntityNewTask = new HomeListEntity();
             homeListEntityNewTask.setTitle("新手任务");
@@ -1483,12 +1521,12 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             homeListEntityNewTask.setIcon(R.mipmap.homepage_xinshourw + "");
             homeListEntitys.add(0, homeListEntityNewTask);
         }
-        if(homeListEntitys.size() > 8){
+        if (homeListEntitys.size() > 8) {
             HomeListEntity homeListEntity = new HomeListEntity();
             homeListEntity.setTitle("查看更多");
             homeListEntity.setDesc("查看更多");
             homeListEntity.setJump("-2");
-            homeListEntity.setIcon(R.mipmap.homepage_chakangd+"");
+            homeListEntity.setIcon(R.mipmap.homepage_chakangd + "");
             homeListEntitys.add(7, homeListEntity);
         }
         setValueList(false);
@@ -1496,28 +1534,28 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
     private void setValueList(boolean flag) {
         homeListEntitysGridview.clear();
-        for(int i=0;i<homeListEntitys.size();i++){
-            if(flag){
+        for (int i = 0; i < homeListEntitys.size(); i++) {
+            if (flag) {
                 homeListEntitysGridview.add(homeListEntitys.get(i));
-            }else {
-                if(i<8){
+            } else {
+                if (i < 8) {
                     homeListEntitysGridview.add(homeListEntitys.get(i));
                 }
             }
 
         }
-        if(homeListEntitysGridview.size() > 8){
+        if (homeListEntitysGridview.size() > 8) {
             HomeListEntity homeListEntity = new HomeListEntity();
             homeListEntity.setJump("-2");
             homeListEntity.setSelect(flag);
             if (flag) {
                 homeListEntity.setTitle("收起模块");
                 homeListEntity.setDesc("收起模块");
-                homeListEntity.setIcon(R.mipmap.homepage_chakangd_click+"");
+                homeListEntity.setIcon(R.mipmap.homepage_chakangd_click + "");
             } else {
                 homeListEntity.setTitle("查看更多");
                 homeListEntity.setDesc("查看更多");
-                homeListEntity.setIcon(R.mipmap.homepage_chakangd+"");
+                homeListEntity.setIcon(R.mipmap.homepage_chakangd + "");
             }
             homeListEntitysGridview.set(7, homeListEntity);
         }

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.kfzs.android.view.widget.TouchEventConsumerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -130,4 +130,4 @@
         android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="1" />
-</LinearLayout>
+</com.kfzs.android.view.widget.TouchEventConsumerLayout>

view/src/main/java/com/kfzs/android/view/widget/TouchEventConsumerLayout.java

@@ -0,0 +1,33 @@
+package com.kfzs.android.view.widget;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.widget.LinearLayout;
+
+/**
+ * 消费空白地方的点击事件，防止下层叠加的view响应到点击
+ * Created by realicing on 2018/8/31.
+ * realicing@sina.com
+ */
+public class TouchEventConsumerLayout extends LinearLayout {
+
+    public TouchEventConsumerLayout(Context context, AttributeSet attrs,
+                                    int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    public TouchEventConsumerLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public TouchEventConsumerLayout(Context context) {
+        super(context);
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        return true;
+    }
+
+}