1

app/src/main/java/com/example/ninefourone/nutritionmaster/NutritionMaster.java

@@ -14,8 +14,6 @@ import com.orhanobut.logger.AndroidLogAdapter;
 import com.orhanobut.logger.Logger;
 
 import java.io.IOException;
-import java.lang.reflect.Array;
-import java.util.Arrays;
 
 import okhttp3.Call;
 import okhttp3.Callback;
@@ -103,7 +101,7 @@ public class NutritionMaster extends Application {
      */
     private void initUser() {
         user = new MyUser();
-        user.setNickName("ScorpioMiku");
+        user.setUsername("ScorpioMiku");
     }
 
     /**

app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardAdapter.java

@@ -39,7 +39,7 @@ public class CardAdapter extends RecyclerView.Adapter<CardHolder> {
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
     @Override
     public void onBindViewHolder(CardHolder holder, int position) {
-        holder.bindView(mList.get(position).getPictureId(), mList.get(position).getTitle(), context);
+        holder.bindView(mList.get(position).getPictureId(), mList.get(position), context);
     }
 
     @Override

app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java

@@ -11,6 +11,7 @@ import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
 import com.example.ninefourone.nutritionmaster.R;
+import com.example.ninefourone.nutritionmaster.bean.DailyCard;
 import com.example.ninefourone.nutritionmaster.modules.viewpagerfragments.customization.CustomizationActivity;
 import com.orhanobut.logger.Logger;
 
@@ -41,12 +42,13 @@ public class CardHolder extends RecyclerView.ViewHolder {
     }
 
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-    public void bindView(int picId, String text, final Context context) {
-        tvName.setText(text);
+    public void bindView(int picId, DailyCard dailyCard, final Context context) {
+        tvName.setText(dailyCard.getTitle());
+        tvSign.setText(dailyCard.getDescription());
 //        ivPhoto.setImageDrawable(context.getDrawable(picId));
         Glide.with(context).load(picId).into(ivPhoto);
         i = new Intent(context, CustomizationActivity.class);
-        i.putExtra("SEND_CODE", text);
+        i.putExtra("SEND_CODE", dailyCard.getTitle());
 //        Logger.d(text);
         itemView.setOnClickListener(new View.OnClickListener() {
             @Override

app/src/main/java/com/example/ninefourone/nutritionmaster/bean/MyUser.java

@@ -10,7 +10,7 @@ public class MyUser {
      * password : password
      * last_login : null
      * is_superuser : false
-     * nickName : okhttptest
+     * username : okhttptest
      * first_name :
      * last_name :
      * email :
@@ -28,7 +28,7 @@ public class MyUser {
     private String password;
     private Object last_login;
     private boolean is_superuser;
-    private String nickName;
+    private String username;
     private String first_name;
     private String last_name;
     private String email;
@@ -108,12 +108,12 @@ public class MyUser {
         this.is_superuser = is_superuser;
     }
 
-    public String getNickName() {
-        return nickName;
+    public String getUsername() {
+        return username;
     }
 
-    public void setNickName(String nickName) {
-        this.nickName = nickName;
+    public void setUsername(String username) {
+        this.username = username;
     }
 
     public String getFirst_name() {
@@ -212,7 +212,7 @@ public class MyUser {
                 ", password='" + password + '\'' +
                 ", last_login=" + last_login +
                 ", is_superuser=" + is_superuser +
-                ", nickName='" + nickName + '\'' +
+                ", username='" + username + '\'' +
                 ", first_name='" + first_name + '\'' +
                 ", last_name='" + last_name + '\'' +
                 ", email='" + email + '\'' +

app/src/main/java/com/example/ninefourone/nutritionmaster/modules/MainActivity.java

@@ -25,8 +25,8 @@ import com.example.ninefourone.nutritionmaster.R;
 import com.example.ninefourone.nutritionmaster.adapter.HomePagerAdapter;
 import com.example.ninefourone.nutritionmaster.base.BaseActivity;
 import com.example.ninefourone.nutritionmaster.camera.FoodMaterialCamera;
-import com.example.ninefourone.nutritionmaster.modules.addinformation.AddPhysiqueActivity;
 import com.example.ninefourone.nutritionmaster.modules.addinformation.AddInformationActivity;
+import com.example.ninefourone.nutritionmaster.modules.addinformation.AddPhysiqueActivity;
 import com.example.ninefourone.nutritionmaster.modules.information.InformationActivity;
 import com.example.ninefourone.nutritionmaster.ui.NoScrollViewPager;
 import com.example.ninefourone.nutritionmaster.utils.CalculateUtils;
@@ -109,6 +109,8 @@ public class MainActivity extends BaseActivity {
     RoundCornerProgressBar heightBar;
     @BindView(R.id.weight_bar)
     RoundCornerProgressBar weightBar;
+    @BindView(R.id.tool_bar_nickname)
+    TextView toolBarNickname;
 
 
     @Override
@@ -129,7 +131,6 @@ public class MainActivity extends BaseActivity {
                 } else {
                     titleLayout.setBackgroundColor(getColor(R.color.bar_open));
                 }
-
             }
 
             @Override
@@ -137,13 +138,10 @@ public class MainActivity extends BaseActivity {
 //                Logger.i("openRatio=" + openRatio + " ,offsetPixels=" + offsetPixels);
             }
         });
-//        initInforView();
         initSpiderView();
         initViewPager();
         initSearchView();
         initBMB();
-//        initOccupations();
-
     }
 
     /**
@@ -164,7 +162,7 @@ public class MainActivity extends BaseActivity {
 
     @Override
     public void initToolBar() {
-
+        toolBarNickname.setText(user.getUsername());
     }
 
     @Override

app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationFragment.java

@@ -15,6 +15,7 @@ import com.example.ninefourone.nutritionmaster.bean.DailyCard;
 import com.example.ninefourone.nutritionmaster.cardconfig.CardConfig;
 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 java.util.ArrayList;
@@ -80,11 +81,20 @@ public class CustomizationFragment extends BaseFragment {
     @Override
     protected void loadData() {
         super.loadData();
-        for (int i = 1; i <= 7; i++) {
+        for (int i = CalculateUtils.getWeek(); i <= 7; i++) {
 //            mDataList.add("周" + ConstantUtils.arab2Chinese(i) + "美食普");
             DailyCard dailyCard = new DailyCard(
                     "周" + ConstantUtils.arab2Chinese(i) + "美食普",
-                    "这里放描述",
+                    ConstantUtils.dailyDescibes[i-1],
+                    picList[i - 1]
+            );
+            mDataList.add(dailyCard);
+        }
+        for (int i = 1; i < CalculateUtils.getWeek(); i++) {
+//            mDataList.add("周" + ConstantUtils.arab2Chinese(i) + "美食普");
+            DailyCard dailyCard = new DailyCard(
+                    "周" + ConstantUtils.arab2Chinese(i) + "美食普",
+                    ConstantUtils.dailyDescibes[i-1],
                     picList[i - 1]
             );
             mDataList.add(dailyCard);

app/src/main/java/com/example/ninefourone/nutritionmaster/utils/CalculateUtils.java

@@ -2,6 +2,8 @@ package com.example.ninefourone.nutritionmaster.utils;
 
 import com.orhanobut.logger.Logger;
 
+import java.util.Calendar;
+
 /**
  * Created by ScorpioMiku on 2018/8/29.
  */
@@ -59,4 +61,15 @@ public class CalculateUtils {
             return "重度肥胖";
         }
     }
+
+    /**
+     * 获取星期几
+     *
+     * @return
+     */
+    public static int getWeek() {
+        Calendar calendar = Calendar.getInstance();
+        Logger.d( calendar.get(Calendar.DAY_OF_WEEK));
+        return calendar.get(Calendar.DAY_OF_WEEK)-1;
+    }
 }

app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ConstantUtils.java

@@ -7,6 +7,10 @@ import java.util.ArrayList;
  */
 
 public class ConstantUtils {
+
+    public static String[] dailyDescibes = {"快乐陪周一", "幸运伴周二", "轻松有周三", "温馨携周四",
+            "愉悦同周五", "休闲找周六", "潇洒属周日"};
+
     public static String arab2Chinese(int number) {
         switch (number) {
             case 1:

app/src/main/res/layout/activity_main.xml

@@ -59,6 +59,7 @@
                             android:src="@drawable/test_avatar" />
 
                         <TextView
+                            android:id="@+id/tool_bar_nickname"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="10dp"