修改我的页面的bug

app/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion 29
     buildToolsVersion '29.0.2'
-    //ndkVersion '23.0.7123448'
+    ndkVersion '23.0.7123448'
 
     defaultConfig {
         applicationId "com.navinfo.outdoor"

app/src/main/java/com/navinfo/outdoor/api/UserApplication.java

@@ -79,11 +79,11 @@ public class UserApplication extends Application {
         //builder.cookieJar(new CookieJarImpl(new MemoryCookieStore()));
         //超时时间设置，默认60秒
         //全局的读取超时时间
-        builder.readTimeout(OkGo.DEFAULT_MILLISECONDS, TimeUnit.MILLISECONDS);
+        builder.readTimeout(0, TimeUnit.MILLISECONDS);
         //全局的写入超时时间
-        builder.writeTimeout(OkGo.DEFAULT_MILLISECONDS, TimeUnit.MILLISECONDS);
+        builder.writeTimeout(0, TimeUnit.MILLISECONDS);
         //全局的连接超时时间
-        builder.connectTimeout(OkGo.DEFAULT_MILLISECONDS, TimeUnit.MILLISECONDS);
+        builder.connectTimeout(0, TimeUnit.MILLISECONDS);
         OkGo.getInstance().init(this)
                 .setOkHttpClient(builder.build())
                 //全局统一缓存模式，默认不使用缓存，可以不传

app/src/main/java/com/navinfo/outdoor/bean/GetPriceBean.java

@@ -2,6 +2,7 @@ package com.navinfo.outdoor.bean;
 
 public class GetPriceBean {
 
+
     private Integer code;
     private String message;
     private BodyBean body;
@@ -38,6 +39,8 @@ public class GetPriceBean {
         private Double rewardPrice;
         private Double poiPushPrice;
         private Double poiNonepushPrice;
+        private Double poivideoPushPrice;
+        private Double poivideoNonepushPrice;
         private Double roadPushPrice;
         private Double roadNonepushPrice;
         private Double csPushPrice;
@@ -102,6 +105,22 @@ public class GetPriceBean {
             this.poiNonepushPrice = poiNonepushPrice;
         }
 
+        public Double getPoivideoPushPrice() {
+            return poivideoPushPrice;
+        }
+
+        public void setPoivideoPushPrice(Double poivideoPushPrice) {
+            this.poivideoPushPrice = poivideoPushPrice;
+        }
+
+        public Double getPoivideoNonepushPrice() {
+            return poivideoNonepushPrice;
+        }
+
+        public void setPoivideoNonepushPrice(Double poivideoNonepushPrice) {
+            this.poivideoNonepushPrice = poivideoNonepushPrice;
+        }
+
         public Double getRoadPushPrice() {
             return roadPushPrice;
         }

app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java

@@ -469,6 +469,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
             return;
         }
         showFileLoadingDialog();
+        setLoadingDialogText("上传中...");
         OkGo
                 // 请求方式和请求url
                 .<PoiUploadBean>post(HttpInterface.OTHER_TASK_UPLOAD_PIC)

app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java

@@ -740,6 +740,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
             return;
         }
         showFileLoadingDialog();
+        setLoadingDialogText("上传中...");
         OkGo
                 // 请求方式和请求url
                 .<OtherUploadPicBean>post(HttpInterface.POI_TASK_UPLOAD_PIC)

app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java

@@ -83,7 +83,6 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
     private RadioButton rbCar;
     private RadioButton rbBicycle;
     private RadioButton rbWalking;
-    private RadioButton rbManual;
     private EditText etDesc;
     private Button btnRoadSave;
     private RadioGroup rgType;
@@ -152,7 +151,6 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
         rbCar = (RadioButton) findViewById(R.id.rb_car);
         rbBicycle = (RadioButton) findViewById(R.id.rb_bicycle);
         rbWalking = (RadioButton) findViewById(R.id.rb_walking);
-        rbManual = (RadioButton) findViewById(R.id.rb_manual);
         etDesc = (EditText) findViewById(R.id.et_desc);
         fmPoiVideoPic = findViewById(R.id.fm_poi_video_picture);
         btnRoadSave = (Button) findViewById(R.id.btn_poi_video_save);
@@ -262,7 +260,6 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
         btnRoadSave.setEnabled(false);
         rbCar.setEnabled(false);
         rbWalking.setEnabled(false);
-        rbManual.setEnabled(false);
         rbBicycle.setEnabled(false);
     }
 
@@ -308,6 +305,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
 
             case R.id.btn_poi_video_upload:
                 showFileLoadingDialog();
+                setLoadingDialogText("压缩中...");
                 ArrayList<File> fileList = new ArrayList<>();
                 if (fmPoiVideoPic.getTag() != null) {
                     List<File> videoFileList = (List<File>) fmPoiVideoPic.getTag();
@@ -498,6 +496,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
             return;
         }
         showFileLoadingDialog();
+        setLoadingDialogText("上传中...");
         OkGo
                 // 请求方式和请求url
                 .<OtherUploadPicBean>post(HttpInterface.POI_VIDEO_UPLOAD_PIC)
@@ -675,8 +674,6 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
             return 1;
         } else if (rbWalking != null && rbWalking.isChecked()) {
             return 2;
-        } else if (rbManual != null && rbManual.isChecked()) {
-            return 3;
         }
         return -1;
     }
