version:1.2

fix:优化卡顿 update:基本对接完成，增加指示器放大
2023-02-23 11:26:22 +08:00
parent cd4ba088fc
commit 2772685f0e
182 changed files with 13448 additions and 418 deletions
--- a/app/src/main/java/com/uiui/zyos/bean/AlarmClockData.java
+++ b/app/src/main/java/com/uiui/zyos/bean/AlarmClockData.java
@@ -0,0 +1,164 @@
+package com.uiui.zyos.bean;
+
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonParser;
+import com.uiui.zyos.alarm.AlarmUtils;
+
+import java.io.Serializable;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+public class AlarmClockData implements Serializable {
+    private static final long serialVersionUID = -5856502480745183157L;
+
+    int id;
+    int type;//类型 1一次 2循环 3周一到周五 4 周六周日
+    String time;//"2021-11-15 18:33:23",//时间格式化字符串，循环类型是18:33:23
+    String title;//标题
+    String voice;//语音文件地址
+    String voice_md5;
+    String file;//图片或视频文件地址
+    int remind_type;
+    int is_onoff;//0关闭 1开启
+
+    boolean finished = false;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getVoice() {
+        return voice;
+    }
+
+    public void setVoice(String voice) {
+        this.voice = voice;
+    }
+
+    public String getVoice_md5() {
+        return voice_md5;
+    }
+
+    public void setVoice_md5(String voice_md5) {
+        this.voice_md5 = voice_md5;
+    }
+
+    public String getFile() {
+        return file;
+    }
+
+    public void setFile(String file) {
+        this.file = file;
+    }
+
+    public boolean isFinished() {
+        return finished;
+    }
+
+    public void setFinished(boolean finished) {
+        this.finished = finished;
+    }
+
+    public int getRemind_type() {
+        return remind_type;
+    }
+
+    public void setRemind_type(int remind_type) {
+        this.remind_type = remind_type;
+    }
+
+    public int getIs_onoff() {
+        return is_onoff;
+    }
+
+    public void setIs_onoff(int is_onoff) {
+        this.is_onoff = is_onoff;
+    }
+
+    public long getTimeStamp() {
+        if (TextUtils.isEmpty(time)) {
+            return 0L;
+        }
+        if (time.length() == 5) {
+            String[] timeSplit = time.split(":");
+            int hour = Integer.parseInt(timeSplit[0]);
+            int minute = Integer.parseInt(timeSplit[1]);
+            Calendar c = Calendar.getInstance();
+            c.set(c.get(Calendar.YEAR), c.get(Calendar.MONTH),
+                    c.get(Calendar.DAY_OF_MONTH), hour, minute, 0);
+            long mTimeInfo = c.getTimeInMillis();
+            Log.e("AlarmClockData", "getTimeStamp: " + mTimeInfo);
+            long actualTime = mTimeInfo > System.currentTimeMillis() ? mTimeInfo : mTimeInfo + AlarmUtils.ONE_DAY_TIME;
+            return actualTime;
+        } else {
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            try {
+                Date date = simpleDateFormat.parse(time);
+                long timestamp = date.getTime();
+                return timestamp;
+            } catch (ParseException e) {
+                return System.currentTimeMillis();
+            }
+        }
+    }
+
+
+    @NonNull
+    @Override
+    public String toString() {
+        return JsonParser.parseString(new Gson().toJson(this)).getAsJsonObject().toString();
+    }
+
+    @Override
+    public boolean equals(@Nullable Object obj) {
+        if (obj == null) return false;
+        if (!(obj instanceof AlarmClockData)) return false;
+        if (id != ((AlarmClockData) obj).id) return false;
+        if (type != ((AlarmClockData) obj).type) return false;
+        if (!time.equals(((AlarmClockData) obj).time)) return false;
+        if (!title.equals(((AlarmClockData) obj).title)) return false;
+        if (!voice.equals(((AlarmClockData) obj).voice)) return false;
+        if (!voice_md5.equals(((AlarmClockData) obj).voice_md5)) return false;
+        if (!file.equals(((AlarmClockData) obj).file)) return false;
+        if (remind_type != ((AlarmClockData) obj).remind_type) return false;
+        if (is_onoff != ((AlarmClockData) obj).is_onoff) return false;
+
+        return true;
+    }
+}
--- a/app/src/main/java/com/uiui/zyos/bean/DesktopIcon.java
+++ b/app/src/main/java/com/uiui/zyos/bean/DesktopIcon.java
@@ -7,6 +7,8 @@ import android.graphics.drawable.Drawable;
 import android.os.Parcel;
 import android.os.Parcelable;

+import androidx.annotation.NonNull;
+
 import java.io.Serializable;

 public class DesktopIcon implements Serializable, Parcelable {
@@ -114,4 +116,9 @@ public class DesktopIcon implements Serializable, Parcelable {
        return desktopIcon;
    }

+    @NonNull
+    @Override
+    public String toString() {
+        return packageName + className;
+    }
 }
