version:1.8.9

fix:优化英语界面报错 update:用户页显示作业分发
2024-09-02 09:29:00 +08:00
parent a049a16738
commit d73f0f1371
39 changed files with 2154 additions and 136 deletions
--- a/app/src/main/java/com/uiui/zyos/bean/AppBase.java
+++ b/app/src/main/java/com/uiui/zyos/bean/AppBase.java
@@ -0,0 +1,58 @@
+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 AppBase implements Serializable {
+    private static final long serialVersionUID = -1084612101570534997L;
+
+    int id;
+    String app_name;
+    String app_package;
+//    @SerializedName(value = "icon", alternate = "app_icon")
+    String icon;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getApp_name() {
+        return app_name;
+    }
+
+    public void setApp_name(String app_name) {
+        this.app_name = app_name;
+    }
+
+    public String getApp_package() {
+        return app_package;
+    }
+
+    public void setApp_package(String app_package) {
+        this.app_package = app_package;
+    }
+
+    public String getIcon() {
+        return icon;
+    }
+
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
+
+
+    @NonNull
+    @Override
+    public String toString() {
+        return JsonParser.parseString(new Gson().toJson(this)).getAsJsonObject().toString();
+    }
+
+}
--- a/app/src/main/java/com/uiui/zyos/bean/AppUpdateInfo.java
+++ b/app/src/main/java/com/uiui/zyos/bean/AppUpdateInfo.java
@@ -0,0 +1,109 @@
+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 AppUpdateInfo implements Serializable {
+    private static final long serialVersionUID = -683006285701880863L;
+
+    int id;
+    int app_id;
+    String app_version_name;
+    long app_version_code;
+    long app_size;
+    String app_desc;
+    String app_md5;
+    String app_url;
+    String is_forcedown;
+    AppBase app;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getApp_id() {
+        return app_id;
+    }
+
+    public void setApp_id(int app_id) {
+        this.app_id = app_id;
+    }
+
+    public String getApp_version_name() {
+        return app_version_name;
+    }
+
+    public void setApp_version_name(String app_version_name) {
+        this.app_version_name = app_version_name;
+    }
+
+    public long getApp_version_code() {
+        return app_version_code;
+    }
+
+    public void setApp_version_code(long app_version_code) {
+        this.app_version_code = app_version_code;
+    }
+
+    public long getApp_size() {
+        return app_size;
+    }
+
+    public void setApp_size(long app_size) {
+        this.app_size = app_size;
+    }
+
+    public String getApp_desc() {
+        return app_desc;
+    }
+
+    public void setApp_desc(String app_desc) {
+        this.app_desc = app_desc;
+    }
+
+    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;
+    }
+
+    public String getIs_forcedown() {
+        return is_forcedown;
+    }
+
+    public void setIs_forcedown(String is_forcedown) {
+        this.is_forcedown = is_forcedown;
+    }
+
+    public AppBase getApp() {
+        return app;
+    }
+
+    public void setApp(AppBase app) {
+        this.app = app;
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return JsonParser.parseString(new Gson().toJson(this)).getAsJsonObject().toString();
+    }
+}
--- a/app/src/main/java/com/uiui/zyos/bean/AriaDownloadInfo.java
+++ b/app/src/main/java/com/uiui/zyos/bean/AriaDownloadInfo.java
@@ -0,0 +1,140 @@
+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 AriaDownloadInfo implements Serializable {
+    private static final long serialVersionUID = -2835281454196323431L;
+
+    int appId;
+    String appName;
+    String appPackage;
+    String appVersionName;
+    long appVersionCode;
+    String appUrl;
+    String appIcon;
+    long appSize;
+    String appMd5;
+
+    public AriaDownloadInfo(int appId, String appName, String appPackage, String appVersionName, long appVersionCode, String appUrl, String appIcon, long appSize, String appMd5) {
+        this.appId = appId;
+        this.appName = appName;
+        this.appPackage = appPackage;
+        this.appVersionName = appVersionName;
+        this.appVersionCode = appVersionCode;
+        this.appUrl = appUrl;
+        this.appIcon = appIcon;
+        this.appSize = appSize;
+        this.appMd5 = appMd5;
+    }
+
+    public int getAppId() {
+        return appId;
+    }
+
+    public void setAppId(int appId) {
+        this.appId = appId;
+    }
+
+    public String getAppName() {
+        return appName;
+    }
+
+    public void setAppName(String appName) {
+        this.appName = appName;
+    }
+
+    public String getAppPackage() {
+        return appPackage;
+    }
+
+    public void setAppPackage(String appPackage) {
+        this.appPackage = appPackage;
+    }
+
+    public String getAppVersionName() {
+        return appVersionName;
+    }
+
+    public void setAppVersionName(String appVersionName) {
+        this.appVersionName = appVersionName;
+    }
+
+    public long getAppVersionCode() {
+        return appVersionCode;
+    }
+
+    public void setAppVersionCode(long appVersionCode) {
+        this.appVersionCode = appVersionCode;
+    }
+
+    public String getAppUrl() {
+        return appUrl;
+    }
+
+    public void setAppUrl(String appUrl) {
+        this.appUrl = appUrl;
+    }
+
+    public String getAppIcon() {
+        return appIcon;
+    }
+
+    public void setAppIcon(String appIcon) {
+        this.appIcon = appIcon;
+    }
+
+    public long getAppSize() {
+        return appSize;
+    }
+
+    public void setAppSize(long appSize) {
+        this.appSize = appSize;
+    }
+
+    public String getAppMd5() {
+        return appMd5;
+    }
+
+    public void setAppMd5(String appMd5) {
+        this.appMd5 = appMd5;
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return JsonParser.parseString(new Gson().toJson(this)).getAsJsonObject().toString();
+    }
+
+    public static AriaDownloadInfo toAriaDownloadInfo(AppUpdateInfo appUpdateInfo) {
+        return new AriaDownloadInfo(
+                appUpdateInfo.getApp_id(),
+                appUpdateInfo.getApp().getApp_name(),
+                appUpdateInfo.getApp().getApp_package(),
+                appUpdateInfo.getApp_version_name(),
+                appUpdateInfo.getApp_version_code(),
+                appUpdateInfo.getApp_url(),
+                appUpdateInfo.getApp().getIcon(),
+                appUpdateInfo.getApp_size(),
+                appUpdateInfo.getApp_md5()
+        );
+    }
+//
+//    public static AriaDownloadInfo toAriaDownloadInfo(AppDetails appDetails) {
+//        return new AriaDownloadInfo(
+//                appDetails.getId(),
+//                appDetails.getApp_name(),
+//                appDetails.getApp_package(),
+//                appDetails.getApp_version_name(),
+//                appDetails.getApp_version_code(),
+//                appDetails.getApp_url(),
+//                appDetails.getApp_icon(),
+//                appDetails.getApp_size(),
+//                appDetails.getApp_md5()
+//        );
+//    }
+}
--- a/app/src/main/java/com/uiui/zyos/bean/HomeworkBean.java
+++ b/app/src/main/java/com/uiui/zyos/bean/HomeworkBean.java
@@ -0,0 +1,134 @@
+package com.uiui.zyos.bean;
+
+import java.io.Serializable;
+
+public class HomeworkBean implements Serializable {
+    private static final long serialVersionUID = 4974017718666880157L;
+
+    int id;
+    int subject_id;
+    int status;
+    String sn;
+    String title;
+    String content;
+    String file_url;
+    String file_name;
+    int file_type;
+    int work_type;
+    String end_time;
+    String created_at;
+    String updated_at;
+    HomeworkSubject subject;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getSubject_id() {
+        return subject_id;
+    }
+
+    public void setSubject_id(int subject_id) {
+        this.subject_id = subject_id;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getSn() {
+        return sn;
+    }
+
+    public void setSn(String sn) {
+        this.sn = sn;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getFile_url() {
+        return file_url;
+    }
+
+    public void setFile_url(String file_url) {
+        this.file_url = file_url;
+    }
+
+    public String getFile_name() {
+        return file_name;
+    }
+
+    public void setFile_name(String file_name) {
+        this.file_name = file_name;
+    }
+
+    public int getFile_type() {
+        return file_type;
+    }
+
+    public void setFile_type(int file_type) {
+        this.file_type = file_type;
+    }
+
+    public int getWork_type() {
+        return work_type;
+    }
+
+    public void setWork_type(int work_type) {
+        this.work_type = work_type;
+    }
+
+    public String getEnd_time() {
+        return end_time;
+    }
+
+    public void setEnd_time(String end_time) {
+        this.end_time = end_time;
+    }
+
+    public String getCreated_at() {
+        return created_at;
+    }
+
+    public void setCreated_at(String created_at) {
+        this.created_at = created_at;
+    }
+
+    public String getUpdated_at() {
+        return updated_at;
+    }
+
+    public void setUpdated_at(String updated_at) {
+        this.updated_at = updated_at;
+    }
+
+    public HomeworkSubject getSubject() {
+        return subject;
+    }
+
+    public void setSubject(HomeworkSubject subject) {
+        this.subject = subject;
+    }
+}
--- a/app/src/main/java/com/uiui/zyos/bean/HomeworkSubject.java
+++ b/app/src/main/java/com/uiui/zyos/bean/HomeworkSubject.java
@@ -0,0 +1,26 @@
+package com.uiui.zyos.bean;
+
+import java.io.Serializable;
+
+public class HomeworkSubject implements Serializable {
+    private static final long serialVersionUID = 8454145003419075553L;
+
+    int id;
+    String name;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}