Merge remote-tracking branch 'origin/sheep2.0' into sheep2.0

.idea/misc.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
-    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
-    <option name="myNullables">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
-        </list>
-      </value>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>

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

@@ -9,11 +9,13 @@ import android.widget.TextView;
 
 import com.kfzs.duanduan.BaseCompatFragment;
 import com.sheep.gamegroup.model.entity.UserEntity;
+import com.sheep.gamegroup.model.entity.WebviewEntity;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.view.activity.PersonalCenterAct;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.utils.G;
 
 import org.xutils.ex.DbException;
 
@@ -92,8 +94,15 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                 Jump2View.getInstance().goTaskList2View(getActivity(), null);
                 break;
             case R.id.proxy_service_layout://代理
+                G.showToast("敬请期待!");
                 break;
             case R.id.abourt_us_layout://关于我们
+                Jump2View.getInstance()
+                        .goWebview(
+                                getActivity(),
+                                new WebviewEntity(
+                                        0,
+                                        "关于我们"));
                 break;
             case R.id.feedbook_layout://意见反馈
                 break;

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

@@ -51,6 +51,7 @@ import com.sheep.gamegroup.model.entity.SlideshowEty;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.model.entity.UserEntity;
+import com.sheep.gamegroup.model.entity.WebviewEntity;
 import com.sheep.gamegroup.model.util.EntityUtils;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.presenter.SmallSheepContract;
@@ -845,7 +846,12 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                     case 4:
                         if(!TextUtils.isEmpty(clickedGameObj.getObjects())){
                             Jump2View.getInstance()
-                                    .goWebview(activity, clickedGameObj.getObjects());
+                                    .goWebview(
+                                            activity,
+                                            new WebviewEntity(
+                                                    0,
+                                                    clickedGameObj.getObjects(),
+                                                    null));
                         }
 
                         break;

app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -340,4 +340,10 @@ public interface ApiService {
     Observable<BaseMessage> getRechargeBalance(@Body JSONObject jsonObject);
 
     /******div***/
+
+    /**
+     * 关于我们
+     */
+    @GET("app/about_us")
+    Observable<BaseMessage> aboutUs();
 }

app/src/main/java/com/sheep/gamegroup/model/entity/AboutUsEntity.java

@@ -0,0 +1,27 @@
+package com.sheep.gamegroup.model.entity;
+
+/**
+ * 关于我们
+ * Created by ljy on 2018/5/10.
+ */
+
+public class AboutUsEntity {
+    private String Title;//
+    private String Content;
+
+    public String getTitle() {
+        return Title;
+    }
+
+    public void setTitle(String title) {
+        Title = title;
+    }
+
+    public String getContent() {
+        return Content;
+    }
+
+    public void setContent(String content) {
+        Content = content;
+    }
+}

app/src/main/java/com/sheep/gamegroup/model/entity/TaskEty.java

@@ -195,6 +195,6 @@ public class TaskEty implements Serializable{
 
 
     public boolean needDownloadApp() {
-        return task_type == 1 || task_type == 3;
+        return task_type != 2 || task_type != 4;
     }
 }

app/src/main/java/com/sheep/gamegroup/model/entity/TaskReleaseEty.java

