1、通用表单弹出软键盘后跳转页面闪退

2、发布6.7.4版本

WeiChat/version.properties

@@ -1,4 +1,4 @@
-#Mon Apr 29 17:27:50 CST 2019
+#Tue May 07 16:26:40 CST 2019
 debugName=972
 versionName=674
 debugCode=972

app_core/common/src/main/java/com/core/widget/view/selectcalendar/SelectCalendarActivity.java

@@ -442,7 +442,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
                     ToastMessage("请先选择日期,再选择时间段！");
                     return;
                 }
-               
+
 
                 if (swich) {
                     //时间段请假：
@@ -832,7 +832,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
                     if (today.compareTo(tv_time_point.getText().toString()) >= 0){
                         ToastMessage("不能预约过去时间");
                         return;
-                    }                    
+                    }
                     Intent intent = new Intent();
                     intent.putExtra("startDate", tv_time_point.getText().toString());
                     setResult(0x11, intent);
@@ -1148,7 +1148,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
             }else{
                 tv_time_point.setText(currentSelectDate+" "+tv_time_point.getText().toString().substring(11,16));
             }
-           
+
         }
         if (today.compareTo(currentSelectDate) > 0 && (type == 1 || type == 4)) {
             ToastMessage("不能预约过去时间");
@@ -1383,7 +1383,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
                                 try {
                                     parseSBookTimeResult(resu);
                                 } catch (Exception e) {
-                                    
+
                                 }
                             }
                         });

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

@@ -4,8 +4,7 @@
     android:id="@+id/sv_top"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fillViewport="true"
-    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.form.DataFormDetailActivity">
+    android:fillViewport="true">
 
     <LinearLayout
         android:id="@+id/ll_top"

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/form/DataFormDetailActivity.java

@@ -128,12 +128,12 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
 
     private int va_id;//订单ID
     private int formid;//主表ID
