试玩赚钱，首页修改 提交

app/src/main/java/com/kfzs/duanduan/fragment/FgtPersonalCenter.java

@@ -0,0 +1,18 @@
+package com.kfzs.duanduan.fragment;
+
+import android.os.Bundle;
+
+import com.kfzs.duanduan.BaseCompatFragment;
+import com.sheep.jiuyan.samllsheep.R;
+
+/**
+ * Created by ljy on 2018/5/8.
+ */
+
+public class FgtPersonalCenter extends BaseCompatFragment {
+    @Override
+    protected void initView(Bundle savedInstanceState) {
+        setContentView(R.layout.personalcenter_act_layout);
+
+    }
+}

app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -362,7 +362,10 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     }
 
     @OnClick({ R.id.user_layout, R.id.withdrawal, R.id.try_play_layout,
-            R.id.invitation_layout, R.id.lying_layout, R.id.newbie_task, R.id.card_layout, R.id.icon_layout, R.id.info_layout, R.id.homepage_wxfz})
+            R.id.invitation_layout, R.id.lying_layout, R.id.newbie_task,
+            R.id.card_layout, R.id.icon_layout, R.id.info_layout, R.id.homepage_wxfz,
+            R.id.q_iv, R.id.q_name_tv, R.id.q_dec_tv,
+            R.id.lying_iv, R.id.lying_dec_tv, R.id.lying_name_tv})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.user_layout:
@@ -379,15 +382,10 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             case R.id.card_layout://办卡赚钱
                 Jump2View.getInstance().goCreditCardTaskList(activity, null);
                 break;
-            case R.id.lying_layout://躺着赚钱
-                if (wechatIsOpen == null) {
-                    G.showToast("网络异常，请稍候重试");
-                } else if (wechatIsOpen) {
-                    Jump2View.getInstance().goLyingView(activity, null);
-                    UMConfigUtils.onEvent(UMConfigUtils.Event.SHEEP_TASK_LIE);
-                } else {
-                    G.showToast(R.string.coming_soon);
-                }
+            case R.id.lying_layout://跳转到游戏页面
+                Jump2View.getInstance()
+                        .goHomePageView(activity, 1);
+
                 break;
             case R.id.newbie_task://新手任务
                 if(getActivity() instanceof BaseActivity){
@@ -423,6 +421,24 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             case R.id.info_layout://其它信息
                 Jump2View.getInstance().goPersonnalCenterView(activity, null);
                 break;
+            case R.id.q_iv://Q币充值
+            case R.id.q_name_tv:
+            case R.id.q_dec_tv:
+                G.showToast("Q币充值");
+                break;
+            case R.id.lying_iv://躺着赚钱
+            case R.id.lying_dec_tv:
+            case R.id.lying_name_tv:
+                if (wechatIsOpen == null) {
+                    G.showToast("网络异常，请稍候重试");
+                } else if (wechatIsOpen) {
+                    Jump2View.getInstance().goLyingView(activity, null);
+                    UMConfigUtils.onEvent(UMConfigUtils.Event.SHEEP_TASK_LIE);
+                } else {
+                    G.showToast(R.string.coming_soon);
+                }
+
+                break;
         }
     }
 

app/src/main/java/com/kfzs/duanduan/react/MainTab.java

@@ -45,7 +45,18 @@ public enum MainTab {
         public int getDrawableId() {
             return R.drawable.drawable_selector_class;
         }
-    }
+    }/*,
+    FgtPersonnalCenter(R.string.personal_center) {
+        @Override
+        public Fragment getFragment() {
+            return new FgtMainCategory();
+        }
+
+        @Override
+        public int getDrawableId() {
+            return R.drawable.drawable_selector_class;
+        }
+    }*/
 //    ,
     //    Bp(R.string.tab_viewpager_borrowplay) {
 //        @Override

app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -1,6 +1,8 @@
 package com.sheep.gamegroup.util;
 
 import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.text.Html;
 import android.text.TextUtils;
 import android.widget.TextView;
 
