linee 7 ore fa
parent
commit
9379737f54

+ 0 - 286
entry/src/main/java/com/fujica/abk/api/cache.java

@@ -21,22 +21,7 @@ public class cache {
     // 缓存键名
     public static final String KEY_TOKEN = "token";
     public static final String KEY_OPEN_ID = "open_id";
-    public static final String KEY_PARK_CACHE = "park_cache";
-    public static final String KEY_LATITUDE = "latitude";
-    public static final String KEY_LONGITUDE = "longitude";
-    public static final String KEY_LATITUDE_1 = "latitude_1";
-    public static final String KEY_LONGITUDE_1 = "longitude_1";
     public static final String KEY_MOBILE = "mobile";
-    // 临时车牌
-    public static final String KEY_TMP_PLATE_NO = "tmp_plate_no";
-    // 选中车牌
-    public static final String KEY_PLATE_NO = "plate_no";
-    // 项目历史记录
-    public static final String KEY_PROJECT_HISTORY = "project_history";
-    // 全局选中项目
-    public static final String KEY_SELECTED_PROJECT = "selected_project";
-
-    private static final Gson gson = new Gson();
 
     /**
      * 获取Preferences实例
@@ -86,103 +71,6 @@ public class cache {
         }
     }
 
-    /**
-     * 获取停车场缓存列表
-     */
-    public static List<Map<String, Object>> getParkCache(Context context) {
-        String json = get(context, KEY_PARK_CACHE);
-        if (json != null && !json.isEmpty()) {
-            try {
-                Type listType = new TypeToken<List<Map<String, Object>>>() {}.getType();
-                return gson.fromJson(json, listType);
-            } catch (Exception e) {
-                Log.error(e);
-            }
-        }
-        return new ArrayList<>();
-    }
-
-    /**
-     * 设置停车场缓存列表
-     */
-    public static void setParkCache(Context context, List<Map<String, Object>> list) {
-        if (list == null) {
-            list = new ArrayList<>();
-        }
-        set(context, KEY_PARK_CACHE, gson.toJson(list));
-    }
-
-    /**
-     * 获取浮点数
-     */
-    public static float getFloat(Context context, String key, Float defaultVal) {
-        String val = get(context, key);
-        if (val == null || val.isEmpty()) {
-            return defaultVal != null ? defaultVal : 0f;
-        }
-        try {
-            return Float.parseFloat(val);
-        } catch (NumberFormatException e) {
-            Log.error(e);
-            return defaultVal != null ? defaultVal : 0f;
-        }
-    }
-
-    /**
-     * 获取纬度
-     */
-    public static float getLatitude(Context context) {
-        return getFloat(context, KEY_LATITUDE, 22.58475573142116f);
-    }
-
-    /**
-     * 获取经度
-     */
-    public static float getLongitude(Context context) {
-        return getFloat(context, KEY_LONGITUDE, 113.95887627473346f);
-    }
-
-    /**
-     * 设置纬度
-     */
-    public static void setLatitude(Context context, float value) {
-        set(context, KEY_LATITUDE, String.valueOf(value));
-    }
-
-    /**
-     * 设置经度
-     */
-    public static void setLongitude(Context context, float value) {
-        set(context, KEY_LONGITUDE, String.valueOf(value));
-    }
-
-    /**
-     * 获取纬度1
-     */
-    public static float getLatitude1(Context context) {
-        return getFloat(context, KEY_LATITUDE_1, 22.58475573142116f);
-    }
-
-    /**
-     * 获取经度1
-     */
-    public static float getLongitude1(Context context) {
-        return getFloat(context, KEY_LONGITUDE_1, 113.95887627473346f);
-    }
-
-    /**
-     * 设置纬度1
-     */
-    public static void setLatitude1(Context context, float value) {
-        set(context, KEY_LATITUDE_1, String.valueOf(value));
-    }
-
-    /**
-     * 设置经度1
-     */
-    public static void setLongitude1(Context context, float value) {
-        set(context, KEY_LONGITUDE_1, String.valueOf(value));
-    }
 
     /**
      * 获取Token
@@ -198,12 +86,6 @@ public class cache {
         set(context, KEY_TOKEN, value);
     }
 
-    /**
-     * 获取OpenId
-     */
-    public static String getOpenId(Context context) {
-        return get(context, KEY_OPEN_ID);
-    }
 
     /**
      * 设置OpenId
@@ -212,12 +94,6 @@ public class cache {
         set(context, KEY_OPEN_ID, value);
     }
 
-    /**
-     * 获取手机号
-     */
-    public static String getMobile(Context context) {
-        return get(context, KEY_MOBILE);
-    }
 
     /**
      * 设置手机号
@@ -251,166 +127,4 @@ public class cache {
         return token != null && !token.isEmpty();
     }
 
-    /**
-     * 获取临时车牌号
-     */
-    public static String getTmpPlateNo(Context context) {
-        return get(context, KEY_TMP_PLATE_NO);
-    }
-
-    /**
-     * 设置临时车牌号
-     */
-    public static void setTmpPlateNo(Context context, String value) {
-        set(context, KEY_TMP_PLATE_NO, value);
-    }
-
-    /**
-     * 获取车牌号
-     */
-    public static String getPlateNo(Context context) {
-        return get(context, KEY_PLATE_NO);
-    }
-
-    /**
-     * 设置车牌号
-     */
-    public static void setPlateNo(Context context, String value) {
-        set(context, KEY_PLATE_NO, value);
-    }
-
-    /**
-     * 获取项目历史记录
-     */
-    public static List<Map<String, Object>> getProjectHistory(Context context) {
-        String json = get(context, KEY_PROJECT_HISTORY);
-        if (json != null && !json.isEmpty()) {
-            try {
-                Type listType = new TypeToken<List<Map<String, Object>>>() {}.getType();
-                return gson.fromJson(json, listType);
-            } catch (Exception e) {
-                Log.error(e);
-            }
-        }
-        return new ArrayList<>();
-    }
-
-    /**
-     * 添加项目历史记录(最多保存5个)
-     */
-    public static void addProjectHistory(Context context, Map<String, Object> project) {
-        List<Map<String, Object>> list = getProjectHistory(context);
-        
-        // 移除已存在的相同项目(根据 projectNo 判断)
-        if (project != null && project.containsKey("projectNo")) {
-            Object projectNo = project.get("projectNo");
-            List<Map<String, Object>> filteredList = new ArrayList<>();
-            for (Map<String, Object> item : list) {
-                if (item != null && !projectNo.equals(item.get("projectNo"))) {
-                    filteredList.add(item);
-                }
-            }
-            list = filteredList;
-        }
-        
-        // 将新项目添加到开头
-        if (project != null) {
-            list.add(0, project);
-        }
-        
-        // 最多保留5个
-        if (list.size() > 5) {
-            list = list.subList(0, 5);
-        }
-        
-        set(context, KEY_PROJECT_HISTORY, gson.toJson(list));
-    }
-
-    /**
-     * 清空项目历史记录
-     */
-    public static void clearProjectHistory(Context context) {
-        try {
-            Preferences pref = getPref(context);
-            if (pref != null) {
-                pref.delete(KEY_PROJECT_HISTORY);
-                pref.flushSync();
-            }
-        } catch (Exception e) {
-            Log.error(e);
-        }
-    }
-
-    /**
-     * 获取全局选中的项目
-     */
-    public static Map<String, Object> getSelectedProject(Context context) {
-        String json = get(context, KEY_SELECTED_PROJECT);
-        if (json != null && !json.isEmpty()) {
-            try {
-                Type mapType = new TypeToken<Map<String, Object>>() {}.getType();
-                return gson.fromJson(json, mapType);
-            } catch (Exception e) {
-                Log.error(e);
-            }
-        }
-        return null;
-    }
-
-    /**
-     * 设置全局选中的项目
-     */
-    public static void setSelectedProject(Context context, Map<String, Object> project) {
-        if (project != null) {
-            set(context, KEY_SELECTED_PROJECT, gson.toJson(project));
-        }
-    }
-
-    /**
-     * 清空全局选中的项目
-     */
-    public static void clearSelectedProject(Context context) {
-        try {
-            Preferences pref = getPref(context);
-            if (pref != null) {
-                pref.delete(KEY_SELECTED_PROJECT);
-                pref.flushSync();
-            }
-        } catch (Exception e) {
-            Log.error(e);
-        }
-    }
-
-    // ========== 以下为兼容旧代码的方法 ==========
-
-    /**
-     * 获取车牌号(兼容旧代码)
-     */
-    public static String getLicensePlate(Context context) {
-        return "";
-//        return getPlateNo(context);
-    }
-
-    /**
-     * 保存车牌号(兼容旧代码)
-     */
-    public static void setLicensePlate(Context context, String licensePlate) {
-        setPlateNo(context, licensePlate);
-    }
-
-    /**
-     * 清除车牌相关缓存
-     */
-    public static void clearLicensePlate(Context context) {
-        try {
-            Preferences preferences = getPref(context);
-            if (preferences != null) {
-                preferences.delete(KEY_PLATE_NO);
-                preferences.delete("parking_status");
-                preferences.flushSync();
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
 }

+ 15 - 2
entry/src/main/java/com/fujica/abk/api/pay.java

@@ -6,19 +6,21 @@ import com.fujica.abk.utils.*;
 import com.google.gson.reflect.TypeToken;
 import ohos.app.Context;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
 /**
  * 认证工具类
  */
-public class pay {
+public class common {
 
     /**
      * 查询停车费用API (真实接口)
      * 参考 TypeScript 版本的 pay.getChargeData 实现
      *
      * @param context      上下文
-     * @param licensePlate 车牌号
+     * @param query 查询条件
      * @return 停车费用信息
      */
     public static CompletableFuture<R<ParkingFeeInfo>> queryParkingFee(Context context, ChargeQuery query) {
@@ -66,4 +68,15 @@ public class pay {
         });
     }
 
+    public static void updateDefaultPlateNo(Context context, String plateNo){
+        if(plateNo!=null && !plateNo.isEmpty()){
+            ApiOption option = new ApiOption("/member/plate/default");
+            option.setMethod(ApiOption.POST);
+            Map<String, Object> params = new HashMap<>();
+            params.put("plateNo", plateNo);
+            params.put("powerType", 1);
+            option.setData(params);
+            api.http(context, option, new TypeToken<R<String>>() {});
+        }
+    }
 }

+ 3 - 10
entry/src/main/java/com/fujica/abk/component/nav/ChargeComponent.java

@@ -1,12 +1,10 @@
 package com.fujica.abk.component.nav;
 
 import com.fujica.abk.ResourceTable;
-import com.fujica.abk.api.cache;
-import com.fujica.abk.api.pay;
+import com.fujica.abk.api.common;
 import com.fujica.abk.component.LoadingComponent;
 import com.fujica.abk.model.in.ChargeQuery;
 import com.fujica.abk.model.out.MemberPlateH5Dto;
-import com.fujica.abk.model.out.OrderDetailRes;
 import com.fujica.abk.model.out.ParkingFeeInfo;
 import com.fujica.abk.utils.*;
 import com.google.gson.reflect.TypeToken;
@@ -238,16 +236,13 @@ public class ChargeComponent extends DirectionalLayout {
                 }
                 if(plateNo == null || plateNo.isEmpty()){
                     plateNo = SystemSettings.getValue(dataAbilityHelper, "car_license_plate_number");
+                    common.updateDefaultPlateNo(context, plateNo);
                 }
                 // 异步请求完成后,更新UI(确保在主线程执行)
                 DialogUtil.postTask(() -> {
                     updateUIAfterPlateNoLoaded();
                 });
             }).exceptionally(throwable -> {
-                // 异常处理:从系统设置中读取备用数据
-                if(plateNo == null || plateNo.isEmpty()){
-                    plateNo = SystemSettings.getValue(dataAbilityHelper, "car_license_plate_number");
-                }
                 // 异常情况下也要更新UI(确保在主线程执行)
                 DialogUtil.postTask(() -> {
                     updateUIAfterPlateNoLoaded();
@@ -304,8 +299,6 @@ public class ChargeComponent extends DirectionalLayout {
      * 模拟车牌输入(后续会被实际输入逻辑替换)
      */
     private void simulateLicensePlateInput(String licensePlate) {
-        // 保存车牌到缓存
-        cache.setLicensePlate(context, licensePlate);
 
         // 更新顶部车牌显示
         filterPlateNo.setVisibility(VISIBLE);
@@ -325,7 +318,7 @@ public class ChargeComponent extends DirectionalLayout {
         query.setChargeScene(2);  // 计费场景: 2
         query.setPlateNo(licensePlate);
 
-        CompletableFuture<R<ParkingFeeInfo>> future = pay.queryParkingFee(getContext(), query);
+        CompletableFuture<R<ParkingFeeInfo>> future = common.queryParkingFee(getContext(), query);
         if (loadingComponent != null) {
             loadingComponent.show();
         }

+ 168 - 115
entry/src/main/java/com/fujica/abk/slice/MainAbilitySlice.java

@@ -60,7 +60,7 @@ public class MainAbilitySlice extends AbilitySlice {
     private Image iconOrder1;
 
     // 当前选中的 tab
-    private int currentTab = 1; // 0: 我的, 1: 找车位, 2: 缴费记录
+    private int currentTab = 0; // 0: 找车位, 1: 计费, 2: 缴费记录
 
     // 定位相关
     private Locator locator;
@@ -149,15 +149,6 @@ public class MainAbilitySlice extends AbilitySlice {
         subscribeAuthChangedEvent();
     }
 
-    void setTimeFormat(String timeFormat) {
-        String timeStr = "12";
-        if (timeStr.equals(timeFormat)) {
-            // Display in 12-hour format
-        } else {
-            // Display in 24-hour format
-        }
-    }
-
     void huaweiIdSignIn() {
         AccountAuthService accountAuthService;
         // 1、配置登录请求参数AccountAuthParams,包括请求用户id(openid、unionid)、email、profile(昵称、头像)等。
@@ -262,63 +253,108 @@ public class MainAbilitySlice extends AbilitySlice {
         // 初始化页面容器
         pageContainer = findComponentById(ResourceTable.Id_page_container);
 
-        if (pageContainer != null) {
-            try {
-                // 创建我的页面(缴费)
-                chargeComponent = new ChargeComponent(MainAbilitySlice.this);
-                chargeComponent.setLoadingComponent(loadingComponent);
-                chargeComponent.setVisibility(Component.HIDE);
-                pageContainer.addComponent(chargeComponent);
-
-                // 创建找车位页面
-                parkComponent = new ParkComponent(MainAbilitySlice.this);
-                parkComponent.setLoadingComponent(loadingComponent);
-                // 如果已有定位信息,设置到组件中
-                if (currentLocation != null) {
-                    parkComponent.setCurrentLocation(currentLocation);
-                }
-                // 设置停车场选中监听器
-                parkComponent.setOnParkSelectedListener(new ParkComponent.OnParkSelectedListener() {
-                    @Override
-                    public void onParkSelected(ParkNearRes park) {
-                        showParkDetail(park);
-                    }
-
-                    @Override
-                    public void onParkDeselected() {
-                        hideDetail();
-                    }
-                });
-                parkComponent.setVisibility(Component.VISIBLE); // 默认显示找车位页面
-                pageContainer.addComponent(parkComponent);
-
-                // 创建缴费记录页面
-                orderComponent = new OrderComponent(MainAbilitySlice.this);
-                orderComponent.setLoadingComponent(loadingComponent);
-                // 设置订单选中监听器
-                orderComponent.setOnOrderSelectedListener(new OrderComponent.OnOrderSelectedListener() {
-                    @Override
-                    public void onOrderSelected(OrderRes order) {
-                        showOrderDetail(order);
-                    }
+        // 初始化底部导航栏
+        initBottomNavigation();
+        
+        // 默认初始化找车位页面(因为默认显示该页面)
+//        initParkComponent();
 
-                    @Override
-                    public void onOrderDeselected() {
-                        hideDetail();
-                    }
-                });
-                orderComponent.setVisibility(Component.HIDE);
-                pageContainer.addComponent(orderComponent);
+        // 默认选中找车位
+        switchToPage(0);
+    }
 
-                Log.info("页面组件初始化完成");
-            } catch (Exception e) {
-                Log.error("创建页面组件失败: " + e.getMessage());
-                e.printStackTrace();
+    /**
+     * 初始化缴费页面组件
+     */
+    private void initChargeComponent() {
+        if (isChargeComponentInitialized || pageContainer == null) {
+            return;
+        }
+        
+        try {
+            Log.info("首次初始化缴费页面");
+            chargeComponent = new ChargeComponent(MainAbilitySlice.this);
+            chargeComponent.setLoadingComponent(loadingComponent);
+            chargeComponent.setVisibility(Component.HIDE);
+            pageContainer.addComponent(chargeComponent);
+            isChargeComponentInitialized = true;
+            Log.info("缴费页面初始化完成");
+        } catch (Exception e) {
+            Log.error("创建缴费页面组件失败: " + e.getMessage());
+            e.printStackTrace();
+        }
+    }
+    
+    /**
+     * 初始化找车位页面组件
+     */
+    private void initParkComponent() {
+        if (isParkComponentInitialized || pageContainer == null) {
+            return;
+        }
+        
+        try {
+            Log.info("首次初始化找车位页面");
+            parkComponent = new ParkComponent(MainAbilitySlice.this);
+            parkComponent.setLoadingComponent(loadingComponent);
+            // 如果已有定位信息,设置到组件中
+            if (currentLocation != null) {
+                parkComponent.setCurrentLocation(currentLocation);
             }
+            // 设置停车场选中监听器
+            parkComponent.setOnParkSelectedListener(new ParkComponent.OnParkSelectedListener() {
+                @Override
+                public void onParkSelected(ParkNearRes park) {
+                    showParkDetail(park);
+                }
+
+                @Override
+                public void onParkDeselected() {
+                    hideDetail();
+                }
+            });
+            parkComponent.setVisibility(Component.HIDE);
+            pageContainer.addComponent(parkComponent);
+            isParkComponentInitialized = true;
+            Log.info("找车位页面初始化完成");
+        } catch (Exception e) {
+            Log.error("创建找车位页面组件失败: " + e.getMessage());
+            e.printStackTrace();
+        }
+    }
+    
+    /**
+     * 初始化缴费记录页面组件
+     */
+    private void initOrderComponent() {
+        if (isOrderComponentInitialized || pageContainer == null) {
+            return;
         }
+        
+        try {
+            Log.info("首次初始化缴费记录页面");
+            orderComponent = new OrderComponent(MainAbilitySlice.this);
+            orderComponent.setLoadingComponent(loadingComponent);
+            // 设置订单选中监听器
+            orderComponent.setOnOrderSelectedListener(new OrderComponent.OnOrderSelectedListener() {
+                @Override
+                public void onOrderSelected(OrderRes order) {
+                    showOrderDetail(order);
+                }
 
-        // 初始化底部导航栏
-        initBottomNavigation();
+                @Override
+                public void onOrderDeselected() {
+                    hideDetail();
+                }
+            });
+            orderComponent.setVisibility(Component.HIDE);
+            pageContainer.addComponent(orderComponent);
+            isOrderComponentInitialized = true;
+            Log.info("缴费记录页面初始化完成");
+        } catch (Exception e) {
+            Log.error("创建缴费记录页面组件失败: " + e.getMessage());
+            e.printStackTrace();
+        }
     }
 
     /**
@@ -341,37 +377,14 @@ public class MainAbilitySlice extends AbilitySlice {
         iconOrder1 = findComponentById(ResourceTable.Id_icon_order_1);
 
         // 设置点击事件
-        if (navCharge != null) {
-            navCharge.setClickedListener(component -> switchToPage(0));
-        }
         if (navPark != null) {
-            navPark.setClickedListener(component -> switchToPage(1));
+            navPark.setClickedListener(component -> switchToPage(0));
+        }
+        if (navCharge != null) {
+            navCharge.setClickedListener(component -> switchToPageAfterLogin(1));
         }
         if (navOrder != null) {
-            navOrder.setClickedListener(component -> {
-                // 先检查是否已登录
-                if (!cache.isAuth(this)) {
-                    // 未登录,调用登录方法
-                    Log.info("未登录,开始登录流程");
-                    auth.login(this).thenAccept(success -> {
-                        if (success) {
-                            Log.info("登录成功,切换到缴费记录页面");
-                            // 登录成功后切换到缴费记录页面
-                            DialogUtil.postTask(() -> switchToPage(2));
-                        } else {
-                            Toast.error(this, "登录失败,请重试");
-                        }
-                    }).exceptionally(e -> {
-                        Log.error("登录异常: " + e.getMessage());
-                        e.printStackTrace();
-                        Toast.error(this, "登录异常: " + e.getMessage());
-                        return null;
-                    });
-                } else {
-                    // 已登录,直接切换页面
-                    switchToPage(2);
-                }
-            });
+            navOrder.setClickedListener(component -> switchToPageAfterLogin(2));
         }
         if (navCurrentLocation != null) {
             navCurrentLocation.setClickedListener(component -> {
@@ -379,11 +392,33 @@ public class MainAbilitySlice extends AbilitySlice {
                 locateCurrentPosition();
             });
         }
+    }
 
-        // 默认选中找车位
-        updateBottomNavState(1); // 测试
+    private void switchToPageAfterLogin(int index){
+        // 先检查是否已登录
+        if (!cache.isAuth(this)) {
+            // 未登录,调用登录方法
+            Log.info("未登录,开始登录流程");
+            auth.login(this).thenAccept(success -> {
+                if (success) {
+                    // 登录成功后切换到缴费记录页面
+                    DialogUtil.postTask(() -> switchToPage(index));
+                } else {
+                    Toast.error(this, "登录失败,请重试");
+                }
+            }).exceptionally(e -> {
+                Log.error("登录异常: " + e.getMessage());
+                e.printStackTrace();
+                Toast.error(this, "登录异常: " + e.getMessage());
+                return null;
+            });
+        } else {
+            // 已登录,直接切换页面
+            switchToPage(index);
+        }
     }
 
+
     /**
      * 切换到指定页面
      */
@@ -405,22 +440,43 @@ public class MainAbilitySlice extends AbilitySlice {
 
         // 显示目标页面
         switch (index) {
-            case 0: // 我的
-                if (chargeComponent != null) {
-                    chargeComponent.setVisibility(Component.VISIBLE);
-                    chargeComponent.refresh();
+            case 0: // 找车位
+                // 首次打开时初始化
+                if (!isParkComponentInitialized) {
+                    initParkComponent();
+                    // 首次初始化时,组件内部已经加载了数据,无需再调用refresh()
+                } else if (parkComponent != null) {
+                    // 非首次打开时才刷新数据
+                    parkComponent.refresh();
                 }
-                break;
-            case 1: // 找车位
                 if (parkComponent != null) {
                     parkComponent.setVisibility(Component.VISIBLE);
-                    parkComponent.refresh();
+                }
+                break;
+            case 1: // 计费
+                // 首次打开时初始化
+                if (!isChargeComponentInitialized) {
+                    initChargeComponent();
+                    // 首次初始化时,组件内部已经加载了数据,无需再调用refresh()
+                } else if (chargeComponent != null) {
+                    // 非首次打开时才刷新数据
+                    chargeComponent.refresh();
+                }
+                if (chargeComponent != null) {
+                    chargeComponent.setVisibility(Component.VISIBLE);
                 }
                 break;
             case 2: // 缴费记录
+                // 首次打开时初始化
+                if (!isOrderComponentInitialized) {
+                    initOrderComponent();
+                    // 首次初始化时,组件内部已经加载了数据,无需再调用reset()
+                } else if (orderComponent != null) {
+                    // 非首次打开时才刷新数据
+                    orderComponent.reset();
+                }
                 if (orderComponent != null) {
                     orderComponent.setVisibility(Component.VISIBLE);
-                    orderComponent.reset();
                 }
                 break;
         }
@@ -431,8 +487,6 @@ public class MainAbilitySlice extends AbilitySlice {
 
         // 切换页面时隐藏详情
         hideDetail();
-
-        Log.info("切换到页面: " + index);
     }
 
     /**
@@ -455,17 +509,7 @@ public class MainAbilitySlice extends AbilitySlice {
 
         // 设置选中状态
         switch (index) {
-            case 0: // 我的
-                textCharge.setTextColor(blueColor);
-
-                iconCharge.setVisibility(Component.HIDE);
-                iconCharge1.setVisibility(Component.VISIBLE);
-                iconOrder.setVisibility(Component.VISIBLE);
-                iconOrder1.setVisibility(Component.HIDE);
-                iconPark.setVisibility(Component.VISIBLE);
-                iconPark1.setVisibility(Component.HIDE);
-                break;
-            case 1: // 找车位
+            case 0: // 找车位
                 textPark.setTextColor(blueColor);
 
                 iconCharge.setVisibility(Component.VISIBLE);
@@ -475,6 +519,16 @@ public class MainAbilitySlice extends AbilitySlice {
                 iconPark.setVisibility(Component.HIDE);
                 iconPark1.setVisibility(Component.VISIBLE);
                 break;
+            case 1: // 我的
+                textCharge.setTextColor(blueColor);
+
+                iconCharge.setVisibility(Component.HIDE);
+                iconCharge1.setVisibility(Component.VISIBLE);
+                iconOrder.setVisibility(Component.VISIBLE);
+                iconOrder1.setVisibility(Component.HIDE);
+                iconPark.setVisibility(Component.VISIBLE);
+                iconPark1.setVisibility(Component.HIDE);
+                break;
             case 2: // 缴费记录
                 textOrder.setTextColor(blueColor);
 
@@ -511,7 +565,7 @@ public class MainAbilitySlice extends AbilitySlice {
 
                     Log.info("定位成功: " + latitude + ", " + longitude);
                     // 定位成功后,如果当前在找车位页面,更新定位信息
-                    if (currentTab == 1 && parkComponent != null) {
+                    if (currentTab == 0 && parkComponent != null) {
                         parkComponent.setCurrentLocation(location);
                     }
                 }
@@ -561,7 +615,6 @@ public class MainAbilitySlice extends AbilitySlice {
         loginSuccessListener = event -> {
             // 在主线程更新UI
             DialogUtil.postTask(() -> {
-                Log.info("收到登录成功事件,更新UI");
                 // 刷新我的页面
                 if (chargeComponent != null) {
                     chargeComponent.refresh();

+ 2 - 0
entry/src/main/java/com/fujica/abk/utils/LicensePlateInputDialog.java

@@ -1,6 +1,7 @@
 package com.fujica.abk.utils;
 
 import com.fujica.abk.ResourceTable;
+import com.fujica.abk.api.common;
 import ohos.agp.colors.RgbColor;
 import ohos.agp.components.*;
 import ohos.agp.components.LayoutScatter;
@@ -254,6 +255,7 @@ public class LicensePlateInputDialog extends CommonDialog {
             btnConfirm.setClickedListener(component -> {
                 String licensePlate = getLicensePlate();
                 if (licensePlate != null && !licensePlate.isEmpty()) {
+                    common.updateDefaultPlateNo(context, licensePlate);
                     if (confirmListener != null) {
                         confirmListener.onConfirm(licensePlate);
                     }

+ 4 - 4
entry/src/main/java/com/fujica/abk/utils/Log.java

@@ -8,21 +8,21 @@ public class Log {
     private static final HiLogLabel TAG = new HiLogLabel(HiLog.DEBUG, 0x0, "fspark log");
 
     public static void error(String message) {
-        HiLog.error(TAG, message);
+        System.err.println("fspark log: " + message);
     }
 
     public static void error(Exception e) {
-        HiLog.error(TAG, e.getMessage() != null ? e.getMessage() : e.toString());
+        System.err.println("fspark log: " + e.getMessage() != null ? e.getMessage() : e.toString());
         e.printStackTrace();
     }
 
     public static void error(Throwable e) {
-        HiLog.error(TAG, e.getMessage() != null ? e.getMessage() : e.toString());
+        System.err.println("fspark log: " + e.getMessage() != null ? e.getMessage() : e.toString());
         e.printStackTrace();
     }
 
     public static void info(String message) {
-        HiLog.info(TAG, message);
+        System.err.println("fspark log: " + message);
     }
 
     public static void warn(String message) {

+ 0 - 1
entry/src/main/java/com/fujica/abk/utils/api.java

@@ -193,7 +193,6 @@ public class api {
                             String errorMsg = result.getMsg() != null ? result.getMsg() : "操作失败" + result.getCode();
                             Toast.error(context, errorMsg);
                         }
-                        Log.info("响应:" + resultStr);
                         if (result == null) {
                             result = new R<>("解析响应失败");
                         }

+ 1 - 1
entry/src/main/resources/base/layout/layout_charge.xml

@@ -24,7 +24,7 @@
             ohos:id="$+id:text_plateNo"
             ohos:height="match_content"
             ohos:width="match_content"
-            ohos:text="粤B11111"
+            ohos:text=""
             ohos:text_color="#FF000000"
             ohos:text_size="16fp"/>
         <Image ohos:width="15vp" ohos:left_margin="8vp" ohos:height="15vp" ohos:image_src="$media:change" ohos:scale_mode="stretch"></Image>