Merge remote-tracking branch 'origin/sheep2.0' into sheep2.0

app/src/main/java/com/sheep/gamegroup/model/util/SheepSubscriber.java

@@ -10,6 +10,7 @@ import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.NetUtil;
 import com.sheep.gamegroup.util.ViewUtil;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import rx.Subscriber;
 
@@ -30,6 +31,8 @@ public abstract class SheepSubscriber<T> extends Subscriber<T> {
         super.onStart();
         Log.i("tag","MySubscriber.onStart()");
         //接下来可以检查网络连接等操作
+        if(context == null)
+            context = SheepApp.mContext;
         if (!NetUtil.isConnected(context)) {
 
             Toast.makeText(context, "当前网络不可用，请检查网络情况", Toast.LENGTH_SHORT).show();

app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java

@@ -253,8 +253,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 
         Glide.with(SheepApp.mContext)
                 .load(taskEty.getIcon())
-                .apply(new RequestOptions().placeholder(R.drawable.icon)
-                        .dontAnimate())
+                .apply(new RequestOptions().placeholder(R.drawable.icon))
                 .into(iconIv);
 
 

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

@@ -7,8 +7,18 @@
     <item
         android:id="@android:id/secondaryProgress"
         android:drawable="@drawable/xin_empty" />
+
     <item
         android:id="@android:id/progress"
-        android:drawable="@drawable/xin_full" />
-
+        android:drawable="@drawable/xin_full">
+        <shape>
+            <stroke android:width="1dip" android:color="#225786" />
+            <corners android:radius="10dip"/>
+            <padding
+                android:left="@dimen/content_padding_15"
+                android:right="@dimen/content_padding_15"
+                android:top="@dimen/content_padding_15"
+                android:bottom="@dimen/content_padding_15"/>
+        </shape>
+    </item>
 </layer-list>

app/src/main/res/values/dd_styles.xml

@@ -166,7 +166,7 @@
     </style>
     <style name="style_rating_bar" parent="@android:style/Widget.RatingBar">
         <item name="android:progressDrawable">@drawable/lay_list_ratingbar</item>
-        <item name="android:layout_height">14dip</item>
+        <item name="android:layout_height">18dip</item>
     </style>
 
     <style name="W2">