xiaoyan159/NavinfoOutDoor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 去掉九天相关代码逻辑

Browse Source
This commit is contained in:
xiaoyan159 2022-05-10 15:40:27 +08:00
parent 3e87744e6f
commit c0e8025c3b
2 changed files with 17 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java
View File

@ -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;
}
}
}

95
app/src/main/res/layout/fragment_road.xml
View File

@ -20,10 +20,14 @@
<androidx.core.widget.NestedScrollView
android:id="@+id/nested_scroll_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
>
android:layout_height="match_parent">
<TextView
@ -103,6 +107,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
app:layout_constraintLeft_toLeftOf="@id/ll_pictures"
app:layout_constraintTop_toBottomOf="@id/ll_pictures">
@ -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" />
<ImageView
android:id="@+id/iv_road_picture"
@ -120,6 +128,7 @@
android:scaleType="fitXY" />
</FrameLayout>
<LinearLayout
android:id="@+id/ll_desc"
android:layout_width="match_parent"
@ -128,85 +137,12 @@
app:layout_constraintLeft_toLeftOf="@id/fm_road_picture"
app:layout_constraintTop_toBottomOf="@id/fm_road_picture">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="20dp"
android:text="03.任务状态"
android:textColor="@color/black"
android:textSize="16sp" />
<RadioGroup
android:id="@+id/rg_road_status"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:tag="0"
android:orientation="vertical">
<RadioButton
android:id="@+id/rbtn_road_open"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:tag="0"
android:checked="true"
android:text="道路正常开通"></RadioButton>
<RadioButton
android:id="@+id/rbtn_road_part_open"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:tag="1"
android:text="道路部分开通"></RadioButton>
<RadioButton
android:id="@+id/rbtn_road_hasnt_open"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:tag="2"
android:text="道路未开通"></RadioButton>
<RadioButton
android:id="@+id/rbtn_road_hasnt_find"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:tag="3"
android:text="道路未找到"></RadioButton>
<RadioButton
android:id="@+id/rbtn_road_other"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:tag="4"
android:text="其他不可采原因"></RadioButton>
</RadioGroup>
<EditText
android:id="@+id/edt_checked_other"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="10dp"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="top"
android:hint="可手动输入"
android:padding="10dp"
android:minLines="2"
android:maxLines="3"
android:background="@drawable/underline"
android:textColor="@color/test_color_selector"
android:textSize="15sp"></EditText>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintLeft_toLeftOf="@id/fm_road_picture"
app:layout_constraintTop_toBottomOf="@id/ll_desc">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="20dp"
android:text="04.备注"
android:text="03.描述"
android:textColor="@color/black"
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">
<Button
android:id="@+id/btn_road_save"
@ -280,3 +216,4 @@
</LinearLayout>