diff --git a/positions/build.properties b/positions/build.properties
index ae32d21..36a0074 100644
--- a/positions/build.properties
+++ b/positions/build.properties
@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
-#Fri Feb 28 02:42:20 GMT 2025
+#Fri Feb 28 03:07:27 GMT 2025
stageCount=0
libraryProject=
baseVersion=1.0
publishVersion=1.0.0
-buildCount=197
+buildCount=207
baseBetaVersion=1.0.1
diff --git a/positions/src/main/java/cc/winboll/studio/positions/MainActivity.java b/positions/src/main/java/cc/winboll/studio/positions/MainActivity.java
index 0958231..ee97c5d 100644
--- a/positions/src/main/java/cc/winboll/studio/positions/MainActivity.java
+++ b/positions/src/main/java/cc/winboll/studio/positions/MainActivity.java
@@ -35,6 +35,7 @@ import cc.winboll.studio.positions.fragments.PositionsFragment;
import cc.winboll.studio.positions.fragments.TXMSFragment;
import cc.winboll.studio.positions.fragments.TasksFragment;
import com.google.android.material.tabs.TabLayout;
+import com.hjq.toast.ToastUtils;
import com.tencent.map.vector.demo.AbsActivity;
import java.util.ArrayList;
import java.util.List;
@@ -49,7 +50,7 @@ final public class MainActivity extends AbsActivity implements IWinBollActivity,
public static final String ACTION_SOS = "cc.winboll.studio.libappbase.WinBoll.ACTION_SOS";
LogView mLogView;
- //Toolbar mToolbar;
+ Toolbar mToolbar;
CheckBox cbMainService;
MainServiceBean mMainServiceBean;
private TabLayout tabLayout;
@@ -96,14 +97,14 @@ final public class MainActivity extends AbsActivity implements IWinBollActivity,
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
-// // 初始化工具栏
-// mToolbar = findViewById(R.id.toolbar);
-// setSupportActionBar(mToolbar);
+ // 初始化工具栏
+ mToolbar = findViewById(R.id.toolbar);
+ setSupportActionBar(mToolbar);
// if (isEnableDisplayHomeAsUp()) {
// // 显示后退按钮
// getSupportActionBar().setDisplayHomeAsUpEnabled(true);
// }
-// getSupportActionBar().setSubtitle(getTag());
+ getSupportActionBar().setTitle("");
// 初始化地图视图
// 创建Fragment实例
@@ -134,7 +135,7 @@ final public class MainActivity extends AbsActivity implements IWinBollActivity,
// 关联TabLayout和ViewPager
tabLayout.setupWithViewPager(viewPager);
}
-
+
// ViewPager的适配器
private class MyPagerAdapter extends FragmentPagerAdapter {
diff --git a/positions/src/main/java/cc/winboll/studio/positions/fragments/PositionsFragment.java b/positions/src/main/java/cc/winboll/studio/positions/fragments/PositionsFragment.java
index 75cfea5..5042541 100644
--- a/positions/src/main/java/cc/winboll/studio/positions/fragments/PositionsFragment.java
+++ b/positions/src/main/java/cc/winboll/studio/positions/fragments/PositionsFragment.java
@@ -7,14 +7,16 @@ package cc.winboll.studio.positions.fragments;
*/
import android.os.Bundle;
import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import cc.winboll.studio.positions.R;
-import androidx.appcompat.widget.Toolbar;
+import com.hjq.toast.ToastUtils;
public class PositionsFragment extends Fragment {
@@ -37,6 +39,7 @@ public class PositionsFragment extends Fragment {
if (getArguments()!= null) {
mPage = getArguments().getInt(ARG_PAGE);
}
+ setHasOptionsMenu(true);
}
@Nullable
@@ -44,9 +47,29 @@ public class PositionsFragment extends Fragment {
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
@Nullable Bundle savedInstanceState) {
View viewMain = inflater.inflate(R.layout.fragment_positions, container, false);
- Toolbar toolbar = viewMain.findViewById(R.id.toolbar);
- getActivity().getMenuInflater().inflate(R.menu.toolbar_positions, toolbar.getMenu());
-
+// Toolbar toolbar = viewMain.findViewById(R.id.toolbar);
+// getActivity().getMenuInflater().inflate(R.menu.toolbar_positions, toolbar.getMenu());
+//
return viewMain;
}
+
+ @Override
+ public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
+ inflater.inflate(R.menu.toolbar_positions, menu);
+ super.onCreateOptionsMenu(menu, inflater);
+ }
+
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ if (item.getItemId() == R.id.item_addposition) {
+ ToastUtils.show("item_addposition");
+ }
+// } else
+// if (item.getItemId() == R.id.item_exit) {
+// exit();
+// return true;
+// }
+ return super.onOptionsItemSelected(item);
+ }
}
diff --git a/positions/src/main/java/cc/winboll/studio/positions/fragments/TasksFragment.java b/positions/src/main/java/cc/winboll/studio/positions/fragments/TasksFragment.java
index 89d1a30..c99d6a6 100644
--- a/positions/src/main/java/cc/winboll/studio/positions/fragments/TasksFragment.java
+++ b/positions/src/main/java/cc/winboll/studio/positions/fragments/TasksFragment.java
@@ -7,20 +7,16 @@ package cc.winboll.studio.positions.fragments;
*/
import android.os.Bundle;
import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import cc.winboll.studio.positions.R;
-import cc.winboll.studio.libappbase.LogView;
-import androidx.annotation.Nullable;
-import androidx.annotation.NonNull;
-import android.graphics.Color;
-import android.widget.TextView;
-import cc.winboll.studio.positions.views.GridMapView;
-import com.tencent.tencentmap.mapsdk.maps.MapView;
-import com.tencent.tencentmap.mapsdk.maps.TencentMap;
-import com.tencent.tencentmap.mapsdk.maps.TextureMapView;
-import androidx.appcompat.widget.Toolbar;
+import com.hjq.toast.ToastUtils;
public class TasksFragment extends Fragment {
@@ -43,6 +39,7 @@ public class TasksFragment extends Fragment {
if (getArguments()!= null) {
mPage = getArguments().getInt(ARG_PAGE);
}
+ setHasOptionsMenu(true);
}
@Nullable
@@ -50,10 +47,31 @@ public class TasksFragment extends Fragment {
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
@Nullable Bundle savedInstanceState) {
View viewMain = inflater.inflate(R.layout.fragment_tasks, container, false);
- Toolbar toolbar = viewMain.findViewById(R.id.toolbar);
- getActivity().getMenuInflater().inflate(R.menu.toolbar_tasks, toolbar.getMenu());
-
+// Toolbar toolbar = viewMain.findViewById(R.id.toolbar);
+// getActivity().getMenuInflater().inflate(R.menu.toolbar_tasks, toolbar.getMenu());
+//
return viewMain;
}
+
+
+ @Override
+ public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
+ inflater.inflate(R.menu.toolbar_tasks, menu);
+ super.onCreateOptionsMenu(menu, inflater);
+ }
+
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ if (item.getItemId() == R.id.item_addtask) {
+ ToastUtils.show("item_addtask");
+ }
+// } else
+// if (item.getItemId() == R.id.item_exit) {
+// exit();
+// return true;
+// }
+ return super.onOptionsItemSelected(item);
+ }
}
diff --git a/positions/src/main/res/layout/activity_main.xml b/positions/src/main/res/layout/activity_main.xml
index 4ce52f2..7a2197f 100644
--- a/positions/src/main/res/layout/activity_main.xml
+++ b/positions/src/main/res/layout/activity_main.xml
@@ -12,6 +12,11 @@
android:layout_height="400dp"
android:id="@+id/frameLayout"/>
+
+
-
-