添加挂机赚钱界面、修改按钮风格并删除半袋米中的QQ风格

app/src/main/AndroidManifest.xml

@@ -317,6 +317,7 @@
             android:screenOrientation="portrait"
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
             android:configChanges="orientation|keyboardHidden|screenSize"/>
+        <activity android:name="com.sheep.gamegroup.view.activity.CommitWxAct" />
 
 
         <!--友盟start-->

app/src/main/java/com/kfzs/duanduan/ActDuJiaShouFa.java

@@ -27,10 +27,8 @@ import com.kfzs.duanduan.bll.UrlBll;
 import com.kfzs.duanduan.event.EventDownloadHandler;
 import com.kfzs.duanduan.proto.ApiResponseOuterClass;
 import com.kfzs.duanduan.proto.GameOuterClass;
-import com.kfzs.duanduan.utils.ThemeUtils;
 import com.kfzs.duanduan.utils.net.ResponseNetworkTask;
 import com.kfzs.duanduan.utils.NumberFormatUtils;
-import com.kfzs.duanduan.utils.StatusBarUtils;
 import com.kfzs.duanduan.utils.dlg.DownBtnUtils;
 import com.kfzs.duanduan.utils.dlg.HelperUtils;
 import com.kfzs.duanduan.utils.dlg.SkipUtils;

app/src/main/java/com/kfzs/duanduan/ActMain.java

