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

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/LoginActivity.java

@@ -3,7 +3,6 @@ package com.xzjmyk.pm.activity.ui.account;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.os.Debug;
 import android.os.Handler;
 import android.os.Message;
 import android.text.TextUtils;
@@ -169,7 +168,6 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                     /**@注释：持久化登录信息 */
                     Log.i("url", "login:" + JSON.toJSONString(result));
                     success = LoginHelper.setLoginUser(mContext, phoneNumber, digestPwd, result);// 设置登陆用户信息
-
                 }
                 if (success) {// 登陆IM成功
                     login_manage(phoneNumber, password);//登录管理平台

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/VisitReportAddActivity.java

@@ -84,6 +84,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
     private void initView() {
         ViewUtils.inject(this);
         getSupportActionBar().setTitle("拜访报告");
+
     }
 
     private void initListener() {
@@ -97,7 +98,19 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
         tv_relate_business.setKeyListener(null);
         tv_visit_steps.setOnClickListener(this);
         tv_relate_business.setOnClickListener(this);
-
+        if (!getIntent().getBooleanExtra("isMe", true)) {
+            //当不可编辑tv_date_end
+            tv_date_start.setFocusable(false);
+            tv_date_end.setFocusable(false);
+            tv_address_refresh.setFocusable(false);
+            tv_customer_login.setFocusable(false);
+            tv_visit_steps.setFocusable(false);
+            tv_relate_business.setFocusable(false);
+            tv_visit_content.setFocusable(false);
+            tv_visit_theme.setFocusable(false);
+            tv_address_login.setFocusable(false);
+            tv_linksman_login.setFocusable(false);
+        }
     }
 
     private void initData() {
@@ -326,12 +339,6 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             case R.id.tv_date_end:
                 showDateDialog((FormEditText) v.findViewById(R.id.tv_date_end));
                 break;
-           /* case R.id.tv_startTim_login:
-                showDateDialog((EditText) v.findViewById(R.id.tv_startTim_login));
-                break;
-            case R.id.tv_endTime_login:
-                showDateDialog((EditText) v.findViewById(R.id.tv_endTime_login));
-                break;*/
             case R.id.tv_address_refresh:
                 BaiduMapUtil.getInstence().getPoiInfo(ct, new BaiduMapUtil.OnLocationListener() {
                     @Override

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

@@ -10,6 +10,7 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -258,7 +259,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                 if (adapter.isTask(object)) {
                     intent = new Intent(ct, DetailTaskActivity.class);
                     intent.putExtra("description", object.getString("department"));
-                    intent.putExtra("isMe",isMe);
+                    intent.putExtra("isMe", isMe);
                     intent.putExtra("duration", object.getString("department"));
                     intent.putExtra("status", object.getString("status"));
                     intent.putExtra("taskname", object.getString("name"));//名称
@@ -269,22 +270,30 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                     intent.putExtra("ra_taskid", String.valueOf(object.getIntValue("ra_taskid")));//取回复内容id
                     intent.putExtra("taskid", String.valueOf(object.getIntValue("ra_id")));//编号
                     intent.putExtra("endtime", object.getString("enddate"));
-                    startActivityForResult(intent, 0x20);
+                    startActivityForResult(intent, isMe ? 0x20 : 0x21);
                 } else if (adapter.isVisit(object)) {
                     intent = new Intent(activity, VisitReportAddActivity.class);
                     intent.putExtra("type", 1);
-                    intent.putExtra("isMe", isMe);
+                    String chche = object.containsKey("status") ? object.getString("status") == null ? "" : object.getString("status") : "";
+                    Log.i("gongpengming","chche="+chche);
+                    boolean me = (isMe && !"已拜访".equals(chche));
+                    Log.i("gongpengming", "me=" + me);
+                    intent.putExtra("isMe", me);
                     intent.putExtra("isAgen", true);
                     OABean bean = JSON.parseObject(object.toString(), OABean.class);
                     intent.putExtra("data", bean);
-                    startActivityForResult(intent, 0x20);
+                    startActivityForResult(intent, isMe ? 0x20 : 0x21);
                 } else if (adapter.isVisitRecord(object)) {
                     intent = new Intent(activity, VisitReportAddActivity.class);
                     intent.putExtra("type", 2);
-                    intent.putExtra("isMe", isMe);
+                    String chche = object.containsKey("status") ? object.getString("status") == null ? "" : object.getString("status") : "";
+                  Log.i("gongpengming","chche="+chche);
+                    boolean me = (isMe && !"已拜访".equals(chche) && !"".equals(chche));
+                    Log.i("gongpengming", "me=" + me);
+                    intent.putExtra("isMe", me);
                     intent.putExtra("isAgen", true);
                     intent.putExtra("data", object.toString());
-                    startActivityForResult(intent, 0x20);
+                    startActivityForResult(intent, isMe ? 0x20 : 0x21);
                 }
             }
         });
@@ -435,7 +444,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                 //判断是否为该下属
                 chche.add(object);
                 size++;
-                if (!object.containsKey("status")||(object.containsKey("status") && !StringUtils.isEmpty(object.getString("status")) && "已拜访".equals(object.getString("status")) || "已完成".equals(object.getString("status")))) {
+                if (!object.containsKey("status") || (object.containsKey("status") && !StringUtils.isEmpty(object.getString("status")) && "已拜访".equals(object.getString("status")) || "已完成".equals(object.getString("status")))) {
                     ok++;
                 }
             }

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

@@ -50,7 +50,7 @@ public class SaveMeetActivity extends BaseActivity {
                     ToastUtil.showToast(SaveMeetActivity.this, "保存会议纪要失败");
                 }
             } else if (msg.what == 0x12) {
-               Crouton.makeText(SaveMeetActivity.this, "保存会议纪要成功");
+                Crouton.makeText(SaveMeetActivity.this, "保存会议纪要成功");
                 finish();
             } else if (msg.what == 0x16) {
                 if (JSON.parseObject(message).containsKey("success") && JSON.parseObject(message).getBoolean("success")) {
@@ -146,7 +146,7 @@ public class SaveMeetActivity extends BaseActivity {
     }
 
     /**
-     * @param fileno
+     * @param fileno   文号、编号
      * @param strChche 会议纪要填写内容
      * @param id
      */
@@ -161,7 +161,6 @@ public class SaveMeetActivity extends BaseActivity {
         bean.setMd_fileno(fileno);
         bean.setMd_id(id);
         bean.setMd_recorderdate(TimeUtils.f_long_2_str(System.currentTimeMillis()));
-
         String url = CommonUtil.getSharedPreferences(this, "erp_baseurl") + "oa/meeting/saveMeetingDoc.action";
         final Map<String, Object> param = new HashMap<>();
         String formStore = FlexJsonUtil.toJson(bean);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/OAListAdapter.java

@@ -30,11 +30,9 @@ public class OAListAdapter extends BaseAdapter {
     public OAListAdapter(Context ct) {
         this.ct = ct;
     }
-
     public JSONArray getArray() {
         return array;
     }
-
     public void setArray(JSONArray array, boolean isMe) {
         this.isMe = isMe;
         this.array = array;

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

@@ -10,7 +10,6 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.Html;
 import android.text.Spanned;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
@@ -192,7 +191,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
             if (poi == null) return;
             loaction = poi.name == null ? "" : poi.name;
             addr = poi.address == null ? "" : poi.address;
-            office_addr.setText(Html.fromHtml("<font color=\'#575757\'>当前位置  " + "</font><font color=\'#000000\'>" + loaction + "</font>"));
+            office_addr.setText(Html.fromHtml("<font color=\'#575757\'>当前位置  " + "</font><font color=\'#000000\'>" + addr + "</font>"));
             latitude = poi.location.latitude;
             longitude = poi.location.longitude;
             unoffice_mm.setText(setDistance());
@@ -313,7 +312,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
         loaction = MyApplication.getInstance().getBdLocationHelper().getName();
         addr = MyApplication.getInstance().getBdLocationHelper().getAddress();
         unoffice_mm.setText(setDistance());
-        office_addr.setText(Html.fromHtml("<font color=\'#575757\'>当前位置  " + "</font><font color=\'#000000\'>" + loaction + "</font>"));
+        office_addr.setText(Html.fromHtml("<font color=\'#575757\'>当前位置  " + "</font><font color=\'#000000\'>" + addr + "</font>"));
     }
 
     private void initView() {
@@ -322,7 +321,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
         listview.setLayoutManager(new LinearLayoutManager(ct));
         adapter = new SigninAdapter(ct);
         listview.setAdapter(adapter);
-        office_addr.setText(Html.fromHtml("<font color=\'#575757\'>当前位置  " + "</font><font color=\'#000000\'>" + loaction + "</font>"));
+        office_addr.setText(Html.fromHtml("<font color=\'#575757\'>当前位置  " + "</font><font color=\'#000000\'>" + addr + "</font>"));
         loadNetData(System.currentTimeMillis());//获取打卡班次信息
     }
 

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

@@ -194,6 +194,7 @@ public class HttpClient {
             } else
                 buf.deleteCharAt(buf.length() - 1);
         }
+//        Log.i("gongpengming", "网址:" + buf.toString());
         HttpGet httpGet = new HttpGet(buf.toString());
         httpclient.getParams().setParameter(
                 CoreProtocolPNames.HTTP_CONTENT_CHARSET, "UTF-8");

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

@@ -161,6 +161,7 @@ public class ViewUtil {
                 if (isNetHas) {
                     /** @注释：处理网络请求返回结果 */
                     String result = getDataFromServer(url, params, request);
+                    Log.i("result", "url:" + (StringUtils.isEmpty(url) ? "" : url));
                     Log.i("result", "result:" + result);
                     if (result != null) {
                         if (bundle == null || message == null) {
@@ -567,7 +568,7 @@ public class ViewUtil {
                     Log.i("result", "parms：" + params.toString());
                     if (result != null) {
                         Log.i("result", "statusCode：" + result.getStatusCode());
-                       // Log.i("result", "statusCode：" +result.getResponseText());
+                        // Log.i("result", "statusCode：" +result.getResponseText());
                         LogUtil.prinlnLongMsg("result", result.getResponseText());
                         Log.i("result", "http 接收响应-----------------------------------------");
                         if (result.getStatusCode() == 200) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/OACalendarView.java

@@ -197,11 +197,19 @@ public class OACalendarView extends View implements View.OnTouchListener {
     private void drawDay(Canvas canvas) {
         float dayTextY = surface.weekHeight + surface.cellHeight * (1 - (1 - surface.dateScale) / 2);
         String chche = "";
+        //画上个月日期
+        calendar.setTime(curDate);
+        calendar.add(Calendar.MONTH, -1);
+        int startItem = calendar.getActualMaximum(Calendar.DATE) - startIndex;//获取当月有多少天
+        calendar.set(Calendar.DAY_OF_MONTH, startItem);
         for (int i = 0; i < startIndex; i++) {
-
+            float dayTextX = i * surface.cellWidth + (surface.cellWidth - surface.hineDatePaint.measureText("今")) / 2f;
+            canvas.drawText(calendar.get(Calendar.DAY_OF_MONTH) + "", dayTextX, dayTextY, surface.hineDatePaint);
+            calendar.add(Calendar.DAY_OF_MONTH, 1);
         }
+        //画当月
         for (int i = startIndex; i < date.length; i++) {
-            int item = i % 7;
+            int item = i % surface.weekText.length;
             if (i != 0 && item == 0) {
                 dayTextY += surface.cellHeight;
             }
@@ -223,6 +231,16 @@ public class OACalendarView extends View implements View.OnTouchListener {
                 drawDecorat(canvas, i, surface.decorPaint);
             }
         }
+        //画下个月日期
+        calendar.setTime(curDate);
+        calendar.add(Calendar.MONTH, 1);
+        calendar.set(Calendar.DAY_OF_MONTH, 1);
+        int next = date.length % 7 == 0 ? 0 : (date.length + (7 - date.length % 7));
+        for (int i = date.length; i < next; i++) {
+            float dayTextX = surface.cellWidth * (i % surface.weekText.length) + (surface.cellWidth - surface.datePaint.measureText("今")) / 2f;
+            canvas.drawText(calendar.get(Calendar.DAY_OF_MONTH) + "", dayTextX, dayTextY, surface.hineDatePaint);
+            calendar.add(Calendar.DAY_OF_MONTH, 1);
+        }
     }
 
     /*判断*/
@@ -351,11 +369,13 @@ public class OACalendarView extends View implements View.OnTouchListener {
         private int selectBgColor = Color.RED;//选择中的画笔颜色
         private int todayColor = Color.RED;//选择中的画笔颜色
         private int decorColor = Color.RED;//装饰画笔颜色
+        private int hineDateColor = Color.parseColor("#BFD3D3D3");//装饰画笔颜色
 
         private Paint weekPaint;//周视图的画笔
         private Paint datePaint;//月视图的画笔
         private Paint selectPaint;//选择中的画笔
         private Paint decorPaint;//装饰画笔
+        private Paint hineDatePaint;//非本月日期
 
         private float weekScale = 0.60f;//周字体大小所占的周的方框的比例
         private float downScale = 0.40f;//点击后所画的圆占框的比例
@@ -363,6 +383,7 @@ public class OACalendarView extends View implements View.OnTouchListener {
         private String[] weekText = {"日", "一", "二", "三", "四", "五", "六"};
 
         private void init() {
+
             //计算周框的高度 1.获取日期共多少行
             int dateRowNum = date.length / 7 + (date.length % 7 > 0 ? 1 : 0);
             cellHeight = weekHeight = height / (dateRowNum + 1);
@@ -386,6 +407,12 @@ public class OACalendarView extends View implements View.OnTouchListener {
             datePaint.setAntiAlias(true);
             datePaint.setTextSize(cellHeight * dateScale);
 
+            hineDatePaint = new Paint();//日期视图的画笔
+            hineDatePaint.setColor(hineDateColor);
+            hineDatePaint.setAntiAlias(true);
+            hineDatePaint.setTextSize(cellHeight * dateScale);
+
+
         }
     }
 

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -221,13 +222,19 @@
                 android:layout_marginLeft="20dp"
                 android:layout_toRightOf="@+id/tv_id6"
                 android:text="*"
-                android:textColor="@color/red" />
+                android:textColor="@color/red"
+                android:id="@+id/textView" />
 
-            <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+            <com.andreabaccega.widget.FormEditText
                 android:id="@+id/tv_visit_theme"
                 style="@style/form_relative_right_text"
                 android:hint="请输入"
-                editTextFormExample:testType="nocheck" />
+                editTextFormExample:testType="nocheck"
+                android:layout_centerVertical="true"
+                android:layout_toRightOf="@+id/textView"
+                android:layout_toEndOf="@+id/textView"
+                android:layout_marginLeft="11dp"
+                android:layout_marginStart="11dp" />
         </RelativeLayout>
 
         <RelativeLayout