修复关于我们中的显示问题

app/src/main/java/com/sheep/gamegroup/util/LogUtil.java

@@ -12,4 +12,8 @@ public class LogUtil {
         if(BuildConfig.DEBUG || SheepApp.getInstance().connectAddress != ConnectAddress.sheep)
             System.out.println(msg);
     }
+    public static void println(String tag, String msg) {
+        if(BuildConfig.DEBUG || SheepApp.getInstance().connectAddress != ConnectAddress.sheep)
+            System.out.println(tag+" "+msg);
+    }
 }

app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java

@@ -243,8 +243,14 @@ public class ViewUtil {
     }
 
     public static void setH5Text(TextView textView, String content) {
-        textView.setText(Html.fromHtml(content));
-        textView.setMovementMethod(new ScrollingMovementMethod());
+        if(textView != null) {
+            if(TextUtils.isEmpty(content)){
+                textView.setText("");
+                return;
+            }
+            textView.setText(Html.fromHtml(content));
+            textView.setMovementMethod(new ScrollingMovementMethod());
+        }
     }
 
     public static void loadDataWithBaseURL(WebView webView, String content) {

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

@@ -107,12 +107,14 @@ public class ActNewAboutUs extends BaseActivity {
     TextView about_us_email_tv;//商务合作--邮箱
     @BindView(R.id.about_us_other_tv)
     TextView about_us_other_tv;//公司简介--内容
+    @BindView(R.id.about_us_other_wv)
+    WebView about_us_other_wv;//公司简介--内容
     private void loadData(NewAboutUs newAboutUs) {
         ViewUtil.setText(about_us_qq_back_tv, newAboutUs.getComplaintQq());
-        ViewUtil.setH5Text(about_us_other_tv, newAboutUs.getContent());
+        ViewUtil.setH5Text(about_us_other_tv, about_us_other_wv, newAboutUs.getContent());
         ViewUtil.setText(about_us_qq_tv, newAboutUs.getCooperationQq());
         ViewUtil.setText(about_us_email_tv, newAboutUs.getMailbox());
-        ViewUtil.setText(about_us_addr_tv, newAboutUs.getTitle());
+        ViewUtil.setText(about_us_addr_tv, newAboutUs.getOfficialAddress());
         ViewUtil.setText(about_us_platform_tv, newAboutUs.getWechatPlatform());
     }
     private void resetData() {

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

@@ -102,12 +102,14 @@
                     style="@style/style_about_us_label"
                     android:layout_alignParentEnd="true"
                     android:layout_alignParentTop="true"
-                    android:text="天府四街" />
+                    android:layout_toEndOf="@+id/about_us_addr_label_tv"
+                    android:gravity="end"
+                    android:text="天府四街天府四街天府四街天府四街天府四街天府四街天府四街天府四街" />
 
                 <View
                     android:id="@+id/about_us_line_1"
                     style="@style/style_about_us_line"
-                    android:layout_below="@+id/about_us_addr_label_tv" />
+                    android:layout_below="@+id/about_us_addr_tv" />
 
                 <TextView
                     android:id="@+id/about_us_platform_label_tv"
@@ -121,6 +123,8 @@
                     style="@style/style_about_us_label"
                     android:layout_alignParentEnd="true"
                     android:layout_below="@id/about_us_line_1"
+                    android:layout_toEndOf="@+id/about_us_platform_label_tv"
+                    android:gravity="end"
                     android:text="好玩之家" />
             </RelativeLayout>
 
@@ -131,6 +135,7 @@
             <RelativeLayout style="@style/style_about_us_rl">
 
                 <TextView
+                    android:id="@+id/about_us_qq_back_label_tv"
                     style="@style/style_about_us_label"
                     android:layout_alignParentStart="true"
                     android:layout_alignParentTop="true"
@@ -141,6 +146,8 @@
                     style="@style/style_about_us_label"
                     android:layout_alignParentEnd="true"
                     android:layout_alignParentTop="true"
+                    android:layout_toEndOf="@+id/about_us_qq_back_label_tv"
+                    android:gravity="end"
                     android:text="13888888888" />
             </RelativeLayout>
 
@@ -162,12 +169,14 @@
                     style="@style/style_about_us_label"
                     android:layout_alignParentEnd="true"
                     android:layout_alignParentTop="true"
+                    android:layout_toEndOf="@+id/about_us_qq_label_tv"
+                    android:gravity="end"
                     android:text="88888888" />
 
                 <View
                     android:id="@+id/about_us_line_2"
                     style="@style/style_about_us_line"
-                    android:layout_below="@+id/about_us_qq_label_tv" />
+                    android:layout_below="@+id/about_us_qq_tv" />
 
                 <TextView
                     android:id="@+id/about_us_email_label_tv"
@@ -181,6 +190,8 @@
                     style="@style/style_about_us_label"
                     android:layout_alignParentEnd="true"
                     android:layout_below="@id/about_us_line_2"
+                    android:layout_toEndOf="@+id/about_us_email_label_tv"
+                    android:gravity="end"
                     android:text="88888888@qq.com" />
             </RelativeLayout>
 
@@ -197,6 +208,10 @@
                     style="@style/style_about_us_label"
                     android:layout_width="match_parent"
                     android:text="公司简介" />
+                <WebView
+                    android:id="@+id/about_us_other_wv"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
             </RelativeLayout>
         </LinearLayout>
     </ScrollView>