Merge branch 'feature' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature_bitliker

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu Dec 21 08:46:49 CST 2017
-debugName=217
+#Thu Dec 21 11:31:47 CST 2017
+debugName=218
 versionName=611
-debugCode=217
+debugCode=218
 versionCode=150

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/DeviceDataFormAddActivity.java

@@ -56,6 +56,7 @@ import com.uas.appworks.OA.erp.activity.form.DataFormFieldActivity;
 import com.uas.appworks.OA.erp.activity.form.FormListSelectActivity;
 import com.uas.appworks.OA.erp.model.form.GroupData;
 import com.uas.appworks.R;
+import com.uas.appworks.activity.DeviceQueryActivity;
 
 import java.text.DecimalFormat;
 import java.text.ParseException;
@@ -658,7 +659,18 @@ public class DeviceDataFormAddActivity extends BaseActivity implements View.OnCl
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.oa_leave) {
-//TODO 进入设备查询        startActivity(new Intent(ct,));
+            String dc_class = null;
+            if (caller.equals("DeviceChange!Use")) {
+                dc_class = "使用转移";
+            } else if (caller.equals("DeviceChange!Scrap")) {
+                dc_class = "报废";
+            } else if (caller.equals("DeviceBatch!Maintain")) {
+                dc_class = "保养维护";
+            } else if (caller.equals("DeviceChange!Inspect")) {
+                dc_class = "故障送检";
+            }
+            startActivity(new Intent(ct, DeviceQueryActivity.class).putExtra(Constants.FLAG.DEVICE_CALLER, caller)
+                    .putExtra(Constants.FLAG.DEVICE_CLASS, dc_class));
         }
         return super.onOptionsItemSelected(item);
     }

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/DeviceManageActivity.java

@@ -14,6 +14,7 @@ import com.uas.appworks.CRM.erp.adapter.DeviceManageAdapter;
 import com.uas.appworks.CRM.erp.model.DeviceManage;
 import com.uas.appworks.OA.erp.activity.form.DataFormDetailActivity;
 import com.uas.appworks.R;
+import com.uas.appworks.activity.DeviceQueryActivity;
 import com.uuzuche.lib_zxing.activity.CaptureActivity;
 import com.uuzuche.lib_zxing.activity.CodeUtils;
 
@@ -38,7 +39,7 @@ public class DeviceManageActivity extends BaseActivity {
         //扫一扫
         models.add(new DeviceManage(1, R.drawable.icon_scan_device, StringUtil.getMessage(R.string.text_scan_device)).setCazz(CaptureActivity.class).setRequest(0x21));
         //设备查询
-        models.add(new DeviceManage(2, R.drawable.icon_device_query, StringUtil.getMessage(R.string.text_device_query))/*.setCazz(DeviceQueryActivity.class)*/);
+        models.add(new DeviceManage(2, R.drawable.icon_device_query, StringUtil.getMessage(R.string.text_device_query)).setCazz(DeviceQueryActivity.class));
         //通用配置表单
 
         models.add(new DeviceManage(3, R.drawable.icon_application_use, StringUtil.getMessage(R.string.text_application_use)).setCazz(DeviceDataFormAddActivity.class).addString("caller", "DeviceChange!Use"));

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/ScanDetailActivity.java

@@ -159,7 +159,7 @@ public class ScanDetailActivity extends BaseActivity implements View.OnClickList
             menuPop.setOutsideTouchable(false);
             menuPop.setFocusable(true);
             menuPop.setWidth(DisplayUtil.dip2px(ct, 100));
-            menuPop.setHeight(DisplayUtil.dip2px(ct, 295));
+            menuPop.setHeight(DisplayUtil.dip2px(ct, 200));
             menuPop.setOnDismissListener(new PopupWindow.OnDismissListener() {
                 @Override
                 public void onDismiss() {