zengjiebin лет назад: 7
Родитель
Сommit
57d9bc60cb

+ 2 - 0
app/src/main/AndroidManifest.xml

@@ -487,6 +487,8 @@
             android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.ActUserLabelList"
             android:screenOrientation="portrait"/>
+        <activity android:name="com.sheep.gamegroup.view.activity.ActNewAboutUs"
+            android:screenOrientation="portrait"/>
     </application>
 
 

+ 0 - 10
app/src/main/java/com/sheep/gamegroup/absBase/BaseActivity.java

@@ -73,16 +73,6 @@ public abstract class BaseActivity extends AppCompatActivity {
         });
 
     }
-    protected   void  showToast(final String msg){
-        this.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                Toast.makeText(BaseActivity.this,msg,Toast.LENGTH_LONG).show();
-            }
-        });
-
-
-    }
 
 
 

+ 3 - 19
app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -42,6 +42,7 @@ import com.sheep.gamegroup.view.activity.ActGuideOnHook;
 import com.sheep.gamegroup.view.activity.ActLoadH5;
 import com.sheep.gamegroup.view.activity.ActMainGame;
 import com.sheep.gamegroup.view.activity.ActMyMoney;
+import com.sheep.gamegroup.view.activity.ActNewAboutUs;
 import com.sheep.gamegroup.view.activity.ActNewbieTaskList;
 import com.sheep.gamegroup.view.activity.ActNotice;
 import com.sheep.gamegroup.view.activity.ActUnderstandSheep;
@@ -1168,24 +1169,7 @@ public class Jump2View {
     }
 
     public void goNewAboutUs(Activity activity) {
-        SheepApp.getInstance().getNetComponent().getApiService().getNewAboutUs()
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
-                            @Override
-                            public void onNext(BaseMessage baseMessage) {
-                                LogUtil.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
-                                NewAboutUs newAboutUs = baseMessage.getData(NewAboutUs.class);
-                                if(newAboutUs != null){
-
-                                }
-                            }
-
-                            @Override
-                            public void onError(BaseMessage baseMessage) {
-                                LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
-                                G.showToast(baseMessage);
-                            }
-                        });
+        Intent intent = new Intent(activity, ActNewAboutUs.class);
+        activity.startActivity(intent);
     }
 }

+ 30 - 0
app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java

@@ -218,6 +218,30 @@ public class ViewUtil {
         return null;
     }
 
+    public static void setH5Text(TextView textView,WebView webView, String content) {
+        if(textView == null || webView == null){
+            return;
+        }
+        if(ViewUtil.isH5Content(content)){
+            webView.loadDataWithBaseURL(null, content, "text/html", "utf-8", null);
+            textView.setVisibility(View.GONE);
+        } else if(content.startsWith("<p>")){
+            ViewUtil.loadDataWithBaseURL(webView, content);
+            textView.setVisibility(View.GONE);
+        } else {
+            webView.setVisibility(View.GONE);
+            String[] items = content.split("\n");
+            StringBuilder stringBuilder = new StringBuilder("\t\t\t\t");
+            for (int i = 0; i < items.length; i++) {
+                if (i != 0)
+                    stringBuilder.append("\n\t\t\t\t");
+                stringBuilder.append(items[i]);
+            }
+            textView.setText(stringBuilder.toString());
+            textView.setMovementMethod(new ScrollingMovementMethod());
+        }
+    }
+
     public static void setH5Text(TextView textView, String content) {
         textView.setText(Html.fromHtml(content));
         textView.setMovementMethod(new ScrollingMovementMethod());
@@ -493,6 +517,12 @@ public class ViewUtil {
         }
     }
 
