微信绑定，界面添加

app/src/main/AndroidManifest.xml

@@ -331,6 +331,8 @@
         <activity android:name="com.sheep.gamegroup.view.activity.ReNameActivity" />
 
         <activity android:name="com.sheep.gamegroup.view.activity.RealNameAuthenAct" />
+        <activity android:name="com.sheep.gamegroup.view.activity.ChangeWxOrTelAct"
+            android:screenOrientation="portrait"/>
         <!--友盟start-->
         <meta-data
             android:name="UMENG_APPKEY"

app/src/main/java/com/kfzs/duanduan/event/EventTypes.java

@@ -20,4 +20,7 @@ public enum EventTypes {
     GO_FiRST , //任务功能  登录后 点击返回键 只能返回第一个界面
     ONFRESH_FGT_FAMLLSHEEP , //刷新fgtSmallSheep数据
     ONFRESH_TRYMAKEMANY_PAGE , //刷新TryMakeMoneyact数据
+
+    //Todo 遇得到的问题
+    INTENT_AMOUNT_VALUE,//提现传值用
 }

app/src/main/java/com/sheep/gamegroup/absBase/BaseActivity.java

@@ -6,6 +6,8 @@ import android.support.annotation.Nullable;
 import android.view.KeyEvent;
 import android.widget.Toast;
 
