Explorar o código

Merge branch 'sheep2.0' of http://10.8.230.114:3000/kemllor/small_sheep_android into sheep2.0

zhanghai %!s(int64=8) %!d(string=hai) anos
pai
achega
82e31f416d

+ 9 - 0
app/src/main/java/com/sheep/gamegroup/model/entity/TaskEty.java

@@ -22,9 +22,18 @@ public class TaskEty implements Serializable{
     private String icon;
     private String package_size;
     private int release_task_id;
+    private int acceptedTaskId;//接受任务id
     private String bonus;// 0,
     private String desc;// 任务详情介绍
 
+    public int getAcceptedTaskId() {
+        return acceptedTaskId;
+    }
+
+    public void setAcceptedTaskId(int acceptedTaskId) {
+        this.acceptedTaskId = acceptedTaskId;
+    }
+
     public String getDesc() {
         return desc;
     }

+ 16 - 4
app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java

@@ -145,7 +145,13 @@ public class TaskDetailAct extends BaseActivity implements TaskDetailContract.Vi
 
         });
         webText.getSettings().setJavaScriptEnabled(true);
-        webText.getSettings().setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN);//适应屏幕,内容将自动缩放
+
+// 1、LayoutAlgorithm.NARROW_COLUMNS : 适应内容大小
+// 2、LayoutAlgorithm.SINGLE_COLUMN:适应屏幕,内容将自动缩放
+//        webText.getSettings().setUseWideViewPort(true);
+//        webText.getSettings().setLoadWithOverviewMode(true);
+//        webText.getSettings().setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN);
+//        webText.setInitialScale(80);
         webText.setWebViewClient(new WebViewClient(){
             @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
             @Override
@@ -154,7 +160,12 @@ public class TaskDetailAct extends BaseActivity implements TaskDetailContract.Vi
                 return true;
             }
         });
-        webText.loadDataWithBaseURL(null,taskEty.getDesc(), "text/html", "utf-8", null);
+        //封装头文件
+        String sHead=   "<html><head><meta name=\"viewport\" content=\"width=device-width, " +
+                "initial-scale=1.0, minimum-scale=0.5, maximum-scale=2.0, user-scalable=yes\" />"+
+                "<style>img{max-width:100% !important;height:auto !important;}</style>"
+                +"<style>body{max-width:100% !important;}</style>"+"</head><body>";
+        webText.loadDataWithBaseURL(null,sHead + taskEty.getDesc() + "</body></html>", "text/html", "utf-8", null);
         nameTv.setText(taskEty.getName()+"");
         priceTv.setText("+"+ taskEty.getBonus() +"元");
         dateTv.setText(TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(taskEty.getUpdate_time()))+"");
@@ -308,6 +319,7 @@ public class TaskDetailAct extends BaseActivity implements TaskDetailContract.Vi
         dialogShowLoading.getTextView().setText("完成");
 //                            onGetNetImageUrl(data);
         dialogShowLoading.getAlertDialog().dismiss();
+        G.showToast("提交成功,等待审核!");
         EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_TRYMAKEMANY_PAGE));
         UMConfigUtils.finishTask();
         finish();
@@ -342,9 +354,9 @@ public class TaskDetailAct extends BaseActivity implements TaskDetailContract.Vi
         UploadResult uploadResult = JSON.parseObject(json, UploadResult.class);
         if (uploadResult != null) {
             final String data = uploadResult.getData().getUrl();
-            dialogShowLoading.getTextView().setText("更新中");
+            dialogShowLoading.getTextView().setText("提交中");
             JSONObject jsonObject = new JSONObject();
-            jsonObject.put("id", taskEty.getRelease_task_id());
+            jsonObject.put("id", taskEty.getAcceptedTaskId());
             jsonObject.put("screenshots",data+"");
             jsonObject.put("remark",taskEty.getRemarks()+"");
             jsonObject.put("package_name",taskEty.getPackage_names()+"");

+ 2 - 0
app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdp.java

@@ -208,6 +208,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 taskEty.setRunTask(1);
                 taskEty.setBonus(acceptedEty.getRelease_task().getBonus());
                 taskEty.setRelease_task_id(acceptedEty.getRelease_task().getId());
+                taskEty.setAcceptedTaskId(acceptedEty.getId());
                 taskEty.setName(acceptedEty.getRelease_task().getName());
                 Jump2View.getInstance().goTaskDetailView(context, taskEty);
                 UMConfigUtils.onEvent(UMConfigUtils.Event.TASK_DETAIL);
@@ -220,6 +221,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 taskEty.setRunTask(1);
                 taskEty.setRelease_task_id(acceptedEty.getRelease_task().getId());
                 taskEty.setName(acceptedEty.getRelease_task().getName());
+                taskEty.setAcceptedTaskId(acceptedEty.getId());
                 Jump2View.getInstance().goDialogActivityView(context, taskEty);
             }
         });