修复菲姐测试的BUG

app/src/main/java/com/sheep/jiuyan/samllsheep/adapter/DownListAdapter.java

@@ -39,7 +39,7 @@ public class DownListAdapter extends BaseAdapter {
     public DownListAdapter(Context context) {
         mContext = context;
         mInflater = LayoutInflater.from(mContext);
-
+        downloadManager = DownloadManager.getInstance();
     }
 
     @Override

app/src/main/java/com/sheep/jiuyan/samllsheep/net/SheepCallback.java

@@ -55,9 +55,7 @@ public abstract class SheepCallback<T> implements Callback {
                 }
             });
 
-        } else if (code == 401) {
-
-        } else {
+        }else {
             mActivity.runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
@@ -67,6 +65,7 @@ public abstract class SheepCallback<T> implements Callback {
         }
     }
 
+
     public void otherCode(int code, String string) {
         //       Toast.makeText(SheepApp.mContext, string, Toast.LENGTH_SHORT).show();
         failure(new IOException(string));

app/src/main/java/com/sheep/jiuyan/samllsheep/page/ResetPWDActivity.java

@@ -39,6 +39,7 @@ public class ResetPWDActivity extends BaseActivity  implements View.OnClickListe
     private TextView tv_submit;
     private int mTime = 0;
     private String mPhone;
+    private  boolean  isUse=false;
 
     private Handler handler = new Handler();
     Runnable runnable = new Runnable() {
@@ -103,6 +104,7 @@ public class ResetPWDActivity extends BaseActivity  implements View.OnClickListe
     private  void  hideSetPWD(){
         rl_set_pwd.setVisibility(View.VISIBLE);
         rl_rset_pwd.setVisibility(View.GONE);
+        isUse=true;
     }
 
     private  void  sendCode(){
@@ -160,6 +162,7 @@ public class ResetPWDActivity extends BaseActivity  implements View.OnClickListe
         HashMap<String, String> map = new HashMap<>();
         map.put("Account", mPhone);
         map.put("Step", "2");
+        map.put("SmsSeccode", et_psw.getText().toString().trim());
         map.put("NewPass", pw1);
         showProgress();
         NetManager.post(Url.GET_RESET_PWD_CODE, map, getApplicationContext(), new SheepCallback<String>(ResetPWDActivity.this) {
@@ -191,6 +194,30 @@ public class ResetPWDActivity extends BaseActivity  implements View.OnClickListe
 
     }
 
+    @Override
+    public void onBackPressed() {
+        if (isUse) {
+          onBackDown();
+            rl_set_pwd.setVisibility(View.VISIBLE);
+            rl_rset_pwd.setVisibility(View.GONE);
+            isUse=false;
+        } else {
+            super.onBackPressed();
+        }
+
+    }
+
+
+    public  void  onBackDown(){
+
+
+    }
+
+
+
+
+
+
     private  void  goNext(){
 
         String moble = et_account.getText().toString().trim();

app/src/main/java/com/sheep/jiuyan/samllsheep/page/ShotScreenActivity.java

@@ -108,10 +108,7 @@ public class ShotScreenActivity extends Activity {
             builder.setCancelable(false);
             builder.show();
             return ;
-
         }
-
-
         HashMap<String, String> parma = new HashMap<>();
         parma.put("task_pkg", topApp);
         parma.put("wx_open_id", SpUtils.getOpenId(this));
@@ -121,10 +118,9 @@ public class ShotScreenActivity extends Activity {
                 Toast.makeText(ShotScreenActivity.this, s, Toast.LENGTH_SHORT).show();
                 finish();
             }
-
             @Override
             public void failure(IOException e) {
-                Toast.makeText(ShotScreenActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show();
+                Toast.makeText(ShotScreenActivity.this, "上传截图失败,亲！请从新上传", Toast.LENGTH_SHORT).show();
                 finish();
             }
         });

app/src/main/java/com/sheep/jiuyan/samllsheep/page/SplashActivity.java

@@ -47,13 +47,13 @@ public class SplashActivity extends BaseActivity {
     public void initData() {
         OpenXFK();
 
+
     }
 
     /**
      * 申请读写权限6.0
      */
     private void getSA() {
-
              Acp.getInstance(this).request(new AcpOptions.Builder()
                         .setPermissions(Manifest.permission.WRITE_EXTERNAL_STORAGE
                                 ,Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.READ_PHONE_STATE
@@ -127,10 +127,12 @@ public class SplashActivity extends BaseActivity {
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if(requestCode==PermissionFloatWindowUtils.REQUEST_OVERLAY_PERMISSION){
+
             if(resultCode==1){
-                OpenXFK();
-            }else{
                 getSA();
+            }else{
+                OpenXFK();
+
             }
 
 

app/src/main/java/com/sheep/jiuyan/samllsheep/page/UserCenterActivity.java

@@ -5,8 +5,6 @@ import android.os.Bundle;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import android.widget.Toast;
-
 import com.bumptech.glide.Glide;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
@@ -46,9 +44,7 @@ public class UserCenterActivity extends BaseActivity implements View.OnClickList
     private TextView mTvTask;
     private TextView mTvWithdrawHostroy;
     private User mUser;
-
     private LinearLayout mLlMoneyHostroy;
-
     private TextView tv_wx_aacount;
 
 
@@ -96,15 +92,7 @@ public class UserCenterActivity extends BaseActivity implements View.OnClickList
 
                     }
                 }
-
-
-
         );
-
-
-
-
-
     }
 
     @Override

app/src/main/java/com/sheep/jiuyan/samllsheep/page/XDownLoadActivity.java

@@ -77,9 +77,6 @@ public class XDownLoadActivity extends BaseActivity {
             }
         }
 
-        if(DownloadManager.getInstance().getDownloadListCount()<=0){
-
-        }
 
         mAdapter = new DownListAdapter(this);
         lv.setAdapter(mAdapter);

app/src/main/java/com/sheep/jiuyan/samllsheep/page/fragment/FgtMainPageTask.java

@@ -144,11 +144,11 @@ public class FgtMainPageTask extends BaseFragment {
     private void checkUserTask() {
         HashMap<String, String> map = new HashMap<>();
         map.put("wx_open_id", SpUtils.getOpenId(SheepApp.mContext));
-        showProgress();
+
         NetManager.get(Url.USER_CHECK_REGISTER, map, SheepApp.mContext, new SheepCallback<String>(getActivity()) {
             @Override
             public void success(String ok) {
-                hideProgress();
+
                 if (TextUtils.equals(ok, "ok")) {
                     showDialog("是否接受任务？");
                 } else {
@@ -159,7 +159,7 @@ public class FgtMainPageTask extends BaseFragment {
             @Override
             public void failure(IOException e) {
                 super.failure(e);
-                hideProgress();
+
             }
         });
     }
@@ -192,11 +192,12 @@ public class FgtMainPageTask extends BaseFragment {
         map.put("wx_open_id", SpUtils.getOpenId(SheepApp.mContext));
         map.put("task_id", mClickItem.getId() + "");
         map.put("imei", new DeviceUtils(getContext()).getIMEI());
-        showProgress();
+
+
         NetManager.get(Url.USER_REGISTER_TASK, map, SheepApp.mContext, new SheepCallback<String>(getActivity()) {
             @Override
             public void success(String o) {
-                hideProgress();
+
                 initData(false);
                 String pkg = mClickItem.getTask().getPkg();
                 if (!TextUtils.isEmpty(pkg))
@@ -213,7 +214,7 @@ public class FgtMainPageTask extends BaseFragment {
             @Override
             public void failure(IOException e) {
                 super.failure(e);
-                hideProgress();
+
             }
         });
     }
@@ -379,11 +380,11 @@ public class FgtMainPageTask extends BaseFragment {
                 mTlDoing.setVisibility(View.GONE);
             }
         });
-        showProgress();
+
         NetManager.get(Url.GET_TASK_COUNT, map, SheepApp.mContext, new SheepCallback<TaskCount>(getActivity()) {
             @Override
             public void success(TaskCount count) {
-                hideProgress();
+
                 mTaskHistory.setText(count.getTaskCount() + "");
                 mTaskSucc.setText(count.getTodayCount() + "");
             }
@@ -391,7 +392,7 @@ public class FgtMainPageTask extends BaseFragment {
             @Override
             public void failure(IOException e) {
                 super.failure(e);
-                hideProgress();
+
             }
         });
     }

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

@@ -82,13 +82,18 @@
                         android:layout_height="wrap_content"
                         android:layout_alignParentBottom="true"
                         android:layout_alignParentRight="true"
-                        android:layout_marginBottom="@dimen/content_padding"
                         android:layout_marginRight="10dp"
                         android:textColor="@color/orange_text_light"
                         android:textSize="@dimen/text_size_5"
                         android:textStyle="bold"
+
+                        android:layout_centerVertical="true"
+                        android:layout_marginBottom="3dp"
                         />
 
+
+
+
                     <TextView
                         android:id="@+id/tv_text1"
                         android:layout_width="wrap_content"
@@ -99,11 +104,13 @@
                         android:layout_marginLeft="10dp"
                         android:layout_marginRight="3dp"
                         android:layout_toLeftOf="@id/tv_bouns"
-                        android:gravity="bottom"
                         android:text="+"
                         android:textColor="@color/orange_text_light"
                         android:textSize="@dimen/text_size_4"/>
 
+
+
+
                     <TextView
                         android:id="@+id/tv_money"
                         android:layout_width="wrap_content"

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

@@ -42,7 +42,7 @@
                 android:textColor="@color/black_text_deep"
                 android:textSize="@dimen/text_size_3"
                  android:background="@null"
-                android:layout_weight="3"
+                android:layout_weight="2"
                 />
 
              <TextView