@@ -82,13 +82,8 @@ public class ActMain extends BaseCompatActivity{
 
     public final static String INTEN_GAME_ID = "INTEN_GAME_ID";
 
-    private boolean hasHeadSession = false;
-    private KFZSDDContentSession mKFZSDDContentSession;
     private DownloadTaskService mDownloadTaskService;
-    private TextView mTxtToolBar;
 
-    private final static String INTENT_SKIP_MODE = "INTENT_SKIP_MODE";
-    private final static String INTENT_SKIP_DATA = "INTENT_SKIP_DATA";
     private ImageView mImgDot;//下载按钮的小红点
     private AppHomepageAdvertisementDialog gameDialog;//预约窗口
 
@@ -108,10 +103,8 @@ public class ActMain extends BaseCompatActivity{
         ButterKnife.bind(this);
         EventBus.getDefault().register(this);
 
-        mTxtToolBar = (TextView) findViewById(R.id.txt_main_activity_toolbar);
         mImgDot = (ImageView) findViewById(R.id.img_download_manager_dot);
         tabsHelper.init();
-        mKFZSDDContentSession = KFZSDDContentSession.getInstance();
         mDownloadTaskService = new DownloadTaskService(this);
         mDownloadTaskService.restoreDownloadTaskStatus();
 

app/src/main/java/com/kfzs/duanduan/ActWeb.java

@@ -20,8 +20,6 @@ import com.kfzs.duanduan.bean.KFIntentKeys;
 import com.kfzs.duanduan.data.graph.provider.current.Current;
 import com.kfzs.duanduan.datashare.DDProviderHelper;
 import com.kfzs.duanduan.db.DataSave;
-import com.kfzs.duanduan.utils.StatusBarUtils;
-import com.kfzs.duanduan.utils.ThemeUtils;
 import com.kfzs.duanduan.utils.net.OnURLParseByJS;
 import com.kfzs.duanduan.utils.ShareUtils;
 import com.orhanobut.logger.Logger;

app/src/main/java/com/kfzs/duanduan/BaseCompatActivity.java

@@ -11,9 +11,6 @@ import android.view.View;
 
 import com.kf.utils.ToastBuilder;
 import com.kfzs.android.view.CompatActivity;
-import com.kfzs.duanduan.bean.VipStyle;
-import com.kfzs.duanduan.utils.StatusBarUtils;
-import com.kfzs.duanduan.utils.ThemeUtils;
 import com.sheep.gamegroup.util.ActivityManager;
 import com.umeng.analytics.MobclickAgent;
 
@@ -56,7 +53,6 @@ public abstract class BaseCompatActivity extends CompatActivity {
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
-        setTheme(ThemeUtils.getInstance().getThemeId(VipStyle.getInstance().getViptypeid()));
 //        StatusBarUtils.setColor(this, ThemeUtils.getInstance().getColorDark(), 0);
         setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
         super.onCreate(savedInstanceState);

app/src/main/java/com/kfzs/duanduan/adp/AdpSearchGame.java

@@ -1,7 +1,6 @@
 package com.kfzs.duanduan.adp;
 
 import android.content.Context;
-import android.content.Intent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -10,12 +9,9 @@ import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
 import com.kfzs.android.view.KFGlideRoundTransform;
-import com.kfzs.duanduan.utils.ThemeUtils;
 import com.kfzs.duanduan.utils.dlg.SkipUtils;
 import com.kfzs.duanduan.view.KFProgressButton;
-import com.kfzs.duanduan.ActWeb;
 import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.bean.KFIntentKeys;
 import com.kfzs.duanduan.proto.GameOuterClass;
 import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.kfzs.duanduan.utils.dlg.DownBtnUtils;

app/src/main/java/com/kfzs/duanduan/bll/AppBaseBll.java

@@ -1,90 +0,0 @@
-package com.kfzs.duanduan.bll;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.text.TextUtils;
-
-import com.android.volleyplus.Response;
-import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.duanduan.ActMain;
-import com.kfzs.duanduan.BaseCompatActivity;
-import com.kfzs.duanduan.KFZSApp;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.bean.BaseMsg;
-import com.kfzs.duanduan.bean.VipStyle;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.utils.ThemeUtils;
-import com.kfzs.duanduan.utils.dlg.HelperUtils;
-import com.kfzs.duanduan.utils.net.APIRequest;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-import com.kfzs.duanduan.utils.net.APIRequestV2;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  AppBaseBll</p>
- * @ <p>Description:APP的一些基础业务类</p>
- * @ date:  2017/12/14 14:39
- * @ QQ:    315096953
- */
-
-public class AppBaseBll {
-
-
-    /**
-     * 加载vip的风格，不会更新任何Activity
-     *
-     * @param context
-     */
-    public void loadVipStyleAll(final Context context) {
-        APIRequestV2 apiRequestV2 = APIRequestInstance.getReqUrlV2("loadVipStyle",
-                UrlBll.V2.VIP_STYLE, null, new Response.Listener<BaseMsg>() {
-                    @Override
-                    public void onResponse(BaseMsg baseMsg) {
-                        VipStyle vipStyle = baseMsg.getData(VipStyle.class);
-                        if (vipStyle == null || TextUtils.isEmpty(vipStyle.getBanner())) {
-                            return;
-                        }
-                        VipStyle.getInstance().init(vipStyle);
-                        ThemeUtils.getInstance().changeTheme(context, VipStyle.getInstance().getViptypeid());
-                    }
-                }, null);
-        KFZSNetwork.addRequest(apiRequestV2);
-    }
-
-
-    /**
-     * 重载vip的风格，activity会重新刷新
-     *
-     * @param context
-     */
-    public void reloadVipStyle(final Context context) {
-        APIRequestV2 apiRequestV2 = APIRequestInstance.getReqUrlV2("loadVipStyle",
-                UrlBll.V2.VIP_STYLE, null, new Response.Listener<BaseMsg>() {
-                    @Override
-                    public void onResponse(BaseMsg baseMsg) {
-                        VipStyle vipStyle = baseMsg.getData(VipStyle.class);
-                        if (vipStyle != null && !TextUtils.isEmpty(vipStyle.getBanner())) {
-                            VipStyle.getInstance().init(vipStyle);
-                            ThemeUtils.getInstance().changeTheme(context, VipStyle.getInstance().getViptypeid());
-                        }
-
-
-//                        if (KFZSApp.actMain != null) {
-//                            try {
-//                                KFZSApp.actMain.finish();
-//                            } catch (Exception e) {
-//                                e.printStackTrace();
-//                            }
-//                        }
-                        Intent intent = new Intent(context, ActMain.class);
-                        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
-//                        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-//                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                        context.startActivity(intent);
-                    }
-                }, null);
-        KFZSNetwork.addRequest(apiRequestV2);
-    }
-}

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

@@ -1,6 +1,5 @@
 package com.kfzs.duanduan.fragment;
 
-import android.app.Activity;
 import android.os.Bundle;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.LinearLayoutManager;

app/src/main/java/com/kfzs/duanduan/utils/ThemeUtils.java

@@ -1,88 +0,0 @@
-package com.kfzs.duanduan.utils;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.support.annotation.AttrRes;
-import android.support.annotation.IdRes;
-
-import com.kfzs.duanduan.BaseCompatActivity;
-import com.kfzs.duanduan.KFZSApp;
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.bean.VipStyle;
-import com.kfzs.duanduan.bll.AppBaseBll;
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  ThemeUtils</p>
- * @ <p>Description:增加主题功能后，弄个工具类来实现吧</p>
- * @ date:  2017/12/15 13:40
- * @ QQ:    315096953
- */
-
-public class ThemeUtils {
-
-    private static ThemeUtils mThemeUtils;
-    private int color_main = 0xf5c923;
-    private int color_mid = 0xfee055;
-    private int color_dark = 0xef702b;
-
-    public synchronized static ThemeUtils getInstance() {
-        if (mThemeUtils == null) {
-            mThemeUtils = new ThemeUtils();
-            mThemeUtils.changeTheme(KFZSApp.context, 1);
-        }
-        return mThemeUtils;
-    }
-
-    /**
-     * @param context
-     * @param viptype 暂时没用枚举,1为好玩色，默认色
-     */
-    @SuppressLint("ResourceType")
-    public void changeTheme(Context context, int viptype) {
-        switch (viptype) {
-            case 2:
-                color_main = context.getResources().getColor(R.color.theme_qq_main);
-                color_mid = context.getResources().getColor(R.color.theme_qq_mid);
-                color_dark = context.getResources().getColor(R.color.theme_qq_dark);
-                break;
-            default:
-                color_main = context.getResources().getColor(R.color.theme_app_main);
-                color_mid = context.getResources().getColor(R.color.theme_app_mid);
-                color_dark = context.getResources().getColor(R.color.theme_app_dark);
-                break;
-        }
-    }
-
-    public int getThemeResId(Context context, @AttrRes int attrId, int defaultId) {
-        TypedArray array = context.getTheme().obtainStyledAttributes(new int[]{attrId});
-        return array.getResourceId(0, defaultId);
-    }
-
-    public int getThemeId(int userType) {
-        int themeId;
-        switch (userType) {
-            case 2:
-                themeId = R.style.AppThemeQQ;
-                break;
-            default:
-                themeId = R.style.AppTheme;
-                break;
-        }
-        return themeId;
-    }
-
-    public int getColorMain() {
-        return color_main;
-    }
-
-    public int getColorMid() {
-        return color_mid;
-    }
-
-    public int getColorDark() {
-        return color_dark;
-    }
-
-}

app/src/main/java/com/kfzs/duanduan/view/KFProgressButton.java

@@ -3,13 +3,9 @@ package com.kfzs.duanduan.view;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Paint;
-import android.graphics.Rect;
-import android.graphics.RectF;
 import android.util.AttributeSet;
-import android.widget.Button;
 
 import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.utils.ThemeUtils;
 
 /**
  * 带进度按钮

app/src/main/java/com/sheep/gamegroup/di/components/LieMakeMoneyComponent.java

@@ -0,0 +1,17 @@
+package com.sheep.gamegroup.di.components;
+
+import com.sheep.gamegroup.di.modules.LieMakeMoneyModule;
+import com.sheep.gamegroup.di.scopes.UserScope;
+import com.sheep.gamegroup.view.activity.LieMakeMoneyAct;
+
+import dagger.Component;
+
+/**
+ * Created by realicing on 2018/3/23.
+ * realicing@sina.com
+ */
+@UserScope
+@Component(modules = LieMakeMoneyModule.class, dependencies = NetComponent.class)
+public interface LieMakeMoneyComponent {
+    void inject(LieMakeMoneyAct lieMakeMoneyact);
+}

app/src/main/java/com/sheep/gamegroup/di/modules/LieMakeMoneyModule.java

@@ -0,0 +1,24 @@
+package com.sheep.gamegroup.di.modules;
+
+
+import com.sheep.gamegroup.presenter.LieMakeMoneyContract;
+
+import dagger.Module;
+import dagger.Provides;
+
+/**
+ * Created by realicing on 2018/3/23.
+ * realicing@sina.com
+ */
+@Module
+public class LieMakeMoneyModule {
+    private LieMakeMoneyContract.View view;
+
+    public LieMakeMoneyModule(LieMakeMoneyContract.View view) {
+        this.view = view;
+    }
+    @Provides
+    public LieMakeMoneyContract.View provideView(){
+        return view;
+    }
+}

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

@@ -46,7 +46,7 @@ public interface ApiService {
     Observable<BaseMessage> getCaptcha(@Body JSONObject jsonObject);
 
     @POST(V1+"app/auth/login_by_sms/")
-    Observable<BaseMessage> loginByCaptcha(@Body com.alibaba.fastjson.JSONObject jsonObject);
+    Observable<BaseMessage> loginByCaptcha(@Body JSONObject jsonObject);
 
     /**
      * 获取用户信息
@@ -56,8 +56,13 @@ public interface ApiService {
     /**
      * 获取用户的已经挂机微信
      */
-    @GET(V1+"/app/wechat//")
+    @GET(V1+"/app/wechat/")
     Observable<BaseMessage> getWebchat();
+    /**
+     * 提交用户的微信账号与密码
+     */
+    @POST(V1+"/app/wechat/")
+    Observable<BaseMessage> postWebchat(@Query("account") String account, @Query("password") String password);
 
     /**
      * 绑定手机号

app/src/main/java/com/sheep/gamegroup/presenter/CommitWxMakeMoneyContract.java

@@ -0,0 +1,20 @@
+package com.sheep.gamegroup.presenter;
+
+
+/**
+ * Created by realicing on 2018/3/23.
+ * realicing@sina.com
+ */
+
+public interface CommitWxMakeMoneyContract {
+    interface Presenter{
+        void postWebchat(String account, String password);//提交微信账号
+    }
+    interface View{
+
+        void updateData2View(Object o);
+        void failData2View(Object o);
+        void postWebchatUpdataView(Object o);
+        void failPostWebchat2View(Object o);
+    }
+}

app/src/main/java/com/sheep/gamegroup/presenter/CommitWxMakeMoneyPresenter.java

@@ -0,0 +1,46 @@
+package com.sheep.gamegroup.presenter;
+
+import com.sheep.gamegroup.model.api.ApiService;
+import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.util.ExceptionHandle;
+import com.sheep.gamegroup.model.util.MySubscriber;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+
+import javax.inject.Inject;
+
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * Created by realicing on 2018/3/23.
+ * realicing@sina.com
+ */
+
+public class CommitWxMakeMoneyPresenter implements CommitWxMakeMoneyContract.Presenter {
+    private CommitWxMakeMoneyContract.View view;
+    private ApiService apiService;
+    @Inject
+    public CommitWxMakeMoneyPresenter(CommitWxMakeMoneyContract.View view, ApiService apiService) {
+        this.view = view;
+        this.apiService = apiService;
+    }
+
+    @Override
+    public void postWebchat(String account, String password) {
+        apiService.getWebchat()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new MySubscriber<BaseMessage>(SheepApp.mContext) {
+                    @Override
+                    public void onError(ExceptionHandle.ResponeThrowable responeThrowable) {
+                        view.failData2View(responeThrowable.getMessage());
+                    }
+
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        view.updateData2View(baseMessage);
+
+                    }
+                });
+    }
+}

app/src/main/java/com/sheep/gamegroup/presenter/LieMakeMoneyContract.java

@@ -0,0 +1,20 @@
+package com.sheep.gamegroup.presenter;
+
+
+/**
+ * Created by realicing on 2018/3/23.
+ * realicing@sina.com
+ */
+
+public interface LieMakeMoneyContract {
+    interface Presenter{
+        void getWebchat();//获取挂机账号列表信息
+    }
+    interface View{
+
+        void updateData2View(Object o);
+        void failData2View(Object o);
+        void getWebchatUpdataView(Object o);
+        void failGetWebchat2View(Object o);
+    }
+}

app/src/main/java/com/sheep/gamegroup/presenter/LieMakeMoneyPresenter.java

@@ -0,0 +1,46 @@
+package com.sheep.gamegroup.presenter;
+
+import com.sheep.gamegroup.model.api.ApiService;
+import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.util.ExceptionHandle;
+import com.sheep.gamegroup.model.util.MySubscriber;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+
+import javax.inject.Inject;
+
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * Created by realicing on 2018/3/23.
+ * realicing@sina.com
+ */
+
+public class LieMakeMoneyPresenter implements LieMakeMoneyContract.Presenter {
+    private LieMakeMoneyContract.View view;
+    private ApiService apiService;
+    @Inject
+    public LieMakeMoneyPresenter(LieMakeMoneyContract.View view, ApiService apiService) {
+        this.view = view;
+        this.apiService = apiService;
+    }
+
+    @Override
+    public void getWebchat() {
+        apiService.getWebchat()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new MySubscriber<BaseMessage>(SheepApp.mContext) {
+                    @Override
+                    public void onError(ExceptionHandle.ResponeThrowable responeThrowable) {
+                        view.failData2View(responeThrowable.getMessage());
+                    }
+
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        view.updateData2View(baseMessage);
+
+                    }
+                });
+    }
+}

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

