From c4374516594d36ace00ac6a428024dbca7308467 Mon Sep 17 00:00:00 2001
From: chenglifeng <clf_cheng@163.com>
Date: Tue, 5 Nov 2024 17:32:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=AB=E6=98=9F=E7=8A=B6=E6=80=81=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=B1=95=E7=A4=BA=E5=8D=AB=E6=98=9F=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |  1 +
 .../survey/dialog/BubblePopWindow.java        |  8 +--
 .../satellitosis/SatelliteStatusActivity.java | 51 +++++++++++++------
 .../res/layout/layout_bubble_popwindow.xml    | 48 ++++++++---------
 .../menu_activity_satellite_system_switch.xml |  2 +-
 5 files changed, 66 insertions(+), 44 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b4dfe6f..9e6fdea 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -130,6 +130,7 @@
         <activity
             android:name=".ui.instrument.satellitosis.SatelliteSystemSwitchActivity"
             android:exported="true"
+            android:label="卫星系统开关"
             android:windowSoftInputMode="adjustResize|stateHidden" />
         <activity
             android:name=".ui.instrument.setupstation.SetupStationCurrentActivity"
diff --git a/app/src/main/java/com/project/survey/dialog/BubblePopWindow.java b/app/src/main/java/com/project/survey/dialog/BubblePopWindow.java
index 8f6601a..cbd31b0 100644
--- a/app/src/main/java/com/project/survey/dialog/BubblePopWindow.java
+++ b/app/src/main/java/com/project/survey/dialog/BubblePopWindow.java
@@ -47,10 +47,10 @@ public class BubblePopWindow extends PopupWindow {
         binding = LayoutBubblePopwindowBinding.inflate(LayoutInflater.from(context));
         setContentView(binding.getRoot());
 
-        binding.llSoftwareSetup.setOnClickListener(v -> {
-            dismiss();
-//            SoftwareSetupActivity.start(context);
-        });
+//        binding.llSoftwareSetup.setOnClickListener(v -> {
+//            dismiss();
+////            SoftwareSetupActivity.start(context);
+//        });
 
         binding.llHelpDocument.setOnClickListener(v -> {
             dismiss();
diff --git a/app/src/main/java/com/project/survey/ui/instrument/satellitosis/SatelliteStatusActivity.java b/app/src/main/java/com/project/survey/ui/instrument/satellitosis/SatelliteStatusActivity.java
index a5bd928..75b94ea 100644
--- a/app/src/main/java/com/project/survey/ui/instrument/satellitosis/SatelliteStatusActivity.java
+++ b/app/src/main/java/com/project/survey/ui/instrument/satellitosis/SatelliteStatusActivity.java
@@ -1,5 +1,6 @@
 package com.project.survey.ui.instrument.satellitosis;
 
+import android.content.Context;
 import android.content.Intent;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -14,8 +15,11 @@ import com.bingce.rtk.parser.nmea0183.SatInfo;
 import com.bingce.rtk.parser.nmea0183.SatelliteData;
 import com.project.survey.R;
 import com.project.survey.databinding.ActivitySatelliteStatusBinding;
+import com.project.survey.dialog.BubblePopWindow;
 import com.project.survey.ui.base.BaseSurveyNewActivity;
 
+import java.util.Arrays;
+
 
 public class SatelliteStatusActivity extends BaseSurveyNewActivity {
     private ActivitySatelliteStatusBinding binding;
@@ -28,6 +32,7 @@ public class SatelliteStatusActivity extends BaseSurveyNewActivity {
 
     @Override
     protected void initView() {
+        baseSurveyActivityUtils.activityBaseSurveyBinding.rlMore.setVisibility(View.VISIBLE);
     }
 
     @Override
@@ -178,24 +183,40 @@ public class SatelliteStatusActivity extends BaseSurveyNewActivity {
         binding.activitySatelliteStatusSnr.setText(snrResult.toString());
     }
 
+//    @Override
+//    public boolean onCreateOptionsMenu(Menu menu) {
+//        getMenuInflater().inflate(R.menu.menu_activity_satellite_system_switch, menu);
+//        return super.onCreateOptionsMenu(menu);
+//    }
+//
+//    @Override
+//    public boolean onOptionsItemSelected(MenuItem item) {
+//        switch (item.getItemId()) {
+//            case android.R.id.home:
+//                finish();
+//                break;
+//            case R.id.menu_satellite_system_switch:
+//                Intent intent = new Intent(this, SatelliteSystemSwitchActivity.class);
+//                startActivity(intent);
+//                break;
+//        }
+//        return super.onOptionsItemSelected(item);
+//    }
+
     @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_activity_satellite_system_switch, menu);
-        return super.onCreateOptionsMenu(menu);
+    public boolean isHideHelpDoc() {
+        return true;
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                finish();
-                break;
-            case R.id.menu_satellite_system_switch:
-                Intent intent = new Intent(this, SatelliteSystemSwitchActivity.class);
-                startActivity(intent);
-                break;
-        }
-        return super.onOptionsItemSelected(item);
+    public BubblePopWindow newBubblePopWindow(Context context) {
+        return new BubblePopWindow(
+                context,
+                Arrays.asList(
+                        new BubblePopWindow.CustomMenuItem(R.drawable.icon_function_switch_off, "卫星系统开关", () -> {
+                            Intent intent = new Intent(context, SatelliteSystemSwitchActivity.class);
+                            startActivity(intent);
+                        })
+                ));
     }
-
 }
diff --git a/app/src/main/res/layout/layout_bubble_popwindow.xml b/app/src/main/res/layout/layout_bubble_popwindow.xml
index f24ce31..4d0f191 100644
--- a/app/src/main/res/layout/layout_bubble_popwindow.xml
+++ b/app/src/main/res/layout/layout_bubble_popwindow.xml
@@ -10,30 +10,30 @@
     android:paddingTop="12dp"
     android:paddingBottom="12dp">
 
-    <androidx.appcompat.widget.LinearLayoutCompat
-        android:id="@+id/ll_software_setup"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp">
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:layout_width="23dp"
-            android:layout_height="23dp"
-            android:src="@drawable/icon_global_settings" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:text="@string/software_setup"
-            android:textColor="@color/black"
-            android:textSize="14sp"
-            android:textStyle="bold" />
-
-    </androidx.appcompat.widget.LinearLayoutCompat>
+<!--    <androidx.appcompat.widget.LinearLayoutCompat-->
+<!--        android:id="@+id/ll_software_setup"-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:gravity="center_vertical"-->
+<!--        android:orientation="horizontal"-->
+<!--        android:paddingTop="8dp"-->
+<!--        android:paddingBottom="8dp">-->
+
+<!--        <androidx.appcompat.widget.AppCompatImageView-->
+<!--            android:layout_width="23dp"-->
+<!--            android:layout_height="23dp"-->
+<!--            android:src="@drawable/icon_global_settings" />-->
+
+<!--        <androidx.appcompat.widget.AppCompatTextView-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:layout_marginStart="10dp"-->
+<!--            android:text="@string/software_setup"-->
+<!--            android:textColor="@color/black"-->
+<!--            android:textSize="14sp"-->
+<!--            android:textStyle="bold" />-->
+
+<!--    </androidx.appcompat.widget.LinearLayoutCompat>-->
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:id="@+id/ll_help_document"
diff --git a/app/src/main/res/menu/menu_activity_satellite_system_switch.xml b/app/src/main/res/menu/menu_activity_satellite_system_switch.xml
index 4947daa..fbad0a3 100644
--- a/app/src/main/res/menu/menu_activity_satellite_system_switch.xml
+++ b/app/src/main/res/menu/menu_activity_satellite_system_switch.xml
@@ -4,5 +4,5 @@
     <item
         android:id="@+id/menu_satellite_system_switch"
         android:title="卫星系统开关"
-        app:showAsAction="never" />
+        app:showAsAction="" />
 </menu>
\ No newline at end of file