18:01考勤单据，erp迁移完成，开始迁移平台部分

WeiChat/src/main/AndroidManifest.xml

@@ -178,7 +178,6 @@
         <activity
             android:name=".ui.erp.activity.TravelActivity"
             android:label="@string/oatravel_apply" />
-        <activity android:name=".ui.erp.activity.CommonDocDetailsActivity" />
         <activity android:name=".ui.erp.activity.SaleSelectActivity" />
         <activity android:name=".ui.message.SelectActivity">
             <intent-filter>
@@ -864,15 +863,7 @@
             android:name=".ui.erp.activity.oa.DestinationActivity"
             android:label="@string/activity_select_aims" />
         <!-- 动态表单 -->
-        <activity
-            android:name=".ui.erp.activity.form.DataFormDetailActivity"
-            android:hardwareAccelerated="false" />
-        <activity android:name=".ui.erp.activity.form.DataFormFieldActivity" />
-        <activity
-            android:name=".ui.erp.activity.form.FormListSelectActivity"
-            android:hardwareAccelerated="false"
-            android:launchMode="singleTask"
-            android:windowSoftInputMode="adjustPan" />
+
         <activity
             android:name=".ui.erp.activity.oa.WorkActivity"
             android:label="@string/activity_signing" />
@@ -889,7 +880,12 @@
         <activity android:name=".ui.erp.activity.oa.ErpActivity" />
         <activity
             android:name=".ui.erp.activity.oa.SelectAimActivity"
-            android:label="@string/activity_select_aims" />
+            android:label="@string/activity_select_aims">
+            <intent-filter>
+                <action android:name="com.modular.form.SelectAimActivity"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
         <activity
             android:name=".ui.erp.activity.oa.SelectRemarkActivity"
             android:label="@string/activity_visit_aims"
@@ -905,9 +901,7 @@
         <activity
             android:name="com.uas.appworks.OA.erp.activity.SignSeniorSettingActivity"
             android:label="@string/super_setting"/>
-        <activity
-            android:name=".ui.erp.activity.form.SelectCalendarActivity"
-            android:label="@string/title_activity_select_calendar"/>
+
         <activity android:name="com.uas.appworks.OA.erp.activity.AddFlihtsActivity"/>
         <activity
             android:name=".ui.erp.activity.oa.FlihtsTimeActivity"
@@ -1037,10 +1031,7 @@
         <activity
             android:name=".ui.me.ScanInfoResultsActivity"
             android:label="@string/Results_of_scan" />
-        <activity
-            android:name=".ui.erp.activity.oa.ExpenseReimbursementActivity"
-            android:label="@string/Expense_reimbursement"
-            android:windowSoftInputMode="adjustPan" />
+
         <activity
             android:name=".ui.erp.activity.secretary.SelectPContactsActivity"
             android:windowSoftInputMode="adjustPan" />

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

@@ -18,7 +18,7 @@ import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.fragment.ChartListFragment;
 import com.xzjmyk.pm.activity.ui.erp.fragment.QueryGridFragment;
 import com.xzjmyk.pm.activity.ui.erp.model.ImageInfo;
-import com.xzjmyk.pm.activity.ui.erp.view.NScrollerGridView;
+import com.core.widget.NScrollerGridView;
 
 import java.util.ArrayList;
 

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

@@ -48,7 +48,7 @@ import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.utils.FlexJsonUtil;
 import com.common.data.ObjectUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
-import com.uas.appcontact.ui.widget.stickylistheaders.ListViewInScroller;
+import com.core.widget.view.ListViewInScroller;
 import com.xzjmyk.pm.activity.ui.erp.view.MonPickerDialog;
 import com.xzjmyk.pm.activity.ui.erp.view.MyMarkerView;
 

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

@@ -30,7 +30,7 @@ import com.xzjmyk.pm.activity.ui.erp.model.LogsEntity;
 import com.xzjmyk.pm.activity.ui.erp.model.PanelItems;
 import com.core.net.http.ViewUtil;
 import com.core.widget.EmptyLayout;
-import com.uas.appcontact.ui.widget.stickylistheaders.ListViewInScroller;
+import com.core.widget.view.ListViewInScroller;
 import com.xzjmyk.pm.activity.ui.erp.view.PickDialog;
 import com.core.utils.FlexJsonUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;

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

@@ -30,9 +30,9 @@ import com.xzjmyk.pm.activity.ui.erp.activity.oa.SearchSelectActivity;
 import com.core.widget.view.Activity.SelectActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectAimActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.oa.AddBusinessAdapter;
-import com.xzjmyk.pm.activity.ui.erp.model.oa.SelectAimModel;
+import com.core.widget.view.model.SelectAimModel;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.util.oa.PopupWindowHelper;
+import com.core.utils.helper.PopupWindowHelper;
 import com.core.widget.MyListView;
 
 import java.util.ArrayList;

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

@@ -37,7 +37,7 @@ import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
 import com.core.model.OAConfig;
-import com.uas.appcontact.ui.widget.stickylistheaders.ListViewInScroller;
+import com.core.widget.view.ListViewInScroller;
 import com.xzjmyk.pm.activity.view.FunnelView;
 
 import java.text.SimpleDateFormat;

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

@@ -57,7 +57,7 @@ import com.xzjmyk.pm.activity.ui.erp.adapter.StickyListAdapter;
 import com.xzjmyk.pm.activity.ui.erp.model.list.SimpleData;
 import com.xzjmyk.pm.activity.util.baidu.OnGetDrivingRouteResult;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.util.oa.PopupWindowHelper;
+import com.core.utils.helper.PopupWindowHelper;
 import com.core.widget.MyListView;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.crouton.Style;

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

@@ -31,7 +31,7 @@ import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
 import com.core.utils.CommonInterface;
-import com.uas.appcontact.ui.widget.stickylistheaders.ListViewInScroller;
+import com.core.widget.view.ListViewInScroller;
 import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.crouton.Style;

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

@@ -47,7 +47,7 @@ import com.core.base.BaseActivity;
 import com.core.widget.view.Activity.SelectActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectAimActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectRemarkActivity;
-import com.xzjmyk.pm.activity.ui.erp.model.oa.SelectAimModel;
+import com.core.widget.view.model.SelectAimModel;
 import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
 import com.core.utils.TimeUtils;

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

