天气、宜忌

app/build.gradle

@@ -91,6 +91,9 @@ dependencies {
     implementation "com.umeng.umsdk:common:9.1.0" //（必选）
     implementation "com.umeng.umsdk:asms:1.1.3" // asms包依赖(必选)
     implementation "com.umeng.umsdk:crash:0.0.4" // native crash包依赖(必选)
+
+    // Jsoup解析网页
+    //implementation 'org.jsoup:jsoup:1.13.1'
 }
 repositories {
     mavenCentral()

app/src/main/java/com/itant/shibei/ui/home/tool/weather/WeatherActivity.java

@@ -17,7 +17,7 @@ import com.miekir.common.utils.ToastTool;
  * 天气界面
  */
 public class WeatherActivity extends BaseBeiActivity implements View.OnClickListener {
-    private static final String FORMAT_URL = "%s/shibei/weather";
+    private static final String FORMAT_URL = "%s/shibei/api/getWeather";
     private static final String FORMAT_EMAIL = "\"email\":\"%s\"";
     private static final String FORMAT_TOKEN = "\"token\":\"%s\"";
 
@@ -51,9 +51,8 @@ public class WeatherActivity extends BaseBeiActivity implements View.OnClickList
 
         EditText et_weather = findViewById(R.id.et_yiji);
         et_weather.setText("{\n" +
-                "  \"temperatureLow\": 28.5,\n" +
-                "  \"temperatureHigh\": 30.5,\n" +
-                "  \"temperatureNow\": 29.2,\n" +
+                "  \"temperatureRange\": \"28.5 ~ 31 ℃\",\n" +
+                "  \"temperatureNow\": \"29.2\",\n" +
                 "  \"wind\": \"无持续风，微风\",\n" +
                 "  \"air\": \"优\",\n" +
                 "  \"desc\": \"阵雨转多云\"\n" +

app/src/main/java/com/itant/shibei/ui/home/tool/weather/WeatherBean.java

@@ -0,0 +1,16 @@
+package com.itant.shibei.ui.home.tool.weather;
+
+/**
+ * Copyright (C), 2019-2020, Miekir
+ *
+ * @author Miekir
+ * @date 2020/8/14 20:44
+ * Description: 天气实体
+ */
+public class WeatherBean {
+    public String temperatureRange;
+    public String temperatureNow;
+    public String wind;
+    public String air;
+    public String desc;
+}

app/src/main/java/com/itant/shibei/ui/home/tool/yiji/YijiActivity.java

@@ -17,7 +17,7 @@ import com.miekir.common.utils.ToastTool;
  * 黄历界面
  */
 public class YijiActivity extends BaseBeiActivity implements View.OnClickListener {
-    private static final String FORMAT_URL = "%s/shibei/weather";
+    private static final String FORMAT_URL = "%s/shibei/api/getYiji";
     private static final String FORMAT_EMAIL = "\"email\":\"%s\"";
     private static final String FORMAT_TOKEN = "\"token\":\"%s\"";
 
@@ -51,13 +51,9 @@ public class YijiActivity extends BaseBeiActivity implements View.OnClickListene
 
         EditText et_yiji = findViewById(R.id.et_yiji);
         et_yiji.setText("{\n" +
-                "  \"newDate\": \"2020-08-14\",\n" +
-                "  \"animalYear\": \"鼠年\",\n" +
-                "  \"oldYear\": \"二〇二〇年\",\n" +
-                "  \"oldMonthDay\": \"六月廿五\",\n" +
-                "  \"hsYear\": \"庚子年\",\n" +
-                "  \"hsMonth\": \"甲申月\",\n" +
-                "  \"hsDay\": \"己丑日\",\n" +
+                "  \"newDate\": \"2020年8月14日 星期五\",\n" +
+                "  \"oldDate\": \"农历二零二零年 六月(小)廿五\",\n" +
+                "  \"hsDate\": \"庚子鼠年 甲申月 己丑日\",\n" +
                 "  \"yi\": \"结婚、领证、动土、安床\",\n" +
                 "  \"ji\": \"搬家、装修、开业\"\n" +
                 "}");

app/src/main/java/com/itant/shibei/ui/home/tool/yiji/YijiBean.java

@@ -0,0 +1,16 @@
+package com.itant.shibei.ui.home.tool.yiji;
+
+/**
+ * Copyright (C), 2019-2020, Miekir
+ *
+ * @author Miekir
+ * @date 2020/8/14 22:16
+ * Description: 宜忌实体
+ */
+public class YijiBean {
+    public String newDate;
+    public String oldDate;
+    public String hsDate;
+    public String yi;
+    public String ji;
+}