@@ -10,9 +12,11 @@ import com.arialyy.aria.core.download.DownloadTarget;
 import com.arialyy.aria.core.inf.IEntity;
 import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
 import com.sheep.gamegroup.model.entity.WithdrawalEty;
+import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 
 import java.io.File;
+import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -215,4 +219,42 @@ public class CommonUtil {
         }
         return "";
     }
+
+    /**
+     * 格式化图片 html
+     */
+    public CharSequence getCharSequence(final Context context, String value, String imgName){
+
+        String html = value + "<img src='" + imgName + "' />";
+        CharSequence c = Html.fromHtml(html, new Html.ImageGetter() {
+            @Override
+            public Drawable getDrawable(String source) {
+                Drawable mipmap = context.getResources().getDrawable(
+                        getResourceId(source)
+                );
+                mipmap.setBounds(0, 0, mipmap.getIntrinsicWidth() / 2,
+                        mipmap.getIntrinsicHeight() / 2);
+                return mipmap;
+            }
+        }, null);
+        return c;
+    }
+
+
+    /**
+     * 根据资源的ID的变量名活的Filed的对象，使用反射机制来实现
+     * @param name
+     * @return
+     */
+    public int getResourceId(String name) {
+        try {
+            //根据资源的ID的变量名活的Filed的对象，使用反射机制来实现
+            Field f = R.mipmap.class.getField(name);
+            //使用反射机制，取得并返回资源id字段
+            return Integer.parseInt(f.get(null).toString());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return 0;
+    }
 }

app/src/main/java/com/sheep/gamegroup/view/activity/TryMakeMoneyact.java

@@ -2,19 +2,29 @@ package com.sheep.gamegroup.view.activity;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.os.Bundle;
 import android.support.design.widget.TabLayout;
 import android.support.v4.view.ViewPager;
 import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ImageView;
 
 import com.kfzs.duanduan.ActDownloadMgr;
 import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.model.entity.GridViewEntity;
+import com.sheep.gamegroup.util.MyGridview;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.view.adapter.AdpTryMakemoney;
+import com.sheep.gamegroup.view.adapter.AdpTrymakemoneyTabGridview;
 import com.sheep.gamegroup.view.fragment.FgtTryMakeMoney;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
