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

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

@@ -36,10 +36,12 @@ import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 import org.afinal.simplecache.ApiKey;
 
 import java.net.URISyntaxException;
+import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import me.iwf.photopicker.PhotoPreview;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
 import rx.schedulers.Schedulers;
@@ -99,7 +101,7 @@ public class FgtRouser extends BaseCompatFragment {
             }
 
             @Override
-            public void convert(ViewHolder holder, final RouserArticlesEntity item) {
+            public void convert(final ViewHolder holder, final RouserArticlesEntity item) {
                 if(item == null){
                     return;
                 }
@@ -157,6 +159,22 @@ public class FgtRouser extends BaseCompatFragment {
                         one_img_iv.setVisibility(View.VISIBLE);
                         home_list_gridview_gv.setVisibility(View.GONE);
                         GlideImageLoader.setImage(one_img_iv, images[0]);
+                        one_img_iv.setOnClickListener(new View.OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                try{
+//                                    List<String> list = new ArrayList<>();
+//                                    PhotoPreview.builder()
+//                                            .setPhotos(list.toArray(images))
+//                                            .setCurrentItem(holder.getAdapterPosition())
+//                                            .setShowDeleteButton(false)
+//                                            .start( activity, 101);
+
+                                }catch (Exception e){
+                                    e.printStackTrace();
+                                }
+                            }
+                        });
                     }
 
                 }else {

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

@@ -100,6 +100,12 @@ public class TaskListItemAdp extends BaseAdapter {
             holder.price_tv.setTextColor(context.getResources().getColor(R.color.time_created));
         }
         holder.price_tv.setText(stateStr);
+        if(!TextUtils.isEmpty(ety.getRemarks())){
+            holder.desc_tv.setVisibility(View.VISIBLE);
+
+        }else {
+            holder.desc_tv.setVisibility(View.GONE);
+        }
         holder.desc_tv.setText(TextUtils.isEmpty(ety.getRemarks())?"":"失败原因:"+ety.getRemarks());
         convertView.setOnClickListener(new View.OnClickListener() {
             @Override

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

@@ -2,6 +2,7 @@ package com.sheep.gamegroup.view.fragment;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.support.design.widget.TabLayout;
 import android.support.v4.view.ViewPager;
@@ -57,7 +58,7 @@ public class FgtMainAudit extends BaseCompatFragment {
     private Activity activity;
 
     public static final String[] tabNames = {"审核中", "任务成功", "任务失败"};
-    private ShenheAdapter mAdapter;
+    private GiftpackListAdapter mAdapter;
 
     @Override
     protected void initView(Bundle savedInstanceState) {
@@ -70,7 +71,7 @@ public class FgtMainAudit extends BaseCompatFragment {
                 .setTitle(mContentView, "审核中心")
                 .setTitleListen(mContentView, 0, null);
 
-        mAdapter = new ShenheAdapter(getChildFragmentManager(), activity.getApplicationContext());
+        mAdapter = new GiftpackListAdapter(getChildFragmentManager(), activity.getApplicationContext());
         mAdapter.add(FgtAudit.newInstance(1), tabNames[0]);
         mAdapter.add(FgtAudit.newInstance(2), tabNames[1]);
         mAdapter.add(FgtAudit.newInstance(3), tabNames[2]);
@@ -133,6 +134,16 @@ public class FgtMainAudit extends BaseCompatFragment {
             @Override
             public void onPageSelected(int i) {
 //                MY_MONEY_TAB.onEvent("tab_name", tabNames[2]);
+//                for(int d=0;d<indicator.getTabCount();d++){
+//                    TabLayout.Tab tab=indicator.getTabAt(i);
+//                    if(i == d){
+//
+//                        ((TextView) tab.getCustomView().findViewById(R.id.tv_text)).setTextColor(Color.parseColor("#34a6e7"));
+//                    }else {
+//
+//                        ((TextView) tab.getCustomView().findViewById(R.id.tv_text)).setTextColor(Color.parseColor("#333333"));
+//                    }
+//                }
 
             }
 
@@ -144,13 +155,13 @@ public class FgtMainAudit extends BaseCompatFragment {
 
         indicator.setupWithViewPager(pager);
         CommonUtil.getInstance().reflex(indicator, activity);
-        for (int i = 0; i < indicator.getTabCount(); i++) {
-            indicator.getTabAt(i).setCustomView(mAdapter.getTabView(i));
-        }
+//        for (int i = 0; i < indicator.getTabCount(); i++) {
+//            indicator.getTabAt(i).setCustomView(mAdapter.getTabView(i));
+//        }
 
-        TabLayout.Tab tab=indicator.getTabAt(2);
+     /*   TabLayout.Tab tab=indicator.getTabAt(2);
 
-            tab.getCustomView().findViewById(R.id.iv_img).setVisibility(View.VISIBLE);
+            tab.getCustomView().findViewById(R.id.iv_img).setVisibility(View.VISIBLE);*/
 
     }
 

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

@@ -3,7 +3,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-    android:padding="@dimen/content_padding_20"
+    android:paddingLeft="@dimen/content_padding_20"
+    android:paddingRight="@dimen/content_padding_20"
     android:layout_marginBottom="@dimen/content_padding_10"
     android:layout_marginLeft="@dimen/content_padding_10"
     android:layout_marginRight="@dimen/content_padding_10">
@@ -88,5 +89,6 @@
         android:layout_height="wrap_content"
         android:text=""
         android:textSize="@dimen/text_size_2"
-        android:textColor="@color/txt_black_818181"/>
+        android:textColor="@color/txt_black_818181"
+        android:visibility="gone"/>
 </RelativeLayout>

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

@@ -8,7 +8,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
-        android:text="2121221" />
+        android:text="2121221"
+        android:textColor="@color/black_333333"/>
 
     <ImageView
         android:id="@+id/iv_img"