From cad4b58a465c395f6d8288a279e4747335160e3d Mon Sep 17 00:00:00 2001
From: Yangk <yangk@menace.com>
Date: Thu, 16 Apr 2026 17:12:44 +0800
Subject: [PATCH] chore: clean up legacy files and update IDE configurations

- Remove old Kotlin DSL build files (build.gradle.kts, settings.gradle.kts)
- Delete legacy MainActivity.java in root package
- Update AndroidManifest.xml for proper configuration
- Add Chinese localization strings
- Update IDE configuration files for better compatibility

Cleanup after MVVM migration to ensure project consistency.
---
 .idea/compiler.xml                            |  2 +-
 .idea/gradle.xml                              |  2 +-
 .idea/misc.xml                                |  3 +-
 app/build.gradle                              | 13 +++-
 app/build.gradle.kts                          | 44 -----------
 app/src/main/AndroidManifest.xml              |  2 +-
 .../com/example/mobile_pda/MainActivity.java  | 78 -------------------
 .../mobile_pda/ui/main/MainActivity.java      |  4 +-
 app/src/main/res/values/strings.xml           |  3 +
 build.gradle.kts                              |  4 -
 settings.gradle.kts                           | 24 ------
 11 files changed, 21 insertions(+), 158 deletions(-)
 delete mode 100644 app/build.gradle.kts
 delete mode 100644 app/src/main/java/com/example/mobile_pda/MainActivity.java
 delete mode 100644 build.gradle.kts
 delete mode 100644 settings.gradle.kts

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b86273d..b589d56 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="21" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 639c779..5fb11a4 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -6,7 +6,7 @@
       <GradleProjectSettings>
         <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
+        <option name="gradleJvm" value="corretto-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6de34e7..65c9f84 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectInspectionProfilesVisibleTreeState">
@@ -34,7 +35,7 @@
       </profile-state>
     </entry>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="corretto-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index 054aef8..885f02b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,8 +23,12 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
+    buildFeatures {
+        viewBinding true
     }
 }
 
