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

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

@@ -69,11 +69,9 @@ public class SigninDao {
             db.setTransactionSuccessful();
             isOk = true;
         } catch (SQLException e) {
-            testShow("SQLException",e.getMessage());
             isException = true;
             e.printStackTrace();
         } catch (Exception e) {
-            testShow("Exception",e.getMessage());
             isException = true;
             e.printStackTrace();
         } finally {
@@ -167,13 +165,10 @@ public class SigninDao {
             String where = "emCode=? and master=? and startTime=? and endTime=?";
             String[] whereArgs = {emCode, master, bean.getStartTime(), bean.getEndTime()};
             int i = db.update(titleName, values, where, whereArgs);
-            testShow("i", String.valueOf(i));
         } catch (SQLException e) {
-            testShow("SQLException", e.getMessage());
             e.printStackTrace();
             return false;
         } catch (Exception e) {
-            testShow("Exception", e.getMessage());
             e.printStackTrace();
             return false;
         } finally {
@@ -233,13 +228,6 @@ public class SigninDao {
         String select = "emCode=? and master=? ";
         String[] args = {emCode, master};
         beans = querySignin(select, args);
-        for (SigninBean e : beans) {
-            testShow("e.getWorkTime()=", e.getWorkTime());
-            testShow("e.getWorkSignin()=", e.getWorkSignin());
-            testShow("e.getOffTime()=", e.getOffTime());
-            testShow("e.getOffSignin()=", e.getOffSignin());
-            testShow("+++++++++++++++++++++", "+++++++++++++++++++++");
-        }
         return beans == null ? new ArrayList<SigninBean>() : beans;
     }
 

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

@@ -43,7 +43,6 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment;
 import com.xzjmyk.pm.activity.ui.erp.fragment.ContactFragment;
 import com.xzjmyk.pm.activity.ui.erp.fragment.WorksFragment;
-import com.xzjmyk.pm.activity.ui.erp.util.alarm.AlarmService;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.find.MyFriendFragment;
 import com.xzjmyk.pm.activity.ui.groupchat.GroupChatFragment;
@@ -392,8 +391,6 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         super.onCreate(savedInstanceState);
         getSupportActionBar().setDisplayShowHomeEnabled(false);
         getSupportActionBar().setDisplayHomeAsUpEnabled(false);
-        Intent alarmService = new Intent(ct, AlarmService.class);
-        startService(alarmService);
         setContentView(R.layout.activity_main);
         SIP_USERNAME = MyApplication.getInstance().mLoginUser.getUserId();
         String host = mConfig.MeetingHost;
@@ -401,17 +398,17 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         SIP_SERVER_HOST = host == null ? "120.24.211.24" : host;
         Log.i("wang", "token:" + MyApplication.getInstance().mAccessToken);
         Log.i("wang", "usId:" + MyApplication.getInstance().mLoginUser.getUserId());
-        Log.i("wang", "usId:" +  CommonUtil.getMetaValue(this, "api_key"));
+        Log.i("wang", "usId:" + CommonUtil.getMetaValue(this, "api_key"));
         //TODO 百度开始推送
         PushManager.startWork(getApplicationContext(), PushConstants.LOGIN_TYPE_API_KEY,
-                CommonUtil.getMetaValue(this,"api_key"));
-        
-        
+                CommonUtil.getMetaValue(this, "api_key"));
+
+
         int isPush = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.BAIDU_PUSH);
         if (isPush == 0) {
             PushManager.stopWork(this);
         }
-        
+
         mActivityManager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
         if (savedInstanceState != null) {
             restoreState(savedInstanceState);

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

@@ -117,9 +117,8 @@ public class CompanyContactsActivity extends BaseActivity {
     private final int LOAD_SUCCESS_LEAFHRORG_RIGHTANDLEFT = 6;
     private final int LOAD_SUCCESS_EMPLOYEE = 4;
     private final int LOAD_SUCCESS_EMPLOYEEINFO = 3;
-    private String depart;//当前所处部门
     private Handler mHandler = new Handler() {
-        public void handleMessage(android.os.Message msg) {
+        public void handleMessage( Message msg) {
             HrorgsEntity hEntity;
             switch (msg.what) {
                 case UPDATE_CHANGE_MASTER:
@@ -129,7 +128,6 @@ public class CompanyContactsActivity extends BaseActivity {
                         String date = manager.select_getCacheTime(
                                 new String[]{commpany, master},
                                 "ed_company=? and ed_whichsys=?");
-                        //Log.i(TAG, "数据库缓存时间：" + date);
                         LoadServerData(master, date);
                     } else {
                         if (reScrollView.isRefreshing()) {

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

@@ -125,7 +125,6 @@ public class MyFriendActivity extends BaseActivity {
     }
 
 
-
     private void initView() {
         mPullToRefreshListView = (PullToRefreshListView) findViewById(R.id.pull_refresh_list);
         mTextDialog = (TextView) findViewById(R.id.text_dialog);
@@ -315,14 +314,18 @@ public class MyFriendActivity extends BaseActivity {
             emList = manager.select_getEmployee(new String[]{master}, "whichsys=?");
         }
         if (ListUtils.isEmpty(emList)) return;
-        if (!ListUtils.isEmpty(friends)) {
+        if (friends.isEmpty()) return;
+        for (EmployeesEntity e : emList) {
+            int em_imid = e.getEm_IMID();
+            if (em_imid == 0) continue;
             for (int i = 0; i < friends.size(); i++) {
                 String id = friends.get(i).getUserId();
-                for (int j = 0; j < emList.size(); j++) {
-                    if (id.equals(String.valueOf(emList.get(j).getEm_IMID()))) {
-                        getFriendByRep(emList.get(j), friends.get(i));
-                        break;
-                    }
+                if (id.equals(mLoginUserId)) {//当前用户，去除
+                    friends.remove(i);
+                    break;
+                }
+                if (String.valueOf(em_imid).equals(id)) {
+                    getFriendByRep(e, friends.get(i));
                 }
             }
         }
@@ -349,8 +352,6 @@ public class MyFriendActivity extends BaseActivity {
     }
 
 
-
-
     String HASHCODE = Integer.toHexString(this.hashCode()) + "@";
 
 

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

@@ -140,7 +140,10 @@ public class AddMeetTaskActivity extends BaseActivity {
         String url = CommonUtil.getSharedPreferences(this, "erp_baseurl") + "common/datalist/data.action";
         String emcode = CommonUtil.getSharedPreferences(ct, "erp_username");
         String caller = "ResourceAssignment";
-        String name = MyApplication.getInstance().mLoginUser.getNickName();
+        String name = CommonUtil.getSharedPreferences(ct, "erp_emname");
+        if (StringUtils.isEmpty(name)) {
+            name = MyApplication.getInstance().mLoginUser.getNickName().trim();
+        }
         //添加限制   or ( =" + "'" + emcode + "')  recorder
         String condition = "(ra_resourcecode='" + emcode + "'  or " + "recorder=" + "'" + name + "'" + ") and " + "(taskorschedule='MTask' and " + "ra_taskname='" + meetName + "') ";
         final Map<String, Object> param = new HashMap<>();

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

@@ -33,8 +33,6 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import static u.aly.av.m;
-
 public class MeetDetailsActivity extends BaseActivity implements View.OnClickListener {
     @ViewInject(R.id.name_tv)
     private TextView name_tv;
@@ -67,6 +65,7 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
     private final int whatLoad = 0x11, SIGNNIN = 0x12, ENDMEET = 0x13;
     private int ma_id;
     private String ma_code;
+    private String emname;
     private boolean isPlay = true;
     private Handler handler = new Handler() {
         @Override
@@ -146,6 +145,10 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_meet_details);
         ViewUtils.inject(this);
+        emname = CommonUtil.getSharedPreferences(ct, "erp_emname");
+        if (com.xzjmyk.pm.activity.ui.erp.util.StringUtils.isEmpty(emname)) {
+            emname = MyApplication.getInstance().mLoginUser.getNickName().trim();
+        }
         entity = getIntent().getParcelableExtra("data");
         item = getIntent().getIntExtra("item", -1);
         if (entity != null) {
@@ -210,7 +213,7 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
         oa_meeting_end.setText(TimeUtils.long2str(endLongTime, "MM月dd"));
         oa_meeting_start_date.setText(TimeUtils.long2str(startLongTime, "HH:mm"));
         oa_meeting_end_date.setText(TimeUtils.long2str(endLongTime, "HH:mm"));
-        if (!StringUtils.isEmpty(MyApplication.getInstance().mLoginUser.getNickName()) && entity.getMa_recorder() != null && !MyApplication.getInstance().mLoginUser.getNickName().equals(entity.getMa_recorder()) || "已结束".equals(status_tv.getText().toString().trim())) {
+        if (!StringUtils.isEmpty(emname) && entity.getMa_recorder() != null && !emname.equals(entity.getMa_recorder()) || "已结束".equals(status_tv.getText().toString().trim())) {
             end_meet_tv.setVisibility(View.GONE);
         } else {
             end_meet_tv.setVisibility(View.VISIBLE);
@@ -317,10 +320,7 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
                 startActivity(intent);
                 break;
             case R.id.meet_save://会议纪要
-                String myname = CommonUtil.getSharedPreferences(ct, "erp_emname");
-             if (StringUtils.isEmpty(myname))
-                    myname = MyApplication.getInstance().mLoginUser.getNickName();
-                if (!user_tv.getText().toString().trim().equals(myname)) {
+                if (!user_tv.getText().toString().trim().equals(emname)) {
                     Crouton.makeText(ct, "你不是会议管理员，没有权限编写会议纪要");
                     return;
                 }
@@ -357,7 +357,7 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
                 startActivity(intent);
                 break;
             case R.id.end_meet_tv:
-                if (!user_tv.getText().toString().trim().equals(MyApplication.getInstance().mLoginUser.getNickName().trim())) {
+                if (!user_tv.getText().toString().trim().equals(emname)) {
                     ToastUtil.showToast(ct, "你不是会议管理员，没有权限结束会议");
                     return;
                 }

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

@@ -10,6 +10,7 @@ import android.os.Handler;
 import android.os.Message;
 import android.text.Editable;
 import android.text.TextWatcher;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -101,8 +102,10 @@ public class OutSigninOKActivity extends BaseActivity {
             }
             if (!StringUtils.isEmpty(path) && new File(path).isFile())
                 uploadFile(path);
-            else
+            else {
+                progressDialog.show();
                 doSigninn();
+            }
         } else if (item.getItemId() == android.R.id.home) {
             InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
             imm.hideSoftInputFromWindow(text_edit.getWindowToken(), 0);
@@ -212,6 +215,11 @@ public class OutSigninOKActivity extends BaseActivity {
                 if (validator.validate(responseInfo.result) && JSON.parseObject(responseInfo.result).getBoolean("success")) {
                     id = getID(JSON.parseObject(responseInfo.result).getString("id"));
                 }
+                if (ct != null) {
+                    //这个为空
+                    Log.i("gongengming", "为空");
+                    progressDialog.show();
+                }
                 doSigninn();
             }
 
@@ -219,6 +227,7 @@ public class OutSigninOKActivity extends BaseActivity {
             @Override
             public void onFailure(HttpException error, String msg) {
                 ViewUtil.ToastMessage(ct, "上传失败：" + msg);
+                progressDialog.show();
                 doSigninn();
             }
         });
@@ -315,7 +324,7 @@ public class OutSigninOKActivity extends BaseActivity {
                     }
 
                     waterBitmapToFile = ImageUtil.compressWaterBitmapToFile(path, 100, 300, 300
-                            , CommonUtil.getSharedPreferences(getApplicationContext(),"erp_emname")
+                            , CommonUtil.getSharedPreferences(getApplicationContext(), "erp_emname")
                             , netDate, addr_tv.getText().toString().trim(), 0);
 
                     ImageLoader.getInstance().displayImage(Uri.fromFile(waterBitmapToFile).toString(), image);
@@ -395,6 +404,7 @@ public class OutSigninOKActivity extends BaseActivity {
     };
 
     private void doSigninn() {
+        Context ct = MyApplication.getInstance();
         if (!CommonUtil.isNetWorkConnected(ct)) {
             Crouton.makeText(ct, "当前网络不可用，请检查网络连接");
             return;
@@ -409,7 +419,7 @@ public class OutSigninOKActivity extends BaseActivity {
             public void callBack(String code) {
                 if (!StringUtils.isEmpty(code) && isNum(code))
                     mo_id = Integer.valueOf(code);
-                CodeUtil.getInstance().getCode(ct, "MOBILE_OUTSIGN", new CodeUtil.OnCodeLinstener() {
+                CodeUtil.getInstance().getCode(MyApplication.getInstance(), "MOBILE_OUTSIGN", new CodeUtil.OnCodeLinstener() {
                     @Override
                     public void callBack(String code) {
                         doSignin(code, mo_id, id);
@@ -443,7 +453,6 @@ public class OutSigninOKActivity extends BaseActivity {
      * 签到
      */
     private void doSignin(String code, int mo_id, int id) {
-        progressDialog.show();
         //获取网络数据
         String url = baseUrl + "mobile/oa/saveOutSign.action";
         final Map<String, Object> param = new HashMap<>();

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

@@ -80,11 +80,10 @@ public class SelectActivity extends BaseActivity {
                 String message = msg.getData().getString("result");
                 if (StringUtils.isEmpty(message)) return;
                 JsonValidator validator = new JsonValidator();
-                if (!validator.validate(message))return;
+                if (!validator.validate(message)) return;
                 JSONObject object = JSON.parseObject(message);
                 if (object == null) return;
-               
-                if ("mobile/common/getCombo.action".equals(action)){//下拉接口解析
+                if ("mobile/common/getCombo.action".equals(action) || isSingle) {//下拉接口解析
                     if (!StringUtils.isEmpty(key)) {
                         if (StringUtils.isEmpty(showKey)) return;
                         if (object.containsKey(key)) {
@@ -98,7 +97,7 @@ public class SelectActivity extends BaseActivity {
                             SelectBean bean = null;
                             JSONObject chce = null;
                             for (int i = 0; i < array.size(); i++) {
-                                if (array.get(i) instanceof JSONObject){
+                                if (array.get(i) instanceof JSONObject) {
                                     chce = array.getJSONObject(i);
                                     if (chce == null) continue;
                                     bean = new SelectBean();
@@ -109,7 +108,7 @@ public class SelectActivity extends BaseActivity {
                                         formBeaan.add(bean);
                                     }
                                 }
-                                if (array.get(i) instanceof String){
+                                if (array.get(i) instanceof String) {
                                     bean = new SelectBean();
                                     bean.setName(array.get(i).toString());
                                     bean.setObject(array.get(i));
@@ -119,30 +118,30 @@ public class SelectActivity extends BaseActivity {
 
                             }
                         }
-                      
+
                     } else {//当返回的没有不需要key值时候
                     }
-                }else{//多选解析
-                  
-                    String dataStr=JSON.parseObject(message).getString("data");
-                    JSONArray datas=JSON.parseArray(dataStr);//values
+                } else {//多选解析
+
+                    String dataStr = JSON.parseObject(message).getString("data");
+                    JSONArray datas = JSON.parseArray(dataStr);//values
 //                    System.out.println(datas.getJSONObject(0).getString("em_name"));
-                    JSONArray dbfinds=	JSON.parseObject(message).getJSONArray("dbfinds");
-                    String fieldkey="";
-                    for(int i=0;i<dbfinds.size();i++){
-                        JSONObject item=dbfinds.getJSONObject(i);
-                        String key=item.getString("field");
-                        if(key.equals(showKey)){
+                    JSONArray dbfinds = JSON.parseObject(message).getJSONArray("dbfinds");
+                    String fieldkey = "";
+                    for (int i = 0; i < dbfinds.size(); i++) {
+                        JSONObject item = dbfinds.getJSONObject(i);
+                        String key = item.getString("field");
+                        if (key.equals(showKey)) {
 //                            System.out.println(item.getString("dbGridField"));
-                            fieldkey=item.getString("dbGridField");
+                            fieldkey = item.getString("dbGridField");
                         }
                     }
                     if (formBeaan == null) formBeaan = new ArrayList<>();
                     else formBeaan.clear();
                     SelectBean bean = null;
-                    for(int i=0;i<datas.size();i++){
-                        System.out.println("value"+i+":"+datas.getJSONObject(i).getString(fieldkey));
-                        bean= new SelectBean();
+                    for (int i = 0; i < datas.size(); i++) {
+                        System.out.println("value" + i + ":" + datas.getJSONObject(i).getString(fieldkey));
+                        bean = new SelectBean();
                         bean.setId(id);
                         bean.setName(datas.getJSONObject(i).getString(fieldkey));
                         bean.setObject(datas.get(i));
@@ -160,7 +159,7 @@ public class SelectActivity extends BaseActivity {
                         adapter.notifyDataSetChanged();
                     }
                 }
-               
+
             } else {
                 emptyLayout.showEmpty();
             }
@@ -174,9 +173,10 @@ public class SelectActivity extends BaseActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.save) {
             search_edit.setText("");
-           selectOK();
-        }
-        return true;
+            selectOK();
+            return true;
+        } else
+            return super.onOptionsItemSelected(item);
     }
 
     private void selectOK() {
@@ -184,15 +184,15 @@ public class SelectActivity extends BaseActivity {
             finish();
             return;
         }
-        ArrayList<SelectBean> formBeaan = (ArrayList)adapter.getFormBeaan();
-        ArrayList<SelectBean> temps=new ArrayList<>();
-        for (int i=0;i<formBeaan.size();i++){
-            if (formBeaan.get(i).isClick()){
+        ArrayList<SelectBean> formBeaan = (ArrayList) adapter.getFormBeaan();
+        ArrayList<SelectBean> temps = new ArrayList<>();
+        for (int i = 0; i < formBeaan.size(); i++) {
+            if (formBeaan.get(i).isClick()) {
                 temps.add(formBeaan.get(i));
             }
         }
         Intent intent = new Intent();
-        intent.putParcelableArrayListExtra("data",temps);
+        intent.putParcelableArrayListExtra("data", temps);
         intent.putExtra("id", id);
         setResult(0x21, intent);
         finish();
@@ -204,7 +204,7 @@ public class SelectActivity extends BaseActivity {
             getMenuInflater().inflate(R.menu.menu_visit_save, menu);
         return true;
     }
-    
+
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -266,22 +266,21 @@ public class SelectActivity extends BaseActivity {
                     setResult(0x20, intent);
                     finish();
                 } else {
-                    if (formBeaan.get(i).isClick()){
+                    if (formBeaan.get(i).isClick()) {
                         formBeaan.get(i).setId(id);
                         formBeaan.get(i).setClick(false);
                         adapter.notifyDataSetChanged();
-                    }else{
+                    } else {
                         formBeaan.get(i).setClick(true);
                         formBeaan.get(i).setId(id);
                         adapter.notifyDataSetChanged();
                     }
-                  
+
                 }
             }
         });
 
 
-
     }
 
     private void initIntent() {
@@ -289,7 +288,7 @@ public class SelectActivity extends BaseActivity {
         if (intent == null) return;
         type = intent.getIntExtra("type", -1);
         title = intent.getStringExtra("title");
-        id=intent.getIntExtra("id",0);
+        id = intent.getIntExtra("id", 0);
         isSingle = intent.getBooleanExtra("isSingle", true);
         int reid = intent.getIntExtra("reid", -1);
         if (reid != -1)
@@ -373,8 +372,12 @@ public class SelectActivity extends BaseActivity {
             chche = formBeaan.get(i);
             holer.name_tv.setText(StringUtils.isEmpty(chche.getName()) ? "" : chche.getName());
             holer.select_scb.setChecked(chche.isClick());
-            holer.select_scb.setFocusable(false);
-            holer.select_scb.setClickable(false);
+            if (isSingle) {
+                holer.select_scb.setVisibility(View.GONE);
+            } else {
+                holer.select_scb.setFocusable(false);
+                holer.select_scb.setClickable(false);
+            }
             return view;
         }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/db/DBManager.java

@@ -171,7 +171,7 @@ public class DBManager {
      * @功能:增加员工信息---批量
      */
     public void saveEmployees(List<EmployeesEntity> employeesEntities) {
-        String sql = "replace into employees(EM_ID,EM_CODE,EM_NAME,EM_POSITION,EM_DEFAULTORNAME,EM_DEPART,EM_MOBILE,EM_UU,COMPANY,WHICHSYS,Em_defaultorid,Em_flag,Em_imid) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?,?,?);";
+        String sql = "replace into employees(EM_ID,EM_CODE,EM_NAME,EM_POSITION,EM_DEFAULTORNAME,EM_DEPART,EM_MOBILE,EM_UU,COMPANY,WHICHSYS,Em_defaultorid,Em_flag,Em_imid,EM_EMAIL) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?,?,?,?);";
         SQLiteStatement sta = db.compileStatement(sql);
         db.beginTransaction();
         for (int i = 0; i < employeesEntities.size(); i++) {
@@ -189,6 +189,7 @@ public class DBManager {
             sta.bindLong(11, entity.getEm_defaultorid());
             sta.bindString(12, entity.getFLAG());
             sta.bindString(13, String.valueOf(entity.getEm_IMID()));
+            sta.bindString(14, StringUtils.isEmpty(entity.getEM_EMAIL()) ? "未填写" : entity.getEM_EMAIL());
             sta.executeInsert();
         }
         db.setTransactionSuccessful();
@@ -313,12 +314,12 @@ public class DBManager {
         while (cursor.moveToNext()) {
             Hrorgs.HrorgItem hrorgItem = new Hrorgs().new HrorgItem();
             hrorgItem.setOr_code(cursor.getString(cursor.getColumnIndex("or_code")));
-            int id=cursor.getInt(cursor.getColumnIndex("or_id"));
+            int id = cursor.getInt(cursor.getColumnIndex("or_id"));
             hrorgItem.setOr_id(id);
             hrorgItem.setOr_name(cursor.getString(cursor.getColumnIndex("or_name")));
             hrorgItem.setOr_isleaf(Integer.valueOf(cursor.getString(cursor.getColumnIndex("or_isleaf"))));
             hrorgItem.setOr_subof(Integer.valueOf(cursor.getString(cursor.getColumnIndex("or_subof"))));
-            hrorgItem.setOr_emcount(selectEmployeesCount(id,master));
+            hrorgItem.setOr_emcount(selectEmployeesCount(id, master));
             hlist.add(hrorgItem);
         }
         table = "employees";
@@ -350,27 +351,27 @@ public class DBManager {
         return hrorgsEntities;
     }
 
-    public int selectEmployeesCount(int or_id,String master){
+    public int selectEmployeesCount(int or_id, String master) {
         int catCount = 0;
 //        String  table = "employees";
 //        String [] columns = null;
 //        String  selection = "em_defaultorid=? and WHICHSYS=?";
-        String [] selectionArgs = new String[]{String.valueOf(or_id), master};
+        String[] selectionArgs = new String[]{String.valueOf(or_id), master};
 //        String groupBy = null;
 //        String having = null;
 //        String orderBy = null;
         //db.query(table, columns, selection, selectionArgs, groupBy, having, orderBy);
-        Cursor cursor =  
-        db.rawQuery("select count(*) from employees where em_defaultorid=? and WHICHSYS=?",selectionArgs);
+        Cursor cursor =
+                db.rawQuery("select count(*) from employees where em_defaultorid=? and WHICHSYS=?", selectionArgs);
         if (cursor.moveToFirst()) {
             catCount = cursor.getInt(0);
         }
         cursor.close();
-        LogUtil.d("count(*):"+catCount);
+        LogUtil.d("count(*):" + catCount);
         return catCount;
     }
-    
-    
+
+
     public void deleteData(String master) {
         String table = "hrorgs";
         String[] whereArgs = {master};
@@ -467,13 +468,14 @@ public class DBManager {
             model.setFLAG(cursor.getString(cursor.getColumnIndex("em_flag")));
             model.setEM_ID(cursor.getInt(cursor.getColumnIndex("em_id")));
             model.setEM_MOBILE(cursor.getString(cursor.getColumnIndex("em_mobile")));
+            model.setEM_EMAIL(cursor.getString(cursor.getColumnIndex("em_email")));
             model.setEM_NAME(cursor.getString(cursor.getColumnIndex("em_name")));
             model.setEM_POSITION(cursor.getString(cursor.getColumnIndex("em_position")));
             model.setEM_UU(cursor.getString(cursor.getColumnIndex("em_uu")));
             model.setWHICHSYS(cursor.getString(cursor.getColumnIndex("whichsys")));
             model.setEm_IMID(Integer.valueOf(cursor.getString(
-                            cursor.getColumnIndex("em_imid")) == null ? "0" : cursor.getString(
-                            cursor.getColumnIndex("em_imid"))
+                    cursor.getColumnIndex("em_imid")) == null ? "0" : cursor.getString(
+                    cursor.getColumnIndex("em_imid"))
             ));
             entity.add(model);
         }
@@ -506,8 +508,8 @@ public class DBManager {
             model.setEM_UU(cursor.getString(cursor.getColumnIndex("em_uu")));
             model.setWHICHSYS(cursor.getString(cursor.getColumnIndex("whichsys")));
             model.setEm_IMID(Integer.valueOf(cursor.getString(
-                            cursor.getColumnIndex("em_imid")) == null ? "0" : cursor.getString(
-                            cursor.getColumnIndex("em_imid"))
+                    cursor.getColumnIndex("em_imid")) == null ? "0" : cursor.getString(
+                    cursor.getColumnIndex("em_imid"))
             ));
         }
         cursor.close();

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

@@ -447,8 +447,6 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
         if (ListUtils.isEmpty(emList)) return null;
         List<BaseSortModel<Friend>> list = new ArrayList<>();
         for (EmployeesEntity e : emList) {
-            if (e.getEm_IMID() != 0 && String.valueOf(e.getEm_IMID()).equals(loginUserId))
-                continue;
             list.add(getFriendByErp(e));
         }
 

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

@@ -313,13 +313,6 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                         Crouton.makeText(ct, "当前网络不可用，请检查网络连接", Style.holoRedLight, 2000);
                         return;
                     }
-                    //TODO 上传文件
-//                    CodeUtil.getInstance().getCode(ct, "CardLog", new CodeUtil.OnCodeLinstener() {
-//                        @Override
-//                        public void callBack(String code) {
-//                            doSignin(code);
-//                        }
-//                    });
                     if (StringUtils.isEmpty(macAddress)) {   //当mac地址不合法时候，提示开启wifi后获取，不然不给进下一步
                         macAddress = util.getMac(ct);
                         return;

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

@@ -81,6 +81,8 @@ public class Constants {
             + "startTime,"//上班开始签到时间
             + "endTime"//下班开始签到时间
             + ")";
+
+
     public static final String SubscriptionMessage = "CREATE TABLE SubscriptionMessage(id_,num_id_,instance_id_ ,createdate_,title_," +
             "son_title_,status_,EMP_ID_,RN_,SONTITLE_,SUMDATA_,name)";
 
@@ -96,7 +98,7 @@ public class Constants {
             + "subs_username varchar(50),"
             + "subs_removed integer,"
             + "subs_img BLOB"
-            +")";
+            + ")";
 
     //已订阅号表
     public static final String TABLE_MY_SUBSCRIPTION = "CREATE TABLE MySubs "
@@ -112,8 +114,6 @@ public class Constants {
             + ")";
 
 
-
-
     /**
      * 检测网络是否可用
      *

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

@@ -4,9 +4,7 @@ import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
-import android.widget.Toast;
 
-import com.xzjmyk.pm.activity.AppConfig;
 import com.xzjmyk.pm.activity.bean.oa.SigninBean;
 import com.xzjmyk.pm.activity.db.dao.SigninDao;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
@@ -162,10 +160,10 @@ public class AlarmManage {
 
     private void setNextAlarm(Context ct, String action, long time) {
         if (time < System.currentTimeMillis()) return;
-        if (AppConfig.DEBUG) {
-            String str = TimeUtils.f_long_2_str(time);
-            Toast.makeText(ct, "提醒时间为:" + str, Toast.LENGTH_SHORT).show();
-        }
+//        if (AppConfig.DEBUG) {
+//            String str = TimeUtils.f_long_2_str(time);
+//            Toast.makeText(ct, "提醒时间为:" + str, Toast.LENGTH_SHORT).show();
+//        }
         Intent intent = new Intent(ct, AlarmReceiver.class);
         intent.setAction(StringUtils.isEmpty(action) ? WORK_ALARM_ACTION : action);
         AlarmManager alarm = (AlarmManager) ct.getSystemService(ALARM_SERVICE);

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

@@ -8,6 +8,7 @@ import android.util.Log;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 
 import java.util.Date;
+import java.util.Map;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -42,7 +43,10 @@ public class AlarmService extends Service {
 
     public void alarm() {
         ReckonAlarmTimeUtil util = new ReckonAlarmTimeUtil();
-        long time = util.reckoAlarmAndAuto(getApplicationContext());
+        Map<String, Number> map = util.reckoAlarmAndAuto(getApplicationContext());
+        if (map == null) return;
+        long time = (long) map.get("time");
+        int type = (int) map.get("type");
         if (time == 0) return;
         Log.i("gongpengming", TimeUtils.f_long_2_str(time));
         Timer timer = new Timer();

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

@@ -9,7 +9,9 @@ import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import static com.xzjmyk.pm.activity.AppConfig.ALARMA_CLICK;
 import static com.xzjmyk.pm.activity.AppConfig.AUTO_SIGNIN;
@@ -21,18 +23,23 @@ import static com.xzjmyk.pm.activity.AppConfig.AUTO_SIGNIN;
 public class ReckonAlarmTimeUtil {
 
 
-    public long reckoAlarmAndAuto(Context ct) {
+    public Map<String, Number> reckoAlarmAndAuto(Context ct) {
         boolean isAlarm = CommonUtil.getSharedPreferencesBoolean(ct, ALARMA_CLICK, false);//是否自动打卡
         boolean isAuto = CommonUtil.getSharedPreferencesBoolean(ct, AUTO_SIGNIN, false);//是否提醒
         if (!isAlarm && !isAuto) {
-            return 0;
+            return null;
         }
+        Map<String, Number> map = new HashMap<>();
         if (isAuto) {
-            nextAuto(ct);
+            map.put("type", 1);
+            long time = nextAuto(ct);
+            map.put("time", time);
+            return map;
         } else if (isAlarm) {
-            nextAlarm(ct);
+            nextAlarm(ct, map);
+            return map;
         }
-        return 0;
+        return null;
     }
 
     //获取下一个自动打卡时间
@@ -65,7 +72,7 @@ public class ReckonAlarmTimeUtil {
     }
 
     //获取下一个提醒时间
-    private long nextAlarm(Context ct) {
+    private long nextAlarm(Context ct, Map<String, Number> map) {
         int u = CommonUtil.getSharedPreferencesInt(ct, "ALARM_WORK_TIME", 5);//上班提前xx分钟
         int d = CommonUtil.getSharedPreferencesInt(ct, "ALARM_OFFWORK_TIME", 5);//下班延迟xx分钟
         SigninBean bean = frontOfAlarm(ct, d);
@@ -73,11 +80,15 @@ public class ReckonAlarmTimeUtil {
         //上班
         long time = getTimeByHHmm(bean.getWorkTime()) - u * 60000;
         if (time > 0 && System.currentTimeMillis() < time) {//当前时间小于提醒时间
+            map.put("type", 2);
+            map.put("time", time);
             return time;
         }
         //下班
         time = getTimeByHHmm(bean.getOffTime()) + d * 60000;
         if (time > 0 && System.currentTimeMillis() < time) {
+            map.put("type", 3);
+            map.put("time", time);
             return time;
         }
         return 0;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/CustomProgressDialog.java

@@ -4,6 +4,7 @@ package com.xzjmyk.pm.activity.ui.erp.view;
 import android.app.Dialog;
 import android.content.Context;
 import android.graphics.drawable.AnimationDrawable;
+import android.util.Log;
 import android.view.Gravity;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -27,12 +28,16 @@ public class CustomProgressDialog extends Dialog {
     @Override
     public void show() {
         if (this != null)
-            super.show();
+            try {
+                super.show();
+            } catch (Exception e) {
+                Log.i("gongpengming", "Exception =" + (e == null ? "空的" : e.getMessage()));
+            }
     }
 
     @Override
     public void dismiss() {
-        if (context==null&&this != null)
+        if (context == null && this != null)
             super.dismiss();
     }
 

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

@@ -184,6 +184,7 @@
         <com.xzjmyk.pm.activity.view.DataLoadView
             android:id="@+id/data_load_view"
             android:layout_width="match_parent"
+            android:visibility="gone"
             android:layout_height="match_parent" />
     </RelativeLayout>
 

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

@@ -9,7 +9,8 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/item_height"
-        android:padding="10dp">
+        android:padding="10dp"
+        android:visibility="gone">
 
         <TextView
             android:layout_width="wrap_content"
@@ -101,13 +102,13 @@
             android:textSize="14sp" />
 
         <TextView
+            android:id="@+id/tv_ualar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:drawableRight="@drawable/oa_next"
             android:text="延迟5分钟"
-            android:id="@+id/tv_ualar"
             android:textColor="@color/text_color"
             android:textSize="14sp" />
     </RelativeLayout>

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

@@ -23,13 +23,13 @@
                 android:contentDescription="@string/app_name"
                 android:src="@drawable/avatar_normal_u" />
 
+
             <RelativeLayout
                 android:id="@+id/simple_info_rl"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
                 android:layout_toRightOf="@+id/avatar_img">
 
                 <TextView
@@ -38,7 +38,6 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:layout_toLeftOf="@+id/phone_number_tv"
-                    android:singleLine="true"
                     android:textColor="@color/text_main"
                     android:textSize="@dimen/text_main" />
 
@@ -48,20 +47,12 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
-                    android:singleLine="true"
+                    android:drawablePadding="10dp"
+                    android:drawableRight="@drawable/oa_next"
                     android:textColor="@color/text_hine"
                     android:textSize="@dimen/text_hine" />
 
             </RelativeLayout>
-
-            <ImageView
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_marginRight="8dp"
-                android:background="@drawable/oa_next"
-                android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -241,9 +232,9 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"
-            android:layout_marginTop="7dp"
             android:layout_marginLeft="10dp"
             android:layout_marginRight="10dp"
+            android:layout_marginTop="7dp"
             android:background="@color/item_line" />
         <!--公司-->
         <!--账套-->
@@ -282,12 +273,14 @@
                 android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
+
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"
             android:layout_marginLeft="10dp"
             android:layout_marginRight="10dp"
             android:background="@color/item_line" />
+
         <RelativeLayout
             android:id="@+id/rl_master_change"
             style="@style/IMTbleLine_UP_Me"
@@ -373,8 +366,8 @@
 
         <RelativeLayout
             android:id="@+id/app_drafts_rl"
-            android:background="#faf9f9"
             style="@style/IMTbleLine_UP_Me"
+            android:background="#faf9f9"
             android:visibility="gone">
 
             <TextView
@@ -411,7 +404,6 @@
                 android:visibility="gone" />
         </RelativeLayout>
 
-      
 
         <RelativeLayout
             android:id="@+id/my_b2b_rl"

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

@@ -40,13 +40,13 @@
         android:id="@+id/oa_range_addr_rl"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="17dp"
-        android:orientation="vertical"
-
-        android:padding="5dp"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true">
+
+        android:layout_alignParentStart="true"
+        android:layout_marginBottom="17dp"
+        android:orientation="vertical"
+        android:padding="5dp">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -84,10 +84,10 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
+                android:layout_marginLeft="12dp"
                 android:layout_marginRight="10dp"
                 android:drawableLeft="@drawable/icon_distance"
-                android:drawablePadding="8dp"
+                android:drawablePadding="10dp"
                 android:text="距离公司"
                 android:textColor="#000000"
                 android:textSize="12dp" />