ui 界面调整

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

@@ -1,71 +1,41 @@
 package com.kfzs.duanduan.fragment;
 
 import android.app.Activity;
-import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.text.Html;
 import android.text.TextUtils;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONArray;
-import com.arialyy.annotations.Download;
 import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.download.DownloadTask;
-import com.kfzs.android.view.tag.FlowLayout;
-import com.kfzs.android.view.tag.TagAdapter;
-import com.kfzs.android.view.tag.TagFlowLayout;
 import com.kfzs.duanduan.BaseCompatFragment;
 import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.services.DownloadTaskService;
 import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.FindApp;
-import com.sheep.gamegroup.model.entity.FindItem;
-import com.sheep.gamegroup.model.entity.FindTag;
 import com.sheep.gamegroup.model.entity.GameAgencyRechargePlatformEntity;
-import com.sheep.gamegroup.model.entity.GridViewEntity;
-import com.sheep.gamegroup.model.entity.HomeListEntity;
 import com.sheep.gamegroup.model.entity.RecyleObj;
 import com.sheep.gamegroup.model.entity.RecyleType;
 import com.sheep.gamegroup.model.entity.TaskReleaseEty;
-import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.CommonUtil;
-import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.SysAppUtil;
-import com.sheep.gamegroup.util.ViewHolder;
-import com.sheep.gamegroup.util.ViewUtil;
-import com.sheep.gamegroup.view.adapter.AdbCommonRecycler;
 import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp;
 import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.utils.G;
-import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
-
-import static android.content.Intent.ACTION_PACKAGE_ADDED;
-import static android.content.Intent.ACTION_PACKAGE_REMOVED;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.FIND_ITEM;
 
 /**
  * Created by ljy on 2018/7/16.

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

@@ -4,66 +4,30 @@ import android.app.Activity;
 import android.os.Bundle;
 import android.support.design.widget.TabLayout;
 import android.support.v4.view.ViewPager;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
-import android.widget.AdapterView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.alibaba.fastjson.JSONArray;
-import com.arialyy.aria.core.download.DownloadTask;
-import com.bumptech.glide.Glide;
-import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.fragment.FgtFindChild;
 import com.kfzs.duanduan.fragment.FgtGameAgencyRecharge;
 import com.kfzs.duanduan.mine.GiftpackListAdapter;
 import com.sheep.gamegroup.absBase.BaseActivity;
-import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.DialogConfig;
-import com.sheep.gamegroup.model.entity.FindTag;
-import com.sheep.gamegroup.model.entity.GameAgencyRechargePlatformEntity;
 import com.sheep.gamegroup.model.entity.GridViewEntity;
-import com.sheep.gamegroup.model.entity.OrienteeringDetail;
-import com.sheep.gamegroup.model.entity.RecyleObj;
-import com.sheep.gamegroup.model.entity.RecyleType;
-import com.sheep.gamegroup.model.entity.RequestParameEty;
-import com.sheep.gamegroup.model.entity.TaskReleaseEty;
-import com.sheep.gamegroup.model.util.SheepSubscriber;
-import com.sheep.gamegroup.util.AppUtil;
-import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.MyGridview;
 import com.sheep.gamegroup.util.ViewUtil;
-import com.sheep.gamegroup.view.adapter.AdpGameAgencyRecharge;
-import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp;
 import com.sheep.gamegroup.view.customview.SheepmSwipeRefreshLayout;
 import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-
 import java.lang.reflect.Field;
 import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.functions.Action1;
-import rx.schedulers.Schedulers;
 
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.FIND_TAG;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.GAME_INSTEAD_OF_RECHARGE_HELP;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.GAME_INSTEAD_OF_RECHARGE_TAB;
 
 /**
  * 游戏代充
@@ -86,14 +50,8 @@ public class ActGameAgencyRecharge extends BaseActivity {
     private GiftpackListAdapter mAdapter;
 
     private Activity activity;
-    private AdpGameAgencyRecharge adpGameAgencyRecharge;
     private ArrayList<Object> gridviewList = new ArrayList<>();
-    private GridViewEntity gridViewEntity;//选中的
-    private TryMakeMoneyAdp tryMakeMoneyAdp;
-    private List<GameAgencyRechargePlatformEntity> platformList = ListUtil.emptyList();//平台充值
-    private List<TaskReleaseEty> releaseEtyLists = new ArrayList<>();//游戏代充
 
-    private String task_type;
 
     @Override
     protected int getLayoutId() {
@@ -247,7 +205,6 @@ public class ActGameAgencyRecharge extends BaseActivity {
         gridviewList.add(new GridViewEntity(false, "平台游戏", 1002+""));
         gridviewList.add(new GridViewEntity(false, "小米游戏", 1004+""));
         gridviewList.add(new GridViewEntity(false, "腾讯游戏", 1003+""));
-        gridViewEntity = (GridViewEntity) gridviewList.get(0);
 
 
     }

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

@@ -73,7 +73,7 @@ public class AdpGameAccount extends AdpCommonRecy<RecyleObj> {
         TextView item_title_tv = holder.itemView.findViewById(R.id.item_title_tv);
         item_title_tv.setVisibility(View.VISIBLE);
         item_title_tv.setTextColor(context.getResources().getColor(R.color.black_444444));
-        item_title_tv.setPadding(3,3,3,3);
+        item_title_tv.setPadding(22,3,3,3);
         switch (recyleObj.getRecyleType()){
             case GAME_ACCOUNT_PLATFORM:
                 item_title_tv.setText("快发平台账号");
@@ -105,6 +105,7 @@ public class AdpGameAccount extends AdpCommonRecy<RecyleObj> {
                 TextView account_tv = holder.itemView.findViewById(R.id.account_tv);
                 TextView state_tv = holder.itemView.findViewById(R.id.state_tv);
                 TextView look_tv = holder.itemView.findViewById(R.id.look_tv);
+                View line_view = holder.itemView.findViewById(R.id.line_view);
                 LinearLayout delete_layout = holder.itemView.findViewById(R.id.delete_layout);
 
                 account_tv.setText("账号："+ CommonUtil.getInstance().returnStarData(item.getAccount(), 4, 2, 3));
@@ -146,6 +147,19 @@ public class AdpGameAccount extends AdpCommonRecy<RecyleObj> {
                     });
                 }
             }
+
+            @Override
+            public void onBindViewHolder(ViewHolder viewHolder, int i) {
+                super.onBindViewHolder(viewHolder, i);
+
+                viewHolder.updatePosition(i);
+                convert(viewHolder, etyList.get(i));
+                if ((i + 1) == etyList.size()) {
+                    viewHolder.itemView.findViewById(R.id.line_view).setVisibility(View.GONE);
+                } else {
+                    viewHolder.itemView.findViewById(R.id.line_view).setVisibility(View.VISIBLE);
+                }
+            }
         });
     }
 

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

@@ -3,8 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingTop="@dimen/content_padding_13"
-    android:background="@color/white">
+    android:paddingTop="@dimen/content_padding_13">
 
     <RelativeLayout
         android:layout_width="match_parent"

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

@@ -4,7 +4,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:background="@color/bg_gray"
     android:layout_marginBottom="12dp">
 
     <TextView