消息，通讯录添加语音识别搜索完成,考勤地址设置删除完成

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/oa/OfficeAddressBean.java

@@ -9,9 +9,9 @@ import java.util.List;
 public class OfficeAddressBean {
 
     /**
-     * sessionId : 02CBF4398AA532702F8752E23515E019
+     * sessionId : 43EB69A8CBC6B932F82BE09F8AB98B73
      * success : true
-     * listdata : [{"CS_WORKADDR":"深圳高新技术产业园区R3-B座5层","CS_VALIDRANGE":"300","CS_LATITUDE":"22.540417822046","CS_LONGITUDE":"113.95191339855914","CS_SHORTNAME":"朗富科技(深圳)有限公司","CS_CODE":null,"CS_INNERDISTANCE":500,"success":true},{"CS_WORKADDR":"深圳市南山区科技南五路5","CS_VALIDRANGE":"300","CS_LATITUDE":"22.54069320895665","CS_LONGITUDE":"113.9531261109972","CS_SHORTNAME":"英唐智控","CS_CODE":null,"CS_INNERDISTANCE":500,"success":true},{"CS_WORKADDR":"广东省深圳市南山区高新南五道9号金证科技大楼5楼西侧","CS_VALIDRANGE":"300","CS_LATITUDE":"22.540643138650598","CS_LONGITUDE":"113.95404238261708","CS_SHORTNAME":"brion公司","CS_CODE":null,"CS_INNERDISTANCE":500,"success":true},{"CS_WORKADDR":"深圳市南山区","CS_VALIDRANGE":"300","CS_LATITUDE":"22.540676518856678","CS_LONGITUDE":"113.9528745854545","CS_SHORTNAME":"宇声数码技术公司","CS_CODE":null,"CS_INNERDISTANCE":500,"success":true}]
+     * listdata : [{"CS_WORKADDR":"广东省深圳市南山科技园科技南五路英唐大厦","CS_VALIDRANGE":"100","CS_ID":9619,"CS_LATITUDE":"22.54068486390692","CS_LONGITUDE":"113.9531350940523","CS_SHORTNAME":"深圳市润唐智能生活电器有限公司","CS_CODE":"2017010065","CS_INNERDISTANCE":500,"success":true},{"CS_WORKADDR":"深圳市南山区科技南五路5","CS_VALIDRANGE":"100","CS_ID":9620,"CS_LATITUDE":"22.54069320895665","CS_LONGITUDE":"113.9531261109972","CS_SHORTNAME":"英唐智控","CS_CODE":"2017010066","CS_INNERDISTANCE":500,"success":true},{"CS_WORKADDR":"深圳市南山区科技园科技中一路","CS_VALIDRANGE":"100","CS_ID":9618,"CS_LATITUDE":"22.546000557212412","CS_LONGITUDE":"113.94107983411239","CS_SHORTNAME":"腾讯大厦","CS_CODE":"2017010064","CS_INNERDISTANCE":500,"success":true},{"CS_WORKADDR":"英唐大厦","CS_VALIDRANGE":"100","CS_ID":9594,"CS_LATITUDE":"113.9529997697171","CS_LONGITUDE":"22.540450740157528","CS_SHORTNAME":"优软科技","CS_CODE":"2017010041","CS_INNERDISTANCE":0,"success":true}]
      */
 
     private String sessionId;
@@ -44,22 +44,24 @@ public class OfficeAddressBean {
 
     public static class ListdataBean {
         /**
-         * CS_WORKADDR : 深圳高新技术产业园区R3-B座5层
-         * CS_VALIDRANGE : 300
-         * CS_LATITUDE : 22.540417822046
-         * CS_LONGITUDE : 113.95191339855914
-         * CS_SHORTNAME : 朗富科技(深圳)有限公司
-         * CS_CODE : null
+         * CS_WORKADDR : 广东省深圳市南山科技园科技南五路英唐大厦
+         * CS_VALIDRANGE : 100
+         * CS_ID : 9619
+         * CS_LATITUDE : 22.54068486390692
+         * CS_LONGITUDE : 113.9531350940523
+         * CS_SHORTNAME : 深圳市润唐智能生活电器有限公司
+         * CS_CODE : 2017010065
          * CS_INNERDISTANCE : 500
          * success : true
          */
 
         private String CS_WORKADDR;
         private String CS_VALIDRANGE;
+        private int CS_ID;
         private String CS_LATITUDE;
         private String CS_LONGITUDE;
         private String CS_SHORTNAME;
-        private Object CS_CODE;
+        private String CS_CODE;
         private int CS_INNERDISTANCE;
         private boolean success;
 
@@ -79,6 +81,14 @@ public class OfficeAddressBean {
             this.CS_VALIDRANGE = CS_VALIDRANGE;
         }
 
+        public int getCS_ID() {
+            return CS_ID;
+        }
+
+        public void setCS_ID(int CS_ID) {
+            this.CS_ID = CS_ID;
+        }
+
         public String getCS_LATITUDE() {
             return CS_LATITUDE;
         }
@@ -103,11 +113,11 @@ public class OfficeAddressBean {
             this.CS_SHORTNAME = CS_SHORTNAME;
         }
 
-        public Object getCS_CODE() {
+        public String getCS_CODE() {
             return CS_CODE;
         }
 
-        public void setCS_CODE(Object CS_CODE) {
+        public void setCS_CODE(String CS_CODE) {
             this.CS_CODE = CS_CODE;
         }
 

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

@@ -91,11 +91,11 @@ public class WorkActivity extends BaseActivity implements View.OnClickListener,
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.title:
-                Intent intent = new Intent(ct, AlarmaActivity.class);
-                intent.putExtra("macAddress", macAddress);
-                startActivity(intent);
+//                Intent intent = new Intent(ct, AlarmaActivity.class);
+//                intent.putExtra("macAddress", macAddress);
+//                startActivity(intent);
                 //TODO 测试版本先关闭
-//                showPopupWindow();
+                showPopupWindow();
                 break;
         }
         return super.onOptionsItemSelected(item);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/OfficeAddressSettingsActivity.java

@@ -64,6 +64,7 @@ public class OfficeAddressSettingsActivity extends BaseActivity{
     private List<String> address_location; //办公地址详细
     private List<String> address_longitude; //经度
     private List<String> address_latitud; //纬度
+    private List<String> address_id; //地址id
     private String caller = "comAddressSet";
     private int saved_num = 0;
     private int save_address_size;
@@ -71,6 +72,8 @@ public class OfficeAddressSettingsActivity extends BaseActivity{
     private int default_work_range = 500; //默认办公范围
     private int delete_position = 0;      //记录删除的位置position
     private OfficeAddressBean mOfficeAddressBean;
+    private int listdada_size;
+
     private Handler handler = new Handler(){
         @Override
         public void handleMessage(Message msg) {
@@ -106,6 +109,8 @@ public class OfficeAddressSettingsActivity extends BaseActivity{
                             address_location.remove(delete_position);
                             address_longitude.remove(delete_position);
                             address_latitud.remove(delete_position);
+                            address_id.remove(delete_position);
+                            listdada_size--;
                             myadapter.notifyDataSetChanged();
                             ToastMessage("删除成功");
                         }
@@ -144,6 +149,7 @@ public class OfficeAddressSettingsActivity extends BaseActivity{
         address_location = new ArrayList<>();
         address_latitud = new ArrayList<>();
         address_longitude = new ArrayList<>();
+        address_id = new ArrayList<>();
 
         mOfficeAddressBean = new OfficeAddressBean();
         myadapter = new OfficeAddressAdapter();
@@ -167,7 +173,7 @@ public class OfficeAddressSettingsActivity extends BaseActivity{
             if (resultJsonObject != null){
                 mOfficeAddressBean = JSON.parseObject(resultJsonObject.toString(),OfficeAddressBean.class);
                 if (!ListUtils.isEmpty(mOfficeAddressBean.getListdata())){
-                    int listdada_size = mOfficeAddressBean.getListdata().size();
+                    listdada_size = mOfficeAddressBean.getListdata().size();
                     for (int i = 0; i < listdada_size; i++) {
                         if (!StringUtils.isEmpty(mOfficeAddressBean.getListdata().get(i).getCS_SHORTNAME())){
                             address_names.add(mOfficeAddressBean.getListdata().get(i).getCS_SHORTNAME());
@@ -192,6 +198,12 @@ public class OfficeAddressSettingsActivity extends BaseActivity{
                         }else {
                             address_longitude.add("");
                         }
+
+                        if (mOfficeAddressBean.getListdata().get(i).getCS_ID() != 0){
+                            address_id.add(mOfficeAddressBean.getListdata().get(i).getCS_ID() + "");
+                        }else {
+                            address_id.add("-1");
+                        }
                     }
                     myadapter.setAddress_names(address_names);
                     myadapter.notifyDataSetChanged();
@@ -405,12 +417,20 @@ public class OfficeAddressSettingsActivity extends BaseActivity{
                     new AlertDialog.Builder(mContext)
                             .setTitle("温馨提示")
                             .setMessage("\t\t确认删除该条办公地址？")
-                            .setNegativeButton("取消",null)
+                            .setNegativeButton("取消", null)
                             .setPositiveButton("确认", new DialogInterface.OnClickListener() {
                                 @Override
                                 public void onClick(DialogInterface dialog, int which) {
                                     mPosition = position;
-                                    doDeleteAddress(mPosition);
+                                    if (mPosition < listdada_size) {
+                                        doDeleteAddress(mPosition);
+                                    } else {
+                                        address_names.remove(mPosition);
+                                        address_location.remove(mPosition);
+                                        address_longitude.remove(mPosition);
+                                        address_latitud.remove(mPosition);
+                                        myadapter.notifyDataSetChanged();
+                                    }
                                 }
                             }).show();
                 }
@@ -423,12 +443,10 @@ public class OfficeAddressSettingsActivity extends BaseActivity{
             String url = Constants.getAppBaseUrl(getApplicationContext()) + "/mobile/deletecomaddressset.action";
             Map<String , Object> param = new HashMap<>();
             param.put("caller",caller);
-//          TODO 少个id
-//          param.put("id".);
+            param.put("id",CommonUtil.getNumByString(address_id.get(delete_position).toString()));
             LinkedHashMap headers = new LinkedHashMap();
             headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(getApplicationContext(), "sessionId"));
             ViewUtil.httpSendRequest(getApplicationContext(), url, param, handler, headers, ADDRESS_DELETE_REQUEST, null, null, "post");
-
         }
 
         class ViewHolder{

WeiChat/src/main/java/com/xzjmyk/pm/basepedo/service/StepService.java

@@ -289,7 +289,7 @@ public class StepService extends Service implements SensorEventListener {
     @Override
     public void onSensorChanged(SensorEvent event) {
         i++;
-//        StepDcretor.CURRENT_SETP ++; //TODO 这里取消屏蔽功能，动一次计步叠加一次
+        StepDcretor.CURRENT_SETP ++; //TODO 这里取消屏蔽功能，动一次计步叠加一次
         updateNotification("今日步数：" + StepDcretor.CURRENT_SETP + " 步");
     }