瀏覽代碼

1.新增 版本更新按钮,
2.新增 用户协议内容
3.修复订单列表 报名列表 地址错误BUG

ZhangXinYu 6 年之前
父節點
當前提交
9d6c343f6b

File diff suppressed because it is too large
+ 254 - 0
app/src/main/assets/tips.html


File diff suppressed because it is too large
+ 26 - 172
app/src/main/java/com/webrain/happywork/ui/activity/TipsActivity.java


+ 1 - 1
app/src/main/java/com/webrain/happywork/ui/adapter/listview/MineApplyListAdapter.java

@@ -81,7 +81,7 @@ public class MineApplyListAdapter extends BaseListAdapter<EnrollmentBean, MineAp
                 tvPrice.setText(obj.getHwRequirement() != null && TextUtils.isEmpty(obj.getHwRequirement().getPrice()) ? "" : (obj.getHwRequirement().getPrice() + "元"));
                 tvStage.setText(obj.getHwRequirement() == null ? "" : obj.getHwRequirement().getSettlementMethod() == AppConstant.SETTLEMENT_METHOD_ONCE ? "*1次" : ("*" + obj.getHwRequirement().getStage() + "期"));
                 tvCompany.setText(TextUtils.isEmpty(obj.getCompanyName()) ? "" : obj.getCompanyName());
-                tvAddress.setText(obj.getHwPlatformCompany() != null && TextUtils.isEmpty(obj.getHwPlatformCompany().getProvinceCityCountry()) ? "" : obj.getHwPlatformCompany().getProvinceCityCountry());
+                tvAddress.setText(obj.getHwRequirement() != null && TextUtils.isEmpty(obj.getHwRequirement().getProvinceCityCountry()) ? "" : obj.getHwRequirement().getProvinceCityCountry());
 
                 if (obj.getHwRequirement() != null && obj.getHwRequirement().getIsOn() == 0) {
                     tvState.setTextColor(mContext.getResources().getColorStateList(R.color.text_gray_88));

+ 1 - 1
app/src/main/java/com/webrain/happywork/ui/adapter/listview/MineOrderListAdapter.java

@@ -86,7 +86,7 @@ public class MineOrderListAdapter extends BaseListAdapter<OrderBean, MineOrderLi
                 tvPrice.setText(obj.getHwRequirement() != null && TextUtils.isEmpty(obj.getHwRequirement().getPrice()) ? "" : (obj.getHwRequirement().getPrice() + "元"));
                 tvStage.setText(obj.getHwRequirement() == null ? "" : obj.getHwRequirement().getSettlementMethod() == AppConstant.SETTLEMENT_METHOD_ONCE ? "*1次" : ("*" + obj.getHwRequirement().getStage() + "期"));
 
-                tvAddress.setText(obj.getHwPlatformCompany() != null && TextUtils.isEmpty(obj.getHwPlatformCompany().getProvinceCityCountry()) ? "" : obj.getHwPlatformCompany().getProvinceCityCountry());
+                tvAddress.setText(obj.getHwRequirement() != null && TextUtils.isEmpty(obj.getHwRequirement().getProvinceCityCountry()) ? "" : obj.getHwRequirement().getProvinceCityCountry());
 
                 tvName.setTextColor(mContext.getResources().getColorStateList(R.color.text_black));
                 tvPrice.setTextColor(mContext.getResources().getColorStateList(R.color.text_blue_32));

+ 31 - 0
app/src/main/res/layout/activity_mine_center.xml

@@ -181,6 +181,37 @@
                 android:background="@mipmap/ic_right_gray" />
         </LinearLayout>
 
+        <LinearLayout
+            android:id="@+id/ll_version"
+            android:layout_width="match_parent"
+            android:layout_height="71dp"
+            android:layout_marginTop="10dp"
+            android:background="@color/white"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingLeft="20dp"
+            android:paddingRight="20dp">
+
+            <View
+                android:layout_width="33dp"
+                android:layout_height="33dp"
+                android:background="@mipmap/ic_mine_version" />
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="14dp"
+                android:layout_weight="1"
+                android:text="@string/mine_version"
+                android:textColor="@color/text_black"
+                android:textSize="@dimen/px39_13sp" />
+
+            <View
+                android:layout_width="9dp"
+                android:layout_height="14dp"
+                android:background="@mipmap/ic_right_gray" />
+        </LinearLayout>
+
         <TextView
             android:id="@+id/tv_logout"
             android:layout_width="match_parent"

+ 3 - 14
app/src/main/res/layout/activity_tips.xml

@@ -5,21 +5,10 @@
     android:orientation="vertical">
 
 
-    <ScrollView
+    <WebView
+        android:id="@+id/wv"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <TextView
-            android:id="@+id/tv_tips"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:lineSpacingExtra="8dp"
-            android:paddingLeft="15dp"
-            android:paddingRight="15dp"
-            android:textColor="@color/text_black"
-            android:textSize="@dimen/px39_13sp" />
-    </ScrollView>
+        android:layout_height="match_parent" />
 
 
 </LinearLayout>

二進制
app/src/main/res/mipmap-hdpi/ic_mine_version.png


二進制
app/src/main/res/mipmap-xhdpi/ic_mine_version.png


二進制
app/src/main/res/mipmap-xxhdpi/ic_mine_version.png


二進制
app/src/main/res/mipmap-xxxhdpi/ic_mine_version.png


+ 2 - 1
app/src/main/res/values/strings.xml

@@ -31,7 +31,7 @@
     <string name="exit_app">再按一次退出</string>
     <string name="wait_a_moment">稍后再说</string>
     <string name="update_now">立刻升级</string>
-    <string name="user_tips">开心工用户协议</string>
+    <string name="user_tips">开心工用户协议</string>
 
     <string name="demand_need_apply">我要报名</string>
     <string name="demand_detail">需求详情</string>
@@ -70,6 +70,7 @@
     <string name="mine_record_account">收款账号</string>
     <string name="mine_record_date">收款时间</string>
     <string name="mine_tax">完税证明</string>
+    <string name="mine_version">版本信息</string>
     <string name="mine_empty_none">空空如也</string>
     <string name="mine_empty_apply">您目前没有需要发布人确认的报名</string>
     <string name="mine_empty_order">您目前没有正在进行中的订单</string>