@@ -1,1230 +0,0 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.form;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.text.TextUtils;
-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.AdapterView;
-import android.widget.BaseAdapter;
-import android.widget.Button;
-import android.widget.GridView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.common.LogUtil;
-import com.common.data.DateFormatUtil;
-import com.common.data.StringUtil;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
-import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.secretary.DataState;
-import com.xzjmyk.pm.activity.ui.erp.fragment.CalendarDateFragmet;
-import com.xzjmyk.pm.activity.ui.erp.model.form.Data;
-import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.app.Constants;
-import com.common.data.ListUtils;
-import com.core.net.http.http.OAHttpHelper;
-import com.core.api.wxapi.ApiConfig;
-import com.core.api.wxapi.ApiPlatform;
-import com.core.api.wxapi.ApiUAS;
-import com.core.api.wxapi.ApiUtils;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-
-/**
- * @desc:公共选择日历日期类
- * @author：Arison on 2017/1/18
- */
-public class SelectCalendarActivity extends BaseActivity implements View.OnClickListener {
-
-    @ViewInject(R.id.viewPager)
-    private ViewPager viewPager;
-    @ViewInject(R.id.ll_date_start)
-    private LinearLayout ll_date_start;
-    @ViewInject(R.id.ll_date_end)
-    private LinearLayout ll_date_end;
-    @ViewInject(R.id.ll_time_start)
-    private LinearLayout ll_time_start;
-    @ViewInject(R.id.ll_time_end)
-    private LinearLayout ll_time_end;
-    @ViewInject(R.id.ll_bottom)
-    private LinearLayout ll_bottom;
-
-    @ViewInject(R.id.tv_date_start)
-    private TextView tv_date_start;
-    @ViewInject(R.id.tv_date_end)
-    private TextView tv_date_end;
-
-    @ViewInject(R.id.v_date_start)
-    private TextView v_date_start;
-    @ViewInject(R.id.v_date_end)
-    private TextView v_date_end;
-
-    @ViewInject(R.id.v_time_start)
-    private TextView v_time_start;
-    @ViewInject(R.id.v_time_end)
-    private TextView v_time_end;
-
-    @ViewInject(R.id.gv_date_list)
-    private GridView gv_date_list;
-    @ViewInject(R.id.click_btn)
-    private Button click_btn;
-
-    private List<DataState> mTimeData = new ArrayList<>();
-    private GridDataAdapter gAdapter;
-    private PagerAdapter pagerAdapter;//当前Viewpager适配器
-
-    private int MAX_PAGER = 30;
-    private Date[] date = new Date[MAX_PAGER];
-
-    private String currentSelectDate;
-
-    private String field;
-
-    private boolean startDate = true;
-    private boolean startTime = true;
-
-    private int status;//0:在录入（无值）1：在录入（有值）
-    private boolean swich = false;//true 按时间段   false按时间
-    private boolean isMenuShuffle = false;//默认隐藏
-
-    private Handler mHandler = new Handler() {
-
-        @Override
-        public void handleMessage(Message msg) {
-            switch (msg.what) {
-                case Constants.HTTP_SUCCESS_INIT:
-                    parsedResult(msg.getData().getString("result"));
-                    break;
-                case 0x5:
-                    LogUtil.d(msg.getData().getString("result"));
-                    parsedResult(msg.getData().getString("result"));
-                    break;
-                case 0x06:
-                    String result = msg.getData().getString("result");
-                    final String resu = result;
-                    try {
-
-                        OAHttpHelper.getInstance().post(new Runnable() {
-                            @Override
-                            public void run() {
-                                parseBookTimeResult(resu);
-                            }
-                        });
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    break;
-                case 0x07:
-                    result = msg.getData().getString("result");
-                    final String endtime = JSON.parseObject(result).getString("endtime");
-                    final String starttime = JSON.parseObject(result).getString("starttime");
-                    OAHttpHelper.getInstance().post(new Runnable() {
-                        @Override
-                        public void run() {
-                            try {
-                                if (!ListUtils.isEmpty(mTimeData)) {
-                                    mTimeData.clear();
-                                }
-                                mTimeData.addAll(timeAddMuilt(starttime, endtime, 15));
-                                gAdapter = new GridDataAdapter(mContext, mTimeData);
-                                gv_date_list.setAdapter(gAdapter);
-                                if (gAdapter.getCount() == 0) {
-                                    initGridData();
-                                }
-                            } catch (Exception e) {
-                                initGridData();
-                            }
-
-                            if (imId != 0) {
-                                getBookingTime(imId);
-                            }
-                        }
-                    });
-
-                    break;
-                case Constants.APP_SOCKETIMEOUTEXCEPTION:
-                    initGridData();
-                    break;
-                case Constants.APP_NOTNETWORK:
-                    initGridData();
-                    break;
-            }
-        }
-    };
-
-
-    private Boolean mWorkovertime = false;
-    private String start_hour_min = "";
-    private String end_hour_min = "";
-    private String first_start_date;
-    private String first_end_date;
-    private String first_start_time;
-    private String first_end_time;
-    private Boolean breastfeeding = false;
-    private int imId;
-    private int type;//0:默认erp：1：小秘书
-    private ArrayList<DataState> totals = new ArrayList<>();
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_date_select, menu);
-        return super.onCreateOptionsMenu(menu);
-    }
-
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        if (isMenuShuffle || breastfeeding) {
-            menu.findItem(R.id.oa_leave).setVisible(true);
-            menu.findItem(R.id.oa_signin_set).setVisible(true);
-        } else {
-            menu.findItem(R.id.oa_signin_set).setVisible(false);
-            menu.findItem(R.id.oa_leave).setVisible(false);
-        }
-        return super.onPrepareOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.oa_leave:
-                if (swich) {
-                    //按时间请假
-                    getSupportActionBar().setTitle("按时间请假");
-                    getSupportActionBar().setSubtitle("只适合普通请假");
-                    ll_bottom.setVisibility(View.GONE);
-                    swich = false;
-                    startDate = true;
-                    startTime = true;
-
-                    tv_date_start.setText("开始时间");
-                    tv_date_end.setText("结束时间");
-
-                    currentSelectDate = null;
-                    v_date_start.setText(first_start_date);
-                    v_date_end.setText(first_end_date);
-                    v_time_start.setText(first_start_time);
-                    v_time_end.setText(first_end_time);
-                    swichDateButton(true);
-                    ll_date_end.setEnabled(false);
-                    ll_time_end.setEnabled(false);
-                } else {
-                    //按时间段请假
-                    getSupportActionBar().setTitle("按时段请假");
-                    getSupportActionBar().setSubtitle("只适合特殊请假");
-                    ll_bottom.setVisibility(View.VISIBLE);
-                    swich = true;
-                    startDate = true;
-                    startTime = true;
-
-                    currentSelectDate = null;
-                    tv_date_start.setText("开始日期");
-                    tv_date_end.setText("结束日期");
-                    v_date_start.setText(first_start_date);
-                    v_date_end.setText(first_end_date);
-                    v_time_start.setText(first_start_time);
-                    v_time_end.setText(first_end_time);
-                    swichTimeButton(true);
-                    ll_date_end.setEnabled(false);
-                    ll_time_end.setEnabled(false);
-                }
-                break;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_select_calendar);
-        initView();
-        initData();
-
-    }
-
-
-    private Integer id;
-    private Data object;
-
-    private void initView() {
-        ViewUtils.inject(this);
-        getSupportActionBar().setTitle("选择时间");
-        //getSupportActionBar().setSubtitle("只适合普通请假");
-        swichDateButton(true);
-        Intent intent = getIntent();
-        String startDate = "";
-        String endDate = "";
-        if (intent != null) {
-            type = intent.getIntExtra("type", 0);
-            field = intent.getStringExtra("field");
-            id = intent.getIntExtra("id", 0);
-            object = intent.getParcelableExtra("object");
-            startDate = intent.getStringExtra("startDate");
-            endDate = intent.getStringExtra("endDate");
-
-
-            String mcaller = intent.getStringExtra("caller");
-            String bf = intent.getStringExtra("breastfeeding");
-            LogUtil.d(bf);
-            if (!StringUtil.isEmpty(bf) && "breastfeeding".equals(bf)) {
-                breastfeeding = true;
-            }
-            if (!TextUtils.isEmpty(mcaller) && ("Workovertime".equals(mcaller) || "ExtraWork$".equals(mcaller))) {
-                mWorkovertime = true;
-            }
-            if (type != 2) {
-                v_date_start.setText(startDate);
-                v_date_end.setText(startDate);
-            }
-            isMenuShuffle = intent.getBooleanExtra("hasMenu", false);
-            LogUtil.d("start:" + startDate + " end:" + endDate + " field:" + field);
-            if (!StringUtil.isEmpty(field)) {
-                if (field.contains("end") || field.contains("date2")) {
-                    //结束时间
-                    swichDateButton(false);
-                    this.startDate = false;
-                }
-            }
-
-            if (type != 2) {
-                if (!StringUtil.isEmpty(startDate) && !StringUtil.isEmpty(endDate)) {
-                    v_date_start.setText(startDate.substring(0, startDate.length() - 3));
-                    v_date_end.setText(endDate.substring(0, endDate.length() - 3));
-                    currentSelectDate = startDate.substring(0, 10);
-                    first_start_date = startDate.substring(0, 10);
-                    first_end_date = endDate.substring(0, 10);
-                    first_start_time = startDate.substring(11, startDate.length());
-                    first_end_time = endDate.substring(11, endDate.length());
-                    Log.v("startDate1", startDate);
-                    Log.v("endDate1", endDate);
-                    Log.v("v_date_start1", v_date_start.getText().toString());
-                    Log.v("v_date_end1", v_date_end.getText().toString());
-                    Log.d("currentSelectDate1", currentSelectDate);
-                } else {
-                    String currentDate = DateFormatUtil.long2Str("yyyy-MM-dd HH:mm");
-                    v_date_start.setText(currentDate.substring(0, currentDate.length()));
-                    v_date_end.setText(currentDate.substring(0, currentDate.length()));
-                    currentSelectDate = currentDate.substring(0, 10);
-                    first_start_date = currentDate.substring(0, 10);
-                    first_end_date = currentDate.substring(0, 10);
-                    first_start_time = currentDate.substring(11, currentDate.length());
-                    first_end_time = currentDate.substring(11, currentDate.length());
-                    Log.v("startDate2", currentDate);
-                    Log.v("endDate2", currentDate);
-                    Log.v("v_date_start2", v_date_start.getText().toString());
-                    Log.v("v_date_end2", v_date_end.getText().toString());
-                    Log.d("currentSelectDate2", currentSelectDate);
-                }
-            }
-            imId = intent.getIntExtra("imId", 0);
-        }
-        initListener();
-    }
-
-    @Override
-    public void onWindowFocusChanged(boolean hasFocus) {
-        super.onWindowFocusChanged(hasFocus);
-
-    }
-
-    private void initListener() {
-        ll_date_start.setOnClickListener(this);
-        ll_date_end.setOnClickListener(this);
-        ll_time_start.setOnClickListener(this);
-        ll_time_end.setOnClickListener(this);
-        //ll_date_end.setEnabled(false);//不可点击
-        ll_time_end.setEnabled(false);//不可点击
-        click_btn.setOnClickListener(this);
-
-        gv_date_list.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                GridDataAdapter.ViewModle modle = (GridDataAdapter.ViewModle) view.getTag();
-                //ToastMessage(modle.tv_text.getText().toString());
-                gAdapter.setSelected(position);
-                gAdapter.notifyDataSetChanged();
-                if (type == 2) {
-                    //按时间请假：
-                    if (startDate) {//按钮状态
-                        //开始时间
-                        v_date_start.setText(modle.tv_text.getText().toString());
-                        //切换到开始时间
-                        swichDateButton(false);//要不要清楚日历状态？
-                        startDate = false;
-                        v_date_end.setText(v_date_start.getText().toString());
-                        start_hour_min = modle.tv_text.getText().toString();
-                    } else {
-                        //结束时间
-                        v_date_end.setText(modle.tv_text.getText().toString());
-                        end_hour_min = modle.tv_text.getText().toString();
-
-                    }
-                    return;
-                }
-
-                if (StringUtil.isEmpty(currentSelectDate)) {
-                    ToastMessage("请先选择日期,再选择时间段！");
-                    return;
-                }
-                if ((StringUtil.isEmpty(currentSelectDate) &&
-                        StringUtil.isEmpty(v_date_end.getText().toString())) ||
-                        (StringUtil.isEmpty(currentSelectDate) &&
-                                StringUtil.isEmpty(v_date_start.getText().toString()))) {
-                    ToastMessage("请先选择日期,再选择时间段！");
-                    return;
-                }
-                if (type == 1) {
-                    if (!modle.clicked) {
-                        ToastMessage("该时间段不能预约！");
-                        return;
-                    }
-                }
-
-                if (swich) {
-                    //时间段请假：
-                    if (startTime) {
-                        v_time_start.setText(modle.tv_text.getText().toString());
-                        swichTimeButton(false);
-                        swichDateButton(false);
-                        startTime = false;
-                        startDate = false;
-                        currentSelectDate = null;//清空
-                        v_date_end.setText(v_date_start.getText().toString());
-                        v_time_end.setText(v_time_start.getText().toString());
-                    } else {
-                        v_time_end.setText(modle.tv_text.getText().toString());
-                    }
-                } else {
-                    //按时间请假：
-                    if (startDate) {//按钮状态
-                        //开始时间
-                        v_date_start.setText(currentSelectDate + " " + modle.tv_text.getText().toString());
-                        //切换到开始时间
-                        swichDateButton(false);//要不要清楚日历状态？
-                        startDate = false;
-                        if (!StringUtil.isEmpty(v_date_start.getText().toString())) {
-                            currentSelectDate = v_date_start.getText().toString().substring(0, 10);//清空
-                            Log.d("currentSelectDate3", currentSelectDate);
-                        } else {
-                            currentSelectDate = null;//清空
-                        }
-                        v_date_end.setText(v_date_start.getText().toString());
-                        start_hour_min = modle.tv_text.getText().toString();
-                    } else {
-                        //结束时间
-                        Log.d("currentSelectDate4", currentSelectDate);
-                        v_date_end.setText(currentSelectDate + " " + modle.tv_text.getText().toString());
-                        end_hour_min = modle.tv_text.getText().toString();
-
-                    }
-                }
-            }
-        });
-
-    }
-
-    private void initData() {
-        switch (type) {
-            case 0:
-                sendRequest();//获取班次信息
-                break;
-            case 1:
-                getBookingTotalTime(imId);
-                break;
-            case 2:
-                initTimeData();
-//                ll_date_end.setVisibility(View.GONE);
-//                ll_date_start.setVisibility(View.GONE);
-                viewPager.setVisibility(View.GONE);
-                currentSelectDate = "";
-                break;
-        }
-        initCalender();
-    }
-
-    private int posItem;           //当前为滑动到的哪个Viewpager
-    private Date curDate;    //当前显示的日期  包含年月日信息
-    private int selectDay;
-
-    private void initCalender() {
-        setDate();
-        selectDay = Calendar.getInstance().get(Calendar.DAY_OF_MONTH);
-        listenerMap = new HashMap<>();
-        LinearLayout.LayoutParams linearParams = (LinearLayout.LayoutParams) viewPager.getLayoutParams(); // 取控件mGrid当前的布局参数   搜索
-        linearParams.height = (getResources().getDisplayMetrics().heightPixels * 1 / 3);// 当控件的高强制设成50象素
-        viewPager.setLayoutParams(linearParams); // 使设置好的布局参数应用到控件myGrid
-        pagerAdapter = new PagerAdapter(getSupportFragmentManager());
-        viewPager.setAdapter(pagerAdapter);
-        viewPager.setCurrentItem(MAX_PAGER / 2);
-
-
-        viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-            @Override
-            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-
-            }
-
-            @Override
-            public void onPageSelected(int position) {
-                posItem = position;
-                Calendar c = Calendar.getInstance();
-                c.setTime(date[position]);
-                c.set(Calendar.DAY_OF_MONTH, selectDay);
-                curDate = c.getTime();
-                setDateTag(curDate);
-            }
-
-            @Override
-            public void onPageScrollStateChanged(int state) {
-
-            }
-        });
-
-    }
-
-
-    private void setDateTag(Date date) {
-        Calendar c = Calendar.getInstance();
-        c.setTime(date);
-        int yeas = c.get(Calendar.YEAR);
-        int month = c.get(Calendar.MONTH) + 1;
-        int day = c.get(Calendar.DAY_OF_MONTH);
-        String today = DateFormatUtil.long2Str(DateFormatUtil.YMD);
-        currentSelectDate = DateFormatUtil.getStrDate4Date(date, "yyyy-MM-dd");
-//        if (today.compareTo(currentSelectDate) > 0 && type == 1){
-//            ToastMessage("不能预约过去时间");
-//            return;
-//        }else {
-        String m = "";
-        String d = "";
-        if (month < 10) {
-            m = "0" + month;
-        } else {
-            m = month + "";
-        }
-        if (day < 10) {
-            d = "0" + day;
-        } else {
-            d = day + "";
-        }
-        if (startDate) {
-            v_date_start.setText(yeas + "-" + m + "-" + d + " " + start_hour_min);
-            Log.d("Slide_date88", yeas + "-" + month + "-" + day + " " + start_hour_min);
-        } else {
-            v_date_end.setText(yeas + "-" + m + "-" + d + " " + end_hour_min);
-
-            Log.d("Slide_date88", yeas + "-" + month + "-" + day + " " + end_hour_min);
-        }
-
-        getBookingTime(imId);
-//        }
-
-    }
-
-    /**
-     * @desc:初始化表格数据
-     * @author：Arison on 2017/1/18
-     */
-    private void initGridData() {
-        if (!ListUtils.isEmpty(mTimeData)) {
-            mTimeData.clear();
-        }
-        if (type == 0) {
-            initTimeData(30);
-        } else {
-            initTimeData(15);
-        }
-        if (mContext != null) {
-            gAdapter = new GridDataAdapter(mContext, mTimeData);
-            gv_date_list.setAdapter(gAdapter);
-        }
-    }
-
-    private void initTimeData(int minute) {
-        if (mWorkovertime) {
-            mTimeData.clear();
-            mTimeData.addAll(timeAddMuilt("00:00", "23:59", minute));
-        } else {
-            if (type == 0) {
-                mTimeData.addAll(timeAddMuilt("08:30", "18:30", minute));
-            } else {
-                mTimeData.addAll(timeAddMuilt("08:00", "20:00", minute));
-            }
-        }
-    }
-
-    private void initTimeData() {
-        if (type == 2) {
-            mTimeData.addAll(timeAddMuilt("00:00", "23:45", 15));
-            if (mContext != null) {
-                gAdapter = new GridDataAdapter(mContext, mTimeData);
-                gv_date_list.setAdapter(gAdapter);
-            }
-        }
-    }
-
-    public void parsedResult(String result) {
-        if (result == null) {
-            result = "{\"ifDefaultClass\":false,\"wd_degree\":2,\"wd_earlytime\":null,\"comAddressdata\":[{\"CS_WORKADDR\":\"深圳市南山区\",\"CS_VALIDRANGE\":\"300\",\"CS_ID\":10141,\"CS_LATITUDE\":\"22.540676518856678\",\"CS_LONGITUDE\":\"113.9528745854545\",\"CS_SHORTNAME\":\"宇声数码技术公司\",\"CS_CODE\":\"2017020234\",\"CS_INNERDISTANCE\":500,\"success\":true},{\"CS_WORKADDR\":\"广东省深圳市南山区高新区科技南六路29号万德莱大厦南座6楼\",\"CS_VALIDRANGE\":\"300\",\"CS_ID\":10143,\"CS_LATITUDE\":\"22.5416028163184\",\"CS_LONGITUDE\":\"113.95309916183191\",\"CS_SHORTNAME\":\"深圳市中兴供应链有限公司\",\"CS_CODE\":\"2017020236\",\"CS_INNERDISTANCE\":500,\"success\":true}],\"count\":null,\"wd_code\":\"TEST1\",\"Class3\":{\"wd_offend\":null,\"wd_onduty\":null,\"wd_offduty\":null,\"wd_onbeg\":null},\"Class2\":{\"wd_offend\":\"20:00\",\"wd_onduty\":\"13:30\",\"wd_offduty\":\"18:00\",\"wd_onbeg\":\"13:00\"},\"wd_id\":111281,\"Class1\":{\"wd_offend\":\"12:30\",\"wd_onduty\":\"08:30\",\"wd_offduty\":\"12:00\",\"wd_onbeg\":\"07:00\"},\"wd_pcount\":null,\"wd_name\":\"测试1\",\"ifNeedSignCard\":true,\"innerdistance\":null,\"distance\":null,\"sessionId\":\"729F70FB568EF25CC7F1CEE14A0900EE\",\"comaddressset\":false,\"longitude\":null,\"latitude\":null,\"success\":true,\"wd_day\":null}";
-        }
-        try {
-            JSONObject root = JSON.parseObject(result);
-            JSONObject Class1 = null;
-            JSONObject Class2 = null;
-            JSONObject Class3 = null;
-            if (ApiUtils.getApiModel() instanceof ApiPlatform) {
-                Class1 =
-                        root.getJSONObject("class1");
-                Class2 =
-                        root.getJSONObject("class2");
-                Class3 =
-                        root.getJSONObject("class3");
-            } else {
-                Class1 =
-                        root.getJSONObject("Class1");
-                Class2 =
-                        root.getJSONObject("Class2");
-                Class3 =
-                        root.getJSONObject("Class3");
-            }
-            int type = 0;// 默认没有班次
-            String wd_onduty = Class1.getString("wd_onduty");// 上班时间
-            if (wd_onduty != null) {
-                String wd_offduty = Class1.getString("wd_offduty");//结束时间
-                type = 1;
-                //获取时间累加，加半小时
-                mTimeData.addAll(timeAddMuilt(wd_onduty, wd_offduty));
-            }
-            wd_onduty = Class2.getString("wd_onduty");// 上班时间
-            if (wd_onduty != null) {
-                String wd_offduty = Class2.getString("wd_offduty");//结束时间
-                type = 2;
-                mTimeData.addAll(timeAddMuilt(wd_onduty, wd_offduty));
-            }
-            wd_onduty = Class3.getString("wd_onduty");// 上班时间
-            if (wd_onduty != null) {
-                String wd_offduty = Class3.getString("wd_offduty");//结束时间
-                type = 3;
-                mTimeData.addAll(timeAddMuilt(wd_onduty, wd_offduty));
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        if (ListUtils.isEmpty(mTimeData)) {
-            initTimeData(30);
-        }
-        if (mWorkovertime) {
-            initTimeData(30);
-        }
-        gAdapter = new GridDataAdapter(MyApplication.getInstance(), mTimeData);
-        gv_date_list.setAdapter(gAdapter);
-    }
-
-    /**
-     * 返回指定时间段内  循环累加半小时
-     *
-     * @param start
-     * @param end   08:30-12:30  [首 +中间值累加半小时 + 尾]
-     * @return
-     */
-    public List<DataState> timeAddMuilt(String start, String end) {
-        LogUtil.d("Test", "timeAddMuilt start:");
-        start = "2017-07-13 " + start;
-        end = "2017-07-13 " + end;
-        List<DataState> result = new ArrayList<>();
-        DataState dataState = new DataState();
-        dataState.setValue(start.substring(11, 16));
-        dataState.setClicked(true);
-        result.add(dataState);
-        while (true) {
-            start = DateFormatUtil.add(
-                    DateFormatUtil.getDate4StrDate(start, "yyyy-MM-dd HH:mm"),
-                    "yyyy-MM-dd HH:mm",
-                    1 * 1 * 30 * 60 * 1000);
-            System.out.println(start);
-            if (start.compareTo(end) >= 0) {
-                DataState dataState1 = new DataState();
-                dataState1.setValue(end.substring(11, 16));
-                dataState1.setClicked(true);
-                result.add(dataState1);
-                break;
-            } else {
-                DataState dataState2 = new DataState();
-                dataState2.setValue(start.substring(11, 16));
-                dataState2.setClicked(true);
-                result.add(dataState2);
-            }
-        }
-        return result;
-    }
-
-
-    /**
-     * 返回指定时间段内  循环累加半小时
-     *
-     * @param start
-     * @param end   08:30-12:30  [首 +中间值累加半小时 + 尾]
-     * @return
-     */
-    public List<DataState> timeAddMuilt(String start, String end, int minute) {
-        LogUtil.d("Test", "timeAddMuilt start:");
-        List<DataState> result = new ArrayList<>();
-        DataState dataState = new DataState();
-        dataState.setValue(start);
-        dataState.setClicked(true);
-        result.add(dataState);
-        int i = 0;
-        while (true) {
-            start = DateFormatUtil.add(DateFormatUtil.getDate4StrDate(start, "HH:mm"),
-                    "HH:mm", 1 * 1 * minute * 60 * 1000);
-            if (start.compareTo(end) >= 0) {
-                DataState dataState1 = new DataState();
-                dataState1.setValue(end);
-                dataState1.setClicked(true);
-                result.add(dataState1);
-                break;
-            } else {
-                if (start.equals("00:00")) {
-                    break;
-                }
-                DataState dataState2 = new DataState();
-                dataState2.setValue(start);
-                dataState2.setClicked(true);
-                result.add(dataState2);
-            }
-            i++;
-        }
-        LogUtil.d("Test", "timeAddMuilt end:");
-        return result;
-    }
-
-
-    private void setDate() {
-        //当前天在 MAX_PAGER/2 位置
-        Calendar c = Calendar.getInstance();
-        Date date = new Date();
-        for (int i = 0; i < MAX_PAGER; i++) {
-            c.setTime(date);
-            c.add(Calendar.MONTH, i - (MAX_PAGER / 2));
-            c.set(Calendar.DAY_OF_MONTH, 1);
-            this.date[i] = c.getTime();
-        }
-    }
-
-    @Override
-    public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.ll_date_start:
-                startDate = true;
-                ll_date_end.setEnabled(true);
-                swichDateButton(startDate);
-                break;
-            case R.id.ll_date_end:
-                startDate = false;
-                swichDateButton(startDate);
-                v_date_end.setText(v_date_start.getText().toString());
-                break;
-            case R.id.ll_time_start:
-                startTime = true;
-                ll_time_end.setEnabled(true);
-                swichTimeButton(startTime);
-                break;
-            case R.id.ll_time_end:
-                startTime = false;
-                swichTimeButton(startTime);
-                v_date_end.setText(v_date_start.getText().toString());
-                break;
-            case R.id.click_btn:
-                if (swich) {
-                    //时间段
-                    if (!StringUtil.isEmpty(v_date_start.getText().toString()) && !
-                            StringUtil.isEmpty(v_date_end.getText().toString())) {
-                        if (!checkDateStr(v_date_end.getText().toString() + " " + v_time_end.getText().toString())) {
-                            if (type == 1) {
-                                ToastMessage("不能预约过去时间!");
-                            } else {
-                                ToastMessage("结束时间 请选择具体时间点!");
-                            }
-                            return;
-                        }
-                        if (!checkDateStr(v_date_start.getText().toString() + " " + v_time_start.getText().toString())) {
-                            if (type == 1) {
-                                ToastMessage("不能预约过去时间!");
-                            } else {
-                                ToastMessage("开始时间 请选择具体时间点!");
-                            }
-                            return;
-                        }
-                        Intent intent = new Intent();
-                        intent.putExtra("startDate", v_date_start.getText().toString() + " " + v_time_start.getText().toString());
-                        intent.putExtra("endDate", v_date_end.getText().toString() + " " + v_time_end.getText().toString());
-                        intent.putExtra("object", object);
-                        intent.putExtra("field", field);
-                        intent.putExtra("id", id);
-                        setResult(0x11, intent);
-                        finish();
-
-                    } else {
-                        ToastMessage("请选择开始时间和结束时间！");
-                    }
-                } else {
-                    //时间
-                    if (!StringUtil.isEmpty(v_date_start.getText().toString()) && !
-                            StringUtil.isEmpty(v_date_end.getText().toString())) {
-                        if (type == 2) {
-                            setResultIntent();
-                            return;
-                        }
-                        if (!checkDateStr(v_date_end.getText().toString())) {
-                            if (type == 1) {
-                                ToastMessage("不能预约过去时间!");
-                            } else {
-                                ToastMessage("结束时间 请选择具体时间点!");
-                            }
-                            return;
-                        }
-                        if (!checkDateStr(v_date_start.getText().toString())) {
-                            if (type == 1) {
-                                ToastMessage("不能预约过去时间!");
-                            } else {
-                                ToastMessage("开始时间 请选择具体时间点!");
-                            }
-                            return;
-                        }
-
-                        if (type == 1) {
-                            if (v_date_start.getText().toString().compareTo(DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS)) < 0) {
-                                ToastMessage("不能预约过去的时间！");
-                                return;
-                            }
-                            //类型等于小秘书的时候
-                            //判断不能跨天预约
-                            if (!v_date_end.getText().toString().substring(0, 10).equals(v_date_start.getText().toString().substring(0, 10))) {
-                                ToastMessage("不能跨天预约！");
-                                return;
-                            }
-                            //判断时间段不能有被预约的天数
-                            String start = v_date_start.getText().toString().substring(11, 16);
-                            String end = v_date_end.getText().toString().substring(11, 16);
-                            List<DataState> dataStates = timeAddMuilt(start, end, 15);
-                            for (int i = 0; i < dataStates.size(); i++) {
-                                DataState dataState = dataStates.get(i);
-                                for (int j = 0; j < totals.size(); j++) {
-                                    DataState nData = totals.get(j);
-                                    if (dataState.getValue().equals(nData.getValue())) {
-                                        ToastMessage("该时间段不能预约！");
-                                        return;
-                                    }
-                                }
-                            }
-
-                            //结束时间不能小于或等于开始时间
-                            if (v_date_end.getText().toString().compareTo(v_date_start.getText().toString()) <= 0) {
-                                ToastMessage("结束时间不能小于或等于开始时间");
-                                return;
-                            }
-                            //getUsersBusyTime();
-                            //return;
-                        }
-                        setResultIntent();
-
-                    } else {
-                        ToastMessage("请选择开始时间和结束时间！");
-                    }
-                }
-
-
-                break;
-        }
-    }
-
-    private void setResultIntent() {
-        Intent intent = new Intent();
-        intent.putExtra("startDate", v_date_start.getText().toString());
-        intent.putExtra("endDate", v_date_end.getText().toString());
-        intent.putExtra("object", object);
-        intent.putExtra("field", field);
-        intent.putExtra("id", id);
-        setResult(0x11, intent);
-        finish();
-    }
-
-
-    /**
-     * @desc:获取用户的繁忙时间
-     * @author：Arison on 2017/7/11
-     */
-//    public void getUsersBusyTime() {
-//        String time = DateFormatUtil.getStrDate4String(v_date_end.getText().toString().replace("-", ""), "yyyyMMdd");
-//        String url = Constants.IM_BASE_URL + "user/appBusytime";
-//        Map<String, Object> params = new HashMap<>();
-//        params.put("token", MyApplication.getInstance().mAccessToken);
-//        params.put("userid", MyApplication.getInstance().mLoginUser.getUserId());
-//        params.put("yearmonth", time);
-//        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-//        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-//        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, 0x08, null, null, "post");
-//    }
-
-
-    /**
-     * @desc:发送网络请求
-     * @author：Arison on 2017/2/15
-     */
-    private void sendRequest() {
-        if (ApiUtils.getApiModel() instanceof ApiUAS) {
-            String url = CommonUtil.getSharedPreferences(this, "erp_baseurl") +
-                    "mobile/getWorkDate.action";
-            Map<String, Object> param = new HashMap<>();
-            param.put("date", DateFormatUtil.getStrDate4Date(new Date(), "yyyyMMdd"));
-            param.put("master", CommonUtil.getSharedPreferences(mContext, "erp_master"));
-            param.put("emcode", CommonUtil.getSharedPreferences(mContext, "erp_username"));
-            LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-            headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(this, "sessionId"));
-            ViewUtil.httpSendRequest(this, url, param, mHandler, headers, Constants.HTTP_SUCCESS_INIT, null, null, "post");
-        } else if (ApiUtils.getApiModel() instanceof ApiPlatform) {
-            String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().punch_schedule_url;
-            Map<String, Object> param = new HashMap<>();
-            param.put("date",DateFormatUtil.getStrDate4Date(new Date(), "yyyyMMdd"));
-            param.put("enuu", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu"));
-            param.put("emcode", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu"));
-            LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-            headers.put("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
-            ViewUtil.httpSendRequest(this, url, param, mHandler, headers, 0x5, null, null, "get");
-        }
-    }
-
-    private boolean checkDateStr(String date_string) {
-        // 利用java中的SimpleDateFormat类，指定日期格式，注意yyyy,MM大小写
-        // 这里的日期格式要求javaAPI中有详细的描述，不清楚的话可以下载相关API查看
-        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-
-        // SimpleDateFormat format=new SimpleDateFormat("yyyyMM");
-        // 设置日期转化成功标识
-        boolean dateflag = true;
-        // 这里要捕获一下异常信息
-        try {
-            Date date = format.parse(date_string);
-        } catch (ParseException e) {
-            dateflag = false;
-        } finally {
-            // 成功：true ;失败:false
-            System.out.println("日期是否满足要求" + dateflag);
-        }
-        return dateflag;
-    }
-
-    private void swichDateButton(boolean swich) {
-        ll_date_start.setSelected(swich);
-        ll_date_end.setSelected(!swich);
-    }
-
-    private void swichTimeButton(boolean swich) {
-        ll_time_start.setSelected(swich);
-        ll_time_end.setSelected(!swich);
-    }
-
-    /**
-     * @desc:表格适配器
-     * @author：Arison on 2017/1/18
-     */
-    private class GridDataAdapter extends BaseAdapter {
-
-        private Context ct;
-        private List<DataState> mData = new ArrayList<>();
-        private LayoutInflater inflater;
-        private int selected = -1;
-
-        GridDataAdapter(Context ct, List<DataState> data) {
-            this.ct = ct;
-            this.mData = data;
-            this.inflater = LayoutInflater.from(ct);
-        }
-
-        @Override
-        public int getCount() {
-            return mData.size();
-        }
-
-        @Override
-        public Object getItem(int position) {
-            return mData.get(position);
-        }
-
-        @Override
-        public long getItemId(int position) {
-            return position;
-        }
-
-        public int getSelected() {
-            return selected;
-        }
-
-        public void setSelected(int selected) {
-            this.selected = selected;
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            ViewModle modle = null;
-
-            if (convertView == null) {
-                convertView = inflater.inflate(R.layout.item_simple_text, parent, false);
-                modle = new ViewModle();
-                modle.tv_text = (TextView) convertView.findViewById(R.id.tv_text);
-                convertView.setTag(modle);
-            } else {
-                modle = (ViewModle) convertView.getTag();
-            }
-            modle.tv_text.setText(mData.get(position).getValue());
-            if (mData.get(position).isClicked()) {
-                modle.clicked = true;
-                modle.tv_text.setTextColor(mContext.getResources().getColor(R.color.black));
-                modle.tv_text.setBackgroundResource(R.drawable.bg_select_blue);
-                if (selected == position) {
-                    modle.tv_text.setSelected(true);
-                    modle.tv_text.setTextColor(mContext.getResources().getColor(R.color.white));
-                } else {
-                    modle.tv_text.setSelected(false);
-                }
-            } else {
-                modle.clicked = false;
-                modle.tv_text.setTextColor(mContext.getResources().getColor(R.color.light_gray));
-                modle.tv_text.setBackgroundResource(R.drawable.bg_select_red);
-                modle.tv_text.setSelected(false);
-            }
-            return convertView;
-        }
-
-        class ViewModle {
-            TextView tv_text;
-            boolean clicked;
-        }
-    }
-
-
-    class PagerAdapter extends FragmentPagerAdapter {
-
-        public PagerAdapter(FragmentManager fm) {
-            super(fm);
-        }
-
-        @Override
-        public Fragment getItem(int position) {
-            return CalendarDateFragmet.getInstance(date[position], selectDay);
-        }
-
-        @Override
-        public int getCount() {
-            return MAX_PAGER;
-        }
-
-        @Override
-        public void setPrimaryItem(ViewGroup container, final int position, Object object) {
-            try {
-                CalendarDateFragmet fragmet = (CalendarDateFragmet) object;
-                fragmet.setDownDay(selectDay);
-                ;
-            } catch (Exception e) {
-
-            }
-        }
-
-
-    }
-
-    private Map<String, OnTaskChangeListener> listenerMap;
-
-    public void setListener(String key, OnTaskChangeListener listener) {
-        listenerMap.put(key, listener);
-    }
-
-    public interface OnTaskChangeListener {
-        void onChange(Set<Integer> in);
-    }
-
-    /*当点击了指定日期（点击日期、滑动时候触发）*/
-    public void setClickDay(Date date) {
-        currentSelectDate =DateFormatUtil.getStrDate4Date(date, "yyyy-MM-dd");
-        Calendar c = Calendar.getInstance();
-        c.setTime(date);
-        selectDay = c.get(Calendar.DAY_OF_MONTH);
-        String today = DateFormatUtil.long2Str(DateFormatUtil.YMD);
-        if (today.compareTo(currentSelectDate) > 0 && type == 1) {
-            ToastMessage("不能预约过去时间");
-            //按时间
-            currentSelectDate = "";
-            // v_date_start.setText(DateFormatUtil.getStrDate4Date(date,"yyyy-MM-dd"));
-            //按时间请假：
-            if (startDate) {//按钮状态
-                //开始时间
-                v_date_start.setText(currentSelectDate);
-            } else {
-                //结束时间
-                v_date_end.setText(currentSelectDate);
-                if (type == 1) {
-                    startDate = true;
-                    ll_date_end.setEnabled(true);
-                    swichDateButton(startDate);
-                    v_date_start.setText(currentSelectDate);
-                }
-            }
-            return;
-        } else {
-            if (swich) {
-                //按时间段
-                if (startDate) {
-                    v_date_start.setText(currentSelectDate);
-                } else {
-                    v_date_end.setText(currentSelectDate);
-                }
-
-            } else {
-                //按时间
-                // v_date_start.setText(DateFormatUtil.getStrDate4Date(date,"yyyy-MM-dd"));
-                //按时间请假：
-                if (startDate) {//按钮状态
-                    //开始时间
-                    v_date_start.setText(currentSelectDate);
-                } else {
-                    //结束时间
-                    v_date_end.setText(currentSelectDate);
-                    if (type == 1) {
-                        startDate = true;
-                        ll_date_end.setEnabled(true);
-                        swichDateButton(startDate);
-                        v_date_start.setText(currentSelectDate);
-                    }
-                }
-            }
-            //ToastMessage(currentSelectDate);
-            getBookingTime(imId);
-        }
-
-    }
-
-
-    /**
-     * @desc:获取总的时间段
-     * @author：Arison on 2017/6/28
-     */
-    private void getBookingTotalTime(int imId) {
-        if (type == 1) {
-            String url = Constants.IM_BASE_URL + "user/appUsertime";
-            Map<String, Object> params = new HashMap<>();
-            params.put("token", MyApplication.getInstance().mAccessToken);
-            params.put("userid", imId);
-            LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-            headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-            ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, 0x07, null, null, "post");
-        }
-    }
-
-
-    /**
-     * @desc:获取预约时间
-     * @author：Arison on 2017/6/28
-     */
-    public void getBookingTime(int imId) {
-        if (type == 1) {
-            String url = Constants.IM_BASE_URL + "user/appBusytime";
-            String ym;
-            if (startDate) {
-                ym = DateFormatUtil.formatChange(v_date_start.getText().toString().replace("-", ""), "yyyyMMdd");
-            } else {
-                ym = DateFormatUtil.formatChange(v_date_end.getText().toString().replace("-", ""), "yyyyMMdd");
-            }
-            Map<String, Object> params = new HashMap<>();
-            params.put("token", MyApplication.getInstance().mAccessToken);
-            params.put("userid", imId);
-            params.put("currentid", MyApplication.getInstance().mLoginUser.getUserId());
-            params.put("yearmonth", ym);
-            LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-            headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-            ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, 0x06, null, null, "post");
-        }
-    }
-
-
-    private void parseBookTimeResult(String result) {
-        String busytime = JSON.parseObject(result).getString("busytime");
-        JSONArray jsonArray = JSON.parseArray(busytime);
-        if (totals != null) totals.clear();
-        if (jsonArray != null) {
-            if (jsonArray.size() != 0) {
-                for (int i = 0; i < jsonArray.size(); i++) {
-                    JSONObject object = jsonArray.getJSONObject(i);
-                    String sDate = object.getString("ab_starttime");
-                    String eDate = object.getString("ab_endtime");
-                    sDate = sDate.substring(11, 16);
-                    eDate = eDate.substring(11, 16);
-                    LogUtil.d("Test", "时间段：" + sDate + "-" + eDate);
-                    List<DataState> dataStates = timeAddMuilt(sDate, eDate, 15);
-                    totals.addAll(dataStates);
-                }
-                LogUtil.d("Test", "被预约的时间段：" + JSON.toJSONString(totals));
-                for (int j = 0; j < mTimeData.size(); j++) {
-                    DataState dataState = mTimeData.get(j);
-                    mTimeData.get(j).setClicked(true);
-                    for (int n = 0; n < totals.size(); n++) {
-                        DataState nDataState = totals.get(n);
-                        if (dataState.getValue().equals(nDataState.getValue())) {
-                            dataState.setClicked(false);
-                        }
-                    }
-                }
-                if (gAdapter != null) {
-                    gAdapter.notifyDataSetChanged();
-                }
-            } else {
-                //默认时间段：00:00-23:59
-                for (int y = 0; y < mTimeData.size(); y++) {
-                    mTimeData.get(y).setClicked(true);
-                }
-                if (gAdapter != null) {
-                    gAdapter.notifyDataSetChanged();
-                }
-            }
-        } else {
-            for (int y = 0; y < mTimeData.size(); y++) {
-                mTimeData.get(y).setClicked(true);
-            }
-            if (gAdapter != null) {
-                gAdapter.notifyDataSetChanged();
-            }
-            //默认时间段：00:00-23:59
-        }
-
-    }
-
-
-}

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

