|
@@ -156,14 +156,14 @@ public class MainActivity extends AppCompatActivity
|
156
|
156
|
{
|
157
|
157
|
return R.id.nav_cameras;
|
158
|
158
|
}
|
159
|
|
- else if (_fullLoginDbo.hasPermission("CAMOTION_SENSOR_GET"))
|
160
|
|
- {
|
161
|
|
- return R.id.nav_sensors;
|
162
|
|
- }
|
163
|
159
|
else if (_fullLoginDbo.hasPermission("CAMOTION_COMMAND_GET"))
|
164
|
160
|
{
|
165
|
161
|
return R.id.nav_commands;
|
166
|
162
|
}
|
|
163
|
+ else if (_fullLoginDbo.hasPermission("CAMOTION_SENSOR_GET"))
|
|
164
|
+ {
|
|
165
|
+ return R.id.nav_sensors;
|
|
166
|
+ }
|
167
|
167
|
}
|
168
|
168
|
return -1;
|
169
|
169
|
}
|
|
@@ -173,10 +173,10 @@ public class MainActivity extends AppCompatActivity
|
173
|
173
|
CamotionFragment fragment;
|
174
|
174
|
if (view == R.id.nav_cameras) {
|
175
|
175
|
fragment = new CamerasFragment();
|
176
|
|
- } else if (view == R.id.nav_sensors) {
|
177
|
|
- fragment = new SensorsFragment();
|
178
|
176
|
} else if (view == R.id.nav_commands) {
|
179
|
177
|
fragment = new CommandsFragment();
|
|
178
|
+ } else if (view == R.id.nav_sensors) {
|
|
179
|
+ fragment = new SensorsFragment();
|
180
|
180
|
} /*else if (view == -1) {
|
181
|
181
|
fragment = new DefaultFragment();
|
182
|
182
|
} */else {
|