提交类型 修复bug

提交内容   处理首页显示图标错乱的问题

app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -105,9 +105,9 @@ public class CommonUtil {
             return "";
         }
         String baseUrl = getSharedPreferences(ct, "erp_baseurl");
-//        if (BaseConfig.isDebug()){
-//            baseUrl="http://192.168.253.41:8080/ERP/";
-//        }
+        if (BaseConfig.isDebug()){
+            baseUrl="http://192.168.253.243:8080/ERP/";
+        }
 //        baseUrl = "http://192.168.253.52:9000/ERP/";
 
         return baseUrl;

app_modular/appmessages/src/main/java/com/modular/appmessages/activity/SubscribeDetailActivity.java

@@ -39,7 +39,7 @@ import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
-import com.core.widget.crouton.Crouton;
+import com.core.utils.ToastUtil;
 import com.modular.appmessages.R;
 import com.umeng.socialize.ShareAction;
 import com.umeng.socialize.bean.SHARE_MEDIA;
@@ -92,7 +92,7 @@ public class SubscribeDetailActivity extends BaseActivity {
                     break;
                 case REMOVE_MY_SUBSCRIPTION:
                     progressDialog.dismiss();
-                    Crouton.makeText(mContext, getString(R.string.subscribe_cancled));
+                   ToastUtil.showToast(mContext, getString(R.string.subscribe_cancled));
                     Intent myIntent = new Intent();
                     setResult(44, myIntent);
                     mApplyButton.setText(getString(R.string.subscribe_detail_commit));
@@ -100,7 +100,7 @@ public class SubscribeDetailActivity extends BaseActivity {
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
-                    Crouton.makeText(mContext, msg.getData().getString("result"));
+                    ToastUtil.showToast(mContext, msg.getData().getString("result"));
                     break;
             }
         }

app_modular/appmessages/src/main/java/com/modular/appmessages/adapter/AllSubscriptionAdapter.java

@@ -20,8 +20,8 @@ import com.core.dao.DBManager;
 import com.core.model.SubscriptionNumber;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
+import com.core.utils.ToastUtil;
 import com.core.widget.CustomProgressDialog;
-import com.core.widget.crouton.Crouton;
 import com.modular.appmessages.R;
 
 import java.util.ArrayList;
@@ -156,7 +156,7 @@ public class AllSubscriptionAdapter extends BaseAdapter {
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
-                    Crouton.makeText(mContext, msg.getData().getString("result"));
+                    ToastUtil.showToast(mContext, msg.getData().getString("result"));
                     break;
             }
         }

app_modular/appmessages/src/main/java/com/modular/appmessages/adapter/AllSubscriptionNumbersAdapter.java

@@ -15,8 +15,8 @@ import com.core.app.Constants;
 import com.core.model.SubscriptionNumber;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
+import com.core.utils.ToastUtil;
 import com.core.widget.CustomProgressDialog;
-import com.core.widget.crouton.Crouton;
 import com.modular.appmessages.R;
 
 import java.util.HashMap;
@@ -142,7 +142,7 @@ public class AllSubscriptionNumbersAdapter extends BaseAdapter {
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
-                    Crouton.makeText(mContext,msg.getData().getString("result"));
+                   ToastUtil.showToast(mContext,msg.getData().getString("result"));
                     break;
             }
         }