@@ -26,11 +26,11 @@ import com.nostra13.universalimageloader.core.ImageLoader;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.model.oa.SelectAimModel;
+import com.core.widget.view.model.SelectAimModel;
 import com.core.utils.ToastUtil;
 import com.core.utils.CommonInterface;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.util.oa.PopupWindowHelper;
+import com.core.utils.helper.PopupWindowHelper;
 import com.core.net.http.http.OnHttpResultListener;
 
 import java.io.File;

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

@@ -30,12 +30,12 @@ import com.lidroid.xutils.view.annotation.ViewInject;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
-import com.xzjmyk.pm.activity.ui.erp.model.oa.SelectAimModel;
+import com.core.widget.view.model.SelectAimModel;
 import com.xzjmyk.pm.activity.ui.erp.presenter.AddVisitReportPresenter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IAddVisitReport;
 import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
-import com.xzjmyk.pm.activity.util.oa.PopupWindowHelper;
+import com.core.utils.helper.PopupWindowHelper;
 import com.core.utils.RecognizerDialogUtil;
 import com.core.widget.MyListView;
 import com.xzjmyk.pm.activity.view.wheel.OASigninPicker;

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

@@ -36,13 +36,13 @@ import com.uas.appworks.OA.erp.activity.MissionSetActivity;
 import com.uas.appworks.OA.erp.utils.MostLinearLayoutManager;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.adapter.MissionAdapter;
