diff --git a/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/StationSurveyorFragment.java b/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/StationSurveyorFragment.java index 304d5a6..5347736 100644 --- a/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/StationSurveyorFragment.java +++ b/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/StationSurveyorFragment.java @@ -298,9 +298,9 @@ public class StationSurveyorFragment extends BaseFragment { @Override public void onCreateOptionsMenu(@NonNull @NotNull Menu menu, @NonNull @NotNull MenuInflater inflater) { if (Test.DEBUG) { - inflater.inflate(R.menu.menu_surveyor_station_record_data_edit_debug, menu); + inflater.inflate(R.menu.menu_surveyor_station_record_data_edit_debug_pla, menu); } else { - inflater.inflate(R.menu.menu_surveyor_station_record_data_edit_release, menu); + inflater.inflate(R.menu.menu_surveyor_station_record_data_edit_release_pla, menu); } // MenuItem stationCheck = menu.findItem(R.id.menu_item_station_check); // MenuItem stationAdjust = menu.findItem(R.id.menu_item_station_adjust); diff --git a/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/base/MeasureBaseFragment.java b/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/base/MeasureBaseFragment.java index 2bfc492..6b7f83f 100644 --- a/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/base/MeasureBaseFragment.java +++ b/app/src/main/java/com/bingce/controlnetwork/fragment/stationsurvey/base/MeasureBaseFragment.java @@ -190,9 +190,9 @@ public abstract class MeasureBaseFragment extends BaseFragment { @Override public void onCreateOptionsMenu(@NonNull @NotNull Menu menu, @NonNull @NotNull MenuInflater inflater) { if (Test.DEBUG) { - inflater.inflate(R.menu.menu_surveyor_station_record_data_edit_debug, menu); + inflater.inflate(R.menu.menu_surveyor_station_record_data_edit_debug_pla, menu); } else { - inflater.inflate(R.menu.menu_surveyor_station_record_data_edit_release, menu); + inflater.inflate(R.menu.menu_surveyor_station_record_data_edit_release_pla, menu); } super.onCreateOptionsMenu(menu, inflater); } diff --git a/app/src/main/res/menu/menu_surveyor_station_record_data_edit_debug.xml b/app/src/main/res/menu/menu_surveyor_station_record_data_edit_debug_pla.xml similarity index 100% rename from app/src/main/res/menu/menu_surveyor_station_record_data_edit_debug.xml rename to app/src/main/res/menu/menu_surveyor_station_record_data_edit_debug_pla.xml diff --git a/app/src/main/res/menu/menu_surveyor_station_record_data_edit_release.xml b/app/src/main/res/menu/menu_surveyor_station_record_data_edit_release_pla.xml similarity index 100% rename from app/src/main/res/menu/menu_surveyor_station_record_data_edit_release.xml rename to app/src/main/res/menu/menu_surveyor_station_record_data_edit_release_pla.xml diff --git a/build.gradle b/build.gradle index 87b6da8..f22b0a7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,12 @@ buildscript { repositories { // jcenter() -// mavenCentral() maven { url 'https://maven.aliyun.com/repository/public' }//central仓和jcenter仓的聚合仓 maven { url 'https://maven.aliyun.com/repository/google' } //google() maven { url 'https://jitpack.io' } maven { url 'https://oss.sonatype.org/content/groups/public/' } maven { url 'https://developer.huawei.com/repo/' } + mavenCentral() google() } dependencies { @@ -20,12 +20,12 @@ allprojects { repositories { flatDir { dirs 'libs' } // jcenter() -// mavenCentral() maven { url 'https://maven.aliyun.com/repository/public' }//central仓和jcenter仓的聚合仓 maven { url 'https://maven.aliyun.com/repository/google' } //google() maven { url 'https://jitpack.io' } maven { url 'https://oss.sonatype.org/content/groups/public/' } maven { url 'https://developer.huawei.com/repo/' } + mavenCentral() google() } } \ No newline at end of file