修改手机号BUG

app/src/main/java/com/ynstkz/shitu/android/activity/AlterPhoneNumberActivity.java

@@ -40,6 +40,8 @@ public class AlterPhoneNumberActivity extends TitleBarActivity implements Verify
     @Bind(R.id.btn_next)
     Button btnNext;
 
+    private String oldPhoneNum;
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -61,8 +63,9 @@ public class AlterPhoneNumberActivity extends TitleBarActivity implements Verify
     private void initData(){
         UserInfoBean userInfoBean = STSign.getInstance().getUserInfo();
         if(userInfoBean != null && userInfoBean.getData() != null) {
+            oldPhoneNum = userInfoBean.getData().getMobile();
             tvHint.setText(String.format(getString(R.string.alter_phone_msg),
-                    userInfoBean.getData().getMobile().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2")));
+                    oldPhoneNum.replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2")));
         }
     }
 
@@ -86,6 +89,7 @@ public class AlterPhoneNumberActivity extends TitleBarActivity implements Verify
         if(type == 4){
             Intent intent = new Intent(AlterPhoneNumberActivity.this, AlterPhoneNumberCheckActivity.class);
             intent.putExtra("phoneNumber", editPhoneNumber.getText().toString());
+            intent.putExtra("oldPhoneNum", oldPhoneNum);
             startActivityForResult(intent, 100);
         }
     }

app/src/main/java/com/ynstkz/shitu/android/activity/AlterPhoneNumberCheckActivity.java

@@ -10,15 +10,21 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.common.library.okhttp.callback.Callback;
+import com.google.gson.Gson;
 import com.ynstkz.shitu.android.R;
 import com.ynstkz.shitu.android.application.STSign;
+import com.ynstkz.shitu.android.base.BaseBean;
 import com.ynstkz.shitu.android.base.TitleBarActivity;
+import com.ynstkz.shitu.android.data.RequestGroup;
 import com.ynstkz.shitu.android.event.UserInfoChangeEvent;
 import com.ynstkz.shitu.android.listener.CheckVerifyCodeCallback;
 
 import org.greenrobot.eventbus.EventBus;
 
 import butterknife.Bind;
+import okhttp3.Call;
+import okhttp3.Response;
 
 /**
  * 作者：fuchangle on 2018/2/23 09:19
@@ -39,6 +45,7 @@ public class AlterPhoneNumberCheckActivity extends TitleBarActivity implements C
     @Bind(R.id.btn_submit)
     Button btnSubmit;
 
+    private String oldPhoneNum;
     private String phoneNumber;
 
     @Override
@@ -60,6 +67,7 @@ public class AlterPhoneNumberCheckActivity extends TitleBarActivity implements C
 
     private void initData(){
         phoneNumber = getIntent().getStringExtra("phoneNumber");
+        oldPhoneNum = getIntent().getStringExtra("oldPhoneNum");
         tvPhoneNumber.setText(phoneNumber);
     }
 
@@ -84,10 +92,41 @@ public class AlterPhoneNumberCheckActivity extends TitleBarActivity implements C
     @Override
     public void isVerifyCodeSuccess(int type, String phoneNumber, String code, boolean isSuccess) {
         if(type == 4 && isSuccess){
-            showToast("修改成功！");
-            setResult(RESULT_OK);
-            EventBus.getDefault().post(new UserInfoChangeEvent());
-            finish();
+            alterPhoneNumber(oldPhoneNum, phoneNumber, code);
         }
     }
+
+    /**
+     * 修改手机号
+     * @param oldMobile
+     * @param mobile
+     * @param code
+     */
+    private void alterPhoneNumber(String oldMobile, final String mobile, String code) {
+
+        RequestGroup.alterPhoneNumber(oldMobile, mobile, code, new Callback() {
+            @Override
+            public Object parseNetworkResponse(Response response, int id) throws Exception {
+                return new Gson().fromJson(response.body().string(), BaseBean.class);
+            }
+
+            @Override
+            public void onError(Call call, Exception e, int id) {
+                showToast(getString(R.string.error_msg));
+            }
+
+            @Override
+            public void onResponse(Object response, int id) {
+                BaseBean baseBean = (BaseBean)response;
+                if(baseBean != null) {
+                    if("200".equals(baseBean.getCode())) {
+                        setResult(RESULT_OK);
+                        EventBus.getDefault().post(new UserInfoChangeEvent());
+                        finish();
+                    }
+                    showToast(baseBean.getMsg());
+                }
+            }
+        });
+    }
 }

app/src/main/java/com/ynstkz/shitu/android/activity/CourseDetailActivity.java