-import com.xzjmyk.pm.activity.ui.erp.model.oa.SelectAimModel;
+import com.core.widget.view.model.SelectAimModel;
 import com.xzjmyk.pm.activity.ui.erp.presenter.MissionPresenter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IMission;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IMissionPresenter;
 import com.xzjmyk.pm.activity.util.baidu.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.baidu.OnGetDrivingRouteResult;
-import com.xzjmyk.pm.activity.util.oa.PopupWindowHelper;
+import com.core.utils.helper.PopupWindowHelper;
 import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
 
 import java.util.List;

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

@@ -1021,7 +1021,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                 startActivity(new Intent(activity, StatisticsActivity.class));
                 PreferenceUtils.putInt(Constants.NEW_FUNCTION_NOTICE, 1);
                 break;
-            case R.id.oamain_expense_reimbursement_ll:
+            case R.id.oamain_expense_reimbursement_ll:  //费用报销
                 startActivity(new Intent(activity, ExpenseReimbursementActivity.class));
                 PreferenceUtils.putInt(Constants.NEW_EXPENSE_REIMBURSEMENT_NOTICE, 1);
                 break;

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

@@ -19,7 +19,7 @@ import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.adapter.oa.SelectAimAdapter;
 import com.core.widget.listener.EditChangeListener;
-import com.xzjmyk.pm.activity.ui.erp.model.oa.SelectAimModel;
+import com.core.widget.view.model.SelectAimModel;
 import com.xzjmyk.pm.activity.ui.erp.presenter.SelectAimPresenter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.ISelectAim;
 import com.common.data.ListUtils;

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

@@ -27,7 +27,7 @@ import com.xzjmyk.pm.activity.R;
 import com.core.base.BaseActivity;
 import com.core.widget.listener.EditChangeListener;
 import com.core.utils.ToastUtil;
-import com.xzjmyk.pm.activity.util.oa.PopupWindowHelper;
+import com.core.utils.helper.PopupWindowHelper;
 import com.core.net.http.http.OAHttpHelper;
 import com.core.net.http.http.OnHttpResultListener;
 import com.core.net.http.http.Request;

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

@@ -43,7 +43,7 @@ import com.xzjmyk.pm.activity.ui.erp.activity.form.SelectCalendarActivity;
 import com.core.widget.view.Activity.SearchLocationActivity;
 import com.core.widget.view.Activity.SelectActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.book.BookingModel;
-import com.xzjmyk.pm.activity.ui.erp.view.NScrollerGridView;
+import com.core.widget.NScrollerGridView;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import java.util.ArrayList;

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

@@ -10,7 +10,7 @@ import android.widget.TextView;
 import com.common.data.StringUtil;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.model.oa.SelectAimModel;
+import com.core.widget.view.model.SelectAimModel;
 import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.util.baidu.BaiduMapUtil;
 

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

@@ -8,7 +8,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.common.data.JSONUtil;
 import com.common.data.StringUtil;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.model.oa.SelectAimModel;
+import com.core.widget.view.model.SelectAimModel;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IAddVisitReport;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.common.data.ListUtils;

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

@@ -14,7 +14,7 @@ import com.common.data.StringUtil;
 import com.core.app.AppConfig;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.model.oa.SelectAimModel;
+import com.core.widget.view.model.SelectAimModel;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.ISelectAim;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.common.data.ListUtils;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/imp/ISelectAim.java

@@ -1,7 +1,7 @@
 package com.xzjmyk.pm.activity.ui.erp.presenter.imp;
 
 import com.core.base.HttpImp;
-import com.xzjmyk.pm.activity.ui.erp.model.oa.SelectAimModel;
+import com.core.widget.view.model.SelectAimModel;
 
 import java.util.List;
 

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

@@ -50,7 +50,7 @@
                 android:textSize="20sp"
                 android:visibility="gone" />
 
-            <com.uas.appcontact.ui.widget.stickylistheaders.ListViewInScroller
+            <com.core.widget.view.ListViewInScroller
                 android:id="@+id/lv_detail_data"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"

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

@@ -116,7 +116,7 @@
                 android:text="@string/booking_topic" />
         </RelativeLayout>
 
-        <com.xzjmyk.pm.activity.ui.erp.view.NScrollerGridView
+        <com.core.widget.NScrollerGridView
             android:id="@+id/gv_topic"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

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

@@ -90,7 +90,7 @@
                 android:hint="请选择(必填)" />
         </LinearLayout>
         
-        <com.uas.appcontact.ui.widget.stickylistheaders.ListViewInScroller
+        <com.core.widget.view.ListViewInScroller
             android:id="@+id/lv_datas"
             android:layout_width="match_parent"
             android:layout_height="match_parent"/>

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

@@ -14,7 +14,7 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <com.uas.appcontact.ui.widget.stickylistheaders.ListViewInScroller
+        <com.core.widget.view.ListViewInScroller
             android:id="@+id/lv_datas"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

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

@@ -41,7 +41,7 @@
                     android:text="点击即为添加..." />
             </LinearLayout>
 
-            <com.xzjmyk.pm.activity.view.gridview.MyStickyGridHeadersGridView
+            <com.core.widget.view.MyStickyGridHeadersGridView
                 android:id="@+id/asset_grid"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -81,7 +81,7 @@
                     android:text="点击即为隐藏..." />
             </LinearLayout>
 
-            <com.xzjmyk.pm.activity.view.gridview.MyStickyGridHeadersGridView
+            <com.core.widget.view.MyStickyGridHeadersGridView
                 android:id="@+id/asset_grid_delete"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"

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

@@ -147,7 +147,7 @@
                 </LinearLayout>
 
             </LinearLayout>
-            <!--com.xzjmyk.pm.activity.ui.erp.view.NScrollerGridView-->
+            <!--com.core.widget.NScrollerGridView-->
 
 
         </LinearLayout>

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

@@ -24,7 +24,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
-            <com.xzjmyk.pm.activity.ui.erp.view.NScrollerGridView
+            <com.core.widget.NScrollerGridView
                 android:id="@+id/gv_details_list"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -36,7 +36,7 @@
                 android:paddingTop="5dp"
                 android:paddingBottom="5dp"
                 android:numColumns="3">
-            </com.xzjmyk.pm.activity.ui.erp.view.NScrollerGridView>
+            </com.core.widget.NScrollerGridView>
         </LinearLayout>
     </com.core.widget.CustomerScrollView>
     <LinearLayout

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

@@ -21,7 +21,7 @@
                        android:orientation="vertical">-->
         <!--            <View style="@style/horizontal_layout" />
                     <View style="@style/horizontal_layout" />-->
-                <com.uas.appcontact.ui.widget.stickylistheaders.ListViewInScroller
+                <com.core.widget.view.ListViewInScroller
                     android:id="@+id/lv_grid_dispaly"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"

app_core/common/src/main/AndroidManifest.xml

@@ -19,5 +19,8 @@
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="stateUnspecified|adjustNothing" />
         <activity android:name="com.core.widget.view.Activity.SelectActivity"/>
+        <activity
+            android:name="com.core.selectcalendar.SelectCalendarActivity"
+            android:label="@string/title_activity_select_calendar"/>
     </application>
 </manifest>

app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -7,8 +7,11 @@ import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
 import android.net.Uri;
 import android.os.Environment;
+import android.os.Looper;
 import android.provider.MediaStore;
 import android.text.TextUtils;
 import android.widget.Toast;