+import com.sheep.gamegroup.util.ActivityManager;
+
 import butterknife.ButterKnife;
 
 /**
@@ -25,6 +27,7 @@ public abstract class BaseActivity extends AppActivity  {
         initView();
         initListener();
         initData();
+        ActivityManager.getInstance().pushActivity(this);
 
     }
 

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

@@ -42,10 +42,14 @@ public class ActivityManager {
      * 结束制定activity
      */
     public void endActivity(Class<? extends Activity> cls){
-        for(Activity activity: activityStack){
-            if(activity.getClass().equals(cls)){
-                endActivity(activity);
+        try{
+            for(Activity activity: activityStack){
+                if(activity.getClass().equals(cls)){
+                    endActivity(activity);
+                }
             }
+        }catch (Exception e){
+            e.printStackTrace();
         }
     }
     /**

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

@@ -23,10 +23,10 @@ public class CommonUtil {
         String result = "未审核";
         switch (type){
             case 0:
-                result = "系统审核通过";
+                result = "未审核";
                 break;
             case 1:
-                result = "未审核";
+                result = "系统审核通过";
                 break;
             case 2:
                 result = "等待人工审核";

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

@@ -17,6 +17,7 @@ import com.sheep.gamegroup.view.activity.AskGetMoneyAct;
 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.ChangeWxOrTelAct;
 import com.sheep.gamegroup.view.activity.CommitWxAct;
 import com.sheep.gamegroup.view.activity.CommitWxCodeAct;
 import com.sheep.gamegroup.view.activity.DialogActivity;
@@ -79,7 +80,8 @@ public class Jump2View {
      */
     public void goLoginView(Context context, Object o){
         Intent intent = new Intent(context, LoginAct.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        if(o != null)
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         context.startActivity(intent);
     }
 
@@ -142,9 +144,9 @@ public class Jump2View {
      * @param context
      * @param o
      */
-    public void goWithdrawalResultview(Context context, Object o){
+    public void goWithdrawalResultview(Context context, String o){
         Intent intent = new Intent(context, WithdrawalResultAct.class);
-        intent.putExtra(" amount", String.valueOf(o));
+        intent.putExtra(" amount", o);
         context.startActivity(intent);
     }
 
@@ -154,6 +156,10 @@ public class Jump2View {
      * @param o false:绑定   true：切换
      */
     public void goBindOrChangeWeixinView(Context context, Object o){
+        if(!isBindWeixin(context)){
+            goNoBindWx(context, o);
+            return;
+        }
         Intent intent = new Intent(context, BindOrChangeWeixinAct.class);
         intent.putExtra("type",o==null?false:(boolean)o);
         context.startActivity(intent);
@@ -310,7 +316,7 @@ public class Jump2View {
 
 
     /**
-     * 跳转到个人中心界面
+     * 跳转到验证界面
      * @param context
      * @param o
      */
@@ -319,6 +325,15 @@ public class Jump2View {
         i.putExtra("info", o);
         context.startActivity(i);
     }
+    /**
+     * 跳转到未绑定微信界面
+     * @param context
+     * @param o
+     */
+    public void goNoBindWx(Context context, Object o){
+        Intent i = new Intent(context, ChangeWxOrTelAct.class);
+        context.startActivity(i);
+    }
 
 
 

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

@@ -145,6 +145,7 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
 
                 break;
             case R.id.rl_wx:  ////跳转到微信
+                Jump2View.getInstance().goBindOrChangeWeixinView(AccountAndSecurityAct.this,"");
                 break;
             case R.id.rl_auther: ////跳转授权
                 Jump2View.getInstance().goRealNameAuther(AccountAndSecurityAct.this,mEntity);
@@ -202,7 +203,7 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
         });
         SpUtils.login(this, "");
         ActivityManager.getInstance().finishAllActivity();
-        Jump2View.getInstance().goLoginView(AccountAndSecurityAct.this,null);
+        Jump2View.getInstance().goLoginView(AccountAndSecurityAct.this,"");
         finish();
     }
 

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

@@ -16,6 +16,7 @@ import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.presenter.BindOrChangeWeixinContract;
 import com.sheep.gamegroup.presenter.BindOrChangeWeixinPresenter;
+import com.sheep.gamegroup.util.ActivityManager;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.jiuyan.samllsheep.R;
@@ -127,6 +128,8 @@ public class BindOrChangeWeixinAct extends BaseActivity implements BindOrChangeW
         } catch (DbException e) {
             e.printStackTrace();
         }
+        ActivityManager.getInstance()
+                .endActivity(ChangeWxOrTelAct.class);
         finish();
         EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_FGT_FAMLLSHEEP));
     }

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

@@ -1,19 +1,36 @@
 package com.sheep.gamegroup.view.activity;
 
+import android.os.Bundle;
+import android.widget.TextView;
+
 import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
 
 /**
  * Created by ljy on 2018/3/26.
  */
 
 public class ChangeWxOrTelAct extends BaseActivity {
+    @BindView(R.id.sure_tv)
+    TextView sureTv;
+
     @Override
     protected int getLayoutId() {
-        return 0;
+        return R.layout.change_wx_tel_layout;
     }
 
     @Override
     public void initView() {
+        ButterKnife.bind(this);
+        TitleBarUtils.getInstance()
+                .setTitle(this,"绑定微信号")
+                .setTitleFinish(this);
 
     }
 
@@ -26,4 +43,8 @@ public class ChangeWxOrTelAct extends BaseActivity {
     public void initData() {
 
     }
+    @OnClick(R.id.sure_tv)
+    public void onViewClicked() {
+        Jump2View.getInstance().goBindOrChangeWeixinView(ChangeWxOrTelAct.this, true);
+    }
 }

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

@@ -148,7 +148,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                 .into(dialogItemIconIv);
         dialogItemNameTv.setText(task_entity.getName());
         dialogItemSizeTv.setText( task_entity.getPackage_size() + "M");
-        isDownLoad = PackageUtil.isAppInstalled(SheepApp.mContext, task_entity.getPackage_names());
+        isDownLoad = PackageUtil.isAppInstalled(activity, task_entity.getPackage_names());
 
         isHaveLoad();
 //        downLoadApk();
@@ -310,24 +310,21 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
             ClassFileHelper.getInstance().createSDDirection();
             File mApkPath = new File(ClassFileHelper.DIR, task_entity.getTask_name() + ClassFileHelper.FILE_SUFFIX);
             downloadInfo = MyDbManager.getInstance().dbFindDownLoad(task_entity.getTask_name(), mApkPath.getAbsolutePath());
-            if (!mApkPath.exists()) {
-                if (downloadInfo == null) {
-                    downloadInfo = new DownloadInfo();
-                    downloadInfo.setUrl(task_entity.getDownload_link());
-                    downloadInfo.setAutoRename(false);
-                    downloadInfo.setAutoResume(true);
-                    downloadInfo.setLabel(task_entity.getTask_name());
-                    downloadInfo.setFileSavePath(mApkPath.getAbsolutePath());
-                    downloadInfo.setIcon(task_entity.getIcon());
-                    downloadInfo.setState(DownloadState.STARTED);
-                    downloadInfo.setPkgName(task_entity.getPackage_names());
-                    MyDbManager.getInstance().saveOrUpdateUser(downloadInfo);//保存到数据库
-                }else{
-//                    start_task_tv.setText("继续下载");
-                }
+            if (downloadInfo == null) {
+                downloadInfo = new DownloadInfo();
+                downloadInfo.setUrl(task_entity.getDownload_link());
+                downloadInfo.setAutoRename(false);
+                downloadInfo.setAutoResume(true);
+                downloadInfo.setLabel(task_entity.getTask_name());
+                downloadInfo.setFileSavePath(mApkPath.getAbsolutePath());
+                downloadInfo.setIcon(task_entity.getIcon());
+                downloadInfo.setState(DownloadState.STARTED);
+                downloadInfo.setPkgName(task_entity.getPackage_names());
+                MyDbManager.getInstance().saveOrUpdateUser(downloadInfo);//保存到数据库
+            }
+
                 infoList.clear();
                 infoList.add(downloadInfo);
-            }
         }
         return downloadInfo;
     }
