测试

app/src/main/AndroidManifest.xml

@@ -146,6 +146,55 @@
             android:name=".ui.lofting.pointlofting.PointStakingActivity"
             android:exported="true"
             android:windowSoftInputMode="adjustResize|stateHidden" />
+        <activity
+            android:name=".ui.instrument.setupstation.SetupStationInputActivity"
+            android:exported="true"
+            android:windowSoftInputMode="adjustResize|stateHidden" />
+        <activity
+            android:name=".ui.instrument.setupstation.SetupStationKnownBackSightActivity"
+            android:exported="true"
+            android:windowSoftInputMode="adjustResize|stateHidden" />
+        <activity
+            android:name=".ui.instrument.setupstation.SetupStationResectionActivity"
+            android:exported="true"
+            android:windowSoftInputMode="adjustResize|stateHidden" />
+        <activity
+            android:name=".ui.instrument.setupstation.SetupStationResectionSubActivity"
+            android:exported="true"
+            android:windowSoftInputMode="adjustResize|stateHidden" />
+        <activity
+            android:name=".ui.instrument.setupstation.ControlPointsNewActivity"
+            android:exported="true"
+            android:windowSoftInputMode="adjustResize|stateHidden" />
+        <activity
+            android:name=".ui.instrument.setupstation.CoordinatePointsLibraryActivity"
+            android:exported="true"
+            android:windowSoftInputMode="adjustResize|stateHidden" />
+        <activity
+            android:name=".ui.instrument.setupstation.StakingNewJobActivity"
+            android:exported="true"
+            android:windowSoftInputMode="adjustResize|stateHidden" />
+        <activity
+            android:name=".ui.instrument.setupstation.PointFilterActivity"
+            android:exported="true"
+            android:windowSoftInputMode="adjustResize|stateHidden" />
+        <activity
+            android:name=".ui.instrument.setupstation.AddResultFormatActivity"
+            android:exported="true"
+            android:windowSoftInputMode="adjustResize|stateHidden" />
+        <activity
+            android:name=".ui.instrument.setupstation.ControlPointsActivity"
+            android:exported="true"
+            android:windowSoftInputMode="adjustResize|stateHidden" />
+        <activity
+            android:name=".ui.instrument.setupstation.EditCoordinatePointActivity"
+            android:exported="true"
+            android:windowSoftInputMode="adjustResize|stateHidden" />
+        <activity
+            android:name=".ui.instrument.setupstation.ResultsTheExportActivity"
+            android:exported="true"
+            android:windowSoftInputMode="adjustResize|stateHidden" />
+
 
     </application>
 

app/src/main/java/com/project/survey/ui/base/BaseSurveyNewActivity.java

@@ -148,6 +148,13 @@ public abstract class BaseSurveyNewActivity extends AppCompatActivity implements
         defaultMenu.showAsDropDown(baseSurveyActivityUtils.activityBaseSurveyBinding.ivMore, -150, 20);
     }
 
+    /**
+     * 隐藏三点更多
+     */
+    public void hideMore() {
+        baseSurveyActivityUtils.activityBaseSurveyBinding.ivMore.setVisibility(View.GONE);
+    }
+
     public boolean isHideHelpDoc() {
         return false;
     }