@@ -33,6 +37,11 @@ dependencies {
     implementation libs.material
     implementation libs.activity
     implementation libs.constraintlayout
+    
+    // Lifecycle components
+    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.7.0'
+    implementation 'androidx.lifecycle:lifecycle-livedata:2.7.0'
+
     testImplementation libs.junit
     androidTestImplementation libs.ext.junit
     androidTestImplementation libs.espresso.core
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
deleted file mode 100644
index dcadb89..0000000
--- a/app/build.gradle.kts
+++ /dev/null
@@ -1,44 +0,0 @@
-plugins {
-    alias(libs.plugins.android.application)
-}
-
-android {
-    namespace = "com.example.mobile_pda"
-    compileSdk {
-        version = release(36)
-    }
-
-    defaultConfig {
-        applicationId = "com.example.mobile_pda"
-        minSdk = 26
-        targetSdk = 36
-        versionCode = 1
-        versionName = "1.0"
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-    }
-}
-
-dependencies {
-    implementation(libs.appcompat)
-    implementation(libs.material)
-    implementation(libs.activity)
-    implementation(libs.constraintlayout)
-    testImplementation(libs.junit)
-    androidTestImplementation(libs.ext.junit)
-    androidTestImplementation(libs.espresso.core)
-}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 67ad519..ded05c4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,7 +12,7 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Mobile_PDA">
         <activity
-            android:name=".MainActivity"
+            android:name=".ui.main.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/example/mobile_pda/MainActivity.java b/app/src/main/java/com/example/mobile_pda/MainActivity.java
deleted file mode 100644
index aae21e5..0000000
--- a/app/src/main/java/com/example/mobile_pda/MainActivity.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.example.mobile_pda;
-
-import android.os.Bundle;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ImageButton;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.activity.EdgeToEdge;
-import androidx.appcompat.app.AppCompatActivity;
-
-public class MainActivity extends AppCompatActivity {
-
-    // 顶部按钮组件 -->开始、暂停、主页图标
-    private Button btnStartHeader, btnPauseHeader;
-    private ImageButton btnHome;
-
-    // 表单输入组件 --> 资源、产品条码、工单等数据项
-    private EditText etResource, etProductBarcode, etWorkOrder, etOpStep, etWorkNum, etProcess, etStatus, etWorkshop, etStartTime, etEndTime;
-
-    // SFC(生产控制) 区域按钮 --> 移除选项、移除全部
-    private TextView btnRemoveSelected, btnRemoveAll;
-
-    // 底部操作区按钮 --> 互检、开始、刀具、辅料、异常、装配、自检、首检、完成
-    private Button btnActionHujian, btnActionStart, btnActionTool, btnActionAux;
-    private Button btnActionException, btnActionAssemble, btnActionSelfCheck, btnActionFirstCheck, btnActionFinish;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        EdgeToEdge.enable(this);
-        // 启用全屏显示，适配系统栏（状态栏/导航栏）宽度占位
-        setContentView(R.layout.activity_main);
-        
-        initViews();
-        setupListeners();
-    }
-
-    private void initViews() {
-        // 顶部导航栏初始化
-        btnStartHeader = findViewById(R.id.btn_start_header);
-        btnPauseHeader = findViewById(R.id.btn_pause_header);
-        btnHome = findViewById(R.id.btn_home);
-
-        // 核心表单区域初始化
-        etResource = findViewById(R.id.et_resource);
-        etProductBarcode = findViewById(R.id.et_product_barcode);
-        etWorkOrder = findViewById(R.id.et_work_order);
-        etOpStep = findViewById(R.id.et_op_step);
-        etWorkNum = findViewById(R.id.et_work_num);
-        etProcess = findViewById(R.id.et_process);
-        etStatus = findViewById(R.id.et_status);
-        etWorkshop = findViewById(R.id.et_workshop);
-        etStartTime = findViewById(R.id.et_start_time);
-        etEndTime = findViewById(R.id.et_end_time);
-
-        // SFC 列表区域初始化
-        btnRemoveSelected = findViewById(R.id.btn_remove_selected);
-        btnRemoveAll = findViewById(R.id.btn_remove_all);
-
-        // 底部快捷操作按钮初始化
-        btnActionHujian = findViewById(R.id.btn_action_hujian);
-        btnActionStart = findViewById(R.id.btn_action_start);
-        btnActionTool = findViewById(R.id.btn_action_tool);
-        btnActionAux = findViewById(R.id.btn_action_aux);
-        btnActionException = findViewById(R.id.btn_action_exception);
-        btnActionAssemble = findViewById(R.id.btn_action_assemble);
-        btnActionSelfCheck = findViewById(R.id.btn_action_self_check);
-        btnActionFirstCheck = findViewById(R.id.btn_action_first_check);
-        btnActionFinish = findViewById(R.id.btn_action_finish);
-    }
-
-    private void setupListeners() {
-        btnActionStart.setOnClickListener(v -> Toast.makeText(this, "Start Clicked", Toast.LENGTH_SHORT).show());
-        btnActionFinish.setOnClickListener(v -> Toast.makeText(this, "Finish Clicked", Toast.LENGTH_SHORT).show());
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/mobile_pda/ui/main/MainActivity.java b/app/src/main/java/com/example/mobile_pda/ui/main/MainActivity.java
index 2e4ba35..79295ad 100644
--- a/app/src/main/java/com/example/mobile_pda/ui/main/MainActivity.java
+++ b/app/src/main/java/com/example/mobile_pda/ui/main/MainActivity.java
@@ -20,11 +20,11 @@ public class MainActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         EdgeToEdge.enable(this);
         
-        // 1. 使用 ViewBinding 极简初始化，淘汰 findViewById
+        //  使用 ViewBinding 极简初始化，淘汰 findViewById
         binding = ActivityMainBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
 
-        // 2. 初始化 ViewModel，状态隔离
+        //  初始化 ViewModel，状态隔离
         viewModel = new ViewModelProvider(this).get(MainViewModel.class);
         
         setupObservers();
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4e5ca5d..906cf59 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Mobile_PDA</string>
+    <string name="toast_start_clicked">开始被点击</string>
+    <string name="toast_finish_clicked">完成被点击</string>
 </resources>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
deleted file mode 100644
index 3756278..0000000
--- a/build.gradle.kts
+++ /dev/null
@@ -1,4 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-plugins {
-    alias(libs.plugins.android.application) apply false
-}
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
deleted file mode 100644
index 62f33b9..0000000
--- a/settings.gradle.kts
+++ /dev/null
@@ -1,24 +0,0 @@
-pluginManagement {
-    repositories {
-        google {
-            content {
-                includeGroupByRegex("com\\.android.*")
-                includeGroupByRegex("com\\.google.*")
-                includeGroupByRegex("androidx.*")
-            }
-        }
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-dependencyResolutionManagement {
-    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
-    repositories {
-        google()
-        mavenCentral()
-    }
-}
-
-rootProject.name = "Mobile_PDA"
-include(":app")
- 
\ No newline at end of file