-    private final Comparator<Object> mComparator=new Comparator<Object>() {
+    private final Comparator<Object> mComparator = new Comparator<Object>() {
         @Override
         public int compare(Object t0, Object t1) {
-            float detno0=JSONUtil.getFloat((JSONObject) t0,"fd_detno");
-            float detno1=JSONUtil.getFloat((JSONObject) t1,"fd_detno");
-            return detno0>detno1?1:-1;
+            float detno0 = JSONUtil.getFloat((JSONObject) t0, "fd_detno");
+            float detno1 = JSONUtil.getFloat((JSONObject) t1, "fd_detno");
+            return detno0 > detno1 ? 1 : -1;
         }
     };
     private Handler mHandler = new Handler() {
@@ -154,7 +154,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                     if (!ListUtils.isEmpty(mDatasNet)) mDatasNet.clear();
                     if (StringUtil.isEmpty(result)) return;
                     JSONArray forms = JSON.parseObject(result).getJSONObject("data").getJSONArray("formdetail");
-                    Collections.sort(forms,mComparator);
+                    Collections.sort(forms, mComparator);
                     grids = JSON.parseObject(result).getJSONObject("data").getJSONArray("gridetail");
                     try {
                         JSONObject config = JSON.parseObject(result).getJSONObject("config");
@@ -1097,6 +1097,11 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
 
         @Override
         public View getView(final int position, View convertView, ViewGroup parent) {
+            View currentFocus = ((Activity) mContext).getCurrentFocus();
+            if (currentFocus != null) {
+                currentFocus.clearFocus();
+            }
+
             final int itemViewType = getItemViewType(position);
             switch (itemViewType) {
                 case TYPE_CATEGORY_ITEM:
@@ -1157,7 +1162,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                         // model= (ViewModel) convertView.getTag();
                     }
                     final Data data = (Data) getItem(position);
-                    
+
                     HashMap<String, Object> results = isLastItem(position);
                     final Integer categoryIndex = (Integer) results.get("categoryIndex");
                     model.text.setText(data.getName());
@@ -1192,7 +1197,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                 ToastUtil.showToast(ct, R.string.networks_out);
                                 return;
                             }
-                            if (data.getType().equals("D") || data.getType().equals("DT") ) {
+                            if (data.getType().equals("D") || data.getType().equals("DT")) {
                                 boolean hasMenu = false;
                                 if ("Ask4Leave".equals(caller)) hasMenu = true;
                                 Log.d("date:", startDate_v + "," + endDate_v);
@@ -1595,10 +1600,10 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                     sa_custaddress = i + 1;
                                 }
                             }
-                            if (sa_custname>0){
+                            if (sa_custname > 0) {
                                 mAdapter.getmListData().get(currentGroupId).getDatas().get(sa_custname - 1).setValue(cu_name);
                             }
-                            if (sa_custaddress>0){
+                            if (sa_custaddress > 0) {
                                 mAdapter.getmListData().get(currentGroupId).getDatas().get(sa_custaddress - 1).setValue(cu_address);
                             }
                             mAdapter.notifyDataSetChanged();

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/form/FormListSelectActivity.java

@@ -234,7 +234,7 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
 
                     condition = "fp_pleasemancode='" + CommonUtil.getSharedPreferences(ct, "erp_username") + "'";
                 } else if("ProdInOut!Sale".equals(caller)){
-                    condition = "pi_invostatuscode='AUDITED'  and  pi_statuscode='POSTED'";
+                    condition = "pi_invostatuscode='AUDITED' and pi_transport='自提' and pi_signstatus='未签名'";
                 }
                 if (condition != null) {
                     new Thread(new GetSaleData(String.valueOf(cur), "10", condition))
@@ -274,7 +274,7 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
 
                     condition = "fp_pleasemancode='" + CommonUtil.getSharedPreferences(ct, "erp_username") + "'";
                 } else if("ProdInOut!Sale".equals(caller)){
-                    condition = "pi_invostatuscode='AUDITED'  and  pi_statuscode='POSTED'";
+                    condition = "pi_invostatuscode='AUDITED' and pi_transport='自提' and pi_signstatus='未签名'";
                 }
                 if (condition != null) {
                     new Thread(new GetSaleData(String.valueOf(cur), "10", condition))
@@ -451,7 +451,7 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
             } else if ("FeePlease!FYBX".equals(caller)) {
                 condition = "fp_pleasemancode='" + CommonUtil.getSharedPreferences(ct, "erp_username") + "'";
             } else if("ProdInOut!Sale".equals(caller)){
-                condition = "pi_invostatuscode='AUDITED'  and  pi_statuscode='POSTED'";
+                condition = "pi_invostatuscode='AUDITED' and pi_transport='自提' and pi_signstatus='未签名'";
             }
             if (condition != null) {
                 new Thread(new GetSaleData(String.valueOf(cur), "10", condition))

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/form/TravelDataFormDetailActivity.java

@@ -1048,6 +1048,11 @@ public class TravelDataFormDetailActivity extends BaseActivity implements View.O
 
         @Override
         public View getView(final int position, View convertView, ViewGroup parent) {
+            View currentFocus = ((Activity) mContext).getCurrentFocus();
+            if (currentFocus != null) {
+                currentFocus.clearFocus();
+            }
+
             final int itemViewType = getItemViewType(position);
             switch (itemViewType) {
                 case TYPE_CATEGORY_ITEM:

app_modular/appworks/src/main/java/com/uas/appworks/crm3_0/activity/CustomerVisitDetailsActivity.java

@@ -536,7 +536,7 @@ public class CustomerVisitDetailsActivity extends OABaseActivity implements Bill
             latBillModel.setField("mp_latitude");
             latBillModel.setDisplay(address.getLatLng().latitude + "");
             BillGroupModel.BillModel lngBillModel = new BillGroupModel.BillModel();
-            
+
             lngBillModel.setField("mp_longitude");
             lngBillModel.setDisplay(address.getLatLng().longitude + "");