@@ -692,9 +689,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
             case 2:
                 rbWalking.setChecked(true);
                 break;
-            case 3:
+
-                rbManual.setChecked(true);
-                break;
         }
     }
 

app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java

@@ -85,7 +85,6 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
     private RadioButton rbCar;
     private RadioButton rbBicycle;
     private RadioButton rbWalking;
-    private RadioButton rbManual;
     private EditText etDesc;
     private Button btnRoadSave;
     private RadioGroup rgType;
@@ -154,7 +153,6 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
         rbCar = (RadioButton) findViewById(R.id.rb_car);
         rbBicycle = (RadioButton) findViewById(R.id.rb_bicycle);
         rbWalking = (RadioButton) findViewById(R.id.rb_walking);
-        rbManual = (RadioButton) findViewById(R.id.rb_manual);
         etDesc = (EditText) findViewById(R.id.et_desc);
         fmRoadPic = findViewById(R.id.fm_road_picture);
         btnRoadSave = (Button) findViewById(R.id.btn_road_save);
@@ -269,7 +267,6 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
         btnRoadSave.setEnabled(false);
         rbCar.setEnabled(false);
         rbBicycle.setEnabled(false);
-        rbManual.setEnabled(false);
         rbWalking.setEnabled(false);
     }
 
@@ -319,7 +316,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
                 break;
             case R.id.road_upload:
                 showFileLoadingDialog();
-                setLoadingDialogText("压缩中。。");
+                setLoadingDialogText("压缩中...");
                 ArrayList<File> fileList = new ArrayList<>();
                 if (fmRoadPic.getTag() != null) {
                     List<File> videoFileList = (List<File>) fmRoadPic.getTag();
@@ -512,7 +509,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
             return;
         }
         showFileLoadingDialog();
-        setLoadingDialogText("上传中。。");
+        setLoadingDialogText("上传中...");
         OkGo
                 // 请求方式和请求url
                 .<OtherUploadPicBean>post(HttpInterface.ROAD_TASK_UPLOAD_PIC)
@@ -713,8 +710,6 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
             return 1;
         } else if (rbWalking != null && rbWalking.isChecked()) {
             return 2;
-        } else if (rbManual != null && rbManual.isChecked()) {
-            return 3;
         }
         return -1;
     }
@@ -730,9 +725,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
             case 2:
                 rbWalking.setChecked(true);
                 break;
-            case 3:
+
-                rbManual.setChecked(true);
-                break;
         }
     }
 

app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java

@@ -33,6 +33,8 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
     private EditText etAllPrice;
     private TextView poiPushMoney;
     private TextView poiReportMoney;
+    private TextView poiVideoPushMoney;
+    private TextView poiVideoReportMoney;
     private TextView roadPushMoney;
     private TextView roadReportMoney;
     private TextView chargingPushMoney;