+import java.util.ArrayList;
+
 import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
 
 /**
  * 试着赚钱页面
@@ -26,10 +36,20 @@ public class TryMakeMoneyact extends BaseActivity {
     TabLayout indicator;
     @BindView(R.id.pager)
     ViewPager pager;
+    @BindView(R.id.tab_gridview)
+    MyGridview tabGridview;
+    @BindView(R.id.select_tab_iv)
+    ImageView selectTabIv;
     private Activity activity;
 
     private AdpTryMakemoney mAdapter;
     private String[] titles = new String[]{"推荐任务", "即将开始"};
+
+    private AdpTrymakemoneyTabGridview tabGridviewAdp;
+    private ArrayList<Object> gridviewListAll = new ArrayList<>();
+    private ArrayList<Object> gridviewList = new ArrayList<>();
+    private boolean clickFlag = false;
+
     @Override
     protected int getLayoutId() {
         return R.layout.try_makemoney_act_layout;
@@ -52,18 +72,87 @@ public class TryMakeMoneyact extends BaseActivity {
         mAdapter = new AdpTryMakemoney(getSupportFragmentManager(), this);
         mAdapter.add(FgtTryMakeMoney.newInstance(0), titles[0]);
         mAdapter.add(FgtTryMakeMoney.newInstance(2), titles[1]);
-//        mAdapter.add(FgtTryMakeMoney2.newInstance(0), titles[0]);
-//        mAdapter.add(FgtTryMakeMoney2.newInstance(1), titles[1]);
         pager.setAdapter(mAdapter);
         indicator.setupWithViewPager(pager);
+
+        tabGridviewAdp = new AdpTrymakemoneyTabGridview(activity, gridviewList);
+        tabGridview.setAdapter(tabGridviewAdp);
     }
 
     @Override
     public void initListener() {
+        tabGridview.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+
+//                select = position;
+                for(int i=0;i<gridviewList.size();i++){
+                    if(position == i){
+                        ((GridViewEntity) gridviewList.get(i)).setSelectState(true);
+                    }else {
+                        ((GridViewEntity) gridviewList.get(i)).setSelectState(false);
+
+                    }
+                    tabGridviewAdp.notifyDataSetChanged();
+                }
+            }
+        });
     }
 
     @Override
     public void initData() {
+        setValueList();
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // TODO: add setContentView(...) invocation
+        ButterKnife.bind(this);
     }
 
+    @OnClick(R.id.select_tab_iv)
+    public void onViewClicked() {
+        clickFlag = !clickFlag;
+        setValueList2(clickFlag);
+        tabGridviewAdp.notifyDataSetChanged();
+    }
+
+    /**
+     * 获取tab的值，fragment调用
+     */
+    public int getTabValue(){
+        return 0;
+    }
+
+
+    /**
+     * test
+     * list 赋值
+     */
+    private void setValueList() {
+        gridviewListAll.clear();
+        for (int i = 0; i < 10; i++) {
+            if(i == 0){
+                gridviewListAll.add(new GridViewEntity(true, "click_" + i));
+            }else {
+                gridviewListAll.add(new GridViewEntity(false, "click_" + i));
+            }
+
+        }
+        setValueList2(clickFlag);
+    }
+    private void setValueList2(boolean flag) {
+        gridviewList.clear();
+        if(flag || gridviewListAll.size() <= 4){
+            gridviewList.addAll(gridviewListAll);
+            selectTabIv.setImageResource(R.mipmap.arrow_up);
+        }else {
+            selectTabIv.setImageResource(R.mipmap.arrow_down);
+            for (int i = 0; i < 4; i++) {
+                gridviewList.add(gridviewListAll.get(i));
+            }
+        }
+
+    }
 }

app/src/main/java/com/sheep/gamegroup/view/adapter/AdpTrymakemoneyTabGridview.java

@@ -0,0 +1,68 @@
+package com.sheep.gamegroup.view.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import com.sheep.gamegroup.model.entity.GridViewEntity;
+import com.sheep.jiuyan.samllsheep.R;
+
+import java.util.List;
+
+/**
+ * Created by ljy on 2018/5/7.
+ */
+
+public class AdpTrymakemoneyTabGridview extends BaseAdapter {
+    private Context context;
+    private List<Object> list;
+
+    public AdpTrymakemoneyTabGridview(Context context, List<Object> list) {
+        this.context = context;
+        this.list = list;
+    }
+
+    @Override
+    public int getCount() {
+        return list.size();
+    }
+
+    @Override
+    public GridViewEntity getItem(int position) {
+        return (GridViewEntity) list.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        ViewHolder holder = null;
+        if(holder == null){
+            holder = new ViewHolder();
+            convertView = LayoutInflater.from(context).inflate(R.layout.withdrawal_gridview_item, null);
+            holder.item_tv = convertView.findViewById(R.id.item_tv);
+
+            convertView.setTag(holder);
+        }else {
+            holder = (ViewHolder) convertView.getTag();
+        }
+
+        if (getItem(position).isSelectState()){
+            holder.item_tv.setTextColor(context.getResources().getColor(R.color.blue));
+        }else{
+            holder.item_tv.setTextColor(context.getResources().getColor(R.color.black));
+        }
+        holder.item_tv.setText(getItem(position).getValue()+"");
+        return convertView;
+    }
+
+    class ViewHolder{
+        TextView item_tv;
+    }
+}

app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdp.java

@@ -196,7 +196,10 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                         break;
                 }
                 viewHolder.itemView.findViewById(R.id.cancel_task_tv).setVisibility(View.GONE);
