预约模块的分离

WeiChat/build.gradle

@@ -118,6 +118,7 @@ dependencies {
     compile project(':appcontact')
     compile project(':appme')
     compile project(':appworks')
+    compile project(":appbooking")
     compile 'com.squareup.okhttp3:okhttp:3.8.1'
     compile project(':android-pdf-viewer')
 }

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

@@ -43,7 +43,7 @@ import com.lidroid.xutils.view.annotation.ViewInject;
 import com.uas.appcontact.model.contacts.ContactsModel;
 import com.uas.appcontact.ui.activity.ContactsActivity;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.model.book.BookingModel;
+import com.modular.booking.model.BookingModel;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import java.util.ArrayList;

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

@@ -44,7 +44,7 @@ import com.uas.appworks.OA.erp.model.SelectCollisionTurnBean;
 import com.uas.appworks.OA.erp.model.SelectEmUser;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectCollisionActivity;
-import com.xzjmyk.pm.activity.ui.erp.model.book.BookingModel;
+import com.modular.booking.model.BookingModel;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import java.util.HashMap;

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

@@ -19,26 +19,25 @@ import com.alibaba.fastjson.JSONObject;
 import com.common.LogUtil;
 import com.common.data.CalendarUtil;
 import com.common.data.DateFormatUtil;
+import com.common.data.ListUtils;
 import com.common.data.StringUtil;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.MainActivity;
+import com.core.base.HttpImp;
 import com.core.base.OABaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.adapter.booking.BookAdapter;
-import com.xzjmyk.pm.activity.ui.erp.adapter.oa.OACalenderViewPagerAdapter;
-import com.xzjmyk.pm.activity.ui.erp.model.book.BookingModel;
-import com.xzjmyk.pm.activity.ui.erp.model.book.SureBookModel;
 import com.core.net.http.ViewUtil;
-import com.core.base.HttpImp;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.app.Constants;
-import com.common.data.ListUtils;
+import com.core.selectcalendar.OACalendarView;
+import com.core.utils.CommonUtil;
 import com.core.widget.CustomerScrollView;
 import com.core.widget.EmptyLayout;
 import com.core.widget.MyListView;
-import com.core.selectcalendar.OACalendarView;
+import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
+import com.modular.booking.adapter.BookAdapter;
+import com.modular.booking.model.BookingModel;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.MainActivity;
+import com.xzjmyk.pm.activity.ui.erp.adapter.oa.OACalenderViewPagerAdapter;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -77,7 +76,6 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
     private BookAdapter mAdapter;
     private OACalendarView calendarView;
     private OACalenderViewPagerAdapter pagerAdapter;//当前Viewpager适配器
-    private List<SureBookModel> mSureBookModel;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -86,18 +84,6 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
         ViewUtils.inject(this);
         initView();
         initEvent();
-        // TODO test
-       /* mSureBookModel = new ArrayList<>();
-        DepositNoticeUtil m = new DepositNoticeUtil();
-        m.loadDepostNotice();
-        new Handler().postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                mSureBookModel = DepositNoticeUtil.getsureBookData();
-                Lg.prinlnLongMsg("mSureBookModel",JSON.toJSONString(mSureBookModel));
-            }
-        },2000);*/
-        // TODO test
     }
 
 
