Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -579,7 +579,6 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         // 设置好参数之后再show
         popupWindow.showAtLocation(contentView, Gravity.CENTER, 0, 0);
         setbg(0.4f);
-
         contentView.findViewById(R.id.scoring_now_tv).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/DetailTaskActivity.java

@@ -211,13 +211,12 @@ public class DetailTaskActivity extends BaseActivity implements OnClickListener
         tv_task_status.setText(intent.getStringExtra("status") == null ? getString(R.string.common_noinput) : intent.getStringExtra("status"));
         tv_task_duration.setText(intent.getStringExtra("duration") == null ? getString(R.string.common_noinput) : intent.getStringExtra("duration"));
         tv_task_describe
-                .setText(intent.getStringExtra("description") == null ? getString(R.string.common_noinput) : intent.getStringExtra("description"));
-        tv_task_starttime
-                .setText(intent.getStringExtra("tasktime") == null ? getString(R.string.common_noinput) : intent.getStringExtra("tasktime"));
+                .setText(intent.getStringExtra("description") == null ? getString(R.string.common_noinput) :intent.getStringExtra("description"));
+        tv_task_starttime.setText(intent.getStringExtra("tasktime") == null ? getString(R.string.common_noinput) :
+                TimeUtils.long2str(TimeUtils.f_str_2_long(intent.getStringExtra("tasktime")), "yyyy-MM-dd HH:mm"));
         taskId = intent.getStringExtra("taskid");
-        tv_task_endtime.
-                setText(intent.getStringExtra("endtime") == null ? getString(R.string.common_noinput) :
-                        TimeUtils.long2str(TimeUtils.f_str_2_long(intent.getStringExtra("endtime")), "yyyy-MM-dd HH:mm"));
+        tv_task_endtime.setText(intent.getStringExtra("endtime") == null ? getString(R.string.common_noinput) :
+                TimeUtils.long2str(TimeUtils.f_str_2_long(intent.getStringExtra("endtime")), "yyyy-MM-dd HH:mm"));
         String ra_taskid = intent.getStringExtra("ra_taskid");
         // String taskcode=intent.getStringExtra("taskcode");
         String attachs = intent.getStringExtra("attachs");

WeiChat/src/main/res/layout/layout_menu_scoring.xml

@@ -7,16 +7,20 @@
     android:background="@drawable/pop_round_bg">
     <TextView
         android:layout_width="match_parent"
-        android:layout_height="45dp"
+        android:layout_height="0dp"
+        android:minHeight="45dp"
+        android:layout_weight="2"
         android:gravity="center"
         android:text="为UU评分"
         android:textColor="@color/black"
         android:textSize="15sp"/>
     <TextView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
+        android:layout_weight="3"
+        android:minHeight="70dp"
         android:gravity="center"
-        android:text="如果您觉得UU很好用，可否为其评一个分数？只需要花费您很少的时间的，感谢您的支持!"
+        android:text="请您为UU评一个分数吧，只需要花费您很少的时间，感谢您的支持!"
         android:textColor="@color/black"
         android:textSize="15sp"
         android:paddingBottom="5dp"
@@ -29,8 +33,10 @@
     <TextView
         android:id="@+id/scoring_now_tv"
         android:layout_width="match_parent"
-        android:layout_height="45dp"
+        android:layout_height="0dp"
+        android:layout_weight="2"
         android:gravity="center"
+        android:minHeight="45dp"
         android:text="现在去评分"
         android:textColor="@color/blue"
         android:textSize="15sp"/>
@@ -41,9 +47,11 @@
     <TextView
         android:id="@+id/complaints_tv"
         android:layout_width="match_parent"
-        android:layout_height="45dp"
+        android:layout_height="0dp"
+        android:layout_weight="2"
         android:gravity="center"
-        android:text="我要吐槽"
+        android:text="建议反馈"
+        android:minHeight="45dp"
         android:textColor="@color/blue"
         android:textSize="15sp"/>
 
@@ -54,10 +62,12 @@
     <TextView
         android:id="@+id/no_thanking_tv"
         android:layout_width="match_parent"
-        android:layout_height="45dp"
+        android:layout_height="0dp"
+        android:layout_weight="2"
         android:gravity="center"
         android:textColor="@color/blue"
-        android:text="不了，谢谢"
+        android:text="下次再说"
+        android:minHeight="45dp"
         android:textSize="15sp"/>
 
 </LinearLayout>