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

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

@@ -12,11 +12,13 @@ import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.duanduan.BaseCompatFragment;
+import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.FriendAndAwardEntity;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.entity.WebviewEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.FastJsonUtils;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
@@ -161,7 +163,8 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                 }
                 break;
             case R.id.tv_submit://注销
-                ((PersonalCenterAct)getActivity()).loginOut();
+                CommonUtil.getInstance()
+                        .loginOut((BaseActivity) getActivity());
                 break;
         }
     }

app/src/main/java/com/kfzs/duanduan/utils/dlg/FormatAny.java

@@ -153,5 +153,16 @@ public class FormatAny {
         return new SimpleDateFormat(FORMAT_TIME_DEFAULT).format(date);
     }
 
+    /**
+     * 数字格式化
+     */
+    public String formatString(String value){
+        try{
+            return new DecimalFormat("#.##").format(Double.valueOf(value));
+        }catch (Exception e){
+            e.printStackTrace();
+            return "0";
+        }
+    }
 
 }

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

@@ -117,60 +117,6 @@ public abstract class BaseActivity extends AppCompatActivity {
 
     public abstract void initData();
 
-    /**
-     * 注销账户
-     */
-    public   void  loginOut(){
-        //登出
-
-        UMConfigUtils.onProfileSignOff();
-        UMConfigUtils.onEvent(UMConfigUtils.Event.USER_LOGOUT);
-        UMShareAPI api=  UMShareAPI.get(this);
-        api.deleteOauth(this, SHARE_MEDIA.WEIXIN, new UMAuthListener() {
-            @Override
-            public void onStart(SHARE_MEDIA platform) {
-            }
 
-            @Override
-            public void onComplete(SHARE_MEDIA platform, int action, Map<String, String> data) {
-            }
-
-            @Override
-            public void onError(SHARE_MEDIA platform, int action, Throwable t) {
-                hideProgress();
-            }
-
-            @Override
-            public void onCancel(SHARE_MEDIA platform, int action) {
-                hideProgress();
-            }
-        });
-
-        api.deleteOauth(this, SHARE_MEDIA.QQ, new UMAuthListener() {
-            @Override
-            public void onStart(SHARE_MEDIA platform) {
-            }
-
-            @Override
-            public void onComplete(SHARE_MEDIA platform, int action, Map<String, String> data) {
-            }
-
-            @Override
-            public void onError(SHARE_MEDIA platform, int action, Throwable t) {
-                hideProgress();
-            }
-
-            @Override
-            public void onCancel(SHARE_MEDIA platform, int action) {
-                hideProgress();
-            }
-        });
-        SpUtils.login(this, "");
-        SpUtils.saveWeixin(this, "");
-        SpUtils.savePhone(this, "");
-        ActivityManager.getInstance().finishAllActivity();
-        Jump2View.getInstance().goLoginView(this,"");
-        finish();
-    }
 
 }

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

@@ -1,5 +1,6 @@
 package com.sheep.gamegroup.util;
 
+import android.app.Activity;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
@@ -15,12 +16,17 @@ import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.download.DownloadTarget;
 import com.arialyy.aria.core.inf.IEntity;
 import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
+import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.HomeListEntity;
 import com.sheep.gamegroup.model.entity.WebviewEntity;
 import com.sheep.gamegroup.model.entity.WithdrawalEty;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 import com.sheep.jiuyan.samllsheep.utils.G;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+import com.umeng.socialize.UMAuthListener;
+import com.umeng.socialize.UMShareAPI;
+import com.umeng.socialize.bean.SHARE_MEDIA;
 
 import java.io.File;
 import java.lang.reflect.Field;
@@ -371,4 +377,60 @@ public class CommonUtil {
 
         }
     }
+    /**
+     * 注销账户
+     */
+    public void loginOut(final BaseActivity activity){
+        //登出
+
+        UMConfigUtils.onProfileSignOff();
+        UMConfigUtils.onEvent(UMConfigUtils.Event.USER_LOGOUT);
+        UMShareAPI api=  UMShareAPI.get(activity);
+        api.deleteOauth(activity, SHARE_MEDIA.WEIXIN, new UMAuthListener() {
+            @Override
+            public void onStart(SHARE_MEDIA platform) {
+            }
+
+            @Override
+            public void onComplete(SHARE_MEDIA platform, int action, Map<String, String> data) {
+            }
+
+            @Override
+            public void onError(SHARE_MEDIA platform, int action, Throwable t) {
+                activity.hideProgress();
+            }
+
+            @Override
+            public void onCancel(SHARE_MEDIA platform, int action) {
+                activity.hideProgress();
+            }
+        });
+
+        api.deleteOauth(activity, SHARE_MEDIA.QQ, new UMAuthListener() {
+            @Override
+            public void onStart(SHARE_MEDIA platform) {
+            }
+
+            @Override
+            public void onComplete(SHARE_MEDIA platform, int action, Map<String, String> data) {
+            }
+
+            @Override
+            public void onError(SHARE_MEDIA platform, int action, Throwable t) {
+                activity.hideProgress();
+            }
+
+            @Override
+            public void onCancel(SHARE_MEDIA platform, int action) {
+                activity.hideProgress();
+            }
+        });
+        SpUtils.login(activity, "");
+        SpUtils.saveWeixin(activity, "");
+        SpUtils.savePhone(activity, "");
+        ActivityManager.getInstance().finishAllActivity();
+        Jump2View.getInstance().goLoginView(activity,"");
+
+        activity.finish();
+    }
 }

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

@@ -21,6 +21,7 @@ import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.presenter.AccountAndSecuritContract;
 import com.sheep.gamegroup.presenter.AccountAndSecuritPresenter;
 import com.sheep.gamegroup.util.ActivityManager;
+import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.UMConfigUtils;
@@ -176,7 +177,7 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
                 Jump2View.getInstance().goPersionInfo(AccountAndSecurityAct.this,mEntity);
                 break;
             case R.id.tv_submit:
-                loginOut();
+                CommonUtil.getInstance().loginOut((BaseActivity) activity);
                 break;
         }
     }

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

@@ -1,7 +1,12 @@
 package com.sheep.gamegroup.view.activity;
 
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
 import android.view.View;
 import android.widget.AdapterView;
+import android.widget.EditText;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alipay.sdk.app.PayTask;
@@ -10,6 +15,7 @@ import com.sheep.gamegroup.alipay.PayResult;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.RechargeEntity;
 import com.sheep.gamegroup.model.entity.RechargePriceEntity;
+import com.sheep.gamegroup.model.entity.RechargeQEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
@@ -25,6 +31,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.BindView;
+import butterknife.ButterKnife;
 import butterknife.OnClick;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
@@ -49,6 +56,8 @@ public class RechargeAct extends BaseActivity {
     int select = -1;
 
     RechargeAdapter rechargeAdapter;
+    @BindView(R.id.et_recharge_price)
+    EditText etRechargePrice;
 
 
     @Override
@@ -70,6 +79,9 @@ public class RechargeAct extends BaseActivity {
     @Override
     public void initData() {
         addDatas();
+        /**
+         * 支付金额选择
+         */
         rechargePriceAdapter = new RechargePriceAdapter(RechargeAct.this, mPriceEntityList);
         rechargeprice_greidview.setVerticalSpacing(20);
         rechargeprice_greidview.setAdapter(rechargePriceAdapter);
@@ -77,33 +89,67 @@ public class RechargeAct extends BaseActivity {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 select = position;
+                rechargePriceAdapter.setInPut(false);
+                RechargePriceEntity  rechargePriceEntity = (RechargePriceEntity) parent.getItemAtPosition(position);
+                etRechargePrice.setText("" + rechargePriceEntity.getPrice());
                 for (int i = 0; i < mPriceEntityList.size(); i++) {
                     if (position == i) {
                         mPriceEntityList.get(i).setSelectState(true);
                     } else {
                         mPriceEntityList.get(i).setSelectState(false);
-
                     }
-                    rechargePriceAdapter.notifyDataSetChanged();
                 }
+                rechargePriceAdapter.notifyDataSetChanged();
+
             }
         });
 
 
+        /**
+         * 支付方式选择
+         */
         rechargeAdapter = new RechargeAdapter(RechargeAct.this);
-
         rechargeGreidview.setVerticalSpacing(40);
         rechargeGreidview.setAdapter(rechargeAdapter);
         rechargeGreidview.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                RechargeEntity  rechargeEntity = (RechargeEntity) parent.getItemAtPosition(position);
+                RechargeEntity rechargeEntity = (RechargeEntity) parent.getItemAtPosition(position);
                 mPayType = rechargeEntity.getId();
                 rechargeAdapter.setSelect(position);
                 rechargeAdapter.notifyDataSetChanged();
             }
         });
 
+//        etRechargePrice.addTextChangedListener(new TextWatcher() {
+//            @Override
+//            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+//
+//            }
+//
+//            @Override
+//            public void onTextChanged(CharSequence s, int start, int before, int count) {
+//                    if(TextUtils.isEmpty(s)){
+//                        rechargePriceAdapter.setInPut(false);
+//                    }else{
+//                        boolean input = true;
+//                        for(RechargePriceEntity priceEntityList : mPriceEntityList){
+//                            int price = Integer.valueOf(s.toString());
+//                            if(price == priceEntityList.getPrice()){
+//                                input = false;
+//                                break;
+//                            }
+//                        }
+//                        rechargePriceAdapter.setInPut(input);
+//                    }
+//            }
+//
+//            @Override
+//            public void afterTextChanged(Editable s) {
+//
+//            }
+//        });
+
 
         showProgress();
         getRechargePayway();
@@ -119,6 +165,10 @@ public class RechargeAct extends BaseActivity {
                     public void onNext(BaseMessage baseMessage) {
                         hideProgress();
                         List<RechargeEntity> list = baseMessage.getDatas(RechargeEntity.class);
+                        if(list != null && list.size() > 0){
+                            mPayType = list.get(0).getId();
+                            rechargeAdapter.setSelect(0);
+                        }
                         rechargeAdapter.addAll(list);
                         if(!list.isEmpty()) {
                             mPayType = list.get(0).getId();
@@ -159,7 +209,6 @@ public class RechargeAct extends BaseActivity {
 
     @OnClick({R.id.tv_recharge_pay})
     public void onViewClicked(View view) {
-        RechargeEntity rechargeEntity;
         switch (view.getId()) {
 
             case R.id.tv_recharge_pay:
@@ -167,11 +216,14 @@ public class RechargeAct extends BaseActivity {
                     G.showToast("请选择支付方式");
                     return;
                 }
-                if (select == -1) {
+
+                mAmount = etRechargePrice.getText().toString().trim();
+                if(android.text.TextUtils.isEmpty(mAmount)){
                     G.showToast("请选择充值金额");
                     return;
                 }
-                mAmount = String.valueOf(mPriceEntityList.get(select).getPrice());
+
+
                 showProgress();
                 getRechargeBalance();
                 break;
@@ -215,11 +267,12 @@ public class RechargeAct extends BaseActivity {
     }
 
     private void addDatas() {
-        mPriceEntityList.add(new RechargePriceEntity(false, "10元", 10));
-        mPriceEntityList.add(new RechargePriceEntity(false, "20元", 20));
-        mPriceEntityList.add(new RechargePriceEntity(false, "50元", 50));
-        mPriceEntityList.add(new RechargePriceEntity(false, "100元", 100));
-        mPriceEntityList.add(new RechargePriceEntity(false, "200元", 200));
-        mPriceEntityList.add(new RechargePriceEntity(false, "500元", 500));
+        mPriceEntityList.add(new RechargePriceEntity(false,"10元", 10));
+        mPriceEntityList.add(new RechargePriceEntity(false,"20元", 20));
+        mPriceEntityList.add(new RechargePriceEntity(false,"50元", 50));
+        mPriceEntityList.add(new RechargePriceEntity(false,"100元", 100));
+        mPriceEntityList.add(new RechargePriceEntity(false,"200元", 200));
+        mPriceEntityList.add(new RechargePriceEntity(false,"500元", 500));
     }
+
 }

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

@@ -14,9 +14,7 @@ import android.widget.EditText;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONObject;
-import com.alipay.sdk.app.PayTask;
 import com.sheep.gamegroup.absBase.BaseActivity;
-import com.sheep.gamegroup.alipay.PayResult;
 import com.sheep.gamegroup.di.components.DaggerRechargeQComponent;
 import com.sheep.gamegroup.di.modules.RechargeQModule;
 import com.sheep.gamegroup.model.entity.BaseMessage;
@@ -111,7 +109,7 @@ public class RechargeQAct extends BaseActivity implements RechargeQContract.View
         });
 
         tvZk.setText(getSpannableString());
-
+        tvMybNumber.setText(String.format(getString(R.string.rechargeq_amount),"0"));
 
         etQbNumber.addTextChangedListener(new TextWatcher() {
             @Override
@@ -197,7 +195,9 @@ public class RechargeQAct extends BaseActivity implements RechargeQContract.View
     @Override
     public void succRechargeQ(BaseMessage o) {
         hideProgress();
-        pay(o.getData().toString());
+//   "模拟支付宝成功，因为支付宝支持成功返回9000，跳转到统一界面"
+        Jump2View.getInstance().goRechargeResultAct(RechargeQAct.this, "9000");
+        finish();
     }
 
     @Override
@@ -206,41 +206,6 @@ public class RechargeQAct extends BaseActivity implements RechargeQContract.View
         G.showToast(o.getMsg());
     }
 
-    private void pay(final String payInfo) {
-        Runnable payRunnable = new Runnable() {
-
-            @Override
-            public void run() {
-                // 构造PayTask 对象
-                PayTask alipay = new PayTask(RechargeQAct.this);
-                // 调用支付接口，获取支付结果
-                final String result = alipay.pay(payInfo, true);
-
-                runOnUiThread(new Runnable() {
-
-                    @Override
-                    public void run() {
-
-                        PayResult payResult = new PayResult(result);
-                        /**
-                         * 同步返回的结果必须放置到服务端进行验证（验证的规则请看https://doc.open.alipay.com/doc2/
-                         * detail.htm?spm=0.0.0.0.xdvAU6&treeId=59&articleId=103665&
-                         * docType=1) 建议商户依赖异步通知
-                         */
-//						String resultInfo = payResult.getResult();// 同步返回需要验证的信息
-
-                        String resultStatus = payResult.getResultStatus();
-                        Jump2View.getInstance().goRechargeResultAct(RechargeQAct.this, resultStatus);
-                        finish();
-                    }
-                });
-            }
-        };
-
-        // 必须异步调用
-        Thread payThread = new Thread(payRunnable);
-        payThread.start();
-    }
 
     private SpannableString getSpannableString(){
         SpannableString spannableString = new SpannableString("(使用绵羊币充值享95折优惠)");

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

@@ -101,6 +101,8 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     LinearLayout bottom_btn_layout;
     @BindView(R.id.detail_task_listview)
     MyListview detail_task_listview;
+    @BindView(R.id.empty_view)
+    View empty_view;
     private Activity activity;
     @Inject
     TaskDetailPresenter presenter;
@@ -545,6 +547,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 
     @Override
     public void taskDescSuccess(BaseMessage baseMessage) {
+        empty_view.setVisibility(View.GONE);
         taskReleaseEty = JSONObject.parseObject(JSONObject.toJSONString(baseMessage.getData()), TaskReleaseEty.class);
         initWigget();
         isGetTaskDesc = false;
@@ -554,6 +557,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     public void taskDescFaile(BaseMessage baseMessage) {
         G.showToast(baseMessage.getMsg()+"");
         isGetTaskDesc = false;
+        empty_view.setVisibility(View.VISIBLE);
     }
 
 

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

@@ -13,6 +13,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.event.EventTypes;
+import com.kfzs.duanduan.utils.dlg.FormatAny;
 import com.sheep.gamegroup.di.components.DaggerWithdrawalComponent;
 import com.sheep.gamegroup.di.modules.WithdrawalModule;
 import com.sheep.gamegroup.model.entity.BaseMessage;
@@ -135,8 +136,7 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
             e.printStackTrace();
         }
 
-        String sr = "可提现金额<font color='#ff2d4b'><small>" + balanceAmount + "</small></font>元";
-        withdrawal_click_bindname_tv.setText(Html.fromHtml(sr));
+        setBalanceAmount();
     }
 
 
@@ -227,8 +227,12 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
         hideProgress();
         String balanceA =  o.getData() +"";
         balanceAmount = TextUtils.isEmpty(balanceA)?"0":balanceA;
+        setBalanceAmount();
+    }
+
+    private void setBalanceAmount(){
 
-        String sr = "可提现金额 <font color='#ff2d4b'><big>" + balanceAmount + "</big></font> 元";
+        String sr = "可提现金额 <font color='#ff2d4b'><big>" + FormatAny.getInstance().formatString(balanceAmount) + "</big></font> 元";
         withdrawal_click_bindname_tv.setText(Html.fromHtml(sr));
     }
 

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

@@ -35,6 +35,7 @@ public class RechargeAdapter extends BaseAdapter {
     }
 
     public void addAll(List<RechargeEntity> list){
+        this.listData.clear();
         this.listData.addAll(list);
         notifyDataSetChanged();
     }
@@ -51,7 +52,7 @@ public class RechargeAdapter extends BaseAdapter {
 
     @Override
     public long getItemId(int position) {
-        return 0;
+        return position;
     }
 
     @Override

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

@@ -22,12 +22,18 @@ import java.util.List;
 public class RechargePriceAdapter extends BaseAdapter {
     private Context context;
     private List<RechargePriceEntity> listData;
+    private  boolean inPut = false;
 
     public RechargePriceAdapter(Context context, List<RechargePriceEntity> listData) {
         this.context = context;
         this.listData = listData;
     }
 
+    public void setInPut(boolean inPut) {
+        this.inPut = inPut;
+        notifyDataSetChanged();
+    }
+
     @Override
     public int getCount() {
         return listData.size();
@@ -63,12 +69,17 @@ public class RechargePriceAdapter extends BaseAdapter {
             holder = (ViewHolder) convertView.getTag();
         }
         RechargePriceEntity priceShow = getItem(position);
-        if (priceShow.isSelectState()){
-            convertView.setBackground(context.getResources().getDrawable(R.drawable.recharge_bg_angle_blue_hold));
-            holder.item_tv_y.setTextColor(ContextCompat.getColor(context,R.color.white));
-        }else{
+        if(inPut){
             convertView.setBackground(context.getResources().getDrawable(R.drawable.recharge_bg_angle_blue_normal));
             holder.item_tv_y.setTextColor(ContextCompat.getColor(context,R.color.blue_end));
+        }else{
+            if (priceShow.isSelectState()){
+                convertView.setBackground(context.getResources().getDrawable(R.drawable.recharge_bg_angle_blue_hold));
+                holder.item_tv_y.setTextColor(ContextCompat.getColor(context,R.color.white));
+            }else{
+                convertView.setBackground(context.getResources().getDrawable(R.drawable.recharge_bg_angle_blue_normal));
+                holder.item_tv_y.setTextColor(ContextCompat.getColor(context,R.color.blue_end));
+            }
         }
 
         holder.item_tv_y.setText(priceShow.getValue());

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

@@ -55,11 +55,14 @@
                         android:visibility="visible" />
 
                     <EditText
+                        android:id="@+id/et_recharge_price"
                         android:layout_width="match_parent"
                         android:layout_height="40dp"
                         android:layout_marginTop="@dimen/content_padding_10"
                         android:background="@null"
                         android:hint="请输入充值金额"
+                        android:inputType="number"
+                        android:maxLength="5"
                         android:paddingLeft="@dimen/content_padding_big"
                         android:textColor="@color/black_444444"
                         android:textColorHint="@color/disenable_color"

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

@@ -97,7 +97,6 @@
                             android:id="@+id/tv_myb_number"
                             android:layout_width="155dp"
                             android:layout_height="wrap_content"
-                            android:text="当前绵羊币金额:0元"
                             android:textColor="@color/black_444444"
                             android:textSize="@dimen/text_size_3" />
 

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

@@ -7,6 +7,12 @@
 
     <include
         layout="@layout/title"/>
+    <include
+        android:id="@+id/empty_view"
+        layout="@layout/empty_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone"/>
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"