@@ -238,11 +238,28 @@ public class CourseDetailActivity extends TitleBarActivity {
         tvViewCount.setText("收藏：" + courseDetilBean.getData().getCollectCount() + "次");
         tvTitle.setText(dataBean.getTitle());
         tvOrgName.setText(dataBean.getTitle());
-        tvOrgDesc.setText(dataBean.getDetail());
-        tvPrice.setText("￥" + dataBean.getPrice() + "元");
-        tvCourseMarketprice.setText("市场价￥" + dataBean.getMarketPrice());
+        if(!TextUtils.isEmpty(dataBean.getDetail())) {
+            tvOrgDesc.setText(dataBean.getDetail());
+        }
+
         isCollect = courseDetilBean.getData().isCollect();
-        tvRequirement.setText(courseDetilBean.getData().getRequirement());
+
+        if(!TextUtils.isEmpty(courseDetilBean.getData().getRequirement())) {
+            tvRequirement.setText(courseDetilBean.getData().getRequirement());
+        }
+
+        if(!TextUtils.isEmpty(dataBean.getPrice())) {
+            tvPrice.setVisibility(View.VISIBLE);
+            tvPrice.setText("￥" + dataBean.getPrice() + "元");
+        } else {
+            tvPrice.setVisibility(View.GONE);
+        }
+        if(!TextUtils.isEmpty(dataBean.getMarketPrice())) {
+            tvCourseMarketprice.setVisibility(View.VISIBLE);
+            tvCourseMarketprice.setText("市场价￥" + dataBean.getMarketPrice());
+        } else {
+            tvCourseMarketprice.setVisibility(View.GONE);
+        }
         initCollectIcon();
         //招生区域
         initEnrollAreaList(dataBean);
@@ -343,7 +360,15 @@ public class CourseDetailActivity extends TitleBarActivity {
         String areaName = "";
         if (dataBean.getEnrollAreaList().size() > 0) {
             for (int i = 0; i < dataBean.getEnrollAreaList().size(); i++) {
-                areaName = areaName + dataBean.getEnrollAreaList().get(i).getAddress() + "\n";
+                String address = dataBean.getEnrollAreaList().get(i).getAddress();
+                if(TextUtils.isEmpty(address)) {
+                    continue;
+                }
+                if(i < dataBean.getEnrollAreaList().size() - 1) {
+                    areaName = areaName + address + "\n";
+                } else {
+                    areaName = areaName + address;
+                }
             }
         }
         tvEnrollmentArea.setText(areaName);

app/src/main/java/com/ynstkz/shitu/android/activity/OrgCommentItemBean.java

@@ -20,6 +20,7 @@ public class OrgCommentItemBean extends BaseBean{
     private int memberId;
     private String address;
     private List<EvaluatePicListBean> evaluatePicList;
+    private String logo;
 
     public int getScore() {
         return score;
@@ -101,6 +102,14 @@ public class OrgCommentItemBean extends BaseBean{
         this.address = address;
     }
 
+    public String getLogo() {
+        return logo;
+    }
+
+    public void setLogo(String logo) {
+        this.logo = logo;
+    }
+
     public static class EvaluatePicListBean {
         /**
          * evaluatePicId : 3

app/src/main/java/com/ynstkz/shitu/android/adapter/MineCommentItemAdapter.java

@@ -108,8 +108,12 @@ public class MineCommentItemAdapter extends CCListAdapter{
                 rbScore.setProgress(orgCommentItemBean.getScore());
                 tvContent.setText(orgCommentItemBean.getContent());
                 tvOrgName.setText(orgCommentItemBean.getMemberName());
-                if(!TextUtils.isEmpty(orgCommentItemBean.getHeadPic())){
-                    Glide.with(context).load(UrlCat.HOST + orgCommentItemBean.getHeadPic()).into(ivOrgIcon);
+                if(!TextUtils.isEmpty(orgCommentItemBean.getLogo())){
+                    if(orgCommentItemBean.getLogo().startsWith("http")) {
+                        Glide.with(context).load(orgCommentItemBean.getLogo()).into(ivOrgIcon);
+                    } else {
+                        Glide.with(context).load(UrlCat.HOST + orgCommentItemBean.getLogo()).into(ivOrgIcon);
+                    }
                 } else {
                     ivOrgIcon.setImageResource(R.drawable.org_item_default_icon);
                 }

app/src/main/java/com/ynstkz/shitu/android/data/RequestGroup.java

@@ -491,4 +491,20 @@ public class RequestGroup {
         OkHttpUtils.post().url(UrlCat.URL_DELETE_FAMILY).addHeader(KEY_TOKEN,
                 SharedPreferencesUtils.getToken()).params(params).build().execute(callback);
     }
+
+    /**
+     * 修改手机号
+     * @param oldMobile
+     * @param mobile
+     * @param code
+     * @param callback
+     */
+    public static void alterPhoneNumber(String oldMobile, String mobile, String code, Callback callback){
+        Map<String, String> params = getSystemParams();
+        params.put("oldMobile", oldMobile);
+        params.put("mobile", mobile);
+        params.put("code", code);
+        OkHttpUtils.postString().url(UrlCat.URL_USER_RESET_MOBILE).addHeader(KEY_TOKEN,
+                SharedPreferencesUtils.getToken()).content(new Gson().toJson(params)).build().execute(callback);
+    }
 }

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

@@ -59,7 +59,6 @@
             android:singleLine="true"
             android:textColor="@color/color_999"
             android:textSize="@dimen/company_12sp"
-            android:textCursorDrawable="@color/main_color"
             android:background="@null"/>
 
     </LinearLayout>