+    public static void setText(TextView textView) {
+        if(textView != null){
+            textView.setText("");
+        }
+    }
+
     public static void setText(TextView textView, String string) {
         if(textView != null){
             textView.setText(TextUtils.isEmpty(string) ? "" : string);

+ 2 - 2
app/src/main/java/com/sheep/gamegroup/view/activity/AccountAndSecurityAct.java

@@ -191,12 +191,12 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
 
     @Override
     public void NetSuccess(int code, String msg, String s) {
-        showToast(msg);
+        G.showToast(msg);
     }
 
     @Override
     public void NetError(int code, String errorMsg) {
-        showToast(errorMsg);
+        G.showToast(errorMsg);
 
     }
 

+ 127 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/ActNewAboutUs.java

@@ -0,0 +1,127 @@
+package com.sheep.gamegroup.view.activity;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.design.widget.TabLayout;
+import android.support.v4.view.ViewPager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.webkit.WebView;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.kfzs.duanduan.fragment.FgtMyMoney1;
+import com.kfzs.duanduan.fragment.FgtMyMoney2;
+import com.kfzs.duanduan.fragment.FgtMyMoney3;
+import com.kfzs.duanduan.mine.GiftpackListAdapter;
+import com.kfzs.duanduan.utils.StatusBarUtils;
+import com.kfzs.duanduan.utils.dlg.FormatAny;
+import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.NewAboutUs;
+import com.sheep.gamegroup.model.entity.UserAssets;
+import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.LogUtil;
+import com.sheep.gamegroup.util.ViewUtil;
+import com.sheep.jiuyan.samllsheep.BuildConfig;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.G;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
+
+import butterknife.BindView;
+import butterknife.OnClick;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * 关于小绵羊
+ * Created by realicing on 2018/6/11.
+ */
+
+public class ActNewAboutUs extends BaseActivity {
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        StatusBarUtils.setTranslucent(this);
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.act_new_about_us;
+    }
+
+    @Override
+    public void initView() {
+        TitleBarUtils.getInstance()
+                .setTitle(this,"关于小绵羊")
+                .setTitleFinish(this);
+    }
+
+    @Override
+    public void initListener() {
+
+    }
+    @Override
+    public void initData() {
+        showProgress();
+        resetData();
+        SheepApp.getInstance().getNetComponent().getApiService().getNewAboutUs()
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(new SheepSubscriber<BaseMessage>(this) {
+                            @Override
+                            public void onNext(BaseMessage baseMessage) {
+                                LogUtil.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
+                                NewAboutUs newAboutUs = baseMessage.getData(NewAboutUs.class);
+                                if(newAboutUs != null){
+                                    loadData(newAboutUs);
+                                } else {
+                                    resetData();
+                                }
+                                hideProgress();
+                            }
+
+                            @Override
+                            public void onError(BaseMessage baseMessage) {
+                                LogUtil.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
+                                G.showToast(baseMessage);
+                                resetData();
+                                hideProgress();
+                            }
+                        });
+    }
+
+    @BindView(R.id.about_us_addr_tv)
+    TextView about_us_addr_tv;//相关信息--官方地址
+    @BindView(R.id.about_us_platform_tv)
+    TextView about_us_platform_tv;//相关信息--官方微信公众平台
+    @BindView(R.id.about_us_qq_back_tv)
+    TextView about_us_qq_back_tv;//投诉与建议--qq
+    @BindView(R.id.about_us_qq_tv)
+    TextView about_us_qq_tv;//商务合作--QQ
+    @BindView(R.id.about_us_email_tv)
+    TextView about_us_email_tv;//商务合作--邮箱
+    @BindView(R.id.about_us_other_tv)
+    TextView about_us_other_tv;//公司简介--内容
+    private void loadData(NewAboutUs newAboutUs) {
+        ViewUtil.setText(about_us_qq_back_tv, newAboutUs.getComplaintQq());
+        ViewUtil.setH5Text(about_us_other_tv, 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_platform_tv, newAboutUs.getWechatPlatform());
+    }
+    private void resetData() {
+        ViewUtil.setText(about_us_qq_back_tv);
+        ViewUtil.setText(about_us_other_tv);
+        ViewUtil.setText(about_us_qq_tv);
+        ViewUtil.setText(about_us_email_tv);
+        ViewUtil.setText(about_us_addr_tv);
+        ViewUtil.setText(about_us_platform_tv);
+    }
+
+}

+ 1 - 17
app/src/main/java/com/sheep/gamegroup/view/activity/ActNotice.java

@@ -79,23 +79,7 @@ public class ActNotice extends BaseActivity {
         act_notice_title_tv.setText(noticeTitle);
         act_notice_time_tv.setText(time);
 
-        if(ViewUtil.isH5Content(content)){
-            act_notice_content_wb.loadDataWithBaseURL(null, content, "text/html", "utf-8", null);
-        } else if(content.startsWith("<p>")){
-            ViewUtil.loadDataWithBaseURL(act_notice_content_wb, content);
-            act_notice_content_tv.setVisibility(View.GONE);
-        } else {
-            act_notice_content_wb.setVisibility(View.GONE);
-            String[] items = content.split("\n");
-            StringBuilder stringBuilder = new StringBuilder("\t\t\t\t");
-            for (int i = 0; i < items.length; i++) {
-                if (i != 0)
-                    stringBuilder.append("\n\t\t\t\t");
-                stringBuilder.append(items[i]);
-            }
-            act_notice_content_tv.setText(stringBuilder.toString());
-            act_notice_content_tv.setMovementMethod(new ScrollingMovementMethod());
-        }
+        ViewUtil.setH5Text(act_notice_content_tv, act_notice_content_wb, content);
     }
     @OnClick(R.id.act_notice_back_tv)
     public void onViewClicked(View view){

+ 2 - 2
app/src/main/java/com/sheep/gamegroup/view/activity/AskGetMoneyAct.java

@@ -142,7 +142,7 @@ public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener, A
             @Override
             public void onClick(View v) {
                 StringUtils.CopyText(AskGetMoneyAct.this,mEntity.getShare_link());
-                showToast("复制链接成功");
+                G.showToast("复制链接成功");
                 dialog.dismiss();
             }
         });
