Merge branch 'master' of http://10.8.230.114:3000/kemllor/small_sheep_android

app/src/main/java/com/sheep/jiuyan/samllsheep/page/GameDetailActivity.java

@@ -1,5 +1,6 @@
 package com.sheep.jiuyan.samllsheep.page;
 
+import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
 
 /**
@@ -10,7 +11,7 @@ import com.sheep.jiuyan.samllsheep.base.BaseActivity;
 public class GameDetailActivity extends BaseActivity {
     @Override
     protected int getLayoutId() {
-        return 0;
+        return R.layout.game_detail_activity;
     }
 
     @Override

app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/AdpMainActivity.java

@@ -9,6 +9,7 @@ import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.page.GameDetailActivity;
 import com.sheep.jiuyan.samllsheep.page.WebActivity;
 import com.sheep.jiuyan.samllsheep.page.entry.TaskPublish;
 import com.sheep.jiuyan.samllsheep.utils.G;
@@ -79,7 +80,7 @@ public class AdpMainActivity extends AdpCommonRecy<TaskPublish> {
         holder.getView(R.id.tv_guide).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent intent = new Intent(mContext, WebActivity.class);
+                Intent intent = new Intent(mContext, GameDetailActivity.class);
                 intent.putExtra(WebActivity.INTENT_URL, (String) v.getTag(TAG_URL));
                 mContext.startActivity(intent);
             }