@@ -126,13 +112,13 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_nearby, menu);
+        getMenuInflater().inflate(R.menu.menu_about, menu);
         return super.onCreateOptionsMenu(menu);
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.search) {
+        if (item.getItemId() ==R.id.app_about) {
             startActivity(new Intent(mContext, BookingAddActivity.class));
         }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/booking/BookAdapter.java

@@ -9,8 +9,8 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.common.data.DateFormatUtil;
+import com.modular.booking.model.BookingModel;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.model.book.BookingModel;
 
 import java.util.ArrayList;
 import java.util.Date;

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/dialog/QSComShowPpUtils.java

@@ -24,7 +24,7 @@ import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.secretary.BookingDetailActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.QSCModel;
-import com.xzjmyk.pm.activity.ui.erp.model.book.BookingModel;
+import com.modular.booking.model.BookingModel;
 import com.common.data.ListUtils;
 import com.core.widget.MyListView;
 import com.core.app.MyActivityManager;

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/dialog/QSearchPpwindowUtils.java

@@ -30,7 +30,7 @@ import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
 import com.core.app.Constants;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.QSCModel;
-import com.xzjmyk.pm.activity.ui.erp.model.book.BookingModel;
+import com.modular.booking.model.BookingModel;
 import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.utils.RecognizerDialogUtil;

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

@@ -5,8 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fillViewport="true"
-    android:descendantFocusability="blocksDescendants"
-    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.secretary.BookingListActivity">
+    android:descendantFocusability="blocksDescendants">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -17,6 +16,7 @@
             style="@style/crm_ll_card"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
+            android:visibility="gone"
             android:weightSum="2">
 
             <TextView
@@ -39,6 +39,141 @@
                 android:padding="10dp"
                 android:text="@string/booking_shared" />
         </LinearLayout>
+
+        <!--new layout-->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:background="#6A6A6A"
+            android:paddingTop="10dp"
+            android:paddingBottom="10dp">
+            <RelativeLayout
+                android:layout_weight="1"
+                android:layout_width="0dp"
+                android:layout_height="match_parent">
+                <TextView
+                    android:id="@+id/tv_signin_num"
+                    android:layout_width="10dp"
+                    android:layout_height="10dp"
+                    android:layout_marginRight="10dp"
+                    android:background="@drawable/hongdian"
+                    android:layout_gravity="top|right"
+                    android:gravity="center"
+                    android:text=""
+                    android:textColor="@android:color/white"
+                    android:textSize="10.0dip"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignTop="@+id/signin" />
+                <TextView
+                    android:id="@+id/mbook"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:drawablePadding="@dimen/drawable_padding"
+                    android:drawableTop="@drawable/oa_1"
+                    android:layout_centerInParent="true"
+                    android:text="@string/booking_personal"
+                    android:textColor="@color/white"
+                    android:layout_marginTop="2dp"/>
+            </RelativeLayout>
+            <RelativeLayout
+                android:layout_weight="1"
+                android:layout_width="0dp"
+                android:layout_height="match_parent">
+                <TextView
+                    android:id="@+id/tv_signout_num"
+                    android:layout_width="10dp"
+                    android:layout_height="10dp"
+                    android:layout_marginRight="10dp"
+                    android:background="@drawable/hongdian"
+                    android:layout_gravity="top|right"
+                    android:layout_alignParentRight="true"
+                    android:gravity="center"
+                    android:text=""
+                    android:textColor="@android:color/white"
+                    android:textSize="10.0dip"
+                    />
+                <TextView
+                    android:id="@+id/outoffice"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="2dp"
+                    android:gravity="center"
+                    android:drawablePadding="@dimen/drawable_padding"
+                    android:drawableTop="@drawable/oa_2"
+                    android:layout_centerInParent="true"
+                    android:text="@string/booking_business"
+                    android:textColor="@color/white" />
+            </RelativeLayout>
+
+            <TextView
+                android:id="@+id/worklog"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:layout_weight="1"
+                android:drawablePadding="@dimen/drawable_padding"
+                android:drawableTop="@drawable/oa_4"
+                android:gravity="center"
+                android:text="@string/booking_service"
+                android:textColor="@color/white" />
+            <TextView
+                android:id="@+id/erp"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:layout_weight="1"
+                android:drawablePadding="@dimen/drawable_padding"
+                android:drawableTop="@drawable/oa_5"
+                android:gravity="center"
+                android:text="@string/booking_shared"
+                android:textColor="@color/white" />
+            <LinearLayout
+                android:id="@+id/oamain_more_menu_ll"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:layout_weight="1"
+                android:orientation="vertical"
+                android:paddingLeft="5dp"
+                android:visibility="gone">
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    >
+
+                    <ImageView
+                        android:id="@+id/oamain_more_menu_iv"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:src="@drawable/ic_oa_more" />
+
+                    <TextView
+                        android:id="@+id/oamain_more_menu_hd_tv"
+                        android:layout_width="10dp"
+                        android:layout_height="10dp"
+                        android:layout_gravity="top|right"
+                        android:layout_marginRight="15dp"
+                        android:background="@drawable/hongdian"
+                        android:textColor="@android:color/white"
+                        android:textSize="10.0dip"
+                        />
+                </FrameLayout>
+
+                <TextView
+                    android:id="@+id/more_menu_tv"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    android:gravity="center"
+                    android:text="@string/oamore_tltle"
+                    android:textColor="@color/white" />
+            </LinearLayout>
+
+        </LinearLayout>
         <!--年月日布局-->
         <LinearLayout
             android:layout_width="match_parent"

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

@@ -5,8 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fillViewport="true"
-    android:descendantFocusability="blocksDescendants"
-    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.secretary.BookingListActivity">
+    android:descendantFocusability="blocksDescendants">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -17,6 +16,7 @@
             style="@style/crm_ll_card"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
+            android:visibility="gone"
             android:weightSum="2">
 
             <TextView
@@ -39,6 +39,140 @@
                 android:padding="10dp"
                 android:text="@string/booking_shared" />
         </LinearLayout>
+        
+        <!--new layout-->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:background="#6A6A6A"
+            android:paddingBottom="10dp">
+            <RelativeLayout
+                android:layout_weight="1"
+                android:layout_width="0dp"
+                android:layout_height="match_parent">
+                <TextView
+                    android:id="@+id/tv_signin_num"
+                    android:layout_width="10dp"
+                    android:layout_height="10dp"
+                    android:layout_marginRight="10dp"
+                    android:background="@drawable/hongdian"
+                    android:layout_gravity="top|right"
+                    android:gravity="center"
+                    android:text=""
+                    android:textColor="@android:color/white"
+                    android:textSize="10.0dip"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignTop="@+id/signin" />
+                <TextView
+                    android:id="@+id/mbook"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:drawablePadding="@dimen/drawable_padding"
+                    android:drawableTop="@drawable/oa_1"
+                    android:layout_centerInParent="true"
+                    android:text="@string/oasign_title"
+                    android:textColor="@color/white"
+                    android:layout_marginTop="2dp"/>
+            </RelativeLayout>
+            <RelativeLayout
+                android:layout_weight="1"
+                android:layout_width="0dp"
+                android:layout_height="match_parent">
+                <TextView
+                    android:id="@+id/tv_signout_num"
+                    android:layout_width="10dp"
+                    android:layout_height="10dp"
+                    android:layout_marginRight="10dp"
+                    android:background="@drawable/hongdian"
+                    android:layout_gravity="top|right"
+                    android:layout_alignParentRight="true"
+                    android:gravity="center"
+                    android:text=""
+                    android:textColor="@android:color/white"
+                    android:textSize="10.0dip"
+                    />
+                <TextView
+                    android:id="@+id/outoffice"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="2dp"
+                    android:gravity="center"
+                    android:drawablePadding="@dimen/drawable_padding"
+                    android:drawableTop="@drawable/oa_2"
+                    android:layout_centerInParent="true"
+                    android:text="@string/oaoutplan_title"
+                    android:textColor="@color/white" />
+            </RelativeLayout>
+
+            <TextView
+                android:id="@+id/worklog"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:layout_weight="1"
+                android:drawablePadding="@dimen/drawable_padding"
+                android:drawableTop="@drawable/oa_4"
+                android:gravity="center"
+                android:text="@string/oaworkdaily_title"
+                android:textColor="@color/white" />
+            <TextView
+                android:id="@+id/erp"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:layout_weight="1"
+                android:drawablePadding="@dimen/drawable_padding"
+                android:drawableTop="@drawable/oa_5"
+                android:gravity="center"
+                android:text="@string/oavacation_apply"
+                android:textColor="@color/white" />
+            <LinearLayout
+                android:id="@+id/oamain_more_menu_ll"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:layout_weight="1"
+                android:orientation="vertical"
+                android:paddingLeft="5dp"
+                android:visibility="gone">
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    >
+
+                    <ImageView
+                        android:id="@+id/oamain_more_menu_iv"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:src="@drawable/ic_oa_more" />
+
+                    <TextView
+                        android:id="@+id/oamain_more_menu_hd_tv"
+                        android:layout_width="10dp"
+                        android:layout_height="10dp"
+                        android:layout_gravity="top|right"
+                        android:layout_marginRight="15dp"
+                        android:background="@drawable/hongdian"
+                        android:textColor="@android:color/white"
+                        android:textSize="10.0dip"
+                        />
+                </FrameLayout>
+
+                <TextView
+                    android:id="@+id/more_menu_tv"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    android:gravity="center"
+                    android:text="@string/oamore_tltle"
+                    android:textColor="@color/white" />
+            </LinearLayout>
+
+        </LinearLayout>
         <!--年月日布局-->
         <LinearLayout
             android:layout_width="match_parent"

app_modular/appbooking/build.gradle

@@ -22,4 +22,6 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile deps.appcompatV7
     testCompile deps.junit
+
+    compile project(':common')
 }

