Browse Source

提交类型 处理bug
提交内容 处理日程bug

Bitliker 7 years ago
parent
commit
682eccfcbc

+ 3 - 0
app_modular/appworks/src/main/java/com/uas/appworks/activity/SchedulerCreateActivity.java

@@ -188,8 +188,11 @@ public class SchedulerCreateActivity extends BaseNetActivity {
         if (item.getItemId() == R.id.edit) {
             if (mSchedule==null||mSchedule.getType().equals(Schedule.TYPE_PHONE)){
                 showToast("手机日程请在系统日历上修改!!!");
+            }else if (mSchedule.getType().equals(Schedule.TYPE_BOOK)){
+                showToast("预约类型请进入小秘书界面操作!!!");
             }else{
                 showPopupWindow();
+
             }
         }
         return super.onOptionsItemSelected(item);

+ 5 - 1
app_modular/appworks/src/main/java/com/uas/appworks/model/Schedule.java

@@ -6,6 +6,7 @@ import android.os.Parcelable;
 public class Schedule implements Parcelable {
     public static final String TYPE_PHONE = "手机日程";
     public static final String TYPE_UU = "UU互联";
+    public static final String TYPE_BOOK = "预约";
 
     private int id;
     private String type;//类型 (UU互联||手机日程|会议)
@@ -22,11 +23,14 @@ public class Schedule implements Parcelable {
     private String status;//状态(预留)
 
 
-
     public Schedule(boolean formUU) {
         type = formUU ? TYPE_UU : TYPE_PHONE;
     }
 
+    public Schedule(String type) {
+        this.type = type;
+    }
+
     protected Schedule(Parcel in) {
         id = in.readInt();
         type = in.readString();

+ 10 - 7
app_modular/appworks/src/main/res/drawable/icon_my_scheduler.xml

@@ -1,15 +1,18 @@
 <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"
+    <path android:fillColor="#A264D3"
         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"/>
+        android:strokeColor="#A264D3" 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"/>
+        android:strokeColor="#A264D3" android:strokeWidth="5"/>
     <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"/>
+        android:strokeColor="#A264D3" android:strokeWidth="4"/>
+    <path android:fillColor="#A264D3"
+        android:pathData="M84.4,61.8L84.4,61.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.1v10C85.5,61.3 85,61.8 84.4,61.8z"
+        android:strokeColor="#A264D3" android:strokeWidth="1"/>
+    <path android:fillColor="#A264D3"
+        android:pathData="M83.3,60.8L83.3,60.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.3C83.8,61.9 83.3,61.4 83.3,60.8z"
+        android:strokeColor="#A264D3" android:strokeWidth="1"/>
 </vector>

+ 1 - 1
app_modular/appworks/src/main/res/values/strings.xml

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