@@ -6,8 +6,8 @@ package com.sheep.gamegroup.util;
 
 public class ConnectAddress {
 
-    public static final String BASE_HTTP = "http://10.8.220.6:8080/";//何威
-//    public static final String BASE_HTTP = "http://10.8.220.5:8080/";//张伟
+//    public static final String BASE_HTTP = "http://10.8.220.6:8080/";//何威
+    public static final String BASE_HTTP = "http://10.8.220.5:8080/";//张伟
 //    public static final String BASE_HTTP = "http://test.sheep.kfzs.com/";//测试服地址
 
     public static final String V1 = "/v1/";

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

@@ -9,6 +9,7 @@ import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.view.activity.AuthenticationAct;
 import com.sheep.gamegroup.view.activity.BindDataAct;
 import com.sheep.gamegroup.view.activity.BindOrChangeWeixinAct;
+import com.sheep.gamegroup.view.activity.CommitWxAct;
 import com.sheep.gamegroup.view.activity.DialogActivity;
 import com.sheep.gamegroup.view.activity.HomePageAct;
 import com.sheep.gamegroup.view.activity.LieMakeMoneyAct;
@@ -148,6 +149,15 @@ public class Jump2View {
         Intent intent = new Intent(context, LieMakeMoneyAct.class);
         context.startActivity(intent);
     }
+    /**
+     * 跳到提交微信号挂机赚钱界面
+     * @param context
+     * @param o
+     */
+    public void goCommitWxView(Context context, Object o){
+        Intent intent = new Intent(context, CommitWxAct.class);
+        context.startActivity(intent);
+    }
 
     /**
      * 跳到绑定数据页面

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

@@ -0,0 +1,69 @@
+package com.sheep.gamegroup.view.activity;
+
+import android.app.Activity;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import com.kfzs.duanduan.G;
+import com.sheep.gamegroup.presenter.CommitWxMakeMoneyPresenter;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
+
+import javax.inject.Inject;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+/**
+ * Created by realicing on 2018/3/23.
+ * realicing@sina.com
+ */
+
+public class CommitWxAct extends BaseActivity {
+
+    @BindView(R.id.tv_wx_commit)
+    TextView tv_wx_commit;
+    @BindView(R.id.et_wx_account)
+    EditText et_wx_account;
+    @BindView(R.id.et_wx_pwd)
+    EditText et_wx_pwd;
+    @OnClick({R.id.tv_wx_commit})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.tv_wx_commit:
+                G.showToast("该功能正在建设中");
+                break;
+        }
+    }
+    @Inject
+    CommitWxMakeMoneyPresenter presenter;
+
+    private Activity activity;
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.commit_wx_make_money;
+    }
+
+    @Override
+    public void initView() {
+        ButterKnife.bind(this);
+        activity = this;
+        TitleBarUtils.getInstance()
+                .setTitle(activity, "挂机赚钱")
+                .setTitleFinish(activity);
+    }
+
+    @Override
+    public void initListener() {
+
+    }
+
+    @Override
+    public void initData() {
+
+    }
+}

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

@@ -9,28 +9,37 @@ import android.support.v7.widget.RecyclerView;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.sheep.gamegroup.di.components.DaggerLieMakeMoneyComponent;
+import com.sheep.gamegroup.di.modules.LieMakeMoneyModule;
+import com.sheep.gamegroup.di.modules.TryMakeMoneyModule;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.RecyleObj;
 import com.sheep.gamegroup.model.entity.RecyleType;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 import com.sheep.gamegroup.model.entity.TaskReleaseEty;
+import com.sheep.gamegroup.presenter.LieMakeMoneyContract;
+import com.sheep.gamegroup.presenter.LieMakeMoneyPresenter;
 import com.sheep.gamegroup.presenter.TryMakeMoneyContract;
 import com.sheep.gamegroup.view.adapter.LieMakeMoneyAdp;
+import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import java.util.List;
 
+import javax.inject.Inject;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
 /**
- * Created by ljy on 2018/3/10.
+ * Created by realicing on 2018/3/23.
+ * realicing@sina.com
  */
-
-public class LieMakeMoneyAct extends BaseActivity {
+public class LieMakeMoneyAct extends BaseActivity implements LieMakeMoneyContract.View{
     @BindView(R.id.recyclerview)
     RecyclerView recyclerview;
     @BindView(R.id.refresh)
@@ -38,7 +47,8 @@ public class LieMakeMoneyAct extends BaseActivity {
 
     private Activity activity;
     private LieMakeMoneyAdp lieMakeMoneyAdp;
-
+    @Inject
+    LieMakeMoneyPresenter presenter;
     Handler mhandler = new Handler(){
         @Override
         public void handleMessage(Message msg) {
@@ -61,12 +71,15 @@ public class LieMakeMoneyAct extends BaseActivity {
                 .getInstance()
                 .setTitle(activity, "躺着赚钱")
                 .setTitleFinish(activity);
+        DaggerLieMakeMoneyComponent.builder()
+                .netComponent(SheepApp.get(this).getNetComponent())
+                .lieMakeMoneyModule(new LieMakeMoneyModule(this))
+                .build()
+                .inject(this);
         recyclerview.setLayoutManager(new LinearLayoutManager(activity));
         lieMakeMoneyAdp = new LieMakeMoneyAdp(this);
-        boolean hasData = false;
-        if(!hasData)
-            lieMakeMoneyAdp.add(RecyleObj.make(RecyleType.START_ON_HOOK, null));
-        lieMakeMoneyAdp.add(RecyleObj.make(RecyleType.PROMPT_ON_HOOK, hasData));
+        lieMakeMoneyAdp.add(RecyleObj.make(RecyleType.START_ON_HOOK, null));
+        lieMakeMoneyAdp.add(RecyleObj.make(RecyleType.PROMPT_ON_HOOK, false));
         recyclerview.setAdapter(lieMakeMoneyAdp);
     }
 
@@ -97,9 +110,31 @@ public class LieMakeMoneyAct extends BaseActivity {
 
     @Override
     public void initData() {
+        if(presenter == null){
+            if(BuildConfig.DEBUG) G.showToast("请刷新项目重试");
+            return;
+        }
+        presenter.getWebchat();
+    }
 
+    @Override
+    public void updateData2View(Object o) {
+        G.showToast("updateData2View");
     }
 
+    @Override
+    public void failData2View(Object o) {
+        G.showToast("failData2View");
+    }
+
+    @Override
+    public void getWebchatUpdataView(Object o) {
+        G.showToast("getWebchatUpdataView");
+    }
 
+    @Override
+    public void failGetWebchat2View(Object o) {
+        G.showToast("failGetWebchat2View");
 
+    }
 }

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

@@ -23,9 +23,9 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 import java.util.List;
 
 /**
- * Created by ljy on 2018/3/20.
+ * Created by realicing on 2018/3/23.
+ * realicing@sina.com
  */
-
 public class LieMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
     private final static int TAG_ID_TEMP = R.id.view_tag_1;
 
@@ -91,103 +91,16 @@ public class LieMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
     private void bindStartOnHook(ViewHolder holder) {
         ImageView imageView = holder.getView(R.id.start_on_hook_iv, ImageView.class);
         imageView.setOnClickListener(view -> {
-            //TODO 跳转到添加微信账号来进行挂机的界面
-            G.showToast("该功能正在建设中");
+            Jump2View.getInstance().goCommitWxView(this.context, null);
         });
     }
     private void bindPromptOnHook(ViewHolder holder, boolean hasData) {
         View ll = holder.getView(R.id.lie_make_operation_ll);
         ll.setVisibility(hasData ? View.VISIBLE : View.GONE);
         ll.findViewById(R.id.account_abnormal_tv).setOnClickListener(view -> {
-            //TODO 跳转到添加微信账号来进行挂机的界面
+            //TODO 账号解封
             G.showToast("该功能正在建设中");
         });
     }
-    /**
-     * 获取已发布的
-     */
-    private void bindReleaseTask(ViewHolder holder, List<TaskReleaseEty> etyList){
-        RecyclerView recyclerView = holder.getView(R.id.release_task_listview, RecyclerView.class);
-//        recyclerView.setHasFixedSize(true);
-//        recyclerView.setLayoutManager(new LinearLayoutManager(context));
-        recyclerView.setHasFixedSize(true);
-        recyclerView.setLayoutManager(new StaggeredGridLayoutManager(1,
-                StaggeredGridLayoutManager.HORIZONTAL));
-        recyclerView.setAdapter(new RecyclerView.Adapter(){
-
-            @Override
-            public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
-                View view = LayoutInflater.from(context)
-                        .inflate(R.layout.try_makemoney_item, viewGroup,false);
-                view.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        TaskEty taskEty = etyList.get(i).getTask();
-                        taskEty.setRunTask(0);
-//                        taskEty.setRelease_task_id(etyList.getRelease_task_id());
-                        Jump2View.getInstance().goDialogActivityView(context, taskEty);
-                    }
-                });
-                RecyclerView.ViewHolder viewHolder = new RecyclerView.ViewHolder(view) {
-                    @Override
-                    public String toString() {
-                        return super.toString();
-                    }
-                };
-                return viewHolder;
-            }
-
-            @Override
-            public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, int i) {
-                viewHolder.itemView.setTag(TAG_ID_TEMP, etyList.get(i).getId());
-                if(i == 0){
-
-                    viewHolder.itemView.findViewById(R.id.item_title_tv).setVisibility(View.VISIBLE);
-                    ((TextView)viewHolder.itemView.findViewById(R.id.item_title_tv)).setText("推荐");
-                }else{
-
-                    viewHolder.itemView.findViewById(R.id.item_title_tv).setVisibility(View.GONE);
-                }
-                ((TextView)viewHolder.itemView.findViewById(R.id.item_anem_tv)).setText(etyList.get(i).getTask().getTask_name()+"");
-                ((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() +"元");
-                Glide.with(context)
-                        .load(etyList.get(i).getTask().getIcon()+"")
-                        .placeholder(R.mipmap.ic_launcher)
-                        .into((ImageView) viewHolder.itemView.findViewById(R.id.item_icon_iv));
-            }
 
-            @Override
-            public int getItemCount() {
-                return etyList.size();
-            }
-        });
-    }
-
-    /**
-     * 获取我正在运行的任务
-     */
-    private void bindRunTask(ViewHolder holder, TaskAcceptedEty acceptedEty){
-        ImageView icon = holder.getView(R.id.item_icon_iv);
-        TextView item_anem_tv = holder.getView(R.id.item_anem_tv);
-        TextView item_num_tv = holder.getView(R.id.item_num_tv);
-        TextView item_money = holder.getView(R.id.item_money);
-        Glide.with(context)
-                .load(acceptedEty.getRelease_task().getTask().getIcon()+"")
-                .placeholder(R.mipmap.ic_launcher)
-                .dontAnimate()
-                .into(icon);
-        item_anem_tv.setText(acceptedEty.getRelease_task().getTask().getTask_name()+"");
-        item_num_tv.setText("剩余"+ acceptedEty.getRelease_task().getLast_num()+"份");
-        item_money.setText("+"+ acceptedEty.getRelease_task().getBonus() +"元");
-        holder.itemView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                TaskEty taskEty = acceptedEty.getRelease_task().getTask();
-                taskEty.setRunTask(1);
-                taskEty.setRelease_task_id(acceptedEty.getRelease_task_id());
-                Jump2View.getInstance().goDialogActivityView(context, taskEty);
-            }
-        });
-    }
 }

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

@@ -5,6 +5,6 @@
 
     <stroke
         android:width="1dp"
-        android:color="@color/theme_app_highlight_more" />
-    <solid android:color="@color/theme_app_highlight_more" />
+        android:color="@color/theme_app_highlight" />
+    <solid android:color="@color/theme_app_highlight" />
 </shape>

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

@@ -5,6 +5,6 @@
 
     <stroke
         android:width="1dp"
-        android:color="@color/theme_qq_highlight_more" />
-    <solid android:color="@color/theme_qq_highlight_more" />
+        android:color="@color/theme_app_highlight_more" />
+    <solid android:color="@color/theme_app_highlight_more" />
 </shape>

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

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/shape_circle_qq" android:state_checked="true"/>
-    <item android:drawable="@drawable/shape_circle_qq" android:state_selected="true"/>
-    <item android:drawable="@drawable/shape_circle_gray" android:state_checked="false"/>
-    <item android:drawable="@drawable/shape_circle_gray" android:state_enabled="false"></item>
-
-</selector>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+  <item android:state_focused="true" android:drawable="@drawable/button_full_normal_main_click" />
+  <item android:state_checked="true" android:drawable="@drawable/button_full_normal_main_click"/>
+  <item android:state_selected="true" android:drawable="@drawable/button_full_normal_main_click"/>
+  <item android:state_pressed="true" android:drawable="@drawable/button_full_normal_main_click"/>
+  <item android:drawable="@drawable/button_full_normal_main"/>
+</selector>

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

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="5dp" />
-    <solid android:color="@color/theme_qq_main" />
-    <size
-        android:width="15dp"
-        android:height="5dp" />
-</shape>

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

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rotate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:fromDegrees="45"
-    android:toDegrees="45">
-    <shape android:shape="rectangle">
-        <size
-            android:width="5dp"
-            android:height="5dp" />
-        <solid android:color="@color/theme_qq_main" />
-    </shape>
-</rotate>

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

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/theme_qq_main" />
-    <size
-        android:width="5dp"
-        android:height="15dp" />
-</shape>

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

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="16dp" />
-    <solid android:color="@color/theme_qq_mid" />
-</shape>

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

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/theme_dra_btn_corner_pressed_false_qq" android:state_pressed="false"/>
-    <item android:drawable="@drawable/theme_dra_btn_corner_pressed_true_qq" android:state_pressed="true"/>
-
-</selector>

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

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@android:id/background"
-        android:drawable="@color/transparent" />
-    <item
-        android:id="@android:id/secondaryProgress"
-        android:drawable="@drawable/xina_qq" />
-    <item
-        android:id="@android:id/progress"
-        android:drawable="@drawable/xinb_qq" />
-
-</layer-list>

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

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>  
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">  
-   <item>  
-      <shape android:shape="rectangle">   
-          <solid android:color="@color/item_transparent" />
-         <corners  
-            android:topLeftRadius="5dp"
-            android:topRightRadius="5dp"
-            android:bottomLeftRadius="5dp"
-            android:bottomRightRadius="5dp" />
-      </shape>  
-   </item>  
-   <item android:top="1px" android:bottom="1px" android:left="1px" android:right="1px">  
-     <shape>  
-        <gradient   
-            android:startColor="@color/theme_qq_dark" android:endColor="@color/theme_qq_main"
-            android:type="linear" android:angle="90"  
-            android:centerX="0.5" android:centerY="0.5" />  
-        <corners  
-            android:topLeftRadius="5dp"
-            android:topRightRadius="5dp"
-            android:bottomLeftRadius="5dp"
-            android:bottomRightRadius="5dp" />
-      </shape>  
-   </item> 
-</layer-list>  

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

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>  
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">  
-   <item>  
-      <shape android:shape="rectangle">   
-          <solid android:color="@color/item_transparent" />
-         <corners  
-            android:topLeftRadius="5dp"
-            android:topRightRadius="5dp"
-            android:bottomLeftRadius="5dp"
-            android:bottomRightRadius="5dp" />
-      </shape>  
-   </item>  
-   <item android:top="1px" android:bottom="1px" android:left="1px" android:right="1px">  
-     <shape>  
-        <gradient   
-            android:startColor="@color/theme_qq_mid" android:endColor="@color/theme_qq_dark"
-            android:type="linear" android:angle="90"  
-            android:centerX="0.5" android:centerY="0.9" />
-        <corners  
-            android:topLeftRadius="5dp"
-            android:topRightRadius="5dp"
-            android:bottomLeftRadius="5dp"
-            android:bottomRightRadius="5dp" />
-      </shape>  
-   </item> 
-</layer-list>  

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

@@ -0,0 +1,60 @@
+<?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="wrap_content"
+    android:layout_margin="@dimen/content_padding_10"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="@dimen/content_padding_10"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white">
+
+        <EditText
+            android:id="@+id/et_wx_account"
+            style="style_edt"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/edt_heigh_default"
+            android:background="@null"
+            android:drawablePadding="@dimen/content_padding_10"
+            android:drawableStart="@drawable/commit_wx_logo"
+            android:hint="请输入要挂机的微信号"
+            android:paddingLeft="20dp"
+            android:textColor="@color/black_text_deep"
+            android:textSize="@dimen/text_size_3" />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="#DFDFDF"
+            android:layout_marginLeft="@dimen/content_padding_10"
+            android:layout_marginRight="@dimen/content_padding_10"/>
+        <EditText
+            android:id="@+id/et_wx_pwd"
+            style="style_edt"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/edt_heigh_default"
+            android:background="@null"
+            android:drawablePadding="@dimen/content_padding_10"
+            android:drawableStart="@drawable/commit_wx_pwd"
+            android:hint="请输入微信密码"
+            android:inputType="textPassword"
+            android:paddingLeft="20dp"
+            android:textColor="@color/black_text_deep"
+            android:textSize="@dimen/text_size_3" />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/tv_wx_commit"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_margin="10dp"
+        android:padding="@dimen/content_padding_10"
+        android:gravity="center"
+        android:background="@drawable/selector_button_full_main"
+        android:text="确定"
+        android:textColor="@color/txt_black_010101"
+        android:textSize="@dimen/text_size_18" />
+</LinearLayout>

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

