From c2ffd60060183c6517790a9b9d2067695fcf3b42 Mon Sep 17 00:00:00 2001 From: wds Date: Sun, 15 Aug 2021 21:46:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9A=E4=BD=8D=E4=B8=8A?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fragment/ChargingPileFragment.java | 18 +++++++++++------- .../fragment/ChargingStationFragment.java | 19 +++++++++++-------- .../outdoor/fragment/OtherFragment.java | 17 +++++++++++------ .../navinfo/outdoor/fragment/PoiFragment.java | 19 ++++++++++++------- .../outdoor/fragment/WithdrawFragment.java | 4 ++-- 5 files changed, 47 insertions(+), 30 deletions(-) diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java index c01d489..566f9be 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java @@ -194,12 +194,10 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC chargingPileDao = poiDatabase.getChargingPileDao(); checkBoxLife = findViewById(R.id.check_pot_life); checkBoxRight = findViewById(R.id.check_pot_right); - checkBoxLife.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + checkBoxLife.setOnClickListener(new View.OnClickListener() { @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - if (isChecked) { - checkBoxLife.setText("保存"); - checkBoxLife.setTextColor(Color.WHITE); + public void onClick(View v) { + if(checkBoxLife.isChecked()){ moveLatlng(latLng, new TencentMap.CancelableCallback() { @Override public void onFinish() { @@ -208,19 +206,25 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC if (markerPile != null) { markerPile.setFixingPoint(screenPilePositions.x, screenPilePositions.y); } + checkBoxLife.setText("保存"); + checkBoxLife.setTextColor(Color.WHITE); + checkBoxLife.setChecked(true); } @Override public void onCancel() { + checkBoxLife.setText("编辑"); + checkBoxLife.setTextColor(Color.BLACK); + checkBoxLife.setChecked(false); } }); - } else { + }else { checkBoxLife.setText("编辑"); checkBoxLife.setTextColor(Color.BLACK); latLng = tencentMap.getProjection().fromScreenLocation(screenPilePositions); markerPile.setPosition(latLng); markerPile.setFixingPointEnable(false); - + checkBoxLife.setChecked(false); } } }); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java index 874c909..6e63b8c 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java @@ -277,13 +277,10 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. EventBus.getDefault().post(obtain); } }); - - checkBoxLife.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + checkBoxLife.setOnClickListener(new View.OnClickListener() { @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - if (isChecked) { - checkBoxLife.setText("保存"); - checkBoxLife.setTextColor(Color.WHITE); + public void onClick(View v) { + if(checkBoxLife.isChecked()){ moveLatlng(latLng, new TencentMap.CancelableCallback() { @Override public void onFinish() { @@ -292,20 +289,26 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. if (markerStation != null) { markerStation.setFixingPoint(screenStationPositions.x, screenStationPositions.y); } + checkBoxLife.setText("保存"); + checkBoxLife.setTextColor(Color.WHITE); + checkBoxLife.setChecked(true); } @Override public void onCancel() { + checkBoxLife.setText("编辑"); + checkBoxLife.setTextColor(Color.BLACK); + checkBoxLife.setChecked(false); } }); - } else { + }else { checkBoxLife.setText("编辑"); checkBoxLife.setTextColor(Color.BLACK); latLng = tencentMap.getProjection().fromScreenLocation(screenStationPositions); markerStation.setPosition(latLng); markerStation.setFixingPointEnable(false); + checkBoxLife.setChecked(false); } - } }); checkBoxRight.setVisibility(View.GONE); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java index 96499c7..f063f6a 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java @@ -191,12 +191,10 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis } }); checkPot = findViewById(R.id.check_pot); - checkPot.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + checkPot.setOnClickListener(new View.OnClickListener() { @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - if (isChecked) { - checkPot.setText("保存"); - checkPot.setTextColor(Color.WHITE); + public void onClick(View v) { + if(checkPot.isChecked()){ moveLatlng(latLng, new TencentMap.CancelableCallback() { @Override public void onFinish() { @@ -205,18 +203,25 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis if (markerOther != null) { markerOther.setFixingPoint(screenOtherPositions.x, screenOtherPositions.y); } + checkPot.setText("保存"); + checkPot.setTextColor(Color.WHITE); + checkPot.setChecked(true); } @Override public void onCancel() { + checkPot.setText("编辑"); + checkPot.setTextColor(Color.BLACK); + checkPot.setChecked(false); } }); - } else { + }else { checkPot.setText("编辑"); checkPot.setTextColor(Color.BLACK); latLng = tencentMap.getProjection().fromScreenLocation(screenOtherPositions); markerOther.setPosition(latLng); markerOther.setFixingPointEnable(false); + checkPot.setChecked(false); } } }); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java index 82be593..0d7297b 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java @@ -177,12 +177,10 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe poiDao = poiDatabase.getPoiDao(); checkBoxLife = findViewById(R.id.check_pot_life); checkBoxRight = findViewById(R.id.check_pot_right); - checkBoxLife.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + checkBoxLife.setOnClickListener(new View.OnClickListener() { @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - if (isChecked) { - checkBoxLife.setText("保存"); - checkBoxLife.setTextColor(Color.WHITE); + public void onClick(View v) { + if(checkBoxLife.isChecked()){ moveLatlng(latLng, new TencentMap.CancelableCallback() { @Override public void onFinish() { @@ -191,22 +189,29 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe if (markerPoi != null) { markerPoi.setFixingPoint(screenPoiPositions.x, screenPoiPositions.y); } + checkBoxLife.setText("保存"); + checkBoxLife.setTextColor(Color.WHITE); + checkBoxLife.setChecked(true); } @Override public void onCancel() { + checkBoxLife.setText("编辑"); + checkBoxLife.setTextColor(Color.BLACK); + checkBoxLife.setChecked(false); } }); - } else { + }else { checkBoxLife.setText("编辑"); checkBoxLife.setTextColor(Color.BLACK); latLng = tencentMap.getProjection().fromScreenLocation(screenPoiPositions); markerPoi.setPosition(latLng); markerPoi.setFixingPointEnable(false); + checkBoxLife.setChecked(false); } - } }); + setSlidingUpPanelLayout(Constant.SLIDING_LAYOUT); nestedScrollView = findViewById(R.id.nested_scroll_view); if (slidingPaneLayout != null) { diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java index 1926c55..e625f8c 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java @@ -175,8 +175,8 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen case R.id.button: String price = etAllPrice.getText().toString().trim(); if (price!=null&&!price.equals("")){ - Integer integer = Integer.valueOf(price); - if (integer!=null&&integer<10){ + double aDouble = Double.valueOf(price); + if (aDouble<10){ Toast.makeText(getActivity(), "提现金额不能低于10元", Toast.LENGTH_SHORT).show(); return; }