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

WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/SigninDao.java

@@ -187,7 +187,7 @@ public class SigninDao {
         String master = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_master");
         String where = "emCode=? and master=?";
         String[] args = {emCode, master};
-        boolean b = deleteSignin(where, args);
+        deleteSignin(where, args);
         insertSignin(beans);
         return false;
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -202,10 +202,9 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
                 if (mWorksFragment == null) {
                     mWorksFragment = new WorksFragment();
                 }
-                changeFragment(mWorksFragment, TAG_NEARBY);//
+                changeFragment(mWorksFragment, TAG_NEARBY);
                 getSupportActionBar().setTitle(R.string.nearby);
 //                PreferenceUtils.putLong(mContext, TIME_MAIN, timeMin);
-                unWorkReadTV.setVisibility(View.GONE);
             }
         /*	else if (checkedId == R.id.main_tab_four) {
                 if (mGroupChatFragment == null) {
@@ -220,6 +219,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
                 }
                 changeFragment(mMeFragment, TAG_ME);//我
                 getSupportActionBar().setTitle(R.string.me);
+                unWorkReadTV.setVisibility(View.GONE);
             }
         }
     };

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

@@ -63,8 +63,8 @@ public class AlarmaActivity extends BaseActivity implements View.OnClickListener
         tv_ualar.setOnClickListener(this);
         isalarma_sw.setOnCheckedChangeListener(this);
         auto_signin_sw.setOnCheckedChangeListener(this);
-        int u = CommonUtil.getSharedPreferencesInt(ct, "ALARM_OFFWORK_TIME", 5);
-        int d = CommonUtil.getSharedPreferencesInt(ct, "ALARM_WORK_TIME", 5);
+        int d = CommonUtil.getSharedPreferencesInt(ct, "ALARM_OFFWORK_TIME", 5);
+        int u = CommonUtil.getSharedPreferencesInt(ct, "ALARM_WORK_TIME", 5);
         tv_alar.setText("提前" + u + "分钟");
         tv_ualar.setText("延迟" + d + "分钟");
 

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

@@ -324,7 +324,7 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
                 if (array != null && array.size() > 0) {
                     for (int i = 0; i < array.size(); i++) {
                         name.append(";" + array.getJSONObject(i).getString("EM_NAME"));
-                        emcome.append(";employee#" + array.getJSONObject(i).getString("EM_CODE"));
+                        emcome.append(";employee#" + array.getJSONObject(i).getString("EM_ID"));
                     }
                     name.delete(0, 1);
                     emcome.delete(0, 1);

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

@@ -77,7 +77,8 @@ public class SaveMeetActivity extends BaseActivity {
                                 sendToSelect(data);
                             }
                         } else {//只有一个审批人
-                            submitMeeting(id);
+                            //TODO 只有一个审批人
+//                            submitMeeting(id);
                         }
                     } catch (Exception e) {
                         ToastMessage("解析数据错误");
@@ -100,9 +101,8 @@ public class SaveMeetActivity extends BaseActivity {
                     }
                     break;
                 case 0x17://提交审批流
-                    finish();
 //                    TODO 先关闭发布版本
-//                    judgeApprovers();
+                    judgeApprovers();
                     break;
                 default:
                     JsonValidator validator = new JsonValidator();

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

@@ -101,7 +101,6 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
     private boolean onActivityResult = false;//返回
     private BdLocationHelper locationHelper = null;//
     private int loginNum = 0; //登陆次数
-    private boolean isReOne = true;//判断是否是第一次重新定位
     private boolean isMacInNet = true;//是否提交过mac地址
     private String macError = null;//mac错误信息
     private String macAddress;
@@ -124,6 +123,8 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                             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");
+                            CommonUtil.setSharedPreferences(ct, "companyX", (float) companyX);
+                            CommonUtil.setSharedPreferences(ct, "companyY", (float) companyY);
                             unoffice_mm.setText(setDistance());
                             if (loginNum < 3 && distance > 1000000) {
                                 returnLogin();
@@ -274,6 +275,10 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
 //                            doSignin(code);
 //                        }
 //                    });
+                    if (StringUtils.isEmpty(macAddress)) {   //当mac地址不合法时候，提示开启wifi后获取，不然不给进下一步
+                        macAddress = util.getMac(ct);
+                        return;
+                    }
                     if (isMacInNet) {
                         validatorMac();
                     } else {
@@ -360,7 +365,6 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                 int resultCode = MyApplication.getInstance().getBdLocationHelper().getResultCode();
                 if (isOk) {
                     setBaiduLocation();
-                    isReOne = false;
                 } else {
                     if (resultCode == 62) {
                         Crouton.makeText(ct, "定位失败，请查看是否开启定位权限", 2000);
@@ -381,7 +385,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                     Log.i("gongpengming", "isOpen=" + isOpen);
                     if (isOpen) {
                         macAddress = util.getMac(ct);
-                        Log.i("gongpengming","");
+                        Log.i("gongpengming", "");
                     }
                 }
             });
@@ -420,7 +424,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                         //TODO 调转到申请更换手机界面
                         dialog.dismiss();
                         Intent intent = new Intent(ct, ChangeMobileActivity.class);
-                        intent.putExtra("macAddress",macAddress);
+                        intent.putExtra("macAddress", macAddress);
                         startActivityForResult(intent, 0x18);
                     }
 
@@ -713,7 +717,6 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
     private void validatorMac() {
         //获取网络数据
         String url = "mobile/addMobileMac.action";
-
         Map<String, Object> param = new HashMap<>();
         param.put("macAddress", macAddress);
         loadNet(url, param, 0x17);

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

@@ -357,6 +357,14 @@ public class CommonUtil {
         }
     }
 
+    public static void setSharedPreferences(Context ct, String key, float value) {
+        if (key != null) {
+            SharedPreferences sPreferences = ct.getSharedPreferences(AppShareName, Context.MODE_PRIVATE);
+            sPreferences.edit().putFloat(key, value);
+            sPreferences.edit().putFloat(key, value).apply();
+        }
+    }
+
     public static boolean setSharedPreferences(Context ct, String key, String value) {
         if (key != null) {
             SharedPreferences sPreferences = ct.getSharedPreferences(AppShareName, Context.MODE_PRIVATE);
@@ -442,8 +450,15 @@ public class CommonUtil {
         long value = sPreferences.getLong(key, 0);
         return value;
     }
-
-    public static int getSharedPreferencesInt(Context ct, String key,int defValues) {
+    public static double getSharedPreferencesfloat(Context ct, String key, float defValues) {
+        if (key == null) {
+            return 0;
+        }
+        SharedPreferences sPreferences = ct.getSharedPreferences(AppShareName, Context.MODE_PRIVATE);
+        double value = sPreferences.getFloat(key, defValues);
+        return value;
+    }
+    public static int getSharedPreferencesInt(Context ct, String key, int defValues) {
         if (key == null) {
             return 0;
         }

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

@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.database.SQLException;
 import android.os.Handler;
 import android.os.Message;
+import android.util.Log;
 import android.widget.Toast;
 
 import com.xzjmyk.pm.activity.BdLocationHelper;
@@ -16,6 +17,7 @@ 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.StringUtils;
+import com.xzjmyk.pm.activity.util.BaiduMapUtil;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -62,7 +64,6 @@ public class AlarmReceiver extends BroadcastReceiver {
 
     //签到
     private void doSignin(Context ct, String code) {
-
         Map<String, Object> param = new HashMap<>();
         Map<String, Object> form = new HashMap<>();
         form.put("cl_code", code);
@@ -73,10 +74,14 @@ public class AlarmReceiver extends BroadcastReceiver {
             BdLocationHelper helper = MyApplication.getInstance().getBdLocationHelper();
             form.put("cl_address", helper.getAddress());
             form.put("cl_location", helper.getName());
+            double companyX = CommonUtil.getSharedPreferencesfloat(ct, "companyX", 0);
+            double companyY = CommonUtil.getSharedPreferencesfloat(ct, "companyY", 0);
+            Log.i("gongpengming", "companyX=" + companyX);
+            Log.i("gongpengming", "companyY=" + companyY);
             double latitude = helper.getLatitude();
             double longitude = helper.getLongitude();
-//            String distance = BaiduMapUtil.getInstence().getDistance(companyX, companyY, latitude, longitude);
-            form.put("cl_distance", 90);
+            String distance = BaiduMapUtil.getInstence().getDistance(companyX, companyY, latitude, longitude);
+            form.put("cl_distance", distance);
         } catch (NullPointerException e) {
 
         } catch (SQLException e) {