Просмотр исходного кода

添加图片压缩,我这边功能基本可以提交给测试服测试了

zengjiebin лет назад: 8
Родитель
Сommit
0cbc5fa21c

+ 1 - 1
app/build.gradle

@@ -268,7 +268,7 @@ dependencies {
     }
     annotationProcessor 'com.arialyy.aria:aria-compiler:3.3.16'
     compile 'com.sunfusheng:marqueeview:1.3.3'
-
+    compile 'com.github.nanchen2251:CompressHelper:1.0.5'
 
 }
 def releaseTime() {

+ 2 - 32
app/src/main/java/com/kfzs/duanduan/fragment/FgtCreditCardProgressQuery.java

@@ -59,7 +59,8 @@ public class FgtCreditCardProgressQuery extends BaseFragment {
         initData();
     }
 
-    private void initData2() {
+    public void initData() {
+        list.clear();
         SheepApp.getInstance().getNetComponent().getApiService().getCreditCardScheduleList()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -67,9 +68,6 @@ public class FgtCreditCardProgressQuery extends BaseFragment {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
                         List<CreditCardProgressQuery> newList = baseMessage.getDatas(CreditCardProgressQuery.class);
-                        for (CreditCardProgressQuery creditCardProgressQuery : newList) {
-                            creditCardProgressQuery.setTaskReleaseEty(sparseArray.get(creditCardProgressQuery.getRelease_task_id()));
-                        }
                         list.addAll(newList);
                         adapter.notifyDataSetChanged();
                         swipe_container.setRefreshing(false);
@@ -87,32 +85,4 @@ public class FgtCreditCardProgressQuery extends BaseFragment {
                     }
                 });
     }
-    private SparseArray<TaskReleaseEty> sparseArray = new SparseArray<>();
-    private void initData() {
-        list.clear();
-        SheepApp.getInstance().getNetComponent().getApiService().getReleaseTaskCreditCard()
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(getContext()) {
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        if(BuildConfig.DEBUG)
-                            System.out.println("baseMessage onNext "+ JSON.toJSONString(baseMessage));
-                        List<TaskReleaseEty> newList = baseMessage.getDatas(TaskReleaseEty.class);
-                        for (TaskReleaseEty taskReleaseEty : newList) {
-                            sparseArray.put(taskReleaseEty.getId(), taskReleaseEty);
-                        }
-                        initData2();
-                    }
-
-                    @Override
-                    public void onError(BaseMessage baseMessage) {
-                        if(BuildConfig.DEBUG)
-                            System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
-//                                G.showToast(TextUtils.isEmpty(baseMessage.getMsg()) ? "服务器错误,请稍候再试" : baseMessage.getMsg());
-                        adapter.notifyDataSetChanged();
-                        swipe_container.setRefreshing(false);
-                    }
-                });
-    }
 }

+ 7 - 1
app/src/main/java/com/kfzs/duanduan/react/upfile/UpFileUtils.java

@@ -1,6 +1,10 @@
 package com.kfzs.duanduan.react.upfile;
 
 
+import com.kfzs.duanduan.react.FileUtil;
+import com.nanchen.compresshelper.CompressHelper;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 import com.zhy.http.okhttp.OkHttpUtils;
 import com.zhy.http.okhttp.callback.Callback;
 