@@ -179,7 +179,7 @@ public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener, A
     @Override
     public void NetError(int code, String errorMsg) {
         hideProgress();
-        showToast(errorMsg);
+        G.showToast(errorMsg);
 
     }
 

+ 4 - 4
app/src/main/java/com/sheep/gamegroup/view/activity/ChangeTelAct.java

@@ -383,22 +383,22 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
 
     private boolean checkPhoneInput(String etPhone) {
         if (TextUtils.isEmpty(etPhone)) {
-            showToast(getString(R.string.input_your_phone));
+            G.showToast(getString(R.string.input_your_phone));
             return false;
         }
         if (etPhone.length() != 11) {
-            showToast(getString(R.string.toast_warning_phone_number_size));
+            G.showToast(getString(R.string.toast_warning_phone_number_size));
             return false;
         }
         return true;
     }
     private boolean checkCodeInput(String etCode) {
         if (TextUtils.isEmpty(etCode)) {
-            showToast(getString(R.string.input_your_captcha));
+            G.showToast(getString(R.string.input_your_captcha));
             return false;
         }
         if (etCode.length() != 6) {
-            showToast(getString(R.string.toast_warning_phone_captcha_image_code_size));
+            G.showToast(getString(R.string.toast_warning_phone_captcha_image_code_size));
             return false;
         }
         return true;

+ 7 - 6
app/src/main/java/com/sheep/gamegroup/view/activity/LoginAct.java

@@ -15,6 +15,7 @@ import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.umeng.socialize.UMAuthListener;
 import com.umeng.socialize.UMShareAPI;
@@ -119,10 +120,10 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
                 hideProgress();
                 String  str=t.getMessage();
                 if(str.indexOf("2008")>0) {
-                    showToast("微信授权失败,请先安装微信客户端 在登录吧!");
+                    G.showToast("微信授权失败,请先安装微信客户端 在登录吧!");
 
                 }else{
-                    showToast("微信授权失败  请检查网络是否正常");
+                    G.showToast("微信授权失败  请检查网络是否正常");
 
                 }
 
@@ -130,7 +131,7 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
 
             @Override
             public void onCancel(SHARE_MEDIA platform, int action) {
-                showToast("微信授权取消");
+                G.showToast("微信授权取消");
                 hideProgress();
             }
         });
@@ -154,7 +155,7 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
 
             @Override
             public void onError(SHARE_MEDIA platform, int action, Throwable t) {
-                showToast("QQ授权失败  请检查网络是否正常");
+                G.showToast("QQ授权失败  请检查网络是否正常");
                 hideProgress();
             }
 
