Browse Source

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

Bitliker 7 years ago
parent
commit
7fb923df49

+ 3 - 3
WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Tue Aug 14 15:20:29 CST 2018
+#Wed Aug 29 08:52:32 CST 2018
 debugName=579
-versionName=640
+versionName=641
 debugCode=579
-versionCode=182
+versionCode=183

+ 2 - 0
app_core/common/src/main/java/com/common/preferences/PreferenceUtils.java

@@ -13,6 +13,8 @@ public class PreferenceUtils {
     public interface Constants{
         String  AUTO_SIGN_SW="AUTO_SIGN_SW";//是否开启自动打卡
         String  SAVE_SYSTEM_SCHEDULE="saveSystemSchedule";//是否保存日程到系统
+        String  DEF_WARN_TIME="DEF_WARN_TIME";//默认提醒时间设置
+        String  DEF_REPEAT_TIME="DEF_repeat_TIME";//默认重复时间
 
     }
 

+ 1 - 1
app_modular/appworks/src/main/java/com/uas/appworks/activity/ScheduleActivity.java

@@ -154,7 +154,7 @@ public class ScheduleActivity extends BaseNetActivity {
         requestHttp(new Parameter.Builder()
                         .addParams("imid", MyApplication.getInstance().getLoginUserId())
                         .addParams("day", dateStr)
-                        .url("schedule/getByDaySchedule")
+                        .url("schedule/byDaySchedule")
                         .record(LOAD_DAY)
                 , mOnSmartHttpListener);
     }

+ 4 - 2
app_modular/appworks/src/main/java/com/uas/appworks/activity/ScheduleSettingActivity.java

@@ -41,9 +41,9 @@ public class ScheduleSettingActivity extends BaseActivity {
             public void onCheckedChanged(View view, boolean isChecked) {
                 PreferenceUtils.putBoolean(PreferenceUtils.Constants.SAVE_SYSTEM_SCHEDULE, isChecked);
                 if (isChecked) {
-                    //开启,TODO 将添加到日程
+                    showToast("创建日程时会将日程同步到系统日历中!!");
                 } else {
-                    //关闭,TODO 询问是否清楚以前的日程
+                    showToast("创建日程时不会将日程同步到系统日历中!!");
                 }
             }
         });
@@ -94,9 +94,11 @@ public class ScheduleSettingActivity extends BaseActivity {
             if (b != null) {
                 switch (requestCode) {
                     case 0x11:
+                        PreferenceUtils.putString(PreferenceUtils.Constants.DEF_WARN_TIME, b.getName());
                         warmTimeTv.setText(b.getName());
                         break;
                     case 0x12:
+                        PreferenceUtils.putString(PreferenceUtils.Constants.DEF_REPEAT_TIME, b.getName());
                         repeatTv.setText(b.getName());
                         break;
                 }

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

@@ -86,8 +86,8 @@ public class SchedulerCreateActivity extends BaseNetActivity {
         mSchedule = new Schedule();
         mSchedule.setStartTime(System.currentTimeMillis() + 1000 * 5 * 60);
         mSchedule.setEndTime(System.currentTimeMillis() + 1000 * 10 * 60);
-        mSchedule.setRepeat(repeats[0]);
         mSchedule.setTag(types[0]);
+        mSchedule.setRepeat(PreferenceUtils.getString(ct,PreferenceUtils.Constants.DEF_REPEAT_TIME,repeats[0]));
         mSchedule.setWarnTime(0);
         mSchedule.setType(getString(R.string.app_name));
     }