外勤签到图片水印，取消本地图片选择

WeiChat/build.gradle

@@ -8,7 +8,7 @@ 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

@@ -95,6 +95,7 @@
     <application
         android:name=".MyApplication"
         android:allowBackup="true"
+        android:hardwareAccelerated="false"
         android:icon="@drawable/uuu"
         android:label="@string/app_name"
         android:largeHeap="true"
@@ -152,7 +153,7 @@
         <activity android:name=".ui.erp.activity.InformActivity" />
         <activity android:name=".ui.erp.activity.TaskActivity" />
         <activity android:name=".ui.erp.activity.ScheduleActivity" />
-        <activity android:name=".ui.erp.activity.SubscribeDetailActivity"/>
+        <activity android:name=".ui.erp.activity.SubscribeDetailActivity" />
         <!-- Contacts 模块 -->
         <activity android:name=".ui.erp.activity.CompanyContactsActivity" />
         <!-- 通用的activity 加载fragment -->

WeiChat/src/main/java/com/xzjmyk/pm/activity/BdLocationHelper.java

@@ -43,7 +43,7 @@ public class BdLocationHelper {
         LocationClientOption option = new LocationClientOption();
         option.setLocationMode(LocationClientOption.LocationMode.Hight_Accuracy);//可选，默认高精度，设置定位模式，高精度，低功耗，仅设备
         option.setCoorType("bd09ll");//可选，默认gcj02，设置返回的定位结果坐标系
-        option.setScanSpan(5000);// 设置发起定位请求的间隔时间为10s;//可选，默认0，即仅定位一次，设置发起定位请求的间隔需要大于等于1000ms才是有效的
+        option.setScanSpan(0);// 设置发起定位请求的间隔时间为10s;//可选，默认0，即仅定位一次，设置发起定位请求的间隔需要大于等于1000ms才是有效的
         option.setIsNeedAddress(true);//可选，设置是否需要地址信息，默认不需要
         option.setOpenGps(true);//可选，默认false,设置是否使用gps
         option.setLocationNotify(true);//可选，默认false，设置是否当gps有效时按照1S1次频率输出GPS结果
@@ -83,7 +83,7 @@ public class BdLocationHelper {
             if (location != null) {
                 resultCode = location.getLocType();
             }
-            BdLocationHelper.this.resultCode=resultCode;
+            BdLocationHelper.this.resultCode = resultCode;
             // 百度定位失败
             if (resultCode != BDLocation.TypeGpsLocation && resultCode != BDLocation.TypeCacheLocation
                     && resultCode != BDLocation.TypeOffLineLocation && resultCode != BDLocation.TypeNetWorkLocation) {

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

@@ -5,7 +5,7 @@ package com.xzjmyk.pm.activity.bean.oa;
  */
 public class OutSigninBean {
     private String mo_code;
-    private String mo_signtime;
+//    private String mo_signtime;
     private String mo_address;
     private String mo_mancode;
     private String mo_man;
@@ -29,14 +29,6 @@ public class OutSigninBean {
         this.mo_company = mo_company;
     }
 
-    public String getMo_signtime() {
-        return mo_signtime;
-    }
-
-    public void setMo_signtime(String mo_signtime) {
-        this.mo_signtime = mo_signtime;
-    }
-
     public String getMo_address() {
         return mo_address;
     }

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

@@ -89,17 +89,18 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
     }
 
     private void initListener() {
-        tv_address_refresh.setOnClickListener(this);
-        tv_date_start.setOnClickListener(this);
-        tv_date_end.setOnClickListener(this);
-        tv_date_start.setKeyListener(null);
-        tv_date_end.setKeyListener(null);
-        tv_customer_login.setOnClickListener(this);
-        tv_visit_steps.setKeyListener(null);
-        tv_relate_business.setKeyListener(null);
-        tv_visit_steps.setOnClickListener(this);
-        tv_relate_business.setOnClickListener(this);
-        if (!getIntent().getBooleanExtra("isMe", true)) {
+        if (getIntent().getBooleanExtra("isMe", true)) {
+            tv_address_refresh.setOnClickListener(this);
+            tv_date_start.setOnClickListener(this);
+            tv_date_end.setOnClickListener(this);
+            tv_date_start.setKeyListener(null);
+            tv_date_end.setKeyListener(null);
+            tv_customer_login.setOnClickListener(this);
+            tv_visit_steps.setKeyListener(null);
+            tv_relate_business.setKeyListener(null);
+            tv_visit_steps.setOnClickListener(this);
+            tv_relate_business.setOnClickListener(this);
+        } else {
             //当不可编辑tv_date_end
             tv_date_start.setFocusable(false);
             tv_date_end.setFocusable(false);
@@ -139,6 +140,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             tv_address_login.setText(getJSONString(object, "address"));
             tv_visit_theme.setText(getJSONString(object, "vr_title"));
             tv_visit_steps.setText(getJSONString(object, "vr_nichestep"));
+            tv_visit_content.setText(getJSONString(object, "vr_detail"));
         }
     }
 
@@ -285,6 +287,9 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
                             "\"vr_cuname\":\"" +
                             CommonUtil.getNoMarkEditText(tv_customer_login) +
                             "\",\n" +
+                            "\"vr_cucontact\":\"" +
+                            CommonUtil.getNoMarkEditText(tv_linksman_login) +
+                            "\",\n" +
                             "\"vr_contact\":\"" +
                             CommonUtil.getNoMarkEditText(tv_linksman_login) +
                             "\",\n" +
@@ -297,7 +302,6 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
                             "\"vr_detail\":\"" +
                             CommonUtil.getNoMarkEditText(tv_visit_content) +
                             "\",\n" +
-
                             "\"vr_recorddate\":\"" +
                             DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd") +
                             "\",\n" +

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

@@ -30,6 +30,7 @@ import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
 import com.xzjmyk.pm.activity.util.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.DateFormatUtil;
 import com.xzjmyk.pm.activity.util.StringUtils;
+import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
 
 import java.util.ArrayList;
@@ -151,7 +152,14 @@ public class VisitReportPlanActivity extends BaseActivity implements View.OnClic
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.btn_save:
-                sendHttpResquest(Constants.HTTP_SUCCESS_INIT);
+                String start = tv_date_select.getText().toString().trim();
+                String end = tv_date_end.getText().toString().trim();
+                if (!StringUtils.isEmpty(start) && !StringUtils.isEmpty(end) && start.compareTo(end) < 0) {
+                    sendHttpResquest(Constants.HTTP_SUCCESS_INIT);
+                } else {
+                    Crouton.makeText(ct, "开始时间不能小于结束时间");
+                }
+
                 break;
             case android.R.id.home:
                 onBackPressed();

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

@@ -10,7 +10,6 @@ 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;
@@ -274,9 +273,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                     intent = new Intent(activity, VisitReportAddActivity.class);
                     intent.putExtra("type", 1);
                     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);
@@ -286,9 +283,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                     intent = new Intent(activity, VisitReportAddActivity.class);
                     intent.putExtra("type", 2);
                     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());

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

@@ -1,6 +1,8 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
 import android.app.Activity;
+import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.AsyncTask;
@@ -14,7 +16,7 @@ import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.WindowManager;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -105,19 +107,13 @@ public class OutSigninOKActivity extends BaseActivity {
                         doSignin(code, 0);
                     }
                 });