@@ -33,6 +33,25 @@ public class TaskReleaseEty implements Serializable{
 
     private int cancel_duration;
     private boolean is_running;
+    private String child_task_name;//
+
+    public String getLabel_color() {
+        return label_color;
+    }
+
+    public void setLabel_color(String label_color) {
+        this.label_color = label_color;
+    }
+
+    private String label_color;//
+
+    public String getChild_task_name() {
+        return child_task_name;
+    }
+
+    public void setChild_task_name(String child_task_name) {
+        this.child_task_name = child_task_name;
+    }
 
     public boolean isIs_running() {
         return is_running;

app/src/main/java/com/sheep/gamegroup/model/entity/WebviewEntity.java

@@ -0,0 +1,50 @@
+package com.sheep.gamegroup.model.entity;
+
+import java.io.Serializable;
+
+/**
+ * webviedw 公用类
+ * Created by ljy on 2018/5/10.
+ */
+
+public class WebviewEntity implements Serializable {
+
+    private int type;//0:默认h5 1：公告
+    private String url;
+    private String title;
+
+    public WebviewEntity(int type, String title) {
+        this.type = type;
+        this.title = title;
+    }
+
+    public WebviewEntity(int type, String url, String title) {
+        this.type = type;
+        this.url = url;
+        this.title = title;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+}

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

@@ -1,9 +1,12 @@
 package com.sheep.gamegroup.util;
 
 import android.content.Context;
+import android.graphics.Color;
 import android.graphics.drawable.Drawable;
+import android.graphics.drawable.GradientDrawable;
 import android.text.Html;
 import android.text.TextUtils;
+import android.view.ViewTreeObserver;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONObject;
@@ -236,14 +239,33 @@ public class CommonUtil {
                 Drawable mipmap = context.getResources().getDrawable(
                         getResourceId(source)
                 );
-                mipmap.setBounds(0, 0, mipmap.getIntrinsicWidth() / 2,
-                        mipmap.getIntrinsicHeight() / 2);
+                mipmap.setBounds(0, 0, mipmap.getIntrinsicWidth() / 1,
+                        mipmap.getIntrinsicHeight() / 1);
                 return mipmap;
             }
         }, null);
         return c;
     }
 
