diff --git a/app/build.gradle b/app/build.gradle index 74a9690..38ac84d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -70,5 +70,10 @@ dependencies { implementation 'com.github.czy1121:turncardlistview:1.0.0' //油表盘 implementation 'com.github.lzyzsd:circleprogress:1.2.1' + //glide +// implementation 'com.github.bumptech.glide:glide:4.8.0' +// annotationProcessor 'com.github.bumptech.glide:compiler:4.8.0' + implementation 'com.github.bumptech.glide:glide:3.8.0' + implementation 'com.android.support:support-v4:19.1.0' } diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardAdapter.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardAdapter.java index 0c44585..a2dd942 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardAdapter.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardAdapter.java @@ -39,7 +39,7 @@ public class CardAdapter extends RecyclerView.Adapter { @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) @Override public void onBindViewHolder(CardHolder holder, int position) { - holder.bindView(mList.get(position).getPictureId(), mList.get(position).getTitle(), position, context); + holder.bindView(mList.get(position).getPictureId(), mList.get(position).getTitle(), context); } @Override diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java index ce08f8d..8a6a3b8 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java @@ -9,6 +9,7 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; +import com.bumptech.glide.Glide; import com.example.ninefourone.nutritionmaster.R; import com.example.ninefourone.nutritionmaster.modules.viewpagerfragments.customization.CustomizationActivity; import com.orhanobut.logger.Logger; @@ -40,9 +41,10 @@ public class CardHolder extends RecyclerView.ViewHolder { } @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) - public void bindView(int picId, String text, int index, final Context context) { + public void bindView(int picId, String text, final Context context) { tvName.setText(text); - ivPhoto.setImageDrawable(context.getDrawable(picId)); +// ivPhoto.setImageDrawable(context.getDrawable(picId)); + Glide.with(context).load(picId).into(ivPhoto); i = new Intent(context, CustomizationActivity.class); i.putExtra("SEND_CODE", text); // Logger.d(text); diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CustomizationAdapter.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CustomizationAdapter.java new file mode 100644 index 0000000..8a36fdc --- /dev/null +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CustomizationAdapter.java @@ -0,0 +1,25 @@ +package com.example.ninefourone.nutritionmaster.adapter; + +import android.support.v7.widget.RecyclerView; +import android.view.ViewGroup; + +/** + * Created by ScorpioMiku on 2018/9/24. + */ + +public class CustomizationAdapter extends RecyclerView.Adapter { + @Override + public CardHolder onCreateViewHolder(ViewGroup parent, int viewType) { + return null; + } + + @Override + public void onBindViewHolder(CardHolder holder, int position) { + + } + + @Override + public int getItemCount() { + return 0; + } +} diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CustomizationHolder.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CustomizationHolder.java new file mode 100644 index 0000000..8dd7e10 --- /dev/null +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CustomizationHolder.java @@ -0,0 +1,14 @@ +package com.example.ninefourone.nutritionmaster.adapter; + +import android.support.v7.widget.RecyclerView; +import android.view.View; + +/** + * Created by ScorpioMiku on 2018/9/24. + */ + +public class CustomizationHolder extends RecyclerView.ViewHolder { + public CustomizationHolder(View itemView) { + super(itemView); + } +} diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/RecommendAdapter.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/RecommendAdapter.java index ab1e39f..9df29ac 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/RecommendAdapter.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/RecommendAdapter.java @@ -3,7 +3,9 @@ package com.example.ninefourone.nutritionmaster.adapter; import android.content.Intent; import android.view.View; +import android.widget.ImageView; +import com.bumptech.glide.Glide; import com.chad.library.adapter.base.BaseMultiItemQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.example.ninefourone.nutritionmaster.R; @@ -36,18 +38,17 @@ public class RecommendAdapter extends BaseMultiItemQuickAdapter - + android:layout_weight="11" + android:orientation="vertical"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + android:textColor="#f0311e" + android:textSize="12sp" /> - + android:textColor="#f0311e" + android:textSize="12sp" /> diff --git a/app/src/main/res/layout/customization_item.xml b/app/src/main/res/layout/customization_item.xml new file mode 100644 index 0000000..f7c18be --- /dev/null +++ b/app/src/main/res/layout/customization_item.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index ea195fd..ce9471e 100644 --- a/build.gradle +++ b/build.gradle @@ -21,6 +21,7 @@ buildscript { allprojects { repositories { + mavenCentral() google() jcenter() maven { url 'https://jitpack.io' }