Inicio Explorar Ayuda
Registro Iniciar sesión
xmy_android
/
small_sheep_android
Seguir 3
Destacar 0
Fork 0
Archivos Incidencias 0 Pull Requests 0 Wiki
Explorar el Código

修改任务详情，webview显示问题，修改接口id赋值

liujiangyao hace 8 años
padre
daa000da59
commit
3a3fb6e0e2
Se han modificado 3 ficheros con 25 adiciones y 3 borrados
Unificar vista Mostrar estadísticas de diff
  1. 9 0
      app/src/main/java/com/sheep/gamegroup/model/entity/TaskEty.java
  2. 14 3
      app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java
  3. 2 0
      app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdp.java

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

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

+ 14 - 3
app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java
Ver fichero 

@@ -145,7 +145,13 @@ public class TaskDetailAct extends BaseActivity implements TaskDetailContract.Vi
 
 
 
         });
 
         });
 
         webText.getSettings().setJavaScriptEnabled(true);
 
         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(){
 
         webText.setWebViewClient(new WebViewClient(){
 
             @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
 
             @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
 
             @Override
 
             @Override
 
@@ -154,7 +160,12 @@ public class TaskDetailAct extends BaseActivity implements TaskDetailContract.Vi
 
                 return true;
 
                 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()+"");
 
         nameTv.setText(taskEty.getName()+"");
 
         priceTv.setText("+"+ taskEty.getBonus() +"元");
 
         priceTv.setText("+"+ taskEty.getBonus() +"元");
 
         dateTv.setText(TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(taskEty.getUpdate_time()))+"");
 
         dateTv.setText(TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(taskEty.getUpdate_time()))+"");
 
@@ -344,7 +355,7 @@ public class TaskDetailAct extends BaseActivity implements TaskDetailContract.Vi
 
             final String data = uploadResult.getData().getUrl();
 
             final String data = uploadResult.getData().getUrl();
 
             dialogShowLoading.getTextView().setText("更新中");
 
             dialogShowLoading.getTextView().setText("更新中");
 
             JSONObject jsonObject = new JSONObject();
 
             JSONObject jsonObject = new JSONObject();
 
-            jsonObject.put("id", taskEty.getRelease_task_id());
 
+            jsonObject.put("id", taskEty.getAcceptedTaskId());
 
             jsonObject.put("screenshots",data+"");
 
             jsonObject.put("screenshots",data+"");
 
             jsonObject.put("remark",taskEty.getRemarks()+"");
 
             jsonObject.put("remark",taskEty.getRemarks()+"");
 
             jsonObject.put("package_name",taskEty.getPackage_names()+"");
 
             jsonObject.put("package_name",taskEty.getPackage_names()+"");

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

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