提交类型 修改需求

提交内容   修改设备管理部分，添加一个字段

app_core/common/src/main/java/com/common/ui/SoftInputLinearLayout.java

@@ -0,0 +1,42 @@
+package com.common.ui;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.os.Build;
+import android.util.AttributeSet;
+import android.view.WindowInsets;
+import android.widget.LinearLayout;
+
+public class SoftInputLinearLayout extends LinearLayout {
+    public SoftInputLinearLayout(Context context) {
+        super(context);
+    }
+
+    public SoftInputLinearLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+
+    public SoftInputLinearLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    protected boolean fitSystemWindows(Rect insets) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT_WATCH) {
+            insets.left = 0;
+            insets.top = 0;
+            insets.right = 0;
+        }
+        return super.fitSystemWindows(insets);
+    }
+
+    @Override
+    public WindowInsets onApplyWindowInsets(WindowInsets insets) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT_WATCH) {
+            return super.onApplyWindowInsets(insets.replaceSystemWindowInsets(0, 0, 0, insets.getSystemWindowInsetBottom()));
+        } else {
+            return insets;
+        }
+    }
+}

app_core/common/src/main/java/com/core/base/BaseToolBarActivity.java

@@ -18,7 +18,6 @@ import android.view.WindowManager;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
-import com.common.LogUtil;
 import com.core.app.R;
 import com.core.utils.CommonUtil;
 import com.core.utils.StatusBarUtil;
