提交类型 修改bug

1.处理一元捐数据量打影响速度的问题
2.处理设备管理有个字段没有显示出来的问题

ip地址为私有ip

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskActivity.java

@@ -910,7 +910,7 @@ public class TaskActivity extends BaseActivity implements OnClickListener {
                     if (type == 0 || real_List.get(mPosition).getMainname().equals("待确认")) {
                         if (doneList == null)
                             doneList = new ArrayList<>();
-                        real_List.get(mPosition).setMainname(getString(R.string.done));
+                        real_List.get(mPosition).setMainname(getString(R.string.confirmed));
                         doneList.add(0, real_List.get(mPosition));
                         real_List.remove(mPosition);
                         adapter.notifyDataSetChanged();

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu Dec 28 15:30:37 CST 2017
-debugName=304
+#Fri Dec 29 17:36:18 CST 2017
+debugName=318
 versionName=613
-debugCode=304
+debugCode=318
 versionCode=152

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

@@ -20,6 +20,7 @@
         android:imeOptions="actionSearch"
         android:lines="1"
         android:maxLines="1"
+        android:drawablePadding="0dp"
         android:paddingRight="26dp"
         android:singleLine="true"
         android:textColor="@color/dark_grey"
@@ -32,7 +33,7 @@
         android:layout_height="20dp"
         android:layout_alignParentRight="true"
         android:layout_alignRight="@+id/search_edit"
-        android:layout_marginRight="25dp"
+        android:layout_marginRight="@dimen/padding"
         android:layout_marginTop="8dp"
         android:background="@drawable/btn_yuyin_nor"
         android:visibility="visible" />

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

@@ -85,7 +85,7 @@ public class SelectNetAcitivty extends OABaseActivity {
         mEmptyLayout.setShowLoadingButton(false);
         mEmptyLayout.setShowEmptyButton(false);
         mEmptyLayout.setShowErrorButton(false);
-        mEmptyLayout.setEmptyMessage("请输入条件查询");
+        mEmptyLayout.setEmptyMessage("没有符合条件的数据");
         voiceSearchView.addTextChangedListener(new EditChangeListener() {
             @Override
             public void afterTextChanged(Editable editable) {
@@ -188,6 +188,7 @@ public class SelectNetAcitivty extends OABaseActivity {
         String fieldKeyLike = null;
         for (int i = 0; i < dbfinds.size(); i++) {
             config = dbfinds.getJSONObject(i);
+            LogUtil.i("config="+config.toJSONString());
             String dbGridField = JSONUtil.getText(config, "dbGridField", "ds_dbfindfield");
             String field = JSONUtil.getText(config, "field", "ds_gridfield");
             if (!StringUtil.isEmpty(dbGridField) && !StringUtil.isEmpty(field)) {
@@ -197,6 +198,7 @@ public class SelectNetAcitivty extends OABaseActivity {
                 configMap.put(dbGridField, field);
             }
         }
+        LogUtil.i("configMap="+JSON.toJSONString(configMap));
         JSONObject o = null;
         Bean b = null;
         List<Bean> models = new ArrayList<>();
@@ -206,15 +208,16 @@ public class SelectNetAcitivty extends OABaseActivity {
             b = new Bean();
             b.name = JSONUtil.getText(o, fieldKeyLike);
 
+            jsonMap = new LinkedHashMap<>();
+            for (Map.Entry<String, String> e : configMap.entrySet()) {
+                LogUtil.i("ek="+e.getKey()+" ev="+e.getValue());
+                jsonMap.put(e.getValue(), JSONUtil.getText(o, e.getKey()));
+            }
             //TODO 修改显示
             try {
-                b.showName = getShowName(o);
+                b.showName = getShowName(jsonMap);
             } catch (Exception e) {
 
-            }
-            jsonMap = new HashMap<>();
-            for (Map.Entry<String, String> e : configMap.entrySet()) {
-                jsonMap.put(e.getValue(), JSONUtil.getText(o, e.getKey()));
             }
             b.json = JSONUtil.map2JSON(jsonMap);
             if (!StringUtil.isEmpty(b.name))
@@ -249,9 +252,9 @@ public class SelectNetAcitivty extends OABaseActivity {
         }
     }
 
-    private String getShowName(JSONObject object) throws Exception {
+    private String getShowName(Map<String, String> object) throws Exception {
         StringBuilder builder = new StringBuilder();
-        for (Map.Entry<String, Object> e : object.entrySet()) {
+        for (Map.Entry<String, String> e : object.entrySet()) {
             builder.append(e.getValue() + ",");
         }
         StringUtil.removieLast(builder);

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

@@ -174,6 +174,11 @@ public class DeviceCycleCountAddActivity extends BaseActivity implements View.On
                         setResult(0x12);
                         ToastUtil.showToast(ct, "添加成功");
                         finish();
+                    } else {
+                        String exceptionInfo = JSONUtil.getText(o.toString(), "exceptionInfo");
+                        if (!StringUtil.isEmpty(exceptionInfo)) {
+                            ToastUtil.showToast(ct, exceptionInfo);
+                        }
                     }
                     isSubmitl = false;
 
@@ -266,7 +271,7 @@ public class DeviceCycleCountAddActivity extends BaseActivity implements View.On
                 holder.valuesEd.setTag(model);
                 holder.valuesEd.setOnClickListener(onClickListener);
                 holder.valuesEd.setCompoundDrawablesWithIntrinsicBounds(null, null, drawable, null);
-                hint = model.isAllowblank() ? R.string.common_select_not_must:  R.string.common_select ;
+                hint = model.isAllowblank() ? R.string.common_select_not_must : R.string.common_select;
             } else {
                 holder.valuesEd.setFocusableInTouchMode(true);
                 holder.valuesEd.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null);

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

@@ -141,20 +141,20 @@ public class DeviceCycleCountDetailsActivity extends BaseActivity {
             if (caption.equals("ID")) {
                 cycleCount.setId(values);
             }
-            if (width < 100 && columns.size() > (i + 1) && JSONUtil.getInt(columns.getJSONObject(i + 1), "width") < 100) {
-                //有两个
-                JSONObject item2 = columns.getJSONObject(i + 1);
-                String field2 = JSONUtil.getText(item2, "dataIndex", "field");
-                String caption2 = JSONUtil.getText(item2, "caption");
-                String values2 = JSONUtil.getText(data, field2);
-                o.setCaption2(caption2);
-                o.setValues2(values2);
-                o.setHasTwo(true);
-                if (caption.equals("ID")) {
-                    cycleCount.setId(values);
-                }
-                i++;
-            }
+//            if (width < 100 && columns.size() > (i + 1) && JSONUtil.getInt(columns.getJSONObject(i + 1), "width") < 100) {
+//                //有两个
+//                JSONObject item2 = columns.getJSONObject(i + 1);
+//                String field2 = JSONUtil.getText(item2, "dataIndex", "field");
+//                String caption2 = JSONUtil.getText(item2, "caption");
+//                String values2 = JSONUtil.getText(data, field2);
+//                o.setCaption2(caption2);
+//                o.setValues2(values2);
+//                o.setHasTwo(true);
+//                if (caption.equals("ID")) {
+//                    cycleCount.setId(values);
+//                }
+//                i++;
+//            }
             if (width > 0) {
                 cycleCount.addData(o);
             }

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

@@ -970,6 +970,10 @@ public class DeviceDataFormAddActivity extends BaseActivity implements View.OnCl
                     editText.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View v) {
+                            if(!NetUtils.isNetWorkConnected(ct)){
+                                ToastUtil.showToast(ct,R.string.networks_out);
+                                return;
+                            }
                             if (data.getType().equals("D")) {
                                 boolean hasMenu = false;
                                 if ("Ask4Leave".equals(caller)) hasMenu = true;
@@ -1193,7 +1197,7 @@ public class DeviceDataFormAddActivity extends BaseActivity implements View.OnCl
      * @author：Arison on 2017/2/13
      */
     private void showDateDialog(Context ct, final EditText tv, final Data field) {
-        DateTimePicker picker = new DateTimePicker((Activity) ct, DateTimePicker.HOUR_OF_DAY);
+        DateTimePicker picker = new DateTimePicker((Activity) ct, DateTimePicker.YEAR_MONTH_DAY);
         picker.setRange(2000, 2030);
         if (!StringUtil.isEmpty(field.getValue())) {
             //记住时间
@@ -1215,7 +1219,7 @@ public class DeviceDataFormAddActivity extends BaseActivity implements View.OnCl
         picker.setOnDateTimePickListener(new DateTimePicker.OnYearMonthDayTimePickListener() {
             @Override
             public void onDateTimePicked(String year, String month, String day, String hour, String minute) {
-                tv.setText(year + "-" + month + "-" + day + " " + hour + ":" + minute + ":00");
+                tv.setText(year + "-" + month + "-" + day + " " + "00" + ":" + "00" + ":00");
                 if (caller.equals("Workovertime")) {//加班单
                     if (d_startDate.equals(field.getField())) {
                         d_startDate_v = tv.getText().toString();

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

@@ -39,6 +39,8 @@ import com.uas.appworks.CRM.erp.model.DeviceInfo;
 import com.uas.appworks.R;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 
@@ -242,8 +244,14 @@ public class ScanDetailActivity extends BaseActivity implements View.OnClickList
         finish();
     }
 
+    private Comparator<Sort> comparator=new Comparator<Sort>() {
+        @Override
+        public int compare(Sort o1, Sort o2) {
+            return o1.sort-o2.sort;
+        }
+    };
     private void handleData(String message) throws Exception {
-        LogUtil.prinlnLongMsg("gongpengming","message="+message);
+        LogUtil.prinlnLongMsg("gongpengming", "message=" + message);
         JSONObject json = JSON.parseObject(message);
         boolean success = JSONUtil.getBoolean(json, "success");
         JSONObject object = JSONUtil.getJSONObject(json, "data");
@@ -262,9 +270,15 @@ public class ScanDetailActivity extends BaseActivity implements View.OnClickList
             //设备履历数据
             JSONArray grid2Item = JSONUtil.getJSONArray(object, "grid2Item");
             JSONArray grid2Data = JSONUtil.getJSONArray(object, "grid2Data");
-            List<DeviceInfo> historyListData = new ArrayList<>();
+            List<Sort> sorts = new ArrayList<>();
             for (int i = 0; i < grid2Data.size(); i++) {
-                historyListData.addAll(handleFromGrid(false, "设备履历" + (i + 1), grid2Item, grid2Data.getJSONObject(i)));
+                JSONObject o = grid2Data.getJSONObject(i);
+                sorts.add(new Sort(JSONUtil.getInt(o, "DC_ID"), o));
+            }
+            Collections.sort(sorts,comparator);
+            List<DeviceInfo> historyListData = new ArrayList<>();
+            for (int i = 0; i < sorts.size(); i++) {
+                historyListData.addAll(handleFromGrid(false, "设备履历" + (i + 1), grid2Item, sorts.get(i).object));
             }
             setData2Adapter(formListData, moreListData, historyListData);
         } else {
@@ -315,12 +329,13 @@ public class ScanDetailActivity extends BaseActivity implements View.OnClickList
             String field = JSONUtil.getText(item, "field", "dataIndex");
             String caption = JSONUtil.getText(item, "caption");
             String type = JSONUtil.getText(item, "type");
-            String values =getValues(type,JSONUtil.getText(data, field,field.toUpperCase())) ;
+            String values = getValues(type, JSONUtil.getText(data, field, field.toUpperCase()));
             if (isFrom && caption.equals("ID")) {
                 id = values;
             }
             deviceInfos.add(new DeviceInfo(isFrom, i == 0 ? title : null, caption, field, values));
         }
+
         return deviceInfos;
     }
 
@@ -338,11 +353,14 @@ public class ScanDetailActivity extends BaseActivity implements View.OnClickList
                 case "LOSSED":
                     return "已盘亏";
             }
-        }else if ("datefield".equals(type) ){
-            try{
-                long time=Long.valueOf(values);
-                return DateFormatUtil.long2Str(time,DateFormatUtil.YMD);
-            }catch (Exception e){
+        } else if ("datefield".equals(type)) {
+            try {
+                long time = Long.valueOf(values);
+                return DateFormatUtil.long2Str(time, DateFormatUtil.YMD);
+            } catch (Exception e) {
+                if (values.length() > 8) {
+                    values = values.substring(0, values.length() - 8);
+                }
 
             }
         }
@@ -402,4 +420,15 @@ public class ScanDetailActivity extends BaseActivity implements View.OnClickList
             }
         }
     }
+
+
+    private class Sort {
+        int sort;
+        JSONObject object;
+
+        public Sort(int sort, JSONObject object) {
+            this.sort = sort;
+            this.object = object;
+        }
+    }
 }

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/fragment/ActivityFragment.java

@@ -151,12 +151,9 @@ public class ActivityFragment extends EasyFragment implements View.OnClickListen
     }
 
     private void loadData(String keyWork, final String status) {
-        LogUtil.prinlnLongMsg("gongpengming", "time0=" + System.currentTimeMillis() / 1000);
         String activitys = PreferenceUtils.getString("activitys");
-        LogUtil.prinlnLongMsg("gongpengming", "time=" + System.currentTimeMillis() / 1000);
-
         try {
-            handlerData(activitys, "全部");
+            handlerData(false, activitys, "全部");
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -174,7 +171,7 @@ public class ActivityFragment extends EasyFragment implements View.OnClickListen
                 public void onResponse(Object o) {
                     try {
                         if (o != null) {
-                            handlerData(o.toString(), status);
+                            handlerData(true, o.toString(), status);
                         }
                     } catch (Exception e) {
                         if (e != null) {
@@ -197,11 +194,64 @@ public class ActivityFragment extends EasyFragment implements View.OnClickListen
 
 
     private void handlerDataThread(String message, String status) throws Exception {
+        if (JSONUtil.validateJSONObject(message)) {
+            JSONObject object = JSON.parseObject(message);
+            JSONArray array = JSONUtil.getJSONArray(object, "activityList");
+            for (int i = 0; i < array.size(); i++) {
+                JSONObject o = array.getJSONObject(i);
+                CharitActModel e = new CharitActModel();
+                e.setActImg(JSONUtil.getText(o, "actImg"));
+                e.setId(JSONUtil.getInt(o, "id"));
+                e.setName(JSONUtil.getText(o, "name"));
+                e.setStage(JSONUtil.getText(o, "stage"));
+                JSONArray awards = JSONUtil.getJSONArray(o, "awards");
+                StringBuilder builder = new StringBuilder();
+                for (int j = 0; j < awards.size(); j++) {
+                    String awardLevel = JSONUtil.getText(awards.getJSONObject(j), "awardLevel");
+                    String awardName = JSONUtil.getText(awards.getJSONObject(j), "awardName");
+                    builder.append(awardLevel + ":" + awardName + "\n");
+                }
+                e.setSubTitle(builder.toString());
+                allModels.add(e);
+            }
+            setAdapter(status, allModels);
+            selectStage.clear();
+            boolean have;
+            selectStage.add("全部");
+            for (CharitActModel e : allModels) {
+                have = false;
+                for (String b : selectStage) {
+                    if (b.equals(e.getStage())) {
+                        have = true;
+                        break;
+                    }
+                }
+                if (!have) {
+                    selectStage.add(e.getStage());
+                }
+            }
+        } else {
+            allModels = new ArrayList<>();
+            setAdapter(status, allModels);
+        }
+        PreferenceUtils.putString("activitys", JSON.toJSONString(allModels));
+    }
+
+    private void handlerDataThread2(String message, String status) throws Exception {
         if (JSONUtil.validateJSONObject(message)) {
             LogUtil.prinlnLongMsg("gongpengming", "time1=" + DateFormatUtil.long2Str("HH:mm:ss"));
             JSONObject object = JSON.parseObject(message);
             JSONArray array = JSONUtil.getJSONArray(object, "activityList");
-            allModels = JSON.parseArray(array.toString(), CharitActModel.class);
+            for (int i = 0; i < array.size(); i++) {
+                JSONObject o = array.getJSONObject(i);
+                CharitActModel e = new CharitActModel();
+                e.setActImg(JSONUtil.getText(o, "actImg"));
+                e.setId(JSONUtil.getInt(o, "id"));
+                e.setName(JSONUtil.getText(o, "name"));
+                e.setStage(JSONUtil.getText(o, "stage"));
+                e.setSubTitle(JSONUtil.getText(o, "subTitle"));
+                allModels.add(e);
+            }
             LogUtil.prinlnLongMsg("gongpengming", "time2=" + DateFormatUtil.long2Str("HH:mm:ss"));
             setAdapter(status, allModels);
             selectStage.clear();
@@ -225,12 +275,16 @@ public class ActivityFragment extends EasyFragment implements View.OnClickListen
         }
     }
 
-    private void handlerData(final String message, final String status) throws Exception {
+    private void handlerData(final boolean isNet, final String message, final String status) throws Exception {
         ThreadPool.getThreadPool().addTask(new Runnable() {
             @Override
             public void run() {
                 try {
-                    handlerDataThread(message, status);
+                    if (isNet) {
+                        handlerDataThread(message, status);
+                    } else {
+                        handlerDataThread2(message, status);
+                    }
                 } catch (Exception e) {
                     e.printStackTrace();
                 }

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/fragment/CharitableListFragment.java

@@ -200,7 +200,7 @@ public class CharitableListFragment extends EasyFragment implements OnPlayListen
             } else {
                 showTop = totality.substring(0, totality.length());
             }
-            int textSize = DisplayUtil.sp2px(ct, 6);
+            int textSize = DisplayUtil.sp2px(ct, 7);
             moneyAmountLL.removeAllViews();//清空布局
             for (int i = 0; i < showTop.length(); i++) {
                 char c = showTop.charAt(i);

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/model/CharitActModel.java

@@ -9,14 +9,19 @@ import java.util.List;
 public class CharitActModel {
 
 	private String actImg;
-	private String code;
-	private String endTime;
 	private int id;
 	private String name;
 	private String stage;
-	private String startTime;
+	private String subTitle;
 	private List<AwardsBean> awards;
 
+	public String getSubTitle() {
+		return subTitle;
+	}
+
+	public void setSubTitle(String subTitle) {
+		this.subTitle = subTitle;
+	}
 
 	public String getActImg() {
 		return actImg;
@@ -26,21 +31,6 @@ public class CharitActModel {
 		this.actImg = actImg;
 	}
 
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public String getEndTime() {
-		return endTime;
-	}
-
-	public void setEndTime(String endTime) {
-		this.endTime = endTime;
-	}
 
 	public int getId() {
 		return id;
@@ -68,13 +58,7 @@ public class CharitActModel {
 		this.stage = stage;
 	}
 
-	public String getStartTime() {
-		return startTime;
-	}
 
-	public void setStartTime(String startTime) {
-		this.startTime = startTime;
-	}
 
 	public List<AwardsBean> getAwards() {
 		return awards;

app_modular/appworks/src/main/res/drawable/text_frame_hint_bg.xml

@@ -4,7 +4,7 @@
         <shape>
             <solid android:color="@color/black_gray" />
             <stroke android:width="@dimen/line" android:color="@color/item_line" />
-            <padding android:bottom="2dp" android:left="3dp" android:right="3dp" android:top="2dp" />
+            <padding android:bottom="1dp" android:left="3dp" android:right="3dp" android:top="1dp" />
         </shape>
     </item>
 </selector>

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

@@ -14,7 +14,8 @@
 
         <TextView
             android:id="@+id/caption1Tv"
-            android:layout_width="60dp"
+            android:layout_width="0dp"
+            android:layout_weight="1"
             android:layout_height="wrap_content"
             android:paddingLeft="@dimen/padding"
             android:text="标题"
@@ -23,8 +24,9 @@
 
         <TextView
             android:id="@+id/values1Tv"
-            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_width="0dp"
+            android:layout_weight="2"
             android:layout_toRightOf="@id/caption1Tv"
             android:paddingLeft="@dimen/padding"
             android:text="标题"
@@ -40,7 +42,8 @@
 
         <TextView
             android:id="@+id/caption2Tv"
-            android:layout_width="60dp"
+            android:layout_width="0dp"
+            android:layout_weight="1"
             android:layout_height="wrap_content"
             android:paddingLeft="@dimen/padding"
             android:text="标题"
@@ -49,8 +52,9 @@
 
         <TextView
             android:id="@+id/values2Tv"
-            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_width="0dp"
+            android:layout_weight="2"
             android:layout_toRightOf="@id/caption2Tv"
             android:paddingLeft="@dimen/padding"
             android:text="标题"

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

@@ -76,7 +76,6 @@
             android:layout_weight="1"
             android:background="@drawable/pop_text_frame_bg"
             android:button="@null"
-            android:checked="true"
             android:gravity="center"
             android:paddingBottom="4dp"
             android:paddingTop="4dp"
@@ -92,7 +91,6 @@
             android:layout_weight="1"
             android:background="@drawable/pop_text_frame_bg"
             android:button="@null"
-            android:checked="true"
             android:gravity="center"
             android:paddingBottom="4dp"
             android:paddingTop="4dp"
@@ -108,7 +106,6 @@
             android:layout_weight="1"
             android:background="@drawable/pop_text_frame_bg"
             android:button="@null"
-            android:checked="true"
             android:gravity="center"
             android:paddingBottom="4dp"
             android:paddingTop="4dp"