分页菜单设计完成
This commit is contained in:
		@@ -1,8 +1,8 @@
 | 
				
			|||||||
#Created by .winboll/winboll_app_build.gradle
 | 
					#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
 | 
					stageCount=0
 | 
				
			||||||
libraryProject=
 | 
					libraryProject=
 | 
				
			||||||
baseVersion=1.0
 | 
					baseVersion=1.0
 | 
				
			||||||
publishVersion=1.0.0
 | 
					publishVersion=1.0.0
 | 
				
			||||||
buildCount=197
 | 
					buildCount=207
 | 
				
			||||||
baseBetaVersion=1.0.1
 | 
					baseBetaVersion=1.0.1
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -35,6 +35,7 @@ import cc.winboll.studio.positions.fragments.PositionsFragment;
 | 
				
			|||||||
import cc.winboll.studio.positions.fragments.TXMSFragment;
 | 
					import cc.winboll.studio.positions.fragments.TXMSFragment;
 | 
				
			||||||
import cc.winboll.studio.positions.fragments.TasksFragment;
 | 
					import cc.winboll.studio.positions.fragments.TasksFragment;
 | 
				
			||||||
import com.google.android.material.tabs.TabLayout;
 | 
					import com.google.android.material.tabs.TabLayout;
 | 
				
			||||||
 | 
					import com.hjq.toast.ToastUtils;
 | 
				
			||||||
import com.tencent.map.vector.demo.AbsActivity;
 | 
					import com.tencent.map.vector.demo.AbsActivity;
 | 
				
			||||||
import java.util.ArrayList;
 | 
					import java.util.ArrayList;
 | 
				
			||||||
import java.util.List;
 | 
					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";
 | 
					    public static final String ACTION_SOS = "cc.winboll.studio.libappbase.WinBoll.ACTION_SOS";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    LogView mLogView;
 | 
					    LogView mLogView;
 | 
				
			||||||
    //Toolbar mToolbar;
 | 
					    Toolbar mToolbar;
 | 
				
			||||||
    CheckBox cbMainService;
 | 
					    CheckBox cbMainService;
 | 
				
			||||||
    MainServiceBean mMainServiceBean;
 | 
					    MainServiceBean mMainServiceBean;
 | 
				
			||||||
    private TabLayout tabLayout;
 | 
					    private TabLayout tabLayout;
 | 
				
			||||||
@@ -96,14 +97,14 @@ final public class MainActivity extends AbsActivity implements IWinBollActivity,
 | 
				
			|||||||
        super.onCreate(savedInstanceState);
 | 
					        super.onCreate(savedInstanceState);
 | 
				
			||||||
        setContentView(R.layout.activity_main);
 | 
					        setContentView(R.layout.activity_main);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
//        // 初始化工具栏
 | 
					        // 初始化工具栏
 | 
				
			||||||
//        mToolbar = findViewById(R.id.toolbar);
 | 
					        mToolbar = findViewById(R.id.toolbar);
 | 
				
			||||||
//        setSupportActionBar(mToolbar);
 | 
					        setSupportActionBar(mToolbar);
 | 
				
			||||||
//        if (isEnableDisplayHomeAsUp()) {
 | 
					//        if (isEnableDisplayHomeAsUp()) {
 | 
				
			||||||
//            // 显示后退按钮
 | 
					//            // 显示后退按钮
 | 
				
			||||||
//            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 | 
					//            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 | 
				
			||||||
//        }
 | 
					//        }
 | 
				
			||||||
//        getSupportActionBar().setSubtitle(getTag());
 | 
					        getSupportActionBar().setTitle("");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        // 初始化地图视图
 | 
					        // 初始化地图视图
 | 
				
			||||||
        // 创建Fragment实例
 | 
					        // 创建Fragment实例
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,14 +7,16 @@ package cc.winboll.studio.positions.fragments;
 | 
				
			|||||||
 */
 | 
					 */
 | 
				
			||||||
import android.os.Bundle;
 | 
					import android.os.Bundle;
 | 
				
			||||||
import android.view.LayoutInflater;
 | 
					import android.view.LayoutInflater;
 | 
				
			||||||
 | 
					import android.view.Menu;
 | 
				
			||||||
 | 
					import android.view.MenuInflater;
 | 
				
			||||||
 | 
					import android.view.MenuItem;
 | 
				
			||||||
