修改token过期提示

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

@@ -301,7 +301,7 @@ public class AlterHeadpicActivity extends TitleBarActivity implements View.OnCli
             @Override
             public void onError(Call call, Exception e, int id) {
                 progressDialog.dismiss();
-                showToast(getString(R.string.error_msg));
+                STSign.getInstance().tonkenError(AlterHeadpicActivity.this, e);
             }
 
             @Override

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

@@ -13,6 +13,7 @@ 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;
@@ -119,7 +120,7 @@ public class AlterPasswordActivity extends TitleBarActivity {
                 if(progressDialog != null){
                     progressDialog.dismiss();
                 }
-                showToast(getString(R.string.error_msg));
+                STSign.getInstance().tonkenError(AlterPasswordActivity.this, e);
             }
 
             @Override

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

@@ -6,7 +6,6 @@ import android.text.TextUtils;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -112,7 +111,7 @@ public class AlterPhoneNumberCheckActivity extends TitleBarActivity implements C
 
             @Override
             public void onError(Call call, Exception e, int id) {
-                showToast(getString(R.string.error_msg));
+                STSign.getInstance().tonkenError(AlterPhoneNumberCheckActivity.this, e);
             }
 
             @Override

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

@@ -13,6 +13,7 @@ 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;
@@ -94,7 +95,7 @@ public class AlterUserNameActivity extends TitleBarActivity {
                 if(progressDialog != null){
                     progressDialog.dismiss();
                 }
-                showToast(getString(R.string.error_msg));
+                STSign.getInstance().tonkenError(AlterUserNameActivity.this, e);
             }
 
             @Override

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

