|
@@ -186,21 +186,18 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
|
|
|
public boolean onOptionsItemSelected(MenuItem item) {
|
|
public boolean onOptionsItemSelected(MenuItem item) {
|
|
|
if (item.getItemId() == android.R.id.home) {
|
|
if (item.getItemId() == android.R.id.home) {
|
|
|
if (isCrm) {
|
|
if (isCrm) {
|
|
|
- // startActivity(new Intent(activity, ClientActivity.class));
|
|
|
|
|
- } else {
|
|
|
|
|
startActivity(new Intent(activity, MainActivity.class));
|
|
startActivity(new Intent(activity, MainActivity.class));
|
|
|
}
|
|
}
|
|
|
finish();
|
|
finish();
|
|
|
} else if (item.getItemId() == R.id.add_item) {
|
|
} else if (item.getItemId() == R.id.add_item) {
|
|
|
if (isCrm) {//从客户
|
|
if (isCrm) {//从客户
|
|
|
- showPopupWindow(getWindow().findViewById(R.id.add_item));
|
|
|
|
|
- } else {
|
|
|
|
|
Intent intent = null;
|
|
Intent intent = null;
|
|
|
if (CommonUtil.isReleaseVersion() || isB2b)
|
|
if (CommonUtil.isReleaseVersion() || isB2b)
|
|
|
intent = new Intent(ct, VisitReportAddActivity.class);
|
|
intent = new Intent(ct, VisitReportAddActivity.class);
|
|
|
else intent = new Intent(ct, AddVisitReportActivity.class);
|
|
else intent = new Intent(ct, AddVisitReportActivity.class);
|
|
|
startActivityForResult(intent, 0x20);
|
|
startActivityForResult(intent, 0x20);
|
|
|
- }
|
|
|
|
|
|
|
+ } else
|
|
|
|
|
+ showPopupWindow(getWindow().findViewById(R.id.add_item));
|
|
|
} else {
|
|
} else {
|
|
|
return super.onOptionsItemSelected(item);
|
|
return super.onOptionsItemSelected(item);
|
|
|
|
|
|