diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddActivity.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddActivity.java
index 915cd06..8bd06e1 100644
--- a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddActivity.java
+++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddActivity.java
@@ -16,6 +16,7 @@ import android.widget.TextView;
import android.widget.Toast;
import com.example.ninefourone.nutritionmaster.R;
+import com.example.ninefourone.nutritionmaster.utils.ConstantUtils;
import com.example.ninefourone.nutritionmaster.utils.MessageUtils;
import com.github.czy1121.view.TurnCardListView;
import com.orhanobut.logger.Logger;
@@ -37,8 +38,15 @@ public class AddActivity extends AppCompatActivity {
private int[] colors = {0xff3F51B5, 0xff673AB7, 0xff006064, 0xffC51162, 0xffFFEB3B, 0xff795548, 0xff9E9E9E};
private Button[] firstButtons = new Button[colors.length];
private Button[] secondButtons = new Button[colors.length];
+ private Button[] thirdButtons = new Button[colors.length];
private TextView[] titleViews = new TextView[colors.length];
+ private Button[][] buttonList = new Button[][]{
+ firstButtons,
+ secondButtons,
+ thirdButtons
+ };
+
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
requestWindowFeature(Window.FEATURE_NO_TITLE);
@@ -76,16 +84,30 @@ public class AddActivity extends AppCompatActivity {
child = LayoutInflater.from(parent.getContext()).inflate(R.layout.add_item, parent, false);
child.findViewById(R.id.image).setBackgroundColor(colors[position]);
titleViews[position] = child.findViewById(R.id.title_view);
+ titleViews[position].setText(ConstantUtils.questionList[position]);
+
firstButtons[position] = child.findViewById(R.id.choose_first);
firstButtons[position].setBackgroundColor(colors[position] + 30);
+ for (int i = 0; i < ConstantUtils.answerList[position].length; i++) {
+ firstButtons[position].setText(ConstantUtils.answerList[position][i]);
+ }
+
secondButtons[position] = child.findViewById(R.id.choose_second);
secondButtons[position].setBackgroundColor(colors[position] + 30);
+ for (int i = 0; i < ConstantUtils.answerList[position].length; i++) {
+ firstButtons[position].setText(ConstantUtils.answerList[position][i]);
+ }
+
+ thirdButtons[position] = child.findViewById(R.id.choose_third);
+ thirdButtons[position].setBackgroundColor(colors[position] + 30);
+
firstButtons[position].setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
firstButtons[position].setBackgroundColor(colors[position] - 60);
secondButtons[position].setBackgroundColor(colors[position] + 30);
+ thirdButtons[position].setBackgroundColor(colors[position] + 30);
cardList.turnTo(position + 1);
}
});
@@ -93,10 +115,20 @@ public class AddActivity extends AppCompatActivity {
@Override
public void onClick(View v) {
firstButtons[position].setBackgroundColor(colors[position] + 30);
+ thirdButtons[position].setBackgroundColor(colors[position] + 30);
secondButtons[position].setBackgroundColor(colors[position] - 60);
cardList.turnTo(position + 1);
}
});
+ thirdButtons[position].setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ firstButtons[position].setBackgroundColor(colors[position] + 30);
+ secondButtons[position].setBackgroundColor(colors[position] + 30);
+ thirdButtons[position].setBackgroundColor(colors[position] - 60);
+ cardList.turnTo(position + 1);
+ }
+ });
return child;
}
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ConstantUtils.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ConstantUtils.java
index a982033..01557a0 100644
--- a/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ConstantUtils.java
+++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ConstantUtils.java
@@ -28,4 +28,24 @@ public class ConstantUtils {
}
}
+
+ public static String[] questionList = new String[]{
+ "现在去照照镜子吧",
+ "你舌苔的颜色",
+ "舌底经络颜色",
+ "口腔整体情况",
+ "整体生活精神状况",
+ "性格特点",
+ "食物温度偏向"
+ };
+
+ public static String[][] answerList = new String[][]{
+ {"开始吧"},
+ {"偏暗红", "偏白", "淡红"},
+ {"暗红", "细红", "不明显"},
+ {"口舌干燥", "口黏苔腻", "还算正常"},
+ {"沉寂易疲劳", "精力充沛"},
+ {"内向", "开朗"},
+ {"烫的", "冷的", "没有特别喜欢的"}
+ };
}
diff --git a/app/src/main/res/layout/add_item.xml b/app/src/main/res/layout/add_item.xml
index f400d82..9c09a73 100644
--- a/app/src/main/res/layout/add_item.xml
+++ b/app/src/main/res/layout/add_item.xml
@@ -33,9 +33,9 @@
@@ -49,5 +49,15 @@
+
+
\ No newline at end of file