Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into draft

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

@@ -530,6 +530,14 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                       
                     }
                     break;
+                case 0x15:
+                    try {
+                        LogUtil.d("result:" + result);
+                        success = JSON.parseObject(result).getBoolean("success");
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     btn_update.setEnabled(true);
                     click_btn.setEnabled(true);
@@ -770,6 +778,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                 Data gData = new Data();
                 gData.setGroup(mdata.get(i).getName());
                 gData.setGroupId(mdata.get(i).getId());
+                gData.setDetailId(mdata.get(i).getDatas().get(0).getDetailId());
                 datas.add(gData);
                 datas.addAll(mdata.get(i).getDatas());
                 index = index + mdata.get(i).getDatas().size() + 1;
@@ -873,11 +882,13 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
             groupIndex = new ArrayList<>();
             datas = new ArrayList<>();
             int index = 0;
+            LogUtil.d(JSON.toJSONString(mdata));
             for (int i = 0; i < mdata.size(); i++) {
                 groupIndex.add(index);
                 Data gData = new Data();
                 gData.setGroup(mdata.get(i).getName());
                 gData.setGroupId(mdata.get(i).getId());
+                gData.setDetailId(mdata.get(i).getDatas().get(0).getDetailId());
                 datas.add(gData);
                 datas.addAll(mdata.get(i).getDatas());
                 index = index + mdata.get(i).getDatas().size() + 1;
@@ -912,7 +923,6 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                         if (StringUtils.isEmpty(itemValue.getGroup())) {
                             header.setVisibility(View.GONE);
                         } else {
-
                             if (itemValue.getGroup().contains("明细") && !itemValue.getGroup().equals("明细项1")) {
                                 item_add.setVisibility(View.VISIBLE);
                             } else {
@@ -933,7 +943,8 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                     .setPositiveButton("确认", new DialogInterface.OnClickListener() {
                                         @Override
                                         public void onClick(DialogInterface dialog, int which) {
-                                            deleteGridItemData(itemValue.getGroupId());
+                                            LogUtil.d(JSON.toJSONString(itemValue));
+                                            deleteGridItemData(itemValue.getGroupId(), itemValue.getDetailId());
                                             notifyDataSetChanged();
                                         }
                                     }).show();
@@ -1372,6 +1383,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                 }
                
                 break;
+          
         }
 
     }
@@ -1485,7 +1497,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
      * @desc:删除
      * @author：Arison on 2016/11/16
      */
-    public void deleteGridItemData(int groupId) {
+    public void deleteGridItemData(int groupId,String detailId) {
         LogUtil.d("delete group:" + groupId);
         if (!ListUtils.isEmpty(mDatas)) {
             int deteId = 0;
@@ -1502,11 +1514,32 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                 }
 
             }
+            
+            deteItemRequest(detailId);
+            
             mDatas.remove(deteId);
             mAdapter.setmListData(mDatas);
             mAdapter.notifyDataSetChanged();
         }
     }
