修复小米游戏中的问题

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

@@ -164,6 +164,13 @@ public class GameAccountEntity implements Serializable {
     }
 
     /**
+     * 是否是小米账号(这里不能通过task_type来判断)
+     * @return
+     */
+    public boolean isXiaoMiAccount(){
+        return app_id != 0;
+    }
+    /**
      * 是否是平台账号
      * @return
      */

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

@@ -1,4 +1,4 @@
-package com.sheep.gamegroup.view.activity;
+package com.sheep.gamegroup.model.entity;
 
 import android.text.TextUtils;
 

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

@@ -31,17 +31,14 @@ import com.arialyy.aria.core.inf.IEntity;
 import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
 import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.event.EventTypes;
-import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.mdad.sdk.mdsdk.AdManager;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.alipay.PayResult;
-import com.sheep.gamegroup.model.api.BaseMessageConverter;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.entity.FindApp;
 import com.sheep.gamegroup.model.entity.GameAccountEntity;
 import com.sheep.gamegroup.model.entity.HomeListEntity;
-import com.sheep.gamegroup.model.entity.RequestParameEty;
 import com.sheep.gamegroup.model.entity.TaskChild;
 import com.sheep.gamegroup.model.entity.TaskDescEntity;
 import com.sheep.gamegroup.model.entity.TaskEty;
@@ -50,10 +47,9 @@ import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.entity.WithdrawalEty;
 import com.sheep.gamegroup.model.util.AutoTaskListUtil;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
-import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
 import com.sheep.gamegroup.usage.AppUsageManager;
 import com.sheep.gamegroup.view.activity.GameTaskOrderListAct;
-import com.sheep.gamegroup.view.activity.XiaomiGameEntity;
+import com.sheep.gamegroup.model.entity.XiaomiGameEntity;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -67,7 +63,6 @@ import com.umeng.socialize.bean.SHARE_MEDIA;
 import com.umeng.socialize.media.UMImage;
 import com.umeng.socialize.media.UMWeb;
 
-import org.afinal.simplecache.ACache;
 import org.afinal.simplecache.ApiKey;
 import org.greenrobot.eventbus.EventBus;
 
@@ -79,7 +74,6 @@ import java.security.MessageDigest;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;

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

@@ -29,6 +29,7 @@ import com.bumptech.glide.request.RequestOptions;
 import com.sheep.gamegroup.model.entity.Advertising;
 import com.sheep.gamegroup.model.entity.Container;
 import com.sheep.gamegroup.model.entity.DialogConfig;
+import com.sheep.gamegroup.model.entity.GameAccountEntity;
 import com.sheep.gamegroup.model.entity.PayEntity;
 import com.sheep.gamegroup.view.activity.SplashAct;
 import com.sheep.gamegroup.view.dialog.DialogAddAccount;
