添加关于我们、版本更新与新功能介绍

app/src/main/AndroidManifest.xml

@@ -481,6 +481,8 @@
             android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.ActGuide"
             android:screenOrientation="portrait"/>
+        <activity android:name="com.sheep.gamegroup.view.activity.ActLoadH5"
+            android:screenOrientation="portrait"/>
     </application>
 
 

app/src/main/java/com/kfzs/duanduan/fragment/FgtCreditCardProgressQuery.java

@@ -76,7 +76,7 @@ public class FgtCreditCardProgressQuery extends BaseFragment {
                     public void onError(BaseMessage baseMessage) {
                         if(BuildConfig.DEBUG)
                             System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
-//                                G.showToast(TextUtils.isEmpty(baseMessage.getMsg()) ? "服务器错误，请稍候再试" : baseMessage.getMsg());
+//                        G.showToast(baseMessage);
                         notifyDataSetChanged();
                     }
                 });

app/src/main/java/com/kfzs/duanduan/fragment/FgtCreditCardTaskList.java

@@ -95,7 +95,7 @@ public class FgtCreditCardTaskList extends BaseFragment {
                             public void onError(BaseMessage baseMessage) {
                                 if(BuildConfig.DEBUG)
                                     System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
-//                                G.showToast(TextUtils.isEmpty(baseMessage.getMsg()) ? "服务器错误，请稍候再试" : baseMessage.getMsg());
+//                                G.showToast(baseMessage);
                                 notifyDataSetChanged();
                             }
                         });

app/src/main/java/com/kfzs/duanduan/fragment/FgtFriendExtractPage.java

@@ -106,7 +106,7 @@ public class FgtFriendExtractPage extends BaseFragment {
                     public void onError(BaseMessage baseMessage) {
                         if(BuildConfig.DEBUG)
                             System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
-                        G.showToast(TextUtils.isEmpty(baseMessage.getMsg()) ? "服务器错误，请稍候再试" : baseMessage.getMsg());
+                        G.showToast(baseMessage);
                         isLoadding = false;
                     }
                 });

app/src/main/java/com/kfzs/duanduan/fragment/FgtPersonalCenter.java

@@ -13,11 +13,13 @@ import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.duanduan.BaseCompatFragment;
+import com.kfzs.duanduan.utils.ApkUtils;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.Ext;
 import com.sheep.gamegroup.model.entity.FriendAndAwardEntity;
 import com.sheep.gamegroup.model.entity.UserEntity;
+import com.sheep.gamegroup.model.entity.VersionInfo;
 import com.sheep.gamegroup.model.entity.WebviewEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.CommonUtil;
@@ -29,7 +31,10 @@ 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.ClassFileHelper;
 import com.sheep.jiuyan.samllsheep.utils.G;
+import com.tencent.bugly.beta.Beta;
+import com.tencent.bugly.beta.UpgradeInfo;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -56,6 +61,8 @@ public class FgtPersonalCenter extends BaseCompatFragment {
     View proxy_service_layout;
     @BindView(R.id.proxy_service_layout_line)
     View proxy_service_layout_line;
+    @BindView(R.id.version_item_tv)
+    TextView version_item_tv;
     Unbinder unbinder;
 
     private UserEntity userEntitys;
@@ -121,8 +128,45 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                                 LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                             }
                         });
+        getVersionInfo();
         getShardData();
     }
+    private VersionInfo versionInfo;
+    private void loadVersionInfo() {
+        String appVersonName = ApkUtils.getCurrentPkgVersionName(SheepApp.getInstance());
+        String serviceVersionName;
+        if(versionInfo == null || TextUtils.isEmpty(serviceVersionName = versionInfo.getVersion_number())){
+            version_item_tv.setText("小绵羊");
+            version_item_tv.append(appVersonName);
+        } else {
+            version_item_tv.setText(TextUtils.equals(appVersonName, serviceVersionName) ?"":"有新版本：");
+            version_item_tv.append("小绵羊");
+            version_item_tv.append(serviceVersionName);
+        }
+    }
+    private void getVersionInfo() {
+        version_item_tv.setText("");
+        SheepApp.getInstance().getNetComponent().getApiService().getVersionInfo("")
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(new SheepSubscriber<BaseMessage>(getContext()) {
+                            @Override
+                            public void onNext(BaseMessage baseMessage) {
+                                LogUtil.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
+                                VersionInfo newVersionInfo = baseMessage.getData(VersionInfo.class);
+                                if(newVersionInfo != null) {
+                                    versionInfo = newVersionInfo;
+                                }
+                                loadVersionInfo();
+                            }
+
+                            @Override
+                            public void onError(BaseMessage baseMessage) {
+                                LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
+                                loadVersionInfo();
+                            }
+                        });
+    }
 
     private void updateData(BaseMessage baseMessage) {
         userEntitys = baseMessage.getData(UserEntity.class);
@@ -165,7 +209,10 @@ public class FgtPersonalCenter extends BaseCompatFragment {
         super.onDestroyView();
         unbinder.unbind();
     }
-    @OnClick({R.id.icon_img_iv, R.id.account_detail_layout, R.id.personalcenter_price_layout, R.id.account_safe_layout, R.id.account_task_layout, R.id.proxy_service_layout, R.id.abourt_us_layout, R.id.feedbook_layout, R.id.recommend_friend_layout, R.id.tv_submit, R.id.faq_layout})
+    @OnClick({R.id.icon_img_iv, R.id.account_detail_layout, R.id.personalcenter_price_layout, R.id.account_safe_layout,
+            R.id.account_task_layout, R.id.proxy_service_layout, R.id.abourt_us_layout, R.id.feedbook_layout,
+            R.id.recommend_friend_layout, R.id.tv_submit, R.id.faq_layout,
+            R.id.version_layout, R.id.clear_layout, R.id.change_layout})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.icon_img_iv://图片
@@ -211,6 +258,17 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                     ViewUtil.shareLink(getActivity(),Ety.getShare_link());
                 }
                 break;
+            case R.id.version_layout://版本更新
+                Beta.checkUpgrade();//检查版本号
+                break;
+            case R.id.clear_layout://清除缓存
+                Glide.get(getActivity()).clearDiskCache();//清理图片
+                ClassFileHelper.getInstance().clearDir();//清理下载文件
+                //清理应用缓存，除sp数据
+                break;
+            case R.id.change_layout://新功能介绍
+                Jump2View.getInstance().goVersionChange(getActivity(), ApkUtils.getCurrentPkgVersionName(SheepApp.getInstance()));
+                break;
             case R.id.tv_submit://注销
                 CommonUtil.getInstance()
                         .loginOut((BaseActivity) getActivity());

app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -220,7 +220,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         activity = getActivity();
         ButterKnife.bind(this, mContentView);
         DaggerSmallSheepComponent.builder()
-                .netComponent(SheepApp.get(getContext()).getNetComponent())
+                .netComponent(SheepApp.getInstance().getNetComponent())
                 .smallSheepModule(new SmallSheepModule(this))
                 .tryMakeMoneyModule(new TryMakeMoneyModule(this))
                 .build()

app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -478,4 +478,9 @@ public interface ApiService {
      */
     @GET("app/advertising/advertisements")
     Observable<BaseMessage> getAdvertising(@Query("type") int type);
+    /**
+     * 新功能介绍
+     */
+    @GET("app/version/new_features")
+    Observable<BaseMessage> getVersionInfo(@Query("version_number") String version_number);
 }

app/src/main/java/com/sheep/gamegroup/model/entity/DialogConfig.java

