diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 356aa17..654a0ab 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.9.0" />
+    <option name="version" value="1.9.24" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/java/http/ApiConfig.java b/app/src/main/java/http/ApiConfig.java
index 5f8fda3..dca98f1 100644
--- a/app/src/main/java/http/ApiConfig.java
+++ b/app/src/main/java/http/ApiConfig.java
@@ -1,40 +1,41 @@
-package http;
-
-/**
- * Created by 90432 on 2017/12/23.
- */
-
-public class ApiConfig {
-   /* public static String BASE_URL="http://5597755.com/Lottery_server/get_init_data.php/";
-    public static String APPID="szo007";
-    public static String webUrl="https://www.dafaok88.com";*/
-
-    public static String BASE_PARENT_URL="https://wy.dou1.net/";
-    public static String BASE_URL= BASE_PARENT_URL + "api/";
-    public static String APPID="api/";
-
-    public static String UERREGISTER="user/register";
-
-    public static String GETCODE=BASE_URL+APPID+"user/getVerificationCode";//获取验证码的接口
-    public  static String   REGISTERCODE=BASE_URL+APPID+"user/registerUser";//注册接口；
- public  static String   USERLOGIN=BASE_URL+APPID+"user/login";//登陆接口；\
- public  static String   MYHISTROY=BASE_URL+APPID+"user/viewhistory";//我的浏览记录；
- public  static String   MYNES=BASE_URL+APPID+"user/myNews";//我的新闻；
- public  static String   MYCOMMENT=BASE_URL+APPID+"user/myComment";//我的评论
-
- public  static String   NEWSINFO=BASE_URL+APPID+"news/getNewsInfo";//新闻详情
- public  static String   NEWSDISUSSINFO=BASE_URL+APPID+"comment/getCommentByBusinessListPage";//新闻评论详情列表
- public  static String   ADDNEWSDISUSS=BASE_URL+APPID+"comment/addComments";//添加评论
- public  static String   ADDNEWSZAN=BASE_URL+APPID+"praise/updatePraise";
-
- public  static String     ADDFAVATER=BASE_URL+APPID+"collection//updateCollection";//收藏级添加评论
- public  static String    GETHOMEBANNER=BASE_URL+APPID+"news/getNewsBannerList";//获取首页bannner
- public  static String    MYQRCODE=BASE_URL+APPID+"user/myQrcode";
- //http://haotian.hoheng.cn/api/user/myQrcode
-
- public static String CALLBACK_TEMP_STOP_PAY = BASE_PARENT_URL + "bts/payment/garage_notify";         //支付宝临停车位支付回调
- public static String CALLBACK_RECHARGE_PAY = BASE_PARENT_URL + "bts/payment/user_wallet_recharge";         //支付宝用户充值余额下单回调
- public static String CALLBACK_PROPERTY_PAY = BASE_PARENT_URL + "bts/payment/user_recharge";         //支付宝用户物业费等等下单回调(账单类型,1水费,2电费.3燃气费,4物业费,5车位管理费,6家政服务费,7报修支付费用)
- public static String CALLBACK_HOUSEKEEPING_PAY = BASE_PARENT_URL + "bts/payment/serve_notify";         //支付宝家政服务正常下单回调
- public static String CALLBACK_PAYMENT_PAY = BASE_PARENT_URL + "orderpaynotify/payment/notify";         //支付宝提交订单回调
-}
+package http;
+
+/**
+ * Created by 90432 on 2017/12/23.
+ */
+
+public class ApiConfig {
+   /* public static String BASE_URL="http://5597755.com/Lottery_server/get_init_data.php/";
+    public static String APPID="szo007";
+    public static String webUrl="https://www.dafaok88.com";*/
+
+    //public static String BASE_PARENT_URL="https://wy.dou1.net/";
+    public static String BASE_PARENT_URL = "http://101.43.95.130:8030/";
+    public static String BASE_URL = BASE_PARENT_URL + "api/";
+    public static String APPID = "api/";
+
+    public static String UERREGISTER = "user/register";
+
+    public static String GETCODE = BASE_URL + APPID + "user/getVerificationCode";//获取验证码的接口
+    public static String REGISTERCODE = BASE_URL + APPID + "user/registerUser";//注册接口；
+    public static String USERLOGIN = BASE_URL + APPID + "user/login";//登陆接口；\
+    public static String MYHISTROY = BASE_URL + APPID + "user/viewhistory";//我的浏览记录；
+    public static String MYNES = BASE_URL + APPID + "user/myNews";//我的新闻；
+    public static String MYCOMMENT = BASE_URL + APPID + "user/myComment";//我的评论
+
+    public static String NEWSINFO = BASE_URL + APPID + "news/getNewsInfo";//新闻详情
+    public static String NEWSDISUSSINFO = BASE_URL + APPID + "comment/getCommentByBusinessListPage";//新闻评论详情列表
+    public static String ADDNEWSDISUSS = BASE_URL + APPID + "comment/addComments";//添加评论
+    public static String ADDNEWSZAN = BASE_URL + APPID + "praise/updatePraise";
+
+    public static String ADDFAVATER = BASE_URL + APPID + "collection//updateCollection";//收藏级添加评论
+    public static String GETHOMEBANNER = BASE_URL + APPID + "news/getNewsBannerList";//获取首页bannner
+    public static String MYQRCODE = BASE_URL + APPID + "user/myQrcode";
+    //http://haotian.hoheng.cn/api/user/myQrcode
+
+    public static String CALLBACK_TEMP_STOP_PAY = BASE_PARENT_URL + "bts/payment/garage_notify";         //支付宝临停车位支付回调
+    public static String CALLBACK_RECHARGE_PAY = BASE_PARENT_URL + "bts/payment/user_wallet_recharge";         //支付宝用户充值余额下单回调
+    public static String CALLBACK_PROPERTY_PAY = BASE_PARENT_URL + "bts/payment/user_recharge";         //支付宝用户物业费等等下单回调(账单类型,1水费,2电费.3燃气费,4物业费,5车位管理费,6家政服务费,7报修支付费用)
+    public static String CALLBACK_HOUSEKEEPING_PAY = BASE_PARENT_URL + "bts/payment/serve_notify";         //支付宝家政服务正常下单回调
+    public static String CALLBACK_PAYMENT_PAY = BASE_PARENT_URL + "orderpaynotify/payment/notify";         //支付宝提交订单回调
+}
diff --git a/app/src/main/res/layout/activity_main_tab.xml b/app/src/main/res/layout/activity_main_tab.xml
index d843c6c..51ccab3 100644
--- a/app/src/main/res/layout/activity_main_tab.xml
+++ b/app/src/main/res/layout/activity_main_tab.xml
@@ -1,157 +1,157 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-
-
-        tools:context=".MainTabActivity">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-
-            android:layout_height="match_parent">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <FrameLayout
-                    android:id="@+id/mycontent"
-
-                    android:layout_width="match_parent"
-
-                    android:layout_height="match_parent" />
-            </LinearLayout>
-        </RelativeLayout>
-
-        <LinearLayout
-            android:id="@+id/rl_bottom"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:orientation="vertical"
-            android:visibility="visible">
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="10dip"
-                android:layout_alignTop="@+id/radioGroup"
-                android:background="@drawable/background_grey_line"
-                android:visibility="gone" />
-
-            <LinearLayout
-                android:id="@+id/radioGroup"
-                android:layout_width="match_parent"
-                android:layout_height="50dip"
-
-                android:background="@color/white"
-                android:orientation="horizontal"
-                android:paddingTop="7dip">
-
-                <RadioButton
-                    android:id="@+id/button"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:button="@null"
-                    android:checked="true"
-                    android:drawableTop="@drawable/main_bottom_0"
-                    android:gravity="center"
-                    android:text="@string/news"
-                    android:textColor="@color/radiobuttoncolor" />
-
-
-
-                <RadioButton
-                    android:id="@+id/button1"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:button="@null"
-                    android:drawableTop="@drawable/main_bottom_1"
-                    android:gravity="center"
-                    android:text="邻里圈"
-                    android:textColor="@color/radiobuttoncolor" />
-                <RelativeLayout
-                    android:id="@+id/rl2"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-                    <RadioButton
-                        android:clickable="false"
-                        android:id="@+id/button2"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:button="@null"
-                        android:layout_centerHorizontal="true"
-                        android:drawableTop="@drawable/main_bottom_3"
-                        android:gravity="center"
-                        android:text="消息"
-                        android:textColor="@color/radiobuttoncolor" />
-
-                    <TextView
-                        android:gravity="center"
-                        android:id="@+id/redview"
-                        android:visibility="gone"
-                        android:layout_width="12dp"
-                        android:textSize="6dp"
-                        android:layout_height="12dp"
-                        android:textColor="@color/white"
-                        android:layout_marginLeft="-8dp"
-                        android:layout_toRightOf="@id/button2"
-                        android:background="@drawable/circle_red" />
-                </RelativeLayout>
-                <RadioButton
-                    android:id="@+id/like"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:button="@null"
-                    android:drawableTop="@drawable/main_bottom_like"
-                    android:gravity="center"
-                    android:text="点赞"
-                    android:textColor="@color/radiobuttoncolor"
-                    android:visibility="gone" />
-
-                <RadioButton
-                    android:id="@+id/button3"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:button="@null"
-                    android:drawableTop="@drawable/main_bottom_2"
-                    android:gravity="center"
-                    android:text="购物车"
-                    android:textColor="@color/radiobuttoncolor"
-                    android:visibility="gone" />
-                <!--
-                                <RadioButton
-                                    android:id="@+id/button2"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="match_parent"
-                                    android:layout_weight="1"
-                                    android:button="@null"
-                                    android:drawableTop="@drawable/main_bottom_3"
-                                    android:gravity="center"
-                                    android:text="@string/news3"
-                                    android:textColor="@color/radiobuttoncolor"
-                                    android:visibility="gone" />-->
-
-                <RadioButton
-                    android:id="@+id/button4"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:button="@null"
-                    android:drawableTop="@drawable/main_bottom_4"
-                    android:gravity="center"
-                    android:text="@string/news4"
-                    android:textColor="@color/radiobuttoncolor" />
-            </LinearLayout>
-        </LinearLayout>
-
-    </RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+
+
+        tools:context=".MainTabActivity">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+
+            android:layout_height="match_parent">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <FrameLayout
+                    android:id="@+id/mycontent"
+
+                    android:layout_width="match_parent"
+
+                    android:layout_height="match_parent" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <LinearLayout
+            android:id="@+id/rl_bottom"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:orientation="vertical"
+            android:visibility="visible">
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="10dip"
+                android:layout_alignTop="@+id/radioGroup"
+                android:background="@drawable/background_grey_line"
+                android:visibility="gone" />
+
+            <LinearLayout
+                android:id="@+id/radioGroup"
+                android:layout_width="match_parent"
+                android:layout_height="50dip"
+
+                android:background="@color/white"
+                android:orientation="horizontal"
+                android:paddingTop="7dip">
+
+                <RadioButton
+                    android:id="@+id/button"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:button="@null"
+                    android:checked="true"
+                    android:drawableTop="@drawable/main_bottom_0"
+                    android:gravity="center"
+                    android:text="@string/news"
+                    android:textColor="@color/radiobuttoncolor" />
+
+
+
+                <RadioButton
+                    android:id="@+id/button1"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:button="@null"
+                    android:drawableTop="@drawable/main_bottom_1"
+                    android:gravity="center"
+                    android:text="邻里圈"
+                    android:textColor="@color/radiobuttoncolor" />
+                <RelativeLayout
+                    android:id="@+id/rl2"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1">
+                    <RadioButton
+                        android:clickable="false"
+                        android:id="@+id/button2"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:button="@null"
+                        android:layout_centerHorizontal="true"
+                        android:drawableTop="@drawable/main_bottom_3"
+                        android:gravity="center"
+                        android:text="消息"
+                        android:textColor="@color/radiobuttoncolor" />
+
+                    <TextView
+                        android:gravity="center"
+                        android:id="@+id/redview"
+                        android:visibility="gone"
+                        android:layout_width="12dp"
+                        android:textSize="6dp"
+                        android:layout_height="12dp"
+                        android:textColor="@color/white"
+                        android:layout_marginLeft="-8dp"
+                        android:layout_toRightOf="@id/button2"
+                        android:background="@drawable/circle_red" />
+                </RelativeLayout>
+                <RadioButton
+                    android:id="@+id/like"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:button="@null"
+                    android:drawableTop="@drawable/main_bottom_like"
+                    android:gravity="center"
+                    android:text="点赞"
+                    android:textColor="@color/radiobuttoncolor"
+                    android:visibility="gone" />
+
+                <RadioButton
+                    android:id="@+id/button3"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:button="@null"
+                    android:drawableTop="@drawable/main_bottom_2"
+                    android:gravity="center"
+                    android:text="购物车"
+                    android:textColor="@color/radiobuttoncolor"
+                    android:visibility="gone" />
+                <!--
+                                <RadioButton
+                                    android:id="@+id/button2"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="match_parent"
+                                    android:layout_weight="1"
+                                    android:button="@null"
+                                    android:drawableTop="@drawable/main_bottom_3"
+                                    android:gravity="center"
+                                    android:text="@string/news3"
+                                    android:textColor="@color/radiobuttoncolor"
+                                    android:visibility="gone" />-->
+
+                <RadioButton
+                    android:id="@+id/button4"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:button="@null"
+                    android:drawableTop="@drawable/main_bottom_4"
+                    android:gravity="center"
+                    android:text="@string/news4"
+                    android:textColor="@color/radiobuttoncolor" />
+            </LinearLayout>
+        </LinearLayout>
+
+    </RelativeLayout>
 </layout>
\ No newline at end of file