@@ -93,9 +92,7 @@ public class BaseToolBarActivity extends AppCompatActivity {
     }
 
     public void initCommonToolbar() {
-        LogUtil.i("gong", "initCommonToolbar");
         if (commonToolBar != null) {
-            LogUtil.i("gong", "commonToolBar != null");
             StatusBarUtil.immersive(this, 0x00000000, 0.0f);
             setSupportActionBar(commonToolBar);
             getSupportActionBar().setDisplayShowTitleEnabled(false);

app_core/common/src/main/res/layout/base_bar_layout.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<com.common.ui.SoftInputLinearLayout
         android:id="@+id/windowLl"
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
@@ -16,4 +16,4 @@
             android:layout_height="match_parent"
             android:layout_below="@+id/toolbarVs"
             android:orientation="horizontal" />
-</LinearLayout>
+</com.common.ui.SoftInputLinearLayout>

app_modular/appmessages/src/main/AndroidManifest.xml

@@ -59,7 +59,8 @@
             android:theme="@style/MainBaseTheme" />
         <activity
             android:name=".activity.ApprovalActivity"
-            android:theme="@style/MainBaseTheme" />
+            android:theme="@style/MainBaseTheme"
+            android:windowSoftInputMode="adjustPan"/>
         <activity
             android:name=".activity.Subscription2Activity"
             android:label="@string/subscribe_title" />

app_modular/appmessages/src/main/java/com/modular/appmessages/activity/ApprovalActivity.java

@@ -12,7 +12,6 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
@@ -187,8 +186,8 @@ public class ApprovalActivity extends BaseActivity implements IApproval, Approva
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN |
-                WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
+//        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN |
+//                WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
         setContentView(R.layout.activity_approval);
         initView();
     }
@@ -558,6 +557,7 @@ public class ApprovalActivity extends BaseActivity implements IApproval, Approva
 
     @Override
     public void showToast(String message) {
+        LogUtil.i("gong","message="+message);
         super.showToast(message);
     }
 

app_modular/appmessages/src/main/java/com/modular/appmessages/presenter/ApprovaPresenter.java

@@ -193,7 +193,7 @@ public class ApprovaPresenter implements OnHttpResultListener {
     /**
      * start 提交部分
      */
-        /*变更处理人 submiting*/
+    /*变更处理人 submiting*/
     public void updateAssignee(String emCode, String nodeLog) {
         if (StringUtil.isEmpty(nodeLog)) {
             iApproval.showToast(R.string.approval_opinion_error, R.color.load_submit);
@@ -287,6 +287,9 @@ public class ApprovaPresenter implements OnHttpResultListener {
     /*同意 submiting end loadProcessUpdate*/
     private void agree(String nodeLog) {
         LogUtil.i("agree");
+        if (1 == 1) {
+            return;
+        }
         iApproval.showLoading();
         String points = StringUtil.getMessage(chchePoints);
         points.replaceAll("@", "").replaceAll("\\@", "").replaceAll("\\\\@", "");
@@ -1146,13 +1149,13 @@ public class ApprovaPresenter implements OnHttpResultListener {
                  */
                 for (int i = 0; i < approvals.size(); i++) {
                     Approval a = approvals.get(i);
-                    LogUtil.i("a.getIdKey()="+a.getIdKey());
+                    LogUtil.i("a.getIdKey()=" + a.getIdKey());
                     if (!a.getIdKey().startsWith("已审批")
                             && !a.getIdKey().startsWith("未通过")
                             && !a.getIdKey().startsWith("不同意")
                             && !a.getIdKey().startsWith("已结束")) {
                         hanNotApproval = true;
-                        if (a.getIdKey().startsWith("待审批")){
+                        if (a.getIdKey().startsWith("待审批")) {
                             a.setValues("");
                         }
                     } else if (a.getIdKey().startsWith("未通过") && i == 0) {
@@ -1292,14 +1295,14 @@ public class ApprovaPresenter implements OnHttpResultListener {
                 if (a.getValuesKey().equals(record.nodeName)) {
                     hanEnd = true;
                 }
-                LogUtil.i("gong","name="+name);
-                LogUtil.i("gong","a.getValuesKey()="+a.getValuesKey());
+                LogUtil.i("gong", "name=" + name);
+                LogUtil.i("gong", "a.getValuesKey()=" + a.getValuesKey());
                 if (name.equals(a.getValuesKey())) {//为当前结点
-                    LogUtil.i("gong","为当前结点="+nodeDealName);
+                    LogUtil.i("gong", "为当前结点=" + nodeDealName);
                     if (!isLog) {
                         a.setDfType(nodeDealCode);
                         a.setCaption(nodeDealName);
-                        a.setIdKey( status);
+                        a.setIdKey(status);
                     } else {
                         if (launchTime > 0) {
                             a.setValues(DateFormatUtil.long2Str(launchTime, "MM-dd"));
@@ -1307,7 +1310,7 @@ public class ApprovaPresenter implements OnHttpResultListener {
                         }
                         if (a.isDftypeEQ(nodeDealCode)) {
                             if (status.equals("不同意")) {
-                                a.setIdKey( "未通过");
+                                a.setIdKey("未通过");
                             } else if (status.equals("同意")) {
                                 a.setIdKey("已审批");
                             }
@@ -1551,14 +1554,18 @@ public class ApprovaPresenter implements OnHttpResultListener {
                 }
             }
             Map<String, Object> formstore = putItem2Params(true, mainList);
-            if (formstore == null)
+            if (formstore == null) {
                 return false;
+            }
             formStore.putAll(formstore);
 
             for (List<Approval> details : detailList) {
                 Map<String, Object> param = putItem2Params(false, details);
-                if (param == null || param.isEmpty() || param.keySet().size() <= 1)
+                if (param == null || param.isEmpty() || param.keySet().size() <= 1) {
+//                    iApproval.showToast("明细行邮必填字段未填写");
+//                    return false;
                     continue;
+                }
                 params.add(param);
             }
         }
@@ -1575,12 +1582,6 @@ public class ApprovaPresenter implements OnHttpResultListener {
                         iApproval.showToast(message);
                     }
                     return null;
-                } else if (StringUtil.isEmpty(approval.getValues())) {
-                    String message = StringUtil.getMessage(R.string.must_input_key) + " " + approval.getCaption() + " " + StringUtil.getMessage(R.string.limit_unno_zijie);
-                    if (showTocat) {
-                        iApproval.showToast(message);
-                    }
-                    return null;
                 } else {
                     if (approval.getValues().equals(Approval.VALUES_UNKNOWN)) {
                         formstore.put(approval.getValuesKey(), "1");//添加特殊字符判断
@@ -1617,7 +1618,7 @@ public class ApprovaPresenter implements OnHttpResultListener {
         approvals.addAll(enclosureList);
         approvals.addAll(pointsList);
         approvals.addAll(nodeList);
-        LogUtil.i("gong","setData2ListThread="+approvals.size());
+        LogUtil.i("gong", "setData2ListThread=" + approvals.size());
 
         OAHttpHelper.getInstance().post(new Runnable() {
             @Override

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

@@ -176,6 +176,7 @@ public class DeviceMatchActivity extends BaseNetActivity implements View.OnClick
                 matche.setName(JSONUtil.getText(object, "DE_NAME"));
                 matche.setExistqty(JSONUtil.getText(object, "EXISTQTY"));
                 matche.setLackqty(JSONUtil.getText(object, "LACKQTY"));
+                matche.setNeedqty(JSONUtil.getText(object, "NEEDQTY"));
                 matches.add(matche);
             }
         }
@@ -219,6 +220,7 @@ public class DeviceMatchActivity extends BaseNetActivity implements View.OnClick
             holder.nameTv.setText(match.getName());
             holder.existqtyTv.setText(match.getExistqty());
             holder.lackqtyTv.setText(match.getLackqty());
+            holder.needqtyTv.setText(match.getNeedqty());
         }
 
         @Override
@@ -232,6 +234,7 @@ public class DeviceMatchActivity extends BaseNetActivity implements View.OnClick
             private TextView nameTv;
             private TextView existqtyTv;
             private TextView lackqtyTv;
+            private TextView needqtyTv;
 
             public ViewHolder(View itemView) {
                 super(itemView);
@@ -239,6 +242,7 @@ public class DeviceMatchActivity extends BaseNetActivity implements View.OnClick
                 nameTv = itemView.findViewById(R.id.nameTv);
                 existqtyTv = itemView.findViewById(R.id.existqtyTv);
                 lackqtyTv = itemView.findViewById(R.id.lackqtyTv);
+                needqtyTv = itemView.findViewById(R.id.needqtyTv);
             }
         }
     }

app_modular/appworks/src/main/java/com/uas/appworks/model/DeviceMatch.java

@@ -5,8 +5,17 @@ package com.uas.appworks.model;
  */
 
 public class DeviceMatch {
-    //机型、机型设备列表名称、现有匹配设备数量、欠缺设备数量
-    private String code, name, existqty, lackqty,spec;
+    //机型、机型设备列表名称、现有匹配设备数量、欠缺设备数量,需求数量
+    private String code, name, existqty, lackqty,spec,needqty;
+
+
+    public String getNeedqty() {
+        return needqty;
+    }
+
+    public void setNeedqty(String needqty) {
+        this.needqty = needqty;
+    }
 
     public String getSpec() {
         return spec==null?"":spec;

app_modular/appworks/src/main/res/layout/item_device_match.xml

@@ -53,6 +53,7 @@
 
 
     <LinearLayout
+        android:id="@+id/existqtyLL"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/specTag"
@@ -109,5 +110,27 @@
             android:paddingLeft="10dp"
             android:textSize="14sp" />
     </LinearLayout>
+    <TextView
+        android:id="@+id/needqtyTag"
+        android:layout_width="wrap_content"
+        android:layout_height="36dp"
+        android:layout_below="@id/existqtyLL"
+        android:layout_gravity="left"
+        android:layout_marginRight="10dp"
+        android:ellipsize="end"
+        android:gravity="center_vertical"
+        android:maxLines="2"
+        android:paddingLeft="@dimen/paddingMin"
+        android:text="需求数量"
+        android:textSize="14sp" />
 
+    <TextView
+        android:id="@+id/needqtyTv"
+        android:layout_width="match_parent"
+        android:layout_height="36dp"
+        android:layout_toRightOf="@id/needqtyTag"
+        android:layout_alignTop="@id/needqtyTag"
+        android:gravity="center_vertical"
+        android:paddingLeft="10dp"
+        android:textSize="14sp" />
 </RelativeLayout>