Commit 99c73292 authored by 陈前's avatar 陈前

权限控制

parent eaad1127
......@@ -13,6 +13,7 @@ import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentCasherBinding;
import com.xingdata.zzdpos.ui.login.LoginPresenter;
import com.xingdata.zzdpos.ui.main.MainPresenter;
import com.xingdata.zzdpos.ui.main.adapter.MenuRecyclerAdapter;
import com.xingdata.zzdpos.ui.manage.manageMenu.ManageMenuActivity;
......@@ -28,12 +29,17 @@ import com.xingdata.zzdpos.util.SystemUtil;
import java.util.ArrayList;
import java.util.List;
import io.reactivex.ObservableOnSubscribe;
import io.reactivex.Observer;
import io.reactivex.disposables.Disposable;
public class CasherFragment extends BaseFragment<MainPresenter, FragmentCasherBinding> {
private MenuRecyclerAdapter mMenuRecyclerAdapter;
private List<Integer> integers;
private Bundle bundle;
private Intent intent;
private Intent intent;
private int[] ints = {101, 102, 103, 104, 105, 106};
private int[] intsB = {101, 102, 104, 105, 106};
@Override
public int getLayoutId() {
......@@ -42,27 +48,63 @@ public class CasherFragment extends BaseFragment<MainPresenter, FragmentCasherBi
@Override
public void initView() {
if (SystemUtil.checkDeviceHasNavigationBar(getActivity())){
LinearLayout.LayoutParams cp = new LinearLayout.LayoutParams( mViewBinding.fragmentCasherRecycler.getLayoutParams());
switch ((int) LoginPresenter.loginReturnBean.getOperLevel()) {
case 1:
ints = intsB;
break;
case 2:
break;
case 3:
break;
}
if (SystemUtil.checkDeviceHasNavigationBar(getActivity())) {
LinearLayout.LayoutParams cp = new LinearLayout.LayoutParams(mViewBinding.fragmentCasherRecycler.getLayoutParams());
cp.setMargins(0, 0, 0, 0);
mViewBinding.fragmentCasherRecycler.setLayoutParams(cp);
}
mViewBinding.fragmentCasherRecycler.setLayoutManager(new GridLayoutManager(getActivity(),
2));
integers = new ArrayList<>();
integers.add(101);
integers.add(102);
integers.add(103);
integers.add(104);
integers.add(105);
integers.add(106);
mMenuRecyclerAdapter = new MenuRecyclerAdapter(getActivity(), integers);
mMenuRecyclerAdapter.bindToRecyclerView(mViewBinding.fragmentCasherRecycler);
mViewBinding.fragmentCasherRecycler.addItemDecoration(new MyMenuItemDecoration
(getActivity(), 2, getResources().getColor(R.color.golden_yuji)));
io.reactivex.Observable.create((ObservableOnSubscribe<Integer>) e -> {
for (int i : ints) {
e.onNext(i);
}
e.onComplete();
}).doFinally(() -> {
mViewBinding.fragmentCasherRecycler.setLayoutManager(new GridLayoutManager(getActivity(),
2));
}).subscribe(new Observer<Integer>() {
private List<Integer> integers;
@Override
public void onSubscribe(Disposable d) {
integers = new ArrayList<>();
}
@Override
public void onNext(Integer integer) {
integers.add(integer);
}
@Override
public void onError(Throwable e) {
}
@Override
public void onComplete() {
mMenuRecyclerAdapter = new MenuRecyclerAdapter(getActivity(), integers);
mMenuRecyclerAdapter.bindToRecyclerView(mViewBinding.fragmentCasherRecycler);
mViewBinding.fragmentCasherRecycler.addItemDecoration(new MyMenuItemDecoration
(getActivity(), 2, getResources().getColor(R.color.golden_yuji)));
}
});
mMenuRecyclerAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
......
......@@ -3,6 +3,7 @@ package com.xingdata.zzdpos.ui.manage.manageMenu;
import android.databinding.DataBindingUtil;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.LinearLayoutManager;
import android.view.View;
......@@ -11,6 +12,8 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.databinding.ActivityMarketingMenuBinding;
import com.xingdata.zzdpos.ui.login.LoginPresenter;
import com.xingdata.zzdpos.ui.main.adapter.MenuRecyclerAdapter;
import com.xingdata.zzdpos.ui.manage.bale.BaleActivity;
import com.xingdata.zzdpos.ui.manage.inventory.InventoryActivity;
import com.xingdata.zzdpos.ui.manage.otherselect.OtherSelectActivity;
......@@ -18,20 +21,38 @@ import com.xingdata.zzdpos.ui.manage.replenishment.ReplenishmentActivity;
import com.xingdata.zzdpos.ui.manage.sssku.SsskuActivity;
import com.xingdata.zzdpos.ui.manage.user.UserActivity;
import com.xingdata.zzdpos.ui.marketing.marketingMenu.adapter.MarketingMenuAdapter;
import com.xingdata.zzdpos.util.MyMenuItemDecoration;
import com.xingdata.zzdpos.util.OnClickListener;
import java.util.ArrayList;
import java.util.List;
import io.reactivex.ObservableOnSubscribe;
import io.reactivex.Observer;
import io.reactivex.disposables.Disposable;
public class ManageMenuActivity extends AppCompatActivity {
MarketingMenuAdapter marketingMenuAdapter;
List<Integer> list = new ArrayList<>();
private int[] ints = {C.MENU.MENU_MANAGER_OPER, C.MENU.MENU_MANAGER_GOODS, C.MENU.MENU_MANAGER_BALE, C.MENU.MENU_MANAGER_REPLENISHMENT, C.MENU.MENU_MANAGER_OTHER, C.MENU.MENU_MANAGER_INVENTORY};
private int[] intsB = {C.MENU.MENU_MANAGER_OTHER, C.MENU.MENU_MANAGER_INVENTORY};
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_marketing_menu);
switch ((int) LoginPresenter.loginReturnBean.getOperLevel()) {
case 1:
ints = intsB;
break;
case 2:
break;
case 3:
break;
}
ActivityMarketingMenuBinding mViewBinding = DataBindingUtil.setContentView(
this, R.layout.activity_marketing_menu);
mViewBinding.icTitle.tvTitle.setText("管理");
......@@ -41,19 +62,42 @@ public class ManageMenuActivity extends AppCompatActivity {
ActivityUtils.finishActivity(ManageMenuActivity.class);
}
});
list.add(C.MENU.MENU_MANAGER_OPER);
list.add(C.MENU.MENU_MANAGER_GOODS);
list.add(C.MENU.MENU_MANAGER_BALE);
list.add(C.MENU.MENU_MANAGER_REPLENISHMENT);
list.add(C.MENU.MENU_MANAGER_OTHER);
list.add(C.MENU.MENU_MANAGER_INVENTORY);
marketingMenuAdapter = new MarketingMenuAdapter(list);
mViewBinding.rvMenu.setAdapter(marketingMenuAdapter);
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);
linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
mViewBinding.rvMenu.setLayoutManager(linearLayoutManager);
io.reactivex.Observable.create((ObservableOnSubscribe<Integer>) e -> {
for (int i : ints) {
e.onNext(i);
}
e.onComplete();
}).doFinally(() -> {
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);
linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
mViewBinding.rvMenu.setLayoutManager(linearLayoutManager);
}).subscribe(new Observer<Integer>() {
private List<Integer> integers;
@Override
public void onSubscribe(Disposable d) {
integers = new ArrayList<>();
}
@Override
public void onNext(Integer integer) {
integers.add(integer);
}
@Override
public void onError(Throwable e) {
}
@Override
public void onComplete() {
marketingMenuAdapter = new MarketingMenuAdapter(integers);
mViewBinding.rvMenu.setAdapter(marketingMenuAdapter);
}
});
marketingMenuAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
......
......@@ -128,7 +128,7 @@ public class MyMenuItemDecoration extends RecyclerView.ItemDecoration {
// top = child.getBottom() + params.bottomMargin;
// bottom = top + mDividerHight;
// } else {
if (i/size!=(parent.getAdapter().getItemCount()/size-1)){
if (i/size!=(parent.getAdapter().getItemCount()+(int)(size*0.5+0.5))/size-1){
top = child.getBottom() + params.bottomMargin;
bottom = top + mDividerHight;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment