Merge branch 'master' of http://10.8.230.114:3000/kemllor/small_sheep_android

# Conflicts:
#	.gitignore

.gitignore

@@ -7,3 +7,4 @@
 /build
 /captures
 .externalNativeBuild
+/.idea

.idea/modules.xml

@@ -2,11 +2,12 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/SamllSheepPlugin.iml" filepath="$PROJECT_DIR$/SamllSheepPlugin.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://D:\Dlg\AndroidStudioProjects\small_sheep_android\.idea\modules\app\app.iml" filepath="D:\Dlg\AndroidStudioProjects\small_sheep_android\.idea\modules\app\app.iml" />
-      <module fileurl="file://D:\Dlg\AndroidStudioProjects\small_sheep_android\app\app.iml" filepath="D:\Dlg\AndroidStudioProjects\small_sheep_android\app\app.iml" />
+      <module fileurl="file://D:/Dlg/AndroidStudioProjects/small_sheep_android/.idea/modules/app/app.iml" filepath="D:/Dlg/AndroidStudioProjects/small_sheep_android/.idea/modules/app/app.iml" />
+      <module fileurl="file://D:/Dlg/AndroidStudioProjects/small_sheep_android/app/app.iml" filepath="D:/Dlg/AndroidStudioProjects/small_sheep_android/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/small_sheep_android.iml" filepath="$PROJECT_DIR$/small_sheep_android.iml" />
-      <module fileurl="file://D:\Dlg\AndroidStudioProjects\small_sheep_android\small_sheep_android.iml" filepath="D:\Dlg\AndroidStudioProjects\small_sheep_android\small_sheep_android.iml" />
+      <module fileurl="file://D:/Dlg/AndroidStudioProjects/small_sheep_android/small_sheep_android.iml" filepath="D:/Dlg/AndroidStudioProjects/small_sheep_android/small_sheep_android.iml" />
     </modules>
   </component>
 </project>

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

@@ -108,7 +108,7 @@ public class LoginActivity extends BaseActivity {
         req.state = "small_sheep_auther";
         SheepApp.mWxapi.sendReq(req);*/
 
-        SpUtils.login(this, "abcabc");
+        SpUtils.login(this, "4ff3898049503dfb7ca61da4dc31cc91");
     }
 
 

app/src/main/res/drawable/texe_background_normal.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <corners android:radius="3dp"/>
+    <corners android:radius="100dp"/>
     <stroke
         android:width="1dp"
         android:color="@color/theme"/>

app/src/main/res/drawable/texe_background_selected.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <corners android:radius="3dp"/>
+    <corners android:radius="100dp"/>
 
     <solid android:color="@color/theme"/>
 

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

@@ -52,15 +52,16 @@
 
     <TextView
         android:id="@+id/tv_wx"
-        android:layout_width="200dp"
+        android:layout_width="match_parent"
         android:layout_height="35dp"
         android:layout_gravity="center"
-        android:layout_marginLeft="5dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
         android:layout_marginTop="100dp"
         android:background="@drawable/text_backgroud"
         android:gravity="center"
         android:text="绑定微信"
-        android:textColor="@drawable/text_color"
+        android:textColor="@color/black_dark"
         android:textSize="16sp"/>
 
 </LinearLayout>