+    /**
+     * 获取行数和一行的字数，来设置字符
+     */
+    public void getViewCharLines(final Context context, final TextView textView, String value){
+        final ViewTreeObserver vto = textView.getViewTreeObserver();
+        vto.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+            @Override
+            public void onGlobalLayout() {
+//                vto.removeGlobalOnLayoutListener(this);
+                if(textView.getLineCount() > 2){
+                    int lineEndIndexOne = textView.getLayout().getLineEnd(1);
+                    int lineEndIndexTwo = textView.getLayout().getLineEnd(2);
+                    String text = textView.getText().subSequence(0, lineEndIndexTwo -3) + "...";
+                    textView.setText(text);
+                }
+            }
+        });
+
+    }
 
     /**
      * 根据资源的ID的变量名活的Filed的对象，使用反射机制来实现
@@ -261,4 +283,16 @@ public class CommonUtil {
         }
         return 0;
     }
+
+    /**
+     * 设置view 背景颜色
+     */
+    public void setViewBackground( TextView textView ,String colorValue){
+        try {
+            GradientDrawable gradientDrawable = (GradientDrawable) textView.getBackground();
+            gradientDrawable.setColor(Color.parseColor(colorValue));
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
 }

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

@@ -23,6 +23,7 @@ import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.entity.WXOnHookAccount;
 import com.sheep.gamegroup.model.util.EntityUtils;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.model.entity.WebviewEntity;
 import com.sheep.gamegroup.view.activity.AccountAndSecurityAct;
 import com.sheep.gamegroup.view.activity.ActCreditCardTaskList;
 import com.sheep.gamegroup.view.activity.ActCreditCardWeb;
@@ -230,6 +231,16 @@ public class Jump2View {
     }
 
     /**
+     * 跳到分享界面
+     * @param context
+     * @param o
+     */
+    public void goInvitationView(Context context, Object o){
+        Intent intent = new Intent(context, BindOrChangeWeixinAct.class);
+        context.startActivity(intent);
+    }
+
+    /**
      * 跳到躺着界面
      * @param context
      * @param o
@@ -520,9 +531,9 @@ public class Jump2View {
     /**
      * 跳转到webview
      */
-    public void goWebview(Context context, Object o){
+    public void goWebview(Context context, WebviewEntity webviewEntity){
         Intent intent = new Intent(context, WebviewAct.class);
-        intent.putExtra("url", (String) o);
+        intent.putExtra("webview_entity", webviewEntity);
         context.startActivity(intent);
     }
     /**

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

@@ -259,7 +259,10 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         }
         switch (taskEty.getTask_type()){
             case 1:
+            case 3:
+            default:
                 if(taskReleaseEty.isIs_running()){
+
                     setBtnStr(taskEty.getTask_type());
                 }else {
                     type = -1;
@@ -269,15 +272,6 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             case 2:
                 btnTaskItem.setText("信用卡注册");
                 break;
-            case 3:
-                if(taskReleaseEty.isIs_running()){
-
-                    setBtnStr(taskEty.getTask_type());
-                }else {
-                    type = -1;
-                    btnTaskItem.setText("领取任务");
-                }
-                break;
             case 4:
                 if(taskReleaseEty.isIs_running()){
                     type = 10;
@@ -310,12 +304,12 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         String buttonStr = "";
         if(isDownLoad){
             type = 3;
-            if(taskType == 3){//应用
-                buttonStr = CommonUtil.OPEN_APPLY;
-
-            }else {
+            if(taskType != 3){
                 buttonStr = CommonUtil.START_PLAY;
 
+            }else {//应用
+                buttonStr = CommonUtil.OPEN_APPLY;
+
             }
         }else {
             switch (taskState) {
@@ -330,12 +324,12 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 case IEntity.STATE_COMPLETE:
                     if (PackageUtil.isAppInstalled(SheepApp.mContext, taskEty.getPackage_names())) {
                         type = 3;
-                        if(taskType == 3){//应用
-                            buttonStr = CommonUtil.OPEN_APPLY;
-
-                        }else {
+                        if(taskType != 3){
                             buttonStr = CommonUtil.START_PLAY;
 
+                        }else {//应用
+                            buttonStr = CommonUtil.OPEN_APPLY;
+
                         }
                     }else if(!TextUtils.isEmpty(PackageUtil.isExistsFile(activity, taskEty.getPackage_names(), ""))){
                         type = 2;

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

@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.support.design.widget.TabLayout;
 import android.support.v4.view.ViewPager;
+import android.util.Log;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ImageView;
@@ -114,7 +115,8 @@ public class TryMakeMoneyact extends BaseActivity {
                 }
                 try{
                     //刷新界面
-                    mAdapter.getItem(position).onResume();
+                    mAdapter.getItem(indicator.getSelectedTabPosition()).onResume();
+                    Log.e("-----select position",indicator.getSelectedTabPosition()+"");
                 }catch (Exception e){
                     e.printStackTrace();
                 }

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

@@ -1,17 +1,28 @@
 package com.sheep.gamegroup.view.activity;
 
 import android.text.TextUtils;
+import android.view.View;
 import android.webkit.WebChromeClient;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
+import android.widget.TextView;
 
+import com.alibaba.fastjson.JSONObject;
 import com.kfzs.android.view.widget.SafeWebView;
 import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.model.entity.AboutUsEntity;
+import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.WebviewEntity;
+import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import butterknife.BindView;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
 
 /**
  * Created by ljy on 2018/4/16.
@@ -21,7 +32,9 @@ public class WebviewAct extends BaseActivity {
 
     @BindView(R.id.activity_webview)
     SafeWebView activityWebview;
-    private String url;
+    @BindView(R.id.title_name_tv)
+    TextView title_name_tv;
+    private WebviewEntity webviewEntity;
 
     @Override
     protected int getLayoutId() {
@@ -30,10 +43,14 @@ public class WebviewAct extends BaseActivity {
 
     @Override
     public void initView() {
+        webviewEntity = (WebviewEntity) getIntent().getSerializableExtra("webview_entity");
+        if(webviewEntity == null){
+            return;
+        }
         TitleBarUtils.getInstance()
                 .setTitleFinish(this)
-                .setTitle(this, "专属福利");
-        url = getIntent().getStringExtra("url");
+                .setTitle(this,
+                        TextUtils.isEmpty(webviewEntity.getTitle()) ?"专属福利":webviewEntity.getTitle());
 
         WebSettings webSettings = activityWebview.getSettings();
 
@@ -47,13 +64,7 @@ public class WebviewAct extends BaseActivity {
         webSettings.setDefaultTextEncodingName("utf-8");
 //        activityWebview.setWebChromeClient(new chromClient());
 
-        if(TextUtils.isEmpty(url)){
-//            activityWebview.loadUrl("file:///android_asset/sheep_show.html");
-
-        }else {
-            activityWebview.loadUrl(url);
 
-        }
 
         activityWebview.setWebViewClient(new WebViewClient() {
             @Override
@@ -92,6 +103,52 @@ public class WebviewAct extends BaseActivity {
 
     @Override
     public void initData() {
+        //封装头文件
+        final String sHead=   "<html><head><meta name=\"viewport\" content=\"width=device-width, " +
+                "initial-scale=1.0, minimum-scale=0.5, maximum-scale=2.0, user-scalable=yes\" />"+
+                "<style>img{max-width:100% !important;height:auto !important;}</style>"
+                +"<style>body{max-width:100% !important;}</style>"+"</head><body>";
+        switch (webviewEntity.getType()){
+            case 0:
+            default:
+                title_name_tv.setVisibility(View.GONE);
+                activityWebview.loadUrl(webviewEntity.getUrl()+"");
+                break;
+            case 1://关于我们
+                showProgress(true);
+                SheepApp.get(this)
+                        .getNetComponent()
+                        .getApiService()
+                        .aboutUs()
+                        .observeOn(Schedulers.io())
+                        .subscribeOn(AndroidSchedulers.mainThread())
+                        .subscribe(new SheepSubscriber<BaseMessage>(this) {
+                            @Override
+                            public void onError(BaseMessage baseMessage) {
+                                hideProgress();
+                                G.showToast(baseMessage.getMsg() + "");
+                            }
+
+                            @Override
+                            public void onNext(BaseMessage baseMessage) {
+                                hideProgress();
+                                AboutUsEntity aboutUsEntity = JSONObject.parseObject(JSONObject.toJSONString(baseMessage.getData()), AboutUsEntity.class);
+                                if(aboutUsEntity != null){
+                                    title_name_tv.setVisibility(View.VISIBLE);
+                                    title_name_tv.setText(webviewEntity.getTitle()+"");
+                                    activityWebview.loadDataWithBaseURL(
+                                            null,
+                                            sHead + aboutUsEntity.getContent() + "</body></html>",
+                                            "text/html",
+                                            "utf-8",
+                                            null);
+                                }
+
+                            }
+                        });
+
+                break;
+        }
 
     }
 }

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

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.Html;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -199,6 +200,26 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
 
                 //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_anem_tv)).setText(
+//                        CommonUtil.getInstance()
+//                                .getCharSequence(
+//                                        context,
+//                                        etyList.get(i).getName()+"",
+//                                        "task_daily_check")
+//                );
+                TextView task_type_tv = viewHolder.itemView.findViewById(R.id.task_type_tv);
+                //设置标签颜色task_type_tv
+                if(!TextUtils.isEmpty(etyList.get(i).getChild_task_name())){
+                    task_type_tv.setVisibility(View.VISIBLE);
+                    task_type_tv.setText(etyList.get(i).getChild_task_name() + "");
+                    CommonUtil.getInstance()
+                            .setViewBackground(
+                                    task_type_tv,
+                                    etyList.get(i).getLabel_color()+"");
+                }else {
+                    task_type_tv.setVisibility(View.GONE);
+                }
+
 
                 ((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() +"元");
@@ -290,6 +311,19 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                         "截止时间:" + TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(etyList.get(i).getRelease_task().getDeadline()))+"");
 
                 ((TextView)viewHolder.itemView.findViewById(R.id.detail_task_tv)).setText("取消任务");
+
+                TextView task_type_tv = viewHolder.itemView.findViewById(R.id.task_type_tv);
+                //设置标签颜色task_type_tv
+                if(!TextUtils.isEmpty(etyList.get(i).getRelease_task().getChild_task_name())){
+                    task_type_tv.setVisibility(View.VISIBLE);
+                    task_type_tv.setText(etyList.get(i).getRelease_task().getChild_task_name() + "");
+                    CommonUtil.getInstance()
+                            .setViewBackground(
+                                    task_type_tv,
+                                    etyList.get(i).getRelease_task().getLabel_color()+"");
+                }else {
+                    task_type_tv.setVisibility(View.GONE);
+                }
                 viewHolder.itemView.findViewById(R.id.detail_task_tv).setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtTryMakeMoney.java

@@ -167,9 +167,9 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         });
     }
     public void reFresh(){
-        if(refresh.isRefreshing()){
-            return;
-        }
+//        if(refresh.isRefreshing()){
+//            return;
+//        }
         refresh.setRefreshing(true);
         initData();
     }

app/src/main/res/drawable/sp_bg_gradient_blue_nocorners.xml

@@ -3,7 +3,8 @@
     android:shape="rectangle">
 
     <gradient
-        android:startColor="@color/blue_34a6e7"
-        android:endColor="@color/blue_start"/>
+        android:startColor="@color/blue_36A6E6"
+        android:gradientRadius="80%"
+        android:endColor="@color/blue_2EC2F7"/>
 
 </shape>

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

@@ -48,6 +48,21 @@
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/task_type_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="取消任务取消任务取消任务"
+            android:minWidth="@dimen/view_size_60"
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_size_12"
+            android:gravity="center"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:padding="@dimen/content_padding_3"
+            android:background="@drawable/sp_bg_gradient_rectangle_blue"
+            android:visibility="visible"/>
         <ImageView
             android:id="@+id/item_icon_iv"
             android:layout_width="@dimen/view_size_60"
@@ -63,7 +78,7 @@
             android:textSize="18dp"
             android:textColor="@color/txt_red"
             android:layout_marginTop="@dimen/content_padding_15"
-            app:layout_constraintTop_toTopOf="@+id/item_anem_tv"
+            app:layout_constraintTop_toBottomOf="@+id/item_anem_tv"
             app:layout_constraintBottom_toBottomOf="@+id/item_anem_tv"
             app:layout_constraintEnd_toEndOf="parent"/>
         <TextView
@@ -76,7 +91,7 @@
             android:ellipsize="middle"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toEndOf="@+id/item_icon_iv"
-            app:layout_constraintRight_toLeftOf="@+id/item_money"
+            app:layout_constraintRight_toLeftOf="@+id/task_type_tv"
             android:layout_marginStart="15dp"
             style="@style/txt_style_15"/>
         <TextView

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

@@ -6,6 +6,16 @@
     <include
         layout="@layout/title"/>
 
+    <TextView
+        android:id="@+id/title_name_tv"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="abc"
+        android:gravity="center"
+        style="@style/txt_style_17_black"
+        android:layout_marginBottom="@dimen/content_padding_15"
+        android:visibility="gone"/>
+
     <com.kfzs.android.view.widget.SafeWebView
         android:id="@+id/activity_webview"
         android:layout_width="match_parent"

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

@@ -23,6 +23,7 @@
     <dimen name="text_size_12">12sp</dimen>
     <dimen name="text_size_15">15sp</dimen>
     <dimen name="text_size_16">16sp</dimen>
+    <dimen name="text_size_17">17sp</dimen>
     <dimen name="text_size_20">20sp</dimen>
     <dimen name="text_size_25">25sp</dimen>
     <dimen name="text_size_32">32sp</dimen>

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

@@ -30,6 +30,8 @@
     <color name="blue_end">#1394e8</color>
     <color name="blue_34a6e7">#34a6e7</color>
     <color name="blue_FF53BBF2">#FF53BBF2</color>
+    <color name="blue_36A6E6">#36A6E6</color>
+    <color name="blue_2EC2F7">#2EC2F7</color>
     <color name="white_DEDEDE">#DEDEDE</color>
     <color name="white_ededed">#ededed</color>
     <color name="white_FFF7F7F7">#FFF7F7F7</color>

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

@@ -37,6 +37,10 @@
         <item name="android:textSize">@dimen/text_size_16</item>
         <item name="android:textColor">@color/black</item>
     </style>
+    <style name="txt_style_17_black">
+        <item name="android:textSize">@dimen/text_size_17</item>
+        <item name="android:textColor">@color/black</item>
+    </style>
 
     <style name="txt_style_12">
         <item name="android:textSize">@dimen/text_size_12</item>