From dab61da6c55607c28d83c051ac10959f03e51818 Mon Sep 17 00:00:00 2001 From: fengjignqi <15192412330@163.com> Date: Sun, 14 Jun 2026 09:06:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E6=8F=8F=E4=BA=8C=E7=BB=B4=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E8=BF=9E=E6=8E=A5=E9=85=8D=E7=BD=911?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../water/device/DeviceControlActivity.java | 3 +- .../ckkj/water/device/SelectWifiActivity.java | 1 + .../com/ckkj/water/index/IndexFragment.java | 43 +++++++++--------- .../ckkj/water/plan/PlanDetailActivity.java | 2 +- .../ckkj/water/plan/WaterPlanFragment.java | 35 ++++++++++++-- .../water/plan/mvp/WaterPlanPresenter.java | 3 +- .../drawable/shape_gray_button_bg_enable.xml | 5 ++ .../main/res/layout/device_control_layout.xml | 1 + .../main/res/layout/water_plan_fragment.xml | 2 + .../res/mipmap-xxhdpi/icon_ctrl_bt_green.png | Bin 0 -> 959 bytes .../res/mipmap-xxxhdpi/icon_ctrl_bt_green.png | Bin 0 -> 1340 bytes 11 files changed, 67 insertions(+), 28 deletions(-) create mode 100644 app/src/main/res/drawable/shape_gray_button_bg_enable.xml create mode 100644 app/src/main/res/mipmap-xxhdpi/icon_ctrl_bt_green.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/icon_ctrl_bt_green.png diff --git a/app/src/main/java/com/ckkj/water/device/DeviceControlActivity.java b/app/src/main/java/com/ckkj/water/device/DeviceControlActivity.java index 2be8e58..75f505b 100644 --- a/app/src/main/java/com/ckkj/water/device/DeviceControlActivity.java +++ b/app/src/main/java/com/ckkj/water/device/DeviceControlActivity.java @@ -75,7 +75,8 @@ public class DeviceControlActivity extends BaseActivity results = data.getStringArrayListExtra(MNScanManager.INTENT_KEY_RESULT_SUCCESS); + + if (results == null || results.isEmpty()) { + ToastUtil.showShort(mContext, "二维码内容不能为空"); + return; + } + + String scanContent = results.get(0); + if (TextUtils.isEmpty(scanContent)) { + ToastUtil.showShort(mContext, "二维码内容不能为空"); + return; + } + + JSONObject json; + try { + json = new JSONObject(scanContent); + } catch (JSONException e) { + ToastUtil.showShort(mContext, "二维码格式错误"); + return; + } try { - ArrayList results = data.getStringArrayListExtra(MNScanManager.INTENT_KEY_RESULT_SUCCESS); - - if (results == null || results.isEmpty()) { - ToastUtil.showShort(mContext, "二维码内容不能为空"); - return; - } - - String scanContent = results.get(0); - if (TextUtils.isEmpty(scanContent)) { - ToastUtil.showShort(mContext, "二维码内容不能为空"); - return; - } - - JSONObject json; - try { - json = new JSONObject(scanContent); - } catch (JSONException e) { - ToastUtil.showShort(mContext, "二维码格式错误"); - return; - } WaterDeviceEntity entity = new WaterDeviceEntity(); if(TextUtils.isEmpty(json.getString("mac")) || TextUtils.isEmpty(json.getString("name"))){ @@ -192,7 +192,8 @@ public class IndexFragment extends BaseFragment mPlanList = new ArrayList<>(); private WaterPlanListAdapter mAdapter; private int mCurrentPage = 1; + private String mSearchOption = ""; @Override public void initData(Bundle state) { @@ -63,13 +67,36 @@ public class WaterPlanFragment extends BaseFragment { + mSearchOption = ""; mCurrentPage = 1; viewBinding.refresh.setNoMoreData(false); - mPresenter.getWaterPlanList(mCurrentPage); + mPresenter.getWaterPlanList(mCurrentPage,mSearchOption); + viewBinding.etInputPlanName.setText(""); }); viewBinding.refresh.setOnLoadMoreListener(layout -> { mCurrentPage++; - mPresenter.getWaterPlanList(mCurrentPage); + mPresenter.getWaterPlanList(mCurrentPage,mSearchOption); + }); + //文本输入搜索排程 + viewBinding.etInputPlanName.setOnEditorActionListener((v, actionId, event) -> { + if (actionId == EditorInfo.IME_ACTION_SEARCH) { + // 隐藏键盘 + InputMethodManager imm = (InputMethodManager) v.getContext() + .getSystemService(Context.INPUT_METHOD_SERVICE); + + if (imm != null) { + imm.hideSoftInputFromWindow(v.getWindowToken(), 0); + } + + // 清除焦点（可选，避免键盘再次弹出） + v.clearFocus(); + mSearchOption = v.getText().toString().trim(); + mCurrentPage = 1; + // 执行搜索 + mPresenter.getWaterPlanList(mCurrentPage,mSearchOption); + return true; + } + return false; }); } @@ -77,7 +104,7 @@ public class WaterPlanFragment extends BaseFragment map = new HashMap<>(); map.put("pageNum", mCurrentPage + ""); map.put("pageSize", "10"); + map.put("name", searchOption); impl.getWaterConfigList(map, new WaterPlanContract.CallBack>() { @Override diff --git a/app/src/main/res/drawable/shape_gray_button_bg_enable.xml b/app/src/main/res/drawable/shape_gray_button_bg_enable.xml new file mode 100644 index 0000000..fee0e92 --- /dev/null +++ b/app/src/main/res/drawable/shape_gray_button_bg_enable.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/device_control_layout.xml b/app/src/main/res/layout/device_control_layout.xml index d71017a..567522a 100644 --- a/app/src/main/res/layout/device_control_layout.xml +++ b/app/src/main/res/layout/device_control_layout.xml @@ -46,6 +46,7 @@ android:gravity="center" android:background="@drawable/shape_device_ctrl_green_cor12"> diff --git a/app/src/main/res/layout/water_plan_fragment.xml b/app/src/main/res/layout/water_plan_fragment.xml index 5c37f14..3588a8d 100644 --- a/app/src/main/res/layout/water_plan_fragment.xml +++ b/app/src/main/res/layout/water_plan_fragment.xml @@ -41,6 +41,8 @@ android:layout_toRightOf="@+id/img_search" android:layout_marginLeft="@dimen/dp_8" android:textSize="14sp" + android:imeOptions="actionSearch" + android:inputType="text" android:hint="@string/input_plan_name" android:textColorHint="@color/color_subtitle"/> diff --git a/app/src/main/res/mipmap-xxhdpi/icon_ctrl_bt_green.png b/app/src/main/res/mipmap-xxhdpi/icon_ctrl_bt_green.png new file mode 100644 index 0000000000000000000000000000000000000000..d2db5a240d1d764aa4e5b4e843381f8d0002f9a3 GIT binary patch literal 959 zcmV;w13>(VP)Px#1am@3R0s$N2z&@+hyVZsX-PyuRA_Kpo^feYJ7v{ z1i__5VpTW+;RGS8N=;qb6Er=6*-?=N^aehH7mbvnc&3Z7jejsRHijX~g>Y$p9pLhLIm?>g+ z0V$8#4d&Ja_Czn;_oi?q`*Z!zHfo-Y*~fax{!=Jd0K*8tSlo~X=FSQm5a26O8sPbj&78e0H#fd^}t z$1z&nDZG^d@TLDv8!y=;bG)dRK7f9nSn4Unah+d8&jBI#Yab+g1zJ4^z}GOA;sziW z5S>Mi>s(9xU=6`>EpGS{kK_XIXM0mxdaF@*O^=l(OD>?*bMQ!`snEyV%1(t$^3;G~ zx<0whX&GGwpsjM2sHKo$xBwG~XHP z8RF-tc{Ui0i;$BSJ(EBk^f-P_h+Zlf|E4?v0h%2%c38cj-$NVaAEe|%l0i!H%XE;? zCf&Y^9c0bU03;xaND7dKl>B<^H2zG?<_jRwov8RpeA*dBL`0xM9smi`Bwa__Yzgev zN}P5^08jM)%#@NZ5xWU^u!aChG;7pWYCX9B9QWIen9WbiO|}Gz3yAGDG3Zhe_Cya0 zl;A!+z|Vccr7KxXK%9Iu$k@Nv0lL75Fhe5y_T;u>ruR@cx)cg3@5D zi>ISy%3fH&Ci0?pNuznS6ykgl$ximHJ4W+;`uW-2Ilx766O2`MGc^Hu$OmZkoUI}@ zfoegM=;F6_t3pjKpa}T@t)2tM)tpxx8 literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxxhdpi/icon_ctrl_bt_green.png b/app/src/main/res/mipmap-xxxhdpi/icon_ctrl_bt_green.png new file mode 100644 index 0000000000000000000000000000000000000000..332bd798d2eb54a96ea1c36d3f301816d84ba9e4 GIT binary patch literal 1340 zcmV-C1;hG@P)Px#1am@3R0s$N2z&@+hyVZt=1D|BRCt{2non}#MihsCt#+KG*f2NX27$#WVHIbydBn8z zg64O1%b8J9TPspFD2^K2NnLB(BU9h$-nq7Fc=z|jW1%rDv7#wCJ* z@Shs!H+JH7IQQpOwX923Wr_LYMJ-oJ0KnOU&<8+B@*@f3!(e+DWEr1=Aof9s7v9b@ zzpJYbVuyFAbpZHd#}aSre&RNopB@2B0@vuJ@+?X($o%{Qwr&ZMssME|Ns`H7>lT{5 zeP3Vh+jtsZ$Ic429tu}Fs)ko+vhZOT5ysBrnmEOG+ze+ZPdzCvmgL zB@e>Ash3$knRKhW@+1lCUM5LJ&X({jl7DILz6e)-IPgtE`~k8J>lV$f1a&X!OK zmo;F17G-S5!}lNfBg~JjM15??|14%&-H21Vh`JmAVE8BSnH%!h!hM?vCndz7C`_v# zab$=hy&Oa=9fQc14&nQ@2~I>10KB(`2PCP2hOk_tfR!=z_ewBf2_B z4O{&XDa4#Ne2ux;pMa)*4|hC4(ObD6^-2I0wrk3wcQ63pWG{%HilD=CwxpNjRSErR z#7erwJ9ae?m<`B9O2}VOGCARzQqoF5#cd1AW+J`!ySHGQ9I0bozJg>KvUm&$*Pv^O z$|c_Hxe2!AK1lDU#xIHQm5`sHxZ{Hu9OdN_C$~s6jv@W0-{%7|8?bK8eIu8UsQfgl3kEoPD>g*x5U+yo<`T9`%P;Cz&pyY zbt5*9qBM9&W=yOyCL-HmHL0BWz4s<$i)jV>b?hoC%mGL+1`!N4$!5xNjjliqCom?{ zdY8JLOfx9U%n{j@OG59(;%iDW#MvX(kW!!~C{HE%1Qj4QpMrZtH@ z|EQ3soSZ5D_dzEt2c-)-aXBbe&>6@