diff --git a/README.md b/README.md index 17b1564..0656f32 100644 --- a/README.md +++ b/README.md @@ -182,6 +182,6 @@ * POST新建用户信息`params`示例 * 1♂ 0♀ - * `occupation_name`,`physical_name`的值必须和数据库对应 + * `occupation_name`,`physique`的值必须和数据库对应 ![](http://ww1.sinaimg.cn/large/0077h8xtly1fvjbfh6vm1j30r70eh3zj.jpg) diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseActivity.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseActivity.java index 336029b..5cbb88b 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseActivity.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseActivity.java @@ -17,6 +17,7 @@ import butterknife.Unbinder; public abstract class BaseActivity extends AppCompatActivity { private Unbinder unbinder; + protected MyUser user; @Override protected void onCreate(@Nullable Bundle savedInstanceState) { @@ -25,6 +26,7 @@ public abstract class BaseActivity extends AppCompatActivity { unbinder = ButterKnife.bind(this); initViews(savedInstanceState); initToolBar(); + this.user = NutritionMaster.user; } @@ -89,8 +91,9 @@ public abstract class BaseActivity extends AppCompatActivity { unbinder.unbind(); } - protected void upUser(MyUser user) { + protected void upUser() { NutritionMaster.user = user; + Logger.d("用户信息已改"+NutritionMaster.user.toString()); } @Override diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseFragment.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseFragment.java index 9753cd5..fb21713 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseFragment.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseFragment.java @@ -11,7 +11,7 @@ import android.view.ViewGroup; import com.example.ninefourone.nutritionmaster.NutritionMaster; import com.example.ninefourone.nutritionmaster.bean.MyUser; -import com.example.ninefourone.nutritionmaster.bean.User; +import com.orhanobut.logger.Logger; import butterknife.ButterKnife; import butterknife.Unbinder; @@ -21,6 +21,7 @@ import butterknife.Unbinder; */ public abstract class BaseFragment extends Fragment { + private MyUser user; private View parentView; private FragmentActivity activity; protected boolean isPrepared; @@ -43,6 +44,7 @@ public abstract class BaseFragment extends Fragment { super.onViewCreated(view, savedInstanceState); unbinder = ButterKnife.bind(this, view); initView(savedInstanceState); + this.user = NutritionMaster.user; } @@ -153,8 +155,9 @@ public abstract class BaseFragment extends Fragment { protected void finishTask() { } - protected void upUser(MyUser user) { + protected void upUser() { NutritionMaster.user = user; + Logger.d("用户信息已改"+NutritionMaster.user.toString()); } } diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/MyUser.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/MyUser.java index 76db8ba..3758f6c 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/MyUser.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/MyUser.java @@ -6,7 +6,7 @@ public class MyUser { /** * id : 7 - * physical_name : 平和质 + * physique : 平和质 * password : password * last_login : null * is_superuser : false @@ -24,7 +24,7 @@ public class MyUser { */ private int id; - private String physical_name; + private Physique physique; private String password; private Object last_login; private boolean is_superuser; @@ -76,12 +76,12 @@ public class MyUser { this.id = id; } - public String getPhysical_name() { - return physical_name; + public Physique getPhysique() { + return physique; } - public void setPhysical_name(String physical_name) { - this.physical_name = physical_name; + public void setPhysique(Physique physique) { + this.physique = physique; } public String getPassword() { @@ -208,7 +208,7 @@ public class MyUser { public String toString() { return "MyUser{" + "id=" + id + - ", physical_name='" + physical_name + '\'' + + ", physique='" + physique + '\'' + ", password='" + password + '\'' + ", last_login=" + last_login + ", is_superuser=" + is_superuser + diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Physique.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Physique.java index 0c52c67..f001b76 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Physique.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Physique.java @@ -27,6 +27,53 @@ public class Physique { this.cure_material = cure_material; } + private String imageUrl; + private String expression; + private String characteristic; + private String mentality; + private String matters; + + + public String getImageUrl() { + return imageUrl; + } + + public void setImageUrl(String imageUrl) { + this.imageUrl = imageUrl; + } + + public String getExpression() { + return expression; + } + + public void setExpression(String expression) { + this.expression = expression; + } + + public String getCharacteristic() { + return characteristic; + } + + public void setCharacteristic(String characteristic) { + this.characteristic = characteristic; + } + + public String getMentality() { + return mentality; + } + + public void setMentality(String mentality) { + this.mentality = mentality; + } + + public String getMatters() { + return matters; + } + + public void setMatters(String matters) { + this.matters = matters; + } + @Override public String toString() { return "Physique{" + diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/User.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/User.java deleted file mode 100644 index 54c888c..0000000 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/User.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.example.ninefourone.nutritionmaster.bean; - -/** - * Created by ScorpioMiku on 2018/8/30. - */ - -public class User { - private float height; - private float weight; - private float BMI; - private String sex; - private int age; - private String job; -} diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddInformationActivity.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddInformationActivity.java index d2e0b2b..dc112fe 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddInformationActivity.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddInformationActivity.java @@ -146,7 +146,7 @@ public class AddInformationActivity extends BaseActivity { okButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - MyUser user = NutritionMaster.user; + if (ageTextView.getText().toString().equals("年龄") || weightTextView.getText().toString().equals("体重") || sexTextView.getText().toString().equals("性别") || heightTextView.getText().toString().equals("身高")|| occupationTextView.getText().toString().equals("职业")) { @@ -157,8 +157,7 @@ public class AddInformationActivity extends BaseActivity { user.setAge(Integer.valueOf(ageTextView.getText().toString().split("岁")[0])); user.setSex(sexTextView.getText().toString()); user.setOccupation_name(occupationTextView.getText().toString()); -// Logger.d(user.toString()); - upUser(user); + upUser(); MessageUtils.MakeToast("信息填写成功"); finish(); } diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddPhysiqueActivity.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddPhysiqueActivity.java index 5d5e589..7071c4c 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddPhysiqueActivity.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddPhysiqueActivity.java @@ -1,8 +1,6 @@ package com.example.ninefourone.nutritionmaster.modules.addinformation; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.CardView; import android.view.LayoutInflater; import android.view.View; @@ -15,9 +13,14 @@ import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; +import com.bumptech.glide.Glide; import com.example.ninefourone.nutritionmaster.R; +import com.example.ninefourone.nutritionmaster.base.BaseActivity; +import com.example.ninefourone.nutritionmaster.bean.Physique; import com.example.ninefourone.nutritionmaster.utils.ConstantUtils; +import com.example.ninefourone.nutritionmaster.utils.MessageUtils; import com.github.czy1121.view.TurnCardListView; +import com.github.siyamed.shapeimageview.CircularImageView; import com.orhanobut.logger.Logger; import java.util.Arrays; @@ -26,19 +29,29 @@ import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -public class AddPhysiqueActivity extends AppCompatActivity { +public class AddPhysiqueActivity extends BaseActivity { @BindView(R.id.card_list) TurnCardListView cardList; @BindView(R.id.back_button) ImageView backButton; - @BindView(R.id.title) - TextView title; @BindView(R.id.result_layout) CardView resultLayout; @BindView(R.id.bottom_content) RelativeLayout bottomContent; + @BindView(R.id.physique_image) + CircularImageView physiqueImage; + @BindView(R.id.physique_name_text_view) + TextView physiqueNameTextView; + @BindView(R.id.expression_text_view) + TextView expressionTextView; + @BindView(R.id.characteristic_text_view) + TextView characteristicTextView; + @BindView(R.id.mentality_text_view) + TextView mentalityTextView; + @BindView(R.id.matters_text_view) + TextView mattersTextView; private String result = ""; @@ -57,13 +70,13 @@ public class AddPhysiqueActivity extends AppCompatActivity { @Override - protected void onCreate(@Nullable Bundle savedInstanceState) { - requestWindowFeature(Window.FEATURE_NO_TITLE); - //设置全屏 - getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, - WindowManager.LayoutParams.FLAG_FULLSCREEN); - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_add); + public int getLayoutId() { + return R.layout.activity_add; + } + + @Override + public void initViews(Bundle savedInstanceState) { +// setContentView(); ButterKnife.bind(this); buttonList = new Button[][]{ firstButtons, @@ -73,6 +86,11 @@ public class AddPhysiqueActivity extends AppCompatActivity { initAddView(); } + @Override + public void initToolBar() { + + } + private void initAddView() { BaseAdapter adapter = new BaseAdapter() { @@ -132,6 +150,7 @@ public class AddPhysiqueActivity extends AppCompatActivity { getResult(); resultLayout.setVisibility(View.VISIBLE); cardList.setVisibility(View.INVISIBLE); + MessageUtils.MakeToast("已将体质信息上传至个人信息"); } }); @@ -273,7 +292,7 @@ public class AddPhysiqueActivity extends AppCompatActivity { switch ((int) (codes[3]) - 48) { case 1: counter[0]++; - counter[1]++; + counter[2]++; counter[5]++; counter[6]++; @@ -283,6 +302,7 @@ public class AddPhysiqueActivity extends AppCompatActivity { break; case 2: counter[7]++; + counter[1]++; counter[3] += margin; counter[4] += margin; @@ -359,8 +379,48 @@ public class AddPhysiqueActivity extends AppCompatActivity { counter[8] = counter[i]; } } - Logger.d(Arrays.toString(counter) + "\n" + physiques[maxIndex]); - + physique = physiques[maxIndex]; + Logger.d(Arrays.toString(counter) + "\n" + physique); + Physique phy = new Physique(); + phy.setPhysical_name(physique); + phy.setCharacteristic(ConstantUtils.physiquesCharacteristics[maxIndex]); + phy.setExpression(ConstantUtils.physiquesExpressions[maxIndex]); + phy.setMentality(ConstantUtils.physiquesMentalitys[maxIndex]); + phy.setMatters(ConstantUtils.physiquesMatters[maxIndex]); + phy.setImageUrl(ConstantUtils.physiquesImageUrls[maxIndex]); + user.setPhysique(phy); + upUser(); + loadInformation(phy); } + + @Override + public void onPointerCaptureChanged(boolean hasCapture) { + + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + requestWindowFeature(Window.FEATURE_NO_TITLE); + //设置全屏 + getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, + WindowManager.LayoutParams.FLAG_FULLSCREEN); + super.onCreate(savedInstanceState); + // TODO: add setContentView(...) invocation + ButterKnife.bind(this); + } + + /** + * 加载显示的信息 + * + * @param physique + */ + private void loadInformation(Physique physique) { + Glide.with(AddPhysiqueActivity.this).load(physique.getImageUrl()).into(physiqueImage); + physiqueNameTextView.setText(physique.getPhysical_name()); + expressionTextView.setText(physique.getExpression()); + characteristicTextView.setText(physique.getCharacteristic()); + mentalityTextView.setText(physique.getMentality()); + mattersTextView.setText(physique.getMatters()); + } } 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 1cd278b..00e7978 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 @@ -37,7 +37,7 @@ public class ConstantUtils { "口腔整体情况", "整体生活精神状况", "生活中的小问题", - "食物温度偏向", + "饮用水温度偏向", "揭晓结果" }; @@ -47,7 +47,7 @@ public class ConstantUtils { {"暗紫", "细红", "不明显"}, {"口舌干燥", "口黏苔腻", "还算正常"}, {"沉寂易疲劳", "精力充沛"}, - {"多汗无力", "多愁善感", "都不"}, + {"多汗无力、易胖", "多愁善感", "都不"}, {"烫的", "冷的", "没有特别喜欢的"}, {"查看"} }; @@ -206,4 +206,60 @@ public class ConstantUtils { } + + public static String[] physiquesImageUrls = { + "https://ws1.sinaimg.cn/large/0067fcixly1fvtqro2rrhj30c90eydgu.jpg", + "https://ws1.sinaimg.cn/large/0067fcixly1fvtqro060mj30c90go755.jpg", + "https://ws1.sinaimg.cn/large/0067fcixly1fvtqrnxrnmj30c90go3zp.jpg", + "https://ws1.sinaimg.cn/large/0067fcixly1fvtqwvxzwjj30c90goaav.jpg", + "https://ws1.sinaimg.cn/large/0067fcixly1fvtqrnuqb3j30c90goaar.jpg", + "https://ws1.sinaimg.cn/large/0067fcixly1fvtqrogotyj30c90goq3u.jpg", + "https://ws1.sinaimg.cn/large/0067fcixly1fvtqrodvjij30b70cvdlq.jpg", + "https://ws1.sinaimg.cn/large/0067fcixly1fvtqro7ij0j30970dpafy.jpg" + }; + + public static String[] physiquesExpressions = { + "平素面色晦暗，皮肤偏暗或色素沉着，容易出现瘀斑，易患疼痛，口唇暗淡或紫，舌质暗有点、片状瘀斑，舌下静脉曲张。" + + "眼眶暗黑，鼻部暗滞，发易脱落，皮肤发干，或有出血倾向、吐血，女性多见痛经、闭经、或经血中多有血块，或经色紫黑有块。", + "手足心热，平常容易口燥咽干，鼻微干，口渴喜冷饮，大便干燥，面色潮红、有烘热感，眼睛干涩视物昏花，唇红微干，" + + "皮肤偏干、易生皱纹，眩晕耳鸣，睡眠差，小便短涩。", + "四季怕冷，手足不温，喜热饮食，精神不振，睡眠偏多。面色柔白，目周晦暗，口唇色淡，毛发易落，大便溏稀，小便清长。", + "面部皮肤油脂较多，多汗且黏，胸闷，痰多，面色淡黄而暗，眼胞微浮，容易困倦，口黏腻或甜，身重不爽，喜食肥甘甜黏，大便正常或不实，小便不多或微混，平素舌体胖大。", + "平素面垢油光，容易口苦口干，身重困倦,易生痤疮，体偏胖或苍瘦，心烦懈怠，眼目红赤，大便燥结或黏滞，小便短赤，男易阴囊潮湿，女易带下增多等。", + "性格内向不稳定，忧郁脆弱，敏感多疑，对精神刺激适应能力较差，平常忧郁面貌，神情多烦闷不乐。胸胁胀满，或走窜疼痛，多伴善太息，或嗳气呃逆，或咽间有异物感，或乳房胀痛，睡眠较差，食欲减退，惊悸怔忡，健忘，痰多，大便多干，小便正常。", + "平常说话语音低怯，气短懒言，容易疲乏，精神不振，易出汗。面色偏黄或晄白，目光少神，唇色少华，毛发不华，容易头晕，记忆力减退，大便不成形，或便后仍觉未尽，小便正常或偏多。", + "面色、肤色润泽，头发稠密有光泽，目光有神，鼻色明润，嗅觉、味觉良好，唇色红润，不易疲劳，精力充沛，耐受寒热，睡眠良好，食欲好，二便正常。" + }; + + public static String[] physiquesCharacteristics = { + "瘀血质的人，血行不畅，临床常呈现肤色晦暗、色素沉着、瘀斑、性格抑郁、健忘，舌质紫黯或有瘀点、舌下络脉紫黯或增粗，脉涩。易患痛证、血证、症瘕等。", + "阴虚质的人，阴液亏少，耐冬不耐夏，临床常呈现口燥咽干、手足心热、喜冷饮、大便干燥，舌红少津，脉细数。一般体形偏瘦，易患虚劳、遗精、失眠等。", + "阳虚质的人，阳气不足，临床常呈现畏寒怕冷、手足不暖、喜热饮食、精神不振，舌淡胖嫩，脉迟沉。一般性格内向，易患痰饮、肿胀、泄泻等。", + "痰湿质的人，痰湿凝聚，临床常以形体肥胖、多汗无力、胸闷痰多、腹部肥满、口黏苔腻等痰湿表现为主要特征。", + "湿热质的人，湿热内蕴，临床常呈现面垢油光、口苦、心烦急躁、口苦口干、身重困倦、大便粘滞不畅或燥结、小便短黄、男性易阴囊潮湿、女性带下增多，易生痤疮，舌质偏红、苔黄腻，脉滑数。", + "气郁质的人，气机郁滞，临床常呈现精神抑郁、忧虑脆弱、多愁善感、易患脏燥、梅核气、百合病等病症。舌淡红、苔薄白，脉弦。", + "气虚质的人，元气不足，临床常呈现疲乏气短、自汗懒言、语音低弱、精神不振、肌肉松软不实，舌淡红、边有齿痕，脉虚。易患感冒、内脏下垂、病后康复缓慢等。", + "平和质的人，阴阳气血调和，体态适中、面色红润、精力充沛、体形匀称健壮、耐受寒热、睡眠良好、患病较少，对自然环境和社会环境适应能力较强。" + }; + + public static String[] physiquesMentalitys = { + "性情急躁，心情易烦，健忘。", + "性情急躁，外向好动，活泼。", + "性格多沉静、内向。", + "性格偏温和，稳重，恭谦，豁达，多善于忍耐。", + "性情多急躁易怒。", + "性格内向不稳定，忧郁脆弱，敏感多疑。", + "情绪不稳定，胆小，不喜欢冒险。", + "性格随和开朗。" + }; + public static String[] physiquesMatters = { + "瘀血质气机失调，血行不畅，应慎食雪糕、冰淇淋、冰冻饮料等寒凉之品，以免影响气血运行。保持心情舒畅，是淤血质调理的重要环节。", + "阴虚质体内阴液不足，药膳应慎食辛辣刺激、煎炒爆炸以及羊肉、狗肉等温热之物，以免耗伤阴液。", + "阳虚质阳气亏虚，药膳应忌生冷寒凉，即使盛夏，也不主张多吃诸如西瓜、梨、苦瓜等寒凉生冷之物，以免损伤阳气。", + "痰湿质痰湿偏盛，药膳应慎食肥甘油腻、厚味滋补之物，以免助湿生痰。", + "湿热质体内湿热偏盛，药膳应慎食牛肉、狗肉、鹿肉、辣椒、姜、葱及肥甘厚味之物，以免助湿生热。", + "气郁质气机不畅，心情抑郁，，应慎食雪糕、冰淇淋、冰冻饮料等寒凉之品，以免影响气血运行。同淤血质一样，保持心情舒畅，也是气郁质调理的重要环节。", + "气虚质中气不足，脾胃消化功能较弱，药膳应忌过于粘腻、寒凉或难以消化之物，以免食滞难化，影响脾胃功能。", + "平和质人阴阳气血平衡，药膳调理不可偏补、贪补，以保持人体阴阳平衡状态最为紧要。所谓“不伤不扰，顺其自然”。" + }; } diff --git a/app/src/main/res/layout/activity_add.xml b/app/src/main/res/layout/activity_add.xml index d679b44..20c024f 100644 --- a/app/src/main/res/layout/activity_add.xml +++ b/app/src/main/res/layout/activity_add.xml @@ -30,8 +30,8 @@ android:layout_height="450dp" android:layout_centerInParent="true" android:visibility="gone" - app:cardElevation="0dp" - app:cardCornerRadius="20dp"> + app:cardCornerRadius="20dp" + app:cardElevation="0dp"> @@ -74,6 +78,7 @@ @@ -127,14 +134,16 @@ android:layout_height="0.5dp" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" + android:alpha="0.5" android:background="@color/place_holder" /> @@ -158,14 +167,16 @@ android:layout_height="0.5dp" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" + android:alpha="0.5" android:background="@color/place_holder" /> @@ -189,14 +200,16 @@ android:layout_height="0.5dp" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" + android:alpha="0.5" android:background="@color/place_holder" />