This commit is contained in:
ScorpioMiku
2018-09-09 11:59:29 +08:00
parent e992f3feb0
commit ee422d33b1
21 changed files with 664 additions and 25 deletions

View File

@@ -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).getTitle(), position, context);
}
@Override

View File

@@ -11,6 +11,7 @@ import android.widget.TextView;
import com.example.ninefourone.nutritionmaster.R;
import com.example.ninefourone.nutritionmaster.modules.viewpagerfragments.customization.CustomizationActivity;
import com.orhanobut.logger.Logger;
import java.util.ArrayList;
@@ -30,7 +31,7 @@ public class CardHolder extends RecyclerView.ViewHolder {
TextView tvSign;
private View itemView;
private Intent i;
public CardHolder(View itemView) {
super(itemView);
@@ -39,14 +40,15 @@ public class CardHolder extends RecyclerView.ViewHolder {
}
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
public void bindView(int picId, String text, final Context context) {
public void bindView(int picId, String text, int index, final Context context) {
tvName.setText(text);
ivPhoto.setImageDrawable(context.getDrawable(picId));
i = new Intent(context, CustomizationActivity.class);
i.putExtra("SEND_CODE", text);
// Logger.d(text);
itemView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent i = new Intent(context, CustomizationActivity.class);
i.putExtra("SEND_CODE", getAdapterPosition());
context.startActivity(i);
}
});

View File

@@ -1,11 +1,14 @@
package com.example.ninefourone.nutritionmaster.adapter;
import android.view.LayoutInflater;
import android.content.Intent;
import android.view.View;
import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.example.ninefourone.nutritionmaster.R;
import com.example.ninefourone.nutritionmaster.bean.RecommendFood;
import com.example.ninefourone.nutritionmaster.modules.RecipeActivity.RecipeActivity;
import com.orhanobut.logger.Logger;
import java.util.List;
@@ -16,6 +19,7 @@ import java.util.List;
public class RecommendAdapter extends BaseMultiItemQuickAdapter<RecommendFood, BaseViewHolder> {
private int[] indexs = new int[]{0, 1, 1, 2};
private Intent intent;
/**
* Same as QuickAdapter#QuickAdapter(Context,int) but with
@@ -47,6 +51,16 @@ public class RecommendAdapter extends BaseMultiItemQuickAdapter<RecommendFood, B
helper.setText(R.id.recommend_item_title, "红烧");
break;
}
View view = helper.getView(R.id.whole_layout);
intent = new Intent(mContext, RecipeActivity.class);
// Logger.d(item.getItemType());
intent.putExtra("SEND_OBJECT", item);
view.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
mContext.startActivity(intent);
}
});
}
@Override
@@ -56,20 +70,16 @@ public class RecommendAdapter extends BaseMultiItemQuickAdapter<RecommendFood, B
RecommendFood recommendFood = new RecommendFood(1, "烧肉", "好吃", indexs[i % 4]);
getData().add(recommendFood);
}
// notifyDataSetChanged();
// Logger.d("加载成功");
}
@Override
public void loadMoreEnd() {
super.loadMoreEnd();
// Logger.d("数据没了");
}
@Override
public void loadMoreFail() {
super.loadMoreFail();
// Logger.d("加载失败");
}

View File

@@ -0,0 +1,10 @@
package com.example.ninefourone.nutritionmaster.bean;
/**
* Created by ScorpioMiku on 2018/9/9.
*/
public class Menu {
private String menuName;
}

View File

@@ -3,11 +3,13 @@ package com.example.ninefourone.nutritionmaster.bean;
import com.chad.library.adapter.base.entity.MultiItemEntity;
import com.orhanobut.logger.Logger;
import java.io.Serializable;
/**
* Created by ScorpioMiku on 2018/9/3.
*/
public class RecommendFood implements MultiItemEntity {
public class RecommendFood implements MultiItemEntity, Serializable {
//三种view
public static final int TYPE_BIG = 0;
@@ -18,6 +20,15 @@ public class RecommendFood implements MultiItemEntity {
private String title;
private String description;
private int type;
private Menu menu;
public Menu getMenu() {
return menu;
}
public void setMenu(Menu menu) {
this.menu = menu;
}
public RecommendFood(int picture, String title, String description, int type) {
this.picture = picture;

View File

@@ -21,6 +21,7 @@ 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.AddActivity;
import com.example.ninefourone.nutritionmaster.modules.information.InformationActivity;
import com.example.ninefourone.nutritionmaster.ui.NoScrollViewPager;
import com.example.ninefourone.nutritionmaster.utils.MessageUtils;
import com.example.ninefourone.nutritionmaster.utils.PermissionUtils;
@@ -85,6 +86,8 @@ public class MainActivity extends BaseActivity {
RadarChart spiderView;
@BindView(R.id.add_information_button)
ImageView addInformationButton;
@BindView(R.id.information_layout)
LinearLayout informationLayout;
@Override
@@ -320,4 +323,10 @@ public class MainActivity extends BaseActivity {
break;
}
}
@OnClick(R.id.information_layout)
public void onViewClicked() {
Intent intent = new Intent(MainActivity.this, InformationActivity.class);
startActivity(intent);
}
}

View File

@@ -0,0 +1,44 @@
package com.example.ninefourone.nutritionmaster.modules.RecipeActivity;
import android.content.Intent;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import com.example.ninefourone.nutritionmaster.R;
import com.example.ninefourone.nutritionmaster.base.BaseActivity;
import com.example.ninefourone.nutritionmaster.bean.Menu;
import com.example.ninefourone.nutritionmaster.bean.RecommendFood;
import com.orhanobut.logger.Logger;
public class RecipeActivity extends BaseActivity {
private RecommendFood recommendFood;
private Menu menu;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
}
@Override
public int getLayoutId() {
return R.layout.activity_recipe;
}
@Override
public void initViews(Bundle savedInstanceState) {
Intent intent = getIntent();
recommendFood = (RecommendFood) intent.getSerializableExtra("SEND_OBJECT");
Logger.d(recommendFood.getItemType());
}
@Override
public void initToolBar() {
}
@Override
public void onPointerCaptureChanged(boolean hasCapture) {
}
}

View File

@@ -0,0 +1,15 @@
package com.example.ninefourone.nutritionmaster.modules.information;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import com.example.ninefourone.nutritionmaster.R;
public class InformationActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_information);
}
}

View File

@@ -5,21 +5,39 @@ import android.support.v7.app.AppCompatActivity;
import android.widget.TextView;
import com.example.ninefourone.nutritionmaster.R;
import com.example.ninefourone.nutritionmaster.base.BaseActivity;
import com.orhanobut.logger.Logger;
import butterknife.BindView;
import butterknife.ButterKnife;
public class CustomizationActivity extends AppCompatActivity {
public class CustomizationActivity extends BaseActivity {
@BindView(R.id.index_text)
TextView indexText;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_customization);
ButterKnife.bind(this);
}
@Override
public int getLayoutId() {
return R.layout.activity_customization;
}
@Override
public void initViews(Bundle savedInstanceState) {
String text = getIntent().getStringExtra("SEND_CODE");
indexText.setText(text);
Logger.d(text);
}
@Override
public void initToolBar() {
}
@Override
public void onPointerCaptureChanged(boolean hasCapture) {
}
}