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

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

@@ -33,7 +33,6 @@ import com.scwang.smartrefresh.layout.api.RefreshHeader;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.constant.RefreshState;
 import com.scwang.smartrefresh.layout.listener.OnMultiPurposeListener;
-import com.uas.appworks.activity.TimeHelperActivity;
 import com.uas.appworks.model.bean.WorkMenuBean;
 import com.uas.appworks.presenter.WorkPlatPresenter;
 import com.uas.appworks.view.WorkPlatView;
@@ -162,7 +161,7 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
 
                 @Override
                 public void onHeaderPulling(RefreshHeader header, float percent, int offset, int headerHeight, int extendHeight) {
-                    if (percent >= 1f) {
+                    /*if (percent >= 1f) {
                         mHeaderTimeTextView.setVisibility(View.VISIBLE);
                     } else {
                         mHeaderTimeTextView.setVisibility(View.GONE);
@@ -175,7 +174,7 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
                             startActivity(intent);
                             getActivity().overridePendingTransition(R.anim.anim_activity_top_in, R.anim.anim_activity_bottom_out);
                         }
-                    }
+                    }*/
                     ViewGroup.LayoutParams layoutParams = mHeaderRelativeLayout.getLayoutParams();
                     layoutParams.height = (int) (mHeaderHeight * (1 + percent));
                     mHeaderRelativeLayout.setLayoutParams(layoutParams);
@@ -185,11 +184,11 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
 
                 @Override
                 public void onHeaderReleasing(RefreshHeader header, float percent, int offset, int headerHeight, int extendHeight) {
-                    if (percent >= 1f) {
+                    /*if (percent >= 1f) {
                         mHeaderTimeTextView.setVisibility(View.VISIBLE);
                     } else {
                         mHeaderTimeTextView.setVisibility(View.GONE);
-                    }
+                    }*/
                     ViewGroup.LayoutParams layoutParams = mHeaderRelativeLayout.getLayoutParams();
                     layoutParams.height = (int) (mHeaderHeight * (1 + percent));
                     mHeaderRelativeLayout.setLayoutParams(layoutParams);

app_core/common/src/main/assets/work_menu.json

@@ -6,16 +6,6 @@
     "moduleId": "",
     "moduleVisible": true,
     "moduleList": [
-      {
-        "isLocalMenu": true,
-        "menuName": "str_work_subscribe_secretary",
-        "menuIcon": "ic_work_subscribe_secretary",
-        "menuActivity": "com.modular.booking.BookingListActivity",
-        "menuTag": "local_subscribe_secretary",
-        "menuUrl": "",
-        "caller": "",
-        "isHide": false
-      },
       {
         "isLocalMenu": true,
         "menuName": "str_work_uu_sports",
@@ -75,16 +65,6 @@
         "menuUrl": "",
         "caller": "",
         "isHide": false
-      },
-      {
-        "isLocalMenu": true,
-        "menuName": "title_time_helper",
-        "menuIcon": "icon_time_helper",
-        "menuActivity": "com.modular.work.TimeHelperActivity",
-        "menuTag": "local_time_helper",
-        "menuUrl": "",
-        "caller": "",
-        "isHide": false
       }
     ]
   },
@@ -268,7 +248,7 @@
         "isLocalMenu": true,
         "menuName": "str_work_customer_manage",
         "menuIcon": "ic_work_customer_manage",
-        "menuActivity": "com.modular.crm.CustomerListActivity",
+        "menuActivity": "com.modular.work.crm3_0.activity.CustomerManageActivity",
         "menuTag": "local_customer_manage",
         "menuUrl": "",
         "caller": "",
@@ -278,7 +258,7 @@
         "isLocalMenu": true,
         "menuName": "str_work_customer_visit",
         "menuIcon": "ic_work_customer_visit",
-        "menuActivity": "com.modular.work.OAActivity",
+        "menuActivity": "com.modular.work.crm3_0.activity.CustomerVisitActivity",
         "menuTag": "local_customer_visit",
         "menuUrl": "",
         "caller": "",

app_core/common/src/main/res/values/strings.xml

@@ -1395,6 +1395,7 @@
     <string name="undone">未完成</string>
     <string name="oacreat_task">创建任务</string>
     <string name="oacreat_calender">创建日程</string>
+    <string name="create_books">创建预约</string>
     <string name="account_notice1">当前账号没有下属,如有问题请联系系统管理员</string>
     <string name="nothing_now">暂无更多</string>
     <string name="set_close_step_notice1">您已预关闭UU运动，下次重启应用时将不再开启UU运动</string>

app_modular/appmessages/src/main/java/com/modular/appmessages/presenter/MessagePresenter.java

@@ -1093,7 +1093,8 @@ public class MessagePresenter implements OnHttpResultListener {
 
     /*跟新未读红点信息*/
     private void updateForUnReader() {
-        int num = subsNum + processNum + uuHelperNum + emnewsNum + taskNum + bookingNum + scheduleNum;
+//         bookingNum +   去除小秘书红点
+        int num = subsNum + processNum + uuHelperNum + emnewsNum + taskNum + scheduleNum;
         if (this.unReaderListener != null) {
             this.unReaderListener.setUnReader(num);
         }
@@ -1257,15 +1258,15 @@ public class MessagePresenter implements OnHttpResultListener {
         h.setT(model);
         models.add(h);
 
-        h = new MessageNew();
-        model = new MessageHeader(StringUtil.getMessage(R.string.booking_menu));
-        model.setIcon(R.drawable.icon_yuyue3);
-        model.setSubDoc("");
-        model.setRedKey(Constants.MESSAGE_YUYUE);
-        model.setType(2);
-        model.setTag("");
-        h.setT(model);
-        models.add(h);
+//        h = new MessageNew();
+//        model = new MessageHeader(StringUtil.getMessage(R.string.booking_menu));
+//        model.setIcon(R.drawable.icon_yuyue3);
+//        model.setSubDoc("");
+//        model.setRedKey(Constants.MESSAGE_YUYUE);
+//        model.setType(2);
+//        model.setTag("");
+//        h.setT(model);
+//        models.add(h);
         return models;
     }
 
@@ -1291,29 +1292,31 @@ public class MessagePresenter implements OnHttpResultListener {
         h.setT(model);
         models.add(h);
 
-        h = new MessageNew();
-        model = new MessageHeader(StringUtil.getMessage(R.string.booking_menu));
-        model.setIcon(R.drawable.icon_yuyue3);
-        model.setSubDoc("");
-        model.setRedKey(Constants.MESSAGE_YUYUE);
-        model.setType(2);
-        model.setTag("");
-        h.setT(model);
-        models.add(h);
+//        h = new MessageNew();
+//        model = new MessageHeader(StringUtil.getMessage(R.string.booking_menu));
+//        model.setIcon(R.drawable.icon_yuyue3);
+//        model.setSubDoc("");
+//        model.setRedKey(Constants.MESSAGE_YUYUE);
+//        model.setType(2);
+//        model.setTag("");
+//        h.setT(model);
+//        models.add(h);
         return models;
     }
 
     private List<MessageNew> getPersonalHeader() {
         List<MessageNew> models = new ArrayList<>();
         MessageNew header = new MessageNew();
-        MessageHeader model = new MessageHeader(StringUtil.getMessage(R.string.booking_menu));
-        model.setIcon(R.drawable.icon_yuyue3);
-        model.setSubDoc("");
-        model.setRedKey(Constants.MESSAGE_YUYUE);
-        model.setType(2);
-        model.setTag("");
-        header.setT(model);
-        models.add(header);
+        MessageHeader model =null;
+
+//        model = new MessageHeader(StringUtil.getMessage(R.string.booking_menu));
+//        model.setIcon(R.drawable.icon_yuyue3);
+//        model.setSubDoc("");
+//        model.setRedKey(Constants.MESSAGE_YUYUE);
+//        model.setType(2);
+//        model.setTag("");
+//        header.setT(model);
+//        models.add(header);
 
         header = new MessageNew();
         model = new MessageHeader("餐饮");

app_modular/appworks/src/main/java/com/uas/appworks/activity/ScheduleActivity.java

@@ -351,6 +351,12 @@ public class ScheduleActivity extends BaseNetActivity {
                         startActivityForResult(new Intent(ct, SchedulerCreateActivity.class), 0x11);
                     }
                 });
+                ((CreateViewHoder) holder).createBookBtn.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        startActivityForResult(new Intent("com.modular.booking.BookingListActivity").putExtra("whichPage","ScheduleActivity"), 0x11);
+                    }
+                });
             }
         }
 