@@ -208,6 +215,7 @@ public abstract class BaseSurveyNewActivity extends AppCompatActivity implements
         baseSurveyActivityUtils.activityBaseSurveyBinding.llCommonRight.setOnClickListener(this::onCommonRightClicked);
 
         baseSurveyActivityUtils.activityBaseSurveyBinding.llIconHomeSatellite.setOnClickListener(v -> {
+            //激光
             if (Device.getInstance().deviceType == DeviceTypeEnum.DEVICE_TYPE_TS) {
                 tsSettingDialogUtils.showTotalStationSettingDialog();
             } else {

app/src/main/java/com/project/survey/ui/instrument/basestationtranslation/RtkBaseCorrectActivity.java

@@ -24,9 +24,7 @@ import com.bingce.rtk.gnss.Gnss;
 import com.bingce.rtk.gnss.setting.BaseCorrect;
 import com.bingce.rtk.model.GnssPosition;
 import com.bingce.rtk.util.CoordTransUtil;
-
 import com.bingce.surveyor.agentweb.HelpWebActivity;
-
 import com.bingce.utils.ThreadPoolUtil;
 import com.bingce.utils.Util;
 import com.project.survey.App;
@@ -160,25 +158,20 @@ public class RtkBaseCorrectActivity extends BaseSurveyNewActivity {
             CommonUtils.hideSoftInput();
             new MaterialDialog.Builder(RtkBaseCorrectActivity.this)
                     .title(R.string.data_source)
-                    .items(new String[]{getString(R.string.road_control_point), getString(R.string.global_control_point), getString(R.string.point_survey_point_library), getString(R.string.staking_point_library)})
+                    .items(new String[]{getString(R.string.global_control_point), getString(R.string.point_survey_point_library), getString(R.string.staking_point_library)})
                     .itemsCallback((dialog, itemView, which, text) -> {
                         switch (which) {
                             case 0:
-                                ControlPointsNewActivity.pickPoint(this, false, (name, code, x, y, z, remarks) -> {
-                                    onPicked(name, x, y, z);
-                                });
-                                break;
-                            case 1:
                                 ControlPointsNewActivity.pickPoint(this, true, (name, code, x, y, z, remarks) -> {
                                     onPicked(name, x, y, z);
                                 });
                                 break;
-                            case 2:
+                            case 1:
                                 CoordinatePointsLibraryActivity.pickPoint(RtkBaseCorrectActivity.this, (name, code, x, y, z, b, l, h) -> {
                                     onPicked(name, x, y, z);
                                 });
                                 break;
-                            case 3:
+                            case 2:
                                 StakingNewJobActivity.pickPoint(RtkBaseCorrectActivity.this, (name, x, y, z) -> {
                                     onPicked(name, x, y, z);
                                 });

app/src/main/java/com/project/survey/ui/instrument/mobilestationmode/GnssConfigSetActivity.java

@@ -416,9 +416,9 @@ public class GnssConfigSetActivity extends ColorfulActivity implements GnssConfi
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        if (sysMode == WorkModeEnum.ROVER || sysMode == WorkModeEnum.BASE) {
+//        if (sysMode == WorkModeEnum.ROVER || sysMode == WorkModeEnum.BASE) {
-            getMenuInflater().inflate(R.menu.menu_activity_rtk_station, menu);
+//            getMenuInflater().inflate(R.menu.menu_activity_rtk_station, menu);
-        }
+//        }
         return super.onCreateOptionsMenu(menu);
     }
 

app/src/main/java/com/project/survey/ui/instrument/setupstation/ControlPointsNewActivity.java

@@ -293,12 +293,6 @@ public class ControlPointsNewActivity extends ColorfulActivity {
                 "X", "Y", "Z",
                 getString(R.string.remarks),
                 getString(R.string.record_time)};
-//        binding.tableView.setAdapter(tableAdapter);
-//        binding.tableView.setTableViewListener(tableClickListener);
-//        binding.tableView.setSelectedColor(Color.rgb(226, 236, 215));
-//        binding.tableView.getSelectionHandler().setShadowEnabled(false);
-//        binding.tableView.setShowCornerView(true);
-//        binding.tableView.setRowHeaderWidth(0);
         binding.bodyRv.setAdapter(controlPointLibraryAdapter);
         binding.bodyNameRv.setAdapter(controlPointNameLibraryAdapter);
         binding.bodyHsv.setScrollView(binding.headerHsv);

app/src/main/java/com/project/survey/ui/instrument/setupstation/PointFilterActivity.java

@@ -21,6 +21,7 @@ public class PointFilterActivity extends BaseSurveyNewActivity {
     private TimePicker timePicker = null;
     private long startTime = -1;
     private long endTime = -1;
+
     @Override
     public View getContentView() {
         binding = ActivityPointFilterBinding.inflate(getLayoutInflater());
@@ -148,6 +149,9 @@ public class PointFilterActivity extends BaseSurveyNewActivity {
         binding.etName.setText(IntentUtil.stringExtra(this, KEY_NAME));
         binding.etCode.setText(IntentUtil.stringExtra(this, KEY_CODE));
         binding.etRemarks.setText(IntentUtil.stringExtra(this, KEY_REMARKS));
+
+        //隐藏三点更多
+        hideMore();
     }
 
     @Override
@@ -157,9 +161,9 @@ public class PointFilterActivity extends BaseSurveyNewActivity {
         if (start < 0 && end < 0) {
             onAllDayClicked();
         } else {
-            if (end - start == 1000 * 60 * 60 * 24 * 7 - 2000){
+            if (end - start == 1000 * 60 * 60 * 24 * 7 - 2000) {
                 on7DayClicked();
-            }else {
+            } else {
                 onTodayClicked();
             }
         }