diff --git a/app/src/main/java/com/bonus/canteen/activity/MainActivity.java b/app/src/main/java/com/bonus/canteen/activity/MainActivity.java index 8b0e335..3087400 100644 --- a/app/src/main/java/com/bonus/canteen/activity/MainActivity.java +++ b/app/src/main/java/com/bonus/canteen/activity/MainActivity.java @@ -120,6 +120,7 @@ public class MainActivity extends AppCompatActivity { private MainActivity activity; TabLayout mTabLayout; TextView titleView, userName; + Button exit; private TextView timeShow, tvWeight; private Handler mHandler = new Handler(Looper.getMainLooper()); private ShutdownReceiver shutdownReceiver; @@ -194,12 +195,13 @@ public class MainActivity extends AppCompatActivity { dishAdapter = new DishAdapter(MainActivity.this, dishList, MainActivity.this); dishGridView.setAdapter(dishAdapter); userName = findViewById(R.id.username); + exit = findViewById(R.id.exit); ThreadPoolManager.getExecutor().execute(() -> { String userNameStr = AppDatabase.getDatabase(this).loginInfoDao().getLoginInfoOne().getUserName(); runOnUiThread(() -> userName.setText(userNameStr)); }); - userName.setOnClickListener(v -> DialogLoader.getInstance().showConfirmDialog( + exit.setOnClickListener(v -> DialogLoader.getInstance().showConfirmDialog( this, "是否退出登录？", getString(R.string.lab_yes), @@ -228,7 +230,7 @@ public class MainActivity extends AppCompatActivity { stallSpinner.setOnItemSelectedListener((spinner, position, id, item) -> { String stallId = stallBeanList.get(position).getStallId(); Log.e("stallSpinner", "Selected stallId: " + stallId + ", stallName: " + stallBeanList.get(position).getStallName()); - initMealTimeTab(stallId); + initDishData(stallId); }); } @@ -378,7 +380,7 @@ public class MainActivity extends AppCompatActivity { if (decimal.compareTo(BigDecimal.valueOf(124)) > 0) { // 如果重量大于100，表示秤上有物品 keepASample.setEnabled(true); - keepASample.setBackground(getDrawable(R.drawable.btn_border_bg_10_dark_green)); + keepASample.setBackground(getDrawable(R.drawable.title_bg)); keepASample.setText(getString(R.string.keepASample)); } else { // 如果重量小于等于0，表示秤上没有物品 diff --git a/app/src/main/java/com/bonus/canteen/adapter/DishAdapter.java b/app/src/main/java/com/bonus/canteen/adapter/DishAdapter.java index f287f7c..4f646d8 100644 --- a/app/src/main/java/com/bonus/canteen/adapter/DishAdapter.java +++ b/app/src/main/java/com/bonus/canteen/adapter/DishAdapter.java @@ -87,7 +87,7 @@ public class DishAdapter extends BaseAdapter { boolean isSampled = StringHelper.isEmptyAndNull(bean.getSampleSaveTime()); holder.isRecord.setText(isSampled ? "未留样" : "已留样"); holder.dishItemLinearLayout.setBackgroundResource( - isSampled ? R.drawable.btn_border_bg_10_dark_green : R.drawable.btn_border_bg_10_dark_green_1 + isSampled ? R.drawable.btn_border_bg_10_dark_blue : R.drawable.btn_border_bg_10_dark_green_1 ); ViewHolder finalHolder = holder; holder.dishItemLinearLayout.setOnClickListener(v -> { @@ -103,12 +103,12 @@ public class DishAdapter extends BaseAdapter { if (StringHelper.isEmptyAndNull(dish.getSampleSaveTime())) { LinearLayout itemLayout = (LinearLayout) viewGroup.getChildAt(list.indexOf(dish)); if (itemLayout != null) { - itemLayout.setBackgroundResource(R.drawable.btn_border_bg_10_dark_green); + itemLayout.setBackgroundResource(R.drawable.btn_border_bg_10_dark_blue); } } } //设置当前选择菜品的底色 - finalHolder.dishItemLinearLayout.setBackgroundResource(R.drawable.btn_border_bg_10_dark_blue); + finalHolder.dishItemLinearLayout.setBackgroundResource(R.drawable.btn_border_bg_5_fe6d4b); mainActivity.updateDishDate(clickedBean); } }); diff --git a/app/src/main/java/com/bonus/canteen/utils/OkHttpService.java b/app/src/main/java/com/bonus/canteen/utils/OkHttpService.java index 0a047d9..d89483b 100644 --- a/app/src/main/java/com/bonus/canteen/utils/OkHttpService.java +++ b/app/src/main/java/com/bonus/canteen/utils/OkHttpService.java @@ -268,6 +268,7 @@ public class OkHttpService { //get方法 public String httpGet(String url, Context context) { try { + Log.e("OkHttpService", "httpGet: " + url); OkHttpClient client = getInstance(); Request request = new Request.Builder().url(url).addHeader( "Authorization", "Bearer " + AppDatabase.getDatabase(context).loginInfoDao().getLoginInfoOne().getToken() 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 94bb67f..807c786 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.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_border_bg_10_dark_blue.xml b/app/src/main/res/drawable/btn_border_bg_10_dark_blue.xml index cf14bab..3e5d89c 100644 --- a/app/src/main/res/drawable/btn_border_bg_10_dark_blue.xml +++ b/app/src/main/res/drawable/btn_border_bg_10_dark_blue.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_border_bg_10_dark_gray.xml b/app/src/main/res/drawable/btn_border_bg_10_dark_gray.xml index 54db1c3..f44e6bb 100644 --- a/app/src/main/res/drawable/btn_border_bg_10_dark_gray.xml +++ b/app/src/main/res/drawable/btn_border_bg_10_dark_gray.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_border_bg_10_dark_green_1.xml b/app/src/main/res/drawable/btn_border_bg_10_dark_green_1.xml index c82d31a..2398039 100644 --- a/app/src/main/res/drawable/btn_border_bg_10_dark_green_1.xml +++ b/app/src/main/res/drawable/btn_border_bg_10_dark_green_1.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_border_bg_10_60ffffff.xml b/app/src/main/res/drawable/btn_border_bg_10_white_1.xml similarity index 52% rename from app/src/main/res/drawable/btn_border_bg_10_60ffffff.xml rename to app/src/main/res/drawable/btn_border_bg_10_white_1.xml index 6a86c59..0cedec6 100644 --- a/app/src/main/res/drawable/btn_border_bg_10_60ffffff.xml +++ b/app/src/main/res/drawable/btn_border_bg_10_white_1.xml @@ -1,8 +1,8 @@ - + + android:width="2dp" + android:color="#ffffff" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/edit_text_bg.xml b/app/src/main/res/drawable/edit_text_bg.xml index ec3cd6c..8424266 100644 --- a/app/src/main/res/drawable/edit_text_bg.xml +++ b/app/src/main/res/drawable/edit_text_bg.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/drawable/ic_login_bg.png b/app/src/main/res/drawable/ic_login_bg.png index b7b1926..c42eba3 100644 Binary files a/app/src/main/res/drawable/ic_login_bg.png and b/app/src/main/res/drawable/ic_login_bg.png differ diff --git a/app/src/main/res/drawable/title_bg.xml b/app/src/main/res/drawable/title_bg.xml new file mode 100644 index 0000000..89a044a --- /dev/null +++ b/app/src/main/res/drawable/title_bg.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/font/source_han_sans_cn_bold.otf b/app/src/main/res/font/source_han_sans_cn_bold.otf new file mode 100644 index 0000000..4b3429a Binary files /dev/null and b/app/src/main/res/font/source_han_sans_cn_bold.otf differ diff --git a/app/src/main/res/font/source_han_sans_cn_medium.ttf b/app/src/main/res/font/source_han_sans_cn_medium.ttf new file mode 100644 index 0000000..2639ef9 Binary files /dev/null and b/app/src/main/res/font/source_han_sans_cn_medium.ttf differ diff --git a/app/src/main/res/font/source_han_sans_regular.otf b/app/src/main/res/font/source_han_sans_regular.otf new file mode 100644 index 0000000..886f82f Binary files /dev/null and b/app/src/main/res/font/source_han_sans_regular.otf differ diff --git a/app/src/main/res/layout/activity_dish_item.xml b/app/src/main/res/layout/activity_dish_item.xml index b02389a..cc85622 100644 --- a/app/src/main/res/layout/activity_dish_item.xml +++ b/app/src/main/res/layout/activity_dish_item.xml @@ -19,7 +19,7 @@ android:layout_width="150dp" android:layout_height="wrap_content" android:id="@+id/dish_item_linear_layout" - android:background="@drawable/btn_border_bg_10_dark_green" + android:background="@drawable/btn_border_bg_10_dark_blue" android:orientation="vertical" android:padding="20dp"> + android:textSize="16sp" /> diff --git a/app/src/main/res/layout/activity_keep_sample_details.xml b/app/src/main/res/layout/activity_keep_sample_details.xml index 921ede6..d6377c2 100644 --- a/app/src/main/res/layout/activity_keep_sample_details.xml +++ b/app/src/main/res/layout/activity_keep_sample_details.xml @@ -6,15 +6,17 @@ android:layout_height="match_parent" android:background="#F4F4F4" android:orientation="vertical"> - + + android:layout_height="wrap_content" + android:padding="10dp"> @@ -26,6 +30,7 @@ android:id="@+id/stall_spinner" style="@style/Material.SpinnerStyle" android:layout_height="50dp" + app:ms_dropdown_max_height="300dp" android:layout_marginStart="10dp" android:minWidth="200dp" /> @@ -33,6 +38,7 @@ android:id="@+id/storage_status_spinner" style="@style/Material.SpinnerStyle" android:layout_height="50dp" + app:ms_dropdown_max_height="300dp" android:layout_marginStart="@dimen/config_margin_10dp" android:minWidth="200dp" /> @@ -60,7 +66,7 @@ style="?android:attr/buttonBarButtonStyle" android:layout_width="100dp" android:layout_height="wrap_content" - android:background="@drawable/btn_border_bg_10_dark_green" + android:background="@drawable/title_bg" android:text="@string/query" />