@@ -503,11 +509,12 @@ public class ScheduleActivity extends BaseNetActivity {
         }
 
         class CreateViewHoder extends RecyclerView.ViewHolder {
-            Button createBtn;
+            Button createBtn,createBookBtn;
 
             public CreateViewHoder(View itemView) {
                 super(itemView);
                 createBtn = itemView.findViewById(R.id.createBtn);
+                createBookBtn = itemView.findViewById(R.id.createBookBtn);
             }
         }
     }

app_modular/appworks/src/main/res/layout/item_create_schedule.xml

@@ -1,24 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
+    android:orientation="horizontal"
+    android:padding="@dimen/padding"
     android:layout_height="wrap_content">
 
     <Button
         android:id="@+id/createBtn"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
+        android:layout_weight="1"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/info"
-        android:layout_marginBottom="150dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:layout_marginTop="20dp"
         android:background="@drawable/bg_bule_btn"
         android:padding="10dp"
         android:text="@string/oacreat_calender"
+        android:layout_marginRight="@dimen/padding"
+        android:textColor="@color/white"
+        android:textSize="@dimen/text_main"/>
+
+    <Button
+        android:id="@+id/createBookBtn"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:layout_marginLeft="@dimen/padding"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/info"
+        android:background="@drawable/bg_bule_btn"
+        android:padding="10dp"
+        android:text="@string/create_books"
         android:textColor="@color/white"
-        android:textSize="@dimen/text_main"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-</android.support.constraint.ConstraintLayout>
+        android:textSize="@dimen/text_main" />
+</LinearLayout>