设备管理

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/WebViewCommActivity.java

@@ -94,7 +94,7 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
     private String mSubsAct;
     private int mPosition;
 
-    private String mSubsurl;
+    private String mSubsurl, mWhichPage;
     private TextView mPreTv;
     private TextView mNextTv;
     private List<Object> mReadSubs;
@@ -156,6 +156,7 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
         pb.setMax(100);
         url = intent.getStringExtra("url");
         mSubsurl = intent.getStringExtra("url");
+        mWhichPage = intent.getStringExtra("whichPage");
         isCookie = intent.getBooleanExtra("cookie", false);
         String msg_title = intent.getStringExtra("title");
         if (!StringUtil.isEmpty(msg_title)) {
@@ -555,7 +556,9 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_about, menu);
+        if (!"real_time".equals(mWhichPage)) {
+            getMenuInflater().inflate(R.menu.menu_about, menu);
+        }
         return true;
     }
 

app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -109,7 +109,7 @@ public class CommonUtil {
 //        if (BaseConfig.isDebug()){
 //            baseUrl="http://117.25.180.218:8090/zz_test/";
 //        }
-//        baseUrl = "http://117.25.180.218:8090/zz_test/";
+        baseUrl = "http://117.25.180.218:8090/zz_test/";
 //        baseUrl = "http://10.1.80.180:8080/uas_war_exploded/";
 //        baseUrl = "http://10.1.80.111:8080/uas/";
         return baseUrl;

app_modular/apputils/src/main/java/com/modular/apputils/activity/BillInputActivity.java

@@ -272,9 +272,6 @@ public class BillInputActivity extends OABaseActivity implements IBill, BillAdap
                                 mBillAdapter.switchTabData(tabPosition);
                                 mBillAdapter.notifyDataSetChanged();
                                 mRecyclerView.scrollToPosition(mBillAdapter.mTabIndex);
-//                                WrapContentLinearLayoutManager mLayoutManager =
-//                                        (WrapContentLinearLayoutManager) mRecyclerView.getLayoutManager();
-//                                mLayoutManager.scrollToPositionWithOffset(mBillAdapter.mTabIndex, 0);
                             }
                         }
 

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

@@ -116,7 +116,7 @@ public class DeviceBillInputActivity extends BillInputActivity {
     }
 
     private void selectDf(int position, BillGroupModel.BillModel model, Bundle extras, String condition) {
-        if ("DF".equals(model.getType())) {
+        if ("DF".equals(model.getType()) || "SF".equals(model.getType())) {
             findBydbFind(model, condition, extras);
         } else {
             super.toSelect(position, model);

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

@@ -1808,6 +1808,7 @@ public class DeviceDataFormAddActivity extends SupportToolBarActivity implements
         params.put("caller", caller);
         params.put("formStore", formStore);
         params.put("gridStore", gridStore);
+        params.put("id", formid);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, Constants.HTTP_SUCCESS_INIT, null, null, "post");
@@ -2013,6 +2014,7 @@ public class DeviceDataFormAddActivity extends SupportToolBarActivity implements
         String url = CommonUtil.getAppBaseUrl(ct) + "mobile/device/updateAndSubmitDeviceChange.action";
         Map<String, Object> params = new HashMap<>();
         params.put("caller", caller);
+        params.put("id", formid);
         params.put("formStore", formStore);
         if (!"[]".equals(gridStore)) {
             params.put("gridStore", gridStore);

app_modular/appworks/src/main/java/com/uas/appworks/activity/RealTimeFormActivity.java

@@ -67,6 +67,7 @@ public class RealTimeFormActivity extends BaseActivity {
                 Intent intent = new Intent("com.modular.main.WebViewCommActivity");
                 intent.putExtra("url", url);
                 intent.putExtra("title", title);
+                intent.putExtra("whichPage", "real_time");
                 intent.putExtra("ORIENTATION_PORTRAIT", false);
                 intent.putExtra("cookie", true);
                 startActivity(intent);

app_modular/appworks/src/main/java/com/uas/appworks/adapter/DeviceBillInputAdapter.java

@@ -19,7 +19,18 @@ public class DeviceBillInputAdapter extends BillAdapter {
         if ("dd_source".equals(model.getField())) {
             //针对dd_source特殊处理，如果有值，则展示【是】，没值则展示否
             String value = model.getValue();
-            if (TextUtils.isEmpty(value)) {
+            int source = 0;
+            try {
+                source = Integer.parseInt(value);
+            } catch (Exception e) {
+                if (!TextUtils.isEmpty(value) && !"0".equals(value)) {
+                    source = 1;
+                } else {
+                    source = 0;
+                }
+                e.printStackTrace();
+            }
+            if (source <= 0) {
                 mInputViewHolder.valuesEd.setText("否");
             } else {
                 mInputViewHolder.valuesEd.setText("是");