Merge branch 'release' of ssh://10.10.100.21/source/uu-android into feature_arison

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu Aug 29 18:00:17 CST 2019
+#Mon Aug 26 17:28:30 CST 2019
 debugName=972
-versionName=696
+versionName=695
 debugCode=972
-versionCode=251
+versionCode=250

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

@@ -483,7 +483,23 @@ public class DeviceCycleCountInfoActivity extends SupportToolBarActivity impleme
                 deviceAttribute();
             }
         } else if (R.id.lossDeviceBtn == id) {
-            lossDevice();
+            new MaterialDialog.Builder(ct)
+                    .title(R.string.app_dialog_title)
+                    .content("确定盘亏？")
+                    .positiveText(MyApplication.getInstance().getString(R.string.app_dialog_ok))
+                    .autoDismiss(false)
+                    .callback(new MaterialDialog.ButtonCallback() {
+                        @Override
+                        public void onPositive(MaterialDialog dialog) {
+                            dialog.dismiss();
+                            lossDevice();
+                        }
+
+                        @Override
+                        public void onNegative(MaterialDialog dialog) {
+                            dialog.dismiss();
+                        }
+                    }).show();
         }
     }