+
+                //CommonUtil.getInstance().getCharSequence(context, etyList.get(i).getName(), "")
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_anem_tv)).setText(etyList.get(i).getName()+"");
+
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_num_tv)).setText("剩余"+ etyList.get(i).getLast_num()+"份");
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_money)).setText("+"+ etyList.get(i).getBonus() +"元");
 

app/src/main/res/layout/fgt_personalcenter_layout.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/bg_gray"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+       <RelativeLayout
+           android:layout_width="match_parent"
+           android:layout_height="@dimen/view_size_100"
+           android:background="@mipmap/home_blue_bg">
+           <ImageView
+               android:id="@+id/icon_img_iv"
+               android:layout_width="@dimen/view_size_60"
+               android:layout_height="@dimen/view_size_60"
+               android:src="@drawable/icon"
+               android:layout_centerVertical="true"/>
+
+           <TextView
+               android:id="@+id/name_tv"
+               android:layout_width="wrap_content"
+               android:layout_height="wrap_content"
+               android:layout_marginBottom="@dimen/content_padding_small"
+               android:layout_marginLeft="@dimen/content_padding_10"
+               android:layout_marginTop="@dimen/content_padding_small"
+               android:text="aaaa"
+               android:textColor="@color/txt_white"
+               android:textSize="@dimen/text_size_12"
+               android:layout_toRightOf="@+id/icon_img_iv"
+               android:layout_alignBaseline="@+id/icon_img_iv"
+               android:layout_centerVertical="true"/>
+
+           <TextView
+               android:id="@+id/sheep_num_tv"
+               android:layout_width="wrap_content"
+               android:layout_height="wrap_content"
+               android:layout_below="@+id/name_tv"
+               android:layout_marginBottom="@dimen/content_padding_small"
+               android:layout_marginLeft="@dimen/content_padding_10"
+               android:text="绵羊号："
+               android:textColor="@color/txt_white"
+               android:textSize="@dimen/text_size_10"
+               android:layout_toRightOf="@+id/icon_img_iv"
+               android:layout_centerVertical="true"/>
+       </RelativeLayout>
+    </RelativeLayout>
+
+
+</LinearLayout>

app/src/main/res/layout/homepage_act_layout.xml

@@ -37,6 +37,9 @@
                 android:scaleType="fitXY"
                 android:adjustViewBounds="true"
                 android:src="@drawable/homepage_wxfz"/>
+
+            <include
+                layout="@layout/homepage_item_liy_q"/>
             <include
                 layout="@layout/homepage_item_currenttime_reward"/>
 

app/src/main/res/layout/homepage_item_4module.xml

@@ -111,13 +111,13 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="躺着赚钱"
+                        android:text="玩转游戏"
                         android:layout_centerVertical="true"
                         style="@style/nomal_txt_style"/>
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="微信挂机领现金"
+                        android:text="万款游戏免费下载"
                         android:layout_centerVertical="true"
                         style="@style/nomal_txt_style_11"/>
                 </LinearLayout>

