liujiangyao лет назад: 8
Родитель
Сommit
2d0526a473

+ 4 - 1
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;
         }
     }

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

@@ -158,7 +158,7 @@ public class FormatAny {
      */
     public String formatString(String value){
         try{
-            return new DecimalFormat("#.##").format(value);
+            return new DecimalFormat("#.##").format(Double.valueOf(value));
         }catch (Exception e){
             e.printStackTrace();
             return "0";

+ 0 - 54
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();
-    }
 
 }

+ 62 - 0
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();
+    }
 }

+ 2 - 1
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;
         }
     }

+ 4 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/RechargeAct.java

@@ -164,6 +164,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);
                     }
 

+ 4 - 0
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);
     }
 
 

+ 1 - 0
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();
     }

+ 6 - 0
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"