app_modular/appbooking/src/main/java/com/modular/booking/adapter/BookAdapter.java

@@ -0,0 +1,122 @@
+package com.modular.booking.adapter;
+
+import android.content.Context;
+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.common.data.DateFormatUtil;
+import com.modular.booking.R;
+import com.modular.booking.model.BookingModel;
+
+import java.util.ArrayList;
+import java.util.Date;
+
+/**
+ * Created by Arison on 2017/6/23.
+ */
+
+public class BookAdapter extends BaseAdapter {
+    
+    private Context ct;
+    private int type=1;
+    private Date currentDate;
+
+    public Date getCurrentDate() {
+        return currentDate;
+    }
+
+    public void setCurrentDate(Date currentDate) {
+        this.currentDate = currentDate;
+    }
+
+    private ArrayList<BookingModel> datas=new ArrayList<>();
+    
+    public BookAdapter(Context ct, ArrayList<BookingModel> data){
+        this.ct=ct;
+        this.datas=data;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    @Override
+    public int getCount() {
+        return datas!=null?datas.size():0;
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return   datas.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        ViewHolder holder = null;
+        if (convertView == null) {
+            holder = new ViewHolder();
+            convertView = LayoutInflater.from(ct).inflate(R.layout.item_booking_list, null);
+            holder.status_img = (ImageView) convertView.findViewById(R.id.status_img);
+            holder.share_img = (ImageView) convertView.findViewById(R.id.iv_share);
+            holder.title_tv = (TextView) convertView.findViewById(R.id.title_tv);
+            holder.status_tv = (TextView) convertView.findViewById(R.id.status_tv);
+            holder.address_tv = (TextView) convertView.findViewById(R.id.address_tv);
+            holder.handler_tv = (TextView) convertView.findViewById(R.id.handler_tv);
+            holder.topic_tv=(TextView) convertView.findViewById(R.id.topic_tv);
+            convertView.setTag(holder);
+        } else {
+            holder = (ViewHolder) convertView.getTag();
+        }
+        try {
+            BookingModel model=datas.get(position);
+            holder.model=model;
+
+            if (DateFormatUtil.getStrDate4Date(currentDate, "yyyy-MM-dd").equals(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd"))){
+                holder.title_tv.setText(model.getAb_starttime().substring(0,10)+" "+model.getAb_starttime().substring(11,16)+"-"+
+                        model.getAb_endtime().substring(11,16));
+            }else{
+                holder.title_tv.setText(model.getAb_starttime().substring(11,16)+"-"+
+                        model.getAb_endtime().substring(11,16));
+            }
+          
+           
+            holder.status_tv.setText(model.getAb_confirmstatus());
+           
+            if(model.getAb_sharestatus().equals("已共享")){
+                holder.share_img.setVisibility(View.VISIBLE);
+            }else{
+                holder.share_img.setVisibility(View.GONE);
+            }
+            if (type==2){
+                holder.handler_tv.setText(model.getAb_recordman()+"—>"+model.getAb_bman());
+            }else{
+                holder.handler_tv.setText(model.getAb_recordman()+"—>"+model.getAb_bman());
+            }
+            
+            holder.topic_tv.setText(model.getAb_type());
+            holder.model.setAb_type(model.getAb_type());
+         
+        } catch (Exception e) {
+        }
+        return convertView;
+    }
+
+    public class ViewHolder {
+        public ImageView status_img,share_img;
+        public TextView title_tv, status_tv, address_tv, handler_tv,topic_tv;
+        public BookingModel model;
+    }
+}

app_modular/appcontact/src/main/java/com/uas/appcontact/model/book/BookingModel.java → app_modular/appbooking/src/main/java/com/modular/booking/model/BookingModel.java

@@ -1,4 +1,4 @@
-package com.uas.appcontact.model.book;
+package com.modular.booking.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;

app_modular/appcontact/src/main/java/com/uas/appcontact/model/book/SureBookModel.java → app_modular/appbooking/src/main/java/com/modular/booking/model/SureBookModel.java

@@ -1,4 +1,4 @@
-package com.uas.appcontact.model.book;
+package com.modular.booking.model;
 
 /**
  * Created by ${FANGLH} on 2017/7/18.

app_modular/appbooking/src/main/res/values/strings.xml

@@ -1,3 +1,10 @@
 <resources>
     <string name="app_name">appbooking</string>
+    
+    <!--预约功能-->
+    <string name="booking_personal">个人预约</string>
+    <string name="booking_business">商务预约</string>
+    <string name="booking_service">服务预约</string>
+    <string name="booking_share">共享预约</string>
+    
 </resources>