소스 검색

修复没有MSD管理功能的问题

songw 2 달 전
부모
커밋
c7afadd6aa

+ 0 - 8
app/src/main/java/com/uas/baigang_xigao/activity/IndexActivity.java

@@ -96,7 +96,6 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
-
                     }
 
                     @Override
@@ -117,8 +116,6 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                 new String[]{DataSourceManager.KEY_GRID_ITEMIMG, DataSourceManager.KEY_GRID_ITEMNAME},
                 new int[]{R.id.griditem_img, R.id.griditem_name});
         menuGridView.setAdapter(adapter);
-
-
         View view = View.inflate(this, R.layout.pop_exit_application, null);
         mCancelTextView = (TextView) view.findViewById(R.id.pop_exit_cancel_tv);
         mMinimizeTextView = (TextView) view.findViewById(R.id.pop_exit_minimize_tv);
@@ -196,7 +193,6 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
         //将选中的ItemName传递给功能Activity(FunctionActivity)
         String itemName = (String) gridItemList.get(position).get(DataSourceManager.KEY_GRID_ITEMNAME);
 //        if (!itemName.equals(GloableParams.GRIDNAME_SHOPCONTENT)) {
-
         List<String> powerList = (List<String>) PdaApplication.getDataCacheFromMap(Constants.FLAG.POWER_CALLER_CACHE);
         boolean isPower = false;
         if (itemName.equals(GloableParams.GRIDNAME_SETTING)) {
@@ -206,7 +202,6 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
         } else if (powerList != null) {
             for (int i = 0; i < powerList.size(); i++) {
                 String power = powerList.get(i);
-
                 if (Constants.CONSTANT.AUTHORITY_PRODINOUT.equals(power)) {
                     if ((GloableParams.GRIDNAME_INOUT_STORAGE.equals(itemName)
                             || GloableParams.GRIDNAME_STORAGE_MANAGER.equals(itemName))
@@ -215,7 +210,6 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                         break;
                     }
                 }
-
                 if (Constants.CONSTANT.AUTHORITY_SHOP.equals(power)) {
                     if ((GloableParams.GRIDNAME_SHOPCONTENT.equals(itemName)
                             || GloableParams.GRIDNAME_STORAGE_MANAGER.equals(itemName)
@@ -235,7 +229,6 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
         } else {
             CommonUtil.toastNoRepeat(this, getString(R.string.have_no_power));
         }
-
 //        } else {
 //        CommonUtil.toastNoRepeat(this, "该功能正在内测");
 //        }
@@ -248,7 +241,6 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
             if (grantResults.length != 1 || grantResults[0] != PackageManager.PERMISSION_GRANTED) {
                 //没有获取到权限
             } else {
-
             }
         }
     }

+ 1 - 1
app/src/main/java/com/uas/baigang_xigao/fragment/SolderPasteManageFragment.java

@@ -63,7 +63,7 @@ public class SolderPasteManageFragment extends BaseFragment {
         mMenuBeanList.add(new CommonMenuBean("日志查询", R.drawable.ic_solder_query,
                 SolderOperateFragment.class, createArgument(Constants.CONSTANT.EXTRA_WHICH_PAGE, SOLDER_QUERY)));
         mMenuBeanList.add(new CommonMenuBean("钢网管控", R.drawable.ic_solder_charging, SteelMeshControlFragment.class));
-//        mMenuBeanList.add(new CommonMenuBean("MSD管理", R.drawable.storage_msd_manager, MSDManageFragment.class));
+        mMenuBeanList.add(new CommonMenuBean("MSD管理", R.drawable.storage_msd_manager, MSDManageFragment.class));
         mMenuBeanList.add(new CommonMenuBean("设置", R.drawable.mainmenu_usersetting, IndexSettingFragment.class));
         mCommonMenuAdapter = new CommonMenuAdapter(mMenuBeanList);
         mMenuRecyclerView.setAdapter(mCommonMenuAdapter);