bugly

WeiChat/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'com.getkeepsafe.dexcount'
 android {
     signingConfigs {
         config {
-            storeFile file('E:/CompanyProject/applicationsignname[20150409]')
+            storeFile file('D:/config/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

WeiChat/src/main/AndroidManifest.xml

@@ -4,11 +4,13 @@
     package="com.xzjmyk.pm.activity"
     android:versionCode="52"
     android:versionName="5.2">
+
     <uses-sdk
         android:minSdkVersion="11"
         android:targetSdkVersion="23" />
     <!-- 拨打电话 -->
     <uses-permission android:name="android.permission.CALL_PHONE" />
+
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature android:name="android.hardware.camera.autofocus" />
     <uses-feature android:name="android.hardware.microphone" />
@@ -60,7 +62,8 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.GET_TASKS" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <!--全局样式不要随意改动  @style/AppTheme-->
+
+    <!-- 全局样式不要随意改动  @style/AppTheme -->
     <application
         android:name=".MyApplication"
         android:allowBackup="true"
@@ -550,7 +553,7 @@
         <activity
             android:name=".ui.erp.activity.oa.OAListActivity"
             android:label="外勤签到列表" />
-
+        <activity android:name=".ui.erp.activity.oa.OptionActivity"></activity>
     </application>
 
 </manifest>

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

@@ -1,6 +1,5 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
-import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
@@ -24,7 +23,6 @@ import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CodeUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
-import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
 import com.xzjmyk.pm.activity.ui.erp.view.SwitchView;
 import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
@@ -253,6 +251,10 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
             Crouton.makeText(this, "开始时间不能大于结束时间");
             return;
         }
+        if (start_tv.getText().toString().toString().compareTo(end_tv.getText().toString().trim()) >= 0) {
+            Crouton.makeText(ct, "结束时间不能小于开始时间");
+            return;
+        }
         StringBuilder builder = new StringBuilder();
         StringBuilder builderId = new StringBuilder();
         for (int i = 0; i < entities.size(); i++) {
@@ -267,27 +269,43 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
         doSignin(builder.toString(), builderId.toString(), id);
     }
 
-    private void showDateDialog(final TextView tv) {
-        DateTimePicker picker = new DateTimePicker(this, DateTimePicker.HOUR_OF_DAY);
-        picker.setRange(2000, 2030);
-        picker.setSelectedItem(Calendar.getInstance().get(Calendar.YEAR),
+    private void showDateDialog(TextView tv) {
+        showDateDialog(tv, Calendar.getInstance().get(Calendar.YEAR),
                 Calendar.getInstance().get(Calendar.MONTH) + 1,
                 Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
                 Calendar.getInstance().get(Calendar.HOUR_OF_DAY),
                 Calendar.getInstance().get(Calendar.MINUTE));
+    }
+
+    private void showDateDialog(final TextView tv, int yeas, int month, int day, int hh, int mm) {
+        DateTimePicker picker = new DateTimePicker(this, DateTimePicker.HOUR_OF_DAY);
+        picker.setRange(2010, 2030);
+        picker.setSelectedItem(yeas, month, day, hh, mm);
         picker.setOnDateTimePickListener(new DateTimePicker.OnYearMonthDayTimePickListener() {
             @Override
             public void onDateTimePicked(String year, String month, String day, String hour, String minute) {
                 String time = year + "-" + month + "-" + day + " " + hour + ":" + minute + ":00";
                 switch (tv.getId()) {
                     case R.id.start_tv:
-                        start_tv.setText(time);
+                        if (!StringUtils.isEmpty(end_tv.getText().toString())) {
+                            if (end_tv.getText().toString().compareTo(time) < 0) {
+                                Crouton.makeText(ct, "结束时间不能小于开始时间");
+                            } else {
+                                start_tv.setText(time);
+                            }
+                        } else {
+                            start_tv.setText(time);
+                        }
                         break;
                     case R.id.end_tv:
-                        if (time.compareTo(start_tv.getText().toString()) < 0) {
-                            Crouton.makeText(ct, "结束时间不能小于开始时间");
+                        if (!StringUtils.isEmpty(start_tv.getText().toString())) {
+                            if (time.compareTo(start_tv.getText().toString()) <= 0) {
+                                Crouton.makeText(ct, "结束时间不能小于开始时间");
+                            } else {
+                                end_tv.setText(time);
+                            }
                         } else {
-                            end_tv.setText(time);
+                            Crouton.makeText(ct, "请先填写开始时间");
                         }
                         break;
                 }
@@ -296,16 +314,6 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
         picker.show();
     }
 
-    public void showDialog(final TextView tv) {
-        DateTimePickerDialog dialog = new DateTimePickerDialog(this, System.currentTimeMillis());
-        dialog.setOnDateTimeSetListener(new DateTimePickerDialog.OnDateTimeSetListener() {
-            public void OnDateTimeSet(AlertDialog dia, long date) {
-                String str = TimeUtils.f_long_2_str(date);
-                tv.setText(str);
-            }
-        });
-        dialog.show();
-    }
 
     private void getIdByNet() {
         String url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "common/getId.action";
@@ -314,7 +322,6 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, param, handler, headers, 0x16, null, null, "post");
-
     }
 
     //提交表单

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

@@ -24,7 +24,6 @@ import com.xzjmyk.pm.activity.bean.oa.MeetingDocBean;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
-import com.xzjmyk.pm.activity.util.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
@@ -87,7 +86,7 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
                 case SIGNNIN:
                     ToastUtil.showToast(ct, "会议签到成功");
                     isPlay = false;
-                    click_btn.setPressed(true);
+                    setSigninAble(false);
                     loadNumData();
                     break;
                 case 0x14:
@@ -101,7 +100,7 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
                             for (int i = 0; i < confirmed; i++)
                                 if (array.getJSONObject(i).containsKey("EM_CODE") && code.equals(array.getJSONObject(i).getString("EM_CODE"))) {
                                     isPlay = false;
-                                    click_btn.setPressed(true);
+                                    setSigninAble(false);
                                     break;
                                 }
                         }
@@ -136,18 +135,13 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
         initView();
     }
 
-    private void getPoinfo() {
-        BaiduMapUtil.getInstence().getPoiInfo(ct, new BaiduMapUtil.OnLocationListener() {
-            @Override
-            public void result(Map<String, Object> map) {
-                if (map == null || map.isEmpty()) return;
-                if (map.get("poi") != null) {
-                    location_tv.setText(map.get("poi") + "");
-                } else if (map.get("name") != null) {
-                    location_tv.setText(map.get("name") + "");
-                }
-            }
-        });
+    private void setSigninAble(boolean b) {
+        if (b) {
+            click_btn.setBackgroundResource(R.drawable.bg_orange_btn);
+        } else {
+            click_btn.setBackgroundResource(R.drawable.bg_orange_btn_pass);
+            click_btn.setText("已签到");
+        }
     }
 
     private void showExitDialog() {
@@ -356,7 +350,6 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
                     }
                 } else {
                     ToastUtil.showToast(ct, "您已经签到过了");
-                    click_btn.setPressed(true);
                 }
                 break;
             case R.id.location_tag://点击重新定位

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

@@ -29,6 +29,7 @@ import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
+import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.view.ClearEditText;
 
@@ -296,7 +297,7 @@ public class MeetingActivity extends BaseActivity {
             viewholder.oa_meeting_addr_tv.setText(entity.getMa_mrname());
             viewholder.oa_meeting_user_tv.setText(entity.getMa_recorder());
             if (entity.getMa_tag() == null || entity.getMa_tag().length() <= 0) return;
-            viewholder.oa_meeting_tag_tv.setText(entity.getMa_type() == null ? "未填写" : entity.getMa_type());
+            viewholder.oa_meeting_tag_tv.setText(StringUtils.isEmpty(entity.getMa_type()) ? "未填写" : entity.getMa_type());
         }
 
         class ViewHolder {

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

@@ -253,9 +253,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                 } else if (e.getRecordman() != null) {//拜访
                     if (e.getRecordman() == null || e.getRecordman().length() <= 0) continue;
                     nameStr = "," + e.getRecordman().trim() + ",";
-                    Log.i("gongpengming", nameStr);
                     if (getResult(nameStr, name)) {//是该下属任务日程
-                        Log.i("gongpengming", "是的");
                         chche.add(e);
                     }
                 }
@@ -379,6 +377,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                 @Override
                 public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                     Intent intent = null;
+                    popupWindow.dismiss();
                     switch (position) {
                         case 0:
                             if (!(getIntent() == null || getIntent().getIntExtra("type", 0) != 1)) {

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

@@ -15,13 +15,10 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.nostra13.universalimageloader.core.ImageLoader;
-import com.nostra13.universalimageloader.core.imageaware.ImageAware;
-import com.nostra13.universalimageloader.core.imageaware.ImageViewAware;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
-import com.xzjmyk.pm.activity.util.ImageUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 
 import java.util.HashMap;
@@ -121,6 +118,8 @@ public class OAListActivity extends BaseActivity {
             holder.company.setText(object.getString("mo_company") == null ? "" : object.getString("mo_company"));
             if (object.containsKey("mo_attachid") && object.getInteger("mo_attachid") > 1000) {
                 ImageLoader.getInstance().displayImage(getImageUrl(object.getInteger("mo_attachid")), holder.image);
+            } else {
+                holder.image.setVisibility(View.GONE);
             }
             return view;
         }
@@ -134,7 +133,6 @@ public class OAListActivity extends BaseActivity {
                     name,//签到人
                     addr, //地址
                     company;//签到公司
-
             ImageView image;
         }
     }

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

@@ -0,0 +1,15 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.oa;
+
+import android.os.Bundle;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+
+public class OptionActivity extends BaseActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_option);
+    }
+}

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

@@ -40,6 +40,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.FlexJsonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.util.CameraUtil;
+import com.xzjmyk.pm.activity.util.ImageUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
@@ -136,12 +137,14 @@ public class OutSigninOKActivity extends BaseActivity {
             public void onClick(DialogInterface dialogInterface, int i) {
                 if (i == 0) {
                     //调用拍照
+                    isTask = true;
                     mNewPhotoUri = CameraUtil.getOutputMediaFileUri(OutSigninOKActivity.this, CameraUtil.MEDIA_TYPE_IMAGE);
                     CameraUtil.captureImage(OutSigninOKActivity.this, mNewPhotoUri, REQUEST_CODE_CAPTURE_PHOTO);
                 } else if (i == 1) {
                     if (!getIntent().getBooleanExtra("isImage", false)) {
                         Crouton.makeText(ct, "您没有被允许使用系统相册，请使用拍照");
                     } else {
+                        isTask = false;
                         //调用系统相册
                         CameraUtil.pickImageSimple(OutSigninOKActivity.this, REQUEST_CODE_PICK_PHOTO);
                     }
@@ -161,7 +164,8 @@ public class OutSigninOKActivity extends BaseActivity {
         return -1;
     }
 
-    int id = 0;
+    private int id = 0;
+    private boolean isTask = false;
 
     private void uploadFile(String path) {
         if (StringUtils.isEmpty(path)) return;
@@ -172,7 +176,10 @@ public class OutSigninOKActivity extends BaseActivity {
         params.addHeader("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         params.addBodyParameter("em_code", CommonUtil.getSharedPreferences(ct, "erp_username"));
         params.addBodyParameter("type", "common");
-        params.addBodyParameter("img", finalFile);
+        if (isTask)
+            params.addBodyParameter("img", ImageUtil.compressBitmapToFile(path, 100, 300, 300));
+        else
+            params.addBodyParameter("img", finalFile);
         String url = Constants.getAppBaseUrl(ct) + "mobile/uploadEmployeeAttach.action";
         final HttpUtils http = new HttpUtils();
         http.send(HttpRequest.HttpMethod.POST, url, params, new RequestCallBack<String>() {

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

@@ -6,6 +6,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.support.v7.app.AlertDialog;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -28,8 +29,6 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-/**
- */
 public class OutofficeSetActivity extends BaseActivity {
     @ViewInject(R.id.location_tv)
     private TextView location_tv;
@@ -45,6 +44,8 @@ public class OutofficeSetActivity extends BaseActivity {
         @Override
         public void handleMessage(Message msg) {
             String message = msg.getData().getString("result");
+            if (progressDialog.isShowing())
+                progressDialog.dismiss();
             JSONObject object = null;
             switch (msg.what) {
                 case 0x11:
@@ -54,11 +55,18 @@ public class OutofficeSetActivity extends BaseActivity {
                     else
                         Crouton.makeText(ct, "保存失败");
                     break;
-
             }
         }
     };
 
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            endActivity();
+        }
+        return true;
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -67,23 +75,19 @@ public class OutofficeSetActivity extends BaseActivity {
         initview();
     }
 
-    //form 3：isImage  2：isAddress  1：distance
-    private void saveSet(String... form) {
-        StringBuilder formStore = new StringBuilder();
-        formStore.append("[");
-        switch (form.length) {
-            case 3:
-                formStore.append("{\"isImage\":\"" + form[2] + "\"},");
-            case 2:
-                formStore.append("{\"isAddress\":\"" + form[1] + "\"},");
-            case 1:
-                formStore.append("{\"distance\":\"" + form[0] + "\"},");
-                break;
-        }
-        formStore.append("]");
-        Map<String, Object> param = new HashMap<>();
-        param.put("formStore", formStore.toString());
-        net("mobile/saveconfigs.action", param, 0x11);
+
+    @Override
+    public void onBackPressed() {
+        endActivity();
+    }
+
+    private void endActivity() {
+        Intent intent = new Intent();
+        intent.putExtra("isImage", isImage.isChecked());
+        intent.putExtra("isAddress", allow_chance_location.isChecked());
+        intent.putExtra("distance", getMin(location_tv.getText().toString().trim()));
+        setResult(0x21, intent);
+        finish();
     }
 
     private void updataSet(String key, String value) {
@@ -115,11 +119,10 @@ public class OutofficeSetActivity extends BaseActivity {
     private void initview() {
         Intent intent = getIntent();
         if (intent != null) {
-            saveSet(intent.getBooleanExtra("isImage", false) ? "1" : "0", intent.getBooleanExtra("isAddress", false) ? "1" : "0", intent.getIntExtra("distance", 0) + "");
             isImage.setChecked(intent.getBooleanExtra("isImage", false));
             allow_chance_location.setChecked(intent.getBooleanExtra("isAddress", false));
             setClickAble(intent.getBooleanExtra("isAddress", false));
-            location_tv.setText(intent.getIntExtra("distance", 0));
+            location_tv.setText(intent.getIntExtra("distance", 0) + "米");
         }
         isImage.setOnCheckedChangeListener(new SwitchView.OnCheckedChangeListener() {
             @Override
@@ -132,7 +135,7 @@ public class OutofficeSetActivity extends BaseActivity {
             @Override
             public void onCheckedChanged(View view, boolean isChecked) {
                 setClickAble(isChecked);
-                updataSet("isAddress ", "" + (isChecked ? 1 : 0));
+                updataSet("isAddress", "" + (isChecked ? 1 : 0));
             }
         });
         location_rl.setOnClickListener(new View.OnClickListener() {

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

@@ -134,7 +134,6 @@ public class UserSelectActivity extends BaseActivity {
             @Override
             public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
             }
-
             @Override
             public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
             }
@@ -312,7 +311,8 @@ public class UserSelectActivity extends BaseActivity {
             holder.select_scb.setChecked(users.get(i).isClick());
             holder.select_scb.setFocusable(false);
             holder.select_scb.setClickable(false);
-            holder.id_tv.setText(users.get(i).getEm_depart() + "->" + users.get(i).getEm_position());
+            String str = (StringUtils.isEmpty(users.get(i).getEm_position()) ? "" : (" | " + users.get(i).getEm_position()));
+            holder.id_tv.setText(users.get(i).getEm_depart() + str);
             holder.name_tv.setText("姓名:" + users.get(i).getEm_name());
             return view;
         }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/OutofficeFragment.java

@@ -36,6 +36,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.util.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
+import com.xzjmyk.pm.activity.view.crouton.Crouton;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -96,16 +97,19 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
                 case 0x12:
                     object = JSON.parseObject(message);
                     if (object.containsKey("success") && object.getBoolean("success")) {
-                        Log.i("gongpengming", "进来" + object.getString("isAdmin"));
-                        isAdmin = object.containsKey("isAdmin") ? ("1".equals(object.getString("isAdmin")) ? true : false ): false;
+                        isAdmin = object.containsKey("isAdmin") ? ("1".equals(object.getString("isAdmin")) ? true : false) : false;
                     }
                     break;
                 case 0x13:
                     object = JSON.parseObject(message);
                     if (object.containsKey("success") && object.getBoolean("success")) {
-                        isAddress = object.containsKey("isAddress") ? ("1".equals(object.getString("isAddress")) ? true : false ): false;
-                        isImage = object.containsKey("isImage") ? ("1".equals(object.getString("isImage")) ? true : false ): false;
+                        isAddress = object.containsKey("isAddress") ? ("1".equals(object.getString("isAddress")) ? true : false) : false;
+                        isImage = object.containsKey("isImage") ? ("1".equals(object.getString("isImage")) ? true : false) : false;
                         distance = object.containsKey("distance") ? Integer.parseInt(object.getString("distance")) : 0;
+                        if (isAddress)
+                            do_trim.setVisibility(View.VISIBLE);
+                        else
+                            do_trim.setVisibility(View.GONE);
                     }
                     break;
             }
@@ -117,6 +121,7 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
         return R.layout.fragment_outoffice;
     }
 
+
     @Override
     public void onDestroy() {
         super.onDestroy();
@@ -151,25 +156,29 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.title) {
-            Intent intent = new Intent(ct, OutofficeSetActivity.class);
-            intent.putExtra("isAddress", isAddress);
-            intent.putExtra("isImage", isImage);
-            intent.putExtra("distance", distance);
-            startActivity(intent);
+            if (isAdmin) {
+                Intent intent = new Intent(ct, OutofficeSetActivity.class);
+                intent.putExtra("isAddress", isAddress);
+                intent.putExtra("isImage", isImage);
+                intent.putExtra("distance", distance);
+                startActivityForResult(intent, 0x21);
+            } else {
+                Crouton.makeText(ct, "当前账号无权限进行设置");
+            }
         }
         return super.onOptionsItemSelected(item);
     }
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        if (isAdmin)
-            inflater.inflate(R.menu.menu_outoffice, menu);
+        inflater.inflate(R.menu.menu_outoffice, menu);
         super.onCreateOptionsMenu(menu, inflater);
     }
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (data == null) return;
+        Log.i("gongpengming", "data != null");
         if (0x21 == requestCode) {
             if (resultCode == LocationMapActivity.REQUCODE) {
                 PoiInfo info = data.getParcelableExtra(LocationMapActivity.REQUESTNAME);
@@ -185,6 +194,18 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
                     sigNum++;
                     num_tv.setText(Html.fromHtml("<u>" + sigNum + "</u>"));
                 }
+            } else if (resultCode == 0x21) {
+                Log.i("gongpengming", "requestCode == 0x21");
+                isImage = data.getBooleanExtra("isImage", false);
+                isAddress = data.getBooleanExtra("isAddress", false);
+                distance = data.getIntExtra("distance", 100);
+                Log.i("gongpengming", "isImage=" + isImage);
+                Log.i("gongpengming", "isAddress=" + isAddress);
+                Log.i("gongpengming", "distance=" + distance);
+                if (isAddress)
+                    do_trim.setVisibility(View.VISIBLE);
+                else
+                    do_trim.setVisibility(View.GONE);
             }
         }
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/SigninFragment.java

@@ -28,11 +28,11 @@ import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.AlarmaActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.LocationMapActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.SigninAdapter;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CodeUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.FlexJsonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.ViewUtil;
 import com.xzjmyk.pm.activity.util.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.CalendarUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
@@ -105,9 +105,9 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                     JSONObject jsonObject = JSON.parseObject(message);//返回对象
                     if (jsonObject.containsKey("success") && jsonObject.getBoolean("success")) {//返回正常
                         if (jsonObject.containsKey("comaddressset") ? jsonObject.getBoolean("comaddressset") : false) {//如果有分配公司
-                            companyDistance = Integer.parseInt(jsonObject.containsKey("distance") ?(StringUtils.isEmpty(jsonObject.getString("distance") )?"0":jsonObject.getString("distance")) : "0");
-                            companyX = Double.parseDouble(jsonObject.containsKey("longitude") ? (StringUtils.isEmpty(jsonObject.getString("longitude") )?"0":jsonObject.getString("longitude")) : "0");
-                            companyY = Double.parseDouble(jsonObject.containsKey("latitude") ? (StringUtils.isEmpty(jsonObject.getString("latitude") )?"0":jsonObject.getString("latitude")) : "0");
+                            companyDistance = Integer.parseInt(jsonObject.containsKey("distance") ? (StringUtils.isEmpty(jsonObject.getString("distance")) ? "0" : jsonObject.getString("distance")) : "0");
+                            companyX = Double.parseDouble(jsonObject.containsKey("longitude") ? (StringUtils.isEmpty(jsonObject.getString("longitude")) ? "0" : jsonObject.getString("longitude")) : "0");
+                            companyY = Double.parseDouble(jsonObject.containsKey("latitude") ? (StringUtils.isEmpty(jsonObject.getString("latitude")) ? "0" : jsonObject.getString("latitude")) : "0");
                             unoffice_mm.setText(setDistance());
                         } else {
                             Crouton.makeText(ct, "当前账号没有分配公司地址，请联系管理员!!");
@@ -149,7 +149,10 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                     });
                     break;
                 default:
-                    Crouton.makeText(ct, "系统出现错误，请联系管理员!!");
+                    if ("网络未连接!".equals(message))
+                        Crouton.makeText(ct, message);
+                    else
+                        Crouton.makeText(ct, message);
                     break;
             }
 

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

@@ -642,7 +642,7 @@ public class ViewUtil {
                     }*/
                     Bundle bundle = new Bundle();
                     Message message = new Message();
-                    bundle.putString("result", "网络未连接！");
+                    bundle.putString("result", "网络未连接!");
                     message.setData(bundle);
                     message.what = Constants.APP_SOCKETIMEOUTEXCEPTION;
                     handler.sendMessage(message);

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

@@ -28,8 +28,6 @@ public class ImageUtil {
      * 所以要解决这个问题，可以在onActivityResult方法中，
      * 获取到照片数据后，读取它的旋转信息，如果不是0，
      * 说明这个照片已经被旋转过了，那么再使用android.graphics.Matrix将照片旋转回去即可。*/
-
-
     public static Bitmap roateBitmapAndScale(Bitmap bitmap, int degree, int newWidth ,int newHeight ) {
         if (degree == 0) {
             return bitmap;

WeiChat/src/main/res/drawable/bg_orange_btn.xml

@@ -4,7 +4,8 @@
         <shape>
             <solid android:color="@color/btn_orange_press" />
             <corners android:radius="8dp" />
-            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp"
+                android:right="0.5dp" android:top="0.5dp" />
         </shape>
     </item>
     <item>

WeiChat/src/main/res/drawable/bg_orange_btn_pass.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+        <shape>
+            <solid android:color="@color/btn_orange_press" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+</selector>

WeiChat/src/main/res/layout/activity_add_log.xml

@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.AddLogActivity">
-
+<LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="50dp"
@@ -140,5 +143,5 @@
             android:layout_weight="1"
             android:src="@drawable/actionbar_add_icon" />
     </LinearLayout>
-
 </LinearLayout>
+</ScrollView>

WeiChat/src/main/res/layout/activity_add_meeting.xml

@@ -132,7 +132,8 @@
                 style="@style/add_meet_tv"
                 android:layout_marginLeft="20dp"
                 android:layout_toRightOf="@id/location_tag"
-                android:hint="请输入" />
+                android:hint="请输入"
+                android:lines="1" />
         </RelativeLayout>
 
         <RelativeLayout

WeiChat/src/main/res/layout/activity_meet_details.xml

@@ -56,7 +56,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="2dp"
-                android:text="分配任务"
+                android:text="发起任务"
                 android:textColor="@color/white" />
         </LinearLayout>
     </LinearLayout>

WeiChat/src/main/res/layout/activity_meet_select.xml

@@ -35,8 +35,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@+id/meet_select_rl"
-        android:layout_marginTop="10dp"
         android:divider="@color/item_line"
-        android:padding="10dp"
         android:scrollbars="none" />
 </RelativeLayout>

WeiChat/src/main/res/layout/activity_option.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.OptionActivity">
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/listview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</RelativeLayout>

WeiChat/src/main/res/layout/item_location_ls.xml

@@ -6,9 +6,9 @@
 
     <TextView
         android:id="@+id/name_tv"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="英唐大厦"
+        android:layout_toLeftOf="@+id/select_rb"
         android:textColor="@color/text_main"
         android:textSize="@dimen/text_main" />
 
@@ -19,7 +19,6 @@
         android:layout_below="@+id/name_tv"
         android:layout_marginTop="2dp"
         android:layout_toLeftOf="@+id/select_rb"
-        android:text="英唐大厦"
         android:textColor="@color/text_hine"
         android:textSize="@dimen/text_hine" />
 
@@ -29,7 +28,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:button="@null"
-        android:focusable="false"
         android:drawableLeft="@drawable/oa_rb_button_bg"
+        android:focusable="false"
         android:padding="10dp" />
 </RelativeLayout>

WeiChat/src/main/res/values/strings.xml

@@ -23,7 +23,7 @@
     <string name="crm_customer_visit">客户拜访</string>
     <string name="crm_waller">荣誉墙</string>
     <!--View empty-->
-    <string name="empty_message">暂时没有数据！</string>
+    <string name="empty_message">暂时没有数据</string>
     <string name="loading_message">请等待！</string>
     <string name="error_message">很抱歉! 系统发现未知错误</string>
     <string name="empty_button">再次尝试</string>

library-viewpager-indicator/build.gradle

@@ -18,5 +18,5 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:18.+'
+    compile 'com.android.support:support-v4:22.+'
 }