import android.view.View;
 | 
					import android.view.View;
 | 
				
			||||||
import android.view.ViewGroup;
 | 
					import android.view.ViewGroup;
 | 
				
			||||||
import android.widget.TextView;
 | 
					 | 
				
			||||||
import androidx.annotation.NonNull;
 | 
					import androidx.annotation.NonNull;
 | 
				
			||||||
import androidx.annotation.Nullable;
 | 
					import androidx.annotation.Nullable;
 | 
				
			||||||
import androidx.fragment.app.Fragment;
 | 
					import androidx.fragment.app.Fragment;
 | 
				
			||||||
import cc.winboll.studio.positions.R;
 | 
					import cc.winboll.studio.positions.R;
 | 
				
			||||||
import androidx.appcompat.widget.Toolbar;
 | 
					import com.hjq.toast.ToastUtils;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
public class PositionsFragment extends Fragment {
 | 
					public class PositionsFragment extends Fragment {
 | 
				
			||||||
    
 | 
					    
 | 
				
			||||||
@@ -37,6 +39,7 @@ public class PositionsFragment extends Fragment {
 | 
				
			|||||||
        if (getArguments()!= null) {
 | 
					        if (getArguments()!= null) {
 | 
				
			||||||
            mPage = getArguments().getInt(ARG_PAGE);
 | 
					            mPage = getArguments().getInt(ARG_PAGE);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					        setHasOptionsMenu(true);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @Nullable
 | 
					    @Nullable
 | 
				
			||||||
@@ -44,9 +47,29 @@ public class PositionsFragment extends Fragment {
 | 
				
			|||||||
    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
 | 
					    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
 | 
				
			||||||
                             @Nullable Bundle savedInstanceState) {
 | 
					                             @Nullable Bundle savedInstanceState) {
 | 
				
			||||||
        View viewMain = inflater.inflate(R.layout.fragment_positions, container, false);
 | 
					        View viewMain = inflater.inflate(R.layout.fragment_positions, container, false);
 | 
				
			||||||
        Toolbar toolbar = viewMain.findViewById(R.id.toolbar);
 | 
					//        Toolbar toolbar = viewMain.findViewById(R.id.toolbar);
 | 
				
			||||||
        getActivity().getMenuInflater().inflate(R.menu.toolbar_positions,  toolbar.getMenu());
 | 
					//        getActivity().getMenuInflater().inflate(R.menu.toolbar_positions,  toolbar.getMenu());
 | 
				
			||||||
        
 | 
					//        
 | 
				
			||||||
        return viewMain;
 | 
					        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);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,20 +7,16 @@ package cc.winboll.studio.positions.fragments;
 | 
				
			|||||||
 */
 | 
					 */
 | 
				
			||||||
import android.os.Bundle;
 | 
					import android.os.Bundle;
 | 
				
			||||||
import android.view.LayoutInflater;
 | 
					import android.view.LayoutInflater;
 | 
				
			||||||
 | 
					import android.view.Menu;
 | 
				
			||||||
 | 
					import android.view.MenuInflater;
 | 
				
			||||||
 | 
					import android.view.MenuItem;
 | 
				
			||||||
import android.view.View;
 | 
					import android.view.View;
 | 
				
			||||||
import android.view.ViewGroup;
 | 
					import android.view.ViewGroup;
 | 
				
			||||||
 | 
					import androidx.annotation.NonNull;
 | 
				
			||||||
 | 
					import androidx.annotation.Nullable;
 | 
				
			||||||
import androidx.fragment.app.Fragment;
 | 
					import androidx.fragment.app.Fragment;
 | 
				
			||||||
import cc.winboll.studio.positions.R;
 | 
					import cc.winboll.studio.positions.R;
 | 
				
			||||||
import cc.winboll.studio.libappbase.LogView;
 | 
					import com.hjq.toast.ToastUtils;
 | 
				
			||||||
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;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
public class TasksFragment extends Fragment {
 | 
					public class TasksFragment extends Fragment {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -43,6 +39,7 @@ public class TasksFragment extends Fragment {
 | 
				
			|||||||
        if (getArguments()!= null) {
 | 
					        if (getArguments()!= null) {
 | 
				
			||||||
            mPage = getArguments().getInt(ARG_PAGE);
 | 
					            mPage = getArguments().getInt(ARG_PAGE);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					        setHasOptionsMenu(true);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @Nullable
 | 
					    @Nullable
 | 
				
			||||||
@@ -50,10 +47,31 @@ public class TasksFragment extends Fragment {
 | 
				
			|||||||
    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
 | 
					    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
 | 
				
			||||||
                             @Nullable Bundle savedInstanceState) {
 | 
					                             @Nullable Bundle savedInstanceState) {
 | 
				
			||||||
        View viewMain = inflater.inflate(R.layout.fragment_tasks, container, false);
 | 
					        View viewMain = inflater.inflate(R.layout.fragment_tasks, container, false);
 | 
				
			||||||
        Toolbar toolbar = viewMain.findViewById(R.id.toolbar);
 | 
					//        Toolbar toolbar = viewMain.findViewById(R.id.toolbar);
 | 
				
			||||||
        getActivity().getMenuInflater().inflate(R.menu.toolbar_tasks,  toolbar.getMenu());
 | 
					//        getActivity().getMenuInflater().inflate(R.menu.toolbar_tasks,  toolbar.getMenu());
 | 
				
			||||||
        
 | 
					//        
 | 
				
			||||||
        
 | 
					        
 | 
				
			||||||
        return viewMain;
 | 
					        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);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -12,6 +12,11 @@
 | 
				
			|||||||
		android:layout_height="400dp"
 | 
							android:layout_height="400dp"
 | 
				
			||||||
		android:id="@+id/frameLayout"/>
 | 
							android:id="@+id/frameLayout"/>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    <androidx.appcompat.widget.Toolbar
 | 
				
			||||||
 | 
					        android:layout_width="match_parent"
 | 
				
			||||||
 | 
					        android:layout_height="wrap_content"
 | 
				
			||||||
 | 
							android:id="@+id/toolbar"/>
 | 
				
			||||||
 | 
					    
 | 
				
			||||||
	<androidx.viewpager.widget.ViewPager
 | 
						<androidx.viewpager.widget.ViewPager
 | 
				
			||||||
		android:layout_width="match_parent"
 | 
							android:layout_width="match_parent"
 | 
				
			||||||
		android:layout_height="0dp"
 | 
							android:layout_height="0dp"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,11 +6,6 @@
 | 
				
			|||||||
    android:layout_width="match_parent"
 | 
					    android:layout_width="match_parent"
 | 
				
			||||||
    android:layout_height="match_parent">
 | 
					    android:layout_height="match_parent">
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <androidx.appcompat.widget.Toolbar
 | 
					 | 
				
			||||||
        android:layout_width="match_parent"
 | 
					 | 
				
			||||||
        android:layout_height="wrap_content"
 | 
					 | 
				
			||||||
		android:id="@+id/toolbar"/>
 | 
					 | 
				
			||||||
    
 | 
					 | 
				
			||||||
    <TextView
 | 
					    <TextView
 | 
				
			||||||
        android:layout_width="wrap_content"
 | 
					        android:layout_width="wrap_content"
 | 
				
			||||||
        android:layout_height="wrap_content"
 | 
					        android:layout_height="wrap_content"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,8 @@
 | 
				
			|||||||
<?xml version="1.0" encoding="utf-8"?>
 | 
					<?xml version="1.0" encoding="utf-8"?>
 | 
				
			||||||
<menu xmlns:android="http://schemas.android.com/apk/res/android"
 | 
					<menu xmlns:android="http://schemas.android.com/apk/res/android"
 | 
				
			||||||
	xmlns:app="http://schemas.android.com/apk/res-auto">
 | 
						xmlns:app="http://schemas.android.com/apk/res-auto"
 | 
				
			||||||
 | 
					    xmlns:tools="http://schemas.android.com/tools"
 | 
				
			||||||
 | 
					    tools:context=".MainActivity">
 | 
				
			||||||
    
 | 
					    
 | 
				
			||||||
    <item
 | 
					    <item
 | 
				
			||||||
        android:id="@+id/item_addtask"
 | 
					        android:id="@+id/item_addtask"
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user