@@ -689,6 +690,12 @@ public class ViewUtil {
     public void showGameAccountDetail(Activity activity, int id){
         new DialogModifyAccount(activity, id).showAddAccount();
     }
+    /**
+     * 用户详情
+     */
+    public void showGameAccountDetail(Activity activity, GameAccountEntity item){
+        new DialogModifyAccount(activity, item).showAddAccount();
+    }
 
 
     /**

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

@@ -1,9 +1,6 @@
 package com.sheep.gamegroup.view.activity;
 
-import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.content.Intent;
-import android.net.Uri;
 import android.support.v7.widget.AppCompatAutoCompleteTextView;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -20,18 +17,13 @@ import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.arialyy.aria.core.download.DownloadTask;
 import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.event.EventTypes;
 import com.sheep.gamegroup.absBase.BaseActivity;
 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.SearchGameRecord;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.TaskReleaseEty;
+import com.sheep.gamegroup.model.entity.XiaomiGameEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.Jump2View;
@@ -42,20 +34,16 @@ import com.sheep.gamegroup.util.ViewHolder;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.adapter.AdbCommonRecycler;
 import com.sheep.gamegroup.view.adapter.ArrayAdapter;
-import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 
 import butterknife.BindView;
 import butterknife.OnClick;

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

@@ -1,67 +1,39 @@
 package com.sheep.gamegroup.view.activity;
 
-import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
 import android.os.Handler;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
-import android.widget.Toast;
 
-import com.alibaba.fastjson.JSONObject;
 import com.arialyy.aria.core.Aria;
-import com.arialyy.aria.core.download.DownloadTask;
-import com.kfzs.android.view.tag.FlowLayout;
-import com.kfzs.android.view.tag.TagAdapter;
-import com.kfzs.android.view.tag.TagFlowLayout;
 import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.event.EventTypes;
-import com.mdad.sdk.mdsdk.AdManager;
-import com.mdad.sdk.mdsdk.GetAdListListener;
-import com.mdad.sdk.mdsdk.common.AdData;
 import com.sheep.gamegroup.absBase.BaseActivity;
-import com.sheep.gamegroup.model.entity.AdDataSon;
 import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.FindApp;
-import com.sheep.gamegroup.model.entity.FindItem;
-import com.sheep.gamegroup.model.entity.FindTag;
-import com.sheep.gamegroup.model.entity.TaskReleaseEty;
-import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.model.entity.XiaomiGameEntity;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DeviceIDUtil;
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
-import com.sheep.gamegroup.util.SheepSwipeRefreshLayout;
 import com.sheep.gamegroup.util.SysAppUtil;
 import com.sheep.gamegroup.util.ViewHolder;
-import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.adapter.AdbCommonRecycler;
-import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
-import java.io.File;
 import java.util.List;
-import java.util.Locale;
 
 import butterknife.BindView;
-import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp.PUBLIC_TAG_PREFIX_TEXTVIEW_LIST;
 

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogModifyAccount.java

@@ -3,6 +3,7 @@ package com.sheep.gamegroup.view.dialog;
 import android.app.Activity;
 import android.content.DialogInterface;
 import android.os.Handler;
+import android.os.Looper;
 import android.os.Message;
 import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
@@ -37,6 +38,8 @@ import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_GAME_ACCOUNT_LOO
 public class DialogModifyAccount {
     private Activity activity;
     private EditText game_new_pwd_et;
+    private View modify_pwd_tv_line;
+    private TextView modify_pwd_tv;
     private TextView sureTv;
     private int id;
     private GameAccountEntity gameAccountEntity;
@@ -54,8 +57,13 @@ public class DialogModifyAccount {
         this.activity = activity;
         this.id = id;
     }
+    public DialogModifyAccount(Activity activity, GameAccountEntity item) {
+        this.activity = activity;
+        this.gameAccountEntity = item;
+        this.id = item.getId();
+    }
 
-    Handler mHandler = new Handler() {
+    Handler mHandler = new Handler(Looper.getMainLooper()) {
         @Override
         public void handleMessage(Message msg) {
             super.handleMessage(msg);
@@ -89,7 +97,8 @@ public class DialogModifyAccount {
         dialog_title.setText("修改密码");
 
         sureTv = view.findViewById(R.id.sure_tv);
-        TextView modify_pwd_tv = view.findViewById(R.id.modify_pwd_tv);
+        modify_pwd_tv_line = view.findViewById(R.id.modify_pwd_tv_line);
+        modify_pwd_tv = view.findViewById(R.id.modify_pwd_tv);
         game_title_et = view.findViewById(R.id.game_title_et);
         game_account_et = view.findViewById(R.id.game_account_et);
         game_old_pwd_et = view.findViewById(R.id.game_old_pwd_et);
@@ -131,6 +140,8 @@ public class DialogModifyAccount {
                 }
             }
         });
+        modify_pwd_tv_line.setVisibility(View.GONE);
+        modify_pwd_tv.setVisibility(View.GONE);
         modify_pwd_tv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -159,7 +170,10 @@ public class DialogModifyAccount {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        initData();
+        if(gameAccountEntity == null)
+            initData();
+        else
+            initView();
     }
 
     /**
@@ -187,5 +201,7 @@ public class DialogModifyAccount {
         game_title_et.setText(gameAccountEntity.getDetailShowForGameType()+"");
         game_account_et.setText("账号："+gameAccountEntity.getAccount()+"");
         game_old_pwd_et.setText("原密码："+gameAccountEntity.getPassword()+"");
+        modify_pwd_tv_line.setVisibility(gameAccountEntity.isXiaoMiAccount() ? View.GONE : View.VISIBLE);
+        modify_pwd_tv.setVisibility(gameAccountEntity.isXiaoMiAccount() ? View.GONE : View.VISIBLE);
     }
 }

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

@@ -24,6 +24,7 @@
         android:minWidth="@dimen/view_size_150"
         android:padding="@dimen/content_padding_small"
         android:text="账号:123456"
+        android:textIsSelectable="true"
         android:textSize="@dimen/text_size_13"
         android:layout_marginBottom="@dimen/content_padding_15"/>
 
@@ -44,9 +45,11 @@
             android:minWidth="@dimen/view_size_150"
             android:padding="@dimen/content_padding_small"
             android:text="原密码：123456"
+            android:textIsSelectable="true"
             android:textSize="@dimen/text_size_13"/>
 
         <View
+            android:id="@+id/modify_pwd_tv_line"
             android:layout_width="1sp"
             android:layout_height="15dp"
             android:background="@color/gray"

app/tinker-support.gradle

@@ -34,7 +34,7 @@ tinkerSupport {
     baseApkResourceMapping = "${bakPath}/${baseApkDir}/sheep/app-sheep-release-R.txt"
 
     // 构建基准包和补丁包都要指定不同的tinkerId，并且必须保证唯一性(2007000-patch;)
-    tinkerId = "2009005-0801-0835-base"
+    tinkerId = "2009006-0801-1522-base"
 //    tinkerId = "2009000-0727-2125-patch"
 
     // 构建多渠道补丁时使用

gradle.properties

@@ -17,8 +17,8 @@
 # org.gradle.parallel=true
 #android.injected.build.model.only.versioned = 3
 
-VERSION_NAME=2.9.5
-VERSION_CODE=2009005
+VERSION_NAME=2.9.6
+VERSION_CODE=2009006
 ANDROID_COMPILE_SDK_VERSION=27
 ANDROID_BUILD_TOOLS_VERSION=27.0.2
 ANDROID_MIN_SDK_VERSION=18