@@ -60,7 +62,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
     protected void initView() {
         super.initView();
         tvUnit = findViewById(R.id.tv_unit);//可提现
-        tvAlready = findViewById(R.id.tv_already);//以提现
+        tvAlready = findViewById(R.id.tv_already);//已提现
         tvTotal = findViewById(R.id.tv_total);//总资产
         tvAll = findViewById(R.id.tv_all);
         tvAll.setOnClickListener(this::onClick);
@@ -73,6 +75,8 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
         btWithdraw.setOnClickListener(this::onClick);
         poiPushMoney = (TextView) findViewById(R.id.poi_push_money);
         poiReportMoney = (TextView) findViewById(R.id.poi_report_money);
+        poiVideoPushMoney = (TextView) findViewById(R.id.poiVideo_push_money);
+        poiVideoReportMoney = (TextView) findViewById(R.id.poiVideo_report_money);
         roadPushMoney = (TextView) findViewById(R.id.road_push_money);
         roadReportMoney = (TextView) findViewById(R.id.road_report_money);
         chargingPushMoney = (TextView) findViewById(R.id.charging_push_money);
@@ -103,6 +107,8 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
                         tvAlready.setText(response.getBody().getHaveExchangePrice() + "");
                         poiPushMoney.setText(response.getBody().getPoiPushPrice() + "元");
                         poiReportMoney.setText(response.getBody().getPoiNonepushPrice() + "元");
+                        poiVideoPushMoney.setText(response.getBody().getPoivideoPushPrice() + "元");
+                        poiVideoReportMoney.setText(response.getBody().getPoivideoNonepushPrice() + "元");
                         roadPushMoney.setText(response.getBody().getRoadPushPrice() + "元");
                         roadReportMoney.setText(response.getBody().getRoadNonepushPrice() + "元");
                         chargingPushMoney.setText(response.getBody().getCsPushPrice() + "元");
@@ -165,7 +171,11 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
                     @Override
                     public void onSuccess(UserPriceExchangeBean response, int id) {
                         dismissLoadingDialog();
-                          Toast.makeText(getContext(), response.getMessage(), Toast.LENGTH_SHORT).show();
+                        Toast.makeText(getContext(), response.getMessage(), Toast.LENGTH_SHORT).show();
+
+
+                        etAllPrice.getText().clear();
+
                         Log.d("TAG", "onSuccess: " + response.toString() + "tttttttt");
                     }
 

app/src/main/java/com/navinfo/outdoor/room/PoiEntity.java

@@ -48,7 +48,7 @@ public class PoiEntity implements Serializable {
     private int isLocalData;//是否是本地数据  0,服务 1,本地
     private int isExclusive;//任务类型 0.普通任务，1.专属任务
     private int bodyId;//保存本地的bodyId
-    private int work_type;//0."车行" 1."自行车" 2."步行" 3."手动"
+    private int work_type;//0."车行" 1."自行车" 2."步行"
 
     public int getWork_type() {
         return work_type;

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

@@ -115,13 +115,13 @@
                     android:text="步行"
                     android:textColor="@color/test_color_selector" />
 
-                <RadioButton
+<!--                <RadioButton-->
-                    android:id="@+id/rb_manual"
+<!--                    android:id="@+id/rb_manual"-->
-                    android:layout_width="0dp"
+<!--                    android:layout_width="0dp"-->
-                    android:layout_height="wrap_content"
+<!--                    android:layout_height="wrap_content"-->
-                    android:layout_weight="1"
+<!--                    android:layout_weight="1"-->
-                    android:text="手动"
+<!--                    android:text="手动"-->
-                    android:textColor="@color/test_color_selector" />
+<!--                    android:textColor="@color/test_color_selector" />-->
             </RadioGroup>
 
         </LinearLayout>
@@ -139,7 +139,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="03.拍照  "
+                android:text="03.录像  "
                 android:textColor="@color/black"
                 android:textSize="16sp" />
 
@@ -190,7 +190,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
                 android:layout_marginTop="20dp"
-                android:text="03.描述"
+                android:text="04.描述"
                 android:textColor="@color/black"
                 android:textSize="16sp" />
 

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

@@ -104,13 +104,13 @@
                     android:layout_weight="1"
                     android:textColor="@color/test_color_selector"
                     android:text="步行"/>
-                <RadioButton
+<!--                <RadioButton-->
-                    android:id="@+id/rb_manual"
+<!--                    android:id="@+id/rb_manual"-->
-                    android:layout_width="0dp"
+<!--                    android:layout_width="0dp"-->
-                    android:layout_weight="1"
+<!--                    android:layout_weight="1"-->
-                    android:textColor="@color/test_color_selector"
+<!--                    android:textColor="@color/test_color_selector"-->
-                    android:layout_height="wrap_content"
+<!--                    android:layout_height="wrap_content"-->
-                    android:text="手动"/>
+<!--                    android:text="手动"/>-->
             </RadioGroup>
 
         </LinearLayout>
@@ -127,7 +127,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="03.拍照  "
+                android:text="03.录像  "
                 android:textColor="@color/black"
                 android:textSize="16sp" />
 
@@ -138,7 +138,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="5dp"
                 android:gravity="center"
-                android:text="拍照"
+                android:text="录像"
                 android:textColor="@color/white"
                 android:textSize="15sp" />
 

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

@@ -312,6 +312,86 @@
                 android:textColor="#333"
                 android:textSize="18sp" />
         </RelativeLayout>
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="#F1F0F0" />
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="65dp"
+            android:padding="5dp"
+            android:gravity="center_vertical">
+
+            <ImageView
+                android:id="@+id/image_poiVideo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_margin="2dp"
+                android:background="@drawable/poi_square" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="20dp"
+                android:layout_toRightOf="@id/image_poiVideo"
+                android:text="POIVIDEO推送积分"
+                android:textColor="#333"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/poiVideo_push_money"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:gravity="center_vertical"
+                android:text="+￥0.0"
+                android:textColor="#333"
+                android:textSize="18sp" />
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="#F1F0F0" />
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="65dp"
+            android:padding="5dp"
+            android:gravity="center_vertical">
+
+            <ImageView
+                android:id="@+id/image_poiVideo_report"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_margin="2dp"
+                android:background="@drawable/poi_square" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="20dp"
+                android:layout_toRightOf="@id/image_poiVideo_report"
+                android:text="POIVIDEO上报任务积分"
+                android:textColor="#333"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/poiVideo_report_money"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:gravity="center_vertical"
+                android:text="+￥0.0"
+                android:textColor="#333"
+                android:textSize="18sp" />
+        </RelativeLayout>
+
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"