@@ -342,6 +339,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
      * 按钮状态
      */
     private void setBtnState(){
+
         type = 0;
         if(task_entity.getRunTask() == 0){//开始任务
             buttonStr = "开始任务";

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

@@ -7,6 +7,7 @@ import android.support.v7.widget.AppCompatEditText;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -60,6 +61,8 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
     TextView phoneBtnCode;
     @BindView(R.id.phone_sure_tv)
     TextView phoneSureTv;
+    @BindView(R.id.phone_iv)
+    ImageView phone_iv;
 
     @Inject
     PhonePresenter phonePresenter;

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

@@ -15,13 +15,13 @@ import android.text.TextUtils;
 import android.view.View;
 import android.widget.TextView;
 
+import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.di.components.DaggerSplashComponent;
 import com.sheep.gamegroup.di.modules.SplashModule;
 import com.sheep.gamegroup.presenter.SplashContract;
 import com.sheep.gamegroup.presenter.SplashPresenter;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
 import com.sheep.jiuyan.samllsheep.page.LoginActivity;
 import com.sheep.jiuyan.samllsheep.page.MainActivity;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
@@ -146,7 +146,7 @@ public class SplashAct extends BaseActivity implements SplashContract.View, Easy
         startActivity(intent);
     }
 
-    private void goMain() {
+    private synchronized void goMain() {
         String openId = SpUtils.getOpenId(getApplicationContext());
         if (!TextUtils.isEmpty(openId)) {
             Intent intent = new Intent(activity, com.kfzs.duanduan.ActMain.class);

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

@@ -194,6 +194,7 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
         hideProgress();
         EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_FGT_FAMLLSHEEP));
 //        BaseMessage baseMessage = (BaseMessage) o;
+        EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.INTENT_AMOUNT_VALUE));
         Jump2View.getInstance().goWithdrawalResultview(activity, amount);
     }
 }

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

@@ -6,6 +6,8 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.kfzs.duanduan.event.BigEvent;
+import com.kfzs.duanduan.view.DialogStorageLow;
 import com.sheep.gamegroup.di.components.DaggerWithdrawalResultComponent;
 import com.sheep.gamegroup.di.modules.WithdrawalResultModule;
 import com.sheep.gamegroup.presenter.WithdrawalResultContract;
@@ -16,6 +18,8 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
+import org.greenrobot.eventbus.Subscribe;
+
 import javax.inject.Inject;
 
 import butterknife.BindView;
@@ -50,6 +54,7 @@ public class WithdrawalResultAct extends BaseActivity implements WithdrawalResul
     public void initView() {
         activity = this;
         amount = getIntent().getStringExtra("amount");
+        withdrawalSuccessMoneyTv.setText("+"+amount+"元");
         TitleBarUtils.getInstance()
                 .setTitle(activity, "提现成功")
                 .setTitleFinish(activity);
@@ -92,4 +97,14 @@ public class WithdrawalResultAct extends BaseActivity implements WithdrawalResul
         super.onDestroy();
         ActivityManager.getInstance().endActivity(WithdrawalAct.class);
     }
+
+    @Subscribe
+    public void onEventMainThread(BigEvent event) {
+        switch (event.getEventTypes()) {
+            case INTENT_AMOUNT_VALUE:
+                amount = event.getOthers() +"";
+                withdrawalSuccessMoneyTv.setText("+"+amount+"元");
+                break;
+        }
+    }
 }

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

