version:4.4

fix:
update:优化闹钟页面，优化日常应用

app/src/main/java/com/uiuios/aios/bean/AddressBean.java

@@ -0,0 +1,63 @@
+package com.uiuios.aios.bean;
+
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+
+import java.io.Serializable;
+
+public class AddressBean implements Serializable {
+    private static final long serialVersionUID = 5408415869212907187L;
+
+    private String mProvince;
+    private String mCity;
+    private String mDistrict;
+
+    public AddressBean(String province, String city, String district) {
+        mProvince = province;
+        mCity = city;
+        mDistrict = district;
+    }
+
+
+    public AddressBean(String district) {
+        mDistrict = district;
+    }
+
+    public String getProvince() {
+        return mProvince;
+    }
+
+    public void setProvince(String province) {
+        mProvince = province;
+    }
+
+    public String getCity() {
+        return mCity;
+    }
+
+    public void setCity(String city) {
+        mCity = city;
+    }
+
+    public String getDistrict() {
+        return mDistrict;
+    }
+
+    public void setDistrict(String district) {
+        mDistrict = district;
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        String s = "";
+        if (!TextUtils.isEmpty(mProvince))
+            s += mProvince;
+        if (!TextUtils.isEmpty(mCity))
+            s += mCity;
+        if (!TextUtils.isEmpty(mDistrict))
+            s += mDistrict;
+        return s;
+    }
+}

app/src/main/java/com/uiuios/aios/bean/ArticleInfo.java

@@ -15,6 +15,11 @@ public class ArticleInfo implements Serializable {
     /*跳转链接*/
     String jump_url;
 
+    int weight;
+    int click_count;
+    String third_url;
+    long update_time;
+
     public int getId() {
         return id;
     }
@@ -54,4 +59,36 @@ public class ArticleInfo implements Serializable {
     public void setJump_url(String jump_url) {
         this.jump_url = jump_url;
     }
+
+    public int getWeight() {
+        return weight;
+    }
+
+    public void setWeight(int weight) {
+        this.weight = weight;
+    }
+
+    public int getClick_count() {
+        return click_count;
+    }
+
+    public void setClick_count(int click_count) {
+        this.click_count = click_count;
+    }
+
+    public String getThird_url() {
+        return third_url;
+    }
+
+    public void setThird_url(String third_url) {
+        this.third_url = third_url;
+    }
+
+    public long getUpdate_time() {
+        return update_time;
+    }
+
+    public void setUpdate_time(long update_time) {
+        this.update_time = update_time;
+    }
 }

app/src/main/java/com/uiuios/aios/bean/CategoryBean.java

@@ -0,0 +1,26 @@
+package com.uiuios.aios.bean;
+
+import java.io.Serializable;
+
+public class CategoryBean implements Serializable {
+    private static final long serialVersionUID = -1254376015727204975L;
+
+    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;
+    }
+}

app/src/main/java/com/uiuios/aios/bean/JsonBean.java

@@ -0,0 +1,76 @@
+package com.uiuios.aios.bean;
+
+
+import com.contrarywind.interfaces.IPickerViewData;
+
+import java.util.List;
+
+/**
+ * TODO<json数据源>
+ *
+ * @author: 小嵩
+ * @date: 2017/3/16 15:36
+ */
+
+public class JsonBean implements IPickerViewData {
+
+
+    /**
+     * name : 省份
+     * city : [{"name":"北京市","area":["东城区","西城区","崇文区","宣武区","朝阳区"]}]
+     */
+
+    private String name;
+    private List<CityBean> city;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public List<CityBean> getCityList() {
+        return city;
+    }
+
+    public void setCityList(List<CityBean> city) {
+        this.city = city;
+    }
+
+    // 实现 IPickerViewData 接口，
+    // 这个用来显示在PickerView上面的字符串，
+    // PickerView会通过IPickerViewData获取getPickerViewText方法显示出来。
+    @Override
+    public String getPickerViewText() {
+        return this.name;
+    }
+
+
+    public static class CityBean {
+        /**
+         * name : 城市
+         * area : ["东城区","西城区","崇文区","昌平区"]
+         */
+
+        private String name;
+        private List<String> area;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public List<String> getArea() {
+            return area;
+        }
+
+        public void setArea(List<String> area) {
+            this.area = area;
+        }
+    }
+}

app/src/main/java/com/uiuios/aios/bean/MapGeoBean.java

@@ -0,0 +1,37 @@
+package com.uiuios.aios.bean;
+
+import androidx.annotation.NonNull;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonParser;
+
+import java.io.Serializable;
+
+public class MapGeoBean implements Serializable {
+    private static final long serialVersionUID = 3502542257994267517L;
+
+    int status;
+    MapGeoResult result;
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public MapGeoResult getResult() {
+        return result;
+    }
+
+    public void setResult(MapGeoResult result) {
+        this.result = result;
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return JsonParser.parseString(new Gson().toJson(this)).getAsJsonObject().toString();
+    }
+}

app/src/main/java/com/uiuios/aios/bean/MapGeoLocation.java

@@ -0,0 +1,34 @@
+package com.uiuios.aios.bean;
+
+import androidx.annotation.NonNull;
+
+import java.io.Serializable;
+
+public class MapGeoLocation implements Serializable {
+    private static final long serialVersionUID = -1877191050083863647L;
+
+    String lng;
+    String lat;
+
+    public String getLng() {
+        return lng;
+    }
+
+    public void setLng(String lng) {
+        this.lng = lng;
+    }
+
+    public String getLat() {
+        return lat;
+    }
+
+    public void setLat(String lat) {
+        this.lat = lat;
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return lng + "," + lat;
+    }
+}

app/src/main/java/com/uiuios/aios/bean/MapGeoResult.java

@@ -0,0 +1,64 @@
+package com.uiuios.aios.bean;
+
+import androidx.annotation.NonNull;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonParser;
+
+import java.io.Serializable;
+
+public class MapGeoResult implements Serializable {
+    private static final long serialVersionUID = 2065809223607379059L;
+
+    MapGeoLocation location;
+    int precise;
+    int confidence;
+    int comprehension;
+    String level;
+
+    public MapGeoLocation getLocation() {
+        return location;
+    }
+
+    public void setLocation(MapGeoLocation location) {
+        this.location = location;
+    }
+
+    public int getPrecise() {
+        return precise;
+    }
+
+    public void setPrecise(int precise) {
+        this.precise = precise;
+    }
+
+    public int getConfidence() {
+        return confidence;
+    }
+
+    public void setConfidence(int confidence) {
+        this.confidence = confidence;
+    }
+
+    public int getComprehension() {
+        return comprehension;
+    }
+
+    public void setComprehension(int comprehension) {
+        this.comprehension = comprehension;
+    }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public void setLevel(String level) {
+        this.level = level;
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return JsonParser.parseString(new Gson().toJson(this)).getAsJsonObject().toString();
+    }
+}