@@ -13,6 +13,8 @@ public class DialogConfig {
     private View.OnClickListener btnLeftOnClickListener;
     private String btnRightText;
     private View.OnClickListener btnRightOnClickListener;
+    private String msgMore;
+    private String tip;
 
     public String getMsg() {
         return msg;
@@ -67,4 +69,22 @@ public class DialogConfig {
         this.btnRightOnClickListener = btnRightOnClickListener;
         return this;
     }
+
+    public String getMsgMore() {
+        return msgMore;
+    }
+
+    public DialogConfig setMsgMore(String msgMore) {
+        this.msgMore = msgMore;
+        return this;
+    }
+
+    public String getTip() {
+        return tip;
+    }
+
+    public DialogConfig setTip(String tip) {
+        this.tip = tip;
+        return this;
+    }
 }

app/src/main/java/com/sheep/gamegroup/model/entity/UserEntity.java

@@ -65,6 +65,8 @@ public class UserEntity implements Serializable {
     private int is_new;//1新用户 2老用户
     @Column(name = "is_agent")
     private int is_agent;//0不是代理 1是代理
+    @Column(name = "first_certification")
+    private int first_certification;//实名认证次数
 
     public String getWx_nickname() {
         return wx_nickname;
@@ -258,10 +260,6 @@ public class UserEntity implements Serializable {
         this.is_agent = is_agent;
     }
 
-    public boolean isNewRegistUser() {//新注册用户
-        return TextUtils.equals(create_time, last_login_time);
-    }
-
     public String getBank_card_mobile() {
         return bank_card_mobile;
     }
@@ -269,4 +267,17 @@ public class UserEntity implements Serializable {
     public void setBank_card_mobile(String bank_card_mobile) {
         this.bank_card_mobile = bank_card_mobile;
     }
+
+    public int getFirst_certification() {
+        return first_certification;
+    }
+
+    public void setFirst_certification(int first_certification) {
+        this.first_certification = first_certification;
+    }
+
+    public boolean isNewRegistUser() {//新注册用户
+        return TextUtils.equals(create_time, last_login_time);
+    }
+
 }

app/src/main/java/com/sheep/gamegroup/model/entity/VersionInfo.java

@@ -0,0 +1,40 @@
+package com.sheep.gamegroup.model.entity;
+
+/**
+ * Created by realicing on 2018/6/7.
+ * realicing@sina.com
+ * {
+ * "version_content": "test",
+ * "id": 10,
+ * "version_number": "2.6"
+ * }
+ */
+public class VersionInfo {
+    private String version_content;
+    private int id;
+    private String version_number;
+
+    public String getVersion_content() {
+        return version_content;
+    }
+
+    public void setVersion_content(String version_content) {
+        this.version_content = version_content;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getVersion_number() {
+        return version_number;
+    }
+
+    public void setVersion_number(String version_number) {
+        this.version_number = version_number;
+    }
+}

app/src/main/java/com/sheep/gamegroup/model/util/SheepSubscriber.java

@@ -67,14 +67,14 @@ public abstract class SheepSubscriber<T> extends Subscriber<T> {
                 if(throwable.message.startsWith("{")){
                     baseMessage = JSONObject.parseObject(throwable.message, BaseMessage.class);
                 }else if(ViewUtil.isH5Content(throwable.message)){
-                    if(BuildConfig.DEBUG){
-                        StringBuilder title = new StringBuilder("调用接口错误");
-                        if(e instanceof HttpException) {
-                            title.append(";");
-                            title.append(((HttpException) e).response().toString());
-                        }
-                        Jump2View.getInstance().goNotice(ActivityManager.getInstance().currentActivity(), title.toString(), throwable.message, 0);
-                    }
+//                    if(BuildConfig.DEBUG){
+//                        StringBuilder title = new StringBuilder("调用接口错误");
+//                        if(e instanceof HttpException) {
+//                            title.append(";");
+//                            title.append(((HttpException) e).response().toString());
+//                        }
+//                        Jump2View.getInstance().goNotice(ActivityManager.getInstance().currentActivity(), title.toString(), throwable.message, 0);
+//                    }
                     baseMessage = new BaseMessage();
                     baseMessage.setMsg("服务器错误");
                 }else {

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

@@ -9,6 +9,7 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
+import android.support.v4.app.FragmentActivity;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.WindowManager;
@@ -29,6 +30,7 @@ import com.sheep.gamegroup.model.entity.NewbieTaskRecord;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.UserEntity;
+import com.sheep.gamegroup.model.entity.VersionInfo;
 import com.sheep.gamegroup.model.entity.WebviewEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.view.activity.AccountAndSecurityAct;
@@ -37,6 +39,7 @@ import com.sheep.gamegroup.view.activity.ActCreditCardWeb;
 import com.sheep.gamegroup.view.activity.ActGuide;
 import com.sheep.gamegroup.view.activity.ActGuideDeblocked;
 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.ActNewbieTaskList;
@@ -350,7 +353,7 @@ public class Jump2View {
                         }
                         if(BuildConfig.DEBUG)
                             System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
-                        G.showToast(TextUtils.isEmpty(baseMessage.getMsg()) ? "服务器错误，请稍候再试" : baseMessage.getMsg());
+                        G.showToast(baseMessage);
                     }
                 });
     }
@@ -759,6 +762,18 @@ public class Jump2View {
             intent.putExtra("time", time);
         context.startActivity(intent);
     }
+    /**
+     * 展示h5内容
+     * @param context
+     * @param title
+     * @param content
+     */
+    public void goLoadH5(Context context, String title, String content) {
+        Intent intent = new Intent(context, ActLoadH5.class);
+        intent.putExtra("title", title);
+        intent.putExtra("content", content);
+        context.startActivity(intent);
+    }
 
     /**
      * 意见反馈
@@ -1047,4 +1062,27 @@ public class Jump2View {
                     }
                 });
     }
+
+    public void goVersionChange(final Activity activity, String currentPkgVersionName) {
+        SheepApp.getInstance().getNetComponent().getApiService().getVersionInfo(currentPkgVersionName)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(activity) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        LogUtil.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
+                        VersionInfo newVersionInfo = baseMessage.getData(VersionInfo.class);
+                        if(newVersionInfo != null && !TextUtils.isEmpty(newVersionInfo.getVersion_content())) {
+                            goLoadH5(activity, "新功能介绍", newVersionInfo.getVersion_content());
+                        } else {
+                            G.showToast(R.string.service_data_error);
+                        }
+                    }
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
+                        G.showToast(baseMessage);
+                    }
+                });
+    }
 }

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

@@ -231,6 +231,8 @@ public class ViewUtil {
     public static void showMsgDialog(final Activity activity, DialogConfig dialogConfig) {
         String title = dialogConfig.getTitle();
         String msg = dialogConfig.getMsg();
+        String msgMore = dialogConfig.getMsgMore();
+        String tip = dialogConfig.getTip();
         String btnLeftText = dialogConfig.getBtnLeftText();
         final View.OnClickListener btnLeftOnClickListener = dialogConfig.getBtnLeftOnClickListener();
         String btnRightText = dialogConfig.getBtnRightText();
@@ -249,6 +251,22 @@ public class ViewUtil {
         TextView dialog_msg = view.findViewById(R.id.dialog_msg);
         dialog_msg.setText(msg);
 
+        TextView dialog_msg_more = view.findViewById(R.id.dialog_msg_more);
+        if(TextUtils.isEmpty(msgMore)){
+            dialog_msg_more.setVisibility(View.GONE);
+        } else {
+            dialog_msg_more.setVisibility(View.VISIBLE);
+            dialog_msg_more.setText(msgMore);
+        }
+
+        TextView dialog_tip = view.findViewById(R.id.dialog_tip);
+        if(TextUtils.isEmpty(tip)){
+            dialog_tip.setVisibility(View.GONE);
+        } else {
+            dialog_tip.setVisibility(View.VISIBLE);
+            dialog_tip.setText(tip);
+        }
+
         TextView dialog_btn_left = view.findViewById(R.id.dialog_btn_left);
         dialog_btn_left.setVisibility(btnLeftText != null || btnLeftOnClickListener != null ? View.VISIBLE : View.GONE);
         if (!TextUtils.isEmpty(btnLeftText))

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

@@ -140,7 +140,7 @@ public class ActMyMoney extends BaseActivity {
                             public void onError(BaseMessage baseMessage) {
                                 if(BuildConfig.DEBUG)
                                     System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
-                                G.showToast(TextUtils.isEmpty(baseMessage.getMsg()) ? "服务器错误，请稍候再试" : baseMessage.getMsg());
+                                G.showToast(baseMessage);
                                 resetData();
                                 hideProgress();
                             }

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

@@ -97,7 +97,7 @@ public class ActUnderstandSheep extends BaseActivity {
                                     public void onError(BaseMessage baseMessage) {
                                         if(BuildConfig.DEBUG)
                                             System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
-                                        G.showToast(TextUtils.isEmpty(baseMessage.getMsg()) ? "服务器错误，请稍候再试" : baseMessage.getMsg());
+                                        G.showToast(baseMessage);
                                     }
                                 });
             }

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

@@ -508,7 +508,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                         public void onError(BaseMessage baseMessage) {
                             if(BuildConfig.DEBUG)
                                 System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
-                            G.showToast(TextUtils.isEmpty(baseMessage.getMsg()) ? "服务器错误，请稍候再试" : baseMessage.getMsg());
+                            G.showToast(baseMessage);
                         }
                     });
         }

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

@@ -31,8 +31,10 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import org.greenrobot.eventbus.EventBus;
+import org.xutils.ex.DbException;
 
 import java.util.HashMap;
+import java.util.Locale;
 
 import javax.inject.Inject;
 
@@ -134,7 +136,7 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
     @Override
     public void NetSuccess(int code, String msg, String s) {
         hideProgress();
-        showToast(msg);
+        showToast(mEntity.getFirst_certification() == 0 ? "认证信息已提交审核，请耐心等待" : "已成功扣除0.5元绵羊币，认证审核中");
         RealNameAutehrChange change = new RealNameAutehrChange();
         for (String key : map.keySet()) {
             if (key.equals("real_name") && !TextUtils.isEmpty(map.get(key))) {
@@ -190,17 +192,40 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.tv_submit:
-                toNext();
+                trySubmit();
                 break;
             case R.id.real_name_know_tv:
                 ViewUtil.showMsgDialog(this, "安全保障：风控系统实时监控，保护你的资金安全隐私保护：高强度数据加密，保护用户隐私信息了解详情，请致电小绵羊客服：028-88612993");
                 break;
             case R.id.name_tip_iv:
-                ViewUtil.showMsgDialog(this, "为了保证账户及账户资金安全，只能绑定认证用户本人的银行卡及身份证号","持卡人说明");
+                ViewUtil.showMsgDialog(this, "为了保证账户及账户资金安全，只能绑定认证用户本人的银行卡及身份证号", "持卡人说明");
                 break;
         }
     }
 
+    public void trySubmit() {
+        if(mEntity == null){
+            try {
+                mEntity = MyDbManager.getInstance().dbFindUser();
+            } catch (DbException e) {
+                e.printStackTrace();
+            }
+        }
+        if(mEntity == null){
+            G.showToast(R.string.unknown_error);
+            return;
+        }
+        ViewUtil.showMsgDialog(this, new DialogConfig().setTitle("重要提示").setMsgMore(String.format(Locale.CHINA,"你已执行%d次实名认证操作",mEntity.getFirst_certification()))
+                .setMsg("实名认证首次免费。请务必确认您所提交的认证信息真实有效。若因信息填写错误造成认证失败。再次申请认证时需扣除您0.5元绵阳币作为认证费用，请务必谨慎填写认证信息。")
+                .setBtnLeftText("返回修改").setBtnRightText("确认提交")
+                .setBtnRightOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        toNext();
+                    }
+                }));
+    }
+
     public void toNext() {
         String realName;
         String idNumber;

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

@@ -708,7 +708,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                             @Override
                             public void onError(BaseMessage baseMessage) {
                                 hideProgress();
-                                G.showToast(TextUtils.isEmpty(baseMessage.getMsg()) ? "服务器错误，请稍候再试" : baseMessage.getMsg());
+                                G.showToast(baseMessage);
                             }
 
                             @Override

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

@@ -264,7 +264,7 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
                         } else {
                             if (BuildConfig.DEBUG)
                                 System.out.println("baseMessage onError " + JSON.toJSONString(baseMessage));
-                            G.showToast(TextUtils.isEmpty(baseMessage.getMsg()) ? "服务器错误，请稍候再试" : baseMessage.getMsg());
+                            G.showToast(baseMessage);
                             hideProgress();
                         }
                     }

app/src/main/java/com/sheep/jiuyan/samllsheep/utils/G.java

@@ -1,6 +1,7 @@
 package com.sheep.jiuyan.samllsheep.utils;
 
 import android.content.Context;
+import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.ViewGroup;
 import android.widget.TextView;
@@ -8,6 +9,7 @@ import android.widget.Toast;
 
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
+import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 
 
@@ -72,6 +74,10 @@ public class G {
         showToast(SheepApp.mSheepApp, SheepApp.mSheepApp.getString(resId), Toast.LENGTH_SHORT);
     }
     public static void showToast(BaseMessage baseMessage) {
-        G.showToast(baseMessage.getMsg() + (BuildConfig.DEBUG ? "[" + baseMessage.getCode() + "]" : ""));
+        if(TextUtils.isEmpty(baseMessage.getMsg())){
+            G.showToast(R.string.service_error);
+        } else {
+            G.showToast(baseMessage.getMsg() + (BuildConfig.DEBUG ? "[" + baseMessage.getCode() + "]" : ""));
+        }
     }
 }

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

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <include layout="@layout/title" />
+
+    <TextView
+        android:id="@+id/act_notice_content_tv"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:lineSpacingExtra="5dp"
+        android:scrollbars="vertical"
+        android:text="@string/app_name"
+        android:textColor="#939393"
+        android:textSize="13sp" />
+
+    <WebView
+        android:id="@+id/act_notice_content_wb"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>

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

@@ -160,4 +160,118 @@
             android:layout_centerVertical="true"/>
 
     </RelativeLayout>
+
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/white_bg_line"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        />
+    <RelativeLayout
+        android:id="@+id/change_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="15dp"
+        >
+        <ImageView
+            android:id="@+id/change_item_icon_iv"
+            android:layout_width="@dimen/content_padding_20"
+            android:layout_height="@dimen/content_padding_20"
+            android:src="@mipmap/personalc_ic_change"
+            android:layout_marginRight="12dp"
+            android:layout_centerVertical="true"/>
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="新功能介绍"
+            android:lines="1"
+            android:textColor="@color/black"
+            android:textSize="14dp"
+            android:layout_centerVertical="true"
+            android:layout_alignBottom="@+id/change_item_icon_iv"
+            android:layout_toEndOf="@+id/change_item_icon_iv" />
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@mipmap/x_ic_next"
+            android:layout_alignParentRight="true"
+            android:layout_marginLeft="12dp"
+            android:layout_centerVertical="true"/>
+
+    </RelativeLayout>
+
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/white_bg_line"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        />
+    <RelativeLayout
+        android:id="@+id/version_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="15dp">
+        <ImageView
+            android:id="@+id/version_item_icon_iv"
+            android:layout_width="@dimen/content_padding_20"
+            android:layout_height="@dimen/content_padding_20"
+            android:src="@mipmap/personalc_ic_version"
+            android:layout_marginEnd="12dp"/>
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="更新版本"
+            android:textColor="@color/black"
+            android:textSize="14dp"
+            android:layout_toEndOf="@+id/version_item_icon_iv" />
+        <TextView
+            android:id="@+id/version_item_tv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="小绵羊2.6.0"
+            android:gravity="end"
+            android:textColor="@color/black_6_3"
+            android:textSize="14sp"
+            android:layout_alignParentEnd="true" />
+
+    </RelativeLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/white_bg_line"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        />
+    <RelativeLayout
+        android:id="@+id/clear_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="15dp">
+        <ImageView
+            android:id="@+id/clear_item_icon_iv"
+            android:layout_width="@dimen/content_padding_20"
+            android:layout_height="@dimen/content_padding_20"
+            android:src="@mipmap/personalc_ic_clear"
+            android:layout_marginEnd="12dp"/>
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="清除缓存"
+            android:textColor="@color/black"
+            android:textSize="14dp"
+            android:layout_toEndOf="@+id/clear_item_icon_iv" />
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="128MB"
+            android:gravity="end"
+            android:textColor="@color/black_6_3"
+            android:textSize="14sp"
+            android:layout_alignParentEnd="true" />
+
+    </RelativeLayout>
 </LinearLayout>

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

@@ -15,6 +15,20 @@
         android:text="内容"
         android:gravity="center_horizontal"
         android:textColor="@color/black_text_deep"
+        android:textSize="20sp" />
+    <TextView
+        android:id="@+id/dialog_msg_more"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:layout_marginTop="@dimen/content_padding_20"
+        android:layout_marginBottom="@dimen/content_padding_20"
+        android:lineSpacingExtra="2dp"
+        android:text="内容"
+        android:gravity="center_horizontal"
+        android:textColor="@color/red"
+        android:visibility="gone"
         android:textSize="24sp" />
     <LinearLayout
         android:layout_width="match_parent"
@@ -42,4 +56,17 @@
             android:layout_marginTop="40dp"
             android:text="确认提交" />
     </LinearLayout>
+    <TextView
+        android:id="@+id/dialog_tip"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:layout_marginTop="@dimen/content_padding_20"
+        android:layout_marginBottom="@dimen/content_padding_20"
+        android:lineSpacingExtra="2dp"
+        android:gravity="center_horizontal"
+        android:textColor="@color/black_text_deep"
+        android:visibility="gone"
+        android:textSize="18sp" />
 </merge>