+    
+    /**
+      * @desc:删除明细项请求
+      * @author：Arison on 2017/2/21
+      */
+    public void deteItemRequest(String id){
+        progressDialog.show();
+        click_btn.setEnabled(false);
+        String url = Constants.getAppBaseUrl(ct) + "common/deleteDetail.action";
+        //caller=MeetingRoom&gridcaller=MeetingRoom&condition=eq_id=16545
+        Map<String, Object> params = new HashMap<>();
+        params.put("caller", caller);
+        params.put("condition",detailkey_id+"="+id);
+        params.put("gridcaller", caller);
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, 0x15, null, null, "post");
+    }
 
     /**
      * @desc:提交操作---数据校验

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

@@ -11,7 +11,6 @@ import android.os.Handler;
 import android.os.Message;
 import android.text.Editable;
 import android.text.TextWatcher;
-import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -91,7 +90,7 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
     private int mPreviousVisibleItem;
 
     private ArrayList<Map<String, Object>> rdata = new ArrayList<Map<String, Object>>();
-    private Map<String, Object> rMap = new HashMap<String, Object>();//@注释：列表数据
+    private Map<String, Object> rMap = new HashMap<String, Object>() ;//@注释：列表数据
 
     private int cur = 1;
     private View.OnClickListener mErrorClickListener = new View.OnClickListener() {
@@ -571,30 +570,30 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
         try {
             result = client.sendPostRequest(Constants.getAppBaseUrl(this)
                     + "mobile/common/list.action", params);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        System.out.println("result:" + result);
-        if (result != null&&rMap!=null) {
-            Map<String, Object> tMap = new HashMap<String, Object>();
-            tMap = FlexJsonUtil.fromJson(result);
-            if (rMap.get("columns") != null) {
-                @SuppressWarnings("unchecked")
-                List<Object> lists = (List<Object>) rMap.get("listdata");
-                List<?> newlist = (List<?>) tMap.get("listdata");
-                if (ListUtils.isEmpty(newlist)) {
-                    cur--;
-                    handler.sendEmptyMessage(2);
+            LogUtil.d(result);
+            if (result != null&&rMap!=null) {
+                Map<String, Object> tMap =  new HashMap<String, Object>();
+                tMap = FlexJsonUtil.fromJson(result);
+                if (rMap.get("columns") != null) {
+                    @SuppressWarnings("unchecked")
+                    List<Object> lists = (List<Object>) rMap.get("listdata");
+                    List<?> newlist = (List<?>) tMap.get("listdata");
+                    if (ListUtils.isEmpty(newlist)) {
+                        cur--;
+                        handler.sendEmptyMessage(2);
+                    } else {
+                        lists.addAll(newlist);
+                    }
+                    rMap.put("listdata", lists);
                 } else {
-                    lists.addAll(newlist);
+                    rMap.putAll(tMap);
                 }
-                rMap.put("listdata", lists);
+                handler.sendEmptyMessage(1);
             } else {
-                rMap.putAll(tMap);
+                handler.sendEmptyMessage(1);
             }
-            handler.sendEmptyMessage(1);
-        } else {
-            handler.sendEmptyMessage(1);
+        } catch (Exception e) {
+            e.printStackTrace();
         }
 
     }
@@ -614,7 +613,7 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
             this.inflater = LayoutInflater.from(ct);
             this.data = data;
             this.dMap = data;
-            Log.d("SaleAdapter:", data.toString());
+//            Log.d("SaleAdapter:", data.toString());
         }
 
         @Override

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

@@ -204,6 +204,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
         ViewUtils.inject(this);
         getSupportActionBar().setTitle("选择时间");
         //getSupportActionBar().setSubtitle("只适合普通请假");
+        swichDateButton(true);
         Intent intent = getIntent();
         String startDate = "";
         String endDate = "";
@@ -211,8 +212,15 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
             startDate = intent.getStringExtra("startDate");
             endDate = intent.getStringExtra("endDate");
             field = intent.getStringExtra("field");
+            
             isMenuShuffle=  intent.getBooleanExtra("hasMenu",false);
-            LogUtil.d("start:" + startDate + " end:" + endDate);
+            LogUtil.d("start:" + startDate + " end:" + endDate+" field:"+field);
+            if (!StringUtils.isEmpty(field)){
+                if (field.contains("end")||field.contains("date2")){
+                    //结束时间
+                    swichDateButton(false);
+                }
+            }
             id = intent.getIntExtra("id", 0);
             object = intent.getParcelableExtra("object");
             if (!StringUtils.isEmpty(startDate) && !StringUtils.isEmpty(endDate)) {
@@ -307,7 +315,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
         viewPager.setAdapter(pagerAdapter);
         viewPager.setCurrentItem(MAX_PAGER / 2);
 
-        swichDateButton(true);
+      
     }
 
 
@@ -382,6 +390,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
             mTimeData.add("10:30");
             mTimeData.add("11:00");
             mTimeData.add("11:30");
+            mTimeData.add("12:00");
             mTimeData.add("12:30");
             mTimeData.add("13:00");
             mTimeData.add("13:30");
@@ -394,7 +403,6 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
             mTimeData.add("17:00");
             mTimeData.add("17:30");
             mTimeData.add("18:00");
-            mTimeData.add("18:30");
         }
         gAdapter = new GridDataAdapter(mContext, mTimeData);
         gv_date_list.setAdapter(gAdapter);
@@ -414,7 +422,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
         while(true){
             start=DateFormatUtil.add(DateFormatUtil.getDate4StrDate(start, "HH:mm"),
                     "HH:mm",1*1*30*60 * 1000);
-            if(start.compareTo(end)>0){
+            if(start.compareTo(end)>=0){
                 result.add(end);
                 break;
             }else{

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

@@ -512,6 +512,7 @@ public class ViewUtil {
     }
 
     public static void ChangeStatusB2B(String result) {
+        LogUtil.d("b2b login:"+result);
         if (erp_phone != null) {
             Log.i("login_status", "ChangeStatusB2B:" + erp_phone);
             Log.i("login_status", "ChangeStatusB2B:" + erp_password);

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

@@ -26,6 +26,7 @@ public class FlexJsonUtil {
 		return new JSONDeserializer<Map<K, V>>().use(null, map.getClass()).deserialize(json);
 	}
 	
+	
 	public static <K, V> HashMap<K, V> fromHJson(String json) {
 		HashMap<K, V> map = new HashMap<K, V>();
 		return new JSONDeserializer<HashMap<K, V>>().use(null, map.getClass()).deserialize(json);
@@ -36,7 +37,7 @@ public class FlexJsonUtil {
 		LinkedHashMap<K, V> map = new LinkedHashMap<K, V>();
 		return new JSONDeserializer<LinkedHashMap<K, V>>().use(null, map.getClass()).deserialize(json);
 	}
-
+	
 	public String toJson() {
 		return new JSONSerializer().exclude("*.class").serialize(this);
 	}

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/DeviceInfoUtil.java

@@ -18,12 +18,17 @@ public class DeviceInfoUtil {
 
 	/* 获取手机唯一序列号 */
 	public static String getDeviceId(Context context) {
-		TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-		String deviceId = tm.getDeviceId();// 手机设备ID，这个ID会被用为用户访问统计
-		if (deviceId == null) {
-			deviceId = UUID.randomUUID().toString().replaceAll("-", "");
+		try {
+			TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+			String deviceId = tm.getDeviceId();// 手机设备ID，这个ID会被用为用户访问统计
+			if (deviceId == null) {
+                deviceId = UUID.randomUUID().toString().replaceAll("-", "");
+            }
+			return deviceId;
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
 		}
-		return deviceId;
 	}
 
 	/* 获取操作系统版本号 */