+        } else if (item.getItemId() == android.R.id.home) {
+            InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.hideSoftInputFromWindow(text_edit.getWindowToken(), 0);
         }
         return super.onOptionsItemSelected(item);
     }
 
-    @Override
-    protected void onStop() {
-        super.onStop();
-        if (getWindow().getAttributes().softInputMode == WindowManager.LayoutParams.SOFT_INPUT_STATE_UNSPECIFIED) {
-            //隐藏软键盘
-            getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
-        }
-    }
-
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.menu_push, menu);
@@ -382,7 +378,7 @@ public class OutSigninOKActivity extends BaseActivity {
         bean.setMo_remark(text_edit.getText().toString());
         bean.setMo_attachid(id);
         bean.setMo_company(com_tv.getText().toString().trim());
-        bean.setMo_signtime(TimeUtils.f_long_2_str(System.currentTimeMillis()));
+//        bean.setMo_signtime(TimeUtils.f_long_2_str(System.currentTimeMillis()));
         String formStore = FlexJsonUtil.toJson(bean);
         String caller = "mobile_outsign";
         param.put("caller", caller);

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

@@ -96,7 +96,7 @@ public class SelectListActivity extends BaseActivity {
                     break;
                 case VISIT_NICHECODES:
                     message = msg.getData().getString("result");
-                    Log.d("handlemessage:",message);
+                    Log.d("handlemessage:", message);
                     if (JSON.parseObject(message) != null ||
                             JSON.parseObject(message).containsKey("success") || JSON.parseObject(message).getBoolean("success")
                             && JSON.parseObject(message).containsKey("stages")) {
@@ -184,6 +184,7 @@ public class SelectListActivity extends BaseActivity {
     private void init() {
         recycler = (ListView) findViewById(R.id.list);
         emptyLayout = new EmptyLayout(ct, recycler);
+        emptyLayout.setEmptyViewRes(R.layout.view_empty);
         emptyLayout.setShowLoadingButton(false);
         emptyLayout.setShowEmptyButton(false);
         emptyLayout.setShowErrorButton(false);
@@ -232,6 +233,7 @@ public class SelectListActivity extends BaseActivity {
             }
         });
     }
+
     public void nichecodes(String chche) {
         progressDialog.show();
         String url = Constants.getAppBaseUrl(ct) + "mobile/crm/getnichecodes.action";

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

@@ -0,0 +1,21 @@
+package com.xzjmyk.pm.activity.ui.erp.fragment;
+
+import android.os.Bundle;
+
+import com.xzjmyk.pm.activity.ui.base.EasyFragment;
+
+/**
+ * Created by pengminggong on 2016/10/12.
+ */
+
+public class ContactFragment extends EasyFragment {
+    @Override
+    protected int inflateLayoutId() {
+        return 0;
+    }
+
+    @Override
+    protected void onCreateView(Bundle savedInstanceState, boolean createView) {
+
+    }
+}

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

@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.text.Html;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -21,6 +22,8 @@ import com.baidu.mapapi.model.LatLng;
 import com.baidu.mapapi.search.core.PoiInfo;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.xzjmyk.pm.activity.AppConfig;
+import com.xzjmyk.pm.activity.BdLocationHelper;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.helper.AvatarHelper;
@@ -98,7 +101,7 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
                     if (object.containsKey("success") && object.getBoolean("success")) {
                         isAdmin = object.containsKey("isAdmin") ? ("1".equals(object.getString("isAdmin")) ? true : false) : false;
                     }
-                    if (!isAdmin){
+                    if (!isAdmin) {
                         ct.getWindow().findViewById(R.id.title).setVisibility(View.GONE);
                     }
                     break;
@@ -225,21 +228,43 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
         AvatarHelper.getInstance().displayAvatar(loginUserId, name_img, true);
         name_tv.setText(MyApplication.getInstance().mLoginUser.getNickName());
         com_tv.setText(CommonUtil.getSharedPreferences(ct, "erp_commpany"));
+        setLocation();
+        do_trim.setOnClickListener(this);
+        click_btn.setOnClickListener(this);
+        if (isAddress)
+            do_trim.setVisibility(View.VISIBLE);
+        else
+            do_trim.setVisibility(View.GONE);
+        BdLocationHelper locationHelper = MyApplication.getInstance().getBdLocationHelper();
+        locationHelper.requestLocation();
+        locationHelper.setListener(new BdLocationHelper.OnBaiduResultListener() {
+            @Override
+            public void result(boolean isOk) {
+                int resultCode = MyApplication.getInstance().getBdLocationHelper().getResultCode();
+                if (isOk) {
+                    setLocation();
+                } else {
+                    if (resultCode == 62) {
+                        Crouton.makeText(ct, "定位失败，请查看是否开启定位权限", 2000);
+                    }
+                }
+            }
+        });
+    }
+
+    private void setLocation() {
+        if (AppConfig.DEBUG) {
+            Log.i("gongpengming", "进来了");
+        }
         String name = MyApplication.getInstance().getBdLocationHelper().getName();
         String addr = MyApplication.getInstance().getBdLocationHelper().getAddress();
-        out_add_name_tv.setText(name);
-        out_add_t_tv.setText(addr);
         double latitude = MyApplication.getInstance().getBdLocationHelper().getLatitude();
         double longitude = MyApplication.getInstance().getBdLocationHelper().getLongitude();
+        out_add_name_tv.setText(name);
+        out_add_t_tv.setText(addr);
         point = new LatLng(latitude, longitude);
         baseAddr = StringUtils.isEmail(name) ? addr : name;
         BaiduMapUtil.getInstence().setMapViewPoint(mapView, point);
-        do_trim.setOnClickListener(this);
-        click_btn.setOnClickListener(this);
-        if (isAddress)
-            do_trim.setVisibility(View.VISIBLE);
-        else
-            do_trim.setVisibility(View.GONE);
     }
 
     private void initData() {

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

@@ -107,7 +107,7 @@ 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");
+                            companyDistance = Integer.parseInt(jsonObject.containsKey("distance") ? (StringUtils.isEmpty(jsonObject.getString("distance")) ? "-1" : jsonObject.getString("distance")) : "-1");
                             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());
@@ -124,7 +124,6 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                     } else {
                         //如果返回失败
                         Crouton.makeText(ct, "系统尚未找到您的班次，请联系管理员设置班次");
-
                     }
                     break;
                 case 0x12:
@@ -142,13 +141,8 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                         Crouton.makeText(ct, "签到失败");
                     break;
                 case 0x19:
-                    final String str = msg.getData().getString("time");
-                    CodeUtil.getInstance().getCode(ct, "CardLog", new CodeUtil.OnCodeLinstener() {
-                        @Override
-                        public void callBack(String code) {
-                            doSignin(code, StringUtils.isEmpty(str) ? TimeUtils.f_long_2_str(time) : str);
-                        }
-                    });
+                    String str = msg.getData().getString("time");
+                    signinTime = StringUtils.isEmpty(str) ? TimeUtils.f_long_2_str(time) : str;
                     break;
                 default:
                     if ("网络未连接!".equals(message))
@@ -252,6 +246,12 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
             Crouton.makeText(ct, "当前网络不可用，请检查网络连接");
             return;
         }
+        CodeUtil.getInstance().getCode(ct, "CardLog", new CodeUtil.OnCodeLinstener() {
+            @Override
+            public void callBack(String code) {
+                doSignin(code);
+            }
+        });
         new Thread() {
             @Override
             public void run() {
@@ -306,8 +306,10 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
             public void result(boolean isOk) {
                 int resultCode = MyApplication.getInstance().getBdLocationHelper().getResultCode();
                 if (isOk) {
-                    if (resultCode != 66)
-                        setBaiduLocation();
+                    setBaiduLocation();
+                    if (distance > companyDistance && !isOpenGps()) {
+                        Crouton.makeText(ct, "如果发现定位不准，请及时打开gps并重新定位", 1000);
+                    }
                 } else {
                     if (resultCode == 62) {
                         Crouton.makeText(ct, "定位失败，请查看是否开启定位权限", 2000);
@@ -324,7 +326,6 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
         loaction = MyApplication.getInstance().getBdLocationHelper().getName();
         addr = MyApplication.getInstance().getBdLocationHelper().getAddress();
         unoffice_mm.setText(setDistance());
-        Crouton.makeText(ct, "当前位置=" + addr + "距离=" + setDistance(), 2000);
         office_addr.setText(Html.fromHtml("<font color=\'#575757\'>当前位置  " + "</font><font color=\'#000000\'>" + addr + "</font>"));
     }
 
@@ -337,12 +338,6 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
         office_addr.setText(Html.fromHtml("<font color=\'#575757\'>当前位置  " + "</font><font color=\'#000000\'>" + addr + "</font>"));
         loadNetData(System.currentTimeMillis());//获取打卡班次信息
         //判断是否有定位权限
-//        PermissionUtil util = new PermissionUtil(ct);
-//        String[] permission = {Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION};
-//
-//        if (!util.hasPermissionGranted(permission)) {
-//            Crouton.makeText(ct, "定位权限被禁止,请到设置中打开", 3000);
-//        }
         if (!isOpenGps()) {
             Crouton.makeText(ct, "为了更好体验，请打开GPS", 3000);
         }
@@ -368,7 +363,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
 
     private boolean isPlay() {
         if (!CommonUtil.isNetWorkConnected(ct)) {
-            Crouton.makeText(ct, "网络错误");
+            Crouton.makeText(ct, "当前网络不可用，请检查网络连接");
             return false;
         }
         if (isSignining) {
@@ -468,16 +463,16 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
         Bean b = null;
         //上午
         b = new Bean();
-        b.startTime = object.containsKey("as_amstarttime") ? object.getString("as_amstarttime") : "08:30";
+        b.startTime = object.containsKey("as_amstarttime") ? object.getString("as_amstarttime") : "00:00";
         b.startSignin = getEndSignin(b.startTime, true);
-        b.endTime = object.containsKey("as_amendtime") ? object.getString("as_amendtime") : "12:00";
+        b.endTime = object.containsKey("as_amendtime") ? object.getString("as_amendtime") : "00:00";
         b.endSignnin = getEndSignin(b.endTime, false);
         beans.add(b);
         //下午
         b = new Bean();
-        b.startTime = object.containsKey("as_pmstarttime") ? object.getString("as_pmstarttime") : "13:30";
+        b.startTime = object.containsKey("as_pmstarttime") ? object.getString("as_pmstarttime") : "00:00";
         b.startSignin = getEndSignin(b.startTime, true);
-        b.endTime = object.containsKey("as_pmendtime") ? object.getString("as_pmendtime") : "18:00";
+        b.endTime = object.containsKey("as_pmendtime") ? object.getString("as_pmendtime") : "00:00";
         b.endSignnin = getEndSignin(b.endTime, false);
         beans.add(b);
         setDataForAdapter(beans);
@@ -542,6 +537,9 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
 
     //在设置完数据以后放到适配器中
     private void setDataForAdapter(ArrayList<Bean> beans) {
+        if (companyDistance == -1 || (companyX == 0 && companyY == 0)) {
+            Crouton.makeText(ct, "未获取正确考勤地点，请重试或重新登陆");
+        }
         if (adapter == null) {
             adapter = new SigninAdapter(ct);
             adapter.setBeans(beans, isToday);
@@ -587,9 +585,8 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
 
 
     //签到
-    private void doSignin(String code, String time) {
+    private void doSignin(String code) {
         isSignining = true;
-        signinTime = time;
         signin_btn.setFocusable(false);
         String url = "mobile/saveCardLog.action";
         final Map<String, Object> param = new HashMap<>();
@@ -597,7 +594,6 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
         bean.setCl_code(code);
         bean.setCl_distance(distance);
         bean.setCl_emcode(CommonUtil.getSharedPreferences(ct, "erp_username"));
-//      bean.setCl_time(time);
         bean.setCl_location(loaction);
         bean.setCl_address(addr);
         bean.setCl_emname(MyApplication.getInstance().mLoginUser.getNickName());

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

@@ -9,6 +9,7 @@ import android.view.MotionEvent;
 import android.view.View;
 
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
+import com.xzjmyk.pm.activity.util.DisplayUtil;
 
 import java.util.Calendar;
 import java.util.Date;
@@ -17,7 +18,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 
-
 /**
  * Created by pengminggong on 2016/9/20.
  */
@@ -197,7 +197,7 @@ public class OACalendarView extends View implements View.OnTouchListener {
 
     //画日期
     private void drawDay(Canvas canvas) {
-        float dayTextY = surface.weekHeight + surface.cellHeight - (surface.cellHeight - surface.dateTaxtSize) / 2;
+        float dayTextY = surface.weekHeight +(surface.cellHeight +surface.dateTaxtSize) / 2;
         String chche = "";
         //画上个月日期
         calendar.setTime(curDate);
@@ -383,7 +383,8 @@ public class OACalendarView extends View implements View.OnTouchListener {
         private String[] weekText = {"日", "一", "二", "三", "四", "五", "六"};
 
         private void init() {
-            downTaxtSize = (dateTaxtSize + 22) / 2;
+            dateTaxtSize = weekTaxtSize = DisplayUtil.dip2px(getContext(), 18);
+            downTaxtSize = (dateTaxtSize + DisplayUtil.dip2px(getContext(), 10)) / 2;
             //计算周框的高度 1.获取日期共多少行
             int dateRowNum = date.length / 7 + (date.length % 7 > 0 ? 1 : 0);
             cellHeight = weekHeight = height / (dateRowNum + 1);
@@ -411,7 +412,6 @@ public class OACalendarView extends View implements View.OnTouchListener {
             hineDatePaint.setColor(hineDateColor);
             hineDatePaint.setAntiAlias(true);
             hineDatePaint.setTextSize(dateTaxtSize);
-
         }
     }
 

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

@@ -218,23 +218,22 @@
                 android:textSize="@dimen/text_main" />
 
             <TextView
+                android:id="@+id/textView"
                 style="@style/form_relative_left_text"
                 android:layout_marginLeft="20dp"
                 android:layout_toRightOf="@+id/tv_id6"
                 android:text="*"
-                android:textColor="@color/red"
-                android:id="@+id/textView" />
+                android:textColor="@color/red" />
 
             <com.andreabaccega.widget.FormEditText
                 android:id="@+id/tv_visit_theme"
                 style="@style/form_relative_right_text"
-                android:hint="请输入"
-                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" />
+                android:layout_toEndOf="@+id/textView"
+                android:layout_toRightOf="@+id/textView"
+                android:hint="请输入"
+                editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -292,7 +291,7 @@
                 android:layout_toRightOf="@+id/tv_id9"
                 android:text="*"
                 android:textColor="@color/red"
-                android:visibility="gone"/>
+                android:visibility="gone" />
 
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/tv_relate_business"