@@ -171,7 +172,7 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
 
     @Override
     public void NetSuccess(int code, String msg, String invitation_code) {
-        showToast(msg);
+        G.showToast(msg);
         hideProgress();
         Jump2View.getInstance().goHomePageView(this, invitation_code);
 
@@ -179,7 +180,7 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
 
     @Override
     public void NetError(int code, String errorMsg) {
-        showToast(errorMsg);
+        G.showToast(errorMsg);
         hideProgress();
 
     }

+ 5 - 5
app/src/main/java/com/sheep/gamegroup/view/activity/PhoneAct.java

@@ -161,22 +161,22 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
 
     private boolean checkPhoneInput() {
         if (TextUtils.isEmpty(etPhone)) {
-            showToast(getString(R.string.input_your_phone));
+            G.showToast(getString(R.string.input_your_phone));
             return false;
         }
         if (etPhone.length() != 11) {
-            showToast(getString(R.string.toast_warning_phone_number_size));
+            G.showToast(getString(R.string.toast_warning_phone_number_size));
             return false;
         }
         return true;
     }
     private boolean checkCodeInput() {
         if (TextUtils.isEmpty(etCode)) {
-            showToast(getString(R.string.input_your_captcha));
+            G.showToast(getString(R.string.input_your_captcha));
             return false;
         }
         if (etCode.length() != 6) {
-            showToast(getString(R.string.toast_warning_phone_captcha_image_code_size));
+            G.showToast(getString(R.string.toast_warning_phone_captcha_image_code_size));
             return false;
         }
         return true;
@@ -251,7 +251,7 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
                 MyDbManager.getInstance().saveOrUpdateUser(loginEty.getUser());
                 UserEntity userEntity = MyDbManager.getInstance().dbFindUser();
                 Log.e("------userEntity", userEntity.getNickname() + "|" + userEntity.getMobile() + "");
-                showToast("登录成功");
+                G.showToast("登录成功");
 //            G.showToast(userEntity.getNickname() + "|" + userEntity.getMobile());
             } catch (Exception e) {
                 e.printStackTrace();

+ 2 - 2
app/src/main/java/com/sheep/gamegroup/view/activity/ReNameActivity.java

@@ -93,7 +93,7 @@ public class ReNameActivity extends BaseActivity implements ReNameContract.View
 
     @Override
     public void NetSuccess(int code, String msg, String string) {
-        showToast(msg);
+        G.showToast(msg);
         UserNameChange  name=new UserNameChange();
         name.setNikeName(et.getText().toString());
         EventBus.getDefault().post(name);
@@ -102,7 +102,7 @@ public class ReNameActivity extends BaseActivity implements ReNameContract.View
 
     @Override
     public void NetError(int code, String errorMsg) {
-        showToast(errorMsg);
+        G.showToast(errorMsg);
         hideProgress();
     }
 

+ 9 - 9
app/src/main/java/com/sheep/gamegroup/view/activity/RealNameAuthenAct.java

@@ -136,7 +136,7 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
     @Override
     public void NetSuccess(int code, String msg, String s) {
         hideProgress();
-        showToast(mEntity.getCertification_count() == 0 ? "认证信息已提交审核,请耐心等待" : "已成功扣除0.5元绵羊币,认证审核中");
+        G.showToast(mEntity.getCertification_count() == 0 ? "认证信息已提交审核,请耐心等待" : "已成功扣除0.5元绵羊币,认证审核中");
         RealNameAutehrChange change = new RealNameAutehrChange();
         for (String key : map.keySet()) {
             if (key.equals("real_name") && !TextUtils.isEmpty(map.get(key))) {
@@ -184,7 +184,7 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
     @Override
     public void NetError(int code, String errorMsg) {
         hideProgress();
-        showToast(errorMsg);
+        G.showToast(errorMsg);
     }
 
 
@@ -232,35 +232,35 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
         String bankCard;
         String bankCardMobile;
         if (TextUtils.isEmpty((realName = etName.getText().toString()))) {
-            showToast("姓名不能为空");
+            G.showToast("姓名不能为空");
             return;
         } else if (TextUtils.isEmpty((idNumber = etIdCard.getText().toString()))) {
-            showToast("身份证不能为空");
+            G.showToast("身份证不能为空");
             return;
         } else if (TextUtils.isEmpty((bankCard = etBank.getText().toString()))) {
-            showToast("银行卡号不能为空");
+            G.showToast("银行卡号不能为空");
             return;
         } else if (TextUtils.isEmpty((bankCardMobile = et_bank_mobile.getText().toString()))) {
-            showToast("银行行预留手机号不能为空");
+            G.showToast("银行行预留手机号不能为空");
             return;
         }
         map.put("real_name", realName);
 
         String str = StringUtils.IDCardValidate(idNumber);
         if (!str.equals("YES")) {
-            showToast(str + ":请填写正确的身份证信息哈!");
+            G.showToast(str + ":请填写正确的身份证信息哈!");
             return;
         }
         map.put("id_number", idNumber);
 
         if (!StringUtils.checkBankCard(bankCard)) {
-            showToast("银行卡不合法哈!");
+            G.showToast("银行卡不合法哈!");
             return;
         }
         map.put("bank_card", bankCard);
 
         if (!StringUtils.isMobile(bankCardMobile)) {
-            showToast("银行卡预留手机号不合法哈!");
+            G.showToast("银行卡预留手机号不合法哈!");
             return;
         }
         map.put("bank_card_mobile", bankCardMobile);

+ 4 - 4
app/src/main/java/com/sheep/gamegroup/view/activity/SignCardAct.java

@@ -129,7 +129,7 @@ public class SignCardAct extends BaseActivity implements SignCardContract.View {
             signTvLjdk.setEnabled(false);
             signTvLjdk.setText("已打卡");
         } else {
-            showToast(o.getMsg());
+            G.showToast(o.getMsg());
             presenter.goPunchCanpunch();
         }
     }
@@ -155,7 +155,7 @@ public class SignCardAct extends BaseActivity implements SignCardContract.View {
                     }));
             presenter.goPunchAndSignCount();//(刷新数据)获取可打卡和报名人数
         } else {
-            showToast(o.getMsg());
+            G.showToast(o.getMsg());
             presenter.goPunchCanSignUp();
         }
     }
@@ -231,7 +231,7 @@ public class SignCardAct extends BaseActivity implements SignCardContract.View {
 
     @Override
     public void failRequest(BaseMessage o) {
-        showToast(o.getMsg());
+        G.showToast(o.getMsg());
     }
 
     @OnClick({R.id.sign_tv_ljdk, R.id.sign_tv_yybm, R.id.sign_tv_kf})
@@ -244,7 +244,7 @@ public class SignCardAct extends BaseActivity implements SignCardContract.View {
                 trySignUp();
                 break;
             case R.id.sign_tv_kf:
-                showToast("028-8888888");
+                G.showToast("028-8888888");
                 break;
         }
     }

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdp.java

@@ -349,7 +349,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                     viewHolder.itemView.findViewById(R.id.line_tv).setVisibility(View.VISIBLE);
                 }
                 if("0".equals(etyList.get(i).getLast_num())){
-                    detail_task_tv.setText("已抢光");
+                    detail_task_tv.setText("任务已抢光");
                     detail_task_tv.setBackground(context.getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
                     detail_task_tv.setEnabled(false);
                     viewHolder.itemView.setEnabled(false);

+ 6 - 0
app/src/main/res/drawable/shape_ash_solid_rectangle_top.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:topLeftRadius="18dp" android:topRightRadius="18dp" />
+    <solid android:color="@color/gray_bg" />
+</shape>

+ 6 - 0
app/src/main/res/drawable/shape_white_solid_rectangle_bottom.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:bottomLeftRadius="18dp" android:bottomRightRadius="18dp" />
+    <solid android:color="#ffffff" />
+</shape>

+ 203 - 0
app/src/main/res/layout/act_new_about_us.xml

@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/white_light"
+    android:orientation="vertical">
+
+    <android.support.constraint.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@mipmap/home_blue_bg"
+        android:paddingBottom="@dimen/content_padding_10"
+        android:paddingEnd="@dimen/content_padding_20"
+        android:paddingStart="@dimen/content_padding_20"
+        android:paddingTop="@dimen/status_bar_height">
+
+        <ImageView
+            android:id="@+id/img_baseactivity_title"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/layout_heigh_default"
+            android:gravity="center_vertical"
+            android:scaleType="centerInside"
+            android:src="@drawable/narrow_back_white"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/txt_baseactivity_title"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/layout_heigh_default"
+            android:layout_centerInParent="true"
+            android:gravity="center"
+            android:text="@string/app_name"
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_size_4"
+            app:layout_constraintBottom_toBottomOf="@+id/img_baseactivity_title"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/img_baseactivity_title" />
+
+        <ImageView
+            android:id="@+id/about_us_iv"
+            android:layout_width="70dp"
+            android:layout_height="70dp"
+            android:src="@mipmap/icon_phone"
+            app:layout_constraintBottom_toTopOf="@+id/about_us_app_tv"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/txt_baseactivity_title" />
+
+        <TextView
+            android:id="@+id/about_us_app_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/app_name"
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_size_20"
+            app:layout_constraintBottom_toTopOf="@+id/about_us_version_tv"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/about_us_iv" />
+
+        <TextView
+            android:id="@+id/about_us_version_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="版本:V2.6"
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_size_4"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/about_us_app_tv" />
+    </android.support.constraint.ConstraintLayout>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                style="@style/style_about_us_title"
+                android:text="相关信息" />
+
+            <RelativeLayout style="@style/style_about_us_rl">
+
+                <TextView
+                    android:id="@+id/about_us_addr_label_tv"
+                    style="@style/style_about_us_label"
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentTop="true"
+                    android:text="官方地址" />
+
+                <TextView
+                    android:id="@+id/about_us_addr_tv"
+                    style="@style/style_about_us_label"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentTop="true"
+                    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" />
+
+                <TextView
+                    android:id="@+id/about_us_platform_label_tv"
+                    style="@style/style_about_us_label"
+                    android:layout_alignParentStart="true"
+                    android:layout_below="@id/about_us_line_1"
+                    android:text="官方微信公众平台" />
+
+                <TextView
+                    android:id="@+id/about_us_platform_tv"
+                    style="@style/style_about_us_label"
+                    android:layout_alignParentEnd="true"
+                    android:layout_below="@id/about_us_line_1"
+                    android:text="好玩之家" />
+            </RelativeLayout>
+
+            <TextView
+                style="@style/style_about_us_title"
+                android:text="投诉与建议" />
+
+            <RelativeLayout style="@style/style_about_us_rl">
+
+                <TextView
+                    style="@style/style_about_us_label"
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentTop="true"
+                    android:text="QQ" />
+
+                <TextView
+                    android:id="@+id/about_us_qq_back_tv"
+                    style="@style/style_about_us_label"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentTop="true"
+                    android:text="13888888888" />
+            </RelativeLayout>
+
+            <TextView
+                style="@style/style_about_us_title"
+                android:text="商务合作" />
+
+            <RelativeLayout style="@style/style_about_us_rl">
+
+                <TextView
+                    android:id="@+id/about_us_qq_label_tv"
+                    style="@style/style_about_us_label"
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentTop="true"
+                    android:text="QQ" />
+
+                <TextView
+                    android:id="@+id/about_us_qq_tv"
+                    style="@style/style_about_us_label"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentTop="true"
+                    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" />
+
+                <TextView
+                    android:id="@+id/about_us_email_label_tv"
+                    style="@style/style_about_us_label"
+                    android:layout_alignParentStart="true"
+                    android:layout_below="@id/about_us_line_2"
+                    android:text="邮箱" />
+
+                <TextView
+                    android:id="@+id/about_us_email_tv"
+                    style="@style/style_about_us_label"
+                    android:layout_alignParentEnd="true"
+                    android:layout_below="@id/about_us_line_2"
+                    android:text="88888888@qq.com" />
+            </RelativeLayout>
+
+            <TextView
+                style="@style/style_about_us_title"
+                android:text="公司简介" />
+
+            <RelativeLayout
+                style="@style/style_about_us_rl"
+                android:layout_marginBottom="@dimen/content_padding_20">
+
+                <TextView
+                    android:id="@+id/about_us_other_tv"
+                    style="@style/style_about_us_label"
+                    android:layout_width="match_parent"
+                    android:text="公司简介" />
+            </RelativeLayout>
+        </LinearLayout>
+    </ScrollView>
+</LinearLayout>

+ 51 - 0
app/src/main/res/values/dd_styles.xml

@@ -13,6 +13,7 @@
         <item name="android:layout_margin">@dimen/content_padding_10</item>
         <item name="android:textSize">@dimen/text_size_15</item>
     </style>
+
     <style name="style_button" parent="button">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">40dp</item>
@@ -22,6 +23,7 @@
         <item name="android:layout_margin">@dimen/content_padding_10</item>
         <item name="android:textSize">@dimen/text_size_15</item>
     </style>
+
     <style name="style_button_stroke" parent="button">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">40dp</item>
@@ -31,6 +33,7 @@
         <item name="android:layout_margin">@dimen/content_padding_10</item>
         <item name="android:textSize">@dimen/text_size_15</item>
     </style>
+
     <style name="style_check_stroke">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
@@ -45,6 +48,7 @@
         <item name="android:layout_margin">@dimen/content_padding_10</item>
         <item name="android:textSize">@dimen/text_size_15</item>
     </style>
+
     <style name="style_button_margin15" parent="button">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">40dp</item>
@@ -54,6 +58,7 @@
         <item name="android:layout_margin">@dimen/content_padding_15</item>
         <item name="android:textSize">@dimen/text_size_15</item>
     </style>
+
     <style name="style_button_no_margin" parent="button">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">40dp</item>
@@ -62,6 +67,7 @@
         <item name="android:textColor">@color/btn_color_main</item>
         <item name="android:textSize">@dimen/text_size_15</item>
     </style>
+
     <style name="style_button_small" parent="button">
         <item name="android:layout_width">70dp</item>
         <item name="android:layout_height">30dp</item>
@@ -70,6 +76,7 @@
         <item name="android:textColor">@color/btn_color_main</item>
         <item name="android:textSize">@dimen/text_size_15</item>
     </style>
+
     <style name="style_button_small_yellow" parent="button">
         <item name="android:layout_width">70dp</item>
         <item name="android:layout_height">30dp</item>
@@ -78,6 +85,7 @@
         <item name="android:textColor">@color/btn_color_main</item>
         <item name="android:textSize">@dimen/text_size_15</item>
     </style>
+
     <style name="full.button_main" parent="button">
         <item name="android:background">@drawable/selector_button_full_main</item>
         <item name="android:textColor">@color/btn_color_main</item>
@@ -154,6 +162,7 @@
     <style name="TablLayoutTextStyle">
         <item name="android:textSize">14sp</item>
     </style>
+
     <style name="style_ash_tv">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">26dp</item>
@@ -164,11 +173,13 @@
         <item name="android:gravity">center</item>
         <item name="android:background">@drawable/sp_bg_rectangle_ash</item>
     </style>
+
     <style name="style_circle_main_v">
         <item name="android:layout_width">18dp</item>
         <item name="android:layout_height">18dp</item>
         <item name="android:background">@drawable/sp_bg_circle_main</item>
     </style>
+
     <style name="style_circle_main_tv">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
@@ -176,4 +187,44 @@
         <item name="android:textColor">#353235</item>
         <item name="android:textSize">15sp</item>
     </style>
+
+    <style name="style_about_us_title">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:paddingStart">@dimen/content_padding_20</item>
+        <item name="android:paddingEnd">@dimen/content_padding_20</item>
+        <item name="android:paddingTop">@dimen/content_padding_10</item>
+        <item name="android:paddingBottom">@dimen/content_padding_10</item>
+        <item name="android:layout_marginTop">@dimen/content_padding_10</item>
+        <item name="android:layout_marginStart">@dimen/content_padding_10</item>
+        <item name="android:layout_marginEnd">@dimen/content_padding_10</item>
+        <item name="android:textColor">#454545</item>
+        <item name="android:background">@drawable/shape_ash_solid_rectangle_top</item>
+    </style>
+
+    <style name="style_about_us_rl">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:orientation">vertical</item>
+        <item name="android:layout_marginStart">@dimen/content_padding_10</item>
+        <item name="android:layout_marginEnd">@dimen/content_padding_10</item>
+        <item name="android:background">@drawable/shape_white_solid_rectangle_bottom</item>
+    </style>
+
+    <style name="style_about_us_label">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:padding">@dimen/content_padding_20</item>
+        <item name="android:textColor">#454545</item>
+    </style>
+
+    <style name="style_about_us_line">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">1dp</item>
+        <item name="android:layout_marginStart">@dimen/content_padding_20</item>
+        <item name="android:layout_marginEnd">@dimen/content_padding_20</item>
+        <item name="android:background">#DFDFDF</item>
+    </style>
 </resources>