@@ -27,6 +30,7 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.text.DecimalFormat;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -36,7 +40,7 @@ import java.util.regex.Pattern;
 public class CommonUtil {
 
     private final static String AppShareName = "setting";
-
+    public static int counter = 0;
 
     /**
      * @desc:获取erp的根路径
@@ -423,4 +427,92 @@ public class CommonUtil {
         }
         return -1;
     }
+
+    /**
+     * 检测网络是否可用
+     *
+     * @param context
+     * @return
+     */
+    public static boolean isNetWorkConnected(Context context) {
+        if (context != null) {
+            ConnectivityManager mConnectivityManager = (ConnectivityManager) context
+                    .getSystemService(Context.CONNECTIVITY_SERVICE);
+            NetworkInfo mNetworkInfo = mConnectivityManager.getActiveNetworkInfo();
+            if (mNetworkInfo != null) {
+                return mNetworkInfo.isAvailable();
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 将阿拉伯数字转换为汉字一、二、三..方法
+     *
+     * @return
+     * @author：FANGlh 2016-11-28
+     */
+    public static String numToCN(int d) {
+//        String[] str = { "零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖" };
+        String[] str = {" ", "一", "二", "三", "四", "五", "六", "七", "八", "九"};
+//        String ss[] = new String[] { "元", "拾", "佰", "仟", "万", "拾", "佰", "仟", "亿" };
+        String ss[] = new String[]{" ", "一", "十", "百", "千", "万", "十", "百", "千", "亿"};
+        String s = String.valueOf(d);
+        System.out.println(s);
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0; i < s.length(); i++) {
+            String index = String.valueOf(s.charAt(i));
+            sb = sb.append(str[Integer.parseInt(index)]);
+        }
+        String sss = String.valueOf(sb);
+        int i = 0;
+        for (int j = sss.length(); j > 0; j--) {
+            sb = sb.insert(j, ss[i++]);
+        }
+        return sb.toString();
+    }
+    /**
+     * @return 返回double保留两位小数
+     * @author: FANGlh 2017-3-30
+     */
+
+    public static double getTwoPointDouble(double num) {
+        try {
+            DecimalFormat df = new DecimalFormat(".##");
+            double dis = Math.abs(num);
+            return Double.valueOf(df.format(dis));
+        } catch (Exception e) {
+            return 0;
+        }
+    }
+
+    /**
+     * 根据手机的分辨率从 dp 的单位 转成为 px(像素)
+     */
+    public static int dip2px(Context context, float dpValue) {
+        final float scale = context.getResources().getDisplayMetrics().density;
+        return (int) (dpValue * scale + 0.5f);
+    }
+    public static boolean isMainThread() {
+        return Looper.getMainLooper().getThread() == Thread.currentThread();
+    }
+
+    /**
+     * 判断str1中包含str2的个数
+     *
+     * @param str1
+     * @param str2
+     * @return counter
+     */
+    public static int countStr(String str1, String str2) {
+        if (str1.indexOf(str2) == -1) {
+            return 0;
+        } else if (str1.indexOf(str2) != -1) {
+            counter++;
+            countStr(str1.substring(str1.indexOf(str2) +
+                    str2.length()), str2);
+            return counter;
+        }
+        return 0;
+    }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/oa/PopupWindowHelper.java → app_core/common/src/main/java/com/core/utils/helper/PopupWindowHelper.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.util.oa;
+package com.core.utils.helper;
 
 import android.app.Activity;
 import android.text.Editable;
@@ -14,8 +14,8 @@ import android.widget.TextView;
 import com.common.data.StringUtil;
 import com.common.system.DisplayUtil;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.model.oa.SelectAimModel;
+import com.core.app.R;
+import com.core.widget.view.model.SelectAimModel;
 
 /**
  * Created by Bitliker on 2017/5/3.

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/NScrollerGridView.java → app_core/common/src/main/java/com/core/widget/NScrollerGridView.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.xzjmyk.pm.activity.ui.erp.view;
+package com.core.widget;
 
 import android.content.Context;
 import android.util.AttributeSet;

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/widget/stickylistheaders/ListViewInScroller.java → app_core/common/src/main/java/com/core/widget/view/ListViewInScroller.java

@@ -1,4 +1,4 @@
-package com.uas.appcontact.ui.widget.stickylistheaders;
+package com.core.widget.view;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -11,7 +11,7 @@ public class ListViewInScroller extends ListView {
 	}
 	
 	public ListViewInScroller(Context context, AttributeSet attrs,
-			int defStyleAttr) {
+                              int defStyleAttr) {
 		super(context, attrs, defStyleAttr);
 	}
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/gridview/MyStickyGridHeadersGridView.java → app_core/common/src/main/java/com/core/widget/view/MyStickyGridHeadersGridView.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.view.gridview;
+package com.core.widget.view;
 
 import android.content.Context;
 import android.util.AttributeSet;

app_core/common/src/main/java/com/core/widget/view/adapter/adapter/ImgFileListAdapter.java

@@ -0,0 +1,97 @@
+package com.core.widget.view.adapter.adapter;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.core.app.R;
+import com.core.utils.pictureselector.ImgCallBack;
+import com.core.utils.pictureselector.Util;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+public class ImgFileListAdapter extends BaseAdapter{
+
+	Context context;
+	String filecount="filecount";
+	String filename="filename";
+	String imgpath="imgpath";
+	List<HashMap<String, String>> listdata;
+	Util util;
+	Bitmap[] bitmaps;
+	private int index=-1;
+	List<View> holderlist;
+	
+	public ImgFileListAdapter(Context context, List<HashMap<String, String>> listdata) {
+		this.context=context;
+		this.listdata=listdata;
+		bitmaps=new Bitmap[listdata.size()];
+		util=new Util(context);
+		holderlist=new ArrayList<View>();
+	}
+	
+	@Override
+	public int getCount() {
+		return listdata.size();
+	}
+
+	@Override
+	public Object getItem(int arg0) {
+		return listdata.get(arg0);
+	}
+
+	@Override
+	public long getItemId(int arg0) {
+		return arg0;
+	}
+
+	@Override
+	public View getView(final int arg0, View arg1, ViewGroup arg2) {
+		Holder holder;
+		if (arg0 != index && arg0 > index) {
+			holder=new Holder();
+			arg1=LayoutInflater.from(context).inflate(R.layout.imgfileadapter, null);
+			holder.photo_imgview=(ImageView) arg1.findViewById(R.id.filephoto_imgview);
+			holder.filecount_textview=(TextView) arg1.findViewById(R.id.filecount_textview);
+			holder.filename_textView=(TextView) arg1.findViewById(R.id.filename_textview);
+			arg1.setTag(holder);
+			holderlist.add(arg1);
+		}else{
+			holder= (Holder)holderlist.get(arg0).getTag();
+			arg1=holderlist.get(arg0);
+		}
+		
+		holder.filename_textView.setText(listdata.get(arg0).get(filename));
+		holder.filecount_textview.setText(listdata.get(arg0).get(filecount));
+		if (bitmaps[arg0] == null) {
+			util.imgExcute(holder.photo_imgview,new ImgCallBack() {
+				@Override
+				public void resultImgCall(ImageView imageView, Bitmap bitmap) {
+					bitmaps[arg0]=bitmap;
+					imageView.setImageBitmap(bitmap);
+				}
+			}, listdata.get(arg0).get(imgpath));
+		}
+		else {
+			holder.photo_imgview.setImageBitmap(bitmaps[arg0]);
+		}
+		
+		return arg1;
+	}
+	
+	class Holder{
+		public ImageView photo_imgview;
+		public TextView filecount_textview;
+		public TextView filename_textView;
+	}
+
+	
+	
+}

app_core/common/src/main/java/com/core/widget/view/adapter/adapter/SearchLocationAdapter.java

@@ -0,0 +1,102 @@
+package com.core.widget.view.adapter.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import com.common.data.ListUtils;
+import com.core.app.R;
+import com.core.widget.view.model.SearchLocationModel;
+
+import java.util.List;
+
+/**
+ * Created by Bitliker on 2017/2/6.
+ */
+
+public class SearchLocationAdapter extends BaseAdapter {
+    private Context ct;
+    private List<SearchLocationModel> listData;
+    private String distanceTag;
+
+
+    public SearchLocationAdapter(Context ct, List<SearchLocationModel> listData, String distanceTag) {
+        this.ct = ct;
+        this.listData = listData;
+        this.distanceTag = distanceTag;
+    }
+
+    public List<SearchLocationModel> getListData() {
+        return listData;
+    }
+
+    public void setListData(List<SearchLocationModel> listData, String distanceTag) {
+        this.distanceTag = distanceTag;
+        this.listData = listData;
+    }
+
+    @Override
+    public int getCount() {
+        return ListUtils.isEmpty(listData) ? 0 : listData.size();
+    }
+
+    @Override
+    public Object getItem(int i) {
+        return listData.get(i);
+    }
+
+    @Override
+    public long getItemId(int i) {
+        return i;
+    }
+
+    @Override
+    public View getView(int i, View view, ViewGroup viewGroup) {
+        ViewHolder holder = null;
+        if (view == null) {
+            view = LayoutInflater.from(ct).inflate(R.layout.item_location_ls, null);
+            holder = new ViewHolder();
+            holder.address_tv = (TextView) view.findViewById(R.id.address_tv);
+            holder.name_tv = (TextView) view.findViewById(R.id.name_tv);
+            holder.distance_tv = (TextView) view.findViewById(R.id.distance_tv);
+            view.setTag(holder);
+        } else {
+            holder = (ViewHolder) view.getTag();
+        }
+        holder.address_tv.setText(listData.get(i).getPoiInfo().address);
+        holder.name_tv.setText(listData.get(i).getPoiInfo().name);
+        String distance = (listData.get(i).getDistance() == 0 ? "0" : listData.get(i).getDistance()) + "" + distanceTag;
+        holder.distance_tv.setText(distance);
+        return view;
+    }
+
+//    private String getDistance(LatLng location) {
+//        String dis = BaiduMapUtil.getInstence().getDistance(location, location);
+//        if (StringUtil.isEmpty(dis)) return String.valueOf(0);
+//        if (isShowKm) {
+//            return getKm(dis) + " km";
+//        } else {
+//            return dis + " m";
+//        }
+//    }
+
+//    private String getKm(String dis) {
+//        if (StringUtil.isEmpty(dis)) return String.valueOf(0);
+//        try {
+//            DecimalFormat fnum = new DecimalFormat("##0.00");
+//            String dd = fnum.format(Float.valueOf(dis) / 1000);
+//            return dd;
+//        } catch (ClassCastException e) {
+//            return String.valueOf(0);
+//        } catch (Exception e) {
+//            return String.valueOf(0);
+//        }
+//    }
+
+    class ViewHolder {
+        TextView name_tv, address_tv, distance_tv;
+    }
+}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/StickyGridAdapter.java → app_core/common/src/main/java/com/core/widget/view/adapter/adapter/StickyGridAdapter.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.adapter;
+package com.core.widget.view.adapter.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -9,9 +9,9 @@ import android.widget.GridView;
 import android.widget.TextView;
 
 import com.common.data.StringUtil;
+import com.core.app.R;
+import com.core.selectcalendar.bean.Data;
 import com.tonicartos.widget.stickygridheaders.StickyGridHeadersSimpleAdapter;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.model.form.Data;
 
 import java.util.List;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/model/oa/SelectAimModel.java → app_core/common/src/main/java/com/core/widget/view/model/SelectAimModel.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.model.oa;
+package com.core.widget.view.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;

app_core/common/src/main/res/layout/activity_book_add.xml

@@ -116,7 +116,7 @@
                 android:text="@string/booking_topic" />
         </RelativeLayout>
 
-        <com.xzjmyk.pm.activity.ui.erp.view.NScrollerGridView
+        <com.core.widget.NScrollerGridView
             android:id="@+id/gv_topic"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

app_core/common/src/main/res/layout/activity_data_form_field.xml

@@ -41,7 +41,7 @@
                     android:text="点击即为添加..." />
             </LinearLayout>
 
-            <com.xzjmyk.pm.activity.view.gridview.MyStickyGridHeadersGridView
+            <com.core.widget.view.MyStickyGridHeadersGridView
                 android:id="@+id/asset_grid"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -81,7 +81,7 @@
                     android:text="点击即为隐藏..." />
             </LinearLayout>
 
-            <com.xzjmyk.pm.activity.view.gridview.MyStickyGridHeadersGridView
+            <com.core.widget.view.MyStickyGridHeadersGridView
                 android:id="@+id/asset_grid_delete"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"

app_core/common/src/main/res/layout/activity_select_calendar.xml

@@ -147,7 +147,7 @@
                 </LinearLayout>
 
             </LinearLayout>
-            <!--com.xzjmyk.pm.activity.ui.erp.view.NScrollerGridView-->
+            <!--com.core.widget.NScrollerGridView-->
 
 
         </LinearLayout>

app_core/common/src/main/res/layout/expense_details_menu.xml

@@ -24,7 +24,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
-            <com.xzjmyk.pm.activity.ui.erp.view.NScrollerGridView
+            <com.core.widget.NScrollerGridView
                 android:id="@+id/gv_details_list"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -36,7 +36,7 @@
                 android:paddingTop="5dp"
                 android:paddingBottom="5dp"
                 android:numColumns="3">
-            </com.xzjmyk.pm.activity.ui.erp.view.NScrollerGridView>
+            </com.core.widget.NScrollerGridView>
         </LinearLayout>
     </com.core.widget.CustomerScrollView>
     <LinearLayout

app_modular/appworks/src/main/AndroidManifest.xml

@@ -7,15 +7,29 @@
 
         <activity
             android:name="com.uas.appworks.OA.erp.activity.DailydetailsActivity"
-            android:theme="@style/OAThemeSignin" />
+            android:theme="@style/OAThemeSignin"/>
 
         <activity
             android:name="com.uas.appworks.OA.erp.activity.WorkDailyAddActivity"
-            android:theme="@style/OAThemeSignin" />
+            android:theme="@style/OAThemeSignin"/>
         <activity
             android:name="com.uas.appworks.OA.erp.activity.WorkDailyShowActivity"
-            android:theme="@style/OAThemeSignin" />
-        <activity android:name="com.uas.appworks.OA.platform.activity.PlatDailyShowActivity" />
-        <activity android:name="com.uas.appworks.OA.platform.activity.PlatWDdetailyActivity" />
+            android:theme="@style/OAThemeSignin"/>
+        <activity android:name="com.uas.appworks.OA.platform.activity.PlatDailyShowActivity"/>
+        <activity android:name="com.uas.appworks.OA.platform.activity.PlatWDdetailyActivity"/>
+        <activity
+            android:name="com.uas.appworks.OA.erp.activity.ExpenseReimbursementActivity"
+            android:label="@string/Expense_reimbursement"
+            android:windowSoftInputMode="adjustPan"/>
+        <activity android:name="com.uas.appworks.OA.erp.activity.CommonDocDetailsActivity"/>
+        <activity
+            android:name="com.uas.appworks.OA.erp.activity.form.DataFormDetailActivity"
+            android:hardwareAccelerated="false" />
+        <activity android:name="com.uas.appworks.OA.erp.activity.form.DataFormFieldActivity" />
+        <activity
+            android:name="com.uas.appworks.OA.erp.activity.form.FormListSelectActivity"
+            android:hardwareAccelerated="false"
+            android:launchMode="singleTask"
+            android:windowSoftInputMode="adjustPan" />
     </application>
 </manifest>

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/CommonDocDetailsActivity.java → app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/CommonDocDetailsActivity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity;
+package com.uas.appworks.OA.erp.activity;
 
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -21,6 +21,9 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONException;
+import com.alibaba.fastjson.JSONObject;
 import com.common.LogUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
@@ -33,34 +36,25 @@ import com.core.base.BaseActivity;
 import com.core.dao.DBManager;
 import com.core.model.EmployeesEntity;
 import com.core.net.http.ViewUtil;
+import com.core.selectcalendar.bean.Approval;
+import com.core.utils.CommonUtil;
 import com.core.utils.helper.AvatarHelper;
 import com.core.widget.CustomerScrollView;
 import com.core.widget.EmptyLayout;
 import com.core.widget.MyListView;
+import com.core.widget.SquareCenterImageView;
 import com.core.widget.view.MyGridView;
 import com.core.xmpp.utils.AppConstant;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
+import com.me.appworks.R;
 import com.nostra13.universalimageloader.core.ImageLoader;
+import com.uas.appworks.OA.erp.activity.form.DataFormDetailActivity;
+import com.uas.appworks.OA.erp.activity.form.FormListSelectActivity;
+import com.uas.appworks.OA.erp.adapter.ComDocGriddataOutAdapter;
+import com.uas.appworks.OA.erp.adapter.CommonDocMainMsgAdapter;
 import com.uas.appworks.OA.erp.model.CommonApprovalFlowBean;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.adapter.ComDocGriddataOutAdapter;
-import com.xzjmyk.pm.activity.adapter.CommonDocApprovalFlowAdapter;
-import com.xzjmyk.pm.activity.adapter.CommonDocMainMsgAdapter;
-import com.xzjmyk.pm.activity.adapter.NodeAdapter;
-import com.xzjmyk.pm.activity.bean.oa.CommonDocAMBean;
-import com.xzjmyk.pm.activity.ui.erp.activity.form.DataFormDetailActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.form.FormListSelectActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.oa.ExpenseReimbursementActivity;
-import com.xzjmyk.pm.activity.ui.erp.model.oa.Approval;
-import com.xzjmyk.pm.activity.ui.erp.util.ApprovaNodeUtil;
-import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.view.SquareCenterImageView;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
+import com.uas.appworks.OA.erp.model.CommonDocAMBean;
+import com.uas.appworks.OA.erp.utils.approvautils.ApprovaNodeUtil;
+import com.uas.appworks.OA.erp.utils.approvautils.NodeAdapter;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -80,71 +74,52 @@ public class CommonDocDetailsActivity extends BaseActivity {
     private static final int NEW_DOC_RESUB_SUCCESSFUL = 52601;
     private static final int New_DOC_REDELETE_SUCCESSFUL = 52602;
     private static final int NEW_DELETE_DOC_REQUEST = 52603;
-    @ViewInject(R.id.common_docui_photo_img)
-    private ImageView photo_im;
-    @ViewInject(R.id.common_docui_name_tv)
-    private TextView name_tv;
-    @ViewInject(R.id.common_docui_Section_tv)
-    private TextView section_tv;
-    @ViewInject(R.id.common_docui_status_tv)
-    private TextView status_tv;
-    @ViewInject(R.id.common_docui_approval_flow_lv)
-    private MyListView appflow_lv;
     private int mNoc = 1;
     private final static int COMMON_DOC_AF_REQUEST = 1125;
     private final static int COMMON_DOC_MSG_REQUEST = 1126;
     private static final int DELETE_DOC_REQUEST = 1127;
     private EmptyLayout mEmptyLayput_approvalflow;
-    private CommonDocApprovalFlowAdapter mCommonDocApprovalFlowAdapter;
     private CommonApprovalFlowBean mCommonApprovalFlowBean;
     private CommonDocAMBean mCommonDocAMBean;
     private DBManager manager;
     private List<String> im_ids;
     private int mkeyValue;
     private String mCaller;
-    @ViewInject(R.id.common_docui_main_msg_lv)
-    private MyListView main_msg_lv;
     private EmptyLayout mEmptyLayput_applymsg;
     private JSONArray formdataBeans;
     private JSONArray griddataBeans;
     private List<CommonDocAMBean.DatasBean.FormconfigsBean> mFormconfigsBean;
     private List<CommonDocAMBean.DatasBean.GridconfigsBean> mGridconfigsBean;
     private CommonDocMainMsgAdapter mCommonDocMainMsgAdapter;
-    @ViewInject(R.id.common_docui_second_msg_lv)
-    private MyListView second_msg_lv;
     private ComDocGriddataOutAdapter mComDocGriddataOutAdapter;
-    @ViewInject(R.id.common_docui_secondmsg_ll)
+
+    private MyListView main_msg_lv;
+    private ImageView photo_im;
+    private TextView name_tv;
+    private TextView section_tv;
+    private TextView status_tv;
+    private MyListView appflow_lv;
+    private MyListView second_msg_lv;
     private LinearLayout secondmsg_ll;
-    @ViewInject(R.id.common_docui_agree_and_change_ll)
     private LinearLayout approval_ll;
-    @ViewInject(R.id.common_docui_agree_ll)
     private LinearLayout agree_ll;
-    @ViewInject(R.id.common_docui_change_dealman_ll)
     private LinearLayout change_deal_man_ll;
-    @ViewInject(R.id.common_docui_disagree_ll)
     private LinearLayout disagree_ll;
-    @ViewInject(R.id.item_common_docui_res_and_del_ll)
     private LinearLayout resanddel_ll;
-    @ViewInject(R.id.common_docui_resubmit_ll)
     private LinearLayout resubmit_ll;
-    @ViewInject(R.id.common_docui_delete_ll)
     private LinearLayout delete_ll;
-    @ViewInject(R.id.common_docui_sv)
     private CustomerScrollView commondoc_sv;
-    private String em_number;
-    private String type_emcode;
-    private String real_status;
-    private String emCode;
-    @ViewInject(R.id.hide_above_af)
     private View hide_above_af;
-    private String last_status;
-    private String update;
-    private Boolean platform;
-    @ViewInject(R.id.ex_invoice_ll)
     private LinearLayout ex_invoice_ll;
-    @ViewInject(R.id.grid_view)
     private MyGridView grid_view;
     private GridViewAdapter mAdapter;
+    private String last_status;
+    private String update;
+    private Boolean platform; private String em_number;
+    private String type_emcode;
+    private String real_status;
+    private String emCode;
+
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -162,8 +137,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
     public void initView() {
         platform = ApiUtils.getApiModel() instanceof ApiPlatform;
         setContentView(R.layout.activity_common_docui);
-        ViewUtils.inject(this);
-
+        initIDS();
         mEmptyLayput_applymsg = new EmptyLayout(this, main_msg_lv);
         mEmptyLayput_applymsg.setShowEmptyButton(false);
         mEmptyLayput_applymsg.setShowErrorButton(false);
@@ -185,7 +159,6 @@ public class CommonDocDetailsActivity extends BaseActivity {
         mEmptyLayput_approvalflow.setShowLoadingButton(false);
         //加载审批流的适配器
         mCommonApprovalFlowBean = new CommonApprovalFlowBean();
-        mCommonDocApprovalFlowAdapter = new CommonDocApprovalFlowAdapter(this);
 
         manager = new DBManager(this);
         im_ids = new ArrayList<>();
@@ -203,6 +176,29 @@ public class CommonDocDetailsActivity extends BaseActivity {
         grid_view.setAdapter(mAdapter);
     }
 
+    private void initIDS() {
+        main_msg_lv = (MyListView) findViewById(R.id.common_docui_main_msg_lv);
+        photo_im = (ImageView) findViewById(R.id.common_docui_photo_img);
+        name_tv = (TextView) findViewById(R.id.common_docui_name_tv);
+        section_tv = (TextView) findViewById(R.id.common_docui_Section_tv);
+        status_tv = (TextView) findViewById(R.id.common_docui_status_tv);
+        appflow_lv = (MyListView) findViewById(R.id.common_docui_approval_flow_lv);
+        second_msg_lv = (MyListView) findViewById(R.id.common_docui_second_msg_lv);
+        secondmsg_ll = (LinearLayout) findViewById(R.id.common_docui_secondmsg_ll);
+        approval_ll = (LinearLayout) findViewById(R.id.common_docui_agree_and_change_ll);
+        agree_ll  = (LinearLayout) findViewById(R.id.common_docui_agree_ll);
+        change_deal_man_ll = (LinearLayout) findViewById(R.id.common_docui_change_dealman_ll);
+        disagree_ll = (LinearLayout) findViewById(R.id.common_docui_disagree_ll);
+        resanddel_ll = (LinearLayout) findViewById(R.id.item_common_docui_res_and_del_ll);
+        resubmit_ll = (LinearLayout) findViewById(R.id.common_docui_resubmit_ll);
+        delete_ll = (LinearLayout) findViewById(R.id.common_docui_delete_ll);
+        commondoc_sv = (CustomerScrollView) findViewById(R.id.common_docui_sv);
+        hide_above_af = findViewById(R.id.hide_above_af);
+        ex_invoice_ll  = (LinearLayout) findViewById(R.id.ex_invoice_ll);
+        grid_view = (MyGridView) findViewById(R.id.grid_view);
+
+    }
+
     private void initDate() {
         final Intent intent = getIntent();
         mCaller = intent.getStringExtra("caller");
@@ -455,11 +451,11 @@ public class CommonDocDetailsActivity extends BaseActivity {
         mFormconfigsBean.clear();
         mGridconfigsBean.clear();
         try {
-            JSONObject amresultJsonObject = new JSONObject(msg_result);
-            JSONObject dataObjecty = amresultJsonObject.optJSONObject("datas");
-            JSONArray formdataArray = dataObjecty.optJSONArray("formdata");
+            JSONObject amresultJsonObject = JSON.parseObject(msg_result);
+            JSONObject dataObjecty = amresultJsonObject.getJSONObject("datas");
+            JSONArray formdataArray = dataObjecty.getJSONArray("formdata");
             showExP(formdataArray);
-            JSONArray griddataArray = dataObjecty.optJSONArray("griddata");
+            JSONArray griddataArray = dataObjecty.getJSONArray("griddata");
 
             LogUtil.prinlnLongMsg("amresultJsonObject", amresultJsonObject.toString());
             if (formdataArray == null) {
@@ -596,7 +592,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
 
     public void AFshow(String af_result) {
         try {
-            JSONObject resultJsonObject = new JSONObject(af_result);
+            JSONObject resultJsonObject =JSON.parseObject(af_result);
             //JSONArray dailynodeArray = resultJsonObject.getJSONArray("nodes");
             if (resultJsonObject == null) {
                 appflow_lv.setVisibility(View.GONE);
@@ -1107,7 +1103,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 int mPosition = (int) parent.getItemIdAtPosition(position);
-                Intent intent = new Intent(mContext, SingleImagePreviewActivity.class);
+                Intent intent = new Intent("com.modular.tool.SingleImagePreviewActivity");
                 intent.putExtra(AppConstant.EXTRA_IMAGE_URI,
                         getImageUrl(CommonUtil.getNumByString(fb_attachs[position])));
                 startActivity(intent);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/ExpenseReimbursementActivity.java → app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/ExpenseReimbursementActivity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.oa;
+package com.uas.appworks.OA.erp.activity;
 
 import android.Manifest;
 import android.annotation.TargetApi;
@@ -56,9 +56,13 @@ import com.core.dao.DBManager;
 import com.core.model.EmployeesEntity;
 import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
+import com.core.utils.CommonUtil;
 import com.core.utils.ToastUtil;
 import com.core.widget.MyListView;
+import com.core.widget.NScrollerGridView;
+import com.core.widget.SquareCenterImageView;
 import com.core.widget.view.Activity.ImgFileListActivity;
+import com.core.widget.view.Activity.MultiImagePreviewActivity;
 import com.core.widget.view.Activity.SelectActivity;
 import com.core.widget.view.MyGridView;
 import com.core.xmpp.utils.AppConstant;
@@ -69,25 +73,18 @@ import com.lidroid.xutils.http.RequestParams;
 import com.lidroid.xutils.http.ResponseInfo;
 import com.lidroid.xutils.http.callback.RequestCallBack;
 import com.lidroid.xutils.http.client.HttpRequest;
-import com.lidroid.xutils.view.annotation.ViewInject;
+import com.me.appworks.R;
 import com.nostra13.universalimageloader.core.ImageLoader;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.oa.CommonDocAMBean;
-import com.xzjmyk.pm.activity.bean.oa.CostBean;
-import com.xzjmyk.pm.activity.bean.oa.CostSingleBean;
-import com.xzjmyk.pm.activity.bean.oa.CostTypeSingleBean;
-import com.xzjmyk.pm.activity.bean.oa.CostUpdatePModel;
-import com.xzjmyk.pm.activity.bean.oa.SaveCostDetailsGridStoreBean;
-import com.xzjmyk.pm.activity.bean.oa.UpdateCostDetailsGridStoreBean;
-import com.xzjmyk.pm.activity.ui.erp.activity.CommonDocDetailsActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.form.FormListSelectActivity;
-import com.xzjmyk.pm.activity.ui.erp.model.oa.AddCostBean;
-import com.xzjmyk.pm.activity.ui.erp.model.oa.CostFormModel;
-import com.xzjmyk.pm.activity.ui.erp.view.NScrollerGridView;
-import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
-import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.view.SquareCenterImageView;
+import com.uas.appworks.OA.erp.activity.form.FormListSelectActivity;
+import com.uas.appworks.OA.erp.model.AddCostBean;
+import com.uas.appworks.OA.erp.model.CommonDocAMBean;
+import com.uas.appworks.OA.erp.model.CostBean;
+import com.uas.appworks.OA.erp.model.CostFormModel;
+import com.uas.appworks.OA.erp.model.CostSingleBean;
+import com.uas.appworks.OA.erp.model.CostTypeSingleBean;
+import com.uas.appworks.OA.erp.model.CostUpdatePModel;
+import com.uas.appworks.OA.erp.model.SaveCostDetailsGridStoreBean;
+import com.uas.appworks.OA.erp.model.UpdateCostDetailsGridStoreBean;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -105,20 +102,15 @@ import java.util.regex.Pattern;
  */
 
 public class ExpenseReimbursementActivity extends BaseActivity implements View.OnClickListener{
-    @ViewInject(R.id.reimbursement_title_fet)
     private FormEditText reimbursement_title_fet;
-    @ViewInject(R.id.reimbursement_type_fet)
     private FormEditText reimbursement_type_fet;
-    @ViewInject(R.id.reimbursement_currency_fet)
     private FormEditText reimbursement_currency_fet;
-    @ViewInject(R.id.btn_save)
     private Button btn_save;
-    @ViewInject(R.id.gv_details_list)
     private NScrollerGridView gv_details_list;
-    @ViewInject(R.id.sum_money_tv)
     private TextView sum_money_tv;
-    @ViewInject(R.id.detail_table_ll)
     private LinearLayout detail_table_ll;
+    private MyListView table_details_list;
+    private TextView add_details_tv;
     private MyGridView mGridView;
     private GridViewAdapter mAdapter;
     private ArrayList<String> mPhotoList;
@@ -131,10 +123,7 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
     private PopupWindow setCalculatorWindow = null;
     private Button btn_sure;
     private int VERSION_CODES;
-    @ViewInject(R.id.table_details_list)
-    private MyListView table_details_list;
-    @ViewInject(R.id.add_details_tv)
-    private TextView add_details_tv;
+
     private DetailsTableAdapter dtAdapter;
     private GridDataAdapter gAdapter;
     private List<String> selected_detailsData; //点击后要返回的消费明细类型
@@ -317,10 +306,10 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
                 case 0x12:
                     if (StringUtil.isEmpty(result)) break;
                     if (!StringUtil.isEmpty(result) && JSONUtil.validate(result)) {
-                        com.alibaba.fastjson.JSONObject object = JSON.parseObject(result);
+                        JSONObject object = JSON.parseObject(result);
                         if (object.containsKey("assigns")) {
                             JSONArray array = JSON.parseObject(result).getJSONArray("assigns");
-                            com.alibaba.fastjson.JSONObject o = array.getJSONObject(0);
+                            JSONObject o = array.getJSONObject(0);
                             String noid = "";
                             if (o != null && o.containsKey("JP_NODEID")) {
                                 noid = o.getString("JP_NODEID");
@@ -418,7 +407,9 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
         initPicturesEvent();   //添加发票事件
     }
     private void initView() {
-        VERSION_CODES = android.os.Build.VERSION.SDK_INT;
+        VERSION_CODES = Build.VERSION.SDK_INT;
+
+        initids();
         reimbursement_title_fet.setOnClickListener(this);
 
         reimbursement_type_fet.setKeyListener(null);
@@ -472,6 +463,18 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
         }
     }
 
+    private void initids() {
+        reimbursement_title_fet = (FormEditText) findViewById(R.id.reimbursement_title_fet);
+        reimbursement_type_fet = (FormEditText) findViewById(R.id.reimbursement_type_fet);
+        reimbursement_currency_fet  = (FormEditText) findViewById(R.id.reimbursement_currency_fet);
+        btn_save= (Button) findViewById(R.id.btn_save);
+        gv_details_list = (NScrollerGridView) findViewById(R.id.gv_details_list);
+        sum_money_tv= (TextView) findViewById(R.id.sum_money_tv);
+        detail_table_ll= (LinearLayout) findViewById(R.id.detail_table_ll);
+        table_details_list = (MyListView) findViewById(R.id.table_details_list);
+        add_details_tv = (TextView) findViewById(R.id.add_details_tv);
+    }
+
     /**
      * //获取发票图片路径接口
      */
@@ -841,143 +844,132 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
 
     @Override
     public void onClick(View v) {
-        switch (v.getId()){
-            case R.id.reimbursement_type_fet:
-                LogUtil.prinlnLongMsg("combdatasType",JSON.toJSONString(costtypesinglebeanList));
-                if(ListUtils.isEmpty(costtypesinglebeanList)) {
-                    ToastMessage(getString(R.string.crm_nodatas));
-                    break;
-                }
-                doTypeSingleSelect(costtypesinglebeanList,2,getString(R.string.Reimbursement_type),SELECT_REIMBURSEMENT_TYPE);
-                break;
-            case R.id.reimbursement_currency_fet:
-                LogUtil.prinlnLongMsg("combdatasMoney",JSON.toJSONString(money_combdatas));
-                if(money_combdatas == null) {
-                    ToastMessage(getString(R.string.crm_nodatas));
-                    break;
-                }
-                doSingleSelect(money_combdatas,2,getString(R.string.currency),SELECT_CURRENCY);
-                break;
-            case R.id.add_details_tv:
-                if ("S".equals(dg_type)) {
-                    showEditWindow();
-//                }else if ("DF".equals(dg_type)){
-                }else {
-                    showPopupWindow();
-                }
-                putDownInput();
-                break;
-            case R.id.automatic_calculation_tv:
-                doAutoCalculateJudge();
-                break;
-            case R.id.i_calculation_tv:
-                showCalculationWindow();
-                break;
-            case R.id.btn_save:
-                doSaveJudge();
-                break;
-
-            // 计算器点击事件
-            case R.id.c_0:  c_onclick("0"); break;
-            case R.id.c_1:  c_onclick("1"); break;
-            case R.id.c_2:  c_onclick("2"); break;
-            case R.id.c_3:  c_onclick("3"); break;
-            case R.id.c_4:  c_onclick("4"); break;
-            case R.id.c_5:  c_onclick("5"); break;
-            case R.id.c_6:  c_onclick("6"); break;
-            case R.id.c_7:  c_onclick("7"); break;
-            case R.id.c_8:  c_onclick("8"); break;
-            case R.id.c_9:  c_onclick("9"); break;
-            case R.id.c_point:
-                if (StringUtil.isEmpty(c_edit.getText().toString())) break;
-                if (!StringUtil.isEmpty(c_edit.getText().toString()) && c_edit.getText().toString().contains(".")){
-                    break;
-                }
-
-                if (StringUtil.isEmpty(c_edit.getText().toString()) && StringUtil.isEmpty(c_result.getText().toString())){
-                    break;
-                }
-                c_onclick("."); break;
-            case R.id.c_c:
-                num1=0;num2=0;
-                Result=0;//计算结果
-                op=0;//判断操作数，
-                c_result.setText(null);
-                c_edit.setText(null);
-                break;
-            case R.id.c_add:
-                String stringadd = c_edit.getText().toString();
-                if (!StringUtil.isEmpty(stringadd)){
-                    num1 = Double.valueOf(stringadd);
-                    Result = Result + num1;
-                }
-                c_edit.setText(null);
-                c_result.setText(Result+"");
-                op=1;
-                isClickEqu=false;
-                break;
-            case R.id.c_cancel:
-                num1=0;num2=0;
-                Result=0;//计算结果
-                op=0;//判断操作数，
-                c_result.setText(null);
-                c_edit.setText(null);
-                closeCalculatorWindow();
-                break;
-            case R.id.c_equal:
-//                if (isClickEqu) break;
-                String stringresult = c_result.getText().toString();
-                String nowedit = c_edit.getText().toString();
-
-                if (StringUtil.isEmpty(stringresult)){
-                    if(!StringUtil.isEmpty(nowedit)){
-                        costFormModel_list.get(et_position).setCost_money(CommonUtil.getTwoPointDouble(Double.valueOf(nowedit)));
-                        dtAdapter.notifyDataSetChanged();
-                        doAutoCalculateJudge();
-                        c_edit.setText(null);
-                        closeCalculatorWindow();
-                    }else {
-                        ToastMessage("请输入");
-                    }
+       if (v.getId() == R.id.reimbursement_type_fet){
+            LogUtil.prinlnLongMsg("combdatasType",JSON.toJSONString(costtypesinglebeanList));
+            if(ListUtils.isEmpty(costtypesinglebeanList)) {
+                ToastMessage(getString(R.string.crm_nodatas));
+                return;
+            }
+            doTypeSingleSelect(costtypesinglebeanList,2,getString(R.string.Reimbursement_type),SELECT_REIMBURSEMENT_TYPE);
 
-                }else{
-                    Result = Double.valueOf(stringresult);
-                    if (!StringUtil.isEmpty(nowedit)){
-                        num2=Double.valueOf(nowedit);
-                        c_result.setText(null);
-                        switch (op) {
-                            case 0: Result=num2;    break;
-                            case 1: Result=Result+num2;   break;
-                            case 2: Result=Result-num2;   break;
-                            default:    Result=0;   break;
-                        }
-                        c_edit.setText(null);
-                        c_result.setText(String.valueOf(Result));
-                    }
-                    isClickEqu=true;
-                    costFormModel_list.get(et_position).setCost_money(CommonUtil.getTwoPointDouble(Double.valueOf(Result)));
+        }else if (v.getId() == R.id.reimbursement_currency_fet){
+            LogUtil.prinlnLongMsg("combdatasMoney",JSON.toJSONString(money_combdatas));
+            if(money_combdatas == null) {
+                ToastMessage(getString(R.string.crm_nodatas));
+                return;
+            }
+            doSingleSelect(money_combdatas,2,getString(R.string.currency),SELECT_CURRENCY);
+        }else if (v.getId() == R.id.add_details_tv){
+            if ("S".equals(dg_type)) {
+                showEditWindow();
+//                }else if ("DF".equals(dg_type)){
+            }else {
+                showPopupWindow();
+            }
+            putDownInput();
+        }else if (v.getId() == R.id.automatic_calculation_tv){
+            doAutoCalculateJudge();
+        }else if (v.getId() == R.id.i_calculation_tv){
+            showCalculationWindow();
+        }else if (v.getId() ==  R.id.btn_save){
+            doSaveJudge();
+        }else if (v.getId() == R.id.c_0){
+            c_onclick("0");
+        }else if (v.getId() == R.id.c_1){
+            c_onclick("1");
+        }else if (v.getId() == R.id.c_2){
+            c_onclick("2");
+        }else if (v.getId() == R.id.c_3){
+            c_onclick("3");
+        }else if (v.getId() == R.id.c_4){
+            c_onclick("4");
+        }else if (v.getId() == R.id.c_5){
+            c_onclick("5");
+        }else if (v.getId() == R.id.c_6){
+            c_onclick("6");
+        }else if (v.getId() == R.id.c_7){
+            c_onclick("7");
+        }else if (v.getId() == R.id.c_8){
+            c_onclick("8");
+        }else if (v.getId() == R.id.c_9){
+            c_onclick("9");
+        }else if (v.getId() == R.id.c_point){
+            if (StringUtil.isEmpty(c_edit.getText().toString()))return;
+            if (!StringUtil.isEmpty(c_edit.getText().toString()) && c_edit.getText().toString().contains("."))return;
+            if (StringUtil.isEmpty(c_edit.getText().toString()) && StringUtil.isEmpty(c_result.getText().toString()))return;
+            c_onclick(".");
+        }else if (v.getId() == R.id.c_c){
+            num1=0;num2=0;
+            Result=0;//计算结果
+            op=0;//判断操作数，
+            c_result.setText(null);
+            c_edit.setText(null);
+        }else if (v.getId() == R.id.c_add){
+            String stringadd = c_edit.getText().toString();
+            if (!StringUtil.isEmpty(stringadd)){
+                num1 = Double.valueOf(stringadd);
+                Result = Result + num1;
+            }
+            c_edit.setText(null);
+            c_result.setText(Result+"");
+            op=1;
+            isClickEqu=false;
+        }else if (v.getId() == R.id.c_cancel){
+            num1=0;num2=0;
+            Result=0;//计算结果
+            op=0;//判断操作数，
+            c_result.setText(null);
+            c_edit.setText(null);
+            closeCalculatorWindow();
+        }else if (v.getId() == R.id.c_equal){
+            String stringresult = c_result.getText().toString();
+            String nowedit = c_edit.getText().toString();
+
+            if (StringUtil.isEmpty(stringresult)){
+                if(!StringUtil.isEmpty(nowedit)){
+                    costFormModel_list.get(et_position).setCost_money(CommonUtil.getTwoPointDouble(Double.valueOf(nowedit)));
                     dtAdapter.notifyDataSetChanged();
                     doAutoCalculateJudge();
-                    c_result.setText(null);
+                    c_edit.setText(null);
                     closeCalculatorWindow();
-
+                }else {
+                    ToastMessage("请输入");
                 }
-                num1=0;num2=0;
-                Result=0;//计算结果
-                op=0;//判断操作数，
-                c_result.setText(null);
-                c_edit.setText(null);
-                break;
 
-            case R.id.c_backspace:
-                String myStr=c_edit.getText().toString();
-                try {
-                    c_edit.setText(myStr.substring(0, myStr.length()-1));
-                } catch (Exception e) {
-                    c_edit.setText("");
+            }else{
+                Result = Double.valueOf(stringresult);
+                if (!StringUtil.isEmpty(nowedit)){
+                    num2=Double.valueOf(nowedit);
+                    c_result.setText(null);
+                    switch (op) {
+                        case 0: Result=num2;    break;
+                        case 1: Result=Result+num2;   break;
+                        case 2: Result=Result-num2;   break;
+                        default:    Result=0;   break;
+                    }
+                    c_edit.setText(null);
+                    c_result.setText(String.valueOf(Result));
                 }
-                break;
+                isClickEqu=true;
+                costFormModel_list.get(et_position).setCost_money(CommonUtil.getTwoPointDouble(Double.valueOf(Result)));
+                dtAdapter.notifyDataSetChanged();
+                doAutoCalculateJudge();
+                c_result.setText(null);
+                closeCalculatorWindow();
 
+            }
+            num1=0;num2=0;
+            Result=0;//计算结果
+            op=0;//判断操作数，
+            c_result.setText(null);
+            c_edit.setText(null);
+        }else if (v.getId() == R.id.c_backspace){
+            String myStr=c_edit.getText().toString();
+            try {
+                c_edit.setText(myStr.substring(0, myStr.length()-1));
+            } catch (Exception e) {
+                c_edit.setText("");
+            }
         }
     }
     private PopupWindow etpopupWindow = null;
@@ -1855,7 +1847,7 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
                             if (mCostUpdatePModel != null && !ListUtils.isEmpty(mCostUpdatePModel.getFiles())
                                     && mPosition < mCostUpdatePModel.getFiles().size()){
 //                                Toast.makeText(ct,"下载的图片，不可与本地选择的图片滑动查看",Toast.LENGTH_LONG).show();
-                                Intent intent = new Intent(mContext, SingleImagePreviewActivity.class);
+                                Intent intent = new Intent("com.modular.tool.SingleImagePreviewActivity");
                                 intent.putExtra(AppConstant.EXTRA_IMAGE_URI,
                                         getImageUrl(mCostUpdatePModel.getFiles().get(mPosition).getFp_id()));
                                 startActivity(intent);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/DataFormDetailActivity.java → app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/form/DataFormDetailActivity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.form;
+package com.uas.appworks.OA.erp.activity.form;
 
 import android.app.Activity;
 import android.content.Context;
@@ -32,29 +32,28 @@ import com.alibaba.fastjson.JSONObject;
 import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
+import com.common.data.ListUtils;
+import com.common.data.RegexUtil;
 import com.common.data.StringUtil;
 import com.common.preferences.PreferenceUtils;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
 import com.core.app.AppConfig;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
-import com.core.model.SelectBean;
 import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.CommonDocDetailsActivity;
-import com.core.widget.view.Activity.SelectActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectAimActivity;
-import com.xzjmyk.pm.activity.ui.erp.model.form.Data;
-import com.xzjmyk.pm.activity.ui.erp.model.form.GroupData;
-import com.xzjmyk.pm.activity.ui.erp.model.oa.SelectAimModel;
+import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.app.Constants;
-import com.common.data.ListUtils;
-import com.xzjmyk.pm.activity.util.oa.PopupWindowHelper;
-import com.common.data.RegexUtil;
-import com.uas.appcontact.ui.widget.stickylistheaders.ListViewInScroller;
-import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
+import com.core.selectcalendar.SelectCalendarActivity;
+import com.core.selectcalendar.bean.Data;
+import com.core.utils.CommonUtil;
+import com.core.utils.helper.PopupWindowHelper;
+import com.core.utils.timeutils.wheel.DateTimePicker;
+import com.core.widget.view.Activity.SelectActivity;
+import com.core.widget.view.ListViewInScroller;
+import com.core.widget.view.model.SelectAimModel;
+import com.lidroid.xutils.ViewUtils;
+import com.me.appworks.R;
+import com.uas.appworks.OA.erp.activity.CommonDocDetailsActivity;
+import com.uas.appworks.OA.erp.model.form.GroupData;
 
 import java.text.DecimalFormat;
 import java.text.ParseException;
@@ -80,9 +79,13 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
 
 
     private boolean isLeave = true;
-
-    @ViewInject(R.id.lv_datas)
     private ListViewInScroller lv_datas;
+    private TextView tv_item_add;
+    private Button click_btn;
+    private Button btn_update;
+    private LinearLayout ll_item_add;
+    private LinearLayout ll_top;
+
     private String caller = "";
 
     private DataAdapter mAdapter;
@@ -93,20 +96,6 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
     private ArrayList<GroupData> mDatasNet = new ArrayList<>();//网络数据
 
     private JSONArray grids;
-
-    @ViewInject(R.id.tv_item_add)
-    private TextView tv_item_add;
-
-    @ViewInject(R.id.click_btn)
-    private Button click_btn;
-    @ViewInject(R.id.btn_update)
-    private Button btn_update;
-
-    @ViewInject(R.id.ll_item_add)
-    private LinearLayout ll_item_add;
-    @ViewInject(R.id.ll_top)
-    private LinearLayout ll_top;
-
     private String formidkey = "";
     private String detailkey_id = "";
     private String detailkey_did = "";
@@ -637,6 +626,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
     private void initView() {
         ViewUtils.inject(this);
         Intent intent = getIntent();
+        initIds();
         formid = 0;
         if (intent != null) {
             formid = intent.getIntExtra("id", 0);
@@ -734,6 +724,15 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
 //        });
     }
 
+    private void initIds() {
+        lv_datas = (ListViewInScroller) findViewById(R.id.lv_datas);
+        tv_item_add = (TextView) findViewById(R.id.tv_item_add);
+        click_btn = (Button) findViewById(R.id.click_btn);
+        btn_update = (Button) findViewById(R.id.btn_update);
+        ll_item_add = (LinearLayout) findViewById(R.id.ll_item_add);
+        ll_top = (LinearLayout) findViewById(R.id.ll_top);
+    }
+
     private void initListener() {
         ll_item_add.setOnClickListener(this);
         click_btn.setOnClickListener(this);
@@ -768,52 +767,47 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.oa_signin_set:
-                ArrayList<Data> fields = new ArrayList<>();
-                ArrayList<Data> fieldsDis = new ArrayList<>();
-                LogUtil.d(JSON.toJSONString(mDatasNet));
-                for (int i = 0; i < mDatasNet.size(); i++) {
-                    GroupData group = mDatasNet.get(i);
-                    for (int j = 0; j < group.getDatas().size(); j++) {
-                        if (group.getDatas().get(j).getIsDefault() == 0) {//隐藏的字段
-                            fields.add(group.getDatas().get(j));
-                        }
+        if (item.getItemId() == R.id.oa_signin_set){
+            ArrayList<Data> fields = new ArrayList<>();
+            ArrayList<Data> fieldsDis = new ArrayList<>();
+            LogUtil.d(JSON.toJSONString(mDatasNet));
+            for (int i = 0; i < mDatasNet.size(); i++) {
+                GroupData group = mDatasNet.get(i);
+                for (int j = 0; j < group.getDatas().size(); j++) {
+                    if (group.getDatas().get(j).getIsDefault() == 0) {//隐藏的字段
+                        fields.add(group.getDatas().get(j));
                     }
-
                 }
-                for (int i = 0; i < mDatas.size(); i++) {
-                    GroupData group = mDatas.get(i);
-                    for (int j = 0; j < group.getDatas().size(); j++) {
-                        if (group.getDatas().get(j).getIsDefault() == -1) {//显示的字段
-                            fieldsDis.add(group.getDatas().get(j));
-                        }
-                    }
 
+            }
+            for (int i = 0; i < mDatas.size(); i++) {
+                GroupData group = mDatas.get(i);
+                for (int j = 0; j < group.getDatas().size(); j++) {
+                    if (group.getDatas().get(j).getIsDefault() == -1) {//显示的字段
+                        fieldsDis.add(group.getDatas().get(j));
+                    }
                 }
-                startActivityForResult(new Intent(this, DataFormFieldActivity.class)
-                                .putParcelableArrayListExtra("fields", fields)
-                                .putParcelableArrayListExtra("fieldsDis", fieldsDis)
-                                .putExtra("caller", caller),
-                        0x25);
 
-                break;
-            case R.id.oa_leave:
-                startActivity(new Intent(mContext, FormListSelectActivity.class)
-                        .putExtra("caller",
-                                caller)
-                        .putExtra("title", getSupportActionBar().getTitle().toString()));
-                if (formid != 0) {
-                    finish();
-                }
-                break;
-            case android.R.id.home:
-                if ("在录入".equals(status)) {
-                    FormListSelectActivity.reload = false;
-                } else if ("已提交".equals(status)) {
-                    FormListSelectActivity.reload = true;
-                }
-                break;
+            }
+            startActivityForResult(new Intent(this, DataFormFieldActivity.class)
+                            .putParcelableArrayListExtra("fields", fields)
+                            .putParcelableArrayListExtra("fieldsDis", fieldsDis)
+                            .putExtra("caller", caller),
+                    0x25);
+        }else if (item.getItemId() == R.id.oa_leave){
+            startActivity(new Intent(mContext, FormListSelectActivity.class)
+                    .putExtra("caller",
+                            caller)
+                    .putExtra("title", getSupportActionBar().getTitle().toString()));
+            if (formid != 0) {
+                finish();
+            }
+        }else if (item.getItemId() == android.R.id.home){
+            if ("在录入".equals(status)) {
+                FormListSelectActivity.reload = false;
+            } else if ("已提交".equals(status)) {
+                FormListSelectActivity.reload = true;
+            }
         }
         return super.onOptionsItemSelected(item);
     }
@@ -844,18 +838,13 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
 
     @Override
     public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.ll_item_add:
-                addGridItemData();
-                break;
-            case R.id.click_btn:
-                if (formid == 0) {
-                    commit();
-                }
-                break;
-            case R.id.btn_update:
-                updata();
-                break;
+        if (v.getId() == R.id.ll_item_add){
+            addGridItemData();
+        }else if (v.getId() == R.id.click_btn){
+            if (formid == 0)
+                commit();
+        }else if (v.getId() == R.id.btn_update){
+            updata();
         }
     }
 
@@ -1229,7 +1218,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                             if (data.getType().equals("DF")) {
                                 if ("fpd_d5".equals(data.getField())){
                                     //出差单 客户名称联动操作特殊处理
-                                    Intent intent = new Intent(ct, SelectAimActivity.class)
+                                    Intent intent = new Intent("com.modular.form.SelectAimActivity")
                                             .putExtra("groupId", data.getGroupId());
                                    currentGroupId= data.getGroupId();
                                     startActivityForResult(intent, 0x23);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/DataFormFieldActivity.java → app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/form/DataFormFieldActivity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.form;
+package com.uas.appworks.OA.erp.activity.form;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -15,17 +15,16 @@ import com.alibaba.fastjson.JSON;
 import com.common.LogUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.tonicartos.widget.stickygridheaders.StickyGridHeadersGridView;
-import com.xzjmyk.pm.activity.R;
 import com.core.app.Constants;
 import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.adapter.StickyGridAdapter;
-import com.xzjmyk.pm.activity.ui.erp.model.form.Data;
 import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.view.gridview.MyStickyGridHeadersGridView;
+import com.core.selectcalendar.bean.Data;
+import com.core.utils.CommonUtil;
+import com.core.widget.view.MyStickyGridHeadersGridView;
+import com.core.widget.view.adapter.adapter.StickyGridAdapter;
+import com.lidroid.xutils.ViewUtils;
+import com.me.appworks.R;
+import com.tonicartos.widget.stickygridheaders.StickyGridHeadersGridView;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -40,19 +39,10 @@ import java.util.Map;
 public class DataFormFieldActivity extends BaseActivity implements AdapterView.OnItemClickListener,
         StickyGridHeadersGridView.OnHeaderClickListener, StickyGridHeadersGridView.OnHeaderLongClickListener {
 
-    @ViewInject(R.id.asset_grid)
     private MyStickyGridHeadersGridView mGridView;
-
-    @ViewInject(R.id.asset_grid_delete)
     private MyStickyGridHeadersGridView mDGridView;
-
-
-    @ViewInject(R.id.bt_save)
     private Button bt_save;
-
-    @ViewInject(R.id.ll_hide)
     private LinearLayout ll_hide;
-    @ViewInject(R.id.ll_add)
     private LinearLayout ll_add;
     private StickyGridAdapter mAdapter;
     private StickyGridAdapter mDadapter;
@@ -70,6 +60,12 @@ public class DataFormFieldActivity extends BaseActivity implements AdapterView.O
 
     private void initView() {
         Intent intent = getIntent();
+        mGridView = (MyStickyGridHeadersGridView) findViewById(R.id.asset_grid);
+        mDGridView = (MyStickyGridHeadersGridView) findViewById(R.id.asset_grid_delete);
+        bt_save = (Button) findViewById(R.id.bt_save);
+        ll_hide = (LinearLayout) findViewById(R.id.ll_hide);
+        ll_add = (LinearLayout) findViewById(R.id.ll_add);
+
         if (intent != null) {
             List<Data> fields = (List) intent.getParcelableArrayListExtra("fields");//传递数据
             List<Data> fieldsDis = (List) intent.getParcelableArrayListExtra("fieldsDis");//传递数据

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/FormListSelectActivity.java → app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/form/FormListSelectActivity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.form;
+package com.uas.appworks.OA.erp.activity.form;
 
 import android.annotation.SuppressLint;
 import android.app.DatePickerDialog;
@@ -33,23 +33,17 @@ import com.common.LogUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.core.base.BaseActivity;
+import com.core.net.http.HttpClient;
+import com.core.utils.CommonUtil;
 import com.core.utils.FlexJsonUtil;
 import com.core.widget.EmptyLayout;
 import com.core.widget.VoiceSearchView;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.activity.CommonDocDetailsActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.ExtraLeaveActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.LeaveActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.SaleDetailActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.TravelActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.WorkExtraActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.oa.ExpenseReimbursementActivity;
-import com.xzjmyk.pm.activity.ui.erp.net.HttpClient;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.me.appworks.R;
+import com.uas.appworks.OA.erp.activity.CommonDocDetailsActivity;
+import com.uas.appworks.OA.erp.activity.ExpenseReimbursementActivity;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -65,11 +59,9 @@ import java.util.Map;
 public class FormListSelectActivity extends BaseActivity implements View.OnClickListener  {
 
     public static boolean isdelete = false;//删除标志位
-    @ViewInject(R.id.lv_sale_list)
     private PullToRefreshListView mlistview;
-    @ViewInject(R.id.voiceSearchView)
     private VoiceSearchView voiceSearchView;
-
+    private ImageView ivDeleteText;
     private EmptyLayout mEmptyLayout;
     private EmptyLayout mEmptyMenu;
 
@@ -77,8 +69,6 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
     private SimpleAdapter radapter;
     private StateBroadcast sBroadcast;
     private String key;// 筛选条件key
-    @ViewInject(R.id.iv_DeleteText)
-    private ImageView ivDeleteText;
     private Calendar calendar;
     private DatePickerDialog dialog;
     private String from;//来自具体的哪个页面
@@ -172,11 +162,18 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
         ViewUtils.inject(this);
         mEmptyLayout = new EmptyLayout(this, mlistview.getRefreshableView());
         mEmptyLayout.setEmptyButtonClickListener(mErrorClickListener);
+        initIDs();
         initView();
         LogUtil.d("onCreate()");
         initData();
     }
 
+    private void initIDs() {
+        mlistview = (PullToRefreshListView) findViewById(R.id.lv_sale_list);
+        voiceSearchView = (VoiceSearchView) findViewById(R.id.voiceSearchView);
+        ivDeleteText = (ImageView) findViewById(R.id.iv_DeleteText);
+    }
+
 
     private void initView() {
         Intent intent = getIntent();

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/ComDocGriddataOutAdapter.java → app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/adapter/ComDocGriddataOutAdapter.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.adapter;
+package com.uas.appworks.OA.erp.adapter;
 
 import android.content.Context;
 import android.text.TextUtils;
@@ -7,16 +7,16 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.oa.CommonDocAMBean;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONException;
+import com.core.utils.CommonUtil;
 import com.core.widget.MyListView;
-
-import org.json.JSONArray;
-import org.json.JSONException;
+import com.me.appworks.R;
+import com.uas.appworks.OA.erp.model.CommonDocAMBean;
 
 import java.util.List;
 
+
 /**
  * Created by FANGlh on 2016/11/27.
  */
@@ -61,7 +61,7 @@ public class ComDocGriddataOutAdapter extends BaseAdapter {
 
     @Override
     public int getCount() {
-        return griddataBeans == null ? 0 : griddataBeans.length();
+        return griddataBeans == null ? 0 : griddataBeans.size();
     }
 
     @Override

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/ComGriddataInsideAdapter.java → app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/adapter/ComGriddataInsideAdapter.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.adapter;
+package com.uas.appworks.OA.erp.adapter;
 
 import android.content.Context;
 import android.util.Log;
@@ -7,15 +7,14 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.oa.CommonDocAMBean;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
+import com.alibaba.fastjson.JSONException;
+import com.alibaba.fastjson.JSONObject;
+import com.me.appworks.R;
+import com.uas.appworks.OA.erp.model.CommonDocAMBean;
 
 import java.util.List;
 
+
 /**
  * Created by FANGlh on 2016/11/27.
  */

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/CommonDocMainMsgAdapter.java → app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/adapter/CommonDocMainMsgAdapter.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.adapter;
+package com.uas.appworks.OA.erp.adapter;
 
 import android.content.Context;
 import android.util.Log;
@@ -7,11 +7,10 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.oa.CommonDocAMBean;
-
-import org.json.JSONArray;
-import org.json.JSONException;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONException;
+import com.me.appworks.R;
+import com.uas.appworks.OA.erp.model.CommonDocAMBean;
 
 import java.util.List;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/model/oa/AddCostBean.java → app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/model/AddCostBean.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.model.oa;
+package com.uas.appworks.OA.erp.model;
 
 /**
  * Created by FANGlh on 2017/6/14.

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/oa/CommonDocAMBean.java → app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/model/CommonDocAMBean.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.bean.oa;
+package com.uas.appworks.OA.erp.model;
 
 import java.util.List;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/oa/CostBean.java → app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/model/CostBean.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.bean.oa;
+package com.uas.appworks.OA.erp.model;
 
 import java.util.List;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/model/oa/CostFormModel.java → app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/model/CostFormModel.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.model.oa;
+package com.uas.appworks.OA.erp.model;
 
 /**
  * Created by FANGlh on 2017/6/12.

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/oa/CostSingleBean.java → app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/model/CostSingleBean.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.bean.oa;
+package com.uas.appworks.OA.erp.model;
 
 import java.util.List;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/oa/CostTypeSingleBean.java → app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/model/CostTypeSingleBean.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.bean.oa;
+package com.uas.appworks.OA.erp.model;
 
 /**
  * Created by FANGlh on 2017/6/19.

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/oa/CostUpdatePModel.java → app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/model/CostUpdatePModel.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.bean.oa;
+package com.uas.appworks.OA.erp.model;
 
 import java.util.List;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/oa/SaveCostDetailsGridStoreBean.java → app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/model/SaveCostDetailsGridStoreBean.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.bean.oa;
+package com.uas.appworks.OA.erp.model;
 
 /**
  * Created by FANGlh on 2017/6/14.

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/oa/UpdateCostDetailsGridStoreBean.java → app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/model/UpdateCostDetailsGridStoreBean.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.bean.oa;
+package com.uas.appworks.OA.erp.model;
 
 /**
  * Created by FANGlh on 2017/6/14.

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/model/form/GroupData.java

@@ -0,0 +1,100 @@
+package com.uas.appworks.OA.erp.model.form;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import com.core.selectcalendar.bean.Data;
+
+import java.util.ArrayList;
+
+/**
+ * @desc:分组实体类
+ * @author：Arison on 2016/11/14
+ */
+public class GroupData implements Parcelable {
+
+    private int id;
+    private String name;
+    private ArrayList<Data> datas = new ArrayList<>();
+   
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public ArrayList<Data> getDatas() {
+        return datas;
+    }
+
+    public void setDatas(ArrayList<Data> datas) {
+        this.datas = datas;
+    }
+
+    /**
+     * 获取Item内容
+     *
+     * @param pPosition
+     * @return
+     */
+    public Object getItem(int pPosition) {
+        // Category排在第一位  
+        if (pPosition == 0) {
+            return this;
+        } else {
+            return datas.get(pPosition - 1);
+        }
+    }
+
+    /**
+     * 当前类别Item总数。分组也需要占用一个Item
+     *
+     * @return
+     */
+    public int getItemCount() {
+        return datas.size() + 1;
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeInt(this.id);
+        dest.writeString(this.name);
+        dest.writeTypedList(this.datas);
+    }
+
+    public GroupData() {
+    }
+
+    protected GroupData(Parcel in) {
+        this.id = in.readInt();
+        this.name = in.readString();
+        this.datas = in.createTypedArrayList(Data.CREATOR);
+    }
+
+    public static final Creator<GroupData> CREATOR = new Creator<GroupData>() {
+        @Override
+        public GroupData createFromParcel(Parcel source) {
+            return new GroupData(source);
+        }
+
+        @Override
+        public GroupData[] newArray(int size) {
+            return new GroupData[size];
+        }
+    };
+}