@@ -57,8 +61,10 @@ public class UpFileUtils {
         if (index < photos.size()) {
             File file;
             if ((file = new File(photos.get(index))).exists()) {
+                File newFile = CompressHelper.getDefault(SheepApp.getInstance()).compressToFile(file);
+//                org.xutils.common.util.FileUtil.copy(newFile.getAbsolutePath(), ClassFileHelper.DIR+"/1.png");
                 OkHttpUtils.post()
-                        .addFile("uploadfile", "1.png", file)//
+                        .addFile("uploadfile", "1.png", newFile)//
                         .url(URL_RN_UP_IMAGE)
                         .build()//
                         .execute(new Callback() {

+ 5 - 5
app/src/main/java/com/sheep/gamegroup/model/entity/CreditCardProgressQuery.java

@@ -24,7 +24,7 @@ public class CreditCardProgressQuery {
     private int update_time;
 
     private int create_time;
-    private TaskReleaseEty taskReleaseEty;
+    private TaskReleaseEty release_task;
 
     public void setRemarks(String remarks){
         this.remarks = remarks;
@@ -87,11 +87,11 @@ public class CreditCardProgressQuery {
         return this.create_time;
     }
 
-    public TaskReleaseEty getTaskReleaseEty() {
-        return taskReleaseEty;
+    public TaskReleaseEty getRelease_task() {
+        return release_task;
     }
 
-    public void setTaskReleaseEty(TaskReleaseEty taskReleaseEty) {
-        this.taskReleaseEty = taskReleaseEty;
+    public void setRelease_task(TaskReleaseEty release_task) {
+        this.release_task = release_task;
     }
 }

+ 30 - 0
app/src/main/java/com/sheep/gamegroup/util/BtStatusUtil.java

@@ -0,0 +1,30 @@
+package com.sheep.gamegroup.util;
+
+ /**
+ * Created by realicing on 2018/4/27.
+ * realicing@sina.com
+ */
+public class BtStatusUtil {
+    /**
+     * CreditCardProgressQuery.status
+     * status; 0,--------1,已接受任务 2,正在进行中,3完成任务,4放弃任务,5任务失败,6审核失败,7提交审核,8任务已下线
+     * @return
+     */
+    public static boolean getEnabled(int status) {
+        return 1 == status || 2 == status || 6 == status;
+    }
+    /**
+     * CreditCardProgressQuery.status
+     * status; 0,--------1,已接受任务 2,正在进行中,3完成任务,4放弃任务,5任务失败,6审核失败,7提交审核,8任务已下线
+     * @return
+     */
+    public static String getUploadText(int status) {
+        switch (status){
+            case 7:
+                return "正在审核";
+            case 8:
+                return "任务已下线";
+        }
+        return "上传截图";
+    }
+}

+ 11 - 6
app/src/main/java/com/sheep/gamegroup/view/activity/ActCreditCardTaskList.java

@@ -13,6 +13,7 @@ import com.kfzs.duanduan.fragment.FgtCreditCardProgressQuery;
 import com.kfzs.duanduan.fragment.FgtCreditCardTaskList;
 import com.kfzs.duanduan.mine.GiftpackListAdapter;
 import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.CreditCardProgressQuery;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.UMConfigUtils;
@@ -20,6 +21,7 @@ import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.AbsChooseImageActivity;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
@@ -103,17 +105,17 @@ public class ActCreditCardTaskList extends AbsChooseImageActivity {
 
     @Override
     protected void onNotGetImage(String msg) {
-
+        G.showToast(msg);
     }
 
     @Override
     protected void onGetImage(String path) {
 
     }
-    private TaskEty taskEty;
+    private CreditCardProgressQuery creditCardProgressQuery;
 
-    public void setTaskEty(TaskEty taskEty) {
-        this.taskEty = taskEty;
+    public void setCreditCardProgressQuery(CreditCardProgressQuery creditCardProgressQuery) {
+        this.creditCardProgressQuery = creditCardProgressQuery;
     }
 
     @Override
@@ -121,8 +123,7 @@ public class ActCreditCardTaskList extends AbsChooseImageActivity {
         setLoaddingText("提交中");
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("screenshots", url);
-        releaseTaskCreditCard(taskEty.getAcceptedTaskId(), jsonObject);
-        taskEty.setScreenshots(url);
+        releaseTaskCreditCard(creditCardProgressQuery.getId(), jsonObject);
     }
 
     @Override
@@ -134,6 +135,10 @@ public class ActCreditCardTaskList extends AbsChooseImageActivity {
         setLoaddingText("完成");
         dismissLoaddingDialog();
         G.showToast("提交成功,等待审核!");
+        Fragment fragment = mAdapter.getItem(1);
+        if(fragment instanceof FgtCreditCardProgressQuery){
+            ((FgtCreditCardProgressQuery) fragment).initData();
+        }
     }
 
     public void releaseTaskCreditCard(int id, JSONObject jsonObject) {

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailCreditCardAct.java

@@ -377,7 +377,7 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
         setLoaddingText("提交中");
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("screenshots", url);
-        releaseTaskCreditCard(taskEty.getAcceptedTaskId(), jsonObject);
+        releaseTaskCreditCard(taskReleaseEty.getAccepted_task_id(), jsonObject);
         taskEty.setScreenshots(url);
     }
 

+ 5 - 2
app/src/main/java/com/sheep/gamegroup/view/adapter/CreditCardProgressQueryAdp.java

@@ -11,6 +11,7 @@ import android.widget.TextView;
 import com.bumptech.glide.Glide;
 import com.sheep.gamegroup.model.entity.CreditCardProgressQuery;
 import com.sheep.gamegroup.model.entity.TaskReleaseEty;
+import com.sheep.gamegroup.util.BtStatusUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.view.activity.ActCreditCardTaskList;
 import com.sheep.jiuyan.samllsheep.R;
@@ -64,7 +65,7 @@ public class CreditCardProgressQueryAdp extends BaseAdapter {
         }
 
         final CreditCardProgressQuery creditCardProgressQuery = (CreditCardProgressQuery) getItem(position);
-        final TaskReleaseEty ety = creditCardProgressQuery.getTaskReleaseEty();
+        final TaskReleaseEty ety = creditCardProgressQuery.getRelease_task();
         Glide.with(context).load(ety.getTask().getIcon())
                 .into(holder.credit_card_task_iv);
         holder.credit_card_task_name_tv.setText(ety.getName());
@@ -77,11 +78,13 @@ public class CreditCardProgressQueryAdp extends BaseAdapter {
                 Jump2View.getInstance().goWeb(context, ety.getTask().getExtInfo().getQuery_url(), "进度查询");
             }
         });
+        holder.credit_card_task_upload_tv.setEnabled(BtStatusUtil.getEnabled(creditCardProgressQuery.getStatus()));
+        holder.credit_card_task_upload_tv.setText(BtStatusUtil.getUploadText(creditCardProgressQuery.getStatus()));
         holder.credit_card_task_upload_tv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 if(context instanceof ActCreditCardTaskList){
-                    ((ActCreditCardTaskList) context).setTaskEty(ety.getTask());
+                    ((ActCreditCardTaskList) context).setCreditCardProgressQuery(creditCardProgressQuery);
                     ((ActCreditCardTaskList) context).showChooseDialog(false, true, AbsChooseImageActivity.DEFAULT_MAX_COUNT);
                 }
             }

+ 8 - 3
app/src/main/java/com/sheep/jiuyan/samllsheep/base/AbsChooseImageActivity.java

@@ -37,6 +37,11 @@ public abstract class AbsChooseImageActivity extends BaseActivity implements UpF
     private boolean isUpload = true;
     private boolean isCrop = true;
     private int photoCount = 1;
+
+    protected ArrayList<String> photos;
+    protected String path;
+    protected List<String> urls = new ArrayList<>();
+
     private DialogShowLoading dialogShowLoading;
     public static final int DEFAULT_MAX_COUNT = 7;//上传任务截图的最大个数
 
@@ -49,6 +54,9 @@ public abstract class AbsChooseImageActivity extends BaseActivity implements UpF
         this.isUpload = isUpload;
         this.isCrop = isCrop && photoCount == 1;
         this.photoCount = photoCount;
+        this.photos = null;
+        this.path = null;
+        this.urls.clear();
         PhotoPicker.builder()
                 .setPhotoCount(photoCount)
                 .setShowCamera(true)
@@ -95,8 +103,6 @@ public abstract class AbsChooseImageActivity extends BaseActivity implements UpF
                 notCrop();
         }
     }
-    protected ArrayList<String> photos;
-    protected String path;
 
     private void notCrop() {
         if(photoCount == 1) {
@@ -123,7 +129,6 @@ public abstract class AbsChooseImageActivity extends BaseActivity implements UpF
         }
     }
 
-    protected List<String> urls = new ArrayList<>();
     @Override
     public void Success(String msg, int index) {
         if(index == -1 && !urls.isEmpty()) {//多图

+ 9 - 0
app/src/main/res/drawable/selector_button_full_main_small.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+  <item android:state_enabled="false" android:drawable="@drawable/button_full_normal_gray" />
+  <item android:state_focused="true" android:drawable="@drawable/sp_bg_gradient_rectangle_yellow" />
+  <item android:state_checked="true" android:drawable="@drawable/sp_bg_gradient_rectangle_yellow"/>
+  <item android:state_selected="true" android:drawable="@drawable/sp_bg_gradient_rectangle_yellow"/>
+  <item android:state_pressed="true" android:drawable="@drawable/sp_bg_gradient_rectangle_yellow"/>
+  <item android:drawable="@drawable/sp_bg_gradient_rectangle_yellow2"/>
+</selector>

+ 1 - 1
app/src/main/res/layout/credit_card_progress_query.xml

@@ -19,7 +19,7 @@
         <ImageView
             android:id="@+id/credit_card_task_iv"
             android:layout_width="100dp"
-            android:layout_height="wrap_content"
+            android:layout_height="66dp"
             android:layout_alignParentStart="true"
             android:layout_centerVertical="true"
             android:adjustViewBounds="true"

+ 1 - 1
app/src/main/res/layout/credit_card_task.xml

@@ -19,7 +19,7 @@
         <ImageView
             android:id="@+id/credit_card_task_iv"
             android:layout_width="100dp"
-            android:layout_height="wrap_content"
+            android:layout_height="66dp"
             android:layout_alignParentStart="true"
             android:layout_centerVertical="true"
             android:adjustViewBounds="true"

+ 1 - 1
app/src/main/res/values/dd_styles.xml

@@ -85,7 +85,7 @@
         <item name="android:layout_width">70dp</item>
         <item name="android:layout_height">30dp</item>
         <item name="android:gravity">center</item>
-        <item name="android:background">@drawable/sp_bg_gradient_rectangle_yellow</item>
+        <item name="android:background">@drawable/selector_button_full_main_small</item>
         <item name="android:textColor">@color/btn_color_main</item>
         <item name="android:textSize">@dimen/text_size_15</item>
     </style>