app/src/main/res/layout/homepage_item_liy_q.xml

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/lying_qb_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+    android:padding="@dimen/content_padding_10"
+    android:layout_margin="@dimen/content_padding">
+
+    <ImageView
+        android:id="@+id/q_iv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@mipmap/home_q_circle_bg"
+        app:layout_constraintBottom_toTopOf="@+id/line_ly_q_view"
+        android:padding="@dimen/content_padding_small"
+        android:layout_marginRight="@dimen/content_padding_small"/>
+
+    <TextView
+        android:id="@+id/q_name_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="充值Q币"
+        app:layout_constraintTop_toTopOf="@+id/q_iv"
+        app:layout_constraintBottom_toBottomOf="@+id/q_iv"
+        app:layout_constraintLeft_toRightOf="@+id/q_iv"
+        style="@style/txt_style_16_black"/>
+
+    <TextView
+        android:id="@+id/lying_name_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="躺着赚钱"
+        app:layout_constraintTop_toTopOf="@+id/lying_iv"
+        app:layout_constraintBottom_toBottomOf="@+id/lying_iv"
+        app:layout_constraintLeft_toRightOf="@+id/lying_iv"
+        style="@style/txt_style_16_black"/>
+
+    <TextView
+        android:id="@+id/q_dec_tv"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="平台绵羊币，充值更便宜"
+        app:layout_constraintTop_toTopOf="@+id/q_iv"
+        app:layout_constraintBottom_toBottomOf="@+id/q_iv"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintLeft_toRightOf="@+id/q_name_tv"
+        android:gravity="right"/>
+
+    <TextView
+        android:id="@+id/lying_dec_tv"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="微信挂机领现金"
+        app:layout_constraintTop_toTopOf="@+id/lying_iv"
+        app:layout_constraintBottom_toBottomOf="@+id/lying_iv"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintLeft_toRightOf="@+id/lying_name_tv"
+        android:gravity="right"/>
+
+    <ImageView
+        android:id="@+id/lying_iv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@mipmap/home_playgame_circle_bg"
+        app:layout_constraintTop_toBottomOf="@+id/line_ly_q_view"
+        android:padding="@dimen/content_padding_small"
+        android:layout_marginRight="@dimen/content_padding_small"/>
+
+    <View
+        android:id="@+id/line_ly_q_view"
+        android:layout_width="match_parent"
+        android:layout_height="1sp"
+        android:background="@color/bg_gray"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
+</android.support.constraint.ConstraintLayout>

app/src/main/res/layout/try_makemoney_act_layout.xml

@@ -65,6 +65,32 @@
             style="@style/style_ash_tv"
             android:text="领取奖励"/>
     </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingLeft="@dimen/content_padding"
+        android:paddingRight="@dimen/content_padding"
+        android:paddingBottom="@dimen/content_padding_small"
+        android:paddingTop="@dimen/content_padding_small">
+        <com.sheep.gamegroup.util.MyGridview
+            android:id="@+id/tab_gridview"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:numColumns="4"
+            android:scrollbars="none"
+            android:listSelector="@android:color/transparent"
+            android:gravity="center_horizontal"/>
+
+        <ImageView
+            android:id="@+id/select_tab_iv"
+            android:layout_width="@dimen/view_size_30"
+            android:layout_height="@dimen/view_size_30"
+            android:padding="@dimen/content_padding_small"
+            android:src="@mipmap/arrow_down" />
+
+    </LinearLayout>
     <android.support.design.widget.TabLayout
         android:id="@+id/indicator"
         android:layout_width="match_parent"

app/src/main/res/layout/try_makemoney_item_recommend.xml

@@ -71,8 +71,9 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:text=""
-            android:lines="1"
+            android:lines="2"
             android:gravity="start"
+            android:ellipsize="middle"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toEndOf="@+id/item_icon_iv"
             app:layout_constraintRight_toLeftOf="@+id/item_money"

app/src/main/res/values/common.xml

@@ -62,6 +62,7 @@
 
     <dimen name="view_size_20">20dp</dimen>
     <dimen name="view_size_30">30dp</dimen>
+    <dimen name="view_size_35">35dp</dimen>
     <dimen name="view_size_45">45dp</dimen>
     <dimen name="view_size_60">60dp</dimen>
     <dimen name="view_size_73">73dp</dimen>

app/src/main/res/values/str_appstore_strings.xml

@@ -17,6 +17,7 @@
     <string name="tab_viewpager_borrowplay">借着玩</string>
     <string name="tab_viewpager_classification">分类</string>
     <string name="mine_hoggerel">小绵羊</string>
+    <string name="personal_center">个人中心</string>
 
     <string name="hot_person_game">人气游戏</string>
     <string name="best_game">精品游戏</string>