26-1-20/1

2026-01-20 10:11:10 +03:00
parent 374f9e9bf3
commit 3c0ae4cf2f
53 changed files with 89652 additions and 6861 deletions
--- a/lib/views/home/Captin/home_captain/drawer_captain.dart
+++ b/lib/views/home/Captin/home_captain/drawer_captain.dart
@@ -23,6 +23,7 @@ import 'package:sefer_driver/views/home/my_wallet/walet_captain.dart';
 import 'package:sefer_driver/views/home/profile/profile_captain.dart';
 import 'package:sefer_driver/views/notification/notification_captain.dart';
 import 'package:url_launcher/url_launcher.dart';
+import '../../../../constant/colors.dart';
 import '../About Us/video_page.dart';
 import '../assurance_health_page.dart';
 import '../maintain_center_page.dart';
@@ -227,12 +228,57 @@ class _DrawerItemTile extends StatelessWidget {
 }

 // --- ويدجت محسنة للجزء العلوي من القائمة ---
+// ... (الاستيرادات السابقة تبقى كما هي)
+
+// --- تم تعديل UserHeader لإضافة التحقق من الصورة ---
 class UserHeader extends StatelessWidget {
  UserHeader({super.key});
  final ImageController imageController = Get.find<ImageController>();
  final HomeCaptainController homeCaptainController =
      Get.find<HomeCaptainController>();

+  // دالة لإظهار التنبيه
+  void _showUploadPhotoDialog(
+      BuildContext context, ImageController controller) {
+    // نستخدم addPostFrameCallback لضمان عدم ظهور الخطأ أثناء بناء الواجهة
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      // نتأكد ألا يكون هناك dialog مفتوح بالفعل لتجنب التكرار
+      if (Get.isDialogOpen == true) return;
+
+      Get.defaultDialog(
+        title: "Profile Photo Required".tr,
+        titleStyle:
+            const TextStyle(color: Colors.red, fontWeight: FontWeight.bold),
+        middleText:
+            "Please upload a clear photo of your face to be identified by passengers."
+                .tr,
+        barrierDismissible: false, // منع الإغلاق بالضغط خارج النافذة
+        radius: 15,
+        contentPadding: const EdgeInsets.all(20),
+        confirm: ElevatedButton.icon(
+          onPressed: () {
+            Get.back(); // إغلاق النافذة الحالية
+            // فتح الكاميرا فوراً
+            controller.choosImagePicture(
+                AppLink.uploadImagePortrate, 'portrait');
+          },
+          icon: const Icon(Icons.camera_alt, color: Colors.white),
+          label: Text("Take Photo Now".tr,
+              style: const TextStyle(color: Colors.white)),
+          style: ElevatedButton.styleFrom(
+            backgroundColor: AppColor
+                .primaryColor, // تأكد من وجود هذا اللون أو استبدله بـ Colors.blue
+            padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
+          ),
+        ),
+        cancel: TextButton(
+          onPressed: () => Get.back(),
+          child: Text("Later".tr, style: const TextStyle(color: Colors.grey)),
+        ),
+      );
+    });
+  }
+
  @override
  Widget build(BuildContext context) {
    return UserAccountsDrawerHeader(
@@ -262,8 +308,23 @@ class UserHeader extends StatelessWidget {
              child: controller.isloading
                  ? const CircularProgressIndicator(color: Colors.white)
                  : CircleAvatar(
+                      // محاولة تحميل الصورة
                      backgroundImage: NetworkImage(
                          '${AppLink.server}/portrate_captain_image/${box.read(BoxName.driverID)}.jpg'),
+
+                      // [تعديل هام]: في حال فشل تحميل الصورة (غير موجودة)
+                      onBackgroundImageError: (exception, stackTrace) {
+                        // طباعة الخطأ في الكونسول للتوضيح
+                        debugPrint(
+                            "Profile image not found or error loading: $exception");
+                        // استدعاء نافذة التنبيه
+                        _showUploadPhotoDialog(context, controller);
+                      },
+
+                      // أيقونة بديلة تظهر في الخلفية إذا لم تكن الصورة موجودة
+                      backgroundColor: Colors.grey.shade300,
+                      child: const Icon(Icons.person,
+                          size: 40, color: Colors.white),
                    ),
            ),
            Positioned(
--- a/lib/views/home/Captin/home_captain/home_captin.dart
+++ b/lib/views/home/Captin/home_captain/home_captin.dart
@@ -17,6 +17,7 @@ import '../../../../constant/box_name.dart';
 import '../../../../constant/colors.dart';
 import '../../../../constant/info.dart';
 import '../../../../constant/style.dart';
+import '../../../../controller/functions/location_background_controller.dart';
 import '../../../../controller/functions/location_controller.dart';
 import '../../../../controller/functions/overlay_permisssion.dart';
 import '../../../../controller/functions/package_info.dart';
@@ -44,29 +45,33 @@ class HomeCaptain extends StatelessWidget {
  Widget build(BuildContext context) {
    // Initial calls remain the same.
    // Get.put(HomeCaptainController());
-    WidgetsBinding.instance.addPostFrameCallback((_) async {
-      closeOverlayIfFound();
-      checkForUpdate(context);
-      getPermissionOverlay();
-      showDriverGiftClaim(context);
-      checkForAppliedRide(context);
-    });

+    WidgetsBinding.instance.addPostFrameCallback((_) async {
+      print("🔥 HomeCaptain postFrameCallback started"); // Debug
+      await closeOverlayIfFound();
+      await checkForUpdate(context);
+      await getPermissionOverlay();
+      await showDriverGiftClaim(context);
+      await checkForAppliedRide(context);
+      print("✅ postFrameCallback completed");
+    });
    // The stack is now even simpler.
    return Scaffold(
      appBar: const _HomeAppBar(),
      drawer: AppDrawer(),
-      body: Stack(
-        children: [
-          // 1. The Map View is the base layer.
-          const _MapView(),
+      body: SafeArea(
+        child: Stack(
+          children: [
+            // 1. The Map View is the base layer.
+            const _MapView(),

-          // 2. The new floating "Status Pod" at the bottom.
-          const _StatusPodOverlay(),
-          FloatingActionButtons(),
-          // This widget from the original code remains.
-          leftMainMenuCaptainIcons(),
-        ],
+            // 2. The new floating "Status Pod" at the bottom.
+            const _StatusPodOverlay(),
+            FloatingActionButtons(),
+            // This widget from the original code remains.
+            leftMainMenuCaptainIcons(),
+          ],
+        ),
      ),
    );
  }
@@ -139,12 +144,12 @@ class _HomeAppBar extends StatelessWidget implements PreferredSizeWidget {
                tooltip: 'Change Map Type'.tr,
                onPressed: homeCaptainController.changeMapType,
              ),
-              _MapControlButton(
-                iconColor: Colors.blue,
-                icon: Icons.streetview_sharp,
-                tooltip: 'Toggle Traffic'.tr,
-                onPressed: homeCaptainController.changeMapTraffic,
-              ),
+              // _MapControlButton(
+              //   iconColor: Colors.blue,
+              //   icon: Icons.streetview_sharp,
+              //   tooltip: 'Toggle Traffic'.tr,
+              //   onPressed: homeCaptainController.changeMapTraffic,
+              // ),
              GetBuilder<HomeCaptainController>(
                builder: (controller) {
                  return _MapControlButton(
@@ -250,6 +255,7 @@ class _MapView extends StatelessWidget {
              // --- تم حذف onCameraMove الخاطئ ---
              // === إضافة الطبقة الحرارية هنا ===
              polygons: controller.heatmapPolygons,
+
              // =
              markers: {
                Marker(
@@ -346,9 +352,10 @@ class _MapView extends StatelessWidget {
 class _StatusPodOverlay extends StatelessWidget {
  const _StatusPodOverlay();

-  void _showDetailsDialog(BuildContext context) {
+  void _showDetailsDialog(
+      BuildContext context, HomeCaptainController controller) {
    Get.dialog(
-      const _DriverDetailsDialog(),
+      _DriverDetailsDialog(controller), // تمرير الكنترولر هنا
      barrierColor: Colors.black.withOpacity(0.3),
    );
  }
@@ -361,7 +368,7 @@ class _StatusPodOverlay extends StatelessWidget {
      left: 16,
      right: 16,
      child: GestureDetector(
-        onTap: () => _showDetailsDialog(context),
+        onTap: () => _showDetailsDialog(context, homeCaptainController),
        child: ClipRRect(
          borderRadius: BorderRadius.circular(24),
          child: BackdropFilter(
@@ -435,11 +442,16 @@ class _StatusPodOverlay extends StatelessWidget {

 /// 4. The Dialog that shows detailed driver stats.
 class _DriverDetailsDialog extends StatelessWidget {
-  const _DriverDetailsDialog();
+  // 1. إضافة متغير للكنترولر
+  final HomeCaptainController controller;
+
+  // 2. تحديث البناء لاستقباله
+  const _DriverDetailsDialog(this.controller);

  @override
  Widget build(BuildContext context) {
-    final homeCaptainController = Get.find<HomeCaptainController>();
+    // 3. حذف السطر الذي يسبب الخطأ: final homeCaptainController = Get.find...
+
    return BackdropFilter(
      filter: ImageFilter.blur(sigmaX: 5, sigmaY: 5),
      child: AlertDialog(
@@ -463,27 +475,28 @@ class _DriverDetailsDialog extends StatelessWidget {
                icon: Entypo.wallet,
                color: AppColor.greenColor,
                label: 'Today'.tr,
-                value: homeCaptainController.totalMoneyToday.toString(),
+                // استخدام المتغير controller الذي تم تمريره
+                value: controller.totalMoneyToday.toString(),
              ),
              const SizedBox(height: 12),
              _buildStatRow(
                icon: Entypo.wallet,
                color: AppColor.yellowColor,
                label: AppInformation.appName,
-                value: homeCaptainController.totalMoneyInSEFER.toString(),
+                value: controller.totalMoneyInSEFER.toString(),
              ),
              const Divider(height: 24),
              _buildDurationRow(
                icon: Icons.timer_outlined,
                label: 'Active Duration:'.tr,
-                value: homeCaptainController.stringActiveDuration,
+                value: controller.stringActiveDuration,
                color: AppColor.greenColor,
              ),
              const SizedBox(height: 12),
              _buildDurationRow(
                icon: Icons.access_time,
                label: 'Total Connection Duration:'.tr,
-                value: homeCaptainController.totalDurationToday,
+                value: controller.totalDurationToday,
                color: AppColor.accentColor,
              ),
              const Divider(height: 24),
@@ -491,7 +504,7 @@ class _DriverDetailsDialog extends StatelessWidget {
                icon: Icons.star_border_rounded,
                color: AppColor.blueColor,
                label: 'Total Points'.tr,
-                value: homeCaptainController.totalPoints.toString(),
+                value: controller.totalPoints.toString(),
              ),
            ],
          ),
@@ -508,6 +521,7 @@ class _DriverDetailsDialog extends StatelessWidget {
    );
  }

+  // ... بقية الدوال المساعدة (_buildStatRow, _buildDurationRow) تبقى كما هي ...
  Widget _buildStatRow(
      {required IconData icon,
      required Color color,
--- a/lib/views/home/Captin/home_captain/widget/connect.dart
+++ b/lib/views/home/Captin/home_captain/widget/connect.dart
@@ -20,13 +20,13 @@ class ConnectWidget extends StatelessWidget {
    //     Get.put(OrderRequestController());
    CaptainWalletController captainWalletController =
        Get.put(CaptainWalletController());
-
+    int refusedRidesToday = 0;
    captainWalletController.getCaptainWalletFromBuyPoints();
    return Center(
      child: GetBuilder<HomeCaptainController>(
          builder: (homeCaptainController) => double.parse(
                      (captainWalletController.totalPoints)) <
-                  -30000
+                  -200
              ? CupertinoButton(
                  onPressed: () {
                    Get.defaultDialog(
@@ -34,7 +34,7 @@ class ConnectWidget extends StatelessWidget {
                        barrierDismissible: false,
                        title: double.parse(
                                    (captainWalletController.totalPoints)) <
-                                -30000
+                                -200
                            ? 'You dont have Points'.tr
                            : 'You Are Stopped For this Day !'.tr,
                        titleStyle: AppStyle.title,
@@ -44,7 +44,7 @@ class ConnectWidget extends StatelessWidget {
                              onPressed: () async {
                                double.parse((captainWalletController
                                            .totalPoints)) <
-                                        -30000
+                                        -200
                                    ? await Get.find<TextToSpeechController>()
                                        .speakText(
                                            'You must be recharge your Account'
@@ -59,7 +59,7 @@ class ConnectWidget extends StatelessWidget {
                            Text(
                              double.parse((captainWalletController
                                          .totalPoints)) <
-                                      -30000
+                                      -200
                                  ? 'You must be recharge your Account'.tr
                                  : 'You Refused 3 Rides this Day that is the reason \nSee you Tomorrow!'
                                      .tr,
@@ -69,7 +69,7 @@ class ConnectWidget extends StatelessWidget {
                        ),
                        confirm: double.parse(
                                    (captainWalletController.totalPoints)) <
-                                -30000
+                                -200
                            ? MyElevatedButton(
                                title: 'Recharge my Account'.tr,
                                onPressed: () {
--- a/lib/views/home/Captin/home_captain/widget/left_menu_map_captain.dart
+++ b/lib/views/home/Captin/home_captain/widget/left_menu_map_captain.dart
@@ -183,8 +183,13 @@ GetBuilder<HomeCaptainController> leftMainMenuCaptainIcons() {
          //   child: Builder(builder: (context) {
          //     return IconButton(
          //       onPressed: () async {
-          //         Get.to(() => const PhoneNumberScreen());
-          //         // box.write(BoxName.statusDriverLocation, 'off');
+          //         NotificationService.sendNotification(
+          //           target: 'service', // الإرسال لجميع المشتركين في "service"
+          //           title: 'طلب خدمة جديد',
+          //           body: 'تم استلام طلب خدمة جديد. الرجاء مراجعة التفاصيل.',
+          //           isTopic: true,
+          //           category: 'new_service_request', // فئة توضح نوع الإشعار
+          //         );
          //       },
          //       icon: const Icon(
          //         FontAwesome5.grin_tears,