小绵羊3.3--任务审核优化、新功能介绍调整、意见反馈、字符与空格优化

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

@@ -23,7 +23,6 @@ import rx.functions.Action1;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_CLEAN;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_CLEAN_SURE;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_UPGRADE;
 
 /**
  * Created by realicing on 2018/04/.
@@ -56,12 +55,15 @@ public class ActSetting extends BaseActivity {
         initCacheSize();
     }
 
-    @OnClick({R.id.abourt_us_layout, R.id.clear_layout, R.id.tv_submit})
+    @OnClick({R.id.abourt_us_layout, R.id.clear_layout, R.id.tv_submit, R.id.change_layout})
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.abourt_us_layout://关于我们
                 Jump2View.getInstance().goNewAboutUs(activity);
                 break;
+            case R.id.change_layout://新功能介绍
+                Jump2View.getInstance().goVersionChange(activity, ApkUtils.getCurrentPkgVersionName(SheepApp.getInstance()));
+                break;
             case R.id.clear_layout://清除缓存
                 ViewUtil.showMsgDialog(activity, new DialogConfig().setTitle("清除缓存").setMsg("所有本地的缓存都会被清理").setBtnRightText("取消")
                         .setBtnLeftText("确定").setBtnLeftOnClickListener(new View.OnClickListener() {

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

@@ -1,6 +1,5 @@
 package com.sheep.gamegroup.view.activity;
 
-import android.os.Bundle;
 import android.support.design.widget.TextInputEditText;
 
 import com.alibaba.fastjson.JSONObject;
@@ -43,7 +42,6 @@ public class FeedbackAct extends BaseActivity {
 
     @Override
     public void initView() {
-
         TitleBarUtils.getInstance()
                 .setTitle(this, "意见反馈")
                 .setTitleFinish(this);
@@ -59,13 +57,6 @@ public class FeedbackAct extends BaseActivity {
 
     }
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        // TODO: add setContentView(...) invocation
-//        this.bind = ButterKnife.bind(this);
-    }
-
     @OnClick(R.id.tv_submit)
     public void onViewClicked() {
         USER_FEEDBACK_COMMIT.onEvent();
@@ -89,12 +80,12 @@ public class FeedbackAct extends BaseActivity {
                 .subscribe(new SheepSubscriber<BaseMessage>(this) {
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        G.showToast(baseMessage.getMsg() + "");
+                        G.showToast(baseMessage);
                     }
 
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        G.showToast(baseMessage.getMsg() + "");
+                        G.showToast(baseMessage);
                         finish();
                     }
                 });

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtPersonalCenter.java

@@ -306,8 +306,8 @@ public class FgtPersonalCenter extends BaseFragment {
 
     @OnClick({R.id.icon_img_iv, R.id.account_detail_layout, R.id.personalcenter_price_layout,
             R.id.account_task_layout, R.id.proxy_service_layout, R.id.feedbook_layout,
-            R.id.recommend_friend_layout, R.id.faq_layout, R.id.reservation_layout, R.id.version_layout,
-            R.id.change_layout, R.id.order_layout, R.id.proxy_game_account_layout,
+            R.id.recommend_friend_layout, R.id.faq_layout, R.id.reservation_layout,
+            R.id.version_layout, R.id.order_layout, R.id.proxy_game_account_layout,
             R.id.iv_redpackage, R.id.ibtn_baseactivity_message
     })
     public void onViewClicked(View view) {
@@ -375,9 +375,6 @@ public class FgtPersonalCenter extends BaseFragment {
                 SysAppUtil.showVersionInfo(activity, null);
                 USER_UPGRADE.onEvent();
                 break;
-            case R.id.change_layout://新功能介绍
-                Jump2View.getInstance().goVersionChange(activity, ApkUtils.getCurrentPkgVersionName(SheepApp.getInstance()));
-                break;
             case R.id.order_layout://订单管理
                 Jump2View.getInstance().goGameTaskOrderList(activity);
                 break;

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

@@ -32,6 +32,20 @@
         <View style="@style/style_item_line" />
 
         <LinearLayout
+            android:id="@+id/change_layout"
+            style="@style/style_item_container">
+
+            <TextView
+                style="@style/style_item_label"
+                android:text="新版本介绍" />
+
+            <TextView style="@style/style_item_end_next" />
+
+        </LinearLayout>
+
+        <View style="@style/style_item_line" />
+
+        <LinearLayout
             android:id="@+id/clear_layout"
             style="@style/style_item_container">
 
@@ -47,7 +61,6 @@
         </LinearLayout>
     </LinearLayout>
 
-
     <TextView
         android:id="@+id/tv_submit"
         style="@style/style_button"

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

@@ -113,22 +113,4 @@
 
     </LinearLayout>
 
-    <View style="@style/style_item_line_new" />
-
-    <LinearLayout
-        android:id="@+id/change_layout"
-        style="@style/style_item_container">
-
-        <ImageView
-            style="@style/style_item_img"
-            android:src="@mipmap/personalc_ic_change" />
-
-        <TextView
-            style="@style/style_item_label"
-            android:text="新版本介绍" />
-
-        <TextView style="@style/style_item_end_next" />
-
-    </LinearLayout>
-
 </LinearLayout>

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

@@ -2,125 +2,121 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="@dimen/content_padding_10"
-    android:paddingBottom="@dimen/content_padding_10">
+    android:paddingTop="@dimen/content_padding_15">
 
     <ImageView
         android:id="@+id/icon_iv"
         android:layout_width="@dimen/view_size_60"
         android:layout_height="@dimen/view_size_60"
-        android:src="@mipmap/icon"
-        android:layout_centerVertical="true"/>
-    <LinearLayout
-        android:id="@+id/content_tv"
-        android:layout_width="match_parent"
+        android:layout_centerVertical="true"
+        android:layout_marginBottom="@dimen/content_padding_15"
+        android:src="@mipmap/icon" />
+
+    <RelativeLayout
+        android:id="@+id/task_list_item_end"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_toRightOf="@+id/icon_iv"
+        android:layout_alignParentEnd="true"
+        android:layout_marginBottom="@dimen/content_padding_15"
         android:layout_centerVertical="true"
-        android:layout_marginLeft="@dimen/content_padding">
-        <RelativeLayout
-            android:id="@+id/name_date_layout"
-            android:layout_width="0dp"
-            android:layout_weight="1"
+        android:layout_gravity="center_vertical">
+
+        <TextView
+            android:id="@+id/price_tv"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical">
-            <TextView
-                android:id="@+id/name_tv"
-                style="@style/nomal_txt_style"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="完成试玩任务无敌大航"
-                android:lines="2"
-                android:ellipsize="end"
-                android:layout_marginTop="@dimen/content_padding_small"/>
+            android:layout_centerHorizontal="true"
+            android:text="+1.5元"
+            android:textColor="@color/txt_red"
+            android:textSize="@dimen/text_size_15" />
 
+        <TextView
+            android:id="@+id/detail_task_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/price_tv"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="@dimen/content_padding_small"
+            android:gravity="center"
+            android:minWidth="@dimen/view_size_73"
+            android:padding="@dimen/content_padding_3"
+            android:text="任务截图"
+            android:textColor="@color/black_444444"
+            android:textSize="@dimen/text_size_12"
+            android:visibility="visible" />
+    </RelativeLayout>
 
-            <LinearLayout
-                android:id="@+id/tag_layout"
-                android:layout_below="@+id/name_tv"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
+    <LinearLayout
+        android:id="@+id/name_date_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginEnd="@dimen/content_padding"
+        android:layout_marginStart="@dimen/content_padding_12"
+        android:layout_toEndOf="@+id/icon_iv"
+        android:layout_toStartOf="@+id/task_list_item_end"
+        android:orientation="vertical">
 
-                <TextView
-                    android:id="@+id/item_num_tv"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text=""
-                    android:textColor="#cc8e8e8e"
-                    android:textSize="10sp" />
+        <TextView
+            android:id="@+id/name_tv"
+            style="@style/nomal_txt_style"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="2"
+            android:text="完成试玩任务无敌大航" />
+
+        <LinearLayout
+            android:id="@+id/tag_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
 
-                <TextView
-                    android:id="@+id/item_num_tv1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/content_padding"
-                    android:text=""
-                    android:textColor="#cc8e8e8e"
-                    android:textSize="10sp"
-                    android:visibility="gone" />
-                <TextView
-                    android:id="@+id/item_num_tv2"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/content_padding"
-                    android:text=""
-                    android:textColor="#cc8e8e8e"
-                    android:textSize="10sp"
-                    android:visibility="gone" />
-            </LinearLayout>
             <TextView
-                android:id="@+id/date_tv"
+                android:id="@+id/item_num_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="2018/02/14 14:41"
-                android:layout_below="@+id/tag_layout"
-                android:textSize="@dimen/text_size_2"
-                android:textColor="@color/txt_black_818181"
-                android:layout_marginBottom="@dimen/content_padding_small"/>
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/content_padding"
-            android:layout_gravity="center_vertical">
+                android:text=""
+                android:textColor="#cc8e8e8e"
+                android:textSize="10sp" />
 
             <TextView
-                android:id="@+id/price_tv"
+                android:id="@+id/item_num_tv1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="+1.5元"
-                android:textColor="@color/txt_red"
-                android:textSize="@dimen/text_size_15"
-                android:layout_centerHorizontal="true"/>
+                android:layout_marginStart="@dimen/content_padding"
+                android:text=""
+                android:textColor="#cc8e8e8e"
+                android:textSize="10sp"
+                android:visibility="gone" />
+
             <TextView
-                android:id="@+id/detail_task_tv"
+                android:id="@+id/item_num_tv2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="任务截图"
-                android:minWidth="@dimen/view_size_73"
-                android:textColor="@color/black_444444"
-                android:textSize="@dimen/text_size_12"
-                android:gravity="center"
-                android:padding="@dimen/content_padding_3"
-                android:layout_below="@+id/price_tv"
-                android:layout_centerHorizontal="true"
-                android:layout_marginTop="@dimen/content_padding_small"
-                android:visibility="visible"/>
-        </RelativeLayout>
+                android:layout_marginStart="@dimen/content_padding"
+                android:text=""
+                android:textColor="#cc8e8e8e"
+                android:textSize="10sp"
+                android:visibility="gone" />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/date_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="2018/02/14 14:41"
+            android:textColor="@color/txt_black_818181"
+            android:textSize="@dimen/text_size_2" />
     </LinearLayout>
 
     <TextView
         android:id="@+id/desc_tv"
-        android:layout_marginTop="@dimen/content_padding_10"
-        android:layout_below="@+id/icon_iv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
         android:text=""
-        android:textSize="@dimen/text_size_2"
         android:textColor="@color/txt_black_818181"
-        android:visibility="gone"/>
+        android:textSize="8sp"
+        android:visibility="gone" />
 </RelativeLayout>