From 6df7e26e28a9b2db53b6671d6db1ae02be67f660 Mon Sep 17 00:00:00 2001 From: jjLv <1981429112@qq.com> Date: Thu, 21 Aug 2025 15:47:05 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/canteen/fragment/FaceFragment.java | 8 +++--- .../bonus/canteen/fragment/LoginFragment.java | 6 +++-- .../bonus/canteen/fragment/PalmFragment.java | 1 + .../bonus/canteen/fragment/StartFragment.java | 17 +++++++----- .../com/bonus/canteen/utils/WorkConfig.java | 8 +++--- .../res/drawable/btn_gradient_selector.xml | 20 ++++++++++++++ app/src/main/res/drawable/edittext_bg.xml | 7 +++++ .../res/drawable/edittext_border_white.xml | 5 +++- app/src/main/res/drawable/face_bg.xml | 2 +- .../main/res/drawable/login_bg_gradient.xml | 6 +++++ app/src/main/res/layout/activity_face.xml | 21 ++++++++++----- app/src/main/res/layout/activity_login.xml | 26 +++++++++---------- app/src/main/res/values/colors.xml | 8 +++++- 13 files changed, 96 insertions(+), 39 deletions(-) create mode 100644 app/src/main/res/drawable/btn_gradient_selector.xml create mode 100644 app/src/main/res/drawable/edittext_bg.xml create mode 100644 app/src/main/res/drawable/login_bg_gradient.xml diff --git a/app/src/main/java/com/bonus/canteen/fragment/FaceFragment.java b/app/src/main/java/com/bonus/canteen/fragment/FaceFragment.java index 296ac95..5d612c3 100644 --- a/app/src/main/java/com/bonus/canteen/fragment/FaceFragment.java +++ b/app/src/main/java/com/bonus/canteen/fragment/FaceFragment.java @@ -936,10 +936,10 @@ public class FaceFragment extends BaseFragment { flEngine.unInit(); flEngine = null; } - if (serialPort != null) { - serialPort.close(); - serialPort = null; - } +// if (serialPort != null) { +// serialPort.close(); +// serialPort = null; +// } if (outputStream != null) { try { outputStream.close(); diff --git a/app/src/main/java/com/bonus/canteen/fragment/LoginFragment.java b/app/src/main/java/com/bonus/canteen/fragment/LoginFragment.java index 7c1daa3..2775d27 100644 --- a/app/src/main/java/com/bonus/canteen/fragment/LoginFragment.java +++ b/app/src/main/java/com/bonus/canteen/fragment/LoginFragment.java @@ -113,8 +113,10 @@ public class LoginFragment extends BaseFragment { if (jsonObject.getIntValue("code") == 500) { Log.e(TAG, "登录失败: " + jsonObject.getString("msg")); requireActivity().runOnUiThread(() -> { - dialog.dismiss(); - dialog = null; + if(dialog != null){ + dialog.dismiss(); + dialog = null; + } XToastUtils.error(jsonObject.getString("msg")); }); return; diff --git a/app/src/main/java/com/bonus/canteen/fragment/PalmFragment.java b/app/src/main/java/com/bonus/canteen/fragment/PalmFragment.java index 56fe524..2cb0c57 100644 --- a/app/src/main/java/com/bonus/canteen/fragment/PalmFragment.java +++ b/app/src/main/java/com/bonus/canteen/fragment/PalmFragment.java @@ -376,6 +376,7 @@ public class PalmFragment extends BaseFragment { saveImage(bytes); } } catch (Exception e) { + XToastUtils.error("处理图像时出错 "); Log.e(TAG, "处理图像错误: " + e.getMessage()); } finally { if (image != null) { diff --git a/app/src/main/java/com/bonus/canteen/fragment/StartFragment.java b/app/src/main/java/com/bonus/canteen/fragment/StartFragment.java index 7df2f34..384806d 100644 --- a/app/src/main/java/com/bonus/canteen/fragment/StartFragment.java +++ b/app/src/main/java/com/bonus/canteen/fragment/StartFragment.java @@ -44,6 +44,7 @@ import okhttp3.RequestBody; @Page(name = "起始页", anim = CoreAnim.none) public class StartFragment extends BaseFragment { private OkHttpService service = new OkHttpService(); + @NonNull @Override protected ActivityStartBinding viewBindingInflate(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, boolean attachToRoot) { @@ -52,17 +53,21 @@ public class StartFragment extends BaseFragment { @Override protected void initViews() { - binding.btnStart.setOnClickListener(view->{ + binding.btnStart.setOnClickListener(view -> { Log.d("StartFragment", "checkToken: 开始验证Token"); //验证token是否失效 - checkToken(new ResponseCallBack(){ + checkToken(new ResponseCallBack() { @Override public void onSuccess() { requireActivity().runOnUiThread(() -> ((MainActivity) requireActivity()).updateView(2)); } + @Override public void onFail(String msg) { - requireActivity().runOnUiThread(()-> XToastUtils.error("Token验证失败,请重新登录!")); + requireActivity().runOnUiThread(() -> { + ((MainActivity) requireActivity()).updateView(-1); + XToastUtils.error("Token验证失败,请重新登录!"); + }); } }); }); @@ -73,9 +78,9 @@ public class StartFragment extends BaseFragment { } - public void checkToken(ResponseCallBack callBack){ + public void checkToken(ResponseCallBack callBack) { Log.d("StartFragment", "checkToken: 开始验证Token"); - ThreadPoolManager.getExecutor().execute(()->{ + ThreadPoolManager.getExecutor().execute(() -> { String url = WorkConfig.getBaseUrl() + "/api/android/device/checkToken"; com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject(); String jsonString = json.toString(); @@ -93,7 +98,7 @@ public class StartFragment extends BaseFragment { } else { if (result.contains("操作成功")) { // 发送广播或更新UI - callBack.onSuccess(); + callBack.onSuccess(); } else { // 发送广播或更新UI callBack.onFail("Token验证失败"); diff --git a/app/src/main/java/com/bonus/canteen/utils/WorkConfig.java b/app/src/main/java/com/bonus/canteen/utils/WorkConfig.java index ed8bb52..94bb67f 100644 --- a/app/src/main/java/com/bonus/canteen/utils/WorkConfig.java +++ b/app/src/main/java/com/bonus/canteen/utils/WorkConfig.java @@ -25,10 +25,10 @@ public class WorkConfig { throw new UnsupportedOperationException("Cannot instantiate utility class"); } //本地 - protected static String baseUrl = "http://192.168.0.34:48380/smart-canteen"; - protected static String prefixesUrl = "http://192.168.0.34:48380"; -// protected static String baseUrl = "http://192.168.0.244:48380/smart-canteen"; -// protected static String prefixesUrl = "http://192.168.0.244:48380"; +// protected static String baseUrl = "http://192.168.0.34:48380/smart-canteen"; +// protected static String prefixesUrl = "http://192.168.0.34:48380"; + protected static String baseUrl = "http://192.168.0.244:48380/smart-canteen"; + protected static String prefixesUrl = "http://192.168.0.244:48380"; protected static String fileUrl = "http://192.168.0.14:9090/lnyst/"; protected static String updateUrl = "https://www.baidu.com"; protected static String serverUri = "tcp://192.168.0.244:1883"; diff --git a/app/src/main/res/drawable/btn_gradient_selector.xml b/app/src/main/res/drawable/btn_gradient_selector.xml new file mode 100644 index 0000000..14d33b7 --- /dev/null +++ b/app/src/main/res/drawable/btn_gradient_selector.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/edittext_bg.xml b/app/src/main/res/drawable/edittext_bg.xml new file mode 100644 index 0000000..623b5dd --- /dev/null +++ b/app/src/main/res/drawable/edittext_bg.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/edittext_border_white.xml b/app/src/main/res/drawable/edittext_border_white.xml index 42acc8f..283af2f 100644 --- a/app/src/main/res/drawable/edittext_border_white.xml +++ b/app/src/main/res/drawable/edittext_border_white.xml @@ -1,5 +1,8 @@ - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/face_bg.xml b/app/src/main/res/drawable/face_bg.xml index aae628e..43dd9b3 100644 --- a/app/src/main/res/drawable/face_bg.xml +++ b/app/src/main/res/drawable/face_bg.xml @@ -4,5 +4,5 @@ + android:color="#6C92E4" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/login_bg_gradient.xml b/app/src/main/res/drawable/login_bg_gradient.xml new file mode 100644 index 0000000..8088845 --- /dev/null +++ b/app/src/main/res/drawable/login_bg_gradient.xml @@ -0,0 +1,6 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_face.xml b/app/src/main/res/layout/activity_face.xml index 0a37be8..7089f8e 100644 --- a/app/src/main/res/layout/activity_face.xml +++ b/app/src/main/res/layout/activity_face.xml @@ -155,7 +155,7 @@ android:text="00.0" android:layout_gravity="end" android:layout_marginEnd="25dp" - android:textColor="#606060" + android:textColor="#4C81F4" android:textFontWeight="1000" android:textSize="25sp" /> + + android:layout_width="465dp" + android:layout_gravity="center" + android:layout_height="465dp" /> + + @@ -17,7 +17,7 @@ android:layout_width="match_parent" android:layout_height="100dp" android:paddingLeft="@dimen/config_margin_10dp" - android:paddingRight="@dimen/config_margin_10dp"> + android:paddingRight="70dp"> + android:textSize="35sp" /> @@ -81,14 +81,14 @@ android:layout_width="match_parent" android:layout_height="80dp" android:gravity="center" - android:layout_marginTop="@dimen/config_margin_40dp" + android:layout_marginTop="60dp" android:paddingLeft="@dimen/config_margin_10dp" android:paddingRight="@dimen/config_margin_10dp">