Skip to content

HBHAndroid
HBHAndroid
Commit 896ef78c authored by 小费同学阿's avatar 小费同学阿 💬
Browse files
Options

环渤海-页面交互优化

parent 4fd1ece5
Show whitespace changes
Inline Side-by-side
Showing with 304 additions and 212 deletions
.idea/workspace.xml
View file @ 896ef78c
......@@ -9,12 +9,8 @@
<option name="autoReloadType" value="NONE" />
</component>
<component name="ChangeListManager">
<list default="true" id="1610d094-2fe0-4efc-9eff-ac55fbf06aaf" name="Changes" comment="环渤海-我的页面创建">
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/Home/HomeFragment.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/mine/MineFragment.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_home.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_mine.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/menu/bottom_nav_menu.xml" afterDir="false" />
<list default="true" id="1610d094-2fe0-4efc-9eff-ac55fbf06aaf" name="Changes" comment="环渤海-页面交互优化">
<change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/selector_menu_wode.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/8.0/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/fileHashes/fileHashes.bin" afterDir="false" />
......@@ -25,8 +21,13 @@
<change beforePath="$PROJECT_DIR$/.gradle/file-system.probe" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/file-system.probe" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/Home/HomeActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/Home/HomeActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_home.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_home.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_mine.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_mine.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/Home/HomeViewModel.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/mine/MineViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/mine/MineViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/drawable/arrow_right.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/drawable/selector_menu_home.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_home.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_home.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_mine.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_mine.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/menu/bottom_nav_menu.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/menu/bottom_nav_menu.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/local.properties" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
......@@ -34,6 +35,9 @@
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="CodeInsightWorkspaceSettings">
<option name="optimizeImportsOnTheFly" value="true" />
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\11194\.android\avd\Pixel_6_Pro_API_34.avd]" />
<component name="ExternalProjectsData">
<projectState path="$PROJECT_DIR$">
......@@ -61,8 +65,8 @@
<option name="RECENT_TEMPLATES">
<list>
<option value="Kotlin Class" />
<option value="resourceFile" />
<option value="Class" />
<option value="resourceFile" />
</list>
</option>
</component>
......@@ -99,8 +103,8 @@
"cidr.known.project.marker": "true",
"dart.analysis.tool.window.visible": "false",
"last_directory_selection": "C:/AndroidStudioProjects/hbhandroid/app/src/main/res/mipmap-hdpi",
"last_opened_file_path": "C:/AndroidStudioProjects/hbhandroid/app/src/main/res/layout",
"project.structure.last.edited": "Dependencies",
"last_opened_file_path": "C:/AndroidStudioProjects/hbhandroid/app/src/main/res/mipmap-hdpi",
"project.structure.last.edited": "SDK Location",
"project.structure.proportion": "0.17",
"project.structure.side.proportion": "0.2",
"settings.editor.selected.configurable": "preferences.pluginManager",
......@@ -118,10 +122,10 @@
<recent name="com.example.merchanthbh.ui.Home" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="C:\AndroidStudioProjects\hbhandroid\app\src\main\res\mipmap-hdpi" />
<recent name="C:\AndroidStudioProjects\hbhandroid\app\src\main\res\layout" />
<recent name="C:\AndroidStudioProjects\hbhandroid\app\src\main\res" />
<recent name="C:\AndroidStudioProjects\hbhandroid\app\src\main\res\drawable" />
<recent name="C:\AndroidStudioProjects\hbhandroid\app\src\main\res\mipmap-hdpi" />
<recent name="C:\AndroidStudioProjects\hbhandroid\app\src\main\res\mipmap\home" />
</key>
<key name="MoveFile.RECENT_KEYS">
......@@ -214,7 +218,14 @@
<option name="project" value="LOCAL" />
<updated>1688715086532</updated>
</task>
<option name="localTasksCounter" value="2" />
<task id="LOCAL-00002" summary="环渤海-页面交互">
<created>1688722135494</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1688722135494</updated>
</task>
<option name="localTasksCounter" value="3" />
<servers />
</component>
<component name="Vcs.Log.Tabs.Properties">
......@@ -230,7 +241,9 @@
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="环渤海-我的页面创建" />
<option name="LAST_COMMIT_MESSAGE" value="环渤海-我的页面创建" />
<MESSAGE value="环渤海-页面交互" />
<MESSAGE value="环渤海-页面交互优化" />
<option name="LAST_COMMIT_MESSAGE" value="环渤海-页面交互优化" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
......
app/src/main/java/com/example/merchanthbh/ui/Home/HomeActivity.java
View file @ 896ef78c
package com.example.merchanthbh.ui.Home;
import android.content.Intent;
import android.os.Bundle;
import android.view.MenuItem;
import android.view.View;
import android.widget.Button;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import com.example.merchanthbh.R;
import com.example.merchanthbh.ui.mine.MineFragment;
import com.google.android.material.bottomnavigation.BottomNavigationView;
public class HomeActivity extends AppCompatActivity {
private HomeFragment homeFragment;
private BottomNavigationView bottomNavigationView;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_home);
// 初始化底部导航栏
bottomNavigationView = findViewById(R.id.bottom_navigation_view);
BottomNavigationView bottomNavigationView = findViewById(R.id.bottom_navigation_view);
bottomNavigationView.setOnNavigationItemSelectedListener(navItemSelectedListener);
// 显示默认的 Fragment
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new HomeFragment()).commit();
}
private BottomNavigationView.OnNavigationItemSelectedListener navItemSelectedListener = item -> {
private final BottomNavigationView.OnNavigationItemSelectedListener navItemSelectedListener = item -> {
Fragment selectedFragment = null;
// 根据选项 ID 创建相应的 Fragmen
// 根据选项 ID 创建相应的 Fragment
if (item.getItemId()==R.id.menu_home)
{ selectedFragment = new HomeFragment();}
else if (item.getItemId()==R.id.menu_mine) {
if (item.getItemId() == R.id.menu_home) {
selectedFragment = new HomeFragment();
} else if (item.getItemId() == R.id.menu_mine) {
selectedFragment = new MineFragment();
}
/* switch (item.getItemId()) {
case R.id.menu_home:
selectedFragment = new HomeFragment();
break;
case R.id.menu_mine:
selectedFragment = new MineFragment();
break;
default:
}*/
// 替换当前显示的 Fragment
// 确保选择项不能为空
assert selectedFragment != null;
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, selectedFragment).commit();
return true;
};
}
}
app/src/main/java/com/example/merchanthbh/ui/Home/HomeViewModel.java deleted 100644 → 0
View file @ 4fd1ece5
package com.example.merchanthbh.ui.Home;
import android.app.Application;
import androidx.annotation.NonNull;
import com.example.merchanthbh.http.data.LoginModel;
import me.goldze.mvvmhabit.base.BaseViewModel;
public class HomeViewModel extends BaseViewModel<LoginModel> {
public HomeViewModel(@NonNull Application application, LoginModel model) {
super(application, model);
}
}
app/src/main/java/com/example/merchanthbh/ui/mine/MineViewModel.java
View file @ 896ef78c
......@@ -4,13 +4,13 @@ import android.app.Application;
import androidx.annotation.NonNull;
import com.example.merchanthbh.http.data.LoginModel;
import com.example.merchanthbh.http.data.LoginRespons;
import me.goldze.mvvmhabit.base.BaseViewModel;
public class MineViewModel extends BaseViewModel<LoginModel> {
public MineViewModel(@NonNull Application application, LoginModel model) {
public class MineViewModel extends BaseViewModel<LoginRespons> {
public MineViewModel(@NonNull Application application, LoginRespons model) {
super(application, model);
}
}
......
app/src/main/res/drawable/arrow_right.xml → app/src/main/res/drawable/selector_menu_home.xml
View file @ 896ef78c
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@mipmap/tab_icon_home_selected" android:state_checked="true" />
<item android:drawable="@mipmap/tab_icon_home_default" android:state_checked="false" />
</selector>
\ No newline at end of file
app/src/main/res/drawable/selector_menu_wode.xml 0 → 100644
View file @ 896ef78c
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@mipmap/tab_icon_wode_selected" android:state_checked="true" />
<item android:drawable="@mipmap/tab_icon_wode_default" android:state_checked="false" />
</selector>
\ No newline at end of file
app/src/main/res/layout/fragment_home.xml
View file @ 896ef78c
......@@ -29,6 +29,7 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="@color/bg_grey"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/bar">
<LinearLayout
......@@ -46,9 +47,9 @@
<!--今日成交-->
<TextView
style="@style/CommText"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:paddingTop="7dp"
android:text="今日成交(元)"
android:text="@string/today_deal"
android:textColor="@color/white"
android:textSize="15sp"
android:textStyle="bold"
......@@ -61,7 +62,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="11dp"
android:paddingTop="40dp"
android:text="27587.68"
android:text="@string/today_deal_number"
android:textColor="#FFFFFF"
android:textSize="30sp"
android:textStyle="bold"
......@@ -85,21 +86,21 @@
android:columnCount="4"
android:orientation="horizontal"
android:rowCount="2"
tools:ignore="MissingConstraints">
tools:ignore="MissingConstraints,UselessParent">
<!--今日订单模块-->
<LinearLayout
android:layout_width="100dp"
android:layout_gravity="center"
android:layout_height="match_parent"
android:layout_columnSpan="1"
android:gravity="center"
android:layout_columnWeight="1"
android:layout_gravity="center"
android:gravity="center"
android:orientation="vertical"
tools:ignore="MissingConstraints">
<!--今日订单-->
<TextView
style="@style/CommText"
android:text="今日订单"
android:text="@string/today_order"
android:textColor="#5971A4"
android:textSize="14sp"
android:textStyle="bold" />
......@@ -108,26 +109,26 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="795个"
android:textStyle="bold"
android:text="@string/today_order_number"
android:textColor="#C8382A"
android:textSize="15sp" />
android:textSize="15sp"
android:textStyle="bold" />
</LinearLayout>
<!--今日下单用户模块-->
<LinearLayout
android:layout_width="100dp"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_columnSpan="1"
android:gravity="center"
android:layout_columnWeight="1"
android:layout_gravity="center"
android:gravity="center"
android:orientation="vertical"
tools:ignore="MissingConstraints">
<!--今日下单用户-->
<TextView
style="@style/CommText"
android:text="今日下单用户"
android:text="@string/today_customer"
android:textColor="#5971A4"
android:textSize="14sp"
android:textStyle="bold" />
......@@ -136,26 +137,26 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="795位"
android:textStyle="bold"
android:text="@string/today_customer_number"
android:textColor="#C8382A"
android:textSize="15sp" />
android:textSize="15sp"
android:textStyle="bold" />
</LinearLayout>
<!--电费余额模块-->
<LinearLayout
android:layout_width="100dp"
android:layout_height="match_parent"
android:layout_gravity="center"
android:gravity="center"
android:layout_columnSpan="1"
android:layout_columnWeight="1"
android:layout_gravity="center"
android:gravity="center"
android:orientation="vertical"
tools:ignore="MissingConstraints">
<!--今日下单用户-->
<TextView
style="@style/CommText"
android:text="电费余额"
android:text="@string/electricity_balance"
android:textColor="#5971A4"
android:textSize="14sp"
android:textStyle="bold" />
......@@ -164,10 +165,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="795.00元"
android:textStyle="bold"
android:text="@string/electricity_balance_num"
android:textColor="#C8382A"
android:textSize="15sp" />
android:textSize="15sp"
android:textStyle="bold" />
</LinearLayout>
</GridLayout>
......@@ -192,27 +193,28 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:layout_gravity="center"
android:layout_columnWeight="1"
android:layout_gravity="center"
android:gravity="center"
android:orientation="vertical"
tools:ignore="MissingConstraints">
tools:ignore="MissingConstraints,UseCompoundDrawables">
<!--店铺信息-图标-->
<ImageView
android:id="@+id/iv_ame_img2"
android:layout_width="48dp"
android:layout_height="48dp"
android:src="@mipmap/home_icon_dianpuxinxi"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
android:contentDescription="TODO"
tools:ignore="ContentDescription,HardcodedText" />
<!--店铺信息-文字-->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="店铺信息"
android:layout_columnWeight="1"
android:layout_marginTop="4dp"
android:text="@string/store_information"
android:textColor="#324E8D"
android:textSize="14sp"
android:textStyle="bold" />
......@@ -223,54 +225,58 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_columnWeight="1"
android:gravity="center"
android:layout_gravity="center"
android:gravity="center"
android:orientation="vertical"
tools:ignore="MissingConstraints">
tools:ignore="MissingConstraints,UseCompoundDrawables">
<!--店铺积分-图标-->
<ImageView
android:id="@+id/iv_ame_img8"
android:layout_width="48dp"
android:layout_height="48dp"
android:src="@mipmap/home_icon_dianpujifen"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
android:contentDescription="TODO"
tools:ignore="ContentDescription,HardcodedText" />
<!--店铺积分-文字-->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="店铺积分"
android:text="@string/store_points"
android:textColor="#324E8D"
android:textSize="14sp"
android:textStyle="bold" />
android:textStyle="bold" >
</TextView>
</LinearLayout>
<!--店员管理模块-->
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:layout_gravity="center"
android:layout_columnWeight="1"
android:layout_gravity="center"
android:gravity="center"
android:orientation="vertical"
tools:ignore="MissingConstraints">
tools:ignore="MissingConstraints,UseCompoundDrawables">
<!--店员管理-图标-->
<ImageView
android:id="@+id/iv_ame_img4"
android:layout_width="48dp"
android:layout_height="48dp"
android:src="@mipmap/home_icon_dianpuguanli"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
android:contentDescription="TODO"
tools:ignore="ContentDescription,HardcodedText" />
<!--店员管理-文字-->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="店员管理"
android:text="@string/clerk_management"
android:textColor="#324E8D"
android:textSize="14sp"
android:textStyle="bold" />
......@@ -293,7 +299,7 @@
android:orientation="horizontal"
android:rowCount="2"
tools:ignore="MissingConstraints">
<!--店铺信息模块-->
<!--添加商品模块-->
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
......@@ -302,28 +308,29 @@
android:layout_gravity="center"
android:gravity="center"
android:orientation="vertical"
tools:ignore="MissingConstraints">
<!--店铺信息-图标-->
tools:ignore="MissingConstraints,UseCompoundDrawables">
<!--添加商品-图标-->
<ImageView
android:id="@+id/iv_ame_img29"
android:layout_width="23.85dp"
android:layout_height="23.85dp"
android:src="@mipmap/home_icon_tianjiashangpin"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<!--店铺信息-文字-->
app:layout_constraintTop_toTopOf="parent"
android:contentDescription="TODO"
tools:ignore="ContentDescription,HardcodedText" />
<!--添加商品-文字-->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="添加商品"
android:text="@string/goods_add"
android:textColor="#333333"
android:textSize="14sp"
android:textStyle="bold" />
</LinearLayout>
<!--店铺积分模块-->
<!--商品管理模块-->
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
......@@ -332,28 +339,29 @@
android:layout_gravity="center"
android:gravity="center"
android:orientation="vertical"
tools:ignore="MissingConstraints">
<!--店铺积分-图标-->
tools:ignore="MissingConstraints,UseCompoundDrawables">
<!--商品管理-图标-->
<ImageView
android:id="@+id/iv_ame_img83"
android:layout_width="23.85dp"
android:layout_height="23.85dp"
android:src="@mipmap/home_icon_shangpinguanli"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<!--店铺积分-文字-->
app:layout_constraintTop_toTopOf="parent"
android:contentDescription="TODO"
tools:ignore="ContentDescription,HardcodedText" />
<!--商品管理-文字-->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="商品管理"
android:text="@string/goods_management"
android:textColor="#333333"
android:textSize="14sp"
android:textStyle="bold" />
</LinearLayout>
<!--店员管理模块-->
<!--创建订单模块-->
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
......@@ -362,27 +370,28 @@
android:layout_gravity="center"
android:gravity="center"
android:orientation="vertical"
tools:ignore="MissingConstraints">
<!--店员管理-图标-->
tools:ignore="MissingConstraints,UseCompoundDrawables">
<!--创建订单-图标-->
<ImageView
android:id="@+id/iv_ame_img"
android:layout_width="23.85dp"
android:layout_height="23.85dp"
android:src="@mipmap/home_icon_chuangjiandingdan"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<!--店员管理-文字-->
app:layout_constraintTop_toTopOf="parent"
android:contentDescription="TODO"
tools:ignore="ContentDescription,HardcodedText" />
<!--创建订单-文字-->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="创建订单"
android:text="@string/order_add"
android:textColor="#333333"
android:textSize="14sp"
android:textStyle="bold" />
</LinearLayout>
<!--店员管理模块-->
<!--订单管理模块-->
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
......@@ -391,27 +400,28 @@
android:layout_gravity="center"
android:gravity="center"
android:orientation="vertical"
tools:ignore="MissingConstraints">
<!--店员管理-图标-->
tools:ignore="MissingConstraints,UseCompoundDrawables">
<!--订单管理-图标-->
<ImageView
android:id="@+id/iv_ame_img97"
android:layout_width="23.85dp"
android:layout_height="23.85dp"
android:src="@mipmap/home_icon_dingdanguanli"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<!--店员管理-文字-->
app:layout_constraintTop_toTopOf="parent"
android:contentDescription="TODO"
tools:ignore="ContentDescription,HardcodedText" />
<!--订单管理-文字-->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="订单管理"
android:text="@string/order_management"
android:textColor="#333333"
android:textSize="14sp"
android:textStyle="bold" />
</LinearLayout>
<!--店铺积分模块-->
<!--诉求反馈模块-->
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
......@@ -421,27 +431,29 @@
android:gravity="center"
android:orientation="vertical"
android:paddingTop="15dp"
tools:ignore="MissingConstraints">
<!--店铺积分-图标-->
tools:ignore="MissingConstraints,UseCompoundDrawables">
<!--诉求反馈-图标-->
<ImageView
android:layout_width="23.85dp"
android:layout_height="23.85dp"
android:src="@mipmap/home_icon_suqiu"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<!--店铺积分-文字-->
app:layout_constraintTop_toTopOf="parent"
android:contentDescription="TODO"
tools:ignore="ContentDescription,HardcodedText" />
<!--诉求反馈-文字-->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="诉求反馈"
android:text="@string/appeal_feedback"
android:textColor="#333333"
android:textSize="14sp"
android:textStyle="bold" />
</LinearLayout>
<!--店员管理模块-->
<!--转发统计模块-->
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
......@@ -451,26 +463,28 @@
android:gravity="center"
android:orientation="vertical"
android:paddingTop="15dp"
tools:ignore="MissingConstraints">
<!--店员管理-图标-->
tools:ignore="MissingConstraints,UseCompoundDrawables">
<!--转发统计-图标-->
<ImageView
android:layout_width="23.85dp"
android:layout_height="23.85dp"
android:src="@mipmap/home_icon_zhuanfa"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<!--店员管理-文字-->
app:layout_constraintTop_toTopOf="parent"
android:contentDescription="TODO"
tools:ignore="ContentDescription,HardcodedText" />
<!--转发统计-文字-->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="转发统计"
android:text="@string/forwarding_statistics"
android:textColor="#333333"
android:textSize="14sp"
android:textStyle="bold" />
</LinearLayout>
<!--店员管理模块-->
<!--人才招聘模块-->
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
......@@ -480,22 +494,23 @@
android:gravity="center"
android:orientation="vertical"
android:paddingTop="15dp"
tools:ignore="MissingConstraints">
<!--店员管理-图标-->
tools:ignore="MissingConstraints,UseCompoundDrawables">
<!--人才招聘-图标-->
<ImageView
android:id="@+id/iv_ame_img9"
android:layout_width="23.85dp"
android:layout_height="23.85dp"
android:src="@mipmap/home_icon_zhaoping"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<!--店员管理-文字-->
app:layout_constraintTop_toTopOf="parent"
android:contentDescription="TODO"
tools:ignore="ContentDescription,HardcodedText" />
<!--人才招聘-文字-->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="人才招聘"
android:text="@string/talent_recruitment"
android:textColor="#333333"
android:textSize="14sp"
android:textStyle="bold" />
......
app/src/main/res/layout/fragment_mine.xml
View file @ 896ef78c
......@@ -44,13 +44,14 @@
tools:ignore="MissingConstraints">
<ImageView
android:id="@+id/iv_ame_img1"
android:layout_width="78dp"
android:layout_height="78dp"
android:src="@mipmap/wode_img_female"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
android:contentDescription="TODO"
tools:ignore="ContentDescription,HardcodedText" />
<LinearLayout
android:layout_width="wrap_content"
......@@ -68,8 +69,8 @@
<TextView
style="@style/CommText"
android:layout_marginLeft="16dp"
android:text="王小丫"
android:layout_marginStart="16dp"
android:text="@string/user_nickname"
android:textColor="@color/black"
android:textSize="20sp"
android:textStyle="bold"
......@@ -77,15 +78,14 @@
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_ame_num1"
android:layout_width="38dp"
android:layout_height="20dp"
android:layout_marginLeft="11dp"
android:layout_marginStart="11dp"
android:background="@drawable/bg_red_radius_4"
android:gravity="center"
android:text="店长"
android:text="@string/user_position"
android:textColor="@color/white"
android:textSize="13dp"
android:textSize="13sp"
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......@@ -94,9 +94,9 @@
<TextView
style="@style/CommText"
android:layout_marginLeft="17dp"
android:layout_marginStart="17dp"
android:layout_marginTop="21dp"
android:text="创建日期：2022-12-12"
android:text="@string/user_createdate"
android:textColor="@color/black"
android:textSize="14sp"
app:layout_constraintRight_toRightOf="@+id/tv_ame_num1"
......@@ -129,36 +129,36 @@
android:layout_marginBottom="13dp"
android:gravity="center"
android:orientation="horizontal"
tools:ignore="MissingConstraints">
tools:ignore="MissingConstraints"
app:layout_constraintEnd_toEndOf="parent"
app:layout_editor_absoluteY="13dp"
>
<!--修改密码-图标-->
<ImageView
android:id="@+id/iv_ame_img4"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginTop="1dp"
android:src="@mipmap/wode_icon_xiugaimima"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
android:contentDescription="TODO"
tools:ignore="ContentDescription,HardcodedText" />
<!--修改密码-文字-->
<TextView
android:layout_width="80dp"
android:layout_height="wrap_content"
android:layout_marginLeft="12dp"
android:text="修改密码"
android:layout_marginStart="12dp"
android:text="@string/change_password"
android:textColor="#5A5A5A"
android:textSize="16sp"
android:textStyle="bold" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_gravity="center"
android:layout_marginLeft="225dp"
android:layout_marginStart="190dp"
android:src="@mipmap/wode_icon_youjiantou"
app:layout_constraintRight_toRightOf="parent"
tools:ignore="MissingConstraints" />
tools:ignore="ContentDescription,HardcodedText,MissingConstraints"
android:contentDescription="TODO" />
</LinearLayout>
<!--分割线-->
......@@ -185,7 +185,9 @@
android:layout_columnSpan="2"
android:gravity="center"
android:orientation="horizontal"
tools:ignore="MissingConstraints">
app:layout_constraintEnd_toEndOf="parent"
tools:ignore="MissingConstraints"
tools:layout_editor_absoluteY="13dp">
<!--更换手机号-图标-->
<ImageView
android:layout_width="16dp"
......@@ -194,32 +196,35 @@
android:src="@mipmap/wode_icon_genghuan"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
android:contentDescription="TODO"
tools:ignore="ContentDescription,HardcodedText" />
<!--更换手机号-文字-->
<TextView
android:layout_width="80dp"
android:layout_height="wrap_content"
android:layout_marginLeft="12dp"
android:text="更换手机号"
android:layout_marginStart="12dp"
android:text="@string/change_phone"
android:textColor="#5A5A5A"
android:textSize="16sp"
android:textStyle="bold" />
<!--arrow右箭头进入-->
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_gravity="center"
android:layout_marginLeft="225dp"
android:layout_marginStart="190dp"
android:src="@mipmap/wode_icon_youjiantou"
app:layout_constraintRight_toRightOf="parent"
tools:ignore="MissingConstraints" />
tools:ignore="ContentDescription,HardcodedText,MissingConstraints"
android:contentDescription="TODO" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
<!--下半部分(隐私协议,清除缓存,检查更新)-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="392dp"
android:orientation="vertical"
android:padding="17dp">
<!--隐私协议模块-->
......@@ -239,6 +244,8 @@
android:layout_marginBottom="13dp"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_editor_absoluteY="13dp"
tools:ignore="MissingConstraints">
<!--隐私协议-图标-->
<ImageView
......@@ -248,25 +255,28 @@
android:src="@mipmap/wode_icon_xieyi"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
android:contentDescription="TODO"
tools:ignore="ContentDescription,HardcodedText" />
<!--隐私协议-文字-->
<TextView
android:layout_width="80dp"
android:layout_height="wrap_content"
android:layout_marginLeft="12dp"
android:text="隐私协议"
android:layout_marginStart="12dp"
android:text="@string/privary_agreement"
android:textColor="#5A5A5A"
android:textSize="16sp"
android:textStyle="bold" />
<!--arrow右箭头进入-->
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_gravity="center"
android:layout_marginLeft="225dp"
android:layout_marginStart="190dp"
android:src="@mipmap/wode_icon_youjiantou"
app:layout_constraintRight_toRightOf="parent"
tools:ignore="MissingConstraints" />
tools:ignore="ContentDescription,HardcodedText,MissingConstraints"
android:contentDescription="TODO" />
</LinearLayout>
<!--分割线-->
......@@ -295,6 +305,8 @@
android:layout_marginBottom="13dp"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_editor_absoluteY="13dp"
tools:ignore="MissingConstraints">
<!--清除缓存-图标-->
<ImageView
......@@ -304,25 +316,28 @@
android:src="@mipmap/wode_icon_qingchu"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
android:contentDescription="TODO"
tools:ignore="ContentDescription,HardcodedText" />
<!--清除缓存-文字-->
<TextView
android:layout_width="80dp"
android:layout_height="wrap_content"
android:layout_marginLeft="12dp"
android:text="清除缓存"
android:layout_marginStart="12dp"
android:text="@string/clear_cache"
android:textColor="#5A5A5A"
android:textSize="16sp"
android:textStyle="bold" />
<!--arrow右箭头进入-->
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_gravity="center"
android:layout_marginLeft="225dp"
android:layout_marginStart="190dp"
android:src="@mipmap/wode_icon_youjiantou"
app:layout_constraintRight_toRightOf="parent"
tools:ignore="MissingConstraints" />
tools:ignore="ContentDescription,HardcodedText,MissingConstraints"
android:contentDescription="TODO" />
</LinearLayout>
<!--分割线-->
......@@ -348,6 +363,8 @@
android:layout_columnSpan="2"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_editor_absoluteY="13dp"
tools:ignore="MissingConstraints">
<!--检查更新-图标-->
<ImageView
......@@ -357,25 +374,28 @@
android:src="@mipmap/wode_icon_gengxin"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
android:contentDescription="TODO"
tools:ignore="ContentDescription,HardcodedText" />
<!--检查更新-文字-->
<TextView
android:layout_width="80dp"
android:layout_height="wrap_content"
android:layout_marginLeft="12dp"
android:text="检查更新"
android:layout_marginStart="12dp"
android:text="@string/check_update"
android:textColor="#5A5A5A"
android:textSize="16sp"
android:textStyle="bold" />
<!--arrow右箭头进入-->
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_gravity="center"
android:layout_marginLeft="225dp"
android:layout_marginStart="190dp"
android:src="@mipmap/wode_icon_youjiantou"
app:layout_constraintRight_toRightOf="parent"
tools:ignore="MissingConstraints" />
tools:ignore="ContentDescription,HardcodedText,MissingConstraints"
android:contentDescription="TODO" />
</LinearLayout>
......@@ -388,7 +408,7 @@
android:layout_gravity="center"
android:layout_marginTop="31dp"
android:background="@drawable/bg_white_radius_24"
android:text="退出登录"
android:text="@string/log_out"
android:textColor="#5971A4"
android:textSize="16sp"
android:textStyle="bold" />
......
app/src/main/res/menu/bottom_nav_menu.xml
View file @ 896ef78c
......@@ -2,14 +2,15 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/menu_home"
android:icon="@mipmap/tab_icon_home_selected"
android:title="首页" />
android:icon="@drawable/selector_menu_home"
android:title="@string/navigation_home" />
<item
android:id="@+id/menu_huanbohai"
android:icon="@mipmap/tab_icon_huanbohai_default"
android:title="环渤海" />
android:icon="@drawable/selector_menu_home"
android:title="@string/navigation_sea" />
<item
android:id="@+id/menu_mine"
android:icon="@mipmap/tab_icon_wode_default"
android:title="我的" />
android:icon="@drawable/selector_menu_wode"
android:title="@string/navigation_mine" />
</menu>
\ No newline at end of file
app/src/main/res/values/strings.xml
View file @ 896ef78c
<resources>
<resources xmlns:tools="http://schemas.android.com/tools">
<string name="app_name">HBHFurniture</string>
<string name="title_activity_exactivity">EXActivity</string>
<string name="navigation_drawer_open">Open navigation drawer</string>
......@@ -7,6 +7,71 @@
<string name="nav_header_subtitle">android.studio@android.com</string>
<string name="nav_header_desc">Navigation header</string>
<string name="action_settings">Settings</string>
<!--navigationBar底部菜单-->
<!--首页-->
<string name="navigation_home">首页</string>
<!--环渤海-->
<string name="navigation_sea">环渤海</string>
<!--我的-->
<string name="navigation_mine">我的</string>
<!--首页模块-->
<!--首页模块 今日成交(元)-->
<string name="today_deal">今日成交(元)</string>
<!--首页模块 今日成交数量-->
<string name="today_deal_number">27587.68</string>
<!--首页模块 今日订单-->
<string name="today_order">今日订单</string>
<!--首页模块 今日订单数量-->
<string name="today_order_number">795个</string>
<!--首页模块 今日下单用户-->
<string name="today_customer">今日下单用户</string>
<!--首页模块 今日下单用户数量-->
<string name="today_customer_number">795位</string>
<!--首页模块 电费余额-->
<string name="electricity_balance">电费余额</string>
<!--首页模块 电费余额数量-->
<string name="electricity_balance_num">795.00元</string>
<!--首页模块 店铺信息-->
<string name="store_information">店铺信息</string>
<!--首页模块 店铺积分-->
<string name="store_points">店铺积分</string>
<!--首页模块 店员管理-->
<string name="clerk_management">店员管理</string>
<!--首页模块 添加商品-->
<string name="goods_add">添加商品</string>
<!--首页模块 商品管理-->
<string name="goods_management">商品管理</string>
<!--首页模块 创建订单-->
<string name="order_add">创建订单</string>
<!--首页模块 订单管理-->
<string name="order_management">订单管理</string>
<!--首页模块 诉求反馈-->
<string name="appeal_feedback">诉求反馈</string>
<!--首页模块 转发统计-->
<string name="forwarding_statistics">转发统计</string>
<!--首页模块 人才招聘-->
<string name="talent_recruitment">人才招聘</string>
<!--我的模块-->
<!--我的模块 用户姓名-->
<string name="user_nickname">王小丫</string>
<!--我的模块 用户职位-->
<string name="user_position">店长</string>
<!--我的模块 创建日期-->
<string name="user_createdate" tools:ignore="TypographyDashes">创建日期：2022–12-12</string>
<!--我的模块 菜单列表-->
<!--修改密码-->
<string name="change_password">修改密码</string>
<!--更换手机号-->
<string name="change_phone">更换手机号</string>
<!--隐私协议-->
<string name="privary_agreement">隐私协议</string>
<!--清除缓存-->
<string name="clear_cache">清除缓存</string>
<!--检查更新-->
<string name="check_update">检查更新</string>
<!--退出登录-->
<string name="log_out">退出登录</string>
<string name="menu_home">Home</string>
<string name="menu_gallery">Gallery</string>
......
local.properties
View file @ 896ef78c
## This file is automatically generated by Android Studio.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
# This file should *NOT* be checked into Version Control Systems,
## This file must *NOT* be checked into Version Control Systems,
# as it contains information specific to your local configuration.
#
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
sdk.dir=D\:\\workSoft\\SDK
\ No newline at end of file
#Fri Jul 07 18:50:30 CST 2023
sdk.dir=C\:\\AndroidSDK
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment