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

WeiChat/src/main/AndroidManifest.xml

@@ -567,8 +567,8 @@
             android:theme="@style/OAThemeMeet" />
         <activity
             android:name=".ui.erp.activity.oa.OAListActivity"
-            android:label="外勤签到列表" />
-        <activity android:name=".ui.erp.activity.oa.OptionActivity"></activity>
+            android:label="外勤签到列表"
+            android:theme="@style/OAThemeOutOffice" />
+        <activity android:name=".ui.erp.activity.oa.OptionActivity" />
     </application>
-
 </manifest>

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

@@ -165,7 +165,7 @@ public class BusinessDetailActivty extends BaseActivity {
             ll_top_state.setVisibility(View.GONE);
             sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page);
         } else if (type == 3) {
-            getSupportActionBar().setTitle("商机");
+            getSupportActionBar().setTitle(business_steps);
             ll_top_state.setVisibility(View.GONE);
             isAdminer(12);
         }else{
@@ -281,6 +281,7 @@ public class BusinessDetailActivty extends BaseActivity {
                         searchResults.values = mData;
                         searchResults.count = mData.size();
                     } else {
+                        mdata=mData;
                         ArrayList<String> searchKey = new ArrayList<String>();
                         ArrayList<Business> newBusiness = new ArrayList<>();
                         for (Business business : mdata) {
@@ -311,9 +312,7 @@ public class BusinessDetailActivty extends BaseActivity {
                 protected void publishResults(CharSequence constraint, FilterResults results) {
                     //装配数据
                     mdata = (ArrayList<Business>) results.values;
-                    if (mAdapter.getCount() == 0) {
-
-                    }
+                    if (mAdapter.getCount() == 0) {}
                     notifyDataSetChanged();
                 }
             };
@@ -410,7 +409,8 @@ public class BusinessDetailActivty extends BaseActivity {
                     String isok = result.getString("isok");
                     if ("0".equals(isok)) {
                         Log.i("qiang", isok);
-                        sendHttpBusinessQiang(BUSINESS_QIANG, bc_code, MyApplication.getInstance().mLoginUser.getNickName());
+                        sendHttpBusinessQiang(BUSINESS_QIANG, bc_code, MyApplication.getInstance().mLoginUser.getNickName(),
+                                CommonUtil.getSharedPreferences(ct, "erp_username"));
                     } else if ("1".equals(isok)) {
                         Log.i("qiang", isok);
                         progressDialog.dismiss();
@@ -475,6 +475,7 @@ public class BusinessDetailActivty extends BaseActivity {
     private final int BUSINESS_FENPEI = 3;
     private final int BUSINESS_QIANG = 2;
 
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         switch (requestCode) {
@@ -483,19 +484,21 @@ public class BusinessDetailActivty extends BaseActivity {
                     return;
                 }
                 String bt_doman = data.getStringExtra("en_name");
-                sendHttpBusinessQiang(BUSINESS_FENPEI, bc_code, bt_doman);
+                String  en_code=data.getStringExtra("en_code");
+                sendHttpBusinessQiang(BUSINESS_FENPEI, bc_code, bt_doman,en_code);
                 break;
         }
         super.onActivityResult(requestCode, resultCode, data);
     }
 
 
-    private void sendHttpBusinessQiang(int what, String bc_code, String bc_doman) {
+    private void sendHttpBusinessQiang(int what, String bc_code, String bc_doman,String en_code) {
         String url = Constants.getAppBaseUrl(ct) + "mobile/crm/updateBusinessChanceDoman.action";
         Map<String, Object> params = new HashMap<>();
         params.put("bc_code", bc_code);
         params.put("bc_doman", bc_doman);
-        params.put("bc_domancode", CommonUtil.getSharedPreferences(ct, "erp_username"));//
+        
+        params.put("bc_domancode",en_code);//
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, what, null, null, "post");

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

@@ -5,6 +5,8 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -13,6 +15,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
+import android.widget.Filter;
+import android.widget.Filterable;
 import android.widget.ListView;
 import android.widget.TextView;
 
@@ -31,6 +35,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
+import com.xzjmyk.pm.activity.view.ClearEditText;
 import com.xzjmyk.pm.activity.view.SmoothCheckBox;
 
 import java.util.ArrayList;
@@ -44,6 +49,11 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
     private PullToRefreshListView mlist;
     private ArrayList<Business> mData = new ArrayList<Business>();
     private String code;
+    @ViewInject(R.id.search_edit)
+    private ClearEditText search_edit;
+
+    private String cu_code;
+    private String cu_name;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -61,8 +71,7 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
             code=getIntent().getStringExtra("code");
         }
     }
-   private String cu_code;
-    private String cu_name;
+
     private void initListener() {
         mlist.setMode(PullToRefreshBase.Mode.DISABLED);
         mlist.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
@@ -78,17 +87,17 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
         });
         mlist.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
-            public void onItemClick(final  AdapterView<?> parent,final View view,final int position, long id) {
-                BusinessSelectCustomerActivity.BussinessDetailAdapter.ViewHolder holder= (BussinessDetailAdapter.ViewHolder) view.getTag();
-                cu_code= holder.code;
-                cu_name=holder.tv_business_name.getText().toString();
-                final  boolean flag = !mData.get(position-1).isChecked;
+            public void onItemClick(final AdapterView<?> parent, final View view, final int position, long id) {
+                BusinessSelectCustomerActivity.BussinessDetailAdapter.ViewHolder holder = (BussinessDetailAdapter.ViewHolder) view.getTag();
+                cu_code = holder.code;
+                cu_name = holder.tv_business_name.getText().toString();
+                final boolean flag = !mData.get(position - 1).isChecked;
                 Log.i(TAG, "onClick:" + position + " check:" + !flag);
                 for (Business model : mData) {
                     model.setIsChecked(false);
                 }
 
-                mData.get(position-1).setIsChecked(flag);
+                mData.get(position - 1).setIsChecked(flag);
                 mHandler.postDelayed(new Runnable() {
                     @Override
                     public void run() {
@@ -98,7 +107,22 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
 
             }
         });
-        ;
+        search_edit.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+
+            }
+        });
     }
 
     private void initData() {
@@ -132,7 +156,7 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
         return true;
     }
 
-    private class BussinessDetailAdapter extends BaseAdapter {
+    private class BussinessDetailAdapter extends BaseAdapter  implements Filterable {
         private Context ct;
         private ArrayList<Business> mdata = new ArrayList<>();
         private LayoutInflater inflater;
@@ -198,6 +222,11 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
             return convertView;
         }
 
+        @Override
+        public Filter getFilter() {
+            return null;
+        }
+
 
         class ViewHolder {
             SmoothCheckBox cb_left;

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

@@ -46,7 +46,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.view.MyMarkerView;
 import com.xzjmyk.pm.activity.util.DateFormatUtil;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
-import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.wheel.DatePicker;
 
 import java.text.DecimalFormat;
@@ -1078,11 +1077,11 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
 //                        ToastUtil.showToast(ct, year + "-" + month + "-" + day);
                 switch (resId) {
                     case R.id.ib_ranking_condition://排名
-                        ToastUtil.showToast(ct, year + "-" + month);
+                       // ToastUtil.showToast(ct, year + "-" + month);
                         sendPersonalRank(year + month);
                         break;
                     case R.id.ib_index_condition://图表
-                        ToastUtil.showToast(ct, year + "-" + month);
+                      //  ToastUtil.showToast(ct, year + "-" + month);
                         sendTargets(year + month);
                         break;
                   /*  case R.id.ib_sale_condition://销售

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

@@ -5,6 +5,8 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.support.v7.widget.PopupMenu;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -23,6 +25,7 @@ import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
 
 import org.json.JSONException;
@@ -117,6 +120,25 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
         et_cu_payments.setKeyListener(null);
         tv_cu_currency.setKeyListener(null);
         et_cu_sellername.setKeyListener(null);
+        
+        tv_cu_remark.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                 if (!StringUtils.isEmpty(s.toString())){
+                     tv_cu_remark.testValidity();
+                 }
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+
+            }
+        });
     }
 
     private void initData() {
@@ -131,7 +153,7 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
             type = intent.getIntExtra("type", 0);
             if (type == 1) {
                 ll_infomal.setVisibility(View.VISIBLE);
-                getSupportActionBar().setTitle("客户录入");
+                getSupportActionBar().setTitle("正式客户");
                 CommonUtil.getCommonId(this,"PRECUSTOMER_SEQ",mHandler,GET_CU_ID);
             } else {
                 ll_infomal.setVisibility(View.GONE);
@@ -164,6 +186,7 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
     private void saveData() {
         String formStore = "";
         Log.i("commoncuid",mCuId+"");
+       
         if (type == 1) {
             if (et_cu_code.testValidity() && et_cu_name.testValidity()
                     && tv_cu_address.testValidity() && et_cu_kind.testValidity()
@@ -172,7 +195,8 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                     && tv_cu_contact.testValidity() && tv_cu_degree.testValidity()
                     && tv_cu_mobile.testValidity() && tv_cu_email.testValidity()
                     && tv_cu_businesscode.testValidity() && tv_cu_currency.testValidity()
-                    && tv_cu_taxrate.testValidity() && tv_cu_nichestep.testValidity()) {
+                    && tv_cu_taxrate.testValidity() && tv_cu_nichestep.testValidity()
+                   ) {
                 formStore = "{\n" +
                         " \"cu_id\":" + mCuId + ",\n" +
                         " \"cu_arcode\":" +"\"\""+ ",\n" +
@@ -207,7 +231,8 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                     && et_cu_district.testValidity() && et_cu_kind.testValidity()
                     && et_cu_payments.testValidity() && et_cu_sellername.testValidity()
                     && tv_cu_contact.testValidity() && tv_cu_degree.testValidity()
-                    && tv_cu_mobile.testValidity() && tv_cu_email.testValidity()) {
+                    && tv_cu_mobile.testValidity() && tv_cu_email.testValidity()
+                   ) {
                 formStore = "{\n" +
                         " \"cu_id\":" + mCuId + ",\n" +
                         " \"cu_code\":\"" + et_cu_code.getText().toString() + "\",\n" +
@@ -268,7 +293,7 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                     if (falg == 0) {
                         ll_infomal.setVisibility(View.VISIBLE);
                         type=1;//正式客户
-                        getSupportActionBar().setTitle("客户录入");
+                        getSupportActionBar().setTitle("正式客户");
                         CommonUtil.getCommonId(ct, "PRECUSTOMER_SEQ", mHandler, GET_CU_ID);
                     } else {
                         ll_infomal.setVisibility(View.GONE);

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

@@ -21,15 +21,18 @@ import com.xzjmyk.pm.activity.ui.erp.activity.oa.UserSelectActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.Employees;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
+import com.xzjmyk.pm.activity.util.CalendarUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
 import com.xzjmyk.pm.activity.view.wheel.OptionPicker;
 
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -146,7 +149,6 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
             @Override
             public void onDateTimePicked(String year, String month, String day, String hour, String minute) {
                 String time = year + "-" + month + "-" + day + " " + hour + ":" + minute + ":00";
-                Log.i("gongpengming", time);
                 if (b) {
                     tv_date_start.setText(time);
                 } else {
@@ -368,9 +370,7 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.tv_date_start:
-//                showDialog(tv_date_start, true);
                 showDateDialog(true);
-//                showDateDialog((FormEditText) v.findViewById(R.id.tv_date_start));
                 break;
             case R.id.tv_date:
                 if (tv_date_start.getText() != null && tv_date_start.getText().toString().length() > 0) {
@@ -389,7 +389,7 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
                 break;
             case R.id.tv_executive:
                 Intent intent = new Intent(ct, UserSelectActivity.class);
-                intent.putExtra("single", true);
+                intent.putExtra("single", false);
                 startActivityForResult(intent, 0x11);
                 break;
         }
@@ -425,9 +425,16 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (data == null) return;
         if (requestCode == 0x11 && resultCode == 0x11) {
-            Employees entity = data.getParcelableExtra("data");
-            if (entity == null || entity.getEm_name() == null) return;
-            tv_executive.setText(entity.getEm_name());
+            ArrayList<Employees> list = data.getParcelableArrayListExtra("data");
+            Log.i("gongpengming", "onActivityResult");
+            if (ListUtils.isEmpty(list)) return;
+            Log.i("gongpengming", "部位0");
+            StringBuilder str = new StringBuilder();
+            for (Employees e : list) {
+                str.append("," + e.getEm_name());
+            }
+            str.delete(0, 1);
+            tv_executive.setText(str.toString());
         }
     }
 }

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

@@ -110,7 +110,7 @@ public class VisitReportPlanActivity extends BaseActivity implements View.OnClic
         if (!TextUtils.isEmpty(mCustomerAddress)){
             tv_address_login.setText(mCustomerAddress);
         }else {
-            tv_address_login.setText(MyApplication.getInstance().getBdLocationHelper().getAddress());
+           // tv_address_login.setText(MyApplication.getInstance().getBdLocationHelper().getAddress());
         }
     }
 

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

@@ -167,7 +167,6 @@ public class AlarmaActivity extends BaseActivity implements View.OnClickListener
 
     private void setArmmanager(long time) {
         if (time <= 0) return;
-        Log.i("gongpengming", TimeUtils.f_long_2_str(time));
         //操作：发送一个广播，广播接收后Toast提示定时操作完成
         Intent intent = new Intent(AlarmaActivity.this, AlarmReceiver.class);
         intent.setAction("ALARMA_ACTION");

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

@@ -7,6 +7,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.util.Log;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
@@ -77,11 +78,8 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
                     break;
                 case ENDMEET:
                     ToastUtil.showToast(ct, "会议结束成功");
-                    Intent data = new Intent();
-                    data.putExtra("item", item);
-                    data.putExtra("data", true);
-                    setResult(0x15, data);
-                    finish();
+                    status_tv.setText("已结束");
+
                     break;
                 case SIGNNIN:
                     ToastUtil.showToast(ct, "会议签到成功");
@@ -120,6 +118,28 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
     private int item;
     private JSONArray array;
 
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            endActivity();
+        }
+        return true;
+    }
+
+    @Override
+    public void onBackPressed() {
+        endActivity();
+    }
+
+    private void endActivity() {
+        Intent data = new Intent();
+        data.putExtra("item", item);
+        data.putExtra("data", true);
+        setResult(0x15, data);
+        finish();
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -141,6 +161,9 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
         } else {
             click_btn.setBackgroundResource(R.drawable.bg_orange_btn_pass);
             click_btn.setText("已签到");
+            click_btn.setClickable(false);
+            click_btn.setFocusable(false);
+            click_btn.setPadding(20, 20, 20, 20);
         }
     }
 
@@ -169,7 +192,6 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
         addr_tv.setText(entity.getMa_mrname() == null ? "未填写" : entity.getMa_mrname());
         sub_tv.setText(entity.getMa_remark() == null ? "" : entity.getMa_remark());
         user_tv.setText(entity.getMa_recorder() == null ? "" : entity.getMa_recorder());
-        Log.i("gongpengming", (StringUtils.isEmpty(entity.getMa_tag()) ? "未填写" : entity.getMa_tag()));
         tag_tv.setText(StringUtils.isEmpty(entity.getMa_tag()) ? "未填写" : entity.getMa_tag());
         //设置会议状态
         String str = entity.getMa_stage();
@@ -298,9 +320,6 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
                 if (!user_tv.getText().toString().trim().equals(MyApplication.getInstance().mLoginUser.getNickName().trim())) {
                     Crouton.makeText(ct, "你不是会议管理员，没有权限编写会议纪要");
                     return;
-                } else if ("已结束".equals(status_tv.getText().toString().trim())) {
-                    Crouton.makeText(ct, "当前会议已经结束，不能在填写会议纪要");
-                    return;
                 }
                 StringBuilder name = new StringBuilder();
                 StringBuilder emcome = new StringBuilder();

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

@@ -208,7 +208,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
         Log.i(TAG, "onCreate:");
         setContentView(R.layout.activity_oa);
         ViewUtils.inject(this);
-        getSupportActionBar().setTitle("自动化办公");
+        getSupportActionBar().setTitle("办公自动化");
         initView();
     }
 

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

@@ -14,40 +14,125 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baidu.mapapi.map.MapView;
+import com.baidu.mapapi.model.LatLng;
+import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
 import com.nostra13.universalimageloader.core.ImageLoader;
+import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
+import com.xzjmyk.pm.activity.util.BaiduMapUtil;
+import com.xzjmyk.pm.activity.util.CalendarUtils;
+import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
+import com.xzjmyk.pm.activity.view.wheel.OASigninPicker;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
 public class OAListActivity extends BaseActivity {
+    @ViewInject(R.id.rili_tv)
+    private TextView rili_tv;
+    @ViewInject(R.id.name_tv)
+    private TextView name_tv;
+    @ViewInject(R.id.num_tv)
+    private TextView num_tv;
+    @ViewInject(R.id.prot_tv)
+    private TextView prot_tv;
+    @ViewInject(R.id.head_img)
+    private ImageView head_img;
+    @ViewInject(R.id.mapView)
+    private MapView mapView;
+    @ViewInject(R.id.listview)
+    private ListView listview;
 
+    private EmptyLayout mEmptyLayout;
     private Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
             progressDialog.dismiss();
             String message = (String) msg.getData().get("result");
             if (msg.what == 0x13) {
-                listview.setAdapter(new SigninAdapter(JSON.parseObject(message).getJSONArray("listdata")));
+                adapter.setJson(JSON.parseObject(message).getJSONArray("listdata"));
+//                listview.setAdapter(new SigninAdapter(JSON.parseObject(message).getJSONArray("listdata")));
             }
         }
     };
-    private ListView listview;
+
+    private String date = null;
+    private SigninAdapter adapter = null;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_oalist);
+        ViewUtils.inject(this);
+        init();
         initView();
     }
 
+    private void init() {
+        date = TimeUtils.s_long_2_str(System.currentTimeMillis());
+    }
+
+    private void initView() {
+        mEmptyLayout = new EmptyLayout(ct, listview);
+        mEmptyLayout.setShowLoadingButton(false);
+        mEmptyLayout.setShowEmptyButton(false);
+        mEmptyLayout.setShowErrorButton(false);
+        rili_tv.setText(StringUtils.isEmpty(date) ? "" : date);
+        String name = MyApplication.getInstance().mLoginUser.getNickName();
+        name_tv.setText(StringUtils.isEmpty(name) ? "" : name);
+        prot_tv.setText("");
+        double latitude = MyApplication.getInstance().getBdLocationHelper().getLatitude();
+        double longitude = MyApplication.getInstance().getBdLocationHelper().getLongitude();
+        BaiduMapUtil.getInstence().setMapViewPoint(mapView, new LatLng(latitude, longitude), true);
+        AvatarHelper.getInstance().displayAvatar(MyApplication.getInstance().mLoginUser.getUserId(), head_img, true);
+        JSONArray array = getIntent().getParcelableExtra("data");
+        adapter = new SigninAdapter();
+        listview.setAdapter(adapter);
+        if (array == null || array.size() <= 0) {
+            loadLog(date);
+        } else {
+            adapter.setJson(array);
+            listview.setAdapter(adapter);
+        }
+        rili_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                showDateDialog();
+            }
+        });
+
+    }
+
+    private void showDateDialog() {
+        OASigninPicker picker = new OASigninPicker(this);
+        picker.setRange(CalendarUtils.getCurrentYear(), CalendarUtils.getCurrentMonth(), CalendarUtils.getCurrentDate());
+        picker.setSelectedItem(CalendarUtils.getCurrentYear(), CalendarUtils.getCurrentMonth(), CalendarUtils.getCurrentDate());
+        picker.setOnDateTimePickListener(new OASigninPicker.OnDateTimePickListener() {
+            @Override
+            public void setTime(String year, String month, String day) {
+                String time = year + "-" + month + "-" + day;
+                if (!time.equals(date)) {
+                    date = time;
+                    rili_tv.setText(date);
+                    loadLog(date);
+                }
+            }
+        });
+        picker.show();
+    }
+
     //获取打卡记录 date:yyyy-MM-dd
-    private void loadLog() {
+    private void loadLog(String date) {
         progressDialog.show();
         //获取网络数据
         String url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "mobile/common/list.action";
@@ -57,28 +142,30 @@ public class OAListActivity extends BaseActivity {
         param.put("page", 1);
         param.put("pageSize", 1000);
         param.put("emcode", emcode);
-        param.put("condition", "mo_mancode='" + emcode + "' and to_char(mo_signtime,'yyyy-MM-dd')='" + TimeUtils.s_long_2_str(System.currentTimeMillis()) + "'");
+        param.put("condition", "mo_mancode='" + emcode + "' and to_char(mo_signtime,'yyyy-MM-dd')='" + date + "'");
         param.put("caller", "Mobile_outsign");
         param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-        com.xzjmyk.pm.activity.ui.erp.util.ViewUtil.httpSendRequest(ct, url, param, handler, headers, 0x13, null, null, "get");
+        ViewUtil.httpSendRequest(ct, url, param, handler, headers, 0x13, null, null, "get");
     }
 
-    private void initView() {
-        JSONArray array = getIntent().getParcelableExtra("data");
-        listview = (ListView) findViewById(R.id.listview);
-        if (array == null || array.size() <= 0)
-            loadLog();
-        else
-            listview.setAdapter(new SigninAdapter(array));
-    }
 
     class SigninAdapter extends BaseAdapter {
         private JSONArray json;
 
-        public SigninAdapter(JSONArray json) {
+        public SigninAdapter() {
+        }
+
+        public JSONArray getJson() {
+            return json;
+        }
+
+        public void setJson(JSONArray json) {
+            prot_tv.setText("本日签到 " + json.size() + " 次");
             this.json = json;
+            if (json == null || json.size() <= 0) mEmptyLayout.showEmpty();
+            notifyDataSetChanged();
         }
 
         @Override
@@ -103,20 +190,26 @@ public class OAListActivity extends BaseActivity {
                 holder = new ViewHolder();
                 view = LayoutInflater.from(ct).inflate(R.layout.item_outoffice_list, null);
                 holder.time = (TextView) view.findViewById(R.id.time);
-                holder.name = (TextView) view.findViewById(R.id.name);
+                holder.day = (TextView) view.findViewById(R.id.day);
+                holder.location = (TextView) view.findViewById(R.id.location);
                 holder.addr = (TextView) view.findViewById(R.id.addr);
+                holder.remark = (TextView) view.findViewById(R.id.remark);
                 holder.image = (ImageView) view.findViewById(R.id.image);
-                holder.company = (TextView) view.findViewById(R.id.company);
                 view.setTag(holder);
             } else {
                 holder = (ViewHolder) view.getTag();
             }
             JSONObject object = json.getJSONObject(i);
-            holder.time.setText(object.getString("mo_signtime") == null ? "" : object.getString("mo_signtime"));
-            holder.name.setText(object.getString("mo_man") == null ? "" : object.getString("mo_man"));
-            holder.addr.setText(object.getString("mo_remark") == null ? "" : object.getString("mo_remark"));
-            holder.company.setText(object.getString("mo_company") == null ? "" : object.getString("mo_company"));
+            String str = getStrByJson(object, "mo_signtime");
+            if (!StringUtils.isEmpty(str)) {
+                holder.time.setText(TimeUtils.long2str(TimeUtils.f_str_2_long(str), "HH:mm"));
+                holder.day.setText(TimeUtils.long2str(TimeUtils.f_str_2_long(str), "MM/dd"));
+            }
+            holder.location.setText(getStrByJson(object, "mo_company"));
+            holder.addr.setText(getStrByJson(object, "mo_address"));
+            holder.remark.setText(getStrByJson(object, "mo_remark"));
             if (object.containsKey("mo_attachid") && object.getInteger("mo_attachid") > 1000) {
+                holder.image.setVisibility(View.VISIBLE);
                 ImageLoader.getInstance().displayImage(getImageUrl(object.getInteger("mo_attachid")), holder.image);
             } else {
                 holder.image.setVisibility(View.GONE);
@@ -124,16 +217,25 @@ public class OAListActivity extends BaseActivity {
             return view;
         }
 
+        private String getStrByJson(JSONObject object, String key) {
+            if (object.containsKey(key)) {
+                return object.getString(key) == null ? "" : object.getString(key);
+            }
+            return "";
+        }
+
         private String getImageUrl(int id) {
             return Constants.getAppBaseUrl(ct) + "common/downloadbyId.action?id=" + id;
         }
 
         class ViewHolder {
-            TextView time,//时间
-                    name,//签到人
-                    addr, //地址
-                    company;//签到公司
-            ImageView image;
+            TextView day,//日期
+                    time,//时间
+                    location,//位置名称
+                    addr,//位置详细
+                    remark;//备注
+            ImageView image;//图片
+
         }
     }
 }

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

@@ -130,7 +130,7 @@ public class OutSigninOKActivity extends BaseActivity {
 
     private void showPopup() {
         AlertDialog.Builder builder = new AlertDialog.Builder(ct);
-        String[] items = {"拍照", "从照片中选择"};
+        String[] items = {"拍照", "从相册中选择"};
         builder.setTitle("选择操作");
         builder.setItems(items, new DialogInterface.OnClickListener() {
             @Override

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

@@ -91,7 +91,7 @@ public class OutofficeSetActivity extends BaseActivity {
     }
 
     private void updataSet(String key, String value) {
-        String formStore = "{\"code\":\"" + key + "\",\"data\":\"" + value + "\"}";
+        String formStore = "{\"" + key + "\":\"" + value + "\"}";
         Map<String, Object> param = new HashMap<>();
         param.put("formStore", formStore);
         net("mobile/updateconfigs.action", param, 0x11);

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

@@ -87,11 +87,7 @@ public class SaveMeetActivity extends BaseActivity {
     private void saveAble() {
         StringBuilder builder = new StringBuilder();
         String chche = "";
-        if (summary_et == null)
-            Log.i("gongpengming", "summary_et为空");
-        if (summary_et.getText().toString() == null) {
-            Log.i("gongpengming", "summary_et.getText().toString()为空");
-        }
+
         chche = summary_et.getText().toString();
         if (StringUtils.isEmpty(chche)) {
             ToastUtil.showToast(ct, "会议纪要未按要求填写");

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

@@ -4,7 +4,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -21,6 +20,7 @@ import com.xzjmyk.pm.activity.adapter.WorkLogAdapter;
 import com.xzjmyk.pm.activity.bean.circle.Comment;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.ClearEditText;
 import com.xzjmyk.pm.activity.view.PMsgBottomView;
@@ -43,8 +43,8 @@ import java.util.regex.Pattern;
  */
 public class WorkLogsActivity extends BaseActivity {
     private WorkLogsActivity ct;
-    private List<PublicMessage> mMessages;//消息对象
-    private List<PublicMessage> messages;//消息对象
+    private List<PublicMessage> allMag;//消息对象
+    private List<PublicMessage> showMag;//消息对象
     private PMsgBottomView bottom_view;
     private CommentItemChche itemChche;
     private static int requestCode = 0x21;
@@ -58,10 +58,13 @@ public class WorkLogsActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_work_logs);
         ct = this;
-        mMessages = new ArrayList<>();
+        allMag = new ArrayList<>();
+        showMag = new ArrayList<>();
         initView();
+        listener();
     }
 
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
@@ -82,7 +85,6 @@ public class WorkLogsActivity extends BaseActivity {
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == this.requestCode) {
             if (resultCode == this.resultCode) {
-                Log.i("gongpengming", "进来了");
                 requestMyBusiness(true);
             }
         }
@@ -90,7 +92,7 @@ public class WorkLogsActivity extends BaseActivity {
 
     //获取数据后更新界面
     private void upDataUi() {
-        mAdapter.setData(messages);
+        mAdapter.setData(showMag);
         mAdapter.notifyDataSetChanged();
     }
 
@@ -101,10 +103,7 @@ public class WorkLogsActivity extends BaseActivity {
         return m.find();
     }
 
-    private void initView() {
-        bottom_view = (PMsgBottomView) findViewById(R.id.bottom_view);
-        search_edit = (ClearEditText) findViewById(R.id.search_edit);
-        context_rv = (PullToRefreshListView) findViewById(R.id.context_rv);
+    private void listener() {
         context_rv.setOnScrollListener(new AbsListView.OnScrollListener() {
             @Override
             public void onScrollStateChanged(AbsListView absListView, int i) {
@@ -116,7 +115,6 @@ public class WorkLogsActivity extends BaseActivity {
             public void onScroll(AbsListView absListView, int i, int i1, int i2) {
             }
         });
-        context_rv.setMode(PullToRefreshBase.Mode.BOTH);
         bottom_view.setPMsgBottomListener(new PMsgBottomView.PMsgBottomListener() {
             @Override
             public void sendText(String text) {
@@ -142,15 +140,15 @@ public class WorkLogsActivity extends BaseActivity {
             public void afterTextChanged(Editable editable) {
                 String strChche = editable.toString();
                 //TODO 正则
-                messages.clear();
+                showMag.clear();
 
-                for (PublicMessage e : mMessages) {
+                for (PublicMessage e : allMag) {
                     boolean b = getResult(e.getNickName() + e.getBody().getText(), strChche);
                     if (b) {
-                        messages.add(e);
+                        showMag.add(e);
                     }
                 }
-                mAdapter.setData(messages);
+                mAdapter.setData(showMag);
                 mAdapter.notifyDataSetChanged();
             }
         });
@@ -165,9 +163,6 @@ public class WorkLogsActivity extends BaseActivity {
                 requestMyBusiness(false);
             }
         });
-        if (mMessages == null)
-            mMessages = new ArrayList<>();
-        mAdapter = new WorkLogAdapter(ct, mMessages);
         mAdapter.setButtonViewListener(new WorkLogAdapter.ButtonViewListener() {
             @Override
             public void onClick(int i, String messageId, String toUserId, String toName) {
@@ -181,6 +176,14 @@ public class WorkLogsActivity extends BaseActivity {
                 bottom_view.show();
             }
         });
+    }
+
+    private void initView() {
+        bottom_view = (PMsgBottomView) findViewById(R.id.bottom_view);
+        search_edit = (ClearEditText) findViewById(R.id.search_edit);
+        context_rv = (PullToRefreshListView) findViewById(R.id.context_rv);
+        context_rv.setMode(PullToRefreshBase.Mode.BOTH);
+        mAdapter = new WorkLogAdapter(ct, showMag);
         context_rv.setAdapter(mAdapter);
         initData();
     }
@@ -189,13 +192,14 @@ public class WorkLogsActivity extends BaseActivity {
         requestMyBusiness(true);
     }
 
-    private boolean isRefersh = false;
-
     private void requestMyBusiness(final boolean isPullDwonToRefersh) {
+        if (!StringUtils.isEmpty(search_edit.getText().toString())) {
+            search_edit.setText("");
+        }
         HashMap<String, String> params = new HashMap<>();
         String messageId = null;
-        if (!isPullDwonToRefersh && mMessages.size() > 0) {
-            messageId = mMessages.get(mMessages.size() - 1).getMessageId();
+        if (!isPullDwonToRefersh && allMag.size() > 0) {
+            messageId = allMag.get(allMag.size() - 1).getMessageId();
             params.put("messageId", messageId);
         }
         params.put("access_token", MyApplication.getInstance().mAccessToken);
@@ -213,23 +217,21 @@ public class WorkLogsActivity extends BaseActivity {
             public void onResponse(ArrayResult<PublicMessage> result) {
                 boolean success = Result.defaultParser(mContext, result, true);
                 if (success) {
-                    if (mMessages == null) {
-                        mMessages = new ArrayList<>();
+                    if (allMag == null) {
+                        allMag = new ArrayList<>();
                     }
-                    if (messages == null) {
-                        messages = new ArrayList<>();
+                    if (showMag == null) {
+                        showMag = new ArrayList<>();
                     }
-                    if (isRefersh) {
-                        mMessages.clear();
-                        messages.clear();
+                    if (isPullDwonToRefersh) {
+                        showMag.clear();
+                        allMag.clear();
                     }
                     if (context_rv.isRefreshing()) {
                         context_rv.onRefreshComplete();
                     }
-                    Log.i("gongpengming","mMessages="+mMessages.size());
-                    Log.i("gongpengming","messages="+messages.size());
-                    mMessages.addAll(result.getData());
-                    messages.addAll(result.getData());
+                    showMag.addAll(result.getData());
+                    allMag.addAll(result.getData());
                     upDataUi();
                 }
             }
@@ -237,33 +239,12 @@ public class WorkLogsActivity extends BaseActivity {
         addDefaultRequest(request);
     }
 
-
-    /**
-     * 添加一条评论的操作
-     * 新一条回复
-     */
-//    private void addComment() {
-//        //参数
-//        HashMap<String, Object> params = new HashMap<>();
-//        params.put("access_token", MyApplication.getInstance().mAccessToken);
-//        if (itemChche == null) return;
-//        params.put("messageId", itemChche.messageId);
-////        if (!TextUtils.isEmpty(itemChche.toUserId)) {
-////            params.put("toUserIdtoUserId", itemChche.toUserId);
-////        }
-////        if (!TextUtils.isEmpty(itemChche.toName)) {
-////            params.put("toNickname", itemChche.toName);
-////        }
-//        params.put("body", itemChche.body);
-//        ViewUtil.httpSendRequest(this, mConfig.MSG_COMMENT_ADD, params, handler, null, ADD_WHAT, null, null, "get");
-//    }
     private void addComment() {
         if (itemChche == null) return;
         Map<String, String> params = new HashMap<String, String>();
         params.put("access_token", MyApplication.getInstance().mAccessToken);
         params.put("messageId", itemChche.messageId);
         params.put("body", itemChche.body);
-
         StringJsonObjectRequest<String> request = new StringJsonObjectRequest<String>(mConfig.MSG_COMMENT_ADD, new Response.ErrorListener() {
             @Override
             public void onErrorResponse(VolleyError arg0) {
@@ -278,8 +259,8 @@ public class WorkLogsActivity extends BaseActivity {
                     comment.setBody(itemChche.body);
                     comment.setNickName(MyApplication.getInstance().mLoginUser.getNickName());
                     comment.setToBody(itemChche.body);
-                    mMessages.get(itemChche.option).getComments().add(comment);
-                    mAdapter.setData(mMessages);
+                    showMag.get(itemChche.option).getComments().add(comment);
+                    mAdapter.setData(showMag);
                     mAdapter.notifyDataSetChanged();
                 }
             }

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

@@ -178,7 +178,6 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (data == null) return;
-        Log.i("gongpengming", "data != null");
         if (0x21 == requestCode) {
             if (resultCode == LocationMapActivity.REQUCODE) {
                 PoiInfo info = data.getParcelableExtra(LocationMapActivity.REQUESTNAME);
@@ -195,13 +194,9 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
                     num_tv.setText(Html.fromHtml("<u>" + sigNum + "</u>"));
                 }
             } else if (resultCode == 0x21) {
-                Log.i("gongpengming", "requestCode == 0x21");
                 isImage = data.getBooleanExtra("isImage", false);
                 isAddress = data.getBooleanExtra("isAddress", false);
                 distance = data.getIntExtra("distance", 100);
-                Log.i("gongpengming", "isImage=" + isImage);
-                Log.i("gongpengming", "isAddress=" + isAddress);
-                Log.i("gongpengming", "distance=" + distance);
                 if (isAddress)
                     do_trim.setVisibility(View.VISIBLE);
                 else

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

@@ -206,7 +206,6 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                 break;
             case R.id.title:
                 showDateDialog();
-//                showPopMenu();
                 break;
             case R.id.unoffice_mm:
                 intent = new Intent(ct, LocationMapActivity.class);

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

@@ -111,7 +111,7 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
             case R.id.setting_rl:
                 String phone = CommonUtil.getSharedPreferences(getActivity(), "user_phone");
                 String password = CommonUtil.getSharedPreferences(getActivity(), "user_password");
-                String url = "http://www.ubtob.com/signin#/redirect/" + phone + "/" + password;
+                String url = "http://www.ubtob.com/signin#/redirect/" + phone + "/" + password+"?client_type=im";
                 ViewUtil.webLinks(ct, url, "我的商务");
                 break;
             case R.id.rl_uas_sys:

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

@@ -197,10 +197,6 @@ public class ViewUtil {
             public void run() {
                 boolean isNetHas = CommonUtil.isNetWorkConnected(ct);
                 if (isNetHas) {
-                    Log.i("gongpengming", "url=" + url);
-                    for (String s : params.keySet()) {
-                        Log.i("gongpengming", "key=" + s + "  @@ values=" + params.get(s));
-                    }
                     String result = getDataFromServer(url, params, request);
                     Log.i("result", "http:" + result);
                     if (result != null) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java

@@ -169,7 +169,6 @@ public class MessageFragment extends EasyFragment {
     }
 
     public void setListener(int num) {
-        Log.i("gongpengming", num + "num=");
         if (refreshRedUIListener == null) return;
         refreshRedUIListener.updata(num);
     }
@@ -722,7 +721,6 @@ public class MessageFragment extends EasyFragment {
             b2b_num_tv.setVisibility(View.VISIBLE);
             b2b_content_tv.setText("您有" + bMsgs.size() + "条商务消息未读");
             rl_b2b.setVisibility(View.VISIBLE);
-            Log.i("gongpengming", "bMsgs.size=" + bMsgs.size());
             setListener(bMsgs.size() + GONGGAO_count + NOTICE_count + NES_count + TASK_count + DAIBAN_count + SUBRICE_count);
         } else {
             rl_b2b.setVisibility(View.GONE);
@@ -746,7 +744,6 @@ public class MessageFragment extends EasyFragment {
                                 num += 1;
                         }
                     }
-                    Log.i("gongpengming", "num.size=" + num);
                     setListener(GONGGAO_count + NOTICE_count + NES_count + TASK_count + DAIBAN_count + num);
                     if (num > 0) {
                         num_tv.setText(num + "");
@@ -823,7 +820,6 @@ public class MessageFragment extends EasyFragment {
 
 
     private void setNOTICE_count(int count) {
-        Log.i("gongpengming","setNOTICE_count="+count);
         setListener(GONGGAO_count + NOTICE_count + NES_count + TASK_count + DAIBAN_count + SUBRICE_count);
         if (count > 0) {
             notice_num_tv.setText(count + "");

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/tool/SingleImagePreviewActivity.java

@@ -93,7 +93,6 @@ public class SingleImagePreviewActivity extends ActionBackActivity {
 		mImageView.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
-//				Log.i("gongpengmingIMAGE","setOnClickListener");
 				finish();
 				overridePendingTransition(0, R.anim.alpha_scale_out);
 			}

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/wheel/DateTimePicker.java

@@ -390,12 +390,16 @@ public class DateTimePicker extends WheelPicker {
         selectedYearIndex = findItemIndex(years, year);
         selectedMonthIndex = findItemIndex(months, month);
         selectedDayIndex = findItemIndex(days, day);
-        if (hour<10){
-            selectedHour = "0"+String.valueOf(hour);  
-        }else{
+        if (hour < 10) {
+            selectedHour = "0" + String.valueOf(hour);
+        } else {
             selectedHour = String.valueOf(hour);
         }
-        selectedMinute = String.valueOf(minute);
+        if (minute < 10) {
+            selectedMinute = "0" + String.valueOf(minute);
+        } else {
+            selectedMinute = String.valueOf(minute);
+        }
     }
 
     /**

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

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

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

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

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

@@ -8,7 +8,7 @@
         android:width="0.5dp"
         android:color="@android:color/black" />
     <!-- 圆角 -->
-    <corners android:radius="3dp" />
+    <corners android:radius="9dp" />
     <!-- 边距 -->
     <padding
         android:bottom="10dp"

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

@@ -5,12 +5,11 @@
     android:layout_height="match_parent"
     android:background="@color/item_color2"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.AddMeetTaskActivity">
+
     <com.handmark.pulltorefresh.library.PullToRefreshListView
         android:id="@+id/listview"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@+id/seach_top"
-        android:layout_marginTop="10dp"
         android:background="@color/item_color2"
         android:divider="@color/item_line"
         android:dividerHeight="10dp" />

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

@@ -266,6 +266,7 @@
             </RelativeLayout>
             <LinearLayout
                 android:layout_marginTop="20dp"
+                android:layout_height="wrap_content"
                 style="@style/crm_ll_card">
                 <TextView
                     android:layout_width="match_parent"

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

@@ -10,7 +10,7 @@
         android:background="@drawable/bg_bar"
         android:layout_width="match_parent"
         android:layout_height="48dp"
-        android:visibility="gone"
+        android:visibility="visible"
         android:orientation="horizontal"
         android:paddingBottom="5dp"
         android:paddingLeft="15dp"

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

@@ -59,12 +59,14 @@
                 android:layout_toRightOf="@+id/tv_c12"
                 android:text="*"
                 android:textColor="@color/red" />
-
+<!--^[\u4e00-\u9fa5]{1,7}$|^[\dA-Za-z_]{1,7}$-->
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/et_cu_name"
                 style="@style/form_relative_right_text"
                 android:hint="请输入"
-                editTextFormExample:testType="nocheck" />
+                whatever:testType="regexp"
+                whatever:customRegexp="^[\u4e00-\u9fa5_a-zA-Z0-9_]{0,300}$"
+                whatever:testErrorString="限定字符长度不大于300" />
         </RelativeLayout>
 
         <!--<ImageView style="@style/app_comm_list_line_gray" />-->
@@ -109,7 +111,9 @@
                 android:id="@+id/tv_cu_address"
                 style="@style/form_relative_right_text"
                 android:hint="请输入"
-                editTextFormExample:testType="nocheck" />
+                whatever:testType="regexp"
+                whatever:customRegexp="^[\u4e00-\u9fa5]{1,500}$|^[\dA-Za-z_]{1,500}$"
+                whatever:testErrorString="限定字符长度不大于500" />
         </RelativeLayout>
 
 
@@ -264,8 +268,9 @@
                 android:id="@+id/tv_cu_contact"
                 style="@style/form_relative_right_text"
                 android:hint="请输入"
-                editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
-                editTextFormExample:testType="nocheck" />
+                whatever:testType="regexp"
+                whatever:customRegexp="^[\u4e00-\u9fa5_a-zA-Z0-9_]{0,100}$"
+                whatever:testErrorString="限定字符长度不大于100" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -291,7 +296,9 @@
                 android:id="@+id/tv_cu_degree"
                 style="@style/form_relative_right_text"
                 android:hint="请输入"
-                editTextFormExample:testType="nocheck" />
+                whatever:testType="regexp"
+                whatever:customRegexp="^[\u4e00-\u9fa5_a-zA-Z0-9_]{0,100}$"
+                whatever:testErrorString="限定字符长度不大于100"/>
         </RelativeLayout>
 
         <RelativeLayout
@@ -317,7 +324,8 @@
                 android:id="@+id/tv_cu_mobile"
                 style="@style/form_relative_right_text"
                 android:hint="请输入"
-                editTextFormExample:testType="nocheck" />
+                android:maxHeight="35dp"
+                editTextFormExample:testType="phone" />
         </RelativeLayout>
 
 
@@ -343,7 +351,8 @@
                 android:id="@+id/tv_cu_email"
                 style="@style/form_relative_right_text"
                 android:hint="请输入"
-                editTextFormExample:testType="nocheck" />
+                android:maxHeight="35dp"
+                editTextFormExample:testType="email" />
 
         </RelativeLayout>
 
@@ -426,7 +435,8 @@
                     android:id="@+id/tv_cu_taxrate"
                     style="@style/form_relative_right_text"
                     android:hint="请输入"
-                    editTextFormExample:testType="nocheck" />
+                    android:maxHeight="35dp"
+                    editTextFormExample:testType="numeric" />
             </RelativeLayout>
 
             <RelativeLayout
@@ -472,8 +482,10 @@
                 android:id="@+id/tv_cu_remark"
                 style="@style/form_relative_right_text"
                 android:hint="请输入"
-                editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
-                editTextFormExample:testType="nocheck" />
+                android:text=" "
+                whatever:testType="regexp"
+                whatever:customRegexp="^[\u4e00-\u9fa5_a-zA-Z0-9_\s]{0,50}$"
+                whatever:testErrorString="限定字符长度不大于50" />
         </RelativeLayout>
     </LinearLayout>
 </ScrollView>

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

@@ -10,55 +10,33 @@
     <LinearLayout
         android:id="@+id/top"
         android:layout_width="match_parent"
-        android:layout_height="70dp"
+        android:layout_height="wrap_content"
         android:background="@color/oa_background_orange"
         android:gravity="center_vertical"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:padding="10dp">
 
-        <LinearLayout
+        <TextView
             android:id="@+id/meet_save"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
             android:layout_weight="1"
-            android:clickable="true"
+            android:drawableTop="@drawable/oa_save_meet"
             android:gravity="center"
-            android:orientation="vertical">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/oa_save_meet" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:text="会议纪要"
-                android:textColor="@color/white" />
-        </LinearLayout>
-
-        <LinearLayout
+            android:text="会议纪要"
+            android:textColor="@color/white" />
+
+        <TextView
             android:id="@+id/add_task_ll"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
+            android:layout_marginTop="2dp"
             android:layout_weight="1"
-            android:clickable="true"
+            android:drawableTop="@drawable/oa_add_task"
             android:gravity="center"
-            android:orientation="vertical">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="@drawable/oa_add_task" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:text="发起任务"
-                android:textColor="@color/white" />
-        </LinearLayout>
+            android:text="发起任务"
+            android:textColor="@color/white" />
     </LinearLayout>
 
     <RelativeLayout
@@ -153,6 +131,8 @@
             android:layout_alignTop="@id/addr"
             android:layout_marginLeft="10dp"
             android:layout_toRightOf="@id/addr"
+            android:ellipsize="end"
+            android:lines="1"
             android:text="未填写"
             android:textColor="@color/text_hine" />
 
@@ -286,16 +266,4 @@
         android:layout_alignParentBottom="true"
         android:background="@drawable/endmeeting" />
 
-    <!--<TextView-->
-    <!--android:id="@+id/end_meet_tv"-->
-    <!--android:layout_width="match_parent"-->
-    <!--android:layout_height="wrap_content"-->
-    <!--android:layout_alignParentBottom="true"-->
-    <!--android:layout_below="@+id/meet_about"-->
-    <!--android:background="@color/white"-->
-    <!--android:clickable="true"-->
-    <!--android:gravity="center"-->
-    <!--android:padding="20dp"-->
-    <!--android:text="结束会议"-->
-    <!--android:textColor="@color/text_main" />-->
 </RelativeLayout>

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

@@ -1,14 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.OAListActivity">
 
+    <FrameLayout
+        android:id="@+id/top_fl"
+        android:layout_width="match_parent"
+        android:layout_height="200dp">
+
+        <com.baidu.mapapi.map.MapView
+            android:id="@+id/mapView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:clickable="false" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <TextView
+                android:id="@+id/rili_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:background="@drawable/oa_signin_tv_bg"
+                android:drawableLeft="@drawable/outoffice_sin"
+                android:drawableRight="@drawable/oa_next"
+                android:text="2016-07-01" />
+
+            <ImageView
+                android:id="@+id/head_img"
+                android:layout_width="60dp"
+                android:layout_height="60dp"
+                android:layout_alignParentBottom="true"
+                android:layout_margin="10dp" />
+            <TextView
+                android:id="@+id/name_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignTop="@id/head_img"
+                android:layout_toRightOf="@id/head_img"
+                android:textColor="@color/text_main" />
+
+            <TextView
+                android:id="@+id/num_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignLeft="@id/name_tv"
+                android:layout_below="@id/name_tv"
+                android:layout_marginTop="5dp"
+                android:visibility="gone"
+                android:textColor="@color/text_hine" />
+
+            <TextView
+                android:id="@+id/prot_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignLeft="@id/num_tv"
+                android:layout_below="@id/num_tv"
+                android:layout_marginTop="5dp"
+                android:text="name"
+                android:textColor="@color/text_hine" />
+        </RelativeLayout>
+    </FrameLayout>
+
     <ListView
         android:id="@+id/listview"
-        android:divider="@color/item_line"
-        android:dividerHeight="2px"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</RelativeLayout>
+        android:layout_height="match_parent"
+        android:divider="@color/item_line"
+        android:dividerHeight="10px" />
+</LinearLayout>

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

@@ -252,7 +252,6 @@
 
 
         <RelativeLayout
-
             android:id="@+id/email_erp_rl"
             style="@style/form_relative_customer"
             android:layout_height="wrap_content"
@@ -263,10 +262,10 @@
                 android:id="@+id/email_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
+                android:layout_alignTop="@+id/tv_content"
                 android:layout_marginLeft="20dp"
                 android:drawablePadding="10dp"
-                android:gravity="center"
+                android:padding="5dp"
                 android:text="详情"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
@@ -275,7 +274,6 @@
                 android:id="@+id/tv_content"
                 style="@style/form_relative_right_text"
                 android:gravity="top|left"
-                android:hint="最多输入十五个字符"
                 android:minLines="4"
                 android:padding="5dp"
                 editTextFormExample:testType="nocheck" />

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

@@ -54,7 +54,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignBottom="@+id/tv"
-            android:layout_marginLeft="5dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
             android:layout_toRightOf="@+id/tv"
             android:text=" 0"
             android:textColor="@color/mainList2"

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

@@ -12,14 +12,17 @@
         android:layout_height="80dp"
         android:layout_marginRight="10dp"
         android:gravity="center"
-        android:textSize="20sp" />
-<TextView
-    android:id="@+id/status_tv"
-    android:textColor="@color/text_hine"
-    android:layout_alignParentRight="true"
-    android:layout_alignTop="@id/head_img"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content" />
+        android:textSize="20sp"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/status_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_alignTop="@id/head_img"
+        android:textColor="@color/text_hine" />
+
     <TextView
         android:id="@+id/name_tv"
         android:layout_width="wrap_content"
@@ -49,7 +52,8 @@
         android:layout_marginTop="10dp"
         android:drawableLeft="@drawable/icon_meeting"
         android:drawablePadding="10dp"
-        android:text="OA,CRM讨论"
+        android:ellipsize="end"
+        android:lines="2"
         android:textColor="@color/text_main"
         android:textSize="@dimen/text_main" />
 

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

@@ -105,11 +105,11 @@
             android:layout_height="wrap_content" />
     </LinearLayout>
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="2px"
-        android:layout_below="@+id/comment_tag"
-        android:background="@color/item_line" />
+    <!--<View-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="2px"-->
+        <!--android:layout_below="@+id/comment_tag"-->
+        <!--android:background="@color/item_line" />-->
 
     <RelativeLayout
         android:id="@+id/operate_tag"

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

@@ -1,46 +1,83 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="80dp"
-    android:padding="8dp">
-
-    <ImageView
-        android:id="@+id/image"
-        android:layout_width="80dp"
-        android:layout_height="80dp"
-  />
-
-    <TextView
-        android:id="@+id/name"
-        android:layout_marginLeft="10dp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toRightOf="@+id/image"
-        android:text="签到人" />
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="10dp">
 
-    <TextView
-        android:id="@+id/company"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:text="签到企业"
-      />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
 
-    <TextView
-        android:id="@+id/time"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@id/name"
-        android:layout_below="@+id/name"
-        android:layout_marginTop="8dp"
-        android:text="签到地点" />
-
-    <TextView
-        android:id="@+id/addr"
-        android:layout_width="wrap_content"
+        <TextView
+            android:id="@+id/day"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="8/20"
+            android:textColor="@color/text_hine"
+            android:textSize="@dimen/text_hine" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="2px"
+            android:layout_gravity="center"
+            android:layout_marginLeft="8dp"
+            android:background="@color/item_line" />
+    </LinearLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignLeft="@id/name"
-        android:layout_below="@+id/time"
-        android:layout_marginTop="8dp"
-        android:text="签到地点" />
-</RelativeLayout>
+        android:layout_marginTop="8dp">
+
+        <TextView
+            android:id="@+id/time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="10:45"
+            android:textColor="@color/text_main"
+            android:textSize="20dp" />
+
+        <TextView
+            android:id="@+id/location"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="8dp"
+            android:layout_toRightOf="@id/time"
+            android:ellipsize="end"
+            android:lines="1"
+            android:textColor="@color/text_main"
+            android:textSize="@dimen/text_main" />
+
+        <TextView
+            android:id="@+id/addr"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignLeft="@id/location"
+            android:layout_below="@id/location"
+            android:layout_marginTop="6dp"
+            android:drawableLeft="@drawable/addr"
+            android:drawablePadding="4dp"
+            android:textSize="@dimen/text_main" />
+
+        <TextView
+            android:id="@+id/remark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignLeft="@id/addr"
+            android:layout_below="@id/addr"
+            android:layout_marginTop="6dp" />
+
+        <ImageView
+            android:id="@+id/image"
+            android:layout_width="80dp"
+            android:layout_height="80dp"
+            android:layout_alignLeft="@id/remark"
+            android:layout_below="@id/remark"
+            android:layout_marginTop="6dp"
+            android:visibility="gone" />
+    </RelativeLayout>
+
+</LinearLayout>

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

@@ -25,7 +25,7 @@
     <color name="btn_login_press">#B9D2E3</color>
 
     <color name="btn_orange_normal">#DD9C57</color>
-    <color name="btn_orange_press">#E5AA69</color>
+    <color name="btn_orange_press">#908f8f</color>
     <!--end gongpengming-->
     <color name="shadow">#AA000000</color>
     <color name="default_shadow_color">#88757575</color>

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#Fri Aug 19 18:54:48 CST 2016
+#Wed Sep 14 14:23:32 CST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME