新闻通知添加进度体！还有内容显示文本!

WeiChat/src/main/AndroidManifest.xml

@@ -304,7 +304,7 @@
                 <action android:name="android.intent.action.ACTION_POWER_DISCONNECTED" />
             </intent-filter>
         </receiver>
-        <!--oA模块提醒功能本地推送-->
+        <!-- oA模块提醒功能本地推送 -->
         <receiver android:name=".ui.erp.activity.oa.AlarmReceiver" />
         <!-- Push服务接收客户端发送的各种请求 -->
         <receiver
@@ -410,7 +410,7 @@
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
             android:name=".ui.erp.activity.oa.StatisticsActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+            android:label="考勤统计" />
         <activity android:name=".ui.erp.activity.TextErpActivity" />
         <activity android:name=".ui.erp.activity.crm.BusinessActivity" />
         <activity android:name=".ui.erp.activity.crm.BusinessDetailActivty" />
@@ -421,7 +421,9 @@
         <activity
             android:name=".ui.message.uas.B2bMsgActivity"
             android:launchMode="singleTask" />
-        <activity android:name=".ui.erp.activity.oa.OutofficeActivity" />
+        <activity
+            android:name=".ui.erp.activity.oa.OutofficeActivity"
+            android:label="外勤签到" />
         <activity android:name=".ui.erp.activity.oa.MeetDetailsActivity" />
         <activity android:name=".ui.erp.activity.oa.OARegisterActivity" />
         android:launchMode="singleTask" />
@@ -463,6 +465,8 @@
         <activity
             android:name=".ui.erp.activity.oa.MeetingActivity"
             android:label="会议助手" />
+        <activity android:name=".ui.message.SubscripSetActivity"
+            android:label="申请订阅"/>
     </application>
 
 </manifest>

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

@@ -42,6 +42,7 @@ public class BdLocationHelper {
 		option.setCoorType("bd09ll");// 返回的定位结果是百度经纬度,默认值gcj02
 		option.setScanSpan(5000);// 设置发起定位请求的间隔时间为10s
 		option.setIsNeedAddress(true);
+
 		option.setNeedDeviceDirect(false);
 		option.setOpenGps(true);//可选，默认false,设置是否使用gps
 
@@ -112,9 +113,6 @@ public class BdLocationHelper {
 				LocationSp.getInstance(mContext).setCityName(mCityName);
 				LocationSp.getInstance(mContext).setDistrictName(mDistrictName);
 				isLocationUpdate = true;
-				
-				
-				
 			}
 
 			if (AppConfig.DEBUG) {

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

@@ -0,0 +1,17 @@
+package com.xzjmyk.pm.activity.bean.oa;
+
+import com.baidu.mapapi.search.core.PoiInfo;
+
+/**
+ * Created by gongpm on 2016/7/14.
+ */
+public class SigninBean  {
+    private int id;
+    private String name;
+    private int num;
+    private int type;
+    private PoiInfo poiInfo;
+
+
+
+}

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

@@ -143,11 +143,12 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
             params.put("latitude", String.valueOf(latitude));
         if (longitude != 0)
             params.put("longitude", String.valueOf(longitude));
-        Log.i("Arison","LoginActivity:login:159:model="+DeviceInfoUtil.getModel());
-        Log.i("Arison","LoginActivity:login:160:osVersion="+DeviceInfoUtil.getOsVersion());
-        Log.i("Arison","LoginActivity:login:161:serial="+DeviceInfoUtil.getDeviceId(mContext));
+        Log.i("Arison", "LoginActivity:login:159:model=" + DeviceInfoUtil.getModel());
+        Log.i("Arison", "LoginActivity:login:160:osVersion=" + DeviceInfoUtil.getOsVersion());
+        Log.i("Arison", "LoginActivity:login:161:serial=" + DeviceInfoUtil.getDeviceId(mContext));
         Log.i("Arison", "LoginActivity:login:162:latitude=" + String.valueOf(latitude));
-        Log.i("Arison","LoginActivity:login:163:longitude="+String.valueOf(longitude));
+        Log.i("Arison", "LoginActivity:login:163:longitude=" + String.valueOf(longitude));
+        Log.i("gongpengming11", "phone=" + phoneNumber + "\n" + "password" + password);
         final StringJsonObjectRequest<LoginRegisterResult> request = new StringJsonObjectRequest<LoginRegisterResult>(mConfig.USER_LOGIN,
                 new ErrorListener() {
                     @Override
@@ -174,6 +175,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                 if (success) {// 登陆IM成功
                     login_manage(phoneNumber, password);//登录管理平台
                 } else {// 登录失败
+                    Log.i("gongpengming", result.getResultMsg());
                     String message = TextUtils.isEmpty(result.getResultMsg()) ? getString(R.string.login_failed) : result.getResultMsg();
                     ToastUtil.showToast(mContext, message);
                 }
@@ -206,7 +208,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
 //		final ProgressDialog dialog = ProgressDialogUtil.init(mContext, null, getString(R.string.please_wait), true);
 //		ProgressDialogUtil.show(dialog);
         /*StringJsonObjectRequest<String> mRequest = new StringJsonObjectRequest<String>(
-				Request.Method.GET, url,
+                Request.Method.GET, url,
 				new ErrorListener() {
 					@Override
 					public void onErrorResponse(VolleyError volleyError) {
@@ -226,6 +228,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
 				}, String.class, params, true);
 		mRequest.setTag(requestTag);
 		addDefaultRequest(mRequest);*/
+        Log.i("gongpengming", "phone=" + phone + "\n" + "password" + password);
         ViewUtil.LoginTask(phone, password, mContext);
     }
 

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

@@ -123,17 +123,12 @@ public class NewsTwoActivity extends BaseActivity {
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, param, handler, headers, Constants.LOAD_SUCCESS, null, null, "get");
     }
-
-
     private Handler handler = new Handler() {
         public void handleMessage(android.os.Message msg) {
             switch (msg.what) {
                 case Constants.LOAD_SUCCESS:
                     String result = msg.getData().getString("result");
                     NewsEntity newsEntity = JSON.parseObject(result, NewsEntity.class);
-                    for (int i = 0; i < newsEntity.getData().size(); i++) {
-                   //     Log.i("gongpengming", newsEntity.getData().get(i).getNE_TYPE());
-                    }
                     if (adapter == null) {
                         adapter = new CardItemAdapter(ct, newsEntity);
                         mlist.getRefreshableView().setAdapter(adapter);

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

@@ -42,14 +42,12 @@ public class NoticeMenuActivity extends BaseActivity {
     @Override
     public void onBackPressed() {
         sendResult();
-        Log.i("gongpengming", "onBackPressed");
         super.onBackPressed();
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
-            Log.i("gongpengming", "onOptionsItemSelected");
             sendResult();
             finish();
             return true;

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

@@ -18,20 +18,18 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.xzjmyk.pm.activity.db.dao.FriendDao;
-import com.xzjmyk.pm.activity.ui.erp.util.ObjectUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Friend;
+import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.NoticeEntity;
 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.ObjectUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -150,24 +148,25 @@ public class NoticesActivity extends BaseActivity {
                     String result = msg.getData().getString("result");
                     NoticeEntity newsEntity = JSON.parseObject(result, NoticeEntity.class);
                     if (adapter == null) {
-                        String em_id = CommonUtil.getSharedPreferences(ct, "erp_emid");
-                        Log.i("User", "em_id=" + em_id);
-                        List<NoticeEntity.Data> fiterdata = new ArrayList<NoticeEntity.Data>();
-                        for (int i = 0; i < newsEntity.getData().size(); i++) {
-                            if (newsEntity.getData().get(i).getNO_ISPUBLIC() == 0) {
-                                if ((!StringUtils.isEmpty(em_id) && newsEntity.getData().get(i).getNO_RECIPIENTID() != null)) {
-                                    if (newsEntity.getData().get(i).getNO_RECIPIENTID().toString().contains(em_id)) {
-                                        fiterdata.add(newsEntity.getData().get(i));
-                                    }
-                                }
-                            } else {
-                                fiterdata.add(newsEntity.getData().get(i));
-                            }
-                        }
-                        newsEntity.setData(fiterdata);
+//                        String em_id = CommonUtil.getSharedPreferences(ct, "erp_emid");
+//                        List<NoticeEntity.Data> fiterdata = new ArrayList<NoticeEntity.Data>();
+//                        for (int i = 0; i < newsEntity.getData().size(); i++) {
+//                            if (newsEntity.getData().get(i).getNO_ISPUBLIC() == 0) {
+//                                if ((!StringUtils.isEmpty(em_id) && newsEntity.getData().get(i).getNO_RECIPIENTID() != null)) {
+//                                    if (newsEntity.getData().get(i).getNO_RECIPIENTID().toString().contains(em_id)) {
+//                                        fiterdata.add(newsEntity.getData().get(i));
+//                                    }
+//                               }
+//                            } else {
+//                                fiterdata.add(newsEntity.getData().get(i));
+//                            }
+//                        }
+//                        newsEntity.setData(fiterdata);
                         adapter = new CardItemAdapter(ct, newsEntity);
                         mlist.getRefreshableView().setAdapter(adapter);
                         progress_bar.setVisibility(View.GONE);
+
+                        TextView text;
                     } else {
                         adapter.notifyDataSetChanged();
                     }

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

@@ -3,12 +3,15 @@ package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
+import android.widget.TextView;
 
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 
 public class AddNextSigninActivity extends BaseActivity implements View.OnClickListener {
 
+    private TextView addr_tv;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -20,6 +23,9 @@ public class AddNextSigninActivity extends BaseActivity implements View.OnClickL
 
     private void initView() {
         findViewById(R.id.time_rl).setOnClickListener(this);
+        addr_tv = (TextView) findViewById(R.id.addr_tv);
+        addr_tv.setOnClickListener(this);
+        findViewById(R.id.save_btn).setOnClickListener(this);
     }
 
     @Override
@@ -28,6 +34,12 @@ public class AddNextSigninActivity extends BaseActivity implements View.OnClickL
             case R.id.time_rl:
                 startActivity(new Intent(AddNextSigninActivity.this, SigninTimeSetActivity.class));
                 break;
+            case R.id.addr_tv:
+                ToastMessage("弹框");
+                break;
+            case R.id.save_btn:
+                ToastMessage("弹框");
+                break;
         }
     }
 }

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

@@ -4,15 +4,14 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.text.Html;
 import android.view.View;
-import android.widget.Button;
 import android.widget.RadioButton;
 
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.DbfindListActivity;
 
-public class AddSigninActivity extends BaseActivity {
+public class AddSigninActivity extends BaseActivity implements View.OnClickListener {
     private RadioButton static_rb, plan_rb;
-    private Button next_btn;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -25,16 +24,29 @@ public class AddSigninActivity extends BaseActivity {
     private void initView() {
         static_rb = (RadioButton) findViewById(R.id.static_rb);
         plan_rb = (RadioButton) findViewById(R.id.plan_rb);
-        next_btn = (Button) findViewById(R.id.next_btn);
+        findViewById(R.id.next_btn).setOnClickListener(this);
+        findViewById(R.id.users_rl).setOnClickListener(this);
+        findViewById(R.id.user_rl).setOnClickListener(this);
         String static_rbStr = "<font color=\'#3c3c3c\'>固定班次  </font><font color=\'#575757\'>(考勤时间都一样)</font>";
         String plan_rbStr = "<font color=\'#3c3c3c\'>排班制  </font><font color='#575757'>(考勤时间不都一样) </font><font color='#FF0000'>【此类型建议在电脑上排班】</font>";
         static_rb.setText(Html.fromHtml(static_rbStr));
         plan_rb.setText(Html.fromHtml(plan_rbStr));
-        next_btn.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
+
+
+    }
+
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.next_btn:
                 startActivity(new Intent(AddSigninActivity.this, AddNextSigninActivity.class));
-            }
-        });
+                break;
+            case R.id.users_rl:
+                startActivityForResult(new Intent(AddSigninActivity.this, DbfindListActivity.class), 1);
+                break;
+            case R.id.user_rl:
+                startActivityForResult(new Intent(AddSigninActivity.this, DbfindListActivity.class), 1);
+                break;
+        }
     }
 }

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

@@ -5,8 +5,6 @@ import android.app.PendingIntent;
 import android.app.TimePickerDialog;
 import android.content.Intent;
 import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -27,7 +25,7 @@ import java.util.Calendar;
 import java.util.Date;
 
 //签到提醒
-public class AlarmaActivity extends BaseActivity {
+public class AlarmaActivity extends BaseActivity implements View.OnClickListener {
     @ViewInject(R.id.isalarma_sw)
     private SwitchView isalarma_sw;
     @ViewInject(R.id.image_alar)
@@ -54,32 +52,8 @@ public class AlarmaActivity extends BaseActivity {
     }
 
     private void initView() {
-        image_alar.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                TimePickerDialog dialog = new TimePickerDialog(AlarmaActivity.this, new TimePickerDialog.OnTimeSetListener() {
-                    @Override
-                    public void onTimeSet(TimePicker timePicker, int i, int i1) {
-                        tv_alar.setText(i + ":" + i1);
-                    }
-                }, 15, 11, true);
-            }
-        });
-        tv_alar.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-            }
+        image_alar.setOnClickListener(this);
 
-            @Override
-            public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-
-            }
-
-            @Override
-            public void afterTextChanged(Editable editable) {
-                startTharth();
-            }
-        });
         formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm");
         isalarma_sw.setOnCheckedChangeListener(new SwitchView.OnCheckedChangeListener() {
             @Override
@@ -169,9 +143,6 @@ public class AlarmaActivity extends BaseActivity {
         }
         return 0;
     }
-//通过上面的方法获得两个日期的天数差，然后用计算秒不就简单了？
-
-
     private void unArmmanager() {
         Intent intent = new Intent(AlarmaActivity.this, AlarmReceiver.class);
         intent.setAction(ALARMASET);
@@ -194,4 +165,26 @@ public class AlarmaActivity extends BaseActivity {
         //TODO 退出时候操作
         finish();
     }
+
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.image_alar:
+                showSelectDalog(tv_alar);
+                break;
+            case R.id.image_ualar:
+                showSelectDalog(tv_ualar);
+                break;
+        }
+    }
+
+    public void showSelectDalog(final TextView tv) {
+        TimePickerDialog dialog = new TimePickerDialog(AlarmaActivity.this, new TimePickerDialog.OnTimeSetListener() {
+            @Override
+            public void onTimeSet(TimePicker timePicker, int i, int i1) {
+                tv.setText(i + ":" + i1);
+            }
+        }, 15, 11, true);
+        dialog.show();
+    }
 }

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

@@ -2,6 +2,8 @@ package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -28,19 +30,19 @@ import com.baidu.mapapi.search.poi.PoiIndoorResult;
 import com.baidu.mapapi.search.poi.PoiNearbySearchOption;
 import com.baidu.mapapi.search.poi.PoiResult;
 import com.baidu.mapapi.search.poi.PoiSearch;
-import com.baidu.mapapi.search.poi.PoiSortType;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.xzjmyk.pm.activity.BdLocationHelper;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.util.BaiduMapUtil;
 
 import java.util.List;
 
 //选择地址
 public class LocationMapActivity extends BaseActivity implements OnGetPoiSearchResultListener {
-    double latitude;
-    double longitude;
+    public static final int REQUCODE = 0x103;  //返回码
+    public static final String REQUESTNAME = "LocationMapActivity_RE";//返回数据提取KEY
     private MapView mapView;
     private PullToRefreshListView listView;
     private List<PoiInfo> listData;  //周围地址主体；列表
@@ -49,6 +51,17 @@ public class LocationMapActivity extends BaseActivity implements OnGetPoiSearchR
     private LocationMapAdapter adapter;
     private int selectItem = 0;
     private PoiInfo myPoInfo;
+    private int what = 0x12;
+    private Handler handler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            if (msg.what == what) {
+                PoiResult poiResult = msg.getData().getParcelable("data");
+                updataByHandle(poiResult);
+            }
+        }
+    };
+    private LatLng point;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -57,13 +70,13 @@ public class LocationMapActivity extends BaseActivity implements OnGetPoiSearchR
 
         init();
         initView();
-        listenerNearInfo(0, 0);
+        BaiduMapUtil.getInstence().getNearInfo(0, 0, point, mPoiSearch, handler, what);
     }
 
     private void initView() {
         mapView = (MapView) findViewById(R.id.bmapView);
         listView = (PullToRefreshListView) findViewById(R.id.listview);
-        initMapViewSet();
+        BaiduMapUtil.getInstence().setMapViewPoint(mapView, point);
         adapter = new LocationMapAdapter();
         listView.setAdapter(adapter);
         //选择
@@ -72,82 +85,37 @@ public class LocationMapActivity extends BaseActivity implements OnGetPoiSearchR
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
                 selectItem = i - 1;
                 adapter.notifyDataSetChanged();
-                initMapViewSet(listData.get(i - 1).location);
+                BaiduMapUtil.getInstence().setMapViewPoint(mapView, listData.get(i - 1).location, true);
             }
         });
+    }
 
-
+    private void updataByHandle(PoiResult poiResult) {
+        if (poiResult != null) {
+            listData = poiResult.getAllPoi();
+            if (listData != null && listData.size() > 0) {
+                listData.add(0, myPoInfo);
+                adapter.notifyDataSetChanged();
+            }
+        }
     }
 
     private void init() {
+        mPoiSearch = PoiSearch.newInstance();
         BdLocationHelper locationHelper = MyApplication.getInstance().getBdLocationHelper();
-        latitude = locationHelper.getLatitude();
-        longitude = locationHelper.getLongitude();
+        point = new LatLng(locationHelper.getLatitude(), locationHelper.getLongitude());
         myPoInfo = new PoiInfo();
-        myPoInfo.location = new LatLng(latitude, longitude);
+        myPoInfo.location = point;
         myPoInfo.address = locationHelper.getAddress();
         myPoInfo.name = "我的位置";
     }
 
-    //监听周围信息的获取 radius=0 为默认显示周围1000米
-    private void listenerNearInfo(int radius, int pagerNum) {
-        if (option == null) {  //当。。。。
-            option = new PoiNearbySearchOption();
-            option.keyword("写字楼");
-            option.sortType(PoiSortType.distance_from_near_to_far);
-            option.location(new LatLng(latitude, longitude));
-            if (radius != 0) {
-                option.radius(radius);
-            } else {
-                option.radius(1000);
-            }
-            if (pagerNum != 0) {
-                option.pageNum(pagerNum);
-            } else {
-                option.pageNum(1);
-            }
-            option.pageCapacity(20);
-        }
-        mPoiSearch = PoiSearch.newInstance();
-        mPoiSearch.setOnGetPoiSearchResultListener(this);
-        mPoiSearch.searchNearby(option);
-    }
-
-    //显示当前位置
-    private void initMapViewSet() {
-        // 定义Maker坐标点
-        LatLng point = new LatLng(latitude, longitude);
-        // 构建Marker图标
-        BitmapDescriptor bitmap = BitmapDescriptorFactory.fromResource(R.drawable.icon_gcoding);
-        // 构建MarkerOption，用于在地图上添加Marker
-        OverlayOptions option = new MarkerOptions().position(point).icon(bitmap);
-        // 在地图上添加Marker，并显示
-        mapView.getMap().addOverlay(option);
-        MapStatus mapStatus = new MapStatus.Builder().zoom(mapView.getMap().getMaxZoomLevel() - 3).target(point).build();
-        MapStatusUpdate u = MapStatusUpdateFactory.newMapStatus(mapStatus);
-        mapView.getMap().animateMapStatus(u);//设置为中心显示
-    }
-
-    //更新为选择的位置
-    private void initMapViewSet(LatLng latLng) {
-        // 构建Marker图标
-        BitmapDescriptor bitmap = BitmapDescriptorFactory.fromResource(R.drawable.icon_gcoding);
-        // 构建MarkerOption，用于在地图上添加Marker
-        OverlayOptions option = new MarkerOptions().position(latLng).icon(bitmap);
-        // 在地图上添加Marker，并显示
-        mapView.getMap().clear();
-        mapView.getMap().addOverlay(option);
-        MapStatus mapStatus = new MapStatus.Builder().zoom(mapView.getMap().getMaxZoomLevel() - 3).target(latLng).build();
-        MapStatusUpdate u = MapStatusUpdateFactory.newMapStatus(mapStatus);
-        mapView.getMap().animateMapStatus(u);//设置为中心显示
-    }
-
     @Override
     public void onGetPoiResult(PoiResult poiResult) {
         if (poiResult != null) {
             listData = poiResult.getAllPoi();
             if (listData != null && listData.size() > 0) {
-                listData.add(myPoInfo);
+                listData.add(0, myPoInfo);
                 adapter.notifyDataSetChanged();
             }
 
@@ -206,6 +174,8 @@ public class LocationMapActivity extends BaseActivity implements OnGetPoiSearchR
             } else {
                 holder.select_rb.setChecked(false);
             }
+            holder.select_rb.setClickable(false);
+            holder.select_rb.setFocusable(false);
             return view;
         }
 
@@ -232,13 +202,13 @@ public class LocationMapActivity extends BaseActivity implements OnGetPoiSearchR
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-            case R.id.save:
+            case R.id.save:   //点击保存返回数据
                 Intent intent = new Intent();
-                intent.putExtra(VisitActivity.REQUESTNAME, listData.get(selectItem).name);
-                setResult(VisitActivity.REQUESTCODE, intent);
+                intent.putExtra(REQUESTNAME, listData.get(selectItem));
+                setResult(REQUCODE, intent);
+                LocationMapActivity.this.finish();
                 break;
         }
-
         return super.onOptionsItemSelected(item);
     }
 }

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

@@ -4,6 +4,8 @@ import android.annotation.TargetApi;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
@@ -17,117 +19,176 @@ import android.widget.ScrollView;
 import android.widget.Spinner;
 import android.widget.TextView;
 
+import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.SaleSelectActivity;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.CalendarView;
 import com.xzjmyk.pm.activity.view.MyListView;
 
 import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
-public class OAActivity extends BaseActivity implements View.OnClickListener {
-    private OAActivity activity = this;
+public class OAActivity extends BaseActivity implements View.OnClickListener, AdapterView.OnItemSelectedListener {
+
+    //start improt View
+    @ViewInject(R.id.oa_rootview)
+    private ScrollView rootScrollView;
+    @ViewInject(R.id.oa_picker)
+    private CalendarView picker;
+    @ViewInject(R.id.oa_listview)
     private MyListView listview;
-    private Spinner state, show_type, type;
+    @ViewInject(R.id.state)
+    private Spinner state;
+    @ViewInject(R.id.show_type)
+    private Spinner show_type;
+    @ViewInject(R.id.type)
+    private Spinner type;
+    @ViewInject(R.id.all_task_num)
+    private TextView all_task_num;  //所有任务个数
+    @ViewInject(R.id.ok_task_num)
+    private TextView ok_task_num;//完成任务个数
+    @ViewInject(R.id.uok_task_num)
+    private TextView uok_task_num;//未完成个数
+    @ViewInject(R.id.ok_scale)
+    private TextView ok_scale;//完成比例
+    @ViewInject(R.id.date_tv)
+    private TextView date_tv;  //当前月份
+    //end improt View
+
+    //init
+    private OAActivity activity;
     private String[] stateItems = {"状态", "确认中", "进行中", "已完成"};
     private String[] typeItems = {"类型", "任务", "日程", "拜访"};
     private String[] show_typeItems = {"展示方式", "日程", "列表"};
-    private CalendarView picker;
+    private String baseUrl;
     private PopupMenu poAddMenu;
-    private ScrollView rootScrollView;
+    private final int what = 0x10;
+    private Handler handler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
 
+        }
+    };
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_oa);
+        ViewUtils.inject(this);
         init();
         initView();
     }
 
     private void init() {
-
+        activity = this;
+        baseUrl = CommonUtil.getSharedPreferences(this, "erp_baseurl");
     }
 
     private void initView() {
-        findViewById(R.id.ll_signin).setOnClickListener(this);
-        findViewById(R.id.oa_img_add).setOnClickListener(this);
-        findViewById(R.id.ll_outside).setOnClickListener(this);
-        findViewById(R.id.ll_meeting).setOnClickListener(this);
-        findViewById(R.id.ll_worklog).setOnClickListener(this);
-        findViewById(R.id.ll_subject).setOnClickListener(this);
-
-        findViewById(R.id.ll_leave).setOnClickListener(this);
-        findViewById(R.id.ll_overtime).setOnClickListener(this);
-        findViewById(R.id.ll_travel).setOnClickListener(this);
-        findViewById(R.id.ll_).setOnClickListener(this);
-        findViewById(R.id.ll_attendance).setOnClickListener(this);
-
-        state = (Spinner) findViewById(R.id.state);
-        type = (Spinner) findViewById(R.id.type);
-        show_type = (Spinner) findViewById(R.id.show_type);
-        picker = (CalendarView) findViewById(R.id.oa_picker);
-        listview = (MyListView) findViewById(R.id.oa_listview);
-        rootScrollView = (ScrollView) findViewById(R.id.oa_rootview);
         rootScrollView.requestDisallowInterceptTouchEvent(false);
         picker.setCalendarData(new Date());
         picker.setSelectMore(false);
         picker.setOnItemClickListener(new CalendarView.OnItemClickListener() {
             @Override
             public void OnItemClick(Date selectedStartDate, Date selectedEndDate, Date downDate) {
-                Log.i("gongpengming",selectedStartDate.toString());
-                Log.i("gongpengming",selectedEndDate.toString());
-                Log.i("gongpengming",downDate.toString());
+                Log.i("gongpengming", selectedStartDate.toString());
+                Log.i("gongpengming", selectedEndDate.toString());
+                Log.i("gongpengming", downDate.toString());
+                updateUI(selectedStartDate, selectedEndDate, downDate);
             }
         });
         bindAdapterForSpinner();
         listview.setAdapter(new MyListViewAdapter());
-        rootScrollView.smoothScrollTo(0,20);
+        rootScrollView.smoothScrollTo(0, 20);
+        setListener();
+    }
+    //获取网络数据
+    public void loadNetData(long date) {
+        //获取网络数据
+        String url = baseUrl + "common/desktop/subs/getSubs.action";
+        final Map<String, Object> param = new HashMap<>();
+        param.put("sessionId", CommonUtil.getSharedPreferences(this, "sessionId"));
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(this, "sessionId"));
+        ViewUtil.httpSendRequest(this, url, param, handler, headers, what, null, null, "get");
+    }
+    private void updateUI(Date selectedStartDate, Date selectedEndDate, Date downDate) {
+        //TODO 更改数据显示
+        all_task_num.setText("我的任务日程：");
+        ok_task_num.setText("已完成：");
+        uok_task_num.setText("未完成：");
+        ok_scale.setText("完成比例：");
+    }
+
+    //下载网络数据完成
+    private void loadNetSuccess(String requestData) {
+
     }
 
     private void bindAdapterForSpinner() {
         state.setAdapter(new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, stateItems));
         type.setAdapter(new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, typeItems));
         show_type.setAdapter(new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, show_typeItems));
+        state.setOnItemSelectedListener(this);
+        type.setOnItemSelectedListener(this);
+        show_type.setOnItemSelectedListener(this);
+    }
 
-        state.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
-                //TODO 选择菜单
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> adapterView) {
-
-            }
-        });
-        type.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
-                //TODO 选择菜单
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> adapterView) {
-                //TODO 选择菜单
-            }
-        });
-        show_type.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
-                ToastMessage(show_typeItems[i]);
-            }
+    //设置控件点击事件
+    private void setListener() {
+        findViewById(R.id.ll_signin).setOnClickListener(this);
+        findViewById(R.id.oa_img_add).setOnClickListener(this);
+        findViewById(R.id.ll_outside).setOnClickListener(this);
+        findViewById(R.id.ll_meeting).setOnClickListener(this);
+        findViewById(R.id.ll_worklog).setOnClickListener(this);
+        findViewById(R.id.ll_subject).setOnClickListener(this);
+        findViewById(R.id.ll_leave).setOnClickListener(this);
+        findViewById(R.id.ll_overtime).setOnClickListener(this);
+        findViewById(R.id.ll_travel).setOnClickListener(this);
+        findViewById(R.id.ll_).setOnClickListener(this);
+        findViewById(R.id.ll_attendance).setOnClickListener(this);
+        findViewById(R.id.date_back_img).setOnClickListener(this);
+        findViewById(R.id.date_next_img).setOnClickListener(this);
+        findViewById(R.id.oa_img_infile).setOnClickListener(this);
+    }
 
-            @Override
-            public void onNothingSelected(AdapterView<?> adapterView) {
-            }
-        });
+    //start Spinner itemSelected
+    @Override
+    public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
+        switch (adapterView.getId()) {
+            case R.id.state:
+                Log.i("gongpengming", stateItems[i]);
+                break;
+            case R.id.show_type:
+                Log.i("gongpengming", show_typeItems[i]);
+                break;
+            case R.id.type:
+                Log.i("gongpengming", typeItems[i]);
+                break;
+        }
     }
+    @Override
+    public void onNothingSelected(AdapterView<?> adapterView) {
+
+    }//end Spinner itemSelected
 
     @Override
     public void onClick(View view) {
         Intent it_scale = null;
         switch (view.getId()) {
+            case R.id.oa_img_infile:  //筛选
+                break;
+            case R.id.date_back_img://日期返回一个月
+                break;
+            case R.id.date_next_img://日期前进一个月
+                break;
             case R.id.ll_signin://打卡签到
                 startActivity(new Intent(activity, SigninActivity.class));
                 break;
@@ -145,6 +206,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                 break;
             case R.id.ll_subject://审批
                 //TODO 审批先不做
+                ToastUtil.showToast(activity, "该功能暂未开通");
                 break;
             case R.id.ll_leave://请假申请
                 it_scale = new Intent(activity,
@@ -261,7 +323,6 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
 
         }
 
-
         class Viewholder {
             TextView item_name_tv, item_addr_tv, item_object_tv, item_doit_tv, item_status_tv;
         }

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

@@ -1,17 +1,49 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
 import android.os.Bundle;
+import android.support.v4.app.FragmentManager;
+import android.widget.CompoundButton;
+import android.widget.RadioButton;
 
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.fragment.OutofficeFragment;
+import com.xzjmyk.pm.activity.ui.erp.fragment.OutofficePlayFragment;
 
 public class OutofficeActivity extends BaseActivity {
+    private RadioButton sin_rb;
+
+    private OutofficeFragment outofficeFragment;
+    private FragmentManager manager;
+    private OutofficePlayFragment outofficePlayFragment;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_outoffice);
-        getSupportActionBar().setTitle("外勤签到");
 
+        initView();
+    }
+
+    private void initView() {
+        sin_rb = (RadioButton) findViewById(R.id.sin_rb);
+        outofficeFragment = new OutofficeFragment();
+        manager = getSupportFragmentManager();
+        manager.beginTransaction().replace(R.id.content_fl, outofficeFragment).commit();
+        sin_rb.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
+                if (b) {
+                    manager.beginTransaction().replace(R.id.content_fl, outofficeFragment).commit();
+                } else {
+                    if (outofficePlayFragment == null) {
+                        outofficePlayFragment = new OutofficePlayFragment();
+                    }
+                    manager.beginTransaction().replace(R.id.content_fl, outofficePlayFragment).commit();
+                }
+            }
+        });
     }
+
+
 }

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

@@ -58,6 +58,8 @@ public class SigninActivity extends BaseActivity {
 
     }
 
+
+
     @Override
     public void onBackPressed() {
         super.onBackPressed();

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

@@ -1,41 +1,24 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.view.MotionEvent;
-import android.view.View;
-import android.widget.RelativeLayout;
 
+import com.lidroid.xutils.ViewUtils;
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 
-public class StatisticsActivity extends AppCompatActivity {
+public class StatisticsActivity extends BaseActivity {
 
-    private RelativeLayout oa_statistics_date;
+//    @ViewInject(R.id._rl)
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_statistics);
+        ViewUtils.inject(this);
         initView();
     }
 
-    private int rewX, rewY, X, Y;
 
     private void initView() {
-        oa_statistics_date = (RelativeLayout) findViewById(R.id.oa_statistics_date);
-        rewX = oa_statistics_date.getWidth();
-        rewY = oa_statistics_date.getHeight();
-
-        oa_statistics_date.setOnTouchListener(new View.OnTouchListener() {
-            @Override
-            public boolean onTouch(View view, MotionEvent motionEvent) {
-                if (view.getId() == R.id.oa_statistics_date) {
-                    X = (int) motionEvent.getRawX();
-                    Y = (int) motionEvent.getRawY();
-                    oa_statistics_date.layout(X, Y, rewX + X, rewY + Y);
-                }
-                return false;
-            }
-        });
     }
 }

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

@@ -10,7 +10,7 @@ public class SuperSetActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_super_set);
+            setContentView(R.layout.activity_super_set);
         getSupportActionBar().setTitle("高级设置");
     }
 }

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

@@ -2,11 +2,13 @@ package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
 
+import com.baidu.mapapi.search.core.PoiInfo;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
@@ -16,7 +18,6 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 public class VisitActivity extends BaseActivity {
     private int resultCode = 0x01;
     public static final int REQUESTCODE = 0x02;
-    public static final String REQUESTNAME = "VisitActivity_REQUESTNAME";
 
     @ViewInject(R.id.location_tv)
     private TextView location_tv;
@@ -55,16 +56,17 @@ public class VisitActivity extends BaseActivity {
         return super.onOptionsItemSelected(item);
     }
 
+    private PoiInfo myPoInfo;
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (this.resultCode == resultCode) {
-            if (data != null) {
-                String str = data.getStringExtra(REQUESTNAME);
-                if (str != null && str.length() > 0) {
-                    location_tv.setText(str);
+        if (data != null) {
+            if (this.resultCode == resultCode) {
+                if (resultCode == LocationMapActivity.REQUCODE) {
+                    myPoInfo = data.getParcelableExtra(LocationMapActivity.REQUESTNAME);
+                    location_tv.setText(myPoInfo.name);
                 }
             }
-
         }
     }
 }

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

@@ -85,6 +85,8 @@ public class WorkLogsActivity extends BaseActivity {
 
 
             }
+
+
             return view;
         }
     }

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

@@ -0,0 +1,81 @@
+package com.xzjmyk.pm.activity.ui.erp.entity;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+/**
+ * 订阅类型
+ * Created by gongpm on 2016/7/15.
+ */
+public class SubscipTypeEntity implements Parcelable {
+    private int id;
+    private String title;
+    private String kind;
+    private boolean clicked;
+
+    protected SubscipTypeEntity(Parcel in) {
+        id = in.readInt();
+        title = in.readString();
+        kind = in.readString();
+        clicked = in.readByte() != 0;
+    }
+public SubscipTypeEntity(){}
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeInt(id);
+        dest.writeString(title);
+        dest.writeString(kind);
+        dest.writeByte((byte) (clicked ? 1 : 0));
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    public static final Creator<SubscipTypeEntity> CREATOR = new Creator<SubscipTypeEntity>() {
+        @Override
+        public SubscipTypeEntity createFromParcel(Parcel in) {
+            return new SubscipTypeEntity(in);
+        }
+
+        @Override
+        public SubscipTypeEntity[] newArray(int size) {
+            return new SubscipTypeEntity[size];
+        }
+    };
+
+    public boolean isClicked() {
+        return clicked;
+    }
+
+    public void setClicked(boolean clicked) {
+        this.clicked = clicked;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getKind() {
+        return kind;
+    }
+
+    public void setKind(String kind) {
+        this.kind = kind;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+
+}

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

@@ -0,0 +1,135 @@
+package com.xzjmyk.pm.activity.ui.erp.fragment;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.View;
+import android.widget.TextView;
+
+import com.baidu.mapapi.map.BitmapDescriptor;
+import com.baidu.mapapi.map.BitmapDescriptorFactory;
+import com.baidu.mapapi.map.MapStatus;
+import com.baidu.mapapi.map.MapStatusUpdate;
+import com.baidu.mapapi.map.MapStatusUpdateFactory;
+import com.baidu.mapapi.map.MapView;
+import com.baidu.mapapi.map.MarkerOptions;
+import com.baidu.mapapi.map.OverlayOptions;
+import com.baidu.mapapi.model.LatLng;
+import com.baidu.mapapi.search.core.PoiInfo;
+import com.xzjmyk.pm.activity.BdLocationHelper;
+import com.xzjmyk.pm.activity.MyApplication;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.EasyFragment;
+import com.xzjmyk.pm.activity.ui.erp.activity.oa.LocationMapActivity;
+import com.xzjmyk.pm.activity.util.BaiduMapUtil;
+
+/**
+ * Created by gongpm on 2016/7/14.
+ */
+public class OutofficeFragment extends EasyFragment implements View.OnClickListener {
+    private TextView num_tv; //签到次数
+    private TextView out_add_name_tv;//地点名称
+    private TextView name_tv;//大名字
+    private TextView name2_tv;//小名字
+    private TextView out_date_tv;//日期
+    private TextView out_time_tv;//当前时间
+    private TextView click_tv;//点击签到
+    private TextView out_add_t_tv;//地址
+    //当前位置
+    private LatLng point;
+    int requestCode = 0x11;
+
+    private MapView mapView;
+
+
+    @Override
+    protected int inflateLayoutId() {
+        return R.layout.fragment_outoffice;
+    }
+
+
+    @Override
+    protected void onCreateView(Bundle savedInstanceState, boolean createView) {
+        setHasOptionsMenu(true);
+        initview();
+
+
+    }
+
+    private void initview() {
+        out_add_name_tv = (TextView) findViewById(R.id.out_add_name_tv);
+        out_add_t_tv = (TextView) findViewById(R.id.out_add_t_tv);
+        num_tv = (TextView) findViewById(R.id.num_tv);
+        name_tv = (TextView) findViewById(R.id.name_tv);
+        name2_tv = (TextView) findViewById(R.id.name2_tv);
+        out_date_tv = (TextView) findViewById(R.id.out_add_t_tv);
+        out_time_tv = (TextView) findViewById(R.id.out_time_tv);
+        click_tv = (TextView) findViewById(R.id.click_tv);
+        mapView = (MapView) findViewById(R.id.mapView);
+        findViewById(R.id.do_trim).setOnClickListener(this);
+        initData();
+    }
+
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.do_trim:
+                startActivityForResult(new Intent(getActivity(), LocationMapActivity.class), requestCode);
+                break;
+        }
+    }
+
+    private void initData() {
+        BdLocationHelper locationHelper = MyApplication.getInstance().getBdLocationHelper();
+        double latitude = locationHelper.getLatitude();
+        double longitude = locationHelper.getLongitude();
+        out_add_name_tv.setText(locationHelper.getDistrictName());
+        out_add_t_tv.setText(locationHelper.getAddress());
+        point = new LatLng(latitude, longitude);
+        BaiduMapUtil.getInstence().setMapViewPoint(mapView, point);
+    }
+
+    //显示当前位置
+    private void initMapViewSet() {
+        BdLocationHelper locationHelper = MyApplication.getInstance().getBdLocationHelper();
+        double latitude = locationHelper.getLatitude();
+        double longitude = locationHelper.getLongitude();
+        out_add_name_tv.setText(locationHelper.getDistrictName());
+        out_add_t_tv.setText(locationHelper.getAddress());
+        // 定义Maker坐标点
+        point = new LatLng(latitude, longitude);
+        // 构建Marker图标
+        BitmapDescriptor bitmap = BitmapDescriptorFactory.fromResource(R.drawable.icon_gcoding);
+        // 构建MarkerOption，用于在地图上添加Marker
+        OverlayOptions option = new MarkerOptions().position(point).icon(bitmap);
+        // 在地图上添加Marker，并显示
+        mapView.getMap().addOverlay(option);
+        mapView.showZoomControls(false);
+        MapStatus mapStatus = new MapStatus.Builder().zoom(mapView.getMap().getMaxZoomLevel() - 3).target(point).build();
+        MapStatusUpdate u = MapStatusUpdateFactory.newMapStatus(mapStatus);
+        mapView.getMap().animateMapStatus(u);//设置为中心显示
+    }
+
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.menu_outoffice, menu);
+        menu.getItem(0).setTitle("签到");
+        super.onCreateOptionsMenu(menu, inflater);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (data == null) return;
+        if (this.requestCode == requestCode) {
+            if (resultCode == LocationMapActivity.REQUCODE) {
+                PoiInfo info = data.getParcelableExtra(LocationMapActivity.REQUESTNAME);
+                if (info != null) {
+                    out_add_name_tv.setText(info.name);
+                    out_add_t_tv.setText(info.address);
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,77 @@
+package com.xzjmyk.pm.activity.ui.erp.fragment;
+
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.EasyFragment;
+import com.xzjmyk.pm.activity.util.ToastUtil;
+import com.xzjmyk.pm.activity.view.wheel.DatePicker;
+
+import java.util.Calendar;
+
+/**
+ * Created by gongpm on 2016/7/14.
+ */
+public class OutofficePlayFragment extends EasyFragment implements View.OnClickListener {
+    @Override
+    protected int inflateLayoutId() {
+        return R.layout.fragment_outofficeplay;
+    }
+
+    @Override
+    protected void onCreateView(Bundle savedInstanceState, boolean createView) {
+        initView();
+    }
+
+    private void initView() {
+        findViewById(R.id.rili_tv).setOnClickListener(this);
+
+    }
+
+    //显示
+    private void showPickerDalog() {
+        DatePicker picker = new DatePicker(getActivity());
+        picker.setRange(2000, 2030);
+        Calendar calendar = Calendar.getInstance();
+        picker.setSelectedItem(
+                calendar.get(Calendar.YEAR),
+                calendar.get(Calendar.MONTH) + 1,
+                calendar.get(Calendar.DAY_OF_MONTH));
+        picker.setOnDatePickListener(new DatePicker.OnYearMonthDayPickListener() {
+            @Override
+            public void onDatePicked(String year, String month, String day) {
+                ToastUtil.showToast(getActivity(), year + "-" + month + "-" + day);
+            }
+        });
+        picker.show();
+    }
+
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.rili_tv:
+                showPickerDalog();
+                break;
+        }
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.menu_outoffice, menu);
+        menu.getItem(0).setTitle("团队足迹");
+        super.onCreateOptionsMenu(menu, inflater);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.title:
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}

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

@@ -8,14 +8,19 @@ import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 
+import com.baidu.mapapi.search.core.PoiInfo;
+import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.calendar.cons.DPMode;
 import com.xzjmyk.pm.activity.ui.calendar.utils.OnDatePickedListener;
 import com.xzjmyk.pm.activity.ui.calendar.views.DatePicker;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.AlarmaActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.oa.LocationMapActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SigninActivity;
 import com.xzjmyk.pm.activity.util.CalendarUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
@@ -26,7 +31,9 @@ import com.xzjmyk.pm.activity.util.TimeUtils;
 public class SigninFragment extends EasyFragment {
     private AlertDialog dateDialog;
     private SigninActivity ct;
-
+    private TextView location_tv;
+    private int requcode = 0x11;
+    private PoiInfo myPoInfo;
 
     @Override
     protected int inflateLayoutId() {
@@ -44,8 +51,21 @@ public class SigninFragment extends EasyFragment {
         setHasOptionsMenu(true);
         long time = System.currentTimeMillis();
         ct.getSupportActionBar().setTitle(TimeUtils.day_long_2_str(time) + "  " + TimeUtils.getWeek(time));
+        initView();
+    }
+
+    private void initView() {
+        location_tv = (TextView) findViewById(R.id.location_tv);
+        location_tv.setText(MyApplication.getInstance().getBdLocationHelper().getAddress());
+        findViewById(R.id.addr_rl).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                startActivityForResult(new Intent(getActivity(), LocationMapActivity.class), requcode);
+            }
+        });
     }
 
+
     private void showDateDalog() {
         //显示日期选择窗口
         if (dateDialog == null)
@@ -55,7 +75,6 @@ public class SigninFragment extends EasyFragment {
         DatePicker picker = new DatePicker(ct);
         picker.setDate(CalendarUtils.getCurrentYear(), CalendarUtils.getCurrentMonth());
         picker.setMode(DPMode.SINGLE);
-
         picker.setOnDatePickedListener(new OnDatePickedListener() {
             @Override
             public void onDatePicked(String date) {
@@ -84,4 +103,19 @@ public class SigninFragment extends EasyFragment {
         }
         return super.onOptionsItemSelected(item);
     }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (data != null) {
+            if (requestCode == requcode) {
+                if (resultCode == LocationMapActivity.REQUCODE) {//地图选择返回
+                    myPoInfo = data.getParcelableExtra(LocationMapActivity.REQUESTNAME);
+                    location_tv.setText(myPoInfo.name);
+
+                }
+            }
+        }
+
+        super.onActivityResult(requestCode, resultCode, data);
+    }
 }

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

@@ -17,8 +17,6 @@ import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.XutilsFragment;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.ErpMenActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.crm.ClientActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
@@ -95,12 +93,12 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
                 ViewUtil.WebLinks(ct, url, "我的商务");
                 break;
             case R.id.rl_uas_sys:
-               ct.startActivity(new Intent(ct, ErpMenActivity.class));
-                 //       ct.startActivity(new Intent(ct, OAActivity.class));
+                ct.startActivity(new Intent(ct, ErpMenActivity.class));
+//                        ct.startActivity(new Intent(ct, OAActivity.class));
                 break;
             case R.id.my_client_rl:
-                ct.startActivity(new Intent(ct, ClientActivity.class));
-                //ToastUtil.showToast(getActivity(), "抱歉，该功能尚未完善");
+                // ct.startActivity(new Intent(ct, ClientActivity.class));
+                ToastUtil.showToast(getActivity(), "抱歉，该功能尚未完善");
                 break;
             case R.id.my_friend_rl:
                 iv_remain.setVisibility(View.GONE);

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

@@ -1,55 +1,69 @@
 package com.xzjmyk.pm.activity.ui.erp.model;
 
+import android.os.Parcelable;
+
 public class Employees {
-	private int em_id;
-	private String em_code;
-	private String em_name;
-	private String em_depart;
-	private String em_position;
-	//private int em_defaultorid;
-	private String em_defaultorname;
-	public int getEm_id() {
-		return em_id;
-	}
-	public void setEm_id(int em_id) {
-		this.em_id = em_id;
-	}
-	public String getEm_code() {
-		return em_code;
-	}
-	public void setEm_code(String em_code) {
-		this.em_code = em_code;
-	}
-	public String getEm_name() {
-		return em_name;
-	}
-	public void setEm_name(String em_name) {
-		this.em_name = em_name;
-	}
-	public String getEm_depart() {
-		return em_depart;
-	}
-	public void setEm_depart(String em_depart) {
-		this.em_depart = em_depart;
-	}
-	public String getEm_position() {
-		return em_position;
-	}
-	public void setEm_position(String em_position) {
-		this.em_position = em_position;
-	}
-//	public int getEm_defaultorid() {
+    private int em_id;
+    private String em_code;
+    private String em_name;
+    private String em_depart;
+    private String em_position;
+    //private int em_defaultorid;
+    private String em_defaultorname;
+
+    public int getEm_id() {
+        return em_id;
+    }
+
+    public void setEm_id(int em_id) {
+        this.em_id = em_id;
+    }
+
+    public String getEm_code() {
+        return em_code;
+    }
+
+    public void setEm_code(String em_code) {
+        this.em_code = em_code;
+    }
+
+    public String getEm_name() {
+        return em_name;
+    }
+
+    public void setEm_name(String em_name) {
+        this.em_name = em_name;
+    }
+
+    public String getEm_depart() {
+        return em_depart;
+    }
+
+    public void setEm_depart(String em_depart) {
+        this.em_depart = em_depart;
+    }
+
+    public String getEm_position() {
+        return em_position;
+    }
+
+    public void setEm_position(String em_position) {
+        this.em_position = em_position;
+    }
+
+    //	public int getEm_defaultorid() {
 //		return em_defaultorid;
 //	}
 //	public void setEm_defaultorid(int em_defaultorid) {
 //		this.em_defaultorid = em_defaultorid;
 //	}
-	public String getEm_defaultorname() {
-		return em_defaultorname;
-	}
-	public void setEm_defaultorname(String em_defaultorname) {
-		this.em_defaultorname = em_defaultorname;
-	}
-	
-	
+    public String getEm_defaultorname() {
+        return em_defaultorname;
+    }
+
+    public void setEm_defaultorname(String em_defaultorname) {
+        this.em_defaultorname = em_defaultorname;
+    }
+
+
 }

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

@@ -347,6 +347,7 @@ public class ViewUtil {
                         ChangeStatusERP(msg.getData().getString("result"));
                     } else {
                         String reason = JSON.parseObject(result).getString("reason");
+
                         ToastMessage(ct, reason);
                     }
                     break;

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

@@ -0,0 +1,267 @@
+package com.xzjmyk.pm.activity.ui.message;
+
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.entity.SubscipTypeEntity;
+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 org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 申请订阅
+ * by gongpm
+ */
+public class SubscripSetActivity extends BaseActivity {
+    private ListView listview;
+    private String baseUrl;
+    private List<SubscipTypeEntity> entities;
+    private SubscripSetAdapter adapter;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_subscrip_set);
+        initView();
+    }
+
+    private void initView() {
+        listview = (ListView) findViewById(R.id.listview);
+        baseUrl = CommonUtil.getSharedPreferences(this, "erp_baseurl");
+        init();
+    }
+
+    private void init() {
+        adapter = new SubscripSetAdapter();
+        listview.setAdapter(adapter);
+        loadNetData();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.save) {
+            saveData();
+
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_visit_save, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    private Handler handler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            String message = (String) msg.getData().get("result");
+            Log.i("gongpengming", message);
+            if (msg.what == 2) {
+                JSONObject object = null;
+                try {
+                    object = new JSONObject(message);
+                    JSONArray array = object.getJSONArray("subsNums");
+                    entities = JSON.parseArray(array.toString(), SubscipTypeEntity.class);
+                    bindData(entities);
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+
+            } else if (Constants.APP_SOCKETIMEOUTEXCEPTION == msg.what) {
+                //错误信息
+
+            } else if (msg.what == 3) {
+
+            }
+        }
+    };
+
+    private void bindData(List<SubscipTypeEntity> entities) {
+        adapter.notifyDataSetChanged();
+    }
+
+    private ArrayList<Integer> ints = new ArrayList();//保存被选中的id
+    private StringBuffer addBuffer = new StringBuffer();
+    private StringBuffer removeBuffer = new StringBuffer();
+    private int addType = 1, removeType = 2;
+
+    //保存时候提交订阅选择
+    private void saveData() {
+        if (entities != null && entities.size() > 0)
+            for (int i = 0; i < entities.size(); i++) {
+                Log.i("gongpengming", entities.get(i).isClicked() + "");
+                if (entities.get(i).isClicked()) {//被选中
+                    if (addBuffer.length() > 0) {
+                        addBuffer.append("," + entities.get(i).getId());
+                    } else {
+                        addBuffer.append(entities.get(i).getId());
+                    }
+//                    for (int j = 0; j < ints.size(); j++) {
+//                        if (ints.get(j) != entities.get(i).getId()) {
+//                            if (addBuffer.length() > 0) {
+//                                addBuffer.append("," + entities.get(i).getId());
+//                            } else {
+//                                addBuffer.append(entities.get(i).getId());
+//                            }
+//                        }
+//                    }
+                } else {//未选中
+                    for (int j = 0; j < ints.size(); j++) {
+                        if (ints.get(j) == entities.get(i).getId()) {//当未选中的有以前已经选中的
+                            if (addBuffer.length() > 0) {
+                                removeBuffer.append("," + entities.get(i).getId());
+                            } else {
+                                removeBuffer.append(entities.get(i).getId());
+                            }
+                        }
+                    }
+                }
+            }
+        Log.i("gongpengming", "addBuffer=" + addBuffer.toString());
+        Log.i("gongpengming", "removeBuffer=" + removeBuffer.toString());
+        if (addBuffer.length() > 0) {
+            upSubdate(addType);
+        }
+        if (removeBuffer.length() > 0) {
+            upSubdate(removeType);
+        }
+    }
+
+    //修改订阅状态 type：添加还是取消
+    public void upSubdate(int type) {
+        if (baseUrl == null || baseUrl.length() <= 0) {
+            baseUrl = CommonUtil.getSharedPreferences(this, "erp_baseurl");
+        }
+        String urlsub;
+        String Ids;
+        if (type == addType) {
+            urlsub = "common/charts/addSubsMans.action";
+            Ids = addBuffer.toString();
+        } else {
+            urlsub = "common/charts/removeSubsMans.action";
+            Ids = removeBuffer.toString();
+        }
+        //获取网络数据
+        String empId = CommonUtil.getSharedPreferences(this, "erp_username");
+        String url = baseUrl + urlsub;
+        Log.i("gongpengming", url + "\n" + Ids + "\n" + empId);
+        final Map<String, Object> param = new HashMap<>();
+        param.put("numIds", Ids);
+        param.put("empId", empId);
+        param.put("sessionId", CommonUtil.getSharedPreferences(this, "sessionId"));
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(this, "sessionId"));
+        ViewUtil.httpSendRequest(this, url, param, handler, headers, 3, null, null, "post");
+    }
+
+    //获取接口数据
+    public void loadNetData() {
+        if (baseUrl == null || baseUrl.length() <= 0) {
+            baseUrl = CommonUtil.getSharedPreferences(this, "erp_baseurl");
+        }
+        //获取网络数据
+        String url = baseUrl + "common/charts/getSubsNums.action";
+        final Map<String, Object> param = new HashMap<>();
+        param.put("condition", "1=1");
+        param.put("sessionId", CommonUtil.getSharedPreferences(this, "sessionId"));
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(this, "sessionId"));
+        ViewUtil.httpSendRequest(this, url, param, handler, headers, 2, null, null, "get");
+    }
+
+    class SubscripSetAdapter extends BaseAdapter {
+        @Override
+        public int getCount() {
+            if (entities == null) {
+                return 0;
+            }
+            return entities.size();
+        }
+
+        @Override
+        public Object getItem(int i) {
+            return null;
+        }
+
+        @Override
+        public long getItemId(int i) {
+            return i;
+        }
+
+        @Override
+        public View getView(final int i, View view, ViewGroup viewGroup) {
+            ViewHolder holder = null;
+            if (view == null) {
+                holder = new ViewHolder();
+                view = LayoutInflater.from(SubscripSetActivity.this).inflate(R.layout.item_subscripset, null);
+                holder.id_tv = (TextView) view.findViewById(R.id.id_tv);
+                holder.title_tv = (TextView) view.findViewById(R.id.title_tv);
+                holder.kind_img = (ImageView) view.findViewById(R.id.kind_img);
+                holder.select_rb = (CheckBox) view.findViewById(R.id.select_rb);
+                view.setTag(holder);
+            } else {
+                holder = (ViewHolder) view.getTag();
+            }
+            final SubscipTypeEntity entity = entities.get(i);
+            bingAdapterData(entity, holder);
+            holder.select_rb.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+                @Override
+                public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
+                    entities.get(i).setClicked(b);
+
+                }
+            });
+            return view;
+        }
+
+        private void bingAdapterData(final SubscipTypeEntity entity, ViewHolder holder) {
+            holder.select_rb.setChecked(entity.isClicked());
+            holder.id_tv.setText(entity.getId() + "");
+            holder.title_tv.setText(entity.getTitle());
+            int resource = -1;
+            if ("private".equals(entity.getKind())) {
+                resource = R.drawable.sub_private;
+            } else {
+                resource = R.drawable.sub_public;
+            }
+            holder.kind_img.setImageResource(resource);
+
+        }
+
+        class ViewHolder {
+            TextView id_tv, title_tv;
+            ImageView kind_img;
+            CheckBox select_rb;
+        }
+    }
+
+
+}

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

@@ -2,10 +2,13 @@ package com.xzjmyk.pm.activity.ui.message;
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
@@ -27,6 +30,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.tool.ThreadPool;
+import com.xzjmyk.pm.activity.util.LoadLocalImageUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.view.MyListView;
 
@@ -42,6 +46,9 @@ import java.util.Map;
 
 
 public class SubscriptionActivity extends BaseActivity {
+    private int type = -1;
+    private static final int DINGYUE = 0x1, DINGYUE_DEF = 0x2, DINGYUE_SELECT = 0x3;
+    private int requestCode = 0x01;
     private String baseUrl;
     private PullToRefreshListView listView;
     private ArrayList<SubscriptionMessage> SubscriptionMessages;
@@ -53,11 +60,18 @@ public class SubscriptionActivity extends BaseActivity {
     private boolean isRef = true;
     private long oldTime = 0;
     private int[] srcs = {
-            R.drawable.list_01, R.drawable.list_02, R.drawable.list_03
+            R.drawable.list_01, R.drawable.list_02, R.drawable.list_03,
+            R.drawable.list_04, R.drawable.list_05, R.drawable.list_06,
+            R.drawable.list_07, R.drawable.list_08, R.drawable.list_09,
+            R.drawable.list_10, R.drawable.list_11, R.drawable.list_12,
+            R.drawable.list_13, R.drawable.list_14, R.drawable.list_15,
+
     };
     private int[] srcsBig = {
-            R.drawable.dingyue, R.drawable.dingyue1, R.drawable.dingyue2, R.drawable.dingyue3, R.drawable.dingyue4, R.drawable.dingyue5, R.drawable.dingyue6
+            R.drawable.uu_dy_image1, R.drawable.uu_dy_image2, R.drawable.uu_dy_image3, R.drawable.uu_dy_image4, R.drawable.uu_dy_image5, R.drawable.uu_dy_image6, R.drawable.uu_dy_image7
+
     };
+
     private Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
@@ -90,11 +104,28 @@ public class SubscriptionActivity extends BaseActivity {
     String mLoginUserId;
     private String emCode;
 
+
     @Override//设置右划退出
     public void setTouch(boolean b) {
         super.setTouch(false);
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+//        getMenuInflater().inflate(R.menu.menu_subscription, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.dingyue_select:
+                startActivityForResult(new Intent(activity, SubscripSetActivity.class), requestCode);
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -362,8 +393,6 @@ public class SubscriptionActivity extends BaseActivity {
         public long getItemId(int position) {
             return position;
         }
-
-
         @Override
         public View getView(final int i, View contextView, ViewGroup viewGroup) {
             VieweHolder holder = null;
@@ -409,7 +438,9 @@ public class SubscriptionActivity extends BaseActivity {
                 Calendar c = Calendar.getInstance();
                 c.setTimeInMillis(Long.parseLong(beans.get(i).getCREATEDATE_()));
                 int mWay = c.get(Calendar.DAY_OF_WEEK);
-                holder.big_img.setImageDrawable(getResources().getDrawable(srcsBig[mWay - 1]));
+                //异步
+                LoadLocalImageUtil.getInstance().displayFromDrawable(srcsBig[mWay - 1], holder.big_img);
+//                holder.big_img.setImageDrawable(getResources().getDrawable(srcsBig[mWay - 1]));
             } else {
                 holder.ll.setVisibility(View.VISIBLE);
                 holder.rl.setVisibility(View.GONE);
@@ -423,8 +454,10 @@ public class SubscriptionActivity extends BaseActivity {
                     isReColor = R.color.text_color;
                 }
                 holder.isre_tv.setText(isRe);
-                holder.big_isre_tv.setTextColor(getResources().getColor(isReColor));
-                holder.small_img.setImageDrawable(getResources().getDrawable(srcs[i % 3]));
+                holder.isre_tv.setTextColor(getResources().getColor(isReColor));
+                //异步
+//                LoadLocalImageUtil.getInstance().displayFromDrawable(srcs[i % 15], holder.big_img);
+                holder.small_img.setImageDrawable(getResources().getDrawable(srcs[i % 15]));
             }
             contextView.setTag(R.id.position, position);
             contextView.setOnClickListener(new View.OnClickListener() {

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/BaiduMapUtil.java

@@ -0,0 +1,142 @@
+package com.xzjmyk.pm.activity.util;
+
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+
+import com.baidu.mapapi.map.BitmapDescriptor;
+import com.baidu.mapapi.map.BitmapDescriptorFactory;
+import com.baidu.mapapi.map.MapStatus;
+import com.baidu.mapapi.map.MapStatusUpdate;
+import com.baidu.mapapi.map.MapStatusUpdateFactory;
+import com.baidu.mapapi.map.MapView;
+import com.baidu.mapapi.map.MarkerOptions;
+import com.baidu.mapapi.map.OverlayOptions;
+import com.baidu.mapapi.model.LatLng;
+import com.baidu.mapapi.search.core.SearchResult;
+import com.baidu.mapapi.search.poi.OnGetPoiSearchResultListener;
+import com.baidu.mapapi.search.poi.PoiDetailResult;
+import com.baidu.mapapi.search.poi.PoiIndoorResult;
+import com.baidu.mapapi.search.poi.PoiNearbySearchOption;
+import com.baidu.mapapi.search.poi.PoiResult;
+import com.baidu.mapapi.search.poi.PoiSearch;
+import com.baidu.mapapi.search.poi.PoiSortType;
+import com.baidu.mapapi.utils.DistanceUtil;
+import com.xzjmyk.pm.activity.R;
+
+import java.text.DecimalFormat;
+
+/**
+ * 百度地图工具类（重复代码过多，放在工具类中）
+ * Created by gongpm on 2016/7/15.
+ */
+public class BaiduMapUtil implements OnGetPoiSearchResultListener {
+    private static BaiduMapUtil instence = null;
+    private Handler handler;
+    private PoiNearbySearchOption option;
+    public static int NEAR_WHAT = 0x22;
+    private int what = -1;
+
+    private BaiduMapUtil() {
+    }
+
+    public static BaiduMapUtil getInstence() {
+        if (instence == null) {
+            synchronized (BaiduMapUtil.class) {
+                instence = new BaiduMapUtil();
+            }
+        }
+        return instence;
+    }
+
+    public void setMapViewPoint(MapView mapView, LatLng point) {
+        setMapViewPoint(mapView, point, false);
+    }
+
+    //计算距离
+    public String getDistance(LatLng a, LatLng b) {
+        double distance = DistanceUtil.getDistance(a, b);
+        DecimalFormat df = new DecimalFormat(".##");
+        return df.format(distance);
+    }
+
+    public String getDistance(double a1, double a2, double b1, double b2) {
+        LatLng a = new LatLng(a1, a2);
+        LatLng b = new LatLng(b1, b2);
+        return getDistance(a, b);
+    }
+
+    //显示当前位置
+    public void setMapViewPoint(MapView mapView, LatLng point, boolean isClear) {
+        // 构建Marker图标
+        BitmapDescriptor bitmap = BitmapDescriptorFactory.fromResource(R.drawable.icon_gcoding);
+        // 构建MarkerOption，用于在地图上添加Marker
+        OverlayOptions option = new MarkerOptions().position(point).icon(bitmap);
+        if (isClear) mapView.getMap().clear();
+        // 在地图上添加Marker，并显示
+        mapView.getMap().addOverlay(option);
+        mapView.showZoomControls(false);
+        MapStatus mapStatus = new MapStatus.Builder().zoom(mapView.getMap().getMaxZoomLevel() - 3).target(point).build();
+        MapStatusUpdate u = MapStatusUpdateFactory.newMapStatus(mapStatus);
+        mapView.getMap().animateMapStatus(u);//设置为中心显示
+    }
+
+    //监听周围信息的获取 radius=0 为默认显示周围1000米
+    public void getNearInfo(int radius, int pagerNum, LatLng location, PoiSearch mPoiSearch, Handler handler, int what) {
+        this.handler = handler;
+        this.what = what;
+        if (option == null)
+            option = new PoiNearbySearchOption();
+        option.keyword("写字楼");
+        option.sortType(PoiSortType.distance_from_near_to_far);
+        option.location(location);
+        if (radius != 0) {
+            option.radius(radius);
+        } else {
+            option.radius(1000);
+        }
+        if (pagerNum != 0) {
+            option.pageNum(pagerNum);
+        } else {
+            option.pageNum(1);
+        }
+        option.pageCapacity(20);
+        mPoiSearch.setOnGetPoiSearchResultListener(this);
+        mPoiSearch.searchNearby(option);
+    }
+
+    private void getNearInfo(int radius, int pagerNum, LatLng location, Handler handler) {
+        getNearInfo(radius, pagerNum, location, PoiSearch.newInstance(), handler, NEAR_WHAT);
+    }
+
+    private void setDataToHandler(SearchResult result) {
+        if (handler == null) return;
+        Message message = handler.obtainMessage();
+        message.what = this.what;
+        Bundle bundle = new Bundle();
+        bundle.putParcelable("data", result);
+        message.setData(bundle);
+        handler.sendMessage(message);
+    }
+
+    @Override
+    public void onGetPoiResult(PoiResult poiResult) {
+        if (handler == null) return;
+        Message message = handler.obtainMessage();
+        message.what = this.what;
+        Bundle bundle = new Bundle();
+        bundle.putParcelable("data", poiResult);
+        message.setData(bundle);
+        handler.sendMessage(message);
+    }
+
+    @Override
+    public void onGetPoiDetailResult(PoiDetailResult poiDetailResult) {
+        setDataToHandler(poiDetailResult);
+    }
+
+    @Override
+    public void onGetPoiIndoorResult(PoiIndoorResult poiIndoorResult) {
+        setDataToHandler(poiIndoorResult);
+    }
+}

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/LoadLocalImageUtil.java

@@ -0,0 +1,72 @@
+package com.xzjmyk.pm.activity.util;
+
+import android.widget.ImageView;
+
+import com.nostra13.universalimageloader.core.ImageLoader;
+
+/**
+ * 异步加载本地图片工具类
+ * 
+ * @author tony
+ * 
+ */
+public class LoadLocalImageUtil {
+    private LoadLocalImageUtil() {
+    }
+
+    private static LoadLocalImageUtil instance = null;
+
+    public static synchronized LoadLocalImageUtil getInstance() {
+        if (instance == null) {
+            instance = new LoadLocalImageUtil();
+        }
+        return instance;
+    }
+
+    /**
+     * 从内存卡中异步加载本地图片
+     * 
+     * @param uri
+     * @param imageView
+     */
+    public void displayFromSDCard(String uri, ImageView imageView) {
+        // String imageUri = "file:///mnt/sdcard/image.png"; // from SD card
+        ImageLoader.getInstance().displayImage("file://" + uri, imageView);
+    }
+
+    /**
+     * 从assets文件夹中异步加载图片
+     * 
+     * @param imageName
+     *            图片名称，带后缀的，例如：1.png
+     * @param imageView
+     */
+    public void dispalyFromAssets(String imageName, ImageView imageView) {
+        // String imageUri = "assets://image.png"; // from assets
+        ImageLoader.getInstance().displayImage("assets://" + imageName,
+                imageView);
+    }
+
+    /**
+     * 从drawable中异步加载本地图片
+     * 
+     * @param imageId
+     * @param imageView
+     */
+    public void displayFromDrawable(int imageId, ImageView imageView) {
+        // String imageUri = "drawable://" + R.drawable.image; // from drawables
+        // (only images, non-9patch)
+        ImageLoader.getInstance().displayImage("drawable://" + imageId,
+                imageView);
+    }
+
+    /**
+     * 从内容提提供者中抓取图片
+     */
+    public void displayFromContent(String uri, ImageView imageView) {
+        // String imageUri = "content://media/external/audio/albumart/13"; //
+        // from content provider
+        ImageLoader.getInstance().displayImage("content://" + uri, imageView);
+    }
+
+}

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

@@ -0,0 +1,121 @@
+package com.xzjmyk.pm.activity.view;
+
+import android.app.ActionBar;
+import android.app.Activity;
+import android.content.Context;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.Window;
+import android.view.animation.AlphaAnimation;
+import android.view.animation.Animation;
+import android.view.animation.LinearInterpolator;
+import android.view.animation.RotateAnimation;
+import android.widget.PopupWindow;
+import android.widget.RelativeLayout;
+
+import com.xzjmyk.pm.activity.R;
+
+
+/**
+ * @note:自定义进度条页面
+ */
+public class LoadingView{
+    Context context;
+    //布局容器
+    RelativeLayout layoutFile,rlLoading;
+    View viewLoading;
+    //弹出框
+    PopupWindow popupWindow;
+
+    //布局解析器
+    private LayoutInflater inflater;
+    //旋转动画
+    private RotateAnimation rotateAnimation;
+    //渐进/出动画
+    private AlphaAnimation alphaAnimationIn,alphaAnimationOut;
+    //View的背景资源
+    int viewBgResid;
+    boolean isShowing = false;
+
+
+    //初始化动画
+    private void initAnimation(){
+        //建立旋转动画对象并为其配置参数
+        rotateAnimation = new RotateAnimation(0,360, Animation.RELATIVE_TO_SELF,0.5f,Animation.RELATIVE_TO_SELF,0.5f);
+        rotateAnimation.setDuration(2000);
+        rotateAnimation.setRepeatCount(-1);
+        rotateAnimation.setRepeatMode(Animation.RESTART);
+        rotateAnimation.setInterpolator(new LinearInterpolator());
+
+        //渐进动画
+        alphaAnimationIn = new AlphaAnimation(0f,1f);
+        alphaAnimationIn.setFillAfter(true);
+        alphaAnimationIn.setDuration(200);
+        alphaAnimationIn.setInterpolator(new LinearInterpolator());
+
+        //渐出动画
+        alphaAnimationOut = new AlphaAnimation(1f,0f);
+        alphaAnimationOut.setFillAfter(true);
+        alphaAnimationOut.setDuration(200);
+        alphaAnimationOut.setInterpolator(new LinearInterpolator());
+
+        //动画结束时，隐藏
+        alphaAnimationOut.setAnimationListener(new Animation.AnimationListener() {
+            @Override
+            public void onAnimationStart(Animation animation) {}
+
+            @Override
+            public void onAnimationEnd(Animation animation) {
+                dismiss();
+            }
+
+            @Override
+            public void onAnimationRepeat(Animation animation) {}
+        });
+
+    }
+
+    public void show(){
+        initAnimation();
+        //布局文件对象
+        layoutFile = (RelativeLayout) inflater.inflate(R.layout.view_loading, null);
+        //布局容器RelativeLayout
+//        rlLoading = (RelativeLayout) layoutFile.findViewById(R.id.rl_loading);
+//        //loading图片,并设置loading的背景图片
+//        viewLoading = layoutFile.findViewById(R.id.view_loading);
+        viewLoading.setBackgroundResource(viewBgResid);
+        //获得处了标题栏外的部分
+        View parentView = ((Activity)context).getWindow().findViewById(Window.ID_ANDROID_CONTENT);
+        //初始化弹窗
+        popupWindow = new PopupWindow(layoutFile, ActionBar.LayoutParams.FILL_PARENT,
+                ActionBar.LayoutParams.FILL_PARENT);
+        //标志已显示
+        isShowing = true;
+        //将标题栏外部分的View放入弹窗中
+        popupWindow.showAtLocation(parentView, Gravity.CENTER, 0, 0);
+        rlLoading.startAnimation(alphaAnimationIn);
+        viewLoading.startAnimation(rotateAnimation);
+    }
+
+    public void dismiss(){
+        if(popupWindow != null && popupWindow.isShowing()){
+            isShowing = false;
+            rlLoading.clearAnimation();
+            viewLoading.clearAnimation();
+            popupWindow.setFocusable(false);
+            popupWindow.dismiss();
+        }
+    }
+
+    //外界获得loadingView的状态
+    public boolean isShow(){
+        return isShowing;
+    }
+
+    public LoadingView(Context pContext){
+        context = pContext;
+//        viewBgResid = R.drawable.loading;
+        inflater = LayoutInflater.from(context);
+    }
+}

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/oa_rb_pass" android:state_checked="true" android:state_enabled="true" />
+    <item android:drawable="@drawable/oa_rb_pass" android:state_checked="true" />
     <item android:drawable="@drawable/oa_rb" />
 </selector>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="true" android:state_checked="true"
+        android:drawable="@drawable/outpaly_pass" />
+    <item android:drawable="@drawable/outplay" />
+</selector>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="true" android:state_checked="true"
+        android:drawable="@drawable/outsin_pass" />
+    <item android:drawable="@drawable/outsin" />
+</selector>

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

@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="@color/blue" />
+            <solid android:color="@color/mainList2" />
             <corners android:radius="360dp" />
             <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
         </shape>

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

@@ -14,7 +14,7 @@
         android:padding="20dp"
         android:text="日志类型"
         android:textColor="@color/text_main"
-        android:textSize="@color/text_main" />
+        android:textSize="@dimen/text_main" />
 
     <EditText
         android:layout_width="match_parent"
@@ -25,7 +25,7 @@
         android:minLines="4"
         android:padding="5dp"
         android:textColor="@color/text_hine"
-        android:textSize="@color/text_main" />
+        android:textSize="@dimen/text_main" />
 
     <EditText
         android:layout_width="match_parent"
@@ -36,7 +36,7 @@
         android:minLines="4"
         android:padding="5dp"
         android:textColor="@color/text_hine"
-        android:textSize="@color/text_main" />
+        android:textSize="@dimen/text_main" />
 
     <EditText
         android:layout_width="match_parent"
@@ -47,7 +47,7 @@
         android:minLines="4"
         android:padding="5dp"
         android:textColor="@color/text_hine"
-        android:textSize="@color/text_main" />
+        android:textSize="@dimen/text_main" />
 
     <TextView
         android:layout_width="match_parent"
@@ -57,11 +57,12 @@
         android:padding="20dp"
         android:text="选择点评人（默认指向自己领导）"
         android:textColor="@color/text_main"
-        android:textSize="@color/text_main" />
+        android:textSize="@dimen/text_main" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginTop="50dp"
         android:orientation="horizontal">
 
         <ImageView

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

@@ -56,6 +56,65 @@
                 android:text="每周六、日 休息" />
         </RelativeLayout>
 
+        <TextView
+            style="@style/add_signin_tv_hine"
+            android:layout_marginTop="20dp"
+            android:text="设置符合你企业要求的考勤方式" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="2px"
+            android:layout_marginTop="10dp"
+            android:background="@color/item_line" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            android:drawableLeft="@drawable/oa_client"
+            android:drawablePadding="10dp"
+            android:padding="10dp"
+            android:text="根据办公地点\n适用于在一铜大楼或一个局域内考勤" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="2px"
+            android:background="@color/item_line" />
 
+        <com.xzjmyk.pm.activity.view.MyListView
+            android:id="@+id/listview"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp">
+
+            <TextView
+                style="@style/add_signin_tv_main"
+                android:layout_marginLeft="10dp"
+                android:text="选择弹性时间" />
+
+            <TextView
+                android:id="@+id/addr_tv"
+                style="@style/add_signin_tv_hine"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="10dp"
+                android:drawablePadding="10dp"
+                android:drawableRight="@drawable/oa_updata"
+                android:text="300米" />
+        </RelativeLayout>
+
+        <Button
+            android:id="@+id/save_btn"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:layout_marginTop="20dp"
+            android:background="@drawable/bg_btn"
+            android:padding="15dp"
+            android:text="保存"
+            android:textColor="@color/white" />
     </LinearLayout>
 </ScrollView>

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

@@ -3,6 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.AddSigninActivity">
 
     <LinearLayout
@@ -19,18 +21,21 @@
                 style="@style/add_signin_tv_main"
                 android:text="考勤组名称" />
 
-            <TextView
+            <EditText
+
                 style="@style/add_signin_tv_hine"
                 android:layout_toRightOf="@+id/name"
+                android:background="@null"
                 android:text="uas技术部门" />
         </RelativeLayout>
 
         <RelativeLayout
+            android:id="@+id/users_rl"
             style="@style/add_signin"
             android:layout_marginTop="30dp">
 
             <TextView
-                android:id="@+id/users"
+                android:id="@+id/users_tv"
                 style="@style/add_signin_tv_main"
                 android:text="参与考勤人员" />
 
@@ -46,10 +51,12 @@
             android:layout_height="1px"
             android:background="@color/item_line" />
 
-        <RelativeLayout style="@style/add_signin">
+        <RelativeLayout
+            android:id="@+id/user_rl"
+            style="@style/add_signin">
 
             <TextView
-                android:id="@+id/user"
+                android:id="@+id/user_tv"
                 style="@style/add_signin_tv_main"
                 android:text="考勤负责人" />
 

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

@@ -11,6 +11,8 @@
         android:layout_height="match_parent"
         android:layout_below="@+id/top"
         android:layout_marginTop="10dp"
-        android:background="@color/item_color2" />
+        android:background="@color/item_color2"
+        android:divider="@color/item_line"
+        android:dividerHeight="3px" />
 
 </RelativeLayout>

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

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
     android:id="@+id/oa_rootview"
-    android:focusableInTouchMode="true"
-    android:focusable="true"
+    android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.crm.ClientActivity">
 
 
@@ -275,19 +275,51 @@
                 android:layout_height="8dp" />
         </LinearLayout>
 
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="6dp">
+
+            <TextView
+                android:id="@+id/date_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:text="2016-07"
+                android:textColor="@color/text_main"
+                android:textSize="@dimen/text_main" />
+
+            <ImageView
+                android:id="@+id/date_back_img"
+                android:layout_width="wrap_content"
+                android:layout_height="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_toLeftOf="@+id/date_tv"
+                android:clickable="true"
+                android:src="@drawable/oa_data_back" />
+
+            <ImageView
+                android:id="@+id/date_next_img"
+                android:layout_width="wrap_content"
+                android:layout_height="20dp"
+                android:layout_marginLeft="20dp"
+                android:layout_toRightOf="@+id/date_tv"
+                android:clickable="true"
+                android:src="@drawable/oa_data_next" />
+        </RelativeLayout>
+
         <LinearLayout
             android:id="@+id/oa_function_ll"
             android:layout_width="match_parent"
             android:layout_height="40dp"
-            android:layout_below="@+id/oa_rl_choose"
             android:orientation="horizontal">
 
             <ImageView
                 android:id="@+id/oa_img_people"
-                android:clickable="true"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
+                android:clickable="true"
                 android:padding="10dp"
                 android:src="@drawable/oa_head" />
 
@@ -311,10 +343,10 @@
 
             <ImageView
                 android:id="@+id/oa_img_add"
-                android:clickable="true"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
+                android:clickable="true"
                 android:padding="10dp"
                 android:src="@drawable/oa_add" />
         </LinearLayout>
@@ -379,10 +411,10 @@
 
             <ImageView
                 android:id="@+id/oa_img_infile"
-                android:clickable="true"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
+                android:clickable="true"
                 android:padding="5dp"
                 android:src="@drawable/filter" />
         </LinearLayout>
@@ -408,7 +440,7 @@
             android:orientation="horizontal">
 
             <TextView
-                android:id="@+id/oa_all_task_num"
+                android:id="@+id/all_task_num"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="2"
@@ -422,12 +454,13 @@
                 android:background="@color/item_line" />
 
             <TextView
+                android:id="@+id/ok_task_num"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="center"
                 android:text="已完成：2"
-                android:textSize="12sp"/>
+                android:textSize="12sp" />
 
             <View
                 android:layout_width="1px"
@@ -435,6 +468,7 @@
                 android:background="@color/item_line" />
 
             <TextView
+                android:id="@+id/uok_task_num"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -448,25 +482,27 @@
                 android:background="@color/item_line" />
 
             <TextView
+                android:id="@+id/ok_scale"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="center"
                 android:text="达成率：10%"
-                android:textSize="12sp"/>
+                android:textSize="12sp" />
         </LinearLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:background="@color/item_line" />
+        <!--<View-->
+            <!--android:layout_width="match_parent"-->
+            <!--android:layout_height="1px"-->
+            <!--android:background="@color/item_line"-->
+            <!--android:date_tv="match_parent" />-->
 
         <com.xzjmyk.pm.activity.view.MyListView
             android:id="@+id/oa_listview"
-            android:focusableInTouchMode="false"
-            android:focusable="false"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:focusable="false"
+            android:focusableInTouchMode="false" />
         />
 
     </LinearLayout>

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

@@ -3,145 +3,47 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="20dp"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.OutofficeActivity">
 
-    <TextView
-        android:id="@+id/oa_out_name_tv"
-        android:layout_width="80dp"
-        android:layout_height="80dp"
-
-        android:background="@drawable/text_button_stye2"
-        android:gravity="center"
-        android:padding="10dp"
-        android:text="晨阳"
-        android:textSize="25dp" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/oa_out_name_tv"
-        android:layout_marginTop="10dp"
-        android:layout_toRightOf="@+id/oa_out_name_tv"
-        android:text="熊晨阳"
-        android:textSize="20dp" />
-
-    <TextView
-        android:id="@+id/tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/oa_out_name_tv"
-        android:layout_marginBottom="10dp"
-        android:layout_toRightOf="@+id/oa_out_name_tv"
-        android:text="你今天完成签到"
-        android:textSize="20dp" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/oa_out_name_tv"
-        android:layout_marginBottom="10dp"
-        android:layout_marginLeft="2dp"
-        android:layout_toRightOf="@+id/tv"
-        android:text="0 次"
-        android:textSize="20dp" />
-
-    <View
-        android:id="@+id/line1"
+    <RadioGroup
+        android:id="@+id/top"
         android:layout_width="match_parent"
-        android:layout_height="2px"
-        android:layout_below="@+id/oa_out_name_tv"
-        android:layout_marginBottom="10dp"
-        android:layout_marginTop="10dp"
-        android:background="@color/item_line" />
-
-    <TextView
-        android:id="@+id/out_date_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/line1"
-        android:layout_marginTop="10dp"
-        android:drawableLeft="@drawable/alarm"
-        android:text="星期一：2016.06.13"
-        android:textSize="@dimen/text_hine" />
-
-    <TextView
-        android:id="@+id/out_time_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_alignTop="@+id/out_date_tv"
-        android:drawableLeft="@drawable/alarm"
-        android:text="当前时间：20:24"
-        android:textSize="@dimen/text_hine" />
+        android:layout_height="44dp"
+        android:layout_alignParentBottom="true"
+        android:orientation="horizontal">
+
+        <RadioButton
+            android:id="@+id/sin_rb"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:button="@null"
+            android:checked="true"
+            android:drawableTop="@drawable/outoffice_sin"
+            android:gravity="center"
+            android:text="签到" />
+
+        <RadioButton
+            android:id="@+id/play_rb"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:button="@null"
+            android:drawableTop="@drawable/outoffice_play"
+            android:gravity="center"
+            android:text="足迹" />
+
+    </RadioGroup>
 
     <View
-        android:id="@+id/line2"
         android:layout_width="match_parent"
         android:layout_height="2px"
-        android:layout_below="@+id/out_date_tv"
-        android:layout_marginBottom="10dp"
-        android:layout_marginTop="10dp"
+        android:layout_above="@+id/top"
         android:background="@color/item_line" />
 
-    <ImageView
-        android:id="@+id/out_addr_img"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/line2"
-        android:src="@drawable/img_head_card" />
-
-    <TextView
-        android:id="@+id/out_add_name_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/out_addr_img"
-        android:layout_marginLeft="10dp"
-        android:layout_toRightOf="@+id/out_addr_img"
-        android:text="英唐大厦"
-        android:textColor="@color/text_main"
-        android:textSize="@dimen/text_main" />
-
-    <TextView
-        android:id="@+id/out_add_t_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/out_add_name_tv"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="5dp"
-        android:layout_toRightOf="@+id/out_addr_img"
-        android:maxLines="2"
-        android:text="广东深圳南山区高新技术产业园。。。。"
-        android:textColor="@color/text_hine"
-        android:textSize="@dimen/text_hine" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/out_add_t_tv"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="5dp"
-        android:layout_toRightOf="@+id/out_addr_img"
-        android:maxLines="1"
-        android:text="地点微调"
-        android:textColor="@color/green"
-        android:textSize="@dimen/text_hine" />
-
-    <View
-        android:id="@+id/line3"
+    <FrameLayout
+        android:id="@+id/content_fl"
         android:layout_width="match_parent"
-        android:layout_height="2px"
-        android:layout_below="@+id/out_addr_img"
-        android:layout_marginBottom="10dp"
-        android:layout_marginTop="10dp"
-        android:background="@color/item_line" />
-
-    <TextView
-        android:layout_width="100dp"
-        android:layout_height="100dp"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:background="@drawable/text_button_stye4"
-        android:gravity="center"
-        android:text="签到" />
+        android:layout_height="match_parent"
+        android:layout_above="@+id/top" />
 </RelativeLayout>

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

@@ -5,35 +5,6 @@
     android:layout_height="match_parent"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.StatisticsActivity">
 
-    <RelativeLayout
-        android:id="@+id/top"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="@color/text_black">
-
-        <TextView
-            android:id="@+id/oa_back"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="10dp"
-            android:clickable="true"
-            android:drawableLeft="@drawable/back"
-            android:text="返回"
-            android:textColor="@color/white"
-            android:textSize="20sp" />
-
-        <TextView
-            android:id="@+id/oa_date_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:clickable="true"
-            android:text="考勤统计"
-            android:textColor="@color/white"
-            android:textSize="16sp" />
-    </RelativeLayout>
-
     <Spinner
         android:id="@+id/oa_statistics_spinner"
         android:layout_width="wrap_content"

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout 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"
+    tools:context="com.xzjmyk.pm.activity.ui.message.SubscripSetActivity">
+
+    <ListView
+        android:id="@+id/listview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:divider="@color/item_line"
+        android:dividerHeight="2px" />
+</RelativeLayout>

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

@@ -6,5 +6,7 @@
     android:layout_height="match_parent"
     android:layout_below="@+id/top"
     android:layout_marginTop="10dp"
+    android:dividerHeight="2px"
+    android:divider="@color/item_line"
     android:background="@color/item_color2"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.WorkLogsActivity"/>

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

@@ -7,18 +7,17 @@
     <RelativeLayout
         android:id="@+id/small_ll"
         android:layout_width="match_parent"
-        android:layout_height="80dp"
-        android:orientation="horizontal"
-        android:visibility="gone">
+        android:layout_height="60dp"
+        android:padding="3dp"
+        android:visibility="gone"
+        android:orientation="horizontal">
 
         <TextView
             android:id="@+id/small_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="8dp"
-            android:layout_marginTop="8dp"
             android:maxLines="3"
-            android:padding="8dp"
+            android:padding="5dp"
             android:textSize="@dimen/text_main" />
 
         <TextView
@@ -26,8 +25,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
-            android:layout_marginBottom="10dp"
-            android:layout_marginLeft="8dp"
             android:layout_toLeftOf="@+id/small_img"
             android:ellipsize="end"
             android:lines="1"
@@ -38,8 +35,7 @@
             android:id="@+id/isre_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/small_tv"
-            android:layout_marginTop="6dp"
+            android:layout_alignTop="@+id/small_img"
             android:layout_toLeftOf="@+id/small_img"
             android:maxLines="3"
             android:padding="8dp"
@@ -47,8 +43,8 @@
 
         <ImageView
             android:id="@+id/small_img"
-            android:layout_width="60dp"
-            android:layout_height="60dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:layout_marginRight="5dp"
@@ -60,43 +56,43 @@
     <RelativeLayout
         android:id="@+id/big_rl"
         android:layout_width="match_parent"
-        android:layout_height="130dp">
+        android:layout_height="130dp"
+        android:visibility="gone">
 
         <ImageView
             android:id="@+id/big_img"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:scaleType="fitXY"
-            android:src="@drawable/dingyue" />
+            android:scaleType="fitXY" />
 
         <TextView
-            android:id="@+id/big_tv"
+            android:id="@+id/big_sub_title_tv"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_marginBottom="5dp"
             android:background="@color/subscrip_text"
-            android:gravity="center_horizontal"
+            android:ellipsize="end"
+            android:paddingLeft="10dp"
             android:textColor="@color/white"
-            android:textSize="@dimen/text_main" />
+            android:textSize="@dimen/text_min" />
 
         <TextView
-            android:id="@+id/big_sub_title_tv"
+            android:id="@+id/big_tv"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_marginBottom="5dp"
+            android:layout_above="@+id/big_sub_title_tv"
             android:background="@color/subscrip_text"
-            android:ellipsize="end"
             android:paddingLeft="10dp"
             android:textColor="@color/white"
-            android:textSize="@dimen/text_min" />
+            android:textSize="@dimen/text_main" />
 
         <TextView
             android:id="@+id/big_isre_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
-            android:layout_below="@+id/big_tv"
-            android:layout_marginRight="5dp"
+            android:layout_margin="10dp"
             android:textSize="@dimen/text_hine" />
     </RelativeLayout>
 </FrameLayout>

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

@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="20dp">
+
+    <TextView
+        android:id="@+id/name_tv"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:background="@drawable/text_button_stye2"
+        android:gravity="center"
+        android:padding="10dp"
+        android:text="晨阳"
+        android:textSize="25dp" />
+
+    <TextView
+        android:id="@+id/name2_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/name_tv"
+        android:layout_marginTop="10dp"
+        android:layout_toRightOf="@+id/name_tv"
+        android:text="熊晨阳"
+        android:textSize="20dp" />
+
+    <TextView
+        android:id="@+id/tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/name_tv"
+        android:layout_marginBottom="10dp"
+        android:layout_toRightOf="@+id/name_tv"
+        android:text="你今天完成签到"
+        android:textSize="20dp" />
+
+    <TextView
+        android:id="@+id/num_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/tv"
+        android:layout_alignBottom="@+id/name_tv"
+        android:layout_marginLeft="5dp"
+        android:layout_toRightOf="@+id/tv"
+        android:text="0 "
+        android:textColor="@color/mainList2"
+        android:textSize="25dp" />
+
+    <TextView
+
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/name_tv"
+        android:layout_marginBottom="10dp"
+        android:layout_marginLeft="2dp"
+        android:layout_toRightOf="@+id/num_tv"
+        android:text="次"
+        android:textSize="20dp" />
+
+    <View
+        android:id="@+id/line1"
+        android:layout_width="match_parent"
+        android:layout_height="2px"
+        android:layout_below="@+id/name_tv"
+        android:layout_marginBottom="10dp"
+        android:layout_marginTop="10dp"
+        android:background="@color/item_line" />
+
+    <TextView
+        android:id="@+id/out_date_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/line1"
+        android:layout_marginTop="10dp"
+        android:drawableLeft="@drawable/alarm"
+        android:text="星期一：2016.06.13"
+        android:textSize="@dimen/text_hine" />
+
+    <TextView
+        android:id="@+id/out_time_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_alignTop="@+id/out_date_tv"
+        android:drawableLeft="@drawable/alarm"
+        android:text="当前时间：20:24"
+        android:textSize="@dimen/text_hine" />
+
+    <View
+        android:id="@+id/line2"
+        android:layout_width="match_parent"
+        android:layout_height="2px"
+        android:layout_below="@+id/out_date_tv"
+        android:layout_marginBottom="10dp"
+        android:layout_marginTop="10dp"
+        android:background="@color/item_line" />
+
+    <com.baidu.mapapi.map.MapView
+        android:id="@+id/mapView"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:layout_below="@+id/line2"
+        android:clickable="true" />
+
+    <TextView
+        android:id="@+id/out_add_name_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/mapView"
+        android:layout_marginLeft="10dp"
+        android:layout_toRightOf="@+id/mapView"
+        android:text="英唐大厦"
+        android:textColor="@color/text_main"
+        android:textSize="@dimen/text_main" />
+
+    <TextView
+        android:id="@+id/out_add_t_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/out_add_name_tv"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="5dp"
+        android:layout_toRightOf="@+id/mapView"
+        android:maxLines="2"
+        android:text="广东深圳南山区高新技术产业园。。。。"
+        android:textColor="@color/text_hine"
+        android:textSize="@dimen/text_hine" />
+
+    <TextView
+        android:id="@+id/do_trim"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/out_add_t_tv"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="5dp"
+        android:layout_toRightOf="@+id/mapView"
+        android:maxLines="1"
+        android:text="地点微调"
+        android:textColor="@color/green"
+        android:textSize="@dimen/text_hine" />
+
+    <View
+        android:id="@+id/line3"
+        android:layout_width="match_parent"
+        android:layout_height="2px"
+        android:layout_below="@+id/mapView"
+        android:layout_marginBottom="10dp"
+        android:layout_marginTop="10dp"
+        android:background="@color/item_line" />
+
+    <TextView
+        android:id="@+id/click_tv"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:background="@drawable/text_button_stye4"
+        android:gravity="center"
+        android:text="签到" />
+</RelativeLayout>

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

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <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_centerVertical="true"
+                android:layout_marginLeft="10dp"
+                android:background="@drawable/oa_signin_tv_bg"
+                android:drawableLeft="@drawable/outoffice_sin"
+                android:drawableRight="@drawable/oa_next"
+                android:text="2016-07-01" />
+        </RelativeLayout>
+    </FrameLayout>
+
+</RelativeLayout>

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

@@ -1,112 +1,197 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_above="@+id/bottom">
 
     <RelativeLayout
-
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:paddingLeft="50dp"
+        android:paddingRight="50dp"
+        android:paddingTop="50dp">
 
-        <RelativeLayout
-            android:id="@+id/oa_rl_handle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_margin="50dp">
+        <LinearLayout
+            android:id="@+id/time0fwork_ll"
+            android:layout_width="100dp"
+            android:layout_height="60dp"
+            android:background="@drawable/oa_signin_tv_bg"
+            android:orientation="vertical">
 
             <TextView
-                android:id="@+id/oa_tv_time_work"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="@drawable/oa_signin_tv_bg"
-                android:text="上班时间\n XX:XX" />
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="上班时间" />
 
             <TextView
-                android:id="@+id/oa_tv_time_clickwork"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:background="@drawable/oa_signin_tv_bg"
-                android:text="上班签到时间\n XX:XX" />
+                android:id="@+id/time0fwork_tv"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="--:--" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/signin0fwork_ll"
+            android:layout_width="120dp"
+            android:layout_height="60dp"
+            android:layout_alignParentRight="true"
+            android:background="@drawable/oa_signin_tv_bg"
+            android:orientation="vertical">
 
             <TextView
-                android:id="@+id/oa_tv_time_unwork"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/oa_tv_time_work"
-                android:layout_marginTop="30dp"
-                android:background="@drawable/oa_signin_tv_bg"
-                android:text="下班时间\n XX:XX" />
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="上班签到时间" />
 
             <TextView
-                android:id="@+id/oa_tv_time_clickunwork"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_alignTop="@+id/oa_tv_time_unwork"
-                android:background="@drawable/oa_signin_tv_bg"
-                android:text="下班签到时间\n XX:XX" />
-        </RelativeLayout>
+                android:id="@+id/signin0fwork_tv"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="--:--" />
+        </LinearLayout>
 
-        <TextView
-            android:id="@+id/oa_signin_time_tv"
+        <LinearLayout
+            android:id="@+id/time0fuwork_ll"
+            android:layout_width="100dp"
+            android:layout_height="60dp"
+            android:layout_below="@+id/time0fwork_ll"
+            android:layout_marginTop="20dp"
+            android:background="@drawable/oa_signin_tv_bg"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="上班时间" />
+
+            <TextView
+                android:id="@+id/time0fuwork_tv"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="--:--" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/signin0fuwork_ll"
+            android:layout_width="120dp"
+            android:layout_height="60dp"
+            android:layout_alignParentRight="true"
+            android:layout_alignTop="@+id/time0fuwork_ll"
+            android:layout_below="@+id/signin0fwork_ll"
+            android:background="@drawable/oa_signin_tv_bg"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="上班签到时间" />
+
+            <TextView
+                android:id="@+id/signin0fuwork_tv"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="--:--" />
+        </LinearLayout>
+
+        <RelativeLayout
+            android:id="@+id/signin_rl"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/oa_rl_handle"
-            android:layout_centerHorizontal="true"
-            android:layout_marginLeft="50dp"
-            android:layout_marginRight="50dp"
-            android:background="@drawable/oa_signin_tv_bg"
-            android:text="下班签到时间\n XX:XX" />
+            android:layout_below="@+id/signin0fuwork_ll"
+            android:layout_marginTop="20dp"
+            android:background="@drawable/oa_signin_tv_bg">
 
+            <TextView
+                style="@style/add_signin_tv_hine"
+                android:text="距离签到时间：" />
+
+            <TextView
+                style="@style/add_signin_tv_hine"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="10dp"
+                android:text="--:--" />
+        </RelativeLayout>
 
         <RelativeLayout
-            android:id="@+id/oa_ll_addr"
+            android:id="@+id/addr_rl"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/oa_signin_time_tv"
-            android:layout_marginLeft="40dp"
-            android:layout_marginRight="40dp"
+            android:layout_below="@+id/signin_rl"
             android:layout_marginTop="20dp"
-            android:padding="8dp">
+            android:background="@drawable/oa_signin_tv_bg">
 
             <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:id="@+id/addr_tag"
+                style="@style/add_signin_tv_hine"
+                android:layout_marginLeft="0dp"
                 android:drawableLeft="@drawable/oa_signin"
-                android:text="地址"
-                android:textSize="16sp" />
-
-            <View
-                android:layout_width="8dp"
-                android:layout_height="2dp" />
+                android:text="地址：" />
 
             <TextView
+                android:id="@+id/location_tv"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_alignParentRight="true"
-                android:text="地址....."
-                android:textSize="16sp" />
+                android:layout_marginLeft="20dp"
+                android:layout_toRightOf="@+id/addr_tag"
+                android:drawableRight="@drawable/oa_next"
+                android:ellipsize="marquee"
+                android:lines="1"
+                android:text="地址..."
+                android:textSize="@dimen/text_hine" />
         </RelativeLayout>
 
-        <TextView
-            android:id="@+id/oa_range_addr_tv"
+        <LinearLayout
+            android:id="@+id/oa_range_addr_rl"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/oa_ll_addr"
-            android:layout_marginLeft="40dp"
-            android:layout_marginRight="40dp"
+            android:layout_below="@+id/addr_rl"
             android:layout_marginTop="30dp"
             android:background="@drawable/oa_signin_tv_bg"
-            android:text="考勤地点：XXX \n 距离考勤地点:XXX公里" />
+            android:orientation="vertical"
+            android:padding="5dp">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="考勤地点：XXXX" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="距离考勤地点：XX公里" />
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_below="@+id/addr_rl"
+            android:layout_marginTop="5dp"
+            android:text="定位不准？重新定位"
+            android:textColor="@color/blue"
+            android:visibility="gone" />
 
         <LinearLayout
             android:layout_width="100dp"
             android:layout_height="100dp"
-            android:layout_below="@+id/oa_range_addr_tv"
+            android:layout_below="@+id/oa_range_addr_rl"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="30dp"
             android:background="@drawable/button_round_shape"
@@ -133,6 +218,5 @@
                 android:textColor="@color/white"
                 android:textSize="14sp" />
         </LinearLayout>
-
     </RelativeLayout>
 </ScrollView>

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

@@ -2,7 +2,6 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:descendantFocusability="blocksDescendants"
     android:padding="5dp">
 
     <TextView
@@ -29,7 +28,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:button="@null"
-
+        android:focusable="false"
         android:drawableLeft="@drawable/oa_rb_button_bg"
         android:padding="10dp" />
 </RelativeLayout>

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

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="5dp">
+
+    <ImageView
+        android:id="@+id/kind_img"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/sub_private" />
+
+    <TextView
+        android:id="@+id/title_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@+id/kind_img"
+        android:textColor="@color/text_main"
+        android:textSize="@dimen/text_main" />
+
+    <TextView
+        android:id="@+id/id_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/title_tv"
+        android:layout_marginLeft="5dp"
+        android:layout_marginTop="2dp"
+        android:layout_toRightOf="@+id/kind_img"
+        android:textColor="@color/text_hine"
+        android:textSize="@dimen/text_hine" />
+
+    <CheckBox
+        android:id="@+id/select_rb"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:button="@null"
+        android:checked="false"
+        android:drawableLeft="@drawable/oa_rb_button_bg"
+        android:padding="10dp" />
+</RelativeLayout>

WeiChat/src/main/res/menu/menu_outoffice.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@id/title"
+        android:title="设置"
+        app:showAsAction="always" />
+</menu>

WeiChat/src/main/res/menu/menu_subscription.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/dingyue"
+        android:title="订阅号" />
+    <item
+        android:id="@+id/dingyue_def"
+        android:title="默认订阅" />
+    <item
+        android:id="@+id/dingyue_select"
+        android:title="选择订阅" />
+</menu>

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

@@ -65,6 +65,7 @@
         <item name="android:textSize">@dimen/text_main</item>
         <item name="android:textColor">@color/text_main</item>
         <item name="android:drawablePadding">8dp</item>
+
     </style>
 
     <style name="add_signin_tv_hine" parent="@style/add_signin_tv">