From c0e8025c3be6ddd5625919d6a1cdb2fac222079f Mon Sep 17 00:00:00 2001 From: xiaoyan159 Date: Tue, 10 May 2022 15:40:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89=E4=B9=9D=E5=A4=A9?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../outdoor/fragment/RoadFragment.java | 46 +-------- app/src/main/res/layout/fragment_road.xml | 95 ++++--------------- 2 files changed, 17 insertions(+), 124 deletions(-) diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java index e5c3743..f07051f 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java @@ -13,8 +13,6 @@ import android.widget.Button; import android.widget.EditText; import android.widget.FrameLayout; import android.widget.ImageView; -import android.widget.RadioButton; -import android.widget.RadioGroup; import android.widget.TextView; import android.widget.Toast; @@ -97,9 +95,6 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList private LatLng latLng, rearLatLng; private StringBuilder roadBuilder; private boolean booleanExtra = true; - private RadioButton rbtnRoadOpen/*道路已开通*/, rbtnRoadPartOpen/*道路部分开通*/, rbtnRoadHasntOpen/*道路未开通*/, rbtnRoadHasntFind/*道路未找到*/, rbtnRoadOther/*其他*/; - private RadioGroup rgRoadStatus; // 道路状态的radioGroup - private EditText edtCheckedOther; public static RoadFragment newInstance(Bundle bundle) { RoadFragment fragment = new RoadFragment(); @@ -215,30 +210,6 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList @Override protected void initView() { super.initView(); - rbtnRoadOpen = findViewById(R.id.rbtn_road_open); - rbtnRoadPartOpen = findViewById(R.id.rbtn_road_part_open); - rbtnRoadHasntOpen = findViewById(R.id.rbtn_road_hasnt_open); - rbtnRoadHasntFind = findViewById(R.id.rbtn_road_hasnt_find); - rbtnRoadOther = findViewById(R.id.rbtn_road_other); - rgRoadStatus = findViewById(R.id.rg_road_status); - edtCheckedOther = findViewById(R.id.edt_checked_other); - - rgRoadStatus.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() { - @Override - public void onCheckedChanged(RadioGroup group, int checkedId) { - rgRoadStatus.setTag(findViewById(checkedId).getTag()); - switch (checkedId) { - case R.id.rbtn_road_other: - edtCheckedOther.setVisibility(View.VISIBLE); - break; - default: - edtCheckedOther.setVisibility(View.GONE); - break; - } - } - }); - - tvPictures = findViewById(R.id.tv_pictures); tvPictures.setOnClickListener(this); setSlidingUpPanelLayout(Constant.SLIDING_LAYOUT); @@ -428,14 +399,6 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList tvPictures.setEnabled(false); etDesc.setEnabled(false); btnRoadSave.setEnabled(false); - - rgRoadStatus.setEnabled(false); - rbtnRoadOpen.setEnabled(false); - rbtnRoadPartOpen.setEnabled(false); - rbtnRoadHasntOpen.setEnabled(false); - rbtnRoadHasntFind.setEnabled(false); - rbtnRoadOther.setEnabled(false); - edtCheckedOther.setEnabled(false); } @Subscribe @@ -636,10 +599,6 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList httpParams.put("address", poiEntity.getAddress()); httpParams.put("workType", 0); httpParams.put("memo", poiEntity.getMemo()); - // 增加对应九天平台的参数 - httpParams.put("existence", rgRoadStatus.getTag().toString()); - httpParams.put("description", edtCheckedOther!=null&&edtCheckedOther.isShown()? edtCheckedOther.getText().toString().trim(): ""); - OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) @@ -693,9 +652,6 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList httpParams.put("address", poiEntity.getAddress()); httpParams.put("workType", 0); httpParams.put("memo", poiEntity.getMemo()); - // 增加对应九天平台的参数 - httpParams.put("existence", rgRoadStatus.getTag().toString()); - httpParams.put("description", edtCheckedOther!=null&&edtCheckedOther.isShown()? edtCheckedOther.getText().toString().trim(): ""); OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) @@ -977,4 +933,4 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList protected PoiCheckResult checkChargingPileEntity(ChargingPileEntity entity) { return null; } -} \ No newline at end of file +} diff --git a/app/src/main/res/layout/fragment_road.xml b/app/src/main/res/layout/fragment_road.xml index 389b82f..0a9a10b 100644 --- a/app/src/main/res/layout/fragment_road.xml +++ b/app/src/main/res/layout/fragment_road.xml @@ -20,10 +20,14 @@ android:layout_height="match_parent"> android:layout_height="match_parent"> @@ -110,7 +115,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="点击拍摄成果可查看，长按可删除" - android:textSize="16sp" /> + android:textSize="16sp" + android:layout_marginStart="10dp" + /> + android:textSize="16sp" /> + - - - - - - - - - - - - - - @@ -232,9 +168,9 @@ android:focusableInTouchMode="true" android:gravity="top" android:hint="任务描述" - android:padding="10dp" - android:minLines="2" - android:maxLines="3" + android:paddingStart="10dp" + android:paddingTop="10dp" + android:paddingBottom="30dp" android:textColor="@color/test_color_selector" android:textSize="15sp" @@ -254,7 +190,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/ll_info"> + app:layout_constraintTop_toBottomOf="@id/ll_desc">