diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/NutritionMaster.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/NutritionMaster.java index 31b7f5f..f58576c 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/NutritionMaster.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/NutritionMaster.java @@ -176,9 +176,9 @@ public class NutritionMaster extends Application { // 获取所有响应头字段 Map> map = connection.getHeaderFields(); // 遍历所有的响应头字段 - for (String key : map.keySet()) { - System.err.println(key + "--->" + map.get(key)); - } +// for (String key : map.keySet()) { +// System.err.println(key + "--->" + map.get(key)); +// } // 定义 BufferedReader输入流来读取URL的响应 BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream())); String result = ""; diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationFragment.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationFragment.java index 88d4bf9..f52e2d7 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationFragment.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationFragment.java @@ -17,6 +17,7 @@ import com.example.ninefourone.nutritionmaster.cardconfig.CardItemTouchCallBack; import com.example.ninefourone.nutritionmaster.cardconfig.SwipeCardLayoutManager; import com.example.ninefourone.nutritionmaster.utils.CalculateUtils; import com.example.ninefourone.nutritionmaster.utils.ConstantUtils; +import com.orhanobut.logger.Logger; import java.util.ArrayList; @@ -82,10 +83,11 @@ public class CustomizationFragment extends BaseFragment { protected void loadData() { super.loadData(); for (int i = CalculateUtils.getWeek(); i <= 7; i++) { +// Logger.d(CalculateUtils.getWeek()); // mDataList.add("周" + ConstantUtils.arab2Chinese(i) + "美食普"); DailyCard dailyCard = new DailyCard( "周" + ConstantUtils.arab2Chinese(i) + "美食普", - ConstantUtils.dailyDescibes[i-1], + ConstantUtils.dailyDescibes[i - 1], picList[i - 1] ); mDataList.add(dailyCard); @@ -94,7 +96,7 @@ public class CustomizationFragment extends BaseFragment { // mDataList.add("周" + ConstantUtils.arab2Chinese(i) + "美食普"); DailyCard dailyCard = new DailyCard( "周" + ConstantUtils.arab2Chinese(i) + "美食普", - ConstantUtils.dailyDescibes[i-1], + ConstantUtils.dailyDescibes[i - 1], picList[i - 1] ); mDataList.add(dailyCard); diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/CalculateUtils.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/CalculateUtils.java index f947147..22c79d6 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/CalculateUtils.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/CalculateUtils.java @@ -73,7 +73,13 @@ public class CalculateUtils { public static int getWeek() { Calendar calendar = Calendar.getInstance(); // Logger.d( calendar.get(Calendar.DAY_OF_WEEK)); - return calendar.get(Calendar.DAY_OF_WEEK) - 1; +// calendar.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY); + int week = calendar.get(Calendar.DAY_OF_WEEK) - 1; + Logger.d(week); + if (week == 0) { + return 7; + } + return week; } /**