升级后的一些代码 修复

app/build.gradle

@@ -8,11 +8,11 @@ android {
         applicationId "com.sheep.jiuyan.samllsheep"
         minSdkVersion 18
         targetSdkVersion 26
-        versionCode 100000
-        versionName "1.0.0"
+        versionCode 101001
+        versionName "1.1.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         ndk {
-            abiFilters "armeabi-v7a", "x86"
+            abiFilters 'armeabi' , 'x86'//, 'armeabi-v7a', 'x86_64', 'arm64-v8a'
         }
     }
     signingConfigs {
@@ -62,7 +62,8 @@ dependencies {
     compile 'org.greenrobot:eventbus:3.1.1'
     compile 'com.zhy:base-adapter:3.0.3'
     compile 'com.liulishuo.filedownloader:library:1.6.9'
-    compile 'com.tencent.bugly:crashreport_upgrade:latest.release'
+    compile 'com.tencent.bugly:crashreport_upgrade:latest.release'//其中latest.release指代最新版本号，也可以指定明确的版本号，例如1.2.0
+    compile 'com.tencent.bugly:nativecrashreport:latest.release' //其中latest.release指代最
     compile 'com.tencent.mm.opensdk:wechat-sdk-android-with-mta:+'
     compile(name: 'utils', ext: 'aar')
     debugCompile 'com.readystatesoftware.chuck:library:1.1.0'

app/src/main/AndroidManifest.xml

@@ -19,7 +19,19 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"/>
+
+
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
+
+    <!--必须的权限配置-->
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.READ_LOGS" />
+    <!--保存资源到SD卡-->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
     <permission
         android:name="android.permission.PACKAGE_USAGE_STATS"
         tools:ignore="ProtectedPermissions"/>
@@ -89,6 +101,26 @@
                 android:resource="@xml/file_paths"/>
         </provider>
 
+
+
+        <!--必须配置-->
+        <activity
+            android:name="com.tencent.bugly.beta.ui.BetaActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize|locale"
+            android:theme="@android:style/Theme.Translucent"/>
+
+        <!-- 必须配置 fileProvider， 注意： android:authorities="${applicationId}.fileProvider" 不要直接copy，设置为你的包名.fileProvider-->
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="com.sheep.jiuyan.samllsheep.fileProvider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/provider_paths"/>
+
+        </provider>
+
         <activity
             android:name=".page.BindWxActivity"
             android:screenOrientation="portrait"/>
@@ -132,6 +164,11 @@
         <activity
             android:name=".page.AskFriendActivity"
             android:screenOrientation="portrait"/>
+
+        <activity
+            android:name=".page.BindPhoneActivity"
+            android:screenOrientation="portrait"/>
+
         <activity
             android:name=".page.SplashActivity"
             android:screenOrientation="portrait">

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

@@ -16,10 +16,10 @@ public class Config {
     //        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.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.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 = "0dd9 98212c";

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

@@ -35,7 +35,7 @@ public class SheepApp extends BaseApplication {
         regWx();
         registerActivityLifecycleCallbacks(activityLifecycleCallbacks);
         initGoble();
-        Bugly.init(getApplicationContext(), Config.BUGLY_APPID, false);
+        Bugly.init(getApplicationContext(), Config.BUGLY_APPID, true);
     }
 
     private void regWx() {

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

@@ -72,5 +72,7 @@ public interface Url {
 
       //线下面对面推广
      String FACE_2_FACE = Config.instance().mBaseUrl + "/static/poster.html";
+     //绑定手机账号
+     String   BINDUSER = Config.instance().mBaseUrl + "/v1/user/bind";
 
 }

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

@@ -0,0 +1,211 @@
+package com.sheep.jiuyan.samllsheep.page;
+
+import android.content.Intent;
+import android.os.Handler;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.sheep.jiuyan.samllsheep.net.NetManager;
+import com.sheep.jiuyan.samllsheep.net.SheepCallback;
+import com.sheep.jiuyan.samllsheep.net.Url;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+import com.sheep.jiuyan.samllsheep.utils.StringUtils;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
+
+import java.io.IOException;
+import java.util.HashMap;
+
+/**
+ * Created by Administrator on 2018/2/23.
+ */
+
+public class BindPhoneActivity  extends BaseActivity implements View.OnClickListener{
+
+    EditText  et_phone;
+    EditText  et_code;
+    Button btn;
+    TextView  tv;
+    int mTime = 0;
+    Handler handler = new Handler();
+    Runnable runnable = new Runnable() {
+        @Override
+        public void run() {
+            mTime--;
+            if (mTime <= 0) {
+                tv.setText("重新发送");
+                tv.setEnabled(true);
+            } else {
+                tv.setText("重新发送(" + mTime + ")");
+                handler.postDelayed(this, 1000);
+            }
+        }
+    };
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_bind_phone;
+    }
+
+    @Override
+    public void initView() {
+        et_phone=(EditText)findViewById(R.id.et_phone);
+        et_code=(EditText)findViewById(R.id.et_code);
+        btn=(Button)findViewById(R.id.btn);
+        tv=(TextView)findViewById(R.id.tv);
+        TitleBarUtils.getInstance()
+                .setTitle(this, "绑定手机号")
+                .setTitleFinish(this);
+
+    }
+
+    @Override
+    public void initListener() {
+        btn.setOnClickListener(this);
+        tv.setOnClickListener(this);
+    }
+
+    @Override
+    public void initData() {
+
+    }
+
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()){
+            case R.id.btn:
+                bindPhone();
+                break;
+            case  R.id.tv:
+                sendCode();
+                break;
+
+
+        }
+
+
+    }
+
+    private  void  checkLoginIsOverdue(){
+         if(TextUtils.isEmpty(SpUtils.getAppToken(BindPhoneActivity.this))){
+             SpUtils.login(this,"");
+             SpUtils.saveAppToken(this,"");
+             Toast.makeText(this,"登录已过期!请重新登录...",Toast.LENGTH_LONG).show();
+             Intent i=new  Intent(this,LoginActivity.class);
+             startActivity(i);
+             finish();
+             return ;
+    }
+    }
+
+
+    private  void  sendCode(){
+        checkLoginIsOverdue();
+        tv.setEnabled(false);
+        String moble = et_phone.getText().toString().trim();
+        if (TextUtils.isEmpty(moble)) {
+            et_phone.setError("请输入手机号");
+            tv.setEnabled(true);
+
+            return;
+        }
+        if(!StringUtils.checkMobileNum(moble)){
+            et_phone.setError("请填写正确的手机号码");
+            tv.setEnabled(true);
+            return;
+        }
+
+        HashMap<String, String> map = new HashMap<>();
+        map.put("Mobile", moble);
+        map.put("Step", "1");
+        map.put("Token",  SpUtils.getAppToken(BindPhoneActivity.this));
+        showProgress();
+        NetManager.post(Url.BINDUSER, map, getApplicationContext(), new SheepCallback<String>(BindPhoneActivity.this) {
+            @Override
+            public void success(String o) {
+                hideProgress();
+                Toast.makeText(BindPhoneActivity.this, "验证码已发送", Toast.LENGTH_SHORT).show();
+                mTime = 60;
+                handler.postDelayed(runnable, 1000);
+            }
+
+            @Override
+            public void failure(IOException e) {
+                hideProgress();
+                tv.setEnabled(true);
+                String message = e.getMessage();
+                if (message.contains("参数错误")) {
+                    message = message.replace("参数错误", "");
+                }
+                message = message.trim();
+                Toast.makeText(BindPhoneActivity.this, message, Toast.LENGTH_SHORT).show();
+            }
+        });
+
+    }
+
+
+
+    private  void  bindPhone(){
+        checkLoginIsOverdue();
+        btn.setEnabled(false);
+        String moble = et_phone.getText().toString().trim();
+        String code = et_code.getText().toString().trim();
+        if (TextUtils.isEmpty(moble)) {
+            btn.setEnabled(true);
+            et_phone.setError("请输入手机号");
+            return;
+        }
+        if(!StringUtils.checkMobileNum(moble)){
+            et_phone.setError("请填写正确的手机号码");
+            btn.setEnabled(true);
+            return;
+        }
+        if (TextUtils.isEmpty(code)) {
+            btn.setEnabled(true);
+            et_code.setError("请输入验证码");
+            return;
+        }
+        if (code.length()!=6) {
+            btn.setEnabled(true);
+            et_code.setError("请填写6位手机验证码");
+            return;
+        }
+        showProgress();
+        HashMap<String, String> map = new HashMap<>();
+        map.put("Mobile", moble);
+        map.put("Step", "2");
+        map.put("Seccode", code);
+        map.put("Token",  SpUtils.getAppToken(BindPhoneActivity.this));
+        NetManager.post(Url.BINDUSER, map, getApplicationContext(), new SheepCallback<String>(BindPhoneActivity.this) {
+            @Override
+            public void success(String o) {
+               hideProgress();
+                Toast.makeText(BindPhoneActivity.this,"绑定手机号成功",Toast.LENGTH_LONG).show();
+                finish();
+            }
+
+            @Override
+            public void failure(IOException e) {
+                hideProgress();
+                btn.setEnabled(true);
+                String message = e.getMessage();
+                if (message.contains("参数错误")) {
+                    message = message.replace("参数错误", "");
+                }
+                message = message.trim();
+                Toast.makeText(BindPhoneActivity.this, message, Toast.LENGTH_SHORT).show();
+            }
+        });
+
+
+    }
+
+
+
+}

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

@@ -16,7 +16,6 @@ import android.widget.RadioGroup;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
@@ -160,6 +159,7 @@ public class LoginActivity extends BaseActivity {
             public void success(String o) {
                 HashMap<String, String> map = new HashMap<>();
                 map.put("token", o);
+                SpUtils.saveAppToken(LoginActivity.this,o);
                 NetManager.get(Url.REGISTER_SHEEP, map, getApplicationContext(), new SheepCallback<BindUserEntiey>(LoginActivity.this) {
                     @Override
                     public void success(BindUserEntiey o) {

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

@@ -37,7 +37,6 @@ import com.bumptech.glide.Glide;
 import com.mylhyl.acp.Acp;
 import com.mylhyl.acp.AcpListener;
 import com.mylhyl.acp.AcpOptions;
-import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
@@ -127,6 +126,9 @@ public class MainActivity extends BaseActivity {
 
 
 
+
+
+
     private  void  goToQX(){
         if (Build.VERSION.SDK_INT >= 23) {
             boolean has = PremissUtils.hasPermission(MainActivity.this);
@@ -226,20 +228,20 @@ if (BuildConfig.DEBUG)
                             if(!TextUtils.isEmpty(user.getBalance())){
                                 try {
                                     float money =Float.parseFloat(user.getBalance());
-                                    if(money>=30){
+                                    if(money>=20){
                                         Intent intent = new Intent(MainActivity.this, WithdrawActivity.class);
                                         intent.putExtra("money", user.getBalance());
                                         startActivity(intent);
                                     }else{
-                                        Toast.makeText(MainActivity.this,"亲！最低提现金额是30元哟！",Toast.LENGTH_LONG).show();
+                                        Toast.makeText(MainActivity.this,"亲！最低提现金额是20元哟！赶紧去做任务吧",Toast.LENGTH_LONG).show();
                                     }
 
                                 }catch (Exception e){
-                                      Toast.makeText(MainActivity.this,"亲！最低提现金额是30元哟！",Toast.LENGTH_LONG).show();
+                                      Toast.makeText(MainActivity.this,"亲！最低提现金额是20元哟！赶紧去做任务吧",Toast.LENGTH_LONG).show();
                                 }
 
                             }else{
-                                Toast.makeText(MainActivity.this,"亲！最低提现金额是30元哟！",Toast.LENGTH_LONG).show();
+                                Toast.makeText(MainActivity.this,"亲！最低提现金额是20元哟！赶紧去做任务吧",Toast.LENGTH_LONG).show();
 
                             }
 

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

@@ -153,7 +153,7 @@ public class ResetPWDActivity extends BaseActivity  implements View.OnClickListe
             @Override
             public void failure(IOException e) {
                 tv_send.setEnabled(true);
-                Toast.makeText(ResetPWDActivity.this, "系统错误", Toast.LENGTH_SHORT).show();
+                Toast.makeText(ResetPWDActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show();
             }
         });
 

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

@@ -1,10 +1,20 @@
 package com.sheep.jiuyan.samllsheep.page;
 
+import android.app.AlertDialog;
+import android.content.Context;
 import android.content.Intent;
+import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
+import android.text.ClipboardManager;
+import android.text.TextUtils;
 import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageView;
 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;
@@ -70,20 +80,32 @@ public class UserCenterActivity extends BaseActivity implements View.OnClickList
 
     @Override
     public void initData() {
+
+    }
+
+
+    @Override
+    protected void onResume() {
+        super.onResume();
         HashMap<String, String> map = new HashMap<>();
         map.put("wx_open_id", SpUtils.getOpenId(this));
         showProgress();
         NetManager.get(Url.USER_INFO, map, getApplicationContext(), new SheepCallback<User>(this) {
-            @Override
-            public void success(User user) {
-                hideProgress();
-                mUser = user;
-                G.mUser = user;
-                mTvNick.setText(user.getNickName());
-                mTvMoney.setText(StringUtils.strToMoney(user.getBalance()));
-                mTvCode.setText("我的邀请码  " + user.getInvitationCode());
-                Glide.with(getApplicationContext()).load(user.getIcon()).placeholder(R.drawable.icon).dontAnimate().into(mImgIcon);
-            }
+                    @Override
+                    public void success(User user) {
+                        hideProgress();
+                        mUser = user;
+                        G.mUser = user;
+                        mTvNick.setText(user.getNickName());
+                        mTvMoney.setText(StringUtils.strToMoney(user.getBalance()));
+                        mTvCode.setText("我的邀请码  " + user.getInvitationCode());
+                        Glide.with(getApplicationContext()).load(user.getIcon()).placeholder(R.drawable.icon).dontAnimate().into(mImgIcon);
+                        if(TextUtils.isEmpty(user.getMobile())){
+                            //做弹框
+                            showBindPhoneDialog();
+                        }
+
+                    }
 
                     @Override
                     public void failure(IOException e) {
@@ -93,8 +115,40 @@ public class UserCenterActivity extends BaseActivity implements View.OnClickList
                     }
                 }
         );
+
     }
 
+    private  void  showBindPhoneDialog(){
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(UserCenterActivity.this);
+        View view = View.inflate(this, R.layout.bind_user_dialog, null);
+        builder.setView(view);
+        final AlertDialog dialog = builder.create();
+        dialog.show();
+        ImageView iv_close = (ImageView) view.findViewById(R.id.iv_close);
+        iv_close.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                dialog.dismiss();
+            }
+        });
+
+        Button btn = (Button) view.findViewById(R.id.btn);
+        btn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+               Intent i=new Intent(UserCenterActivity.this,BindPhoneActivity.class);
+                UserCenterActivity.this.startActivity(i);
+                dialog.dismiss();
+            }
+        });
+
+
+
+    }
+
+
+
     @Override
     public void initView() {
         mImgIcon = (CircleImageView) findViewById(R.id.img_icon);
@@ -127,23 +181,17 @@ public class UserCenterActivity extends BaseActivity implements View.OnClickList
                 toLogin();
             }
 
-        } else if (i == R.id.tv_withdraw_hostroy) {
-            if (checkLogin()) {
-                intent = new Intent(UserCenterActivity.this, WithdrawRecordActivity.class);
-                startActivity(intent);
-            } else {
-                toLogin();
-            }
-
-        } else if (i == R.id.tv_task) {
-            if (checkLogin()) {
-                intent = new Intent(UserCenterActivity.this, TaskRecordActivity.class);
-                startActivity(intent);
-            } else {
-                toLogin();
-            }
-
-        } else if (i == R.id.ll_money_hostroy) {
+        }
+//        else if (i == R.id.tv_task) {
+//            if (checkLogin()) {
+//                intent = new Intent(UserCenterActivity.this, TaskRecordActivity.class);
+//                startActivity(intent);
+//            } else {
+//                toLogin();
+//            }
+//
+//        }
+          else if (i == R.id.ll_money_hostroy) {
             if (checkLogin()) {
                 intent = new Intent(UserCenterActivity.this, MoneyHistroyActivity.class);
                 startActivity(intent);

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

@@ -84,7 +84,11 @@ public class WebActivity extends BaseActivity {
 
             @Override
             public void onProgressChanged(WebView view, int newProgress) {
-                slowlyProgressBar.onProgressChange(newProgress);
+                if(slowlyProgressBar!=null){
+                    slowlyProgressBar.onProgressChange(newProgress);
+                }
+
+
             }
         });
 

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

@@ -33,7 +33,7 @@ import java.util.HashMap;
 public class WithdrawActivity extends BaseActivity implements View.OnClickListener {
     private TextView mMoney;
     private GridView mGvMoney;
-    int[] mMoneys = new int[]{30, 50, 100, 500};
+    int[] mMoneys = new int[]{20,30, 50, 100};
     private TextView mTvWx;
     private GvAdapter mAdapter;
     private AlertDialog mDialog;

app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/AdpCommonRecy.java

@@ -42,6 +42,7 @@ public abstract class AdpCommonRecy<T> extends RecyclerView.Adapter<ViewHolder>
 
     public void clear() {
         this.mListDatas.clear();
+         notifyDataSetChanged();
     }
 
     public T getItem(int position) {

app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/User.java

@@ -31,6 +31,8 @@ public class User implements Serializable {
     private String Today;
     private String Balance;
     private String InvitationCode;
+    private  String  Mobile;
+
 
     public int getReceived_red_packet() {
         return received_red_packet;
@@ -123,4 +125,13 @@ public class User implements Serializable {
     public void setBalance(String Balance) {
         this.Balance = Balance;
     }
+
+
+    public String getMobile() {
+        return Mobile;
+    }
+
+    public void setMobile(String mobile) {
+        Mobile = mobile;
+    }
 }

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

@@ -71,8 +71,6 @@ public class FgtMainPageOffline extends BaseFragment {
                 initData(true);
             }
         });
-        initData(false);
-
 
         mLayoutStartTask.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -96,6 +94,11 @@ public class FgtMainPageOffline extends BaseFragment {
         });
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        initData(false);
+    }
 
     /**
      * 加载远端数据

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

@@ -105,8 +105,6 @@ public class FgtMainPageTask extends BaseFragment {
             }
         });
         mRecyclerView.setNestedScrollingEnabled(false);
-        initData(false);
-
         findViewById(R.id.view_income_today)
                 .setOnClickListener(new View.OnClickListener() {
                     @Override
@@ -266,10 +264,13 @@ public class FgtMainPageTask extends BaseFragment {
         HashMap<String, String> map = new HashMap<>();
         map.put("wx_open_id", SpUtils.getOpenId(SheepApp.mContext));
         map.put("imei", new DeviceUtils(SheepApp.mContext).getIMEI());
+        if(mAdapter!=null &&mAdapter.getItemCount()>0){
+            mAdapter.clear();
+        }
         NetManager.get(Url.PUBLISH_TASKS, map, SheepApp.mContext, new SheepCallback<List<TaskPublish>>(getActivity()) {
             @Override
             public void success(List<TaskPublish> tasks) {
-                mAdapter.clear();
+
                 if (tasks != null && tasks.size() > 0) {
                     mAdapter.addAll(tasks);
                     mAdapter.notifyDataSetChanged();
@@ -299,7 +300,7 @@ public class FgtMainPageTask extends BaseFragment {
                     G.mUser = user;
                     ((BaseActivity) getActivity()).initData();//刷新数据
                     findViewById(R.id.txt_fgt_main_page_task_income, TextView.class)
-                            .setText(StringUtils.strToMoney(user.getToday()));
+                            .setText( StringUtils.strToMoney(StringUtils.strToMoney(user.getToday()))  );
                 }
             }
         });

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

@@ -174,10 +174,8 @@ public class PackageUtil {
             // LAUNCHER Intent
             Intent intent = new Intent(Intent.ACTION_MAIN);
             intent.addCategory(Intent.CATEGORY_LAUNCHER);
-
             // 设置ComponentName参数1:packagename参数2:MainActivity路径
             ComponentName cn = new ComponentName(packageName, className);
-
             intent.setComponent(cn);
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             context.startActivity(intent);

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

@@ -46,6 +46,20 @@ public class SpUtils {
 
 
 
+    public static void saveAppToken(Context context, String vaule) {
+        SharedPreferences user = context.getSharedPreferences("user", Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = user.edit();
+        editor.putString("apptoken", vaule);
+        editor.apply();
+    }
+
+
+    public static String getAppToken(Context context) {
+        SharedPreferences user = context.getSharedPreferences("user", Context.MODE_PRIVATE);
+        return user.getString("apptoken", "");
+    }
+
+
 
 
 

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

@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+
+
+    <include layout="@layout/title"></include>
+
+
+      <ImageView
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:background="@null"
+          android:src="@drawable/ic_security"
+          android:layout_gravity="center_horizontal"
+          android:layout_marginTop="25dp"
+          />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="绑定会让你的账号更加安全。"
+        android:textSize="16sp"
+        android:textColor="@color/black_dark"
+        android:gravity="center"
+        android:layout_marginTop="10dp"
+        />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="绑定完成后，您可以通过手机登录小绵羊。"
+        android:textSize="16sp"
+        android:textColor="@color/black_dark"
+        android:gravity="center"
+        android:layout_marginTop="10dp"
+        />
+
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/black_light"
+        android:layout_marginTop="40dp"
+        ></View>
+
+       <LinearLayout
+           android:layout_width="match_parent"
+           android:layout_height="wrap_content"
+           android:orientation="horizontal"
+           android:layout_marginTop="15dp"
+           android:layout_marginBottom="15dp"
+           >
+         <TextView
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:text="+86"
+             android:textSize="20sp"
+             android:textColor="@color/black_dark"
+             android:layout_gravity="center_vertical"
+             android:paddingLeft="20dp"
+             android:paddingRight="20dp"
+             />
+         <View
+             android:layout_width="1px"
+             android:layout_height="40dp"
+             android:background="@color/line"
+             ></View>
+
+          <EditText
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:hint="手机号"
+              android:textSize="18sp"
+              android:paddingLeft="15dp"
+              android:textColor="@color/black_dark"
+              android:background="@null"
+              android:id="@+id/et_phone"
+              android:inputType="phone"
+              />
+
+       </LinearLayout>
+
+
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/black_light"
+        ></View>
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginTop="15dp"
+        android:layout_marginBottom="15dp"
+        >
+        <EditText
+            android:layout_width="220dp"
+            android:layout_height="match_parent"
+            android:hint="请输入验证码"
+            android:textSize="18sp"
+            android:textColor="@color/black_dark"
+            android:background="@null"
+            android:paddingLeft="20dp"
+            android:layout_gravity="center_vertical"
+            android:id="@+id/et_code"
+            android:inputType="phone"
+            android:maxLength="6"
+            />
+
+        <View
+            android:layout_width="1px"
+            android:layout_height="40dp"
+            android:background="@color/line"
+            ></View>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="获取验证码"
+            android:textSize="18sp"
+            android:textColor="@color/black_dark"
+            android:layout_gravity="center_vertical"
+            android:padding="10dp"
+            android:id="@+id/tv"
+            />
+
+    </LinearLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/black_light"
+        ></View>
+
+
+    <Button
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="立即绑定"
+        android:textColor="@color/black_dark"
+        android:layout_margin="15dp"
+        android:background="@drawable/bg_corner_popup"
+        android:textSize="18sp"
+        android:id="@+id/btn"
+
+        />
+
+
+
+</LinearLayout>

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

@@ -2,22 +2,78 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent"
-
+    android:background="@drawable/dialog_bg"
     >
+   
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/bbb"
+        >
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="40dp"
+        android:text="安全绑定"
+        android:textSize="20sp"
+        android:textColor="@color/black_dark"
+        android:layout_centerInParent="true"
+        android:gravity="center"
+        />
+
+     <ImageView
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+         android:background="@null"
+         android:src="@drawable/ic_dialog_close"
+         android:layout_gravity="right|center"
+         android:padding="10dp"
+         android:layout_alignParentRight="true"
+         android:id="@+id/iv_close"
+         />
+    </RelativeLayout>
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@null"
+        android:src="@drawable/ic_dialog_phone"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="15dp"
+        />
 
     <TextView
         android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:text="绑定账户"
-        android:background="@color/bbb"
-        android:textSize="20dp"
+        android:layout_height="wrap_content"
+        android:text="绑定手机更安全!"
+        android:textSize="18sp"
         android:textColor="@color/black_dark"
         android:gravity="center"
+        android:layout_marginTop="7dp"
         />
 
-      <include layout="@layout/reset_pwd_layout"></include>
 
 
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="绑定手机号，现金体现更方便"
+        android:textSize="16sp"
+        android:textColor="@color/line"
+        android:gravity="center"
+        android:layout_marginTop="7dp"
+        />
+
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="马 上 绑 定"
+            android:layout_gravity="center"
+            android:layout_marginTop="20dp"
+            android:background="@drawable/ic_dialog_btn"
+            android:textSize="16sp"
+            android:id="@+id/btn"
+            android:layout_marginBottom="20dp"
+            />
 
 
 </LinearLayout>

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

@@ -177,6 +177,7 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:orientation="horizontal"
+        android:visibility="gone"
         android:paddingLeft="5dp">
 
         <ImageView
@@ -203,8 +204,6 @@
 
     </LinearLayout>
 
-    <include
-        layout="@layout/line_h_1px"/>
 
     <LinearLayout
         android:layout_width="match_parent"