@@ -91,7 +91,7 @@
 
         <com.kfzs.duanduan.view.KFProgressButton
             android:id="@+id/download_mgr_btn_act"
-            style="?full.button"
+            android:background="@drawable/selector_button_full_main"
             android:layout_width="wrap_content"
             android:layout_height="30dip"
             android:layout_marginLeft="10dip"
@@ -99,7 +99,7 @@
             android:ellipsize="end"
             android:maxLines="1"
             android:text="下载中"
-            android:textColor="@color/white"
+            android:textColor="@color/btn_color_main"
             android:textSize="@dimen/app_size_tv_small" />
 
     </LinearLayout>

app/src/main/res/values-v23/style_theme.xml

@@ -19,7 +19,7 @@
         <item name="line_short">@drawable/sp_line_vertical</item>
         <item name="star_style">@style/ratingbar_main</item>
         <item name="radio_btn">@drawable/sel_circle_dot</item>
-        <item name="button_full_normal">@drawable/button_full_normal_main</item>
+        <item name="button_full_normal">@drawable/selector_button_full_main</item>
         <item name="full.button">@style/full.button_main</item>
         <item name="small.button">@style/small.button_main</item>
         <item name="sp_dot_rota">@drawable/sp_dot_rota_main</item>
@@ -27,33 +27,4 @@
         <item name="sp_search_edt">@drawable/sp_search_edt_main</item>
         <item name="btn_color">@color/btn_color_main</item>
     </style>
-
-    <style name="AppThemeQQ" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="colorPrimary">@color/white</item>
-        <item name="colorPrimaryDark">@color/white</item>
-        <item name="colorAccent">@color/theme_qq_highlight</item>
-        <item name="colorControlHighlight">@color/theme_qq_highlight_more</item>
-
-        <item name="main_color">@color/theme_qq_main</item>
-        <item name="main_color_dark">@color/theme_qq_dark</item>
-        <item name="main_color_mid">@color/theme_qq_mid</item>
-        <item name="main_color_accent">@color/theme_qq_highlight</item>
-        <item name="main_color_light">@color/theme_qq_highlight_more</item>
-        <item name="star_unselect">@drawable/xina_qq</item>
-        <item name="star_select">@drawable/xinb_qq</item>
-        <!--下面的属性全是为了兼容安卓4.0！多了好多文件啊-->
-
-        <item name="line_short">@drawable/sp_line_vertical_qq</item>
-        <item name="star_style">@style/ratingbar_qq</item>
-        <item name="radio_btn">@drawable/sel_circle_dot_qq</item>
-        <item name="button_full_normal">@drawable/button_full_normal_qq</item>
-        <item name="full.button">@style/full.button_qq</item>
-        <item name="small.button">@style/small.button_qq</item>
-        <item name="sp_dot_rota">@drawable/sp_dot_rota_qq</item>
-        <item name="theme_bg_btn_corner">@drawable/theme_bg_btn_corner_qq</item>
-        <item name="sp_search_edt">@drawable/sp_search_edt_qq</item>
-        <item name="btn_color">@color/btn_color_qq</item>
-    </style>
 </resources>

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

