|
|
@ -650,6 +650,7 @@ public class DeviceActivity extends AppCompatActivity {
|
|
|
|
int rotation = -1;
|
|
|
|
int rotation = -1;
|
|
|
|
int usb = 0;
|
|
|
|
int usb = 0;
|
|
|
|
int netCamera = 0;
|
|
|
|
int netCamera = 0;
|
|
|
|
|
|
|
|
int vendor = 0;
|
|
|
|
Integer chVal = Integer.valueOf(channel);
|
|
|
|
Integer chVal = Integer.valueOf(channel);
|
|
|
|
if (mChannelCfgs.containsKey(chVal)) {
|
|
|
|
if (mChannelCfgs.containsKey(chVal)) {
|
|
|
|
JSONObject jsonChannel = mChannelCfgs.get(chVal);
|
|
|
|
JSONObject jsonChannel = mChannelCfgs.get(chVal);
|
|
|
@ -662,6 +663,8 @@ public class DeviceActivity extends AppCompatActivity {
|
|
|
|
int cameraType = jsonChannel.optInt("cameraType", 0);
|
|
|
|
int cameraType = jsonChannel.optInt("cameraType", 0);
|
|
|
|
usb = (cameraType == 1) ? 1 : 0;
|
|
|
|
usb = (cameraType == 1) ? 1 : 0;
|
|
|
|
netCamera = (cameraType == 2 || cameraType == 4) ? 1 : 0;
|
|
|
|
netCamera = (cameraType == 2 || cameraType == 4) ? 1 : 0;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
vendor = jsonChannel.optInt("vendor", 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -673,6 +676,7 @@ public class DeviceActivity extends AppCompatActivity {
|
|
|
|
intent.putExtra("channel", channel);
|
|
|
|
intent.putExtra("channel", channel);
|
|
|
|
intent.putExtra("rotation", rotation);
|
|
|
|
intent.putExtra("rotation", rotation);
|
|
|
|
intent.putExtra("netCamera", netCamera);
|
|
|
|
intent.putExtra("netCamera", netCamera);
|
|
|
|
|
|
|
|
intent.putExtra("vendor", vendor);
|
|
|
|
intent.putExtra("usb", usb);
|
|
|
|
intent.putExtra("usb", usb);
|
|
|
|
intent.putExtra("cmdid", TextUtils.isEmpty(mAppConfig.cmdid) ? "" : mAppConfig.cmdid);
|
|
|
|
intent.putExtra("cmdid", TextUtils.isEmpty(mAppConfig.cmdid) ? "" : mAppConfig.cmdid);
|
|
|
|
// intent.putExtra("info", info);
|
|
|
|
// intent.putExtra("info", info);
|
|
|
|