From c2f2e44c42e6eef59f00a0990c4833e5ce7257b3 Mon Sep 17 00:00:00 2001 From: cuizhibin Date: Sun, 3 Aug 2025 23:18:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataBase/DatabaseHelper.java | 4 +- .../example/myapplication/MainActivity.java | 37 ++++++++++--------- .../myapplication/Tool/PartListFetcher.java | 7 ++-- .../myapplication/api/PartService.java | 1 + settings.gradle.kts | 4 +- 5 files changed, 28 insertions(+), 25 deletions(-) diff --git a/app/src/main/java/com/example/myapplication/DataBase/DatabaseHelper.java b/app/src/main/java/com/example/myapplication/DataBase/DatabaseHelper.java index 77e6123..b9171f9 100644 --- a/app/src/main/java/com/example/myapplication/DataBase/DatabaseHelper.java +++ b/app/src/main/java/com/example/myapplication/DataBase/DatabaseHelper.java @@ -81,7 +81,7 @@ public class DatabaseHelper extends SQLiteOpenHelper { String CREATE_TURBINE_TABLE = "CREATE TABLE " + TABLE_TURBINES + "(" + COLUMN_TURBINE_ID + " TEXT PRIMARY KEY," + COLUMN_TURBINE_NAME + " TEXT," - + COLUMN_PROJECT_NAME + " TEXT," + + COLUMN_PROJECT_ID + " TEXT," + COLUMN_LAST_UPDATED + " INTEGER" + ")"; db.execSQL(CREATE_TURBINE_TABLE); String CREATE_PARTS_TABLE = "CREATE TABLE " + TABLE_PARTS + "(" @@ -169,7 +169,7 @@ public class DatabaseHelper extends SQLiteOpenHelper { String CREATE_TURBINE_TABLE = "CREATE TABLE " + TABLE_TURBINES + "(" + COLUMN_TURBINE_ID + " TEXT PRIMARY KEY," + COLUMN_TURBINE_NAME + " TEXT," - + COLUMN_PROJECT_NAME + " TEXT," + + COLUMN_PROJECT_ID + " TEXT," + COLUMN_LAST_UPDATED + " INTEGER" + ")"; db.execSQL(CREATE_TURBINE_TABLE); } diff --git a/app/src/main/java/com/example/myapplication/MainActivity.java b/app/src/main/java/com/example/myapplication/MainActivity.java index 27446aa..d1415a3 100644 --- a/app/src/main/java/com/example/myapplication/MainActivity.java +++ b/app/src/main/java/com/example/myapplication/MainActivity.java @@ -315,8 +315,8 @@ public class MainActivity extends AppCompatActivity implements ViewModelStoreOwn private static final String PREF_REMEMBER = "remember"; private final String AUTH_TOKEN_KEY = "auth_token"; private String authToken = ""; - private final String BASE_URL = "http://10.2.1.20:8888"; -// private final String BASE_URL = "http://pms.dtyx.net:9158"; +// private final String BASE_URL = "http://10.2.1.20:8888"; + private final String BASE_URL = "http://pms.dtyx.net:9158"; @SuppressLint("UnspecifiedRegisterReceiverFlag") @Override @@ -469,6 +469,10 @@ public class MainActivity extends AppCompatActivity implements ViewModelStoreOwn } private void clearProject() { + projectId = ""; + projectName = ""; + sharedPreferences.edit().putString(PREF_PROJECT, "").apply(); + dataManager.setProjectId(""); actvProject.setText(""); loadProjects(); projectAdapter.getFilter().filter(""); @@ -477,6 +481,11 @@ public class MainActivity extends AppCompatActivity implements ViewModelStoreOwn } private void clearTurbine() { + turbineId = ""; + turbineName = ""; + sharedPreferences.edit().putString(PREF_TURBINE, "").apply(); + dataManager.setTurbineId(""); + dataManager.setTurbineName(""); actvTurbine.setText(""); loadTurbines(); turbineAdapter.getFilter().filter(""); @@ -484,6 +493,11 @@ public class MainActivity extends AppCompatActivity implements ViewModelStoreOwn } private void clearPart() { + partId = ""; + partName = ""; + sharedPreferences.edit().putString(PREF_PART, "").apply(); + dataManager.setPartId(""); + dataManager.setPartName(""); actvPart.setText(""); loadParts(); partAdapter.getFilter().filter(""); @@ -552,21 +566,10 @@ public class MainActivity extends AppCompatActivity implements ViewModelStoreOwn } } - private Retrofit initRetrofit() { - OkHttpClient.Builder okHttpClientBuilder = new OkHttpClient.Builder() - .connectTimeout(30, TimeUnit.SECONDS) - .readTimeout(30, TimeUnit.SECONDS) - .writeTimeout(30, TimeUnit.SECONDS); - okHttpClientBuilder.addInterceptor(new AuthInterceptor(authToken)); - // 2. 初始化Retrofit - - return RetrofitClient.getClient(authToken); - } - private void loadProjects() { try { // 2. 初始化Retrofit - Retrofit retrofit = initRetrofit(); + Retrofit retrofit = RetrofitClient.getClient(authToken); // 3. 创建API服务 ProjectApi projectApi = retrofit.create(ProjectApi.class); // 4. 执行网络请求 @@ -584,7 +587,7 @@ public class MainActivity extends AppCompatActivity implements ViewModelStoreOwn } try { // 2. 初始化Retrofit - Retrofit retrofit = initRetrofit(); + Retrofit retrofit = RetrofitClient.getClient(authToken); // 3. 创建API服务 TurbineApiService turbine = retrofit.create(TurbineApiService.class); // 4. 执行网络请求 @@ -602,7 +605,7 @@ public class MainActivity extends AppCompatActivity implements ViewModelStoreOwn } try { // 2. 初始化Retrofit - Retrofit retrofit = initRetrofit(); + Retrofit retrofit = RetrofitClient.getClient(authToken); // 3. 创建API服务 PartService part = retrofit.create(PartService.class); // 4. 执行网络请求 @@ -892,7 +895,7 @@ public class MainActivity extends AppCompatActivity implements ViewModelStoreOwn } private void executePartRequest(PartService partApi) { - retrofit2.Call>> call = partApi.getPartList(projectId, null, null, null, null); + retrofit2.Call>> call = partApi.getPartList(projectId, turbineId, null, null, null, null); call.enqueue(new retrofit2.Callback<>() { @Override diff --git a/app/src/main/java/com/example/myapplication/Tool/PartListFetcher.java b/app/src/main/java/com/example/myapplication/Tool/PartListFetcher.java index 0ca6fc0..1b3ec3a 100644 --- a/app/src/main/java/com/example/myapplication/Tool/PartListFetcher.java +++ b/app/src/main/java/com/example/myapplication/Tool/PartListFetcher.java @@ -122,8 +122,7 @@ public class PartListFetcher { } private List fetchFromServer() throws IOException, ApiException { Call>> call = partService.getPartList( - projectId, - + projectId, null, null, null, null, null ); @@ -143,7 +142,7 @@ public class PartListFetcher { } private void fetchFromServerAsync(final PartListCallback callback) { Call>> call = partService.getPartList( - projectId, + projectId, null, null, null, null, null @@ -194,7 +193,7 @@ public class PartListFetcher { PartListCallback callback) { Call>> call = partService.getPartList( projectId, - + null, keyword, manufacturer, model, diff --git a/app/src/main/java/com/example/myapplication/api/PartService.java b/app/src/main/java/com/example/myapplication/api/PartService.java index 9cc04b4..1cc8455 100644 --- a/app/src/main/java/com/example/myapplication/api/PartService.java +++ b/app/src/main/java/com/example/myapplication/api/PartService.java @@ -13,6 +13,7 @@ public interface PartService { @GET("/part/list") Call>> getPartList( @Query("projectId") String projectId, + @Query("turbineId") String turbineId, @Query("keyword") String keyword, @Query("partManufacturer") String partManufacturer, @Query("partModel") String partModel, diff --git a/settings.gradle.kts b/settings.gradle.kts index 2bbfed3..4e8aaf4 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -17,8 +17,8 @@ dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { google() - mavenCentral() - maven { url = uri("https://chaquo.com/maven") } + maven("https://maven.aliyun.com/repository/google") + maven("https://maven.aliyun.com/repository/central") } }