@@ -96,6 +96,8 @@ public class DownLoadTvAdp extends BaseAdapter {
         }
         if(taskType == 0){//开始任务
             holder.start_task_tv.setText("开始任务");
+        }else if(taskType == 1){
+            holder.start_task_tv.setText("开始试玩");
         }
         else {
             holder.refresh();
@@ -204,6 +206,9 @@ public class DownLoadTvAdp extends BaseAdapter {
                     if(taskType == 0){
                         startTask();
                         return;
+                    }else if(taskType == 2){
+                        PackageUtil.startApp(SheepApp.mContext, getDownloadInfo().getPkgName());
+                        return;
                     }
                     DownloadState state = downloadInfo.getState();
                     switch (state) {

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

@@ -21,7 +21,7 @@
                 android:layout_gravity="center_horizontal"
                 android:layout_marginLeft="100dp"
                 android:layout_marginRight="100dp"
-                android:src="@mipmap/no_bind_phone"
+                android:src="@mipmap/icon"
                 android:layout_marginTop="35dp"
                 android:layout_marginBottom="5dp"/>
 

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

@@ -22,17 +22,28 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginLeft="100dp"
-                android:layout_marginRight="100dp"
-                android:src="@mipmap/no_bind_phone"
-                android:layout_marginTop="35dp"
+                android:layout_marginLeft="@dimen/content_padding_100"
+                android:layout_marginRight="@dimen/content_padding_100"
+                android:src="@mipmap/no_bind_img"
+                android:layout_marginTop="@dimen/content_padding_35"
                 android:layout_marginBottom="5dp"/>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text=""
-                />
+                android:text="@string/no_bind_wx_notice_text"
+                style="@style/txt_style_12"
+                android:layout_marginTop="@dimen/content_padding_30"
+                android:layout_marginBottom="@dimen/content_padding_10"
+                android:layout_gravity="center"/>
+            <TextView
+                android:id="@+id/sure_tv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/txt_big_btn_style"
+                android:text="立即绑定"
+                android:background="@drawable/selector_button_full_main"/>
+
         </LinearLayout>
     </ScrollView>
 

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

@@ -76,7 +76,6 @@
             android:id="@+id/account_safe_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@id/account_info_tv"
             android:padding="15dp"
             android:gravity="center">
             <ImageView
@@ -95,7 +94,6 @@
                 android:textColor="@color/black"
                 android:textSize="14dp"
                 android:layout_centerVertical="true"
-                android:layout_alignBottom="@+id/personalcenter_item_icon_iv"
                 android:layout_toEndOf="@+id/personalcenter_item_icon_iv" />
             <ImageView
                 android:id="@+id/personalcenter_item_right_iv"

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

@@ -9,16 +9,19 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="centerCrop"
-        android:src="@drawable/splash_bg"/>
+        android:src="@drawable/splash_bg_img"/>
 
     <TextView
         android:id="@+id/btn_join"
-        style="@style/style_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="140dp"
+        android:layout_height="40dp"
         android:layout_gravity="center|bottom"
-        android:layout_marginBottom="25dp"
-        android:text="进入赚钱"
-        android:textSize="@dimen/text_size_5"/>
+        android:layout_marginBottom="15dp"
+        android:background="@drawable/splash_bnt_img"
+        android:gravity="center"
+        android:paddingBottom="@dimen/content_padding_small"
+        android:text="进 入 赚 钱"
+        android:textColor="@color/white"
+        android:textSize="@dimen/text_size_3" />
 
 </FrameLayout>

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

@@ -132,7 +132,7 @@
                 android:layout_height="wrap_content"
                 style="@style/txt_big_btn_style"
                 android:text="确 定"
-                android:background="@drawable/sp_bg_gradient_rectangle_yellow"/>
+                android:background="@drawable/selector_button_full_main"/>
         </LinearLayout>
     </ScrollView>
 

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

@@ -40,7 +40,7 @@
             android:id="@+id/tv_link_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/share_link_content"
+            android:text=""
             android:layout_toRightOf="@id/iv_head"
             android:layout_below="@id/tv_name"
             android:layout_marginTop="3dp"

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

@@ -73,12 +73,15 @@
     <dimen name="content_padding_8">8dp</dimen>
     <dimen name="content_padding_big">18dp</dimen>
     <dimen name="content_padding_10">10dp</dimen>
+    <dimen name="content_padding_13">13dp</dimen>
     <dimen name="content_padding_15">15dp</dimen>
     <dimen name="content_padding_20">20dp</dimen>
     <dimen name="content_padding_30">30dp</dimen>
+    <dimen name="content_padding_35">35dp</dimen>
     <dimen name="content_padding_40">40dp</dimen>
     <dimen name="content_padding_65">65dp</dimen>
     <dimen name="content_padding_80">80dp</dimen>
+    <dimen name="content_padding_100">100dp</dimen>
 
 
     <!--下面的tagid用于设置tag使用-->

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

@@ -73,7 +73,7 @@
         <item name="android:minHeight">@dimen/view_size_45</item>
         <item name="android:text">无敌大航海</item>
         <item name="android:textSize">@dimen/text_size_5</item>
-        <item name="android:textColor">@color/txt_black</item>
+        <item name="android:textColor">@color/white</item>
         <item name="android:gravity">center</item>
         <item name="android:layout_margin">@dimen/content_padding</item>
         <item name="android:background">@drawable/sp_bg_gradient_rectangle_blue</item>

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

@@ -14,6 +14,7 @@
     <integer name="size_phone_number">11</integer>
     <string name="toast_warning_phone_number_size">手机号码为11位</string>
     <string name="toast_warning_phone_number_error">手机号码为纯数字</string>
-    <string name="bind_weixin_notice_text">请用需要绑定的微信号关注微信公众号"好玩服务号",在公众号中输入"验证码"获取验证码并填入下方</string>
+    <string name="bind_weixin_notice_text">请用需要绑定的微信号关注微信公众号\"好玩服务号\",在公众号中点击验证码或输入\"验证码\"三个字获取验证码并填入下方</string>
     <string name="bind_weixin_withdrawal_notice_text">你的每次收入提现，我们都会通过微信的企业商户入账功能将收入实时入账到绑定微信号的微信零钱上</string>
+    <string name="no_bind_wx_notice_text">未绑定微信号，无法入账到你的微信零钱</string>
 </resources>