@@ -1,18 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!--app theme color-->
-    <color name="theme_qq_main">#2c72f4</color>
-    <color name="theme_qq_mid">#3f83f6</color>
-    <color name="theme_qq_dark">#1e58f0</color>
-    <color name="theme_qq_highlight">#4b8ef7</color>
-    <color name="theme_qq_highlight_more">#5e9ff8</color>
     <color name="btn_color_main">#000000</color>
 
-    <color name="theme_app_main">#f5c923</color>
-    <color name="theme_app_mid">#ffba25</color>
-    <color name="theme_app_highlight">#ffaa25</color>
-    <color name="theme_app_highlight_more">#fee055</color>
-    <color name="btn_color_qq">#ffffff</color>
+    <color name="theme_app_main">#29d6fd</color>
+    <color name="theme_app_mid">#34a5e7</color>
+    <color name="theme_app_highlight">#29d6fd</color>
+    <color name="theme_app_highlight_more">#34a5e7</color>
 
     <!--app theme info color-->
     <color name="theme_app_info">#42a4ff</color>

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

@@ -30,6 +30,7 @@
     <dimen name="text_size_10">10sp</dimen>
     <dimen name="text_size_12">12sp</dimen>
     <dimen name="text_size_15">15sp</dimen>
+    <dimen name="text_size_18">18sp</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/dd_styles.xml

@@ -57,27 +57,16 @@
     </style>
 
     <style name="full.button_main" parent="button">
-        <item name="android:background">@drawable/button_full_normal_main</item>
+        <item name="android:background">@drawable/selector_button_full_main</item>
         <item name="android:textColor">@color/btn_color_main</item>
         <item name="android:textSize">13sp</item>
     </style>
 
-    <style name="full.button_qq" parent="button">
-        <item name="android:background">@drawable/button_full_normal_qq</item>
-        <item name="android:textColor">@color/btn_color_qq</item>
-        <item name="android:textSize">13sp</item>
-    </style>
-
     <style name="small.button_main" parent="full.button_main">
         <item name="android:layout_width">60dip</item>
         <item name="android:layout_height">30dip</item>
     </style>
 
-    <style name="small.button_qq" parent="full.button_qq">
-        <item name="android:layout_width">60dip</item>
-        <item name="android:layout_height">30dip</item>
-    </style>
-
     <style name="group_title">
         <item name="android:drawableLeft">@mipmap/h1</item>
         <item name="android:textSize">@dimen/app_size_tv_ordinary</item>
@@ -111,13 +100,6 @@
         <item name="android:layout_height">10dip</item>
     </style>
 
-    <style name="ratingbar_qq" parent="@android:style/Widget.RatingBar">
-        <item name="android:progressDrawable">@drawable/theme_bg_ratingbar_qq</item>
-        <item name="android:minHeight">16dip</item>
-        <item name="android:maxHeight">16dip</item>
-        <item name="android:layout_height">10dip</item>
-    </style>
-
     <style name="icon">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>

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

@@ -22,6 +22,7 @@
     <color name="txt_black_cc444444">#cc444444</color>
     <color name="txt_black_444444">#444444</color>
     <color name="txt_black_565656">#565656</color>
+    <color name="txt_black_010101">#010101</color>
     <color name="txt_red_ff4a5f">#ff4a5f</color>
 
     <color name="yellow_start">#f4c76c</color>

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

@@ -19,7 +19,7 @@
         <item name="line_short">@drawable/sp_line_vertical</item>
         <item name="star_style">@style/ratingbar_main</item>
         <item name="radio_btn">@drawable/sel_circle_dot</item>
-        <item name="button_full_normal">@drawable/button_full_normal_main</item>
+        <item name="button_full_normal">@drawable/selector_button_full_main</item>
         <item name="full.button">@style/full.button_main</item>
         <item name="small.button">@style/small.button_main</item>
         <item name="sp_dot_rota">@drawable/sp_dot_rota_main</item>
@@ -28,34 +28,6 @@
         <item name="btn_color">@color/btn_color_main</item>
     </style>
 
-    <style name="AppThemeQQ" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="colorPrimary">@color/white</item>
-        <item name="colorPrimaryDark">@color/disenable_color</item>
-        <item name="colorAccent">@color/theme_qq_highlight</item>
-        <item name="colorControlHighlight">@color/theme_qq_highlight_more</item>
-
-        <item name="main_color">@color/theme_qq_main</item>
-        <item name="main_color_dark">@color/theme_qq_dark</item>
-        <item name="main_color_mid">@color/theme_qq_mid</item>
-        <item name="main_color_accent">@color/theme_qq_highlight</item>
-        <item name="main_color_light">@color/theme_qq_highlight_more</item>
-        <item name="star_unselect">@drawable/xina_qq</item>
-        <item name="star_select">@drawable/xinb_qq</item>
-        <!--下面的属性全是为了兼容安卓4.0！多了好多文件啊-->
-
-        <item name="line_short">@drawable/sp_line_vertical_qq</item>
-        <item name="star_style">@style/ratingbar_qq</item>
-        <item name="radio_btn">@drawable/sel_circle_dot_qq</item>
-        <item name="button_full_normal">@drawable/button_full_normal_qq</item>
-        <item name="full.button">@style/full.button_qq</item>
-        <item name="small.button">@style/small.button_qq</item>
-        <item name="sp_dot_rota">@drawable/sp_dot_rota_qq</item>
-        <item name="theme_bg_btn_corner">@drawable/theme_bg_btn_corner_qq</item>
-        <item name="sp_search_edt">@drawable/sp_search_edt_qq</item>
-        <item name="btn_color">@color/btn_color_main</item>
-    </style>
-
 
     <attr name="sp_search_edt" format="reference" />
     <attr name="theme_bg_btn_corner" format="reference" />