提交类型 处理问题反馈

提交内容   处理设备管理的问题反馈

app_modular/apputils/src/main/java/com/modular/apputils/widget/compactcalender/WeekUtils.java

@@ -6,7 +6,7 @@ import java.util.Locale;
 
 public class WeekUtils {
 
-    static String[] getWeekdayNames(Locale locale, int day, boolean useThreeLetterAbbreviation){
+    static String[] getWeekdayNames(Locale locale, int day, boolean useThreeLetterAbbreviation) {
         DateFormatSymbols dateFormatSymbols = new DateFormatSymbols(locale);
         String[] dayNames = dateFormatSymbols.getShortWeekdays();
         if (dayNames == null) {
@@ -24,7 +24,13 @@ public class WeekUtils {
             weekDayNames[i] = weekDaysFromSunday[currentDay];
         }
 
-        if (!useThreeLetterAbbreviation) {
+        if (locale.getLanguage() != null && locale.getLanguage().endsWith("zh")) {
+            for (int i = 0; i < weekDayNames.length; i++) {
+                if (weekDayNames[i] != null && weekDayNames[i].length() > 1) {
+                    weekDayNames[i] = weekDayNames[i].substring(weekDayNames[i].length() - 1, weekDayNames[i].length());
+                }
+            }
+        } else if (!useThreeLetterAbbreviation) {
             for (int i = 0; i < weekDayNames.length; i++) {
                 weekDayNames[i] = weekDayNames[i].substring(0, 1);
             }

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

@@ -93,8 +93,7 @@ public class ScheduleActivity extends BaseNetActivity {
         monthTv = findViewById(R.id.monthTv);
         newDayTv = findViewById(R.id.newDayTv);
         lunarCalendarTv = findViewById(R.id.lunarCalendarTv);
-        compactCalendarView.setUseThreeLetterAbbreviation(false);
-        compactCalendarView.setFirstDayOfWeek(Calendar.MONDAY);
+        compactCalendarView.setFirstDayOfWeek(Calendar.SUNDAY);
         compactCalendarView.setIsRtl(false);
         compactCalendarView.displayOtherMonthDays(false);
         compactCalendarView.setLocale(TimeZone.getDefault(), Locale.CHINESE);
@@ -130,11 +129,9 @@ public class ScheduleActivity extends BaseNetActivity {
         newDayTv.setVisibility(dateStr.equals(mCurrentDateStr) ? View.GONE : View.VISIBLE);
         String ym = DateFormatUtil.date2Str(date, DateFormatUtil.YM);
         if (StringUtil.isEmpty(lastMonth) || !ym.equals(lastMonth)) {
-            if (StringUtil.isEmpty(lastMonth)) {
-                loadByDay(dateStr);
-            }
             lastMonth = ym;
             loadByMonth(lastMonth);
+            loadByDay(dateStr);
         } else {
             loadByDay(dateStr);
         }
@@ -282,6 +279,7 @@ public class ScheduleActivity extends BaseNetActivity {
                 }
                 mViewHoder.contentTv.setText(StringUtil.isEmpty(mSchedule.getRemarks()) ? "" : mSchedule.getRemarks());
                 mViewHoder.typeTv.setText(StringUtil.isEmpty(mSchedule.getType()) ? "" : mSchedule.getType());
+                mViewHoder.tagTv.setText(StringUtil.isEmpty(mSchedule.getTag()) ? "" : mSchedule.getTag());
                 mViewHoder.itemView.setTag(mSchedule);
                 mViewHoder.itemView.setOnClickListener(mOnClickListener);
 
@@ -318,6 +316,7 @@ public class ScheduleActivity extends BaseNetActivity {
             private TextView endTimeTv;
             private TextView contentTv;
             private TextView typeTv;
+            private TextView tagTv;
 
 
             public ViewHoder(View itemView) {
@@ -327,6 +326,7 @@ public class ScheduleActivity extends BaseNetActivity {
                 endTimeTv = (TextView) itemView.findViewById(R.id.endTimeTv);
                 contentTv = (TextView) itemView.findViewById(R.id.contentTv);
                 typeTv = (TextView) itemView.findViewById(R.id.typeTv);
+                tagTv = (TextView) itemView.findViewById(R.id.tagTv);
 
             }
         }

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

@@ -5,6 +5,7 @@ import android.support.v7.app.ActionBar;
 import android.support.v7.widget.DividerItemDecoration;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.text.Editable;
 import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -23,6 +24,7 @@ import com.common.data.ListUtils;
 import com.core.app.MyApplication;
 import com.core.utils.CommonUtil;
 import com.core.widget.ClearEditText;
+import com.core.widget.listener.EditChangeListener;
 import com.core.xmpp.utils.audio.voicerecognition.JsonParser;
 import com.iflytek.cloud.RecognizerResult;
 import com.iflytek.cloud.SpeechConstant;
@@ -87,6 +89,12 @@ public class ScheduleSearchActivity extends BaseNetActivity {
                 return false;
             }
         });
+        mSearchEditText.addTextChangedListener(new EditChangeListener() {
+            @Override
+            public void afterTextChanged(Editable editable) {
+                searchEvent();
+            }
+        });
         ActionBar bar = this.getSupportActionBar();
         if (bar != null) {
             bar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
@@ -142,6 +150,11 @@ public class ScheduleSearchActivity extends BaseNetActivity {
     }
 
     private void loadDataByKey() {
+        if (TextUtils.isEmpty(this.lastKey)){
+            mRecyclerView.setVisibility(View.GONE);
+            emptyView.setVisibility(View.GONE);
+            return;
+        }
         requestHttp(new Parameter.Builder()
                         .record(11)
                         .addTag(LAST_KEY, this.lastKey)

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

@@ -46,7 +46,7 @@ public class SchedulerCreateActivity extends BaseNetActivity {
     private final int DELETE = 0x12;
     private final int UPDATE = 0x13;
 
-    private final String[] warns = {"不提醒", "开始时", "提醒前5分钟", "提醒前15分钟", "提醒前30分钟", "提醒前1小时", "提醒前一天"};
+    private final String[] warns = {"不提醒", "开始时", "提前5分钟", "提前15分钟", "提前30分钟", "提前1小时", "提前一天"};
     private final String[] warns2 = {"不提醒", "当天8点", "当天9点", "提前一天8点", "提前一天9点"};
     private final String[] types = {"工作", "学习", "娱乐", "运动", "约会", "纪念日"};
     private final String[] repeats = {"不重复", "每天重复", "每周重复", "每月重复"};
@@ -77,6 +77,7 @@ public class SchedulerCreateActivity extends BaseNetActivity {
                 initSchedule();
             }
         }
+        setTitle(isEnable?R.string.create_scheduler:R.string.scheduler_detail);
         findById();
         initView();
         updateEnable(isEnable);
@@ -87,7 +88,7 @@ public class SchedulerCreateActivity extends BaseNetActivity {
         mSchedule.setStartTime(System.currentTimeMillis() + 1000 * 5 * 60);
         mSchedule.setEndTime(System.currentTimeMillis() + 1000 * 10 * 60);
         mSchedule.setTag(types[0]);
-        mSchedule.setRepeat(PreferenceUtils.getString(ct,PreferenceUtils.Constants.DEF_REPEAT_TIME,repeats[0]));
+        mSchedule.setRepeat(PreferenceUtils.getString(ct, PreferenceUtils.Constants.DEF_REPEAT_TIME, repeats[0]));
         mSchedule.setWarnTime(0);
         mSchedule.setType(getString(R.string.app_name));
     }
@@ -170,6 +171,7 @@ public class SchedulerCreateActivity extends BaseNetActivity {
             menu.findItem(R.id.edit).setVisible(false);
             menu.findItem(R.id.complete).setVisible(true);
         } else {
+            setTitle(R.string.scheduler_detail);
             menu.findItem(R.id.complete).setVisible(false);
             menu.findItem(R.id.edit).setVisible(true);
         }
@@ -259,7 +261,7 @@ public class SchedulerCreateActivity extends BaseNetActivity {
                 invalidateOptionsMenu();
             } else if (view.getId() == R.id.deleteTv) {
                 closePopupWindow();
-                deleteSchedule();
+                deleteFormSc();
             } else if (view.getId() == R.id.cancel_tv) {
                 closePopupWindow();
             } else if (view == startTimeTv) {
@@ -526,6 +528,22 @@ public class SchedulerCreateActivity extends BaseNetActivity {
                 });
     }
 
+    private void deleteFormSc() {
+        new VeriftyDialog.Builder(ct)
+                .setTitle(getString(R.string.app_name))
+                .setCanceledOnTouchOutside(false)
+                .setShowCancel(true)
+                .setContent("是否确定删除该日程？")
+                .build(new VeriftyDialog.OnDialogClickListener() {
+                    @Override
+                    public void result(boolean clickSure) {
+                        if (clickSure) {
+                            deleteSchedule();
+                        }
+                    }
+                });
+    }
+
     private void deleteFormSystem(final Schedule mSchedule) {
         requestPermission(Manifest.permission.WRITE_CALENDAR, new Runnable() {
             @Override

app_modular/appworks/src/main/java/com/uas/appworks/utils/ScheduleUtils.java

@@ -120,6 +120,7 @@ public class ScheduleUtils {
         event.put(CalendarContract.Events.DTEND, mSchedule.getEndTime());//日程结束时间时间
         event.put(CalendarContract.Events.HAS_ALARM, mSchedule.hasAlarm());//设置是否有闹钟提醒
         event.put(CalendarContract.Events.ORIGINAL_ALL_DAY, mSchedule.getAllDay());//是否全天
+        event.put(CalendarContract.Events.ALL_DAY, mSchedule.getAllDay());//是否全天
         event.put(CalendarContract.Events.EVENT_TIMEZONE, TimeZone.getDefault().getID());  //这个是时区，必须有，
         if (ActivityCompat.checkSelfPermission(context, Manifest.permission.WRITE_CALENDAR) != PackageManager.PERMISSION_GRANTED) {
             // 没有 权限

app_modular/appworks/src/main/res/drawable/bg_schedule_tag_blue.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/deep_blue" />
+    <corners android:radius="40dp" />
+    <padding
+        android:bottom="1dp"
+        android:left="@dimen/paddingMin"
+        android:right="@dimen/paddingMin"
+        android:top="1dp" />
+</shape>

app_modular/appworks/src/main/res/drawable/ic_edit_more.xml

@@ -0,0 +1,42 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportHeight="15"
+    android:viewportWidth="23">
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="evenOdd"
+        android:pathData="M1.5,0L2.5,0A1.5,1.5 0,0 1,4 1.5L4,1.5A1.5,1.5 0,0 1,2.5 3L1.5,3A1.5,1.5 0,0 1,0 1.5L0,1.5A1.5,1.5 0,0 1,1.5 0z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="evenOdd"
+        android:pathData="M1.5,6L2.5,6A1.5,1.5 0,0 1,4 7.5L4,7.5A1.5,1.5 0,0 1,2.5 9L1.5,9A1.5,1.5 0,0 1,0 7.5L0,7.5A1.5,1.5 0,0 1,1.5 6z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="evenOdd"
+        android:pathData="M1.5,12L2.5,12A1.5,1.5 0,0 1,4 13.5L4,13.5A1.5,1.5 0,0 1,2.5 15L1.5,15A1.5,1.5 0,0 1,0 13.5L0,13.5A1.5,1.5 0,0 1,1.5 12z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="evenOdd"
+        android:pathData="M7.5,0L21.5,0A1.5,1.5 0,0 1,23 1.5L23,1.5A1.5,1.5 0,0 1,21.5 3L7.5,3A1.5,1.5 0,0 1,6 1.5L6,1.5A1.5,1.5 0,0 1,7.5 0z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="evenOdd"
+        android:pathData="M7.5,6L21.5,6A1.5,1.5 0,0 1,23 7.5L23,7.5A1.5,1.5 0,0 1,21.5 9L7.5,9A1.5,1.5 0,0 1,6 7.5L6,7.5A1.5,1.5 0,0 1,7.5 6z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="evenOdd"
+        android:pathData="M7.5,12L21.5,12A1.5,1.5 0,0 1,23 13.5L23,13.5A1.5,1.5 0,0 1,21.5 15L7.5,15A1.5,1.5 0,0 1,6 13.5L6,13.5A1.5,1.5 0,0 1,7.5 12z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+</vector>

app_modular/appworks/src/main/res/drawable/ic_my_scheduler_seting.xml

@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="5dp"
+    android:height="16dp"
+    android:viewportHeight="22"
+    android:viewportWidth="6">
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="evenOdd"
+        android:pathData="M3,3m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="evenOdd"
+        android:pathData="M3,11m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="evenOdd"
+        android:pathData="M3,19m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+</vector>

app_modular/appworks/src/main/res/drawable/icon_my_scheduler.xml

@@ -0,0 +1,15 @@
+<vector android:height="24dp" android:viewportHeight="100"
+    android:viewportWidth="100" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#00000000"
+        android:pathData="M49.3,3.7c4,0 8.1,0 12.1,0c5.6,0 9.7,4.1 9.7,9.6c0,2 0,4 0,5.9c0,1.6 -1.2,2.9 -2.8,3.1c-1.4,0.2 -2.9,-0.8 -3.3,-2.3c-0.1,-0.3 -0.1,-0.7 -0.1,-1.1c0,-1.9 0,-3.7 0,-5.5c0,-2.3 -1.3,-3.6 -3.5,-3.6c-8,0 -16,0 -24.1,0c-2.3,0 -3.5,1.2 -3.5,3.5c0,1.9 0,3.7 0,5.6c0,1.7 -0.9,2.9 -2.3,3.2c-1.9,0.5 -3.8,-0.8 -3.9,-2.8c-0.1,-2.5 -0.1,-5 0.1,-7.5c0.4,-4.6 4.4,-8.2 9.1,-8.3c0,0 0.1,0 0.1,0C41,3.7 45.2,3.7 49.3,3.7L49.3,3.7zM49.3,3.7"
+        android:strokeColor="#A463D6" android:strokeWidth="2"/>
+    <path android:fillColor="#00000000"
+        android:pathData="M84.3,79.2c-5.3,0 -10.1,-2.1 -13.6,-5.6c-0.7,1.3 -2.3,2 -3.9,1.4c-1.2,-0.5 -2,-1.6 -2,-3c0,-4 0,-7.9 0,-11.9c0,-0.1 0,-0.2 0,-0.4c0,-0.1 0,-0.2 0,-0.4c0,-4 0,-8.1 0,-12.1c0,-2.3 2.1,-3.7 4.2,-2.9c0.7,0.3 1.3,0.8 1.7,1.5c3.5,-3.4 8.3,-5.5 13.5,-5.5c3.1,0 6,0.7 8.6,2c0,-1.4 0,-2.7 0,-4.1c0,-0.9 -0.1,-1.8 -0.3,-2.6c-1,-4.2 -4.7,-7.1 -9,-7.1c-6.5,0 -13.1,0 -19.6,0c-16.2,0 -32.3,0 -48.5,0c-1.5,0 -3,0.2 -4.3,0.9c-3.7,1.8 -5.4,4.9 -5.4,8.9c0,14.2 0,28.4 0,42.6c0,0.4 0,0.7 0,1.1c0.4,4 2.4,6.7 6.1,8.2c0.4,0.2 0.6,0.4 0.7,0.7c2.3,6 9.7,8 14.7,3.9c1.3,-1.1 2.2,-2.5 2.9,-4.1h0.5c12.4,0 24.9,0 37.3,0c0.4,0 0.6,0.1 0.8,0.5c1.5,3.6 4.9,5.8 8.8,5.7c3.9,-0.1 7.2,-2.4 8.6,-6.2c0.1,-0.2 0.3,-0.5 0.5,-0.6c4,-1.6 6.2,-4.8 6.2,-9.2c0,-1.3 0,-2.6 0,-4C90.3,78.5 87.4,79.2 84.3,79.2zM33.8,72c0,1.7 -1,2.9 -2.4,3.2c-1.9,0.4 -3.7,-0.9 -3.8,-2.9c0,-0.1 0,-0.2 0,-0.3c0,-8.2 0,-16.4 0,-24.6c0,-2.1 1.6,-3.5 3.6,-3.2c1.3,0.2 2.4,1.3 2.6,2.6c0,0.3 0,0.6 0,1c0,4 0,8 0,12C33.8,63.9 33.8,67.9 33.8,72z"
+        android:strokeColor="#A463D6" android:strokeWidth="2"/>
+    <path android:fillColor="#00000000"
+        android:pathData="M85,59.8m-13.8,0a13.8,13.8 0,1 1,27.6 0a13.8,13.8 0,1 1,-27.6 0"
+        android:strokeColor="#AF84D1" android:strokeWidth="1.5"/>
+    <path android:fillColor="#AF84D1" android:pathData="M83.4,60.8L83.4,60.8c-0.6,0 -1.1,-0.5 -1.1,-1.1v-10c0,-0.6 0.5,-1.1 1.1,-1.1l0,0c0.6,0 1.1,0.5 1.1,1.1v10C84.5,60.3 84,60.8 83.4,60.8z"/>
+    <path android:fillColor="#AF84D1" android:pathData="M82.3,59.8L82.3,59.8c0,-0.6 0.5,-1.1 1.1,-1.1h6.3c0.6,0 1.1,0.5 1.1,1.1l0,0c0,0.6 -0.5,1.1 -1.1,1.1h-6.3C82.8,60.9 82.3,60.4 82.3,59.8z"/>
+    <path android:fillColor="#AF84D1" android:pathData="M83.5,59.7m-1.4,0a1.4,1.4 0,1 1,2.8 0a1.4,1.4 0,1 1,-2.8 0"/>
+</vector>

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

@@ -14,7 +14,7 @@
         android:padding="@dimen/padding"
         android:text="2018-08"
         android:textColor="#FF000000"
-        android:textSize="14sp"
+        android:textSize="15sp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent" />
 
@@ -25,7 +25,7 @@
         android:layout_marginRight="30dp"
         android:text="农历 十八"
         android:textColor="#FF696969"
-        android:textSize="11sp"
+        android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="@id/monthTv"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="@id/monthTv" />
@@ -58,7 +58,7 @@
         app:compactCalendarShouldSelectFirstDayOfMonthOnScroll="true"
         app:compactCalendarTargetHeight="250dp"
         app:compactCalendarTextColor="#181818"
-        app:compactCalendarTextSize="12sp"
+        app:compactCalendarTextSize="15sp"
         app:layout_constraintTop_toBottomOf="@id/monthTv" />
 
     <View

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

@@ -4,23 +4,17 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <TextView
+
+
+    <include
         android:id="@+id/emptyView"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:text="无日程"
-        android:textColor="#FF737373"
-        android:textSize="18sp"
-        android:gravity="center"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        layout="@layout/common_empty_view"/>
+
 
     <android.support.v7.widget.RecyclerView
         android:layout_width="0dp"
         android:id="@+id/mRecyclerView"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"

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

@@ -42,8 +42,8 @@
             android:layout_height="wrap_content"
             android:text="全天"
             android:textColor="#FF000000"
-            android:textSize="14sp"
-            android:visibility="visible" />
+            android:textSize="15sp"
+            android:visibility="gone" />
 
         <TextView
             android:id="@+id/startTimeTv"
@@ -51,8 +51,8 @@
             android:layout_height="wrap_content"
             android:text="10:30"
             android:textColor="#FF000000"
-            android:textSize="9sp"
-            android:visibility="gone" />
+            android:textSize="11sp"
+            android:visibility="visible" />
 
         <TextView
             android:id="@+id/endTimeTv"
@@ -60,36 +60,63 @@
             android:layout_height="wrap_content"
             android:text="14:00"
             android:textColor="#FF000000"
-            android:textSize="9sp"
-            android:visibility="gone" />
+            android:textSize="11sp"
+            android:visibility="visible" />
 
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/contentTv"
-        android:layout_width="wrap_content"
+    <android.support.constraint.ConstraintLayout
+        android:id="@+id/contentCl"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginLeft="20dp"
         android:layout_marginTop="@dimen/padding"
-        android:text="需求设计需求设计需求设计需求设计需…"
-        android:textColor="#FF282828"
-        android:textSize="12sp"
         app:layout_constraintLeft_toRightOf="@id/timeFl"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintRight_toLeftOf="@+id/nextIV"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/contentTv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:lines="1"
+            android:maxLength="20"
+            android:text="需求设计需求设计需求设计需求设计需需求设计需求设计需求设计需求设计需…"
+            android:textColor="#FF282828"
+            android:textSize="13sp"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintRight_toLeftOf="@+id/tagTv" />
+
+        <TextView
+            android:id="@+id/tagTv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/paddingMin"
+            android:background="@drawable/bg_schedule_tag_blue"
+            android:text="工作"
+            android:textColor="#FFFFFFFF"
+            android:textSize="9sp"
+            app:layout_constraintBottom_toBottomOf="@id/contentTv"
+            app:layout_constraintLeft_toRightOf="@id/contentTv"
+            app:layout_constraintTop_toTopOf="@id/contentTv" />
+    </android.support.constraint.ConstraintLayout>
+
 
     <TextView
         android:id="@+id/typeTv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/padding"
-        app:layout_constraintBottom_toBottomOf="parent"
         android:layout_marginTop="@dimen/paddingMin"
         android:textColor="#FF909090"
-        android:textSize="8sp"
-        app:layout_constraintLeft_toLeftOf="@id/contentTv"
-        app:layout_constraintTop_toBottomOf="@id/contentTv" />
+        android:textSize="10sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="@id/contentCl"
+        app:layout_constraintTop_toBottomOf="@id/contentCl" />
 
     <ImageView
+        android:id="@+id/nextIV"
         android:layout_width="@dimen/next_width"
         android:layout_height="@dimen/next_height"
         android:src="@drawable/oa_next"
@@ -102,6 +129,6 @@
         android:layout_height="@dimen/line"
         android:background="@color/linen"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="@id/contentTv"
+        app:layout_constraintLeft_toLeftOf="@id/contentCl"
         app:layout_constraintRight_toRightOf="parent" />
 </android.support.constraint.ConstraintLayout>

app_modular/appworks/src/main/res/menu/menu_input_ok.xml

@@ -9,5 +9,6 @@
     <item
         android:id="@+id/edit"
         android:title="@string/edit"
+        android:icon="@drawable/ic_edit_more"
         app:showAsAction="always" />
 </menu>

app_modular/appworks/src/main/res/menu/menu_schedule.xml

@@ -10,7 +10,7 @@
 
     <item
         android:id="@+id/setting"
-        android:icon="@drawable/ic_dot_more"
+        android:icon="@drawable/ic_my_scheduler_seting"
         android:title="设置"
         app:showAsAction="always" />
 </menu>

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

@@ -231,6 +231,7 @@
 
     <!--日程时间助手-->
     <string name="create_scheduler">创建日程</string>
+    <string name="scheduler_detail">日程详情</string>
     <string name="detail">详情</string>
     <string name="scheduler_tag">日程标签</string>
     <string name="scheduler_warn">日程提醒</string>

app_third/recyclerlibrary/src/main/java/com/module/recyclerlibrary/listener/OnRecyclerClickLister.java

@@ -23,23 +23,22 @@ public abstract class OnRecyclerClickLister implements RecyclerView.OnItemTouchL
 
     @Override
     public void onTouchEvent(RecyclerView rv, MotionEvent e) {
+        //触摸事件
         mGestureDetectorCompat.onTouchEvent(e);
     }
 
     @Override
     public boolean onInterceptTouchEvent(RecyclerView rv, MotionEvent e) {
+        //拦截事件
         mGestureDetectorCompat.onTouchEvent(e);
         return false;
     }
 
     @Override
     public void onRequestDisallowInterceptTouchEvent(boolean disallowIntercept) {
+        //是否拦截触摸时间
     }
 
-    public abstract void onItemLongClick(RecyclerView.ViewHolder vh);
-
-    public abstract void onItemClick(RecyclerView.ViewHolder vh);
-
     private class GestureListener extends GestureDetector.SimpleOnGestureListener {
         @Override
         public boolean onSingleTapUp(MotionEvent e) {
@@ -60,4 +59,9 @@ public abstract class OnRecyclerClickLister implements RecyclerView.OnItemTouchL
             }
         }
     }
+
+
+    public abstract void onItemLongClick(RecyclerView.ViewHolder vh);
+
+    public abstract void onItemClick(RecyclerView.ViewHolder vh);
 }