Merge remote-tracking branch 'origin/2.0' into 2.0
# Conflicts: # app/src/main/res/drawable-hdpi/home1_selected.png # app/src/main/res/drawable-hdpi/home1_unselected.png # app/src/main/res/drawable-hdpi/home2_selected.png # app/src/main/res/drawable-hdpi/home2_unselected.png # app/src/main/res/drawable-hdpi/home3_selected.png # app/src/main/res/drawable-hdpi/home3_unselected.png # app/src/main/res/drawable/oval_hint_dn.xml # app/src/main/res/drawable/oval_hint_up.xml # app/src/main/res/layout/activity_main.xml
This commit is contained in:
@ -150,13 +150,13 @@ public class ShareUtils {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(ViewHolder holder, final int position) {
|
||||
public void onBindViewHolder(final ViewHolder holder, int position) {
|
||||
holder.shareLogo.setImageResource(arrLogo[position]);
|
||||
holder.shareLabel.setText(arrLabel[position]);
|
||||
holder.itemView.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
switch (position){
|
||||
switch (holder.getPosition()){
|
||||
case 0:
|
||||
wechatSahre();
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user