卫星状态页面展示卫星系统开关

main
chenglifeng 8 months ago
parent dc5d37c952
commit c437451659
  1. 1
      app/src/main/AndroidManifest.xml
  2. 8
      app/src/main/java/com/project/survey/dialog/BubblePopWindow.java
  3. 49
      app/src/main/java/com/project/survey/ui/instrument/satellitosis/SatelliteStatusActivity.java
  4. 48
      app/src/main/res/layout/layout_bubble_popwindow.xml
  5. 2
      app/src/main/res/menu/menu_activity_satellite_system_switch.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"

@ -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();

@ -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);
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);
break;
})
));
}
return super.onOptionsItemSelected(item);
}
}

@ -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"

@ -4,5 +4,5 @@
<item
android:id="@+id/menu_satellite_system_switch"
android:title="卫星系统开关"
app:showAsAction="never" />
app:showAsAction="" />
</menu>
Loading…
Cancel
Save