Преглед изворни кода

删除gradle中使用的java1.8,修复编译卡的问题
躺着玩中显示服务器给的备注信息,并添加一种修改账号密码后的状态

zengjiebin пре 8 година
родитељ
комит
67440e80d2

+ 1 - 4
.idea/misc.xml

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
@@ -30,7 +27,7 @@
   <component name="ProjectPlainTextFileTypeManager">
     <file url="file://$PROJECT_DIR$/app/src/main/assets/poster.html" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

+ 21 - 19
app/build.gradle

@@ -14,15 +14,15 @@ android {
         ndk {
             abiFilters "armeabi-v7a", 'x86'//, 'armeabi-v7a', 'x86_64', 'arm64-v8a'
         }
-        jackOptions {
-            enabled true
-        }
+//        jackOptions {
+//            enabled true
+//        }
         multiDexEnabled true
     }
-    compileOptions{
-        sourceCompatibility org.gradle.api.JavaVersion.VERSION_1_8
-        targetCompatibility org.gradle.api.JavaVersion.VERSION_1_8
-    }
+//    compileOptions{
+//        sourceCompatibility org.gradle.api.JavaVersion.VERSION_1_8
+//        targetCompatibility org.gradle.api.JavaVersion.VERSION_1_8
+//    }
     signingConfigs {
         config {
             keyAlias 'sheep'
@@ -112,16 +112,14 @@ repositories {
 }
 
 dependencies {
-    //    compile fileTree(include: ['*.jar'], dir: 'libs')
-    //    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-    //        exclude group: 'com.android.support', module: 'support-annotations'
-    //    })
-    compile 'com.android.support:design:27.0.2'
+    compile 'com.android.support:design:27.1.0'
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
     testCompile 'junit:junit:4.12'
     //    compile 'com.shark:screencapture:1.0.0'
     compile 'com.google.code.gson:gson:2.8.2'
-    compile 'com.jcodecraeer:xrecyclerview:1.5.2'
+    compile ('com.jcodecraeer:xrecyclerview:1.5.2'){
+        exclude group: 'com.android.support', module: 'design'
+    }
     compile 'com.squareup.okhttp3:okhttp:3.10.0'
     compile 'org.greenrobot:eventbus:3.1.1'
     compile 'com.zhy:base-adapter:3.0.3'
@@ -130,10 +128,14 @@ dependencies {
     //其中latest.release指代最新版本号,也可以指定明确的版本号,例如1.2.0
     compile 'com.tencent.bugly:nativecrashreport:latest.release'
     //其中latest.release指代最
-    compile 'com.tencent.mm.opensdk:wechat-sdk-android-with-mta:+'
-    debugCompile 'com.readystatesoftware.chuck:library:1.1.0'
+//    compile 'com.tencent.mm.opensdk:wechat-sdk-android-with-mta:+'
+    debugCompile ('com.readystatesoftware.chuck:library:1.1.0'){
+        exclude group: 'com.android.support', module: 'design'
+    }
     compile 'de.hdodenhof:circleimageview:2.2.0'
-    releaseCompile 'com.readystatesoftware.chuck:library-no-op:1.1.0'
+    releaseCompile ('com.readystatesoftware.chuck:library-no-op:1.1.0'){
+        exclude group: 'com.android.support', module: 'design'
+    }
     compile 'org.xutils:xutils:3.5.0'
     compile 'com.mylhyl:acp:1.1.7'
     compile 'cn.yipianfengye.android:zxing-library:2.2'
@@ -168,7 +170,7 @@ dependencies {
 
     //友盟
     compile 'com.umeng.sdk:common:latest.integration'
-    compile 'com.umeng.sdk:analytics:latest.integration'
+    //compile 'com.umeng.sdk:analytics:latest.integration'
 
     //fast json
     compile 'com.alibaba:fastjson:+'
@@ -209,8 +211,8 @@ dependencies {
     compile 'com.kf.framework:kf-utils:1.4.5@aar'
     //    compile 'com.kf.framework:volleyplus:latest.integration@aar'
     compile 'com.kf.framework:volleyplus:1.4.5@aar'
-    compile 'com.android.support:support-annotations:27.0.2'
-    compile 'com.android.support:recyclerview-v7:27.0.2'
+    compile 'com.android.support:support-annotations:27.1.0'
+    compile 'com.android.support:recyclerview-v7:27.1.0'
     compile project(':datashare')
     compile files('libs/jackson-core-2.2.1.jar')
     compile files('libs/jackson-dataformat-xml-2.1.2.jar')

+ 6 - 5
app/src/main/java/com/kfzs/duanduan/KFZSApp.java

@@ -94,12 +94,13 @@ public class KFZSApp extends MultiDexApplication{
 //        Log.w("DDINIT", "umengKey: " + umengKey + " |channelName: " + channelName + " |debug: " + debug);
 //        Log.w("DDINIT", "wxAppId: " + BuildConfig.WX_APPID + " |wxAppSecret: " + BuildConfig.WX_APPSECRET + " |debug: " + debug);
 //        Log.w("DDINIT", "wbAppId: " + BuildConfig.WB_APPID + " |wbAppSecret: " + BuildConfig.WB_APPSECRET + " |debug: " + debug);
-        MobclickAgent.UMAnalyticsConfig umAnalyticsConfig = new MobclickAgent.UMAnalyticsConfig(application, umengKey, channelName);
-        MobclickAgent.startWithConfigure(umAnalyticsConfig);
-        MobclickAgent.setDebugMode(debug);
+        //先注释掉,报错了
+//        MobclickAgent.UMAnalyticsConfig umAnalyticsConfig = new MobclickAgent.UMAnalyticsConfig(application, umengKey, channelName);
+//        MobclickAgent.startWithConfigure(umAnalyticsConfig);
+//        MobclickAgent.setDebugMode(debug);
         //Log.e("JPushRegzid", JPushInterface.getRegistrationID(this));
-        MobclickAgent.setCatchUncaughtExceptions(!debug);
-        MobclickAgent.enableEncrypt(true);
+//        MobclickAgent.setCatchUncaughtExceptions(!debug);
+//        MobclickAgent.enableEncrypt(true);
 
 //        //um Share
 //        Config.DEBUG = true;

+ 6 - 1
app/src/main/java/com/kfzs/duanduan/react/TabsHelper.java

@@ -176,7 +176,12 @@ public class TabsHelper {
             presscount = presscount + 1;
             Observable.just(1).delay(period * presscount, TimeUnit.MILLISECONDS)
                     .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(integer -> doBackPress());
+                    .subscribe(new Consumer<Integer>() {
+                        @Override
+                        public void accept(Integer integer) throws Exception {
+                            doBackPress();
+                        }
+                    });
         } else {
             presscount = 0;
             doBackPress();

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/absBase/BaseActivity.java

@@ -53,7 +53,7 @@ public abstract class BaseActivity extends AppActivity  {
         });
 
     }
-    protected   void  showToast(String msg){
+    protected   void  showToast(final String msg){
         this.runOnUiThread(new Runnable() {
             @Override
             public void run() {

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

@@ -123,7 +123,7 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
 
 
     @Override
-    public void showTask(UserInfoEntity entity) {
+    public void showTask(final UserInfoEntity entity) {
 
         this.runOnUiThread(new Runnable() {
             @Override

+ 7 - 4
app/src/main/java/com/sheep/gamegroup/view/activity/CommitWxCodeAct.java

@@ -32,6 +32,7 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
+import static com.sheep.gamegroup.view.activity.LieMakeMoneyAct.STATE_ON_HOOK_ABNORMAL_NEXT;
 import static com.sheep.gamegroup.view.activity.LieMakeMoneyAct.STATE_ON_HOOK_DEBLOCKED;
 import static com.sheep.gamegroup.view.activity.LieMakeMoneyAct.STATE_ON_HOOK_UNVERIFIED;
 import static com.sheep.gamegroup.view.activity.LieMakeMoneyAct.STATE_ON_HOOK_VERIFIED;
@@ -67,23 +68,25 @@ public class CommitWxCodeAct extends BaseActivity implements CommitWxCodeMakeMon
                         case STATE_ON_HOOK_VERIFIED:
                             G.showToast("微信验证码不能为空");
                             break;
-                        case STATE_ON_HOOK_UNVERIFIED:
+                        case STATE_ON_HOOK_ABNORMAL_NEXT:
                             G.showToast("微信密码不能为空");
                             break;
                     }
                 } else if(presenter != null) {
                     showProgress();
                     JSONObject jsonObject = new JSONObject();
-                    jsonObject.put("status", type);
                     switch (type){
                         case STATE_ON_HOOK_VERIFIED:
                             //用户已经验证,等待脚本验证
+                            jsonObject.put("status", type);
                             jsonObject.put("verification_code", password);
                             break;
                         case STATE_ON_HOOK_DEBLOCKED:
                             //用户确认已经解封,设置为等待服务器验证
+                            jsonObject.put("status", type);
                             break;
-                        case STATE_ON_HOOK_UNVERIFIED:
+                        case STATE_ON_HOOK_ABNORMAL_NEXT:
+                            jsonObject.put("status", type);
                             //因为账号异常(账号密码错误),所以修改账号,修改后将进入初始状态,即未验证
                             jsonObject.put("account", account);
                             jsonObject.put("password", password);
@@ -127,7 +130,7 @@ public class CommitWxCodeAct extends BaseActivity implements CommitWxCodeMakeMon
                 et_wx_pwd.setVisibility(View.GONE);
                 tv_wx_hint.setVisibility(View.VISIBLE);
                 break;
-            case STATE_ON_HOOK_UNVERIFIED:
+            case STATE_ON_HOOK_ABNORMAL_NEXT:
                 title = "修改挂机微信信息";
                 break;
         }

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

@@ -277,7 +277,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
         startStaskSprogress.setVisibility(View.VISIBLE);
         if (task_entity != null) {
             ClassFileHelper.getInstance().createSDDirection();
-            File mApkPath = new File(ClassFileHelper.DIR, task_entity.getTask_name() + ClassFileHelper.FILE_SUFFIX);
+            final File mApkPath = new File(ClassFileHelper.DIR, task_entity.getTask_name() + ClassFileHelper.FILE_SUFFIX);
             if (!mApkPath.exists()) {
 //                new File(mApkPath.getAbsolutePath());
                 try{

+ 2 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/LieMakeMoneyAct.java

@@ -121,6 +121,7 @@ public class LieMakeMoneyAct extends BaseActivity implements LieMakeMoneyContrac
     public static final int STATE_ON_HOOK_ABNORMAL = 5;//账号异常
     public static final int STATE_ON_HOOK_VC_OVERTIME = 6;//验证码超时请重新上传
     public static final int STATE_ON_HOOK_VERIFIED = 7;//用户已经验证等待脚本验证
+    public static final int STATE_ON_HOOK_ABNORMAL_NEXT = 8;//用户已经验证等待脚本验证
 
     //{ "data": [ { "id": 14, "Uid": 12, "account": "trhhccg", "password": "", "verification_code": "", "status": 0, "remarks": "", "normal_time": 0, "create_time": 1521854985, "update_time": 0, "phone_number": "17628083502", "is_send": 0, "device_info": null } ] }
     @Override
@@ -143,6 +144,7 @@ public class LieMakeMoneyAct extends BaseActivity implements LieMakeMoneyContrac
                 case STATE_ON_HOOK_ABNORMAL:
                 case STATE_ON_HOOK_VC_OVERTIME:
                 case STATE_ON_HOOK_VERIFIED:
+                case STATE_ON_HOOK_ABNORMAL_NEXT:
                 default:
                     lieMakeMoneyAdp.add(RecyleObj.make(RecyleType.ABNORMAL_ON_HOOK, wxOnHookAccount));
                     break;

+ 89 - 63
app/src/main/java/com/sheep/gamegroup/view/adapter/LieMakeMoneyAdp.java

@@ -23,6 +23,7 @@ import java.util.List;
 import java.util.Locale;
 
 import static com.sheep.gamegroup.view.activity.LieMakeMoneyAct.STATE_ON_HOOK_ABNORMAL;
+import static com.sheep.gamegroup.view.activity.LieMakeMoneyAct.STATE_ON_HOOK_ABNORMAL_NEXT;
 import static com.sheep.gamegroup.view.activity.LieMakeMoneyAct.STATE_ON_HOOK_BLOCKED;
 import static com.sheep.gamegroup.view.activity.LieMakeMoneyAct.STATE_ON_HOOK_DEBLOCKED;
 import static com.sheep.gamegroup.view.activity.LieMakeMoneyAct.STATE_ON_HOOK_NEED_VC;
@@ -73,26 +74,29 @@ public class LieMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
                 bindStartOnHook(holder);
                 break;
             case ABNORMAL_ON_HOOK:
-                bindAbnormalOnHook(holder, recyleObj.getDataObjT());
+                bindAbnormalOnHook(holder, (WXOnHookAccount) recyleObj.getDataObjT());
                 break;
             case NORMAL_ON_HOOK:
-                bindNormalOnHook(holder, recyleObj.getDataObjT());
+                bindNormalOnHook(holder, (WXOnHookAccount) recyleObj.getDataObjT());
                 break;
             case PROCESS_ON_HOOK:
-                bindProcessOnHook(holder, recyleObj.getDataObjT());
+                bindProcessOnHook(holder, (WXOnHookAccount) recyleObj.getDataObjT());
                 break;
             case PROMPT_ON_HOOK:
-                bindPromptOnHook(holder, recyleObj.getDataObjT());
+                bindPromptOnHook(holder, (List<WXOnHookAccount>) recyleObj.getDataObjT());
                 break;
         }
     }
 
-    private void bindProcessOnHook(ViewHolder holder, WXOnHookAccount dataObjT) {
+    private void bindProcessOnHook(ViewHolder holder, final WXOnHookAccount dataObjT) {
         TextView weixin_name_tv = holder.getView(R.id.weixin_name_tv);
         TextView customer_service_name_tv = holder.getView(R.id.customer_service_name_tv);
         weixin_name_tv.setText(dataObjT.getAccount());
-        customer_service_name_tv.setOnClickListener(view -> {
-            G.showToast("请联系客服:"+dataObjT.getCustomer_service());
+        customer_service_name_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                G.showToast("请联系客服:"+dataObjT.getCustomer_service());
+            }
         });
     }
 
@@ -103,98 +107,111 @@ public class LieMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
         earnings_money_tv.setText(String.format(Locale.CHINA,"%.2f",dataObjT.getMoney()));
     }
 
-    private void bindAbnormalOnHook(ViewHolder holder, WXOnHookAccount dataObjT) {
+    private void bindAbnormalOnHook(ViewHolder holder, final WXOnHookAccount dataObjT) {
         TextView state_name_tv = holder.getView(R.id.state_name_tv);
         TextView weixin_name_tv = holder.getView(R.id.weixin_name_tv);
         TextView wx_is_open_tv = holder.getView(R.id.wx_is_open_tv);
         TextView earnings_name_tv = holder.getView(R.id.earnings_name_tv);
         TextView wx_how_to_open_tv = holder.getView(R.id.wx_how_to_open_tv);
         weixin_name_tv.setText(dataObjT.getAccount());
-//        if(TextUtils.isEmpty(dataObjT.getRemarks())){
-//            wx_is_open_tv.setText("账号异常,请联系客服");
-//        } else {
-//            wx_is_open_tv.setText(dataObjT.getRemarks());
-//        }
+        if(TextUtils.isEmpty(dataObjT.getRemarks())){
+            earnings_name_tv.setText("账号异常,请联系客服");
+        } else {
+            earnings_name_tv.setText(dataObjT.getRemarks());
+        }
         switch (dataObjT.getStatus()) {
             case STATE_ON_HOOK_NEED_VC://需要用户验证码
                 state_name_tv.setText("账号异常");
-                earnings_name_tv.setText("需要验证码");
+//                earnings_name_tv.setText("需要验证码");
                 wx_is_open_tv.setText("提交验证码");
                 wx_how_to_open_tv.setVisibility(View.GONE);
                 break;
             case STATE_ON_HOOK_BLOCKED://被封
                 state_name_tv.setText("账号异常");
-                earnings_name_tv.setText("账号封禁");
+//                earnings_name_tv.setText("账号封禁");
                 wx_is_open_tv.setText("已解封,继续赚钱");
                 wx_how_to_open_tv.setVisibility(View.VISIBLE);
                 break;
-            case STATE_ON_HOOK_DEBLOCKED://用户已经解封等待脚本验证
+            case STATE_ON_HOOK_ABNORMAL_NEXT://用户已经修改账号密码等待服务器验证
+            case STATE_ON_HOOK_DEBLOCKED://用户已经解封等待服务器验证
                 state_name_tv.setText("账号处理中");
-                earnings_name_tv.setText("等待验证");
+//                earnings_name_tv.setText("等待验证");
                 wx_is_open_tv.setText("刷新看看");
                 wx_how_to_open_tv.setVisibility(View.GONE);
                 break;
             case STATE_ON_HOOK_ABNORMAL://账号异常
                 state_name_tv.setText("账号异常");
-                earnings_name_tv.setText("账号或密码错误");
+//                earnings_name_tv.setText("账号或密码错误");
                 wx_is_open_tv.setText("修改账号或密码");
                 wx_how_to_open_tv.setVisibility(View.GONE);
                 break;
             case STATE_ON_HOOK_VC_OVERTIME://验证码超时请重新上传
                 state_name_tv.setText("账号异常");
-                earnings_name_tv.setText("验证码超时");
+//                earnings_name_tv.setText("验证码超时");
                 wx_is_open_tv.setText("提交验证码");
                 wx_how_to_open_tv.setVisibility(View.GONE);
                 break;
             case STATE_ON_HOOK_VERIFIED://用户已经验证等待脚本验证
                 state_name_tv.setText("账号处理中");
-                earnings_name_tv.setText("等待验证");
+//                earnings_name_tv.setText("等待验证");
                 wx_is_open_tv.setText("刷新看看");
                 wx_how_to_open_tv.setVisibility(View.GONE);
                 break;
             default:
                 state_name_tv.setText("账号异常");
-                earnings_name_tv.setText("账号异常,请联系客服");
+//                earnings_name_tv.setText("账号异常,请联系客服");
                 wx_is_open_tv.setText("修改账号或密码");
                 wx_how_to_open_tv.setVisibility(View.GONE);
                 break;
         }
         // 各种状态用户可以进行不同的操作
-        wx_is_open_tv.setOnClickListener(view -> {
-            switch (dataObjT.getStatus()) {
-                case STATE_ON_HOOK_NEED_VC://需要用户验证码
-                case STATE_ON_HOOK_VC_OVERTIME://验证码超时请重新上传
-                    //修改验证码
-                    Jump2View.getInstance().goCommitWxCodeOnHookView(this.context, dataObjT, STATE_ON_HOOK_VERIFIED);
-                    break;
-                case STATE_ON_HOOK_BLOCKED://被封
-                    Jump2View.getInstance().goCommitWxCodeOnHookView(this.context, dataObjT, STATE_ON_HOOK_DEBLOCKED);
-                    break;
-                case STATE_ON_HOOK_DEBLOCKED://用户已经解封等待服务器验证
-                case STATE_ON_HOOK_VERIFIED://用户已经验证等待脚本验证
-                    if(this.context instanceof LieMakeMoneyAct) {
-                        clear();
-                        notifyDataSetChanged();
-                        ((LieMakeMoneyAct) this.context).initData();
-                    }else
-                        G.showToast("请等待或者联系客服:"+dataObjT.getCustomer_service());
-                    break;
-                case STATE_ON_HOOK_ABNORMAL://账号异常
-                default:
-                    //修改用户信息
-                    Jump2View.getInstance().goCommitWxCodeOnHookView(this.context, dataObjT, STATE_ON_HOOK_UNVERIFIED);
-                    break;
+        wx_is_open_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                switch (dataObjT.getStatus()) {
+                    case STATE_ON_HOOK_NEED_VC://需要用户验证码
+                    case STATE_ON_HOOK_VC_OVERTIME://验证码超时请重新上传
+                        //修改验证码
+                        Jump2View.getInstance().goCommitWxCodeOnHookView(context, dataObjT, STATE_ON_HOOK_VERIFIED);
+                        break;
+                    case STATE_ON_HOOK_BLOCKED://被封
+                        Jump2View.getInstance().goCommitWxCodeOnHookView(context, dataObjT, STATE_ON_HOOK_DEBLOCKED);
+                        break;
+                    case STATE_ON_HOOK_ABNORMAL_NEXT://用户已经修改账号密码等待服务器验证
+                    case STATE_ON_HOOK_DEBLOCKED://用户已经解封等待服务器验证
+                    case STATE_ON_HOOK_VERIFIED://用户已经验证等待脚本验证
+                        if(context instanceof LieMakeMoneyAct) {
+                            clear();
+                            notifyDataSetChanged();
+                            ((LieMakeMoneyAct) context).initData();
+                        }else
+                            G.showToast("请等待或者联系客服:"+dataObjT.getCustomer_service());
+                        break;
+                    case STATE_ON_HOOK_ABNORMAL://账号异常
+                    default:
+                        //修改用户信息
+                        Jump2View.getInstance().goCommitWxCodeOnHookView(context, dataObjT, STATE_ON_HOOK_ABNORMAL_NEXT);
+                        break;
+                }
             }
         });
-        wx_how_to_open_tv.setOnClickListener(view -> {
-            if(context instanceof LieMakeMoneyAct)
-                DialogAccountAbnormal.showDialog((Activity) context);
-            else if(BuildConfig.DEBUG)
-                G.showToast("测试:请确保context为LieMakeMoneyAct的实例");
+        wx_how_to_open_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if(context instanceof LieMakeMoneyAct)
+                    DialogAccountAbnormal.showDialog((Activity) context);
+                else if(BuildConfig.DEBUG)
+                    G.showToast("测试:请确保context为LieMakeMoneyAct的实例");
+            }
         });
         //测试
         if(BuildConfig.DEBUG){
-            earnings_name_tv.setOnClickListener(view -> G.showToast("备注:"+dataObjT.getRemarks()));
+            earnings_name_tv.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    G.showToast("备注:"+dataObjT.getRemarks());
+                }
+            });
         }
     }
 
@@ -205,24 +222,33 @@ 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 -> {
-            Jump2View.getInstance().goGuideOnHook(this.context, null);
-        });
+        imageView.setOnClickListener(new View.OnClickListener() {
+                                         @Override
+                                         public void onClick(View view) {
+                                             Jump2View.getInstance().goGuideOnHook(context, null);
+                                         }
+                                     });
     }
 
-    private void bindPromptOnHook(ViewHolder holder,  List<WXOnHookAccount> list) {
+    private void bindPromptOnHook(ViewHolder holder, final List<WXOnHookAccount> list) {
         View ll = holder.getView(R.id.lie_make_operation_ll);
         ll.setVisibility(list != null ? View.VISIBLE : View.GONE);
-        ll.findViewById(R.id.start_on_hook_tv).setOnClickListener(view -> {
-            // 点击添加挂机账号,进入引导小号界面
-            Jump2View.getInstance().goGuideOnHook(this.context, null);
+        ll.findViewById(R.id.start_on_hook_tv).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                // 点击添加挂机账号,进入引导小号界面
+                Jump2View.getInstance().goGuideOnHook(context, null);
+            }
         });
-        ll.findViewById(R.id.customer_service_name_tv).setOnClickListener(view -> {
+        ll.findViewById(R.id.customer_service_name_tv).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
 //            // 点击联系客服
-            if(list != null && !list.isEmpty())
-                G.showToast("请联系客服:"+list.get(0).getCustomer_service());
-            else if(BuildConfig.DEBUG)
-                G.showToast("传入的context不是activity,无法弹出对话框");
+                if(list != null && !list.isEmpty())
+                    G.showToast("请联系客服:"+list.get(0).getCustomer_service());
+                else if(BuildConfig.DEBUG)
+                    G.showToast("传入的context不是activity,无法弹出对话框");
+            }
         });
     }
 

+ 3 - 5
app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdp.java

@@ -102,7 +102,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
     /**
      * 获取已发布的
      */
-    private void bindReleaseTask(ViewHolder holder, List<TaskReleaseEty> etyList){
+    private void bindReleaseTask(ViewHolder holder, final List<TaskReleaseEty> etyList){
         RecyclerView recyclerView = holder.getView(R.id.release_task_listview, RecyclerView.class);
         recyclerView.setHasFixedSize(true);
         recyclerView.setLayoutManager(new StaggeredGridLayoutManager(1,
@@ -123,15 +123,13 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
             }
 
             @Override
-            public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, int i) {
+            public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, final int i) {
                     viewHolder.itemView.setTag(TAG_ID_TEMP, etyList.get(i).getId());
                 Log.e("-----viewholder",i+"");
                 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).getName()+"");
@@ -168,7 +166,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
     /**
      * 获取我正在运行的任务
      */
-    private void bindRunTask(ViewHolder holder, TaskAcceptedEty acceptedEty){
+    private void bindRunTask(ViewHolder holder, final 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);

+ 1 - 1
datashare/build.gradle

@@ -27,7 +27,7 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:27.0.2'
+    compile 'com.android.support:support-v4:27.1.0'
     compile 'org.greenrobot:greendao:3.2.2'
 }
 

+ 2 - 2
gradle.properties

@@ -9,13 +9,13 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx2048m
+#org.gradle.jvmargs=-Xmx2048m
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-android.injected.build.model.only.versioned = 3
+#android.injected.build.model.only.versioned = 3
 
 VERSION_NAME=2.0.0
 VERSION_CODE=200000

+ 2 - 2
view/build.gradle

@@ -29,8 +29,8 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:27.0.2'
-    compile 'com.android.support:support-v4:27.0.2'
+    compile 'com.android.support:appcompat-v7:27.1.0'
+    compile 'com.android.support:support-v4:27.1.0'
     compile 'com.github.bumptech.glide:glide:3.7.0'
     compile 'jp.wasabeef:glide-transformations:2.0.2'
 //    compile project(':sheep')