修复若干BUG

app/build.gradle

@@ -71,4 +71,6 @@ dependencies {
     compile 'org.xutils:xutils:3.5.0'
     compile 'com.mylhyl:acp:1.1.7'
     compile 'cn.yipianfengye.android:zxing-library:2.2'
+    compile 'com.github.huburt-Hu:NewbieGuide:v1.2.0'
+
 }

app/src/main/java/com/sheep/jiuyan/samllsheep/Config.java

@@ -17,9 +17,11 @@ public class Config {
     //    public String mBaseUrl = "http://10.8.220.130:8088";
     //        public String mBaseUrl = "http://10.8.220.213:8088";
     //    public String mBaseUrl = "http://10.8.220.130:8088";
-//       public String mBaseUrl = "http://10.8.220.6:8088";
-    public String mBaseUrl = "http://10.8.220.132:8088";
-//    public String mBaseUrl = "http://api.task.bandaimi.com";
+    //何威
+//      public String mBaseUrl = "http://10.8.220.6:8088";
+//张伟
+// public String mBaseUrl = "http://10.8.220.132:8088";
+   public String mBaseUrl = "http://api.task.bandaimi.com";
 //    public String mBaseUrl = "http://test.ss.shouyouquan.com";
     public final static String WX_APPID = "wx3c0376c4fcc8b723";
     public final static String BUGLY_APPID = "0dd998212c";

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

@@ -59,6 +59,7 @@ public class NetManager {
         }
         Request request = new Request.Builder().url(url).get().build();
         getInstancce(context).newCall(request).enqueue(callback);
+
     }
 
     public static void postForm(String url, Map<String, String> parma, Context context, SheepCallback callback) {

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

@@ -68,7 +68,7 @@ public interface Url {
     //新手任务奖励
      String GET_NEW_TASK_MONEY = Config.instance().mBaseUrl + "/v1/newbie/know_the_sheep";
       //重置密码中的发送验证码
-     String  GET_RESET_PWD_CODE=Config.instance().mBaseUrl + "/v1/findPwd";
+     String  GET_RESET_PWD_CODE=Config.instance().mBaseUrl + "/v1/user/findPwd";
 
 
 }

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

@@ -23,6 +23,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.app.hubert.library.NewbieGuide;
 import com.bumptech.glide.Glide;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -74,6 +75,12 @@ public class GameDetailActivity extends BaseActivity {
     @Override
     public void initView() {
         findViews();
+        NewbieGuide.with(this)//传入fragment
+                .setLabel("guide")//设置引导层标示，必传！否则报错
+                .setLayoutRes(R.layout.splash_1)//自定义的提示layout，不要添加背景色，引导层背景色通过setBackgroundColor()设置
+                .alwaysShow(false)
+                .show();//直接显示引导层
+
     }
 
 
@@ -371,6 +378,7 @@ public class GameDetailActivity extends BaseActivity {
 
             @Override
             public void otherCode(int code, String string) {
+                hideProgress();
                 mLlInfos.addView(getStep("领取任务", "待完成", 2));
             }
 

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

@@ -32,6 +32,7 @@ import android.widget.RadioGroup;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.app.hubert.library.NewbieGuide;
 import com.bumptech.glide.Glide;
 import com.mylhyl.acp.Acp;
 import com.mylhyl.acp.AcpListener;
@@ -103,6 +104,11 @@ public class MainActivity extends BaseActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        NewbieGuide.with(this)//传入fragment
+                .setLabel("guide2")//设置引导层标示，必传！否则报错
+                .setLayoutRes(R.layout.splash_2)//自定义的提示layout，不要添加背景色，引导层背景色通过setBackgroundColor()设置
+                .alwaysShow(false)
+                .show();//直接显示引导层
         Intent intent = getIntent();
         String tag = intent.getStringExtra("tag");
         if (TextUtils.equals(tag, "once")) {
@@ -113,6 +119,8 @@ public class MainActivity extends BaseActivity {
         startOpenXFK();
         goToQX();
 
+
+
 }
 
 

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

@@ -133,12 +133,7 @@ public class ResetPWDActivity extends BaseActivity  implements View.OnClickListe
             @Override
             public void failure(IOException e) {
                 tv_send.setEnabled(true);
-                String message = e.getMessage();
-                if (message.contains("参数错误")) {
-                    message = message.replace("参数错误", "");
-                }
-                message = message.trim();
-                Toast.makeText(ResetPWDActivity.this, message, Toast.LENGTH_SHORT).show();
+                Toast.makeText(ResetPWDActivity.this, "系统错误", Toast.LENGTH_SHORT).show();
             }
         });
 

app/src/main/java/com/sheep/jiuyan/samllsheep/utils/SpUtils.java

@@ -47,4 +47,6 @@ public class SpUtils {
 
 
 
+
+
 }

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

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent"
+
+    >
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:text="绑定账户"
+        android:background="@color/bbb"
+        android:textSize="20dp"
+        android:textColor="@color/black_dark"
+        android:gravity="center"
+        />
+
+      <include layout="@layout/reset_pwd_layout"></include>
+
+
+
+
+</LinearLayout>

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

@@ -40,7 +40,6 @@
             android:background="@drawable/sp_edt_background_login"
             android:hint="请输入帐号"
             android:paddingLeft="20dp"
-            android:inputType="phone"
             android:textColor="@color/black_text_deep"
             android:textSize="@dimen/text_size_3"/>
 

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/splash_1"
+
+        />
+
+
+</LinearLayout>

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/splash_2"
+
+        />
+
+
+</LinearLayout>

build.gradle

@@ -16,6 +16,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven { url "https://jitpack.io" }
     }
 }