--- a/app/src/main/java/com/uiui/zyos/bean/LessonApp.java
+++ b/app/src/main/java/com/uiui/zyos/bean/LessonApp.java
@@ -0,0 +1,79 @@
+package com.uiui.zyos.bean;
+
+import androidx.annotation.NonNull;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonParser;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class LessonApp implements Serializable {
+    private static final long serialVersionUID = -7239207868023265592L;
+
+    int id;
+    List<App> app;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public List<App> getApp() {
+        return app;
+    }
+
+    public void setApp(List<App> app) {
+        this.app = app;
+    }
+
+    public class App implements Serializable {
+        private static final long serialVersionUID = -3442928771696560097L;
+
+        int id;
+        String app_package;
+        String app_md5;
+        String  app_url;
+
+        public int getId() {
+            return id;
+        }
+
+        public void setId(int id) {
+            this.id = id;
+        }
+
+        public String getApp_package() {
+            return app_package;
+        }
+
+        public void setApp_package(String app_package) {
+            this.app_package = app_package;
+        }
+
+        public String getApp_md5() {
+            return app_md5;
+        }
+
+        public void setApp_md5(String app_md5) {
+            this.app_md5 = app_md5;
+        }
+
+        public String getApp_url() {
+            return app_url;
+        }
+
+        public void setApp_url(String app_url) {
+            this.app_url = app_url;
+        }
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return JsonParser.parseString(new Gson().toJson(this)).getAsJsonObject().toString();
+    }
+}
--- a/app/src/main/java/com/uiui/zyos/bean/LessonJson.java
+++ b/app/src/main/java/com/uiui/zyos/bean/LessonJson.java
@@ -0,0 +1,64 @@
+package com.uiui.zyos.bean;
+
+import androidx.annotation.NonNull;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonParser;
+
+import java.io.Serializable;
+
+public class LessonJson implements Serializable {
+    private static final long serialVersionUID = 6825242822560631014L;
+
+    int is_lesson;
+    String start_time;
+    String end_time;
+    int is_monitor;
+    String pkgs;
+
+    public int getIs_lesson() {
+        return is_lesson;
+    }
+
+    public void setIs_lesson(int is_lesson) {
+        this.is_lesson = is_lesson;
+    }
+
+    public String getStart_time() {
+        return start_time;
+    }
+
+    public void setStart_time(String start_time) {
+        this.start_time = start_time;
+    }
+
+    public String getEnd_time() {
+        return end_time;
+    }
+
+    public void setEnd_time(String end_time) {
+        this.end_time = end_time;
+    }
+
+    public int getIs_monitor() {
+        return is_monitor;
+    }
+
+    public void setIs_monitor(int is_monitor) {
+        this.is_monitor = is_monitor;
+    }
+
+    public String getPkgs() {
+        return pkgs;
+    }
+
+    public void setPkgs(String pkgs) {
+        this.pkgs = pkgs;
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return JsonParser.parseString(new Gson().toJson(this)).getAsJsonObject().toString();
+    }
+}
--- a/app/src/main/java/com/uiui/zyos/bean/LessonSetting.java
+++ b/app/src/main/java/com/uiui/zyos/bean/LessonSetting.java
@@ -0,0 +1,64 @@
+package com.uiui.zyos.bean;
+
+import androidx.annotation.NonNull;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonParser;
+
+import java.io.Serializable;
+
+public class LessonSetting implements Serializable {
+    private static final long serialVersionUID = -6129161360078961573L;
+
+    int id;
+    int is_lesson;//是否开启网课模式 0否1是
+    String start_time;//可用时段 开始时间
+    String end_time;//可用时段 结束时间
+    int is_monitor;//是否开启网课监控 0否1是
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getIs_lesson() {
+        return is_lesson;
+    }
+
+    public void setIs_lesson(int is_lesson) {
+        this.is_lesson = is_lesson;
+    }
+
+    public String getStart_time() {
+        return start_time;
+    }
+
+    public void setStart_time(String start_time) {
+        this.start_time = start_time;
+    }
+
+    public String getEnd_time() {
+        return end_time;
+    }
+
+    public void setEnd_time(String end_time) {
+        this.end_time = end_time;
+    }
+
+    public int getIs_monitor() {
+        return is_monitor;
+    }
+
+    public void setIs_monitor(int is_monitor) {
+        this.is_monitor = is_monitor;
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return JsonParser.parseString(new Gson().toJson(this)).getAsJsonObject().toString();
+    }
+}
--- a/app/src/main/java/com/uiui/zyos/bean/SnInfo.java
+++ b/app/src/main/java/com/uiui/zyos/bean/SnInfo.java
@@ -24,9 +24,11 @@ public class SnInfo implements Serializable {
    String is_lock;
    String is_reset;
    String grade;
-    String name;
    int admin_id;
    String mobile;
+    String avatar;
+    long binding_time;
+

    /*
    *3 商用——企业用户
@@ -143,12 +145,12 @@ public class SnInfo implements Serializable {
        this.is_reset = is_reset;
    }

-    public String getName() {
-        return name;
+    public String getGrade() {
+        return grade;
    }

-    public void setName(String name) {
-        this.name = name;
+    public void setGrade(String grade) {
+        this.grade = grade;
    }

    public int getAdmin_id() {
@@ -159,12 +161,28 @@ public class SnInfo implements Serializable {
        this.admin_id = admin_id;
    }

-    public String getGrade() {
-        return grade;
+    public String getMobile() {
+        return mobile;
    }

-    public void setGrade(String grade) {
-        this.grade = grade;
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public long getBinding_time() {
+        return binding_time;
+    }
+
+    public void setBinding_time(long binding_time) {
+        this.binding_time = binding_time;
    }

    public int getType_id() {
@@ -175,14 +193,6 @@ public class SnInfo implements Serializable {
        this.type_id = type_id;
    }

-    public String getMobile() {
-        return mobile;
-    }
-
-    public void setMobile(String mobile) {
-        this.mobile = mobile;
-    }
-
    @NonNull
    @Override
    public String toString() {