@@ -11,6 +11,7 @@ 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.bean.BindInfoBean;
@@ -138,7 +139,7 @@ public class BindThreeAccountActivity extends TitleBarActivity {
 
             @Override
             public void onError(Call call, Exception e, int id) {
-                showToast(getString(R.string.error_msg));
+                STSign.getInstance().tonkenError(BindThreeAccountActivity.this, e);
             }
 
             @Override
@@ -254,6 +255,7 @@ public class BindThreeAccountActivity extends TitleBarActivity {
                 if(progressDialog != null){
                     progressDialog.dismiss();
                 }
+                STSign.getInstance().tonkenError(BindThreeAccountActivity.this, e);
             }
 
             @Override
@@ -286,7 +288,7 @@ public class BindThreeAccountActivity extends TitleBarActivity {
 
             @Override
             public void onError(Call call, Exception e, int id) {
-                showToast(e.getMessage());
+                STSign.getInstance().tonkenError(BindThreeAccountActivity.this, e);
             }
 
             @Override

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

@@ -252,7 +252,7 @@ public class CourseDetailActivity extends TitleBarActivity {
             tvPrice.setVisibility(View.VISIBLE);
             tvPrice.setText("￥" + dataBean.getPrice() + "元");
         } else {
-            tvPrice.setVisibility(View.GONE);
+            tvPrice.setText("￥0元");
         }
         if(!TextUtils.isEmpty(dataBean.getMarketPrice())) {
             tvCourseMarketprice.setVisibility(View.VISIBLE);
@@ -364,10 +364,10 @@ public class CourseDetailActivity extends TitleBarActivity {
                 if(TextUtils.isEmpty(address)) {
                     continue;
                 }
-                if(i < dataBean.getEnrollAreaList().size() - 1) {
-                    areaName = areaName + address + "\n";
-                } else {
+                if(i <= 0) {
                     areaName = areaName + address;
+                } else {
+                    areaName = areaName + "\n"+address;
                 }
             }
         }
@@ -389,7 +389,7 @@ public class CourseDetailActivity extends TitleBarActivity {
 
             @Override
             public void onError(Call call, Exception e, int id) {
-                showToast(getString(R.string.error_msg));
+                STSign.getInstance().tonkenError(CourseDetailActivity.this, e);
             }
 
             @Override
@@ -424,7 +424,7 @@ public class CourseDetailActivity extends TitleBarActivity {
 
             @Override
             public void onError(Call call, Exception e, int id) {
-                showToast(getString(R.string.error_msg));
+                STSign.getInstance().tonkenError(CourseDetailActivity.this, e);
             }
 
             @Override

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

@@ -13,6 +13,7 @@ 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;
@@ -110,7 +111,7 @@ public class FindPasswordAffirmActivity extends TitleBarActivity {
                 if(progressDialog != null){
                     progressDialog.dismiss();
                 }
-                showToast(getString(R.string.error_msg));
+                STSign.getInstance().tonkenError(FindPasswordAffirmActivity.this, e);
             }
 
             @Override

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

@@ -17,6 +17,7 @@ import com.common.library.cache.Cache;
 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.bean.IdAuthCacheBean;
@@ -139,7 +140,7 @@ public class IdAuthActivity extends TitleBarActivity {
                 if(progressDialog != null){
                     progressDialog.dismiss();
                 }
-                showToast(getString(R.string.error_msg));
+                STSign.getInstance().tonkenError(IdAuthActivity.this, e);
             }
 
             @Override

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

@@ -14,6 +14,7 @@ import com.common.library.pulltorefresh.PullToRefreshListView;
 import com.google.gson.Gson;
 import com.ynstkz.shitu.android.R;
 import com.ynstkz.shitu.android.adapter.MessageListAdapter;
+import com.ynstkz.shitu.android.application.STSign;
 import com.ynstkz.shitu.android.base.TitleBarActivity;
 import com.ynstkz.shitu.android.bean.MessageListBean;
 import com.ynstkz.shitu.android.data.RequestGroup;
@@ -101,6 +102,7 @@ public class MessageListActivity extends TitleBarActivity implements PullToRefre
             @Override
             public void onError(Call call, Exception e, int id) {
                 showNoData();
+                STSign.getInstance().tonkenError(MessageListActivity.this, e);
             }
 
             @Override

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

@@ -223,7 +223,7 @@ public class MineCollectActivity extends TitleBarActivity implements PullToRefre
                                 }
                                 pullToRefresh.setMode(PullToRefreshBase.Mode.BOTH);
                             } else {
-                                if(mineCollectItemAdapter != null || mineCollectItemAdapter.getCount() > 0) {
+                                if(mineCollectItemAdapter != null && mineCollectItemAdapter.getCount() > 0) {
                                     showToast("已经加载全部");
                                 } else {
                                     showNoData();

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

@@ -298,12 +298,28 @@ public class OrgDetailActivity extends TitleBarActivity {
         dataBean = orgDetailBean.getData();
         tvTitle.setText(dataBean.getMemberName());
         tvOrgName.setText(dataBean.getMemberName());
-        tvOrgPhone.setText(dataBean.getPhone());
         tvCollectcount.setText("收藏：" + dataBean.getCollectCount() + "次");
-        tvAddress.setText(dataBean.getAddress());
-        tvOrgDesc.setText(dataBean.getIntroduction());
         rbScore.setProgress((int)dataBean.getScore());
         isCollect = dataBean.isCollect();
+
+        if(!TextUtils.isEmpty(dataBean.getPhone())){
+            tvOrgPhone.setText(dataBean.getPhone());
+        } else {
+            tvOrgPhone.setVisibility(View.GONE);
+        }
+
+        if(!TextUtils.isEmpty(dataBean.getAddress())) {
+            tvAddress.setText(dataBean.getAddress());
+        } else {
+            tvAddress.setVisibility(View.GONE);
+        }
+
+        if(!TextUtils.isEmpty(dataBean.getIntroduction())) {
+            tvOrgDesc.setText(dataBean.getIntroduction());
+        } else {
+            tvOrgDesc.setVisibility(View.GONE);
+        }
+
         initCollectIcon();
 
         //初始化Banner信息

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

@@ -178,8 +178,7 @@ public class OrgWriteCommentActivity extends TitleBarActivity implements View.On
             @Override
             public void onError(Call call, Exception e, int id) {
                 progressDialog.dismiss();
-                STSign.logout();
-                startActivity(new Intent(OrgWriteCommentActivity.this, LoginActivity.class));
+                STSign.getInstance().tonkenError(OrgWriteCommentActivity.this, e);
             }
 
             @Override

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

@@ -425,7 +425,7 @@ public class StudentInfoActivity extends TitleBarActivity {
 
             @Override
             public void onError(Call call, Exception e, int id) {
-                showToast(getString(R.string.error_msg));
+                STSign.getInstance().tonkenError(StudentInfoActivity.this, e);
             }
 
             @Override
@@ -536,7 +536,7 @@ public class StudentInfoActivity extends TitleBarActivity {
 
             @Override
             public void onError(Call call, Exception e, int id) {
-                showToast(getString(R.string.error_msg));
+                STSign.getInstance().tonkenError(StudentInfoActivity.this, e);
             }
 
             @Override

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

@@ -243,11 +243,15 @@ public class RequestGroup {
         Map<String, String> params = getSystemParams();
         params.put("pageNumber",pageNumber);
         params.put("pageSize", "10");
-        if(!TextUtils.isEmpty(lon)){
-            params.put("lon", lon);
-        }
-        if(!TextUtils.isEmpty(lat)){
-            params.put("lat", lat);
+        if(!TextUtils.isEmpty(keyword)){
+            params.put("keyword", keyword);
+        } else {
+            if(!TextUtils.isEmpty(lon)){
+                params.put("lon", lon);
+            }
+            if(!TextUtils.isEmpty(lat)){
+                params.put("lat", lat);
+            }
         }
         if(!TextUtils.isEmpty(agencyTypeId)){
             params.put("agencyTypeId", agencyTypeId);
@@ -255,9 +259,6 @@ public class RequestGroup {
         if(!TextUtils.isEmpty(sortType)){
             params.put("sortType", sortType);
         }
-        if(!TextUtils.isEmpty(keyword)){
-            params.put("keyword", keyword);
-        }
         OkHttpUtils.get().url(UrlCat.URL_AGENCY_LIST).tag(obj).params(params).build().execute(callback);
     }