删除多余的旧文件。

app/src/main/AndroidManifest.xml

@@ -13,7 +13,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity android:name="constant.yysdk.com.main_yy_rh_sdk.MainActivity"
-            android:screenOrientation="landscape"
+            android:screenOrientation="portrait"
             android:launchMode="singleTop"
             android:configChanges="keyboardHidden|orientation|screenSize"
 

app/src/main/java/constant/yysdk/com/main_yy_rh_sdk/MainActivity.java

@@ -196,6 +196,11 @@ public class MainActivity extends Activity implements View.OnClickListener {
             public void onGetOaid(boolean isSuccess, String oaid) {
 
             }
+
+            @Override
+            public void onShowGameExit() {
+
+            }
         }, true);
         sdk.sdkOnCreate(this, savedInstanceState);
         sdk.setSDKLogoutListener(this, new LogoutCallback() {

hnqj/src/main/java/com/yyrh/networking/NetRequestApi.java

@@ -9,8 +9,6 @@ import android.widget.Toast;
 import com.yyrh.pay.PaymentNotify;
 import com.yyrh.sdk.SDKEntry;
 import com.yyrh.sdk.callback.ShowPolicyCallback;
-import com.yyrh.ui.ForgetPwdLayout;
-import com.yyrh.ui.PhoneRegisterLayout;
 import com.yyrh.ui.fragment.UserPhoneLoginFragment;
 import com.yyrh.ui.fragment.UserRetrievePwdFragment;
 import com.yyrh.utils.ResourceUtil;
@@ -171,7 +169,7 @@ public class NetRequestApi {
             @Override
             public void onFailure(int code, String errorMessage) {
                 ProgressDialogUtils.dismiss();
-                new TosUtil(activity, "blue", activity.getString(ResourceUtil.getStringId(activity, "yyrh_network_error_tip"))).show();
+                new TosUtil(activity, TosUtil.TOAST_ERROR, activity.getString(ResourceUtil.getStringId(activity, "yyrh_network_error_tip"))).show();
 
                 loginCallback.onLoginError(activity.getString(ResourceUtil.getStringId(activity, "yyrh_network_error_tip")));
             }
@@ -317,7 +315,7 @@ public class NetRequestApi {
             public void onFailure(int code, String errorMessage) {
                 ProgressDialogUtils.dismiss();
 
-                new TosUtil(activity, "blue", activity.getString(ResourceUtil.getStringId(activity, "yyrh_network_error_tip"))).show();
+                new TosUtil(activity, TosUtil.TOAST_ERROR, activity.getString(ResourceUtil.getStringId(activity, "yyrh_network_error_tip"))).show();
 
 
                 loginCallback.onLoginError(activity.getString(ResourceUtil.getStringId(activity, "yyrh_network_error_tip")));
@@ -385,7 +383,7 @@ public class NetRequestApi {
 
 
         if (createTime.length() != 10) {
-            new TosUtil(activity, "blue", activity.getString(ResourceUtil.getStringId(activity, "yyrh_ctime_format_error"))).show();
+            new TosUtil(activity, TosUtil.TOAST_ERROR, activity.getString(ResourceUtil.getStringId(activity, "yyrh_ctime_format_error"))).show();
 
             return;
         }
@@ -486,7 +484,7 @@ public class NetRequestApi {
 
         String role_ctime = (String) map.get("role_ctime");
         if (Utils.judgeStrNull(role_ctime)) {
-            new TosUtil(activity, "blue", activity.getString(ResourceUtil.getStringId(activity, "yyrh_pls_upload_roleinfo_frist"))).show();
+            new TosUtil(activity, TosUtil.TOAST_ERROR, activity.getString(ResourceUtil.getStringId(activity, "yyrh_pls_upload_roleinfo_frist"))).show();
             ProgressDialogUtils.dismiss();
             return;
         }
@@ -534,7 +532,7 @@ public class NetRequestApi {
             @Override
             public void onFailure(int code, String errorMessage) {
                 ProgressDialogUtils.dismiss();
-                new TosUtil(activity, "blue", activity.getString(ResourceUtil.getStringId(activity, "yyrh_network_error_tip"))).show();
+                new TosUtil(activity, TosUtil.TOAST_ERROR, activity.getString(ResourceUtil.getStringId(activity, "yyrh_network_error_tip"))).show();
 
                 callback.onPayFailed(activity.getString(ResourceUtil.getStringId(activity, "yyrh_network_error_tip")));
 
@@ -606,7 +604,7 @@ public class NetRequestApi {
             @Override
             public void onFailure(int code, String errorMessage) {
                 ProgressDialogUtils.dismiss();
-                new TosUtil(activity, "blue", activity.getString(ResourceUtil.getStringId(activity, "yyrh_network_error_tip"))).show();
+                new TosUtil(activity, TosUtil.TOAST_ERROR, activity.getString(ResourceUtil.getStringId(activity, "yyrh_network_error_tip"))).show();
 
                 captchaCallback.onGetFailed(activity.getString(ResourceUtil.getStringId(activity, "yyrh_network_error_tip")));
 

hnqj/src/main/java/com/yyrh/pay/WvPayYyrhDialog.java

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.webkit.DownloadListener;
 import android.webkit.WebChromeClient;
@@ -11,6 +12,7 @@ import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 
 import com.yyrh.constant.SDKSettings;
 import com.yyrh.ui.PageJsInteraction;
@@ -25,6 +27,8 @@ import org.json.JSONObject;
 
 import java.util.HashMap;
 
+import static com.yyrh.constant.SDKSettings.isLandscape;
+
 
 public class WvPayYyrhDialog extends BaseDialog implements View.OnClickListener{
 
@@ -53,12 +57,16 @@ public class WvPayYyrhDialog extends BaseDialog implements View.OnClickListener{
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        if (SDKSettings.isLandscape){
-            setContentView(ResourceUtil.getLayoutId(context,
-                    "yyrh_pay_webview_landscape"));
-        } else {
         setContentView(ResourceUtil.getLayoutId(context,
-                "yyrh_pay_webview_portrait"));
+                "qj_p_webview"));
+
+
+        if (!isLandscape){
+            LinearLayout ll_p_wb = findViewById(ResourceUtil.getId(context, "ll_p_wb"));
+            Float x = Float.valueOf("0.9").floatValue();
+            Float y = Float.valueOf("0.9").floatValue();
+            ll_p_wb.setScaleX(x);
+            ll_p_wb.setScaleY(y);
         }
 
         iv_reback_close = findViewById(ResourceUtil.getId(context,
@@ -187,6 +195,6 @@ public class WvPayYyrhDialog extends BaseDialog implements View.OnClickListener{
     @Override
     public void showJsMsg(String message) {
         super.showJsMsg(message);
-        new TosUtil(context,"blue",  message).show();
+        new TosUtil(context,TosUtil.TOAST_ERROR,  message).show();
     }
 }

hnqj/src/main/java/com/yyrh/sdk/SDKEntry.java

@@ -147,7 +147,7 @@ public class SDKEntry {
 
                 }else{
 
-                    new TosUtil(gameAct,"blue", msg).show();
+                    new TosUtil(gameAct,TosUtil.TOAST_ERROR, msg).show();
 
                     initCall.onInitFailed(msg);
 
@@ -205,7 +205,7 @@ public class SDKEntry {
         @Override
         public void onLoginChannelFail(String msg) {
 
-            new TosUtil(gameAct,"blue",  msg).show();
+            new TosUtil(gameAct,TosUtil.TOAST_ERROR,  msg).show();
             sdk.SDKLoginChannelFail(msg);
         }
 
@@ -252,6 +252,11 @@ public class SDKEntry {
         public String onGetChannelUid() {
             return SDKSettings.CHANNELUID;
         }
+
+        @Override
+        public void onShowGameExit() {
+            initCall.onShowGameExit();
+        }
     };
 
     /**
@@ -351,7 +356,7 @@ public class SDKEntry {
         YYLog.i("payOrderInit");
         map.put("role_ctime",this.role_ctime);
         if (SDKSettings.UNAME.equals("")){
-            new TosUtil(activity,"blue", activity.getString(ResourceUtil.getStringId(activity, "yyrh_login2pay"))).show();
+            new TosUtil(activity,TosUtil.TOAST_ERROR, activity.getString(ResourceUtil.getStringId(activity, "qj_login2pay"))).show();
 
             return;
         }
@@ -529,7 +534,7 @@ public class SDKEntry {
     public void getRealNameInfo(Activity activity, RealNameMsgCallback realNameMsgCallback){
         this.realNameMsgCallback = realNameMsgCallback;
         if (Utils.getTextIsNull(SDKSettings.UNAME)){
-            new TosUtil(activity,"blue",  activity.getString(ResourceUtil.getStringId(activity, "yyrh_login2pay"))).show();
+            new TosUtil(activity,TosUtil.TOAST_ERROR,  activity.getString(ResourceUtil.getStringId(activity, "qj_login2pay"))).show();
             return;
         }
         SdkManager.defaultManager(gameAct).getRealNameInfo(activity, realNameMsgCallback);

hnqj/src/main/java/com/yyrh/sdk/YyrhSdkManager.java

@@ -9,9 +9,7 @@ import android.graphics.BitmapFactory;
 import android.os.Build;
 import android.os.Handler;
 import android.util.Log;
-import android.widget.Toast;
 
-import com.yyrh.advertisement.AdvertiseManager;
 import com.yyrh.constant.URLConstants;
 import com.yyrh.factory.SdkManager;
 import com.yyrh.imei.ImeiUtil;
@@ -31,13 +29,11 @@ import com.yyrh.ui.fragment.FragmentUtils;
 import com.yyrh.ui.userlist.DatabaseHelper;
 import com.yyrh.utils.InspectSimulator;
 import com.yyrh.utils.ResourceUtil;
-import com.yyrh.utils.TosUtil;
 import com.yyrh.utils.Utils;
 import com.yyrh.constant.SDKSettings;
 import com.yyrh.networking.NetRequestApi;
 
 import com.yyrh.sdk.callback.InitCallback;
-import com.yyrh.ui.ConstantDialog;
 import com.yyrh.ui.CustomExitGameDialog;
 import com.yyrh.utils.YYLog;
 import com.yythird.sdk.ChannelSDK;
@@ -120,7 +116,7 @@ public class YyrhSdkManager {
                 @Override
                 public void onShow(String agreement_url) {
                     YYLog.i("need to display the policy");
-                    new PrivacyPolicyDialog(activity, ResourceUtil.getStyleId(activity, "yyrh_base_dialog"), agreement_url,
+                    new PrivacyPolicyDialog(activity, ResourceUtil.getStyleId(activity, "qj_base_dialog"), agreement_url,
                             new PrivacyPolicyDialog.OnClosePageListener() {
                                 @Override
                                 public void onUserAgreePolicy() {
@@ -240,6 +236,11 @@ public class YyrhSdkManager {
 
             }
 
+            @Override
+            public void onShowGameExit() {
+
+            }
+
         });
 
         SDKSettings.isSimulator = InspectSimulator.isSimulator(activity);
@@ -260,7 +261,6 @@ public class YyrhSdkManager {
     private void yyrh_showLoginDialog(Activity activity) {
         destroyFloat();
         Intent intent = new Intent(activity, UseLoginActivity.class);
-        //intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
         intent.putExtra("isLandscape", Utils.isLandscape(activity));
         intent.putExtra("fragmentTag", FragmentUtils.SDK_LOGIN_TAG);
@@ -312,7 +312,7 @@ public class YyrhSdkManager {
         }
         itemList.clear();
 
-        final int[] menuIcons = new int[]{ResourceUtil.getMipmapId(activity,"yyrh_user_center_icon"),ResourceUtil.getMipmapId(activity,"yyrh_switch_account_icon"), ResourceUtil.getMipmapId(activity,"yyrh_hide_icon")};
+        final int[] menuIcons = new int[]{ResourceUtil.getMipmapId(activity,"qj_user_center_icon"),ResourceUtil.getMipmapId(activity,"qj_switch_account_icon"), ResourceUtil.getMipmapId(activity,"qj_hide_icon")};
 
 
 
@@ -324,10 +324,10 @@ public class YyrhSdkManager {
             mFloatMenu = new FloatLogoMenu.Builder()
                     .withActivity(activity)
 //                    .withContext(mActivity.getApplication())//这个在7.0（包括7.0）以上以及大部分7.0以下的国产手机上需要用户授权，需要搭配<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-                    .logo(BitmapFactory.decodeResource(activity.getResources(),ResourceUtil.getMipmapId(activity,"yyrh_float_icon")))
+                    .logo(BitmapFactory.decodeResource(activity.getResources(),ResourceUtil.getMipmapId(activity,"qj_float_icon")))
                     .drawCicleMenuBg(true)
                     .backMenuColor(0xffe4e3e1)
-                    .setBgDrawable(activity.getResources().getDrawable(ResourceUtil.getDrawableId(activity,"yyrh_game_float_menu_bg")))
+                    .setBgDrawable(activity.getResources().getDrawable(ResourceUtil.getDrawableId(activity,"qj_game_float_menu_bg")))
                     //这个背景色需要和logo的背景色一致
                     .setFloatItems(itemList)
                     .defaultLocation(FloatLogoMenu.LEFT)
@@ -338,20 +338,20 @@ public class YyrhSdkManager {
 
                             itemList.set(position,new FloatItem(MENU_ITEMS[position], 0x99000000, 0x99000000, BitmapFactory.decodeResource(activity.getResources(), menuIcons[position]), String.valueOf(0)));
 
-                            if (title.equals("隐藏")){
+                            if (title.equals(CLOSE)){
                                 destroyFloat();
                                 itemList.clear();
 
-                            }else if (title.equals("切换账号")){
+                            }else if (title.equals(FEEDBACK)){
                                 yyrhLogout();
-                            }else if (title.equals("用户中心")){
+                            }else if (title.equals(HOME)){
                                 HashMap<String,String> map = new HashMap<>();
                                 map.put("game_code",SDKSettings.game_code);
                                 map.put("gcp_code",SDKSettings.gcp_code);
                                 map.put("uname",SDKSettings.UNAME);
                                 String url  = Utils.getUserCententerUrl(URLConstants.USERCENTERLISTWEB,map);
 
-                                new WvPageListDialog(activity,ResourceUtil.getStyleId(activity,"yyrh_base_dialog"),url).show();
+                                new WvPageListDialog(activity,ResourceUtil.getStyleId(activity,"qj_base_dialog"),url).show();
                                 mFloatMenu.hideMenu();
                             }
                             else{
@@ -383,7 +383,7 @@ public class YyrhSdkManager {
         if (Utils.judgeStrNull(url)){
             return;
         }
-        new WvPayYyrhDialog(activity,ResourceUtil.getStyleId(activity,"yyrh_base_dialog"),url,map).show();
+        new WvPayYyrhDialog(activity,ResourceUtil.getStyleId(activity,"qj_base_dialog"),url,map).show();
 
 
 
@@ -447,7 +447,7 @@ public class YyrhSdkManager {
                 String url  = Utils.getUserCententerUrl(URLConstants.USERBINDINFO,ifmap);
                 if (SDKSettings.isForceRealName){
                     url = url + "&smrz=1";
-                    new WvPageListDialog(context, ResourceUtil.getStyleId(context, "yyrh_base_dialog"), url,
+                    new WvPageListDialog(context, ResourceUtil.getStyleId(context, "qj_base_dialog"), url,
                             new WvPageListDialog.OnClosePageListener() {
                                 @Override
                                 public void onClose() {
@@ -469,7 +469,7 @@ public class YyrhSdkManager {
                                 }
                             },SDKSettings.isForceRealName).show();
                 }else {
-                    new WvPageListDialog(context, ResourceUtil.getStyleId(context, "yyrh_base_dialog"), url,
+                    new WvPageListDialog(context, ResourceUtil.getStyleId(context, "qj_base_dialog"), url,
                                  new WvPageListDialog.OnClosePageListener() {
                                      @Override
                                      public void onClose() {

hnqj/src/main/java/com/yyrh/sdk/callback/InitCallback.java

@@ -6,5 +6,5 @@ public interface InitCallback {
     public void onInitFailed(String msg);
     public void onInitError(String _strError);
     public void onGetOaid(boolean isSuccess,String oaid);
-
+    public void onShowGameExit();
 }

hnqj/src/main/java/com/yyrh/ui/AutoLoginDialog.java

@@ -137,14 +137,14 @@ public class AutoLoginDialog extends Dialog {
 
 					@Override
 					public void onLoginFailed(String msg) {
-						new TosUtil(context,"blue",  msg).show();
+						new TosUtil(context,TosUtil.TOAST_ERROR,  msg).show();
 
 
 					}
 
 					@Override
 					public void onLoginError(String msg) {
-						new TosUtil(context,"blue",  msg).show();
+						new TosUtil(context,TosUtil.TOAST_ERROR,  msg).show();
 
 
 					}

hnqj/src/main/java/com/yyrh/ui/ConstantDialog.java

@@ -1,34 +0,0 @@
-package com.yyrh.ui;
-
-import android.app.Activity;
-import android.app.Dialog;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.view.View;
-
-import com.yyrh.utils.Utils;
-
-
-public class ConstantDialog extends Dialog{
-
-
-    public Context context;
-
-
-    public ConstantDialog(Context context,int themeResId) {
-        super(context,themeResId);
-        SharedPreferences sp = context.getSharedPreferences("yyrh", Activity.MODE_PRIVATE);
-
-
-        if (!Utils.judgeStrNull(sp.getString("username", ""))){
-            new LoginLayout(context,this);
-        }else{
-            new RegisterLayout(context,this);
-        }
-
-
-    }
-
-
-
-}

hnqj/src/main/java/com/yyrh/ui/CustomExitGameDialog.java

@@ -7,10 +7,13 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.LinearLayout;
 
 import com.yyrh.constant.SDKSettings;
 import com.yyrh.utils.ResourceUtil;
 
+import static com.yyrh.constant.SDKSettings.isLandscape;
+
 
 public class CustomExitGameDialog extends Dialog {
 
@@ -40,14 +43,19 @@ public class CustomExitGameDialog extends Dialog {
 		public CustomExitGameDialog Create(){
 			{
 				LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-				dialog = new CustomExitGameDialog(context,ResourceUtil.getStyleId(context,"yyrh_base_dialog"));
-				View layout;
-				if (SDKSettings.isLandscape){
-					layout =  inflater.inflate(ResourceUtil.getLayoutId(context, "yyrh_exit_game_dialog"),null);
-				}else{
-					layout =  inflater.inflate(ResourceUtil.getLayoutId(context, "yyrh_exit_game_dialog_protrait"),null);
-				}
+				dialog = new CustomExitGameDialog(context,ResourceUtil.getStyleId(context,"qj_base_dialog"));
+
 
+				View layout =  inflater.inflate(ResourceUtil.getLayoutId(context, "qj_exit_game_dialog"),null);
+
+
+				if (!isLandscape){
+					LinearLayout ll_exit_game = layout.findViewById(ResourceUtil.getId(context, "ll_exit_game"));
+					Float x = Float.valueOf("0.9").floatValue();
+					Float y = Float.valueOf("0.9").floatValue();
+					ll_exit_game.setScaleX(x);
+					ll_exit_game.setScaleY(y);
+				}
 
 				dialog.addContentView(layout,new ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
 

hnqj/src/main/java/com/yyrh/ui/ForgetPwdLayout.java

@@ -1,200 +0,0 @@
-package com.yyrh.ui;
-
-import android.app.Activity;
-import android.content.Context;
-
-import android.content.SharedPreferences;
-import android.os.CountDownTimer;
-import android.text.method.HideReturnsTransformationMethod;
-import android.text.method.PasswordTransformationMethod;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ImageView;
-
-import com.yyrh.constant.SDKSettings;
-import com.yyrh.networking.NetRequestApi;
-import com.yyrh.ui.fragment.UserPhoneLoginFragment;
-import com.yyrh.ui.fragment.UserRetrievePwdFragment;
-import com.yyrh.ui.userlist.DatabaseHelper;
-import com.yyrh.utils.ResourceUtil;
-import com.yyrh.utils.TosUtil;
-import com.yyrh.utils.Utils;
-
-public class ForgetPwdLayout implements View.OnClickListener {
-
-
-    private Context context;
-    private ConstantDialog constantDialog;
-    private EditText et_user_phone,et_user_code,et_user_pwd;
-    private Button btn_get_code,reg_compete_btn;
-    private ImageView down_eye_btn, close_btn;
-    private boolean isShowPwd = false;
-    public ForgetPwdLayout(Context context, ConstantDialog constantDialog){
-
-        this.context = context;
-        this.constantDialog = constantDialog;
-        if (SDKSettings.isLandscape){
-            constantDialog.setContentView(ResourceUtil.getLayoutId(context, "yyrh_phone_find_pwd_dialog"));
-        }else{
-            constantDialog.setContentView(ResourceUtil.getLayoutId(context, "yyrh_phone_find_pwd_dialog_protrait"));
-        }
-
-
-        et_user_phone = constantDialog.findViewById(ResourceUtil.getId(context, "et_user_phone"));
-        et_user_code = constantDialog.findViewById(ResourceUtil.getId(context, "et_user_code"));
-        et_user_pwd  = constantDialog.findViewById(ResourceUtil.getId(context, "et_user_pwd"));
-        btn_get_code  = constantDialog.findViewById(ResourceUtil.getId(context, "btn_get_code"));
-        reg_compete_btn  = constantDialog.findViewById(ResourceUtil.getId(context, "reg_compete_btn"));
-        down_eye_btn  = constantDialog.findViewById(ResourceUtil.getId(context, "down_eye_btn"));
-
-        close_btn  = constantDialog.findViewById(ResourceUtil.getId(context, "close_btn"));
-        down_eye_btn.setOnClickListener(this);
-        btn_get_code.setOnClickListener(this);
-        close_btn.setOnClickListener(this);
-        reg_compete_btn.setOnClickListener(this);
-    }
-
-    @Override
-    public void onClick(View v) {
-        int id = v.getId();
-        if (id == ResourceUtil.getId(context, "btn_get_code")) {
-            String phone =  et_user_phone.getText().toString();
-
-            if (phone.length() < 10) {
-                new TosUtil(context,"blue", context.getString(ResourceUtil.getStringId(context, "yyrh_pls_input_right_phone"))).show();
-                return;
-            }
-            getPhoneCaptcha((Activity) context,phone,"modify_pwd");
-        }else if (id == ResourceUtil.getId(context, "reg_compete_btn")) {
-            String phone =  et_user_phone.getText().toString();
-            String code = et_user_code.getText().toString();
-            final String pwd = et_user_pwd.getText().toString();
-            if (phone.length() < 10) {
-
-                new TosUtil(context,"blue",  context.getString(ResourceUtil.getStringId(context, "yyrh_pls_input_right_phone"))).show();
-
-                return;
-            }
-            if(code.length() < 4 || Utils.judgeStrNull(code))
-            {
-                new TosUtil(context,"blue",  context.getString(ResourceUtil.getStringId(context, "yyrh_pls_input_right_code"))).show();
-
-
-                return;
-            }
-            if(pwd.length() < 6 || Utils.judgeStrNull(pwd))
-            {
-                new TosUtil(context,"blue",  context.getString(ResourceUtil.getStringId(context, "yyrh_pwd_limit_6"))).show();
-
-                return;
-            }
-            resetPwdWithPhone((Activity) context,phone,code,pwd);
-
-        }else if (id == ResourceUtil.getId(context, "close_btn")) {
-            new LoginLayout(context,constantDialog);
-        }else if (id == ResourceUtil.getId(context, "down_eye_btn")) {
-            if (!isShowPwd) {
-                isShowPwd = true;
-                et_user_pwd.setTransformationMethod(HideReturnsTransformationMethod.getInstance());
-                down_eye_btn.setImageResource(ResourceUtil.getMipmapId(context, "yyrh_eye_icon_select"));
-            } else {
-                isShowPwd = false;
-                et_user_pwd.setTransformationMethod(PasswordTransformationMethod.getInstance());
-                down_eye_btn.setImageResource(ResourceUtil.getMipmapId(context, "yyrh_eye_icon_normal"));
-            }
-        }
-
-    }
-
-    private void  getPhoneCaptcha(Activity activity, String phone, String action){
-        NetRequestApi.getPhoneCaptcha(activity, phone, action, new UserPhoneLoginFragment.CaptchaCallback() {
-            @Override
-            public void onGetSuccess(String msg) {
-                getCodeSuccess();
-                new TosUtil(context,"green", context.getString(ResourceUtil.getStringId(context, "yyrh_send_code_success"))).show();
-
-
-            }
-
-            @Override
-            public void onGetFailed(String msg) {
-                new TosUtil(context,"blue", msg).show();
-
-            }
-        });
-    }
-
-    private void resetPwdWithPhone(Activity activity, final String phone, String code, final String pwd) {
-        NetRequestApi.resetPwdWithPhone(activity, phone, code, pwd, new UserRetrievePwdFragment.ResetPwdCallback() {
-            @Override
-            public void onResetSuccess(String msg) {
-
-                SharedPreferences sp = context
-                        .getSharedPreferences("yyrh",
-                                Activity.MODE_PRIVATE);
-                SharedPreferences.Editor editor = sp.edit();
-                editor.putString("username", phone);
-                editor.putString("password", pwd);
-                editor.commit();
-                String timeStamp = System.currentTimeMillis() + "";
-                String delete_sql = "delete from user where name = '" + phone + "'";
-                String insert_sql = "insert into user(name,pwd,time) values('" + phone
-                        + "','" + pwd + "','" + timeStamp + "')";
-
-                DatabaseHelper.excuteSql(context, delete_sql);
-                DatabaseHelper.excuteSql(context, insert_sql);
-                new LoginLayout(context,constantDialog);
-
-                new TosUtil(context,"green", msg).show();
-
-            }
-
-            @Override
-            public void onResetFailed(String msg) {
-
-                new TosUtil(context,"blue",  msg).show();
-
-            }
-        });
-    }
-
-    private void getCodeSuccess() {
-        btn_get_code.setEnabled(false);
-        btn_get_code.setText("60s");
-        btn_get_code.setBackgroundResource(ResourceUtil.getDrawableId(context,"yyrh_radius_main_color_1dp"));
-        TimeCount time = new TimeCount(60000, 1000);
-        time.start();
-    }
-
-    class TimeCount extends CountDownTimer {
-
-        public TimeCount(long millisInFuture, long countDownInterval) {
-            super(millisInFuture, countDownInterval);
-            // TODO Auto-generated constructor stub
-        }
-
-        @Override
-        public void onTick(long millisUntilFinished) {
-            // TODO Auto-generated method stub
-            btn_get_code.setText(millisUntilFinished / 1000 + "s");
-
-        }
-
-        @Override
-        public void onFinish() {
-            // TODO Auto-generated method stub
-            btn_get_code.setEnabled(true);
-            btn_get_code.setBackgroundResource(ResourceUtil.getDrawableId(context,"yyrh_radius_main_color_1dp"));
-            btn_get_code.setText(ResourceUtil.getStringId(context, "yyrh_get_phone_code"));
-        }
-
-    }
-    public interface ResetPwdCallback {
-
-        void onResetSuccess(String msg);
-        void onResetFailed(String msg);
-
-
-    }
-}

hnqj/src/main/java/com/yyrh/ui/GameSplashDialog.java

@@ -29,7 +29,7 @@ public class GameSplashDialog extends Dialog {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(ResourceUtil.getLayoutId(context,
-                "yyrh_show_splash_view"));
+                "qj_show_splash_view"));
         this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);//去掉信息栏
         iv_bg =  findViewById(ResourceUtil.getId(context, "iv_show_bg"));
         try {

hnqj/src/main/java/com/yyrh/ui/LoginLayout.java

@@ -1,271 +0,0 @@
-package com.yyrh.ui;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.graphics.Paint;
-import android.os.CountDownTimer;
-import android.text.method.HideReturnsTransformationMethod;
-import android.text.method.PasswordTransformationMethod;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.TextView;
-
-import com.yyrh.constant.SDKSettings;
-import com.yyrh.sdk.YyrhSdkManager;
-import com.yyrh.utils.ResourceUtil;
-import com.yyrh.utils.TosUtil;
-import com.yyrh.utils.Utils;
-import com.yyrh.networking.NetRequestApi;
-import com.yyrh.sdk.SDKEntry;
-import com.yyrh.sdk.callback.LoginCallback;
-import com.yyrh.ui.userlist.DatabaseHelper;
-import com.yyrh.ui.userlist.User;
-import com.yyrh.ui.userlist.UserListAdapter;
-
-import java.util.ArrayList;
-
-public class LoginLayout implements View.OnClickListener {
-
-
-
-    private Context context;
-
-    private Button loginButton,registButton,forgetPwdBtn;
-
-    private EditText accountEdit, pwdEdit;
-
-    private ImageView showListView,showPwd;
-
-    private boolean isShowList = false;
-
-    private ConstantDialog constantDialog;
-
-    private boolean isShowPwd = false;
-
-
-    DatabaseHelper dbHelper;
-    public TextView tv;
-    private UserListAdapter adapter;
-    private ListView listView;
-
-
-    public LoginLayout(Context context,ConstantDialog constantDialog){
-
-        this.context = context;
-        this.constantDialog = constantDialog;
-        if (SDKSettings.isLandscape){
-            constantDialog.setContentView(ResourceUtil.getLayoutId(context, "yyrh_login_dialog"));
-        }else{
-            constantDialog.setContentView(ResourceUtil.getLayoutId(context, "yyrh_login_dialog_protrait"));
-        }
-
-        loginButton 		=  constantDialog.findViewById(ResourceUtil.getId(context, "yyrh_enter_btn"));
-        registButton 		=  constantDialog.findViewById(ResourceUtil.getId(context, "yyrh_reg_btn"));
-        listView 			=  constantDialog.findViewById(ResourceUtil.getId(context, "account_listview"));
-        accountEdit 		=  constantDialog.findViewById(ResourceUtil.getId(context, "yyrh_user_edit"));
-        pwdEdit 			=  constantDialog.findViewById(ResourceUtil.getId(context, "yyrh_pwd_edit"));
-        showListView 		= constantDialog.findViewById(ResourceUtil.getId(context, "down_btn"));
-        showPwd = constantDialog.findViewById(ResourceUtil.getId(context, "down_eye_btn"));
-        tv 					= constantDialog.findViewById(ResourceUtil.getId(context, "list_text"));
-        forgetPwdBtn = constantDialog.findViewById(ResourceUtil.getId(context, "yyrh_forget_pwd_btn"));
-
-        showListView.setOnClickListener(this);
-        loginButton.setOnClickListener(this);
-        registButton.setOnClickListener(this);
-        showPwd.setOnClickListener(this);
-        forgetPwdBtn.setOnClickListener(this);
-
-        SharedPreferences sp = context.getSharedPreferences("yyrh", Activity.MODE_PRIVATE);
-        accountEdit.setText(sp.getString("username", ""));
-        pwdEdit.setText(sp.getString("password", ""));
-        pwdEdit.setTransformationMethod(PasswordTransformationMethod.getInstance());
-
-
-        adapter = new UserListAdapter(this,context,getData());
-        listView.setAdapter(adapter);
-        listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                accountEdit.setText(adapter.list.get(position).uname);
-                pwdEdit.setText(adapter.list.get(position).pwd);
-                hideListView();
-            }
-        });
-    }
-
-
-
-    @Override
-    public void onClick(View v) {
-
-        int id = v.getId();
-        if (id == ResourceUtil.getId(context, "yyrh_enter_btn")) { 			/*	进入游戏		*/
-
-            startLogin(accountEdit.getText().toString(), pwdEdit.getText().toString());
-
-        } else if (id == ResourceUtil.getId(context, "yyrh_reg_btn")) {		/*	1秒注册		*/
-            new RegisterLayout(context,constantDialog);
-
-        }else if (id == ResourceUtil.getId(context, "yyrh_forget_pwd_btn")) {		/*	1秒注册		*/
-            new ForgetPwdLayout(context,constantDialog);
-
-        } else if (id == ResourceUtil.getId(context, "down_eye_btn")) {		/*	1秒注册		*/
-            if (!isShowPwd) {
-                isShowPwd = true;
-                pwdEdit.setTransformationMethod(HideReturnsTransformationMethod.getInstance());
-                showPwd.setImageResource(ResourceUtil.getMipmapId(context, "yyrh_eye_icon_select"));
-            } else {
-                isShowPwd = false;
-                pwdEdit.setTransformationMethod(PasswordTransformationMethod.getInstance());
-                showPwd.setImageResource(ResourceUtil.getMipmapId(context, "yyrh_eye_icon_normal"));
-            }
-
-        }else if (id == ResourceUtil.getId(context, "down_btn")){
-
-            /*	显示缓存账号	*/
-            if (!isShowList) {
-                showListView.setImageResource(ResourceUtil.getMipmapId(context, "yyrh_arrow_select"));
-                showListView();
-            } else {
-
-                showListView.setImageResource(ResourceUtil.getMipmapId(context, "yyrh_arrow_normal"));
-                hideListView();
-            }
-        }
-
-    }
-
-    private void showListView() {
-        if (adapter.list.size() == 0) {
-            tv.setVisibility(View.VISIBLE);
-        } else {
-            listView.setVisibility(View.VISIBLE);
-            tv.setVisibility(View.GONE);
-
-        }
-        isShowList = true;
-
-
-    }
-
-    private void hideListView() {
-        listView.setVisibility(View.GONE);
-        tv.setVisibility(View.GONE);
-        isShowList = false;
-
-        showListView.setImageResource(ResourceUtil.getMipmapId(context, "yyrh_arrow_normal"));
-    }
-
-
-    private void startLogin(final String account, final String pwd) {
-        if (Utils.judgeStrNull(account)){
-            new TosUtil(context,"blue", context.getString(ResourceUtil.getStringId(context, "yyrh_band_need_account"))).show();
-           // ToastUtil.show(context, context.getString(ResourceUtil.getStringId(context, "yyrh_band_need_account")));
-            return;
-        }
-        if (Utils.judgeStrNull(pwd)){
-            new TosUtil(context,"blue", context.getString(ResourceUtil.getStringId(context, "yyrh_band_need_pwd"))).show();
-          //  ToastUtil.show(context, context.getString(ResourceUtil.getStringId(context, "yyrh_band_need_pwd")));
-            return;
-        }
-
-        if(account.length()<6)
-        {
-            new TosUtil(context,"blue", context.getString(ResourceUtil.getStringId(context, "yyrh_account_limit_6"))).show();
-         //   ToastUtil.show(context, context.getString(ResourceUtil.getStringId(context, "yyrh_account_limit_6")));
-            return;
-        }
-        if(pwd.length()<6)
-        {
-            new TosUtil(context,"blue", context.getString(ResourceUtil.getStringId(context, "yyrh_pwd_limit_6"))).show();
-           // ToastUtil.show(context, context.getString(ResourceUtil.getStringId(context, "yyrh_pwd_limit_6")));
-            return;
-        }
-        registerInterval();
-        NetRequestApi.loginWithYy(true,(Activity) context, account, pwd, new LoginCallback() {
-            @Override
-            public void onLoginSuccess(String token) {
-
-                constantDialog.dismiss();
-
-
-                YyrhSdkManager.defaultManager(context).saveUserLoginInfo(context,account,pwd,token);
-
-            }
-
-            @Override
-            public void onLoginFailed(String msg) {
-                new TosUtil(context,"blue", msg).show();
-
-                SDKEntry.getSdkInstance().loginCall.onLoginFailed(msg);
-            }
-
-            @Override
-            public void onLoginError(String msg) {
-                new TosUtil(context,"blue", msg).show();
-            }
-        });
-
-    }
-
-    private ArrayList<User> getData() {
-        ArrayList<User> userList = new ArrayList<User>();
-        dbHelper = new DatabaseHelper(context);
-        SQLiteDatabase db = null;
-        db = dbHelper.getReadableDatabase();
-        String qurey_sql = "select name,pwd from user order by time desc";
-        Cursor cursor = db.rawQuery(qurey_sql, null);
-        while (cursor.moveToNext()) {
-            User user = new User();
-            user.uname = cursor.getString(0);
-            user.pwd = cursor.getString(1);
-            userList.add(user);
-        }
-        cursor.close();
-        db.close();
-        return userList;
-    }
-
-    private void registerInterval() {
-
-
-        loginButton.setEnabled(false);
-        loginButton.setText("3s");
-        loginButton.setBackgroundResource(ResourceUtil.getColorId(context,"yyrh_black_color_40"));
-        TimeCount time = new TimeCount(3000, 1000);
-        time.start();
-    }
-
-
-    class TimeCount extends CountDownTimer {
-
-        public TimeCount(long millisInFuture, long countDownInterval) {
-            super(millisInFuture, countDownInterval);
-            // TODO Auto-generated constructor stub
-        }
-
-        @Override
-        public void onTick(long millisUntilFinished) {
-            // TODO Auto-generated method stub
-            loginButton.setText(millisUntilFinished / 1000 + "s");
-
-        }
-
-        @Override
-        public void onFinish() {
-            // TODO Auto-generated method stub
-            loginButton.setEnabled(true);
-            loginButton.setBackgroundResource(ResourceUtil.getColorId(context,"yyrh_btn1_color"));
-            loginButton.setText(ResourceUtil.getStringId(context, "yyrh_enter_game"));
-        }
-
-    }
-}

hnqj/src/main/java/com/yyrh/ui/PhoneRegisterLayout.java

@@ -1,294 +0,0 @@
-package com.yyrh.ui;
-
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Paint;
-import android.os.CountDownTimer;
-import android.text.method.HideReturnsTransformationMethod;
-import android.text.method.PasswordTransformationMethod;
-import android.view.View;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.yyrh.constant.SDKSettings;
-import com.yyrh.constant.URLConstants;
-import com.yyrh.networking.NetRequestApi;
-import com.yyrh.sdk.SDKEntry;
-import com.yyrh.sdk.YyrhSdkManager;
-import com.yyrh.ui.floatmenu.WvPageListDialog;
-import com.yyrh.ui.fragment.UserPhoneLoginFragment;
-import com.yyrh.ui.userlist.User;
-import com.yyrh.utils.ResourceUtil;
-import com.yyrh.utils.SignUtils;
-import com.yyrh.utils.TosUtil;
-import com.yyrh.utils.Utils;
-
-import static com.yyrh.constant.URLConstants.RSAKEY;
-
-public class PhoneRegisterLayout implements View.OnClickListener {
-
-
-    private Context context;
-    private ConstantDialog constantDialog;
-    private EditText et_user_phone,et_user_code,et_user_pwd;
-    private Button btn_get_code,et_reg_compete_btn;
-    private ImageView down_eye_btn,close_btn;
-    private boolean isShowPwd = false;
-    private CheckBox cb_register;
-    private TextView tv_tip,tv_private_policy;
-    public PhoneRegisterLayout(Context context, ConstantDialog constantDialog){
-
-        this.context = context;
-        this.constantDialog = constantDialog;
-        if (SDKSettings.isLandscape){
-            constantDialog.setContentView(ResourceUtil.getLayoutId(context, "yyrh_phone_register_dialog"));
-        }else{
-            constantDialog.setContentView(ResourceUtil.getLayoutId(context, "yyrh_phone_register_dialog_protrait"));
-        }
-
-
-        et_user_phone = constantDialog.findViewById(ResourceUtil.getId(context, "et_user_phone"));
-        et_user_code = constantDialog.findViewById(ResourceUtil.getId(context, "et_user_code"));
-        et_user_pwd  = constantDialog.findViewById(ResourceUtil.getId(context, "et_user_pwd"));
-        btn_get_code  = constantDialog.findViewById(ResourceUtil.getId(context, "btn_get_code"));
-        et_reg_compete_btn  = constantDialog.findViewById(ResourceUtil.getId(context, "et_reg_compete_btn"));
-        down_eye_btn  = constantDialog.findViewById(ResourceUtil.getId(context, "down_eye_btn"));
-
-        cb_register = constantDialog.findViewById(ResourceUtil.getId(context, "cb_register"));
-
-        close_btn  = constantDialog.findViewById(ResourceUtil.getId(context, "close_btn"));
-
-        tv_tip = constantDialog.findViewById(ResourceUtil.getId(context, "tv_tip"));
-        tv_tip.getPaint().setFlags(Paint. UNDERLINE_TEXT_FLAG );
-        tv_tip.getPaint().setAntiAlias(true);
-
-        tv_private_policy = constantDialog.findViewById(ResourceUtil.getId(context, "tv_private_policy"));
-        tv_private_policy.getPaint().setFlags(Paint. UNDERLINE_TEXT_FLAG );
-        tv_private_policy.getPaint().setAntiAlias(true);
-
-
-        tv_private_policy.setOnClickListener(this);
-        down_eye_btn.setOnClickListener(this);
-        btn_get_code.setOnClickListener(this);
-        close_btn.setOnClickListener(this);
-        tv_tip.setOnClickListener(this);
-        et_reg_compete_btn.setOnClickListener(this);
-    }
-
-    @Override
-    public void onClick(View v) {
-        int id = v.getId();
-        if (id == ResourceUtil.getId(context, "btn_get_code")) {
-           String phone =  et_user_phone.getText().toString();
-
-            if (phone.length() < 10) {
-                new TosUtil(context,"blue", context.getString(ResourceUtil.getStringId(context, "yyrh_pls_input_right_phone"))).show();
-               // ToastUtil.show(context, context.getString(ResourceUtil.getStringId(context, "yyrh_pls_input_right_phone")));
-                return;
-            }
-            getPhoneCaptcha((Activity) context,phone,"register");
-
-        }else if (id == ResourceUtil.getId(context, "et_reg_compete_btn")) {
-
-            registerWithPhone((Activity) context);
-        }else if (id == ResourceUtil.getId(context, "close_btn")) {
-            new RegisterLayout(context,constantDialog);
-        }else if (id == ResourceUtil.getId(context, "tv_tip")) {
-
-            String url  =  SDKSettings.UserCentUrl + URLConstants.USERPROTOCOLWEB + "gcp_code=" + SDKSettings.gcp_code
-                    + "&game_code=" + SDKSettings.game_code;
-
-            new WvPageListDialog(context,ResourceUtil.getStyleId(context,"yyrh_base_dialog"),url).show();
-
-        }else if (id == ResourceUtil.getId(context, "tv_private_policy")) {
-
-
-                String url  =  SDKSettings.UserCentUrl + URLConstants.USERPOLICYWEB + "gcp_code=" + SDKSettings.gcp_code
-                        + "&game_code=" + SDKSettings.game_code;
-
-                new WvPageListDialog(context,ResourceUtil.getStyleId(context,"yyrh_base_dialog"),url).show();
-
-        } else if (id == ResourceUtil.getId(context, "down_eye_btn")) {
-            if (!isShowPwd) {
-                isShowPwd = true;
-                et_user_pwd.setTransformationMethod(HideReturnsTransformationMethod.getInstance());
-                down_eye_btn.setImageResource(ResourceUtil.getMipmapId(context, "yyrh_eye_icon_select"));
-            } else {
-                isShowPwd = false;
-                et_user_pwd.setTransformationMethod(PasswordTransformationMethod.getInstance());
-                down_eye_btn.setImageResource(ResourceUtil.getMipmapId(context, "yyrh_eye_icon_normal"));
-            }
-        }
-
-    }
-
-    private void  getPhoneCaptcha(Activity activity, String phone, String action){
-        NetRequestApi.getPhoneCaptcha(activity, phone, action, new UserPhoneLoginFragment.CaptchaCallback() {
-            @Override
-            public void onGetSuccess(String msg) {
-                getCodeSuccess();
-
-                new TosUtil(context,"green",context.getString(ResourceUtil.getStringId(context, "yyrh_send_code_success"))).show();
-
-
-               // ToastUtil.show(context,context.getString(ResourceUtil.getStringId(context, "yyrh_send_code_success")));
-            }
-
-            @Override
-            public void onGetFailed(String msg) {
-
-                new TosUtil(context,"blue",msg).show();
-
-            }
-        });
-    }
-    private void registerWithPhone(final Activity activity){
-        String code = et_user_code.getText().toString();
-        final String account = et_user_phone.getText().toString();
-        final String pwd = et_user_pwd.getText().toString();
-        String userInfo ="";
-
-        if(account.length() < 10 || Utils.judgeStrNull(account))
-        {
-            new TosUtil(context,"blue", context.getString(ResourceUtil.getStringId(context, "yyrh_pls_input_right_phone"))).show();
-
-
-            return;
-        }
-        if(pwd.length() < 6 || Utils.judgeStrNull(pwd))
-        {
-
-            new TosUtil(context,"blue", context.getString(ResourceUtil.getStringId(context, "yyrh_pwd_limit_6"))).show();
-
-
-
-            return;
-        }
-        if(code.length() < 4 || Utils.judgeStrNull(code))
-        {
-            new TosUtil(context,"blue", context.getString(ResourceUtil.getStringId(context, "yyrh_pls_input_right_code"))).show();
-
-            return;
-        }
-
-        if (!cb_register.isChecked()){
-
-            new TosUtil(context, "blue",context.getString(ResourceUtil.getStringId(context, "yyrh_pls_checked_reg_tip"))).show();
-
-            return;
-
-        }
-
-        try {
-            userInfo =  SignUtils.encryptRsaByPublicKey(RSAKEY,account+"|"+ pwd);
-        } catch (Exception e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-        registerInterval();
-        NetRequestApi.registerWithPhone(activity,code,userInfo, new UserPhoneLoginFragment.PhoneRegisterCallback() {
-            @Override
-            public void onRegisterSuccess(String msg) {
-
-
-                constantDialog.dismiss();
-
-
-                YyrhSdkManager.defaultManager(context).saveUserLoginInfo(context,account,pwd,msg);
-
-                SDKEntry.getSdkInstance().adSdkCallback.onRegisterSuccess(account);
-            }
-
-            @Override
-            public void onRegisterFailed(String msg) {
-                new TosUtil(context,"blue", msg).show();
-            }
-        });
-    }
-    private void getCodeSuccess() {
-        btn_get_code.setEnabled(false);
-        btn_get_code.setText("60s");
-        btn_get_code.setBackgroundResource(ResourceUtil.getDrawableId(context,"yyrh_radius_main_color_1dp"));
-        TimeCount time = new TimeCount(60000, 1000);
-        time.start();
-    }
-
-    class TimeCount extends CountDownTimer {
-
-        public TimeCount(long millisInFuture, long countDownInterval) {
-            super(millisInFuture, countDownInterval);
-            // TODO Auto-generated constructor stub
-        }
-
-        @Override
-        public void onTick(long millisUntilFinished) {
-            // TODO Auto-generated method stub
-            btn_get_code.setText(millisUntilFinished / 1000 + "s");
-
-        }
-
-        @Override
-        public void onFinish() {
-            // TODO Auto-generated method stub
-            btn_get_code.setEnabled(true);
-            btn_get_code.setBackgroundResource(ResourceUtil.getDrawableId(context,"yyrh_radius_green_3dp"));
-            btn_get_code.setText(ResourceUtil.getStringId(context, "yyrh_get_phone_code"));
-        }
-
-    }
-
-    public interface CaptchaCallback {
-
-        void onGetSuccess(String msg);
-        void onGetFailed(String msg);
-
-
-    }
-
-    public interface PhoneRegisterCallback {
-
-        void onRegisterSuccess(String msg);
-        void onRegisterFailed(String msg);
-
-
-    }
-
-    private void registerInterval() {
-
-
-
-
-        et_reg_compete_btn.setEnabled(false);
-        et_reg_compete_btn.setText("3s");
-        et_reg_compete_btn.setBackgroundResource(ResourceUtil.getColorId(context,"yyrh_black_color_40"));
-        RegTimeCount time = new RegTimeCount(3000, 1000);
-        time.start();
-    }
-
-    class RegTimeCount extends CountDownTimer {
-
-        public RegTimeCount(long millisInFuture, long countDownInterval) {
-            super(millisInFuture, countDownInterval);
-            // TODO Auto-generated constructor stub
-        }
-
-        @Override
-        public void onTick(long millisUntilFinished) {
-            // TODO Auto-generated method stub
-            et_reg_compete_btn.setText(millisUntilFinished / 1000 + "s");
-
-        }
-
-        @Override
-        public void onFinish() {
-            // TODO Auto-generated method stub
-            et_reg_compete_btn.setEnabled(true);
-            et_reg_compete_btn.setBackgroundResource(ResourceUtil.getColorId(context,"yyrh_btn1_color"));
-            et_reg_compete_btn.setText(ResourceUtil.getStringId(context, "yyrh_register_success"));
-        }
-
-    }
-}

hnqj/src/main/java/com/yyrh/ui/PrivacyPolicyDialog.java

@@ -16,6 +16,7 @@ import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.Button;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 
 import com.yyrh.constant.SDKSettings;
 import com.yyrh.ui.userlist.DatabaseHelper;
@@ -71,12 +72,14 @@ public class PrivacyPolicyDialog extends Dialog {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         boolean isLandscape = Utils.isLandscape((Activity) context);
-        if (isLandscape){
-            setContentView(ResourceUtil.getLayoutId(context,
-                    "yyrh_privacy_policy_dialog"));
-        }else{
-            setContentView(ResourceUtil.getLayoutId(context,
-                    "yyrh_privacy_policy_dialog_protrait"));
+        setContentView(ResourceUtil.getLayoutId(context,
+                "qj_privacy_policy_dialog"));
+        if (!isLandscape){
+            LinearLayout ll_private_policy = findViewById(ResourceUtil.getId(context, "ll_private_policy"));
+            Float x = Float.valueOf("0.9").floatValue();
+            Float y = Float.valueOf("0.9").floatValue();
+            ll_private_policy.setScaleX(x);
+            ll_private_policy.setScaleY(y);
         }
 
         webView = findViewById(ResourceUtil.getId(context,
@@ -84,7 +87,7 @@ public class PrivacyPolicyDialog extends Dialog {
 
 
 
-        yyrh_loading = findViewById(ResourceUtil.getId(context, "yyrh_loading"));
+        yyrh_loading = findViewById(ResourceUtil.getId(context, "qj_loading"));
         Animation rotateAnimation = AnimationUtils.loadAnimation(context, ResourceUtil.getAnimId(context, "yyrh_rotate_anim"));
         yyrh_loading.startAnimation(rotateAnimation);
 
@@ -154,6 +157,9 @@ public class PrivacyPolicyDialog extends Dialog {
         });
 
 
+        webView.setBackgroundColor(0);
+        webView.getBackground().setAlpha(0);
+
         webView.loadUrl(url);
     }
 

hnqj/src/main/java/com/yyrh/ui/ProgressDialogUtils.java

@@ -23,7 +23,7 @@ public class ProgressDialogUtils {
 			activity = _activity;
 
 			progressDialog = new Dialog(_activity,ResourceUtil.getStyleId(_activity, "yyrh_progress_dialog"));
-			progressDialog.setContentView(ResourceUtil.getLayoutId(_activity, "yyrh_dialog_progress"));
+			progressDialog.setContentView(ResourceUtil.getLayoutId(_activity, "qj_dialog_progress"));
             progressDialog.setCancelable(false);
             progressDialog.getWindow().setBackgroundDrawableResource(android.R.color.transparent);
             TextView msg =  progressDialog.findViewById(ResourceUtil.getId(_activity, "id_tv_loadingmsg"));

hnqj/src/main/java/com/yyrh/ui/RegisterLayout.java

@@ -1,209 +0,0 @@
-package com.yyrh.ui;
-
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Paint;
-import android.os.CountDownTimer;
-import android.view.View;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.EditText;
-import android.widget.TextView;
-
-import com.yyrh.constant.SDKSettings;
-import com.yyrh.constant.URLConstants;
-import com.yyrh.sdk.SDKEntry;
-import com.yyrh.sdk.YyrhSdkManager;
-import com.yyrh.ui.floatmenu.WvPageListDialog;
-import com.yyrh.utils.ResourceUtil;
-import com.yyrh.utils.ScreenShotUtil;
-import com.yyrh.utils.TosUtil;
-import com.yyrh.utils.Utils;
-import com.yyrh.networking.NetRequestApi;
-import com.yyrh.sdk.callback.RegisterCallback;
-
-public class RegisterLayout implements View.OnClickListener {
-
-
-    private ConstantDialog constantDialog;
-    private Context context;
-    private EditText accountEdit,registPwdEdit;
-    private Button backToLogin,registCompete,reg_phone_btn;
-    private CheckBox cb_register;
-    private TextView tv_tip,tv_private_policy;
-    public RegisterLayout(Context context,ConstantDialog constantDialog){
-        this.constantDialog = constantDialog;
-        this.context = context;
-        if (SDKSettings.isLandscape){
-            constantDialog.setContentView(ResourceUtil.getLayoutId(context, "yyrh_register_dialog"));
-        }else{
-            constantDialog.setContentView(ResourceUtil.getLayoutId(context, "yyrh_register_dialog_protrait"));
-        }
-
-
-
-        backToLogin =  constantDialog.findViewById(ResourceUtil.getId(context, "reg_back_btn"));
-        registCompete =  constantDialog.findViewById(ResourceUtil.getId(context, "reg_compete_btn"));
-
-        accountEdit = constantDialog.findViewById(ResourceUtil.getId(context, "reg_account_edit"));
-        registPwdEdit = constantDialog.findViewById(ResourceUtil.getId(context, "reg_pwd_edit"));
-
-        cb_register = constantDialog.findViewById(ResourceUtil.getId(context, "cb_register"));
-        tv_tip = constantDialog.findViewById(ResourceUtil.getId(context, "tv_tip"));
-        tv_tip.getPaint().setFlags(Paint. UNDERLINE_TEXT_FLAG );
-        tv_tip.getPaint().setAntiAlias(true);
-
-        tv_private_policy = constantDialog.findViewById(ResourceUtil.getId(context, "tv_private_policy"));
-        tv_private_policy.getPaint().setFlags(Paint. UNDERLINE_TEXT_FLAG );
-        tv_private_policy.getPaint().setAntiAlias(true);
-        tv_private_policy.setOnClickListener(this);
-
-
-        reg_phone_btn = constantDialog.findViewById(ResourceUtil.getId(context, "reg_phone_btn"));
-
-        accountEdit.setText("qj" + Utils.getRandom(7));
-        registPwdEdit.setText(Utils.getRandom(7));
-        backToLogin.setOnClickListener(this);
-        registCompete.setOnClickListener(this);
-        tv_tip.setOnClickListener(this);
-        reg_phone_btn.setOnClickListener(this);
-
-    }
-
-    @Override
-    public void onClick(View v) {
-        int id = v.getId();
-        if (id == ResourceUtil.getId(context, "reg_compete_btn")) {
-
-            registerInterval();
-            startRegister(accountEdit.getText().toString(), registPwdEdit.getText().toString());
-        }else if (id == ResourceUtil.getId(context, "reg_back_btn")) {
-
-            new LoginLayout(context,constantDialog);
-        }
-        else if (id == ResourceUtil.getId(context, "tv_tip")) {
-
-
-            String url  =  SDKSettings.UserCentUrl + URLConstants.USERPROTOCOLWEB + "gcp_code=" + SDKSettings.gcp_code
-                    + "&game_code=" + SDKSettings.game_code;
-
-            new WvPageListDialog(context,ResourceUtil.getStyleId(context,"yyrh_base_dialog"),url).show();
-
-        }else if (id == ResourceUtil.getId(context, "tv_private_policy")) {
-
-
-            String url  =  SDKSettings.UserCentUrl + URLConstants.USERPOLICYWEB + "gcp_code=" + SDKSettings.gcp_code
-                    + "&game_code=" + SDKSettings.game_code;
-
-            new WvPageListDialog(context,ResourceUtil.getStyleId(context,"yyrh_base_dialog"),url).show();
-
-        }else if (id == ResourceUtil.getId(context, "reg_phone_btn")) {
-
-            new PhoneRegisterLayout(context,constantDialog);
-        }
-    }
-
-    private void startRegister(final String account, final String pwd) {
-        if (!cb_register.isChecked()){
-
-            new TosUtil(context,"blue", context.getString(ResourceUtil.getStringId(context, "yyrh_pls_checked_reg_tip"))).show();
-
-            return;
-        }
-        if (Utils.judgeStrNull(account)){
-            new TosUtil(context,"blue",  context.getString(ResourceUtil.getStringId(context, "yyrh_band_need_account"))).show();
-
-
-
-            return;
-        }
-        if (Utils.isNumeric(account)){
-            new TosUtil(context,"blue",  context.getString(ResourceUtil.getStringId(context, "yyrh_acount_not_only_number"))).show();
-
-            return;
-        }
-        if (Utils.judgeStrNull(pwd)){
-            new TosUtil(context,"blue",  context.getString(ResourceUtil.getStringId(context, "yyrh_band_need_pwd"))).show();
-
-
-            return;
-        }
-
-        if (account.length() < 6 || pwd.length() > 20) {
-            new TosUtil(context,"blue",  context.getString(ResourceUtil.getStringId(context, "yyrh_regist_account_error"))).show();
-
-
-            return;
-        }
-
-        if (pwd.length() < 6 || pwd.length() > 20) {
-
-            new TosUtil(context, "blue", context.getString(ResourceUtil.getStringId(context, "yyrh_regist_pwd_error"))).show();
-            return;
-        }
-
-
-
-        NetRequestApi.registerWithYy((Activity) context, account, pwd, new RegisterCallback() {
-            @Override
-            public void onRegisterSuccess(String token) {
-
-
-                if (ScreenShotUtil.shotByDialog(context,constantDialog)){
-                    new TosUtil(context,"green",  context.getString(ResourceUtil.getStringId(context, "yyrh_register_screen_tip"))).show();
-
-
-                }
-
-                constantDialog.dismiss();
-                SDKSettings.isVefityRealName = false;
-                YyrhSdkManager.defaultManager(context).saveUserLoginInfo(context,account,pwd,token);
-                SDKEntry.getSdkInstance().adSdkCallback.onRegisterSuccess(account);
-            }
-
-            @Override
-            public void onRegisterFailed(String msg) {
-
-                new TosUtil(context,"blue",  msg).show();
-
-
-            }
-
-        });
-    }
-
-    private void registerInterval() {
-
-
-        registCompete.setEnabled(false);
-        registCompete.setText("3s");
-        registCompete.setBackgroundResource(ResourceUtil.getColorId(context,"yyrh_black_color_40"));
-        TimeCount time = new TimeCount(3000, 1000);
-        time.start();
-    }
-
-    class TimeCount extends CountDownTimer {
-
-        public TimeCount(long millisInFuture, long countDownInterval) {
-            super(millisInFuture, countDownInterval);
-            // TODO Auto-generated constructor stub
-        }
-
-        @Override
-        public void onTick(long millisUntilFinished) {
-            // TODO Auto-generated method stub
-            registCompete.setText(millisUntilFinished / 1000 + "s");
-
-        }
-
-        @Override
-        public void onFinish() {
-            // TODO Auto-generated method stub
-            registCompete.setEnabled(true);
-            registCompete.setBackgroundResource(ResourceUtil.getDrawableId(context,"qj_login_bg"));
-            registCompete.setText(ResourceUtil.getStringId(context, "yyrh_register_success"));
-        }
-
-    }
-}
-

hnqj/src/main/java/com/yyrh/ui/SingleButtonDialog.java

@@ -38,10 +38,10 @@ public class SingleButtonDialog extends Dialog {
 		public SingleButtonDialog Create(String msg){
 			{
 				LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-				dialog = new SingleButtonDialog(context,ResourceUtil.getStyleId(context,"yyrh_base_dialog"));
+				dialog = new SingleButtonDialog(context,ResourceUtil.getStyleId(context,"qj_base_dialog"));
 				View layout;
 
-				layout =  inflater.inflate(ResourceUtil.getLayoutId(context, "yyrh_ios_style_dialog"),null);
+				layout =  inflater.inflate(ResourceUtil.getLayoutId(context, "qj_ios_style_dialog"),null);
 
 
 

hnqj/src/main/java/com/yyrh/ui/floatmenu/WvPageListDialog.java

@@ -16,7 +16,7 @@ import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
 import android.widget.ImageView;
-
+import android.widget.LinearLayout;
 
 
 import com.yyrh.constant.SDKSettings;
@@ -29,6 +29,7 @@ import com.yyrh.utils.TosUtil;
 
 
 import static com.yyrh.constant.SDKSettings.USER_BIRTHDAY;
+import static com.yyrh.constant.SDKSettings.isLandscape;
 import static com.yyrh.constant.SDKSettings.isVefityRealName;
 
 public class WvPageListDialog extends BaseDialog {
@@ -74,12 +75,21 @@ public class WvPageListDialog extends BaseDialog {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if (SDKSettings.isLandscape){
-            setContentView(ResourceUtil.getLayoutId(context,
-                    "yyrh_webview_common_dialog"));
-        }else{
+
             setContentView(ResourceUtil.getLayoutId(context,
-                    "yyrh_webview_common_dialog_portrait"));
+                    "qj_webview_common_dialog"));
+
+
+
+
+        if (!isLandscape){
+
+            LinearLayout ll_webview_common = findViewById(ResourceUtil.getId(context, "ll_webview_common"));
+            Float x = Float.valueOf("0.9").floatValue();
+            Float y = Float.valueOf("0.9").floatValue();
+            ll_webview_common.setScaleX(x);
+            ll_webview_common.setScaleY(y);
+
         }
 
         webView = findViewById(ResourceUtil.getId(context,
@@ -88,7 +98,7 @@ public class WvPageListDialog extends BaseDialog {
         close_btn = findViewById(ResourceUtil.getId(context,
                 "close_btn"));
 
-        yyrh_loading = findViewById(ResourceUtil.getId(context, "yyrh_loading"));
+        yyrh_loading = findViewById(ResourceUtil.getId(context, "qj_loading"));
         Animation rotateAnimation = AnimationUtils.loadAnimation(context, ResourceUtil.getAnimId(context, "yyrh_rotate_anim"));
         yyrh_loading.startAnimation(rotateAnimation);
 
@@ -184,7 +194,7 @@ public class WvPageListDialog extends BaseDialog {
     @Override
     public void showJsMsg(String message) {
         super.showJsMsg(message);
-        new TosUtil(context,"blue",  message).show();
+        new TosUtil(context,TosUtil.TOAST_ERROR,  message).show();
     }
 
     @Override

hnqj/src/main/java/com/yyrh/ui/fragment/UserAccountLoginFragment.java

@@ -21,19 +21,13 @@ import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.yyrh.constant.SDKSettings;
-import com.yyrh.constant.URLConstants;
 import com.yyrh.networking.NetRequestApi;
 import com.yyrh.sdk.SDKEntry;
 import com.yyrh.sdk.YyrhSdkManager;
 import com.yyrh.sdk.callback.LoginCallback;
-import com.yyrh.ui.LoginLayout;
-import com.yyrh.ui.floatmenu.WvPageListDialog;
 import com.yyrh.ui.userlist.DatabaseHelper;
 import com.yyrh.ui.userlist.QjUserListAdapter;
 import com.yyrh.ui.userlist.User;
-import com.yyrh.ui.userlist.UserListAdapter;
-import com.yyrh.ui.widget.EditView;
 import com.yyrh.utils.ResourceUtil;
 import com.yyrh.utils.TosUtil;
 import com.yyrh.utils.Utils;
@@ -171,25 +165,25 @@ public class UserAccountLoginFragment extends BaseFragment {
 
     private void startLogin(final String account, final String pwd) {
         if (Utils.judgeStrNull(account)){
-            new TosUtil(getActivity(),"blue", getString(ResourceUtil.getStringId(getActivity(), "yyrh_band_need_account"))).show();
+            new TosUtil(getActivity(),TosUtil.TOAST_ERROR, getString(ResourceUtil.getStringId(getActivity(), "yyrh_band_need_account"))).show();
             // ToastUtil.show(context, context.getString(ResourceUtil.getStringId(context, "yyrh_band_need_account")));
             return;
         }
         if (Utils.judgeStrNull(pwd)){
-            new TosUtil(getActivity(),"blue", getString(ResourceUtil.getStringId(getActivity(), "yyrh_band_need_pwd"))).show();
+            new TosUtil(getActivity(),TosUtil.TOAST_ERROR, getString(ResourceUtil.getStringId(getActivity(), "yyrh_band_need_pwd"))).show();
             //  ToastUtil.show(context, context.getString(ResourceUtil.getStringId(context, "yyrh_band_need_pwd")));
             return;
         }
 
         if(account.length()<6)
         {
-            new TosUtil(getActivity(),"blue", getString(ResourceUtil.getStringId(getActivity(), "yyrh_account_limit_6"))).show();
+            new TosUtil(getActivity(),TosUtil.TOAST_ERROR, getString(ResourceUtil.getStringId(getActivity(), "yyrh_account_limit_6"))).show();
             //   ToastUtil.show(context, context.getString(ResourceUtil.getStringId(context, "yyrh_account_limit_6")));
             return;
         }
         if(pwd.length()<6)
         {
-            new TosUtil(getActivity(),"blue", getString(ResourceUtil.getStringId(getActivity(), "yyrh_pwd_limit_6"))).show();
+            new TosUtil(getActivity(),TosUtil.TOAST_ERROR, getString(ResourceUtil.getStringId(getActivity(), "yyrh_pwd_limit_6"))).show();
             // ToastUtil.show(context, context.getString(ResourceUtil.getStringId(context, "yyrh_pwd_limit_6")));
             return;
         }
@@ -209,14 +203,14 @@ public class UserAccountLoginFragment extends BaseFragment {
 
             @Override
             public void onLoginFailed(String msg) {
-                new TosUtil(getActivity(),"blue", msg).show();
+                new TosUtil(getActivity(),TosUtil.TOAST_ERROR, msg).show();
 
                 SDKEntry.getSdkInstance().loginCall.onLoginFailed(msg);
             }
 
             @Override
             public void onLoginError(String msg) {
-                new TosUtil(getActivity(),"blue", msg).show();
+                new TosUtil(getActivity(),TosUtil.TOAST_ERROR, msg).show();
             }
         });
 

hnqj/src/main/java/com/yyrh/ui/fragment/UserPhoneLoginFragment.java

@@ -2,12 +2,10 @@ package com.yyrh.ui.fragment;
 
 import android.app.Activity;
 import android.app.Fragment;
-import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.text.method.PasswordTransformationMethod;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -21,9 +19,7 @@ import com.yyrh.constant.URLConstants;
 import com.yyrh.networking.NetRequestApi;
 import com.yyrh.sdk.SDKEntry;
 import com.yyrh.sdk.YyrhSdkManager;
-import com.yyrh.ui.PhoneRegisterLayout;
 import com.yyrh.ui.floatmenu.WvPageListDialog;
-import com.yyrh.ui.widget.EditView;
 import com.yyrh.utils.ResourceUtil;
 import com.yyrh.utils.SignUtils;
 import com.yyrh.utils.TosUtil;
@@ -31,6 +27,7 @@ import com.yyrh.utils.Utils;
 
 import static com.yyrh.constant.URLConstants.RSAKEY;
 
+
 public class UserPhoneLoginFragment extends BaseFragment {
 
 
@@ -82,7 +79,7 @@ public class UserPhoneLoginFragment extends BaseFragment {
             String url  =  SDKSettings.UserCentUrl + URLConstants.USERPROTOCOLWEB + "gcp_code=" + SDKSettings.gcp_code
                     + "&game_code=" + SDKSettings.game_code;
 
-            new WvPageListDialog(getActivity(),ResourceUtil.getStyleId(getActivity(),"yyrh_base_dialog"),url).show();
+            new WvPageListDialog(getActivity(),ResourceUtil.getStyleId(getActivity(),"qj_base_dialog"),url).show();
 
 
         }else if(id == ResourceUtil.getId(getActivity(), "tv_private_policy")){
@@ -90,7 +87,7 @@ public class UserPhoneLoginFragment extends BaseFragment {
             String url  =  SDKSettings.UserCentUrl + URLConstants.USERPOLICYWEB + "gcp_code=" + SDKSettings.gcp_code
                     + "&game_code=" + SDKSettings.game_code;
 
-            new WvPageListDialog(getActivity(),ResourceUtil.getStyleId(getActivity(),"yyrh_base_dialog"),url).show();
+            new WvPageListDialog(getActivity(),ResourceUtil.getStyleId(getActivity(),"qj_base_dialog"),url).show();
 
         }else if(id == ResourceUtil.getId(getActivity(), "btn_reg_compete")){
             registerWithPhone(getActivity());
@@ -100,7 +97,7 @@ public class UserPhoneLoginFragment extends BaseFragment {
             String phone =  et_user_phone.getText().toString();
 
             if (phone.length() < 10) {
-                new TosUtil(getActivity(),"blue", getString(ResourceUtil.getStringId(getActivity(), "qj_pls_input_right_phone"))).show();
+                new TosUtil(getActivity(),TosUtil.TOAST_ERROR, getString(ResourceUtil.getStringId(getActivity(), "qj_pls_input_right_phone"))).show();
 
                 return;
             }
@@ -126,7 +123,7 @@ public class UserPhoneLoginFragment extends BaseFragment {
 
         if(account.length() < 10 || Utils.judgeStrNull(account))
         {
-            new TosUtil(getActivity(),"blue",getString(ResourceUtil.getStringId(getActivity(), "yyrh_pls_input_right_phone"))).show();
+            new TosUtil(getActivity(),TosUtil.TOAST_ERROR,getString(ResourceUtil.getStringId(getActivity(), "yyrh_pls_input_right_phone"))).show();
 
 
             return;
@@ -134,7 +131,7 @@ public class UserPhoneLoginFragment extends BaseFragment {
         if(pwd.length() < 6 || Utils.judgeStrNull(pwd))
         {
 
-            new TosUtil(getActivity(),"blue", getString(ResourceUtil.getStringId(getActivity(), "yyrh_pwd_limit_6"))).show();
+            new TosUtil(getActivity(),TosUtil.TOAST_ERROR, getString(ResourceUtil.getStringId(getActivity(), "yyrh_pwd_limit_6"))).show();
 
 
 
@@ -142,14 +139,14 @@ public class UserPhoneLoginFragment extends BaseFragment {
         }
         if(code.length() < 4 || Utils.judgeStrNull(code))
         {
-            new TosUtil(getActivity(),"blue", getString(ResourceUtil.getStringId(getActivity(), "yyrh_pls_input_right_code"))).show();
+            new TosUtil(getActivity(),TosUtil.TOAST_ERROR, getString(ResourceUtil.getStringId(getActivity(), "yyrh_pls_input_right_code"))).show();
 
             return;
         }
 
         if (!cb_register.isChecked()){
 
-            new TosUtil(getActivity(), "blue",getString(ResourceUtil.getStringId(getActivity(), "yyrh_pls_checked_reg_tip"))).show();
+            new TosUtil(getActivity(), TosUtil.TOAST_ERROR,getString(ResourceUtil.getStringId(getActivity(), "yyrh_pls_checked_reg_tip"))).show();
 
             return;
 
@@ -177,7 +174,7 @@ public class UserPhoneLoginFragment extends BaseFragment {
 
             @Override
             public void onRegisterFailed(String msg) {
-                new TosUtil(getActivity(),"blue", msg).show();
+                new TosUtil(getActivity(),TosUtil.TOAST_ERROR, msg).show();
             }
         });
     }
@@ -189,7 +186,7 @@ public class UserPhoneLoginFragment extends BaseFragment {
             public void onGetSuccess(String msg) {
                 getCodeSuccess();
 
-                new TosUtil(getActivity(),"green",getString(ResourceUtil.getStringId(getActivity(), "yyrh_send_code_success"))).show();
+                new TosUtil(getActivity(),TosUtil.TOAST_GREEN,getString(ResourceUtil.getStringId(getActivity(), "yyrh_send_code_success"))).show();
 
 
                 // ToastUtil.show(context,context.getString(ResourceUtil.getStringId(context, "yyrh_send_code_success")));
@@ -198,7 +195,7 @@ public class UserPhoneLoginFragment extends BaseFragment {
             @Override
             public void onGetFailed(String msg) {
 
-                new TosUtil(getActivity(),"blue",msg).show();
+                new TosUtil(getActivity(),TosUtil.TOAST_ERROR,msg).show();
 
             }
         });

hnqj/src/main/java/com/yyrh/ui/fragment/UserRegisterFragment.java

@@ -119,7 +119,7 @@ public class UserRegisterFragment extends BaseFragment {
             String url  =  SDKSettings.UserCentUrl + URLConstants.USERPROTOCOLWEB + "gcp_code=" + SDKSettings.gcp_code
                     + "&game_code=" + SDKSettings.game_code;
 
-            new WvPageListDialog(getActivity(),ResourceUtil.getStyleId(getActivity(),"yyrh_base_dialog"),url).show();
+            new WvPageListDialog(getActivity(),ResourceUtil.getStyleId(getActivity(),"qj_base_dialog"),url).show();
 
 
         }else if(id == ResourceUtil.getId(getActivity(), "tv_private_policy")){
@@ -127,7 +127,7 @@ public class UserRegisterFragment extends BaseFragment {
             String url  =  SDKSettings.UserCentUrl + URLConstants.USERPOLICYWEB + "gcp_code=" + SDKSettings.gcp_code
                     + "&game_code=" + SDKSettings.game_code;
 
-            new WvPageListDialog(getActivity(),ResourceUtil.getStyleId(getActivity(),"yyrh_base_dialog"),url).show();
+            new WvPageListDialog(getActivity(),ResourceUtil.getStyleId(getActivity(),"qj_base_dialog"),url).show();
 
 
         }else if(id == ResourceUtil.getId(getActivity(), "btn_account_login")){
@@ -151,31 +151,31 @@ public class UserRegisterFragment extends BaseFragment {
     private void startRegister(final String account, final String pwd) {
         if (!cb_register.isChecked()){
 
-            new TosUtil(getActivity(),"blue", getActivity().getString(ResourceUtil.getStringId(getActivity(), "yyrh_pls_checked_reg_tip"))).show();
+            new TosUtil(getActivity(),TosUtil.TOAST_ERROR, getActivity().getString(ResourceUtil.getStringId(getActivity(), "yyrh_pls_checked_reg_tip"))).show();
 
             return;
         }
         if (Utils.judgeStrNull(account)){
-            new TosUtil(getActivity(),"blue",  getActivity().getString(ResourceUtil.getStringId(getActivity(), "yyrh_band_need_account"))).show();
+            new TosUtil(getActivity(),TosUtil.TOAST_ERROR,  getActivity().getString(ResourceUtil.getStringId(getActivity(), "yyrh_band_need_account"))).show();
 
 
 
             return;
         }
         if (Utils.isNumeric(account)){
-            new TosUtil(getActivity(),"blue",  getActivity().getString(ResourceUtil.getStringId(getActivity(), "yyrh_acount_not_only_number"))).show();
+            new TosUtil(getActivity(),TosUtil.TOAST_ERROR,  getActivity().getString(ResourceUtil.getStringId(getActivity(), "yyrh_acount_not_only_number"))).show();
 
             return;
         }
         if (Utils.judgeStrNull(pwd)){
-            new TosUtil(getActivity(),"blue",  getActivity().getString(ResourceUtil.getStringId(getActivity(), "yyrh_band_need_pwd"))).show();
+            new TosUtil(getActivity(),TosUtil.TOAST_ERROR,  getActivity().getString(ResourceUtil.getStringId(getActivity(), "yyrh_band_need_pwd"))).show();
 
 
             return;
         }
 
         if (account.length() < 6 || pwd.length() > 20) {
-            new TosUtil(getActivity(),"blue",  getActivity().getString(ResourceUtil.getStringId(getActivity(), "yyrh_regist_account_error"))).show();
+            new TosUtil(getActivity(),TosUtil.TOAST_ERROR,  getActivity().getString(ResourceUtil.getStringId(getActivity(), "yyrh_regist_account_error"))).show();
 
 
             return;
@@ -183,7 +183,7 @@ public class UserRegisterFragment extends BaseFragment {
 
         if (pwd.length() < 6 || pwd.length() > 20) {
 
-            new TosUtil(getActivity(), "blue", getActivity().getString(ResourceUtil.getStringId(getActivity(), "yyrh_regist_pwd_error"))).show();
+            new TosUtil(getActivity(), TosUtil.TOAST_ERROR, getActivity().getString(ResourceUtil.getStringId(getActivity(), "yyrh_regist_pwd_error"))).show();
             return;
         }
 
@@ -196,7 +196,7 @@ public class UserRegisterFragment extends BaseFragment {
 
                 if (ScreenShotUtil.shotByView(getActivity(),getView())){
 
-                    new TosUtil(getActivity(),"green",  getString(ResourceUtil.getStringId(getActivity(), "yyrh_register_screen_tip"))).show();
+                    new TosUtil(getActivity(),TosUtil.TOAST_GREEN,  getString(ResourceUtil.getStringId(getActivity(), "yyrh_register_screen_tip"))).show();
 
                 }
 
@@ -212,7 +212,7 @@ public class UserRegisterFragment extends BaseFragment {
             @Override
             public void onRegisterFailed(String msg) {
 
-                new TosUtil(getActivity(),"blue",  msg).show();
+                new TosUtil(getActivity(),TosUtil.TOAST_ERROR,  msg).show();
 
 
             }

hnqj/src/main/java/com/yyrh/ui/fragment/UserRetrievePwdFragment.java

@@ -7,27 +7,19 @@ import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.text.method.HideReturnsTransformationMethod;
-import android.text.method.PasswordTransformationMethod;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.yyrh.networking.NetRequestApi;
-import com.yyrh.ui.ForgetPwdLayout;
-import com.yyrh.ui.LoginLayout;
 import com.yyrh.ui.userlist.DatabaseHelper;
-import com.yyrh.ui.widget.EditView;
 import com.yyrh.utils.ResourceUtil;
 import com.yyrh.utils.TosUtil;
 import com.yyrh.utils.Utils;
 
-import org.w3c.dom.Text;
-
 public class UserRetrievePwdFragment extends BaseFragment {
 
     private EditText et_user_phone,et_user_code,et_user_pwd;
@@ -72,7 +64,7 @@ public class UserRetrievePwdFragment extends BaseFragment {
             String phone =  et_user_phone.getText().toString();
 
             if (phone.length() < 10) {
-                new TosUtil(getActivity(),"blue", getString(ResourceUtil.getStringId(getActivity(), "yyrh_pls_input_right_phone"))).show();
+                new TosUtil(getActivity(),TosUtil.TOAST_ERROR, getString(ResourceUtil.getStringId(getActivity(), "yyrh_pls_input_right_phone"))).show();
                 return;
             }
             getPhoneCaptcha(getActivity(),phone,"modify_pwd");
@@ -82,20 +74,20 @@ public class UserRetrievePwdFragment extends BaseFragment {
             final String pwd = et_user_pwd.getText().toString();
             if (phone.length() < 10) {
 
-                new TosUtil(getActivity(),"blue",getString(ResourceUtil.getStringId(getActivity(), "yyrh_pls_input_right_phone"))).show();
+                new TosUtil(getActivity(),TosUtil.TOAST_ERROR,getString(ResourceUtil.getStringId(getActivity(), "yyrh_pls_input_right_phone"))).show();
 
                 return;
             }
             if(code.length() < 4 || Utils.judgeStrNull(code))
             {
-                new TosUtil(getActivity(),"blue",getString(ResourceUtil.getStringId(getActivity(), "yyrh_pls_input_right_code"))).show();
+                new TosUtil(getActivity(),TosUtil.TOAST_ERROR,getString(ResourceUtil.getStringId(getActivity(), "yyrh_pls_input_right_code"))).show();
 
 
                 return;
             }
             if(pwd.length() < 6 || Utils.judgeStrNull(pwd))
             {
-                new TosUtil(getActivity(),"blue", getString(ResourceUtil.getStringId(getActivity(), "yyrh_pwd_limit_6"))).show();
+                new TosUtil(getActivity(),TosUtil.TOAST_ERROR, getString(ResourceUtil.getStringId(getActivity(), "yyrh_pwd_limit_6"))).show();
 
                 return;
             }
@@ -118,14 +110,14 @@ public class UserRetrievePwdFragment extends BaseFragment {
             @Override
             public void onGetSuccess(String msg) {
                 getCodeSuccess();
-                new TosUtil(getActivity(),"green", getString(ResourceUtil.getStringId(getActivity(), "yyrh_send_code_success"))).show();
+                new TosUtil(getActivity(),TosUtil.TOAST_GREEN, getString(ResourceUtil.getStringId(getActivity(), "yyrh_send_code_success"))).show();
 
 
             }
 
             @Override
             public void onGetFailed(String msg) {
-                new TosUtil(getActivity(),"blue", msg).show();
+                new TosUtil(getActivity(),TosUtil.TOAST_ERROR, msg).show();
 
             }
         });
@@ -158,7 +150,7 @@ public class UserRetrievePwdFragment extends BaseFragment {
         public void onFinish() {
             // TODO Auto-generated method stub
             btn_get_code.setEnabled(true);
-
+            btn_get_code.setText(ResourceUtil.getStringId(getActivity(), "yyrh_get_phone_code"));
         }
 
     }
@@ -191,7 +183,7 @@ public class UserRetrievePwdFragment extends BaseFragment {
                 DatabaseHelper.excuteSql(getActivity(), insert_sql);
 
 
-                new TosUtil(getActivity(),"green", msg).show();
+                new TosUtil(getActivity(),TosUtil.TOAST_GREEN, msg).show();
 
                 Fragment accountLoginFragment = FragmentUtils.getSdkFragment(getActivity(),FragmentUtils.SDK_LOGIN_TAG);
                 replaceFragmentToActivity(getFragmentManager(),accountLoginFragment,ResourceUtil.getId(getActivity(),"qj_content"));
@@ -202,7 +194,7 @@ public class UserRetrievePwdFragment extends BaseFragment {
             @Override
             public void onResetFailed(String msg) {
 
-                new TosUtil(getActivity(),"blue",  msg).show();
+                new TosUtil(getActivity(),TosUtil.TOAST_ERROR,  msg).show();
 
             }
         });

hnqj/src/main/java/com/yyrh/ui/userlist/QjUserListAdapter.java

@@ -12,7 +12,6 @@ import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.yyrh.ui.LoginLayout;
 import com.yyrh.utils.ResourceUtil;
 
 import java.util.ArrayList;
@@ -55,7 +54,7 @@ public class QjUserListAdapter extends BaseAdapter {
 		// TODO Auto-generated method stub
 		ViewHolder holder = null;
 		if (convertView == null) {
-			convertView = mInflater.inflate(ResourceUtil.getLayoutId(context, "yyrh_user_list_item"), parent,false);
+			convertView = mInflater.inflate(ResourceUtil.getLayoutId(context, "qj_user_list_item"), parent,false);
 			holder = new ViewHolder();
 
 			holder.accountName = convertView

hnqj/src/main/java/com/yyrh/ui/userlist/UserListAdapter.java

@@ -1,115 +0,0 @@
-package com.yyrh.ui.userlist;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.database.sqlite.SQLiteDatabase;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.yyrh.utils.ResourceUtil;
-import com.yyrh.ui.LoginLayout;
-
-import java.util.ArrayList;
-
-
-public class UserListAdapter extends BaseAdapter {
-	private Context context;
-	public ArrayList<User> list;
-	private LayoutInflater mInflater = null;
-	DatabaseHelper dbHelper;
-	private LoginLayout loginLayout;
-
-	public UserListAdapter(LoginLayout loginLayout, Context context, ArrayList<User> list) {
-		this.context = context;
-		this.list = list;
-		this.mInflater = LayoutInflater.from(context);
-		this.loginLayout=loginLayout;
-	}
-
-	@Override
-	public int getCount() {
-		// TODO Auto-generated method stub
-		return list.size();
-	}
-
-	@Override
-	public Object getItem(int position) {
-		// TODO Auto-generated method stub
-		return position;
-	}
-
-	@Override
-	public long getItemId(int position) {
-		// TODO Auto-generated method stub
-		return position;
-	}
-
-	@Override
-	public View getView(final int position, View convertView, ViewGroup parent) {
-		// TODO Auto-generated method stub
-		ViewHolder holder = null;
-		if (convertView == null) {
-			convertView = mInflater.inflate(ResourceUtil.getLayoutId(context, "yyrh_user_list_item"), parent,false);
-			holder = new ViewHolder();
-
-			holder.accountName = convertView
-					.findViewById(ResourceUtil.getId(context, "history_account"));
-			holder.closeItem =  convertView
-					.findViewById(ResourceUtil.getId(context, "item_close"));
-			
-			holder.closeItem.setOnClickListener(new OnClickListener() {
-				
-				@Override
-				public void onClick(View v) {
-					// TODO Auto-generated method stub
-					deleteItem(position);
-				}
-			});
-			
-			convertView.setTag(holder);
-		} else {
-			holder = (ViewHolder) convertView.getTag();
-
-		}
-		holder.accountName.setText(list.get(position).uname);
-		return convertView;
-	}
-
-	class ViewHolder {
-		TextView accountName;
-		ImageView closeItem;
-
-	}
-	private void deleteItem(int position){
-		String uname = list.get(position).uname;
-		SharedPreferences sp = context.getSharedPreferences("ninsw", Activity.MODE_PRIVATE);
-		SharedPreferences.Editor editor = sp.edit();
-		String name = sp.getString("username", "");
-		if(uname.endsWith("name")){
-			editor.remove("username");
-			editor.remove("password");
-		}
-		
-		
-		dbHelper = new DatabaseHelper(context);
-		SQLiteDatabase db = null;
-		db = dbHelper.getReadableDatabase();
-		String sql = "delete from user where name = '"+list.get(position).uname+"'";
-		//执行SQL语句   
-		db.execSQL(sql);   
-		db.close();
-		list.remove(position);
-		if(list.size()==0){
-			loginLayout.tv.setVisibility(View.VISIBLE);
-		}
-	
-		this.notifyDataSetChanged();
-	}
-
-}

hnqj/src/main/java/com/yyrh/ui/webview/ProgressWebView.java

@@ -1,74 +0,0 @@
-package com.yyrh.ui.webview;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.webkit.ConsoleMessage;
-import android.webkit.JsResult;
-import android.webkit.WebView;
-import android.widget.ProgressBar;
-
-
-import com.yyrh.utils.ResourceUtil;
-
-
-
-public class ProgressWebView extends WebView {
-    private final static String TAG = ProgressWebView.class.getSimpleName();
-
-    private ProgressBar progressBar;
-    private Context context;
-
-
-    public ProgressWebView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        this.context = context;
-
-        progressBar = new ProgressBar(context,null, android.R.attr.progressBarStyleHorizontal);
-        progressBar.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, 3, 0, 0));
-                progressBar.setProgressDrawable(getResources().getDrawable(ResourceUtil.getDrawableId(context,"yyrh_wevbview_progressbar")));
-                addView(progressBar);
-                setWebChromeClient(new WebChromeClient());
-    }
-    public  class WebChromeClient extends android.webkit.WebChromeClient{
-        @Override
-        public void onProgressChanged(WebView view, int newProgress) {
-            if (newProgress == 100){
-                progressBar.setVisibility(GONE);
-            }else {
-                if (progressBar.getVisibility() == GONE){
-                    progressBar.setVisibility(VISIBLE);
-                    progressBar.setProgress(newProgress);
-                }
-                super.onProgressChanged(view, newProgress);
-            }
-
-        }
-
-        @Override
-        public boolean onConsoleMessage(ConsoleMessage cm) {
-            android.util.Log.d(TAG, "webview console " + cm.lineNumber() + " of " + cm.sourceId() + " : " + cm.message());
-                        return true;
-        }
-
-        @Override
-        public boolean onJsAlert(WebView view, String url, String message, JsResult result) {
-            result.cancel();
-            return true;
-        }
-
-
-
-
-    }
-    
-    @Override
-    protected void onScrollChanged(int l, int t, int oldl, int oldt) {
-        LayoutParams lp = (LayoutParams) progressBar.getLayoutParams();
-        lp.x = l;
-        lp.y = t;
-        progressBar.setLayoutParams(lp);
-        super.onScrollChanged(l, t, oldl, oldt);
-    }
-
-
-}

hnqj/src/main/java/com/yyrh/utils/TosUtil.java

@@ -16,7 +16,8 @@ public class TosUtil {
     private Toast mToast;
     private TextView mTextView;
     private ImageView mImageView;
-
+    public static String TOAST_GREEN = "green";
+    public static String TOAST_ERROR = "error";
     public TosUtil(Context context,String color,String msg) {
 
 
@@ -29,7 +30,7 @@ public class TosUtil {
         mTextView.setText(msg);
 
         mImageView = view.findViewById(ResourceUtil.getId(context, "toast_iv"));
-        if (color.equals("green")) {
+        if (color.equals(TOAST_GREEN)) {
             mImageView.setImageResource(ResourceUtil.getMipmapId(context, "qj_tips_success"));
         }
         else {

hnqj/src/main/java/com/yythird/base/ChannelSdkCallback.java

@@ -16,5 +16,5 @@ public interface ChannelSdkCallback {
     public void onUploadUserRealNameInfo(String report_type,String msg);
     public void onGetOaidCallback(boolean isSuccess,String oaid);
     public String onGetChannelUid();
-
+    public void onShowGameExit();
 }

hnqj/src/main/java/com/yythird/sdk/ChannelSDK.java

@@ -37,6 +37,7 @@ public class ChannelSDK extends BaseSDK {
         return instance;
     }
 
+
     @Override
     public String SDKGetOrderExt() {
         return super.SDKGetOrderExt();
@@ -56,12 +57,10 @@ public class ChannelSDK extends BaseSDK {
 
     }
 
-
     @Override
     public void SDKExit(Activity ac, ChannelSdkCallback sdkCallback) {
-        super.SDKExit(ac, sdkCallback);
 
-        Log.i("ChannelSDK","SDKExit");
+        getSdkCallback().onShowGameExit();
     }
 
     @Override

hnqj/src/main/res/drawable/yyrh_color_white.xml → hnqj/src/main/res/drawable/qj_color_white_70.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/yyrh_white" />
+    <solid android:color="@color/qj_white_70" />
+    <corners android:radius="8dp" />
 </shape>

hnqj/src/main/res/drawable/yyrh_dialog_ios_bg.xml → hnqj/src/main/res/drawable/qj_dialog_ios_bg.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="@color/yyrh_white"/>
+    <solid android:color="@color/qj_white"/>
     <corners android:radius="10dp"/>
 </shape>

hnqj/src/main/res/drawable/qj_exit_bg.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" >
 
-    <solid android:color="@color/qj_white_90" />
+    <solid android:color="@color/qj_white_83" />
 
     <stroke android:width="0.5dp" android:color="@color/yyrh_deepgrey"/>
     <corners android:radius="10dp" />

hnqj/src/main/res/drawable/yyrh_game_float_menu_bg.xml → hnqj/src/main/res/drawable/qj_game_float_menu_bg.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/yyrh_white"/>
+    <solid android:color="@color/qj_white"/>
     <stroke
         android:width="1px"
-        android:color="@color/yyrh_btn4_color"/>
+        android:color="@color/qj_green_line"/>
     <corners
         android:bottomLeftRadius="50dp"
         android:bottomRightRadius="50dp"

hnqj/src/main/res/drawable/qj_login_bg.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" >
 
-    <solid android:color="@color/qj_white_90" />
+    <solid android:color="@color/qj_white_83" />
 
       <corners android:radius="10dp" />
 

hnqj/src/main/res/drawable/qj_progress_drawable_white.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animation-list android:oneshot="false"
+                xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:duration="83" android:drawable="@mipmap/qj_ic_loading_white_01" />
+    <item android:duration="83" android:drawable="@mipmap/qj_ic_loading_white_02" />
+    <item android:duration="83" android:drawable="@mipmap/qj_ic_loading_white_03" />
+    <item android:duration="83" android:drawable="@mipmap/qj_ic_loading_white_04" />
+    <item android:duration="83" android:drawable="@mipmap/qj_ic_loading_white_05" />
+    <item android:duration="83" android:drawable="@mipmap/qj_ic_loading_white_06" />
+    <item android:duration="83" android:drawable="@mipmap/qj_ic_loading_white_07" />
+    <item android:duration="83" android:drawable="@mipmap/qj_ic_loading_white_08" />
+    <item android:duration="83" android:drawable="@mipmap/qj_ic_loading_white_09" />
+    <item android:duration="83" android:drawable="@mipmap/qj_ic_loading_white_10" />
+    <item android:duration="83" android:drawable="@mipmap/qj_ic_loading_white_11" />
+    <item android:duration="83" android:drawable="@mipmap/qj_ic_loading_white_12" />
+</animation-list>

hnqj/src/main/res/drawable/yyrh_radius_white_1dp.xml → hnqj/src/main/res/drawable/qj_radius_white_10dp.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" >
 
-    <solid android:color="@color/yyrh_white" />
+    <solid android:color="@color/qj_white" />
 
-    <stroke android:width="0.5dp" android:color="@color/yyrh_deepgrey"/>
+    <stroke android:width="0.5dp" android:color="@color/qj_deepgrey"/>
     <corners android:radius="10dp" />
 
 

hnqj/src/main/res/drawable/yyrh_radius_white_3dp.xml → hnqj/src/main/res/drawable/qj_radius_white_12dp.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" >
 
-    <solid android:color="@color/yyrh_white" />
+    <solid android:color="@color/qj_white" />
 
-    <stroke android:width="1dp" android:color="@color/yyrh_deepgrey"/>
+    <stroke android:width="1dp" android:color="@color/qj_deepgrey"/>
     <corners android:radius="12dp" />
 
 

hnqj/src/main/res/drawable/qj_radius_white_1dp.xml

@@ -3,7 +3,7 @@
 
     <solid android:color="@color/yyrh_white" />
 
-    <stroke android:width="0.5dp" android:color="@color/yyrh_deepgrey"/>
+    <stroke android:width="0.5dp" android:color="@color/qj_deepgrey"/>
     <corners android:radius="10dp" />
 
 

hnqj/src/main/res/drawable/yyrh_40_deepgrey_bg.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <solid android:color="@color/yyrh_black_color_40" />
-
-
-</shape>

hnqj/src/main/res/drawable/yyrh_progress_drawable_white.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<animation-list android:oneshot="false"
-                xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:duration="83" android:drawable="@mipmap/yyrh_ic_loading_white_01" />
-    <item android:duration="83" android:drawable="@mipmap/yyrh_ic_loading_white_02" />
-    <item android:duration="83" android:drawable="@mipmap/yyrh_ic_loading_white_03" />
-    <item android:duration="83" android:drawable="@mipmap/yyrh_ic_loading_white_04" />
-    <item android:duration="83" android:drawable="@mipmap/yyrh_ic_loading_white_05" />
-    <item android:duration="83" android:drawable="@mipmap/yyrh_ic_loading_white_06" />
-    <item android:duration="83" android:drawable="@mipmap/yyrh_ic_loading_white_07" />
-    <item android:duration="83" android:drawable="@mipmap/yyrh_ic_loading_white_08" />
-    <item android:duration="83" android:drawable="@mipmap/yyrh_ic_loading_white_09" />
-    <item android:duration="83" android:drawable="@mipmap/yyrh_ic_loading_white_10" />
-    <item android:duration="83" android:drawable="@mipmap/yyrh_ic_loading_white_11" />
-    <item android:duration="83" android:drawable="@mipmap/yyrh_ic_loading_white_12" />
-</animation-list>

hnqj/src/main/res/drawable/yyrh_radius_blue_3dp.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <solid android:color="@color/yyrh_blue_color" />
-
-    <stroke android:width="1dp" android:color="@color/yyrh_blue_color"/>
-    <corners android:radius="12dp" />
-
-
-</shape>

hnqj/src/main/res/drawable/yyrh_radius_deep_blue_3dp.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <solid android:color="@color/yyrh_white" />
-
-    <stroke android:width="1dp" android:color="@color/yyrh_deepgrey"/>
-    <corners
-        android:topLeftRadius="12dp"
-        android:topRightRadius="12dp"
-        android:bottomRightRadius="0dp"
-        android:bottomLeftRadius="0dp"
-
-        />
-
-
-</shape>

hnqj/src/main/res/drawable/yyrh_radius_deepgray_bg.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/yyrh_deepgrey"/>
-    <corners
-        android:bottomLeftRadius="5dp"
-        android:bottomRightRadius="5dp"
-        android:topLeftRadius="5dp"
-        android:topRightRadius="5dp"/>
-</shape>

hnqj/src/main/res/drawable/yyrh_radius_deepgrey_2dp.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <solid android:color="@color/yyrh_white_90" />
-    <stroke android:width="1dp"
-        android:color="@color/yyrh_deepgrey"/>
-
-    <corners android:radius="4dp" />
-
-</shape>

hnqj/src/main/res/drawable/yyrh_radius_green_3dp.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <solid android:color="@color/yyrh_btn2_color" />
-
-    <stroke android:width="1dp" android:color="@color/yyrh_btn2_color"/>
-    <corners android:radius="12dp" />
-
-
-</shape>

hnqj/src/main/res/drawable/yyrh_radius_grey_3dp.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <solid android:color="@color/yyrh_deepgrey" />
-
-    <stroke android:width="1dp" android:color="@color/yyrh_deepgrey"/>
-    <corners android:radius="12dp" />
-
-
-</shape>

hnqj/src/main/res/drawable/yyrh_radius_main_color_1dp.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/yyrh_white" />
-    <stroke android:width="1dp"
-        android:color="@color/yyrh_main_color"/>
-
-    <corners android:radius="4dp" />
-</shape>

hnqj/src/main/res/drawable/yyrh_radius_main_color_bg.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/yyrh_main_color"/>
-    <corners
-        android:bottomLeftRadius="5dp"
-        android:bottomRightRadius="5dp"
-        android:topLeftRadius="5dp"
-        android:topRightRadius="5dp"/>
-</shape>

hnqj/src/main/res/drawable/yyrh_radius_red_2dp.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <solid android:color="@color/yyrh_red" >
-    </solid>
-
-    <corners android:radius="2dp" />
-
-
-</shape>

hnqj/src/main/res/drawable/yyrh_radius_yellow_2dp.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <solid android:color="@color/yyrh_deepyellow" >
-    </solid>
-
-    <corners android:radius="2dp" />
-
-
-</shape>

hnqj/src/main/res/drawable/yyrh_wevbview_progressbar.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-     <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-        <!-- 背景 -->
-        <item android:id="@android:id/background">
-             <shape>
-                <solid android:color="@color/yyrh_deepgrey" />
-             </shape>
-         </item>
-        <!-- 进度条 -->
-         <item android:id="@android:id/progress">
-             <clip>
-                 <shape>
-                     <solid android:color="@color/yyrh_blue_color" />
-                 </shape>
-            </clip>
-         </item>
-     </layer-list>

hnqj/src/main/res/layout/qj_account_login.xml

@@ -52,7 +52,7 @@
             android:layout_height="40dp"
             android:background="@drawable/qj_edittext_bg"
             android:digits="0123456789abcdefghijgklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-            android:drawableLeft="@mipmap/qj_account"
+            android:drawableLeft="@mipmap/qj_account_login"
             android:drawablePadding="10dp"
             android:gravity="center_vertical"
             android:hint="@string/qj_input_your_account"
@@ -114,7 +114,7 @@
             android:background="@drawable/qj_login_button_style"
             android:layout_centerHorizontal="true"
             android:text="@string/qj_login"
-            android:textColor="@color/yyrh_white"
+            android:textColor="@color/qj_white"
             android:textSize="16sp" />
     </RelativeLayout>
 
@@ -148,13 +148,13 @@
         android:layout_height="40dp"
         android:gravity="center_vertical"
         android:layout_centerHorizontal="true"
-        android:background="@drawable/yyrh_radius_white_1dp"
+        android:background="@drawable/qj_radius_white_10dp"
         android:paddingLeft="10dp"
-        android:text="@string/yyrh_no_record"
+        android:text="@string/qj_no_record"
         android:layout_marginTop="105dp"
         android:visibility="gone"
         android:textSize="18sp"
-        android:textColor="@color/yyrh_font_lightblack"
+        android:textColor="@color/qj_text_black"
 
         />
 

hnqj/src/main/res/layout/yyrh_dialog_progress.xml → hnqj/src/main/res/layout/qj_dialog_progress.xml

@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:background="@mipmap/yyrh_ic_loading_bg"
+              android:background="@mipmap/qj_ic_loading_bg"
               android:gravity="center"
               android:orientation="vertical"
               android:padding="16.0dip" >
@@ -10,7 +10,7 @@
     <ProgressBar
             android:layout_width="30.0dip"
             android:layout_height="30.0dip"
-            android:indeterminateDrawable="@drawable/yyrh_progress_drawable_white" />
+            android:indeterminateDrawable="@drawable/qj_progress_drawable_white" />
 
     <TextView
             android:id="@+id/id_tv_loadingmsg"

hnqj/src/main/res/layout/qj_edittext_style.xml

@@ -12,7 +12,7 @@ android:layout_height="wrap_content"
         android:id="@+id/iv_left_view"
         android:layout_width="18dp"
         android:layout_height="20dp"
-        android:background="@mipmap/qj_account"
+        android:background="@mipmap/qj_account_login"
         android:layout_centerVertical="true"
         android:layout_marginLeft="13dp"
         />

hnqj/src/main/res/layout/yyrh_exit_game_dialog.xml → hnqj/src/main/res/layout/qj_exit_game_dialog.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/linear"
+    android:id="@+id/ll_exit_game"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center"
@@ -27,7 +27,7 @@
             android:layout_width="match_parent"
             android:layout_height="45dp"
             android:gravity="center_horizontal"
-            android:text="@string/yyrh_issure_exit"
+            android:text="@string/qj_issure_exit"
             android:textColor="@color/qj_text_black"
             android:textSize="16sp" />
         <View

hnqj/src/main/res/layout/yyrh_ios_style_dialog.xml → hnqj/src/main/res/layout/qj_ios_style_dialog.xml

@@ -3,7 +3,7 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/yyrh_dialog_ios_bg">
+    android:background="@drawable/qj_dialog_ios_bg">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -13,25 +13,25 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/yyrh_black"
+            android:textColor="@color/qj_black"
             android:textSize="16sp"
             android:textStyle="bold"
-            android:text="@string/yyrh_title_tip"/>
+            android:text="@string/qj_title_tip"/>
 
         <TextView
             android:id="@+id/content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
-            android:textColor="@color/yyrh_black"
+            android:textColor="@color/qj_black"
             android:textSize="12sp"
-            android:text="@string/yyrh_network_error_tip"/>
+            android:text="@string/qj_network_error_tip"/>
     </LinearLayout>
 
     <View
         android:layout_width="match_parent"
         android:layout_height="1px"
-        android:background="@color/yyrh_dialog_line"/>
+        android:background="@color/qj_dialog_line"/>
 
     <TextView
         android:id="@+id/confirm"
@@ -39,7 +39,7 @@
         android:layout_height="40dp"
         android:gravity="center"
         android:layout_gravity="center_horizontal"
-        android:textColor="@color/yyrh_blues"
+        android:textColor="@color/qj_blues"
         android:textSize="16sp"
-        android:text="@string/yyrh_confirm"/>
+        android:text="@string/qj_confirm"/>
     </LinearLayout>

hnqj/src/main/res/layout/yyrh_pay_webview_landscape.xml → hnqj/src/main/res/layout/qj_p_webview.xml

@@ -1,9 +1,10 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="380dp"
+    android:layout_width="360dp"
     android:layout_height="320dp"
     android:gravity="center"
-    android:background="@drawable/yyrh_radius_white_1dp"
+    android:background="@drawable/qj_radius_white_10dp"
     android:orientation="vertical"
+    android:id="@+id/ll_p_wb"
     >
         <RelativeLayout
             android:layout_width="match_parent"
@@ -26,8 +27,7 @@
                 android:layout_marginTop="15dp"
                 android:layout_marginRight="5dp"
                 android:padding="10dp"
-                android:src="@mipmap/yyrh_close_btn"
-                android:layout_alignRight="@+id/tv_pay_tip"
+                android:src="@mipmap/qj_close"
                 android:layout_alignParentRight="true"
 
                 />

hnqj/src/main/res/layout/qj_phone_login.xml

@@ -118,8 +118,8 @@
                 android:layout_marginLeft="10dp"
                 android:layout_toRightOf="@id/cb_register"
                 android:gravity="center"
-                android:text="@string/qj_agreement"
-                android:textColor="@color/yyrh_font_lightblack"
+                android:text="@string/qj_agreement_tip"
+                android:textColor="@color/qj_text_black"
                 android:textSize="11.3sp" />
 
             <TextView
@@ -139,7 +139,7 @@
                 android:layout_toRightOf="@id/tv_tip"
                 android:gravity="center"
                 android:text="@string/qj_and"
-                android:textColor="@color/yyrh_font_lightblack"
+                android:textColor="@color/qj_text_black"
                 android:textSize="11.3sp" />
 
             <TextView

hnqj/src/main/res/layout/yyrh_privacy_policy_dialog.xml → hnqj/src/main/res/layout/qj_privacy_policy_dialog.xml

@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="420dp"
-    android:layout_height="match_parent"
-    android:background="@drawable/yyrh_radius_white_3dp"
-    android:orientation="vertical">
+    android:layout_width="360dp"
+    android:layout_height="280dp"
+    android:background="@drawable/qj_color_white_70"
+    android:orientation="vertical"
+    android:id="@+id/ll_private_policy"
+    >
 
 
 <RelativeLayout
     android:layout_width="match_parent"
     android:layout_height="0dp"
-    android:layout_weight="8"
+    android:layout_weight="7"
     android:layout_marginTop="10dp"
     android:layout_marginLeft="2dp"
     android:layout_marginRight="2dp"
@@ -19,19 +21,20 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_gravity="center"
+            android:background="@color/qj_transparent"
             />
 
     <ImageView
             android:layout_width="30dp"
             android:layout_height="30dp"
             android:layout_centerInParent="true"
-            android:id="@+id/yyrh_loading"
-            android:background="@mipmap/yyrh_loading"/>
+            android:id="@+id/qj_loading"
+            android:background="@mipmap/qj_loading"/>
 </RelativeLayout>
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="2"
+        android:layout_weight="3"
         android:orientation="horizontal"
         >
         <View
@@ -46,10 +49,9 @@
             android:layout_height="30dp"
             android:layout_weight="2"
             android:layout_gravity="center"
-
-            android:text="@string/yyrh_disagreement"
-            android:textColor="@color/yyrh_white"
-            android:background="@color/yyrh_deepgrey"/>
+            android:text="@string/qj_disagreement"
+            android:textColor="@color/qj_text_orange_color"
+            android:background="@drawable/qj_btn_account_bg"/>
         <View
             android:layout_width="0dp"
             android:layout_height="match_parent"
@@ -67,10 +69,9 @@
             android:layout_height="30dp"
             android:layout_weight="2"
             android:layout_gravity="center"
-
-            android:background="@color/yyrh_btn1_color"
-            android:textColor="@color/yyrh_white"
-            android:text="@string/yyrh_agreement"/>
+            android:background="@drawable/qj_login_button_style"
+            android:textColor="@color/qj_white"
+            android:text="@string/qj_agreement"/>
         <View
             android:layout_width="0dp"
             android:layout_height="match_parent"

hnqj/src/main/res/layout/qj_register_dialog.xml

@@ -53,7 +53,7 @@
             android:layout_height="40dp"
             android:background="@drawable/qj_edittext_bg"
             android:digits="0123456789abcdefghijgklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-            android:drawableLeft="@mipmap/qj_account"
+            android:drawableLeft="@mipmap/qj_account_login"
             android:drawablePadding="10dp"
             android:gravity="center_vertical"
             android:hint="@string/qj_input_your_account"
@@ -130,8 +130,8 @@
             android:layout_height="match_parent"
             android:gravity="center"
             android:textSize="11.2sp"
-            android:text="@string/qj_agreement"
-            android:textColor="@color/yyrh_font_lightblack"/>
+            android:text="@string/qj_agreement_tip"
+            android:textColor="@color/qj_text_black"/>
         <TextView
             android:id="@+id/tv_tip"
            android:layout_toRightOf="@id/tv_agree_tip"
@@ -149,7 +149,7 @@
             android:gravity="center"
             android:textSize="11.2sp"
             android:text="@string/qj_and"
-            android:textColor="@color/yyrh_font_lightblack"/>
+            android:textColor="@color/qj_text_black"/>
         <TextView
             android:id="@+id/tv_private_policy"
             android:layout_toRightOf="@id/tv_and_tip"
@@ -171,7 +171,7 @@
         android:background="@drawable/qj_login_button_style"
         android:layout_centerHorizontal="true"
         android:text="@string/qj_login"
-        android:textColor="@color/yyrh_white"
+        android:textColor="@color/qj_white"
         android:textSize="16sp" />
 
     <Button

hnqj/src/main/res/layout/qj_retrieve_pwd.xml

@@ -127,9 +127,9 @@
             android:layout_centerHorizontal="true"
             android:layout_gravity="center_horizontal"
             android:background="@drawable/qj_login_button_style"
-            android:text="@string/yyrh_find_pwd_phone"
+            android:text="@string/qj_find_pwd_phone"
             android:textSize="16sp"
-            android:textColor="@color/yyrh_white"
+            android:textColor="@color/qj_white"
             android:minHeight="1dp"
             android:minWidth="1dp"
             android:gravity="center"

hnqj/src/main/res/layout/yyrh_show_splash_view.xml → hnqj/src/main/res/layout/qj_show_splash_view.xml

@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="@color/yyrh_white">
+    android:background="@color/qj_white">
     
     <ImageView 
         android:id="@+id/iv_show_bg"

hnqj/src/main/res/layout/yyrh_user_list_item.xml → hnqj/src/main/res/layout/qj_user_list_item.xml

@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="40dp"
-    android:background="@color/yyrh_white_90"
+    android:background="@color/qj_white_90"
     android:id="@+id/rl_item"
     >
 
@@ -13,7 +13,7 @@
         android:layout_centerVertical="true"
         android:layout_marginLeft="20dp"
         android:textSize="18sp"
-        android:textColor="@color/yyrh_font_lightblack"
+        android:textColor="@color/qj_text_black"
          />
 
     <ImageView
@@ -23,12 +23,12 @@
         android:layout_alignParentRight="true"
         android:layout_marginRight="10dp"
         android:layout_centerVertical="true"
-        android:src="@mipmap/yyrh_accoutn_del_x" />
+        android:src="@mipmap/qj_close" />
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_alignParentBottom="true"
-        android:background="@color/yyrh_deepgrey"
+        android:background="@color/qj_deepgrey"
 
         />
 </RelativeLayout>

hnqj/src/main/res/layout/qj_webview_common_dialog.xml

@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="380dp"
+    android:layout_width="360dp"
     android:layout_height="280dp"
-    android:background="@drawable/yyrh_radius_white_3dp"
-    android:orientation="vertical">
+    android:background="@drawable/qj_radius_white_12dp"
+    android:orientation="vertical"
+    android:id="@+id/ll_webview_common"
+    >
 
     <RelativeLayout
         android:id="@+id/rl1"
@@ -11,14 +13,7 @@
         android:layout_height="match_parent"
         >
 
-        <Button
-            android:id="@+id/close_btn"
-            android:layout_width="8dp"
-            android:layout_height="16dp"
-            android:layout_marginLeft="20dp"
-            android:layout_marginTop="20dp"
-            android:background="@mipmap/qj_reback"
-            />
+
         <WebView
             android:id="@+id/wb_user_info"
             android:layout_width="match_parent"
@@ -36,8 +31,19 @@
             android:layout_width="30dp"
             android:layout_height="30dp"
             android:layout_centerInParent="true"
-            android:id="@+id/yyrh_loading"
-            android:background="@mipmap/yyrh_loading"/>
+            android:id="@+id/qj_loading"
+            android:background="@mipmap/qj_loading"/>
+        <ImageView
+            android:id="@+id/close_btn"
+            android:layout_width="16dp"
+            android:layout_height="16dp"
+            android:layout_margin="20dp"
+            android:background="@mipmap/qj_close"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="5dp"
+            android:layout_marginTop="15dp"
+            android:padding="10dp"
+            />
     </RelativeLayout>
 
 

hnqj/src/main/res/layout/yyrh_auto_login_dialog.xml

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="350dp"
-    android:layout_height="144dp"
-    android:id="@+id/yyrh_auto_login_dialog"
-    android:background="@drawable/yyrh_radius_white_1dp"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"
-        android:layout_gravity="center_horizontal">
-        
-        <ImageView
-            android:layout_width="26dp"
-            android:layout_height="26dp"
-            android:id="@+id/yyrh_autoLogin_icon"
-            android:background="@mipmap/yyrh_loading"/>
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/yyrh_autoLogin_text"
-            android:layout_marginLeft="10dp"
-            android:textSize="14dp"
-            android:layout_gravity="center_vertical"
-
-            android:text="@string/yyrh_autologin_text"/>
-    </LinearLayout>
-    
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="20dp">
-        <Button
-            android:id="@+id/yyrh_autoLogin_cancel_Btn"
-            android:layout_width="165dp"
-            android:layout_height="40dp"
-            android:background="@drawable/yyrh_radius_main_color_bg"
-            android:text="@string/yyrh_autologin_cancel"
-            android:textSize="16dp"
-            android:textColor="@color/yyrh_white"></Button>
-    </LinearLayout>
-
-</LinearLayout>

hnqj/src/main/res/layout/yyrh_exit_game_dialog_protrait.xml

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="350dp"
-    android:layout_height="250dp"
-    android:background="@drawable/yyrh_radius_white_3dp"
-    android:orientation="vertical"
-    >
-
-    <RelativeLayout
-        android:id="@+id/rl1"
-        android:layout_width="match_parent"
-        android:layout_height="60dp"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:layout_centerInParent= "true"
-            android:textColor="@color/yyrh_font_lightblack"
-            android:text="@string/yyrh_exit_tip"
-            android:textSize="20sp"
-            />
-
-    </RelativeLayout>
-
-    <LinearLayout
-        android:layout_gravity="center"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/tv_tip"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="2"
-            android:gravity="center"
-            android:text="@string/yyrh_issure_exit"
-            android:textColor="@color/yyrh_font_lightblack"
-            android:textSize="18sp" />
-
-        <LinearLayout
-            android:layout_width="290dp"
-            android:layout_height="0dp"
-            android:layout_below="@id/tv_tip"
-            android:layout_gravity="center_horizontal"
-            android:layout_weight="2"
-            android:layout_margin="20dp"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/find_pwd_confirm_btn"
-                android:layout_width="0dp"
-                android:layout_height="40dp"
-                android:layout_marginRight="20dp"
-                android:layout_weight="1"
-                android:background="@drawable/yyrh_radius_main_color_bg"
-                android:text="@string/yyrh_sure"
-                android:textColor="@color/yyrh_white"
-                android:layout_gravity="center"/>
-
-            <Button
-                android:id="@+id/find_pwd_cancel_btn"
-                android:layout_width="0dp"
-                android:layout_height="40dp"
-                android:layout_marginLeft="20dp"
-                android:layout_weight="1"
-                android:background="@drawable/yyrh_radius_deepgray_bg"
-                android:text="@string/yyrh_cancel"
-                android:textColor="@color/yyrh_white"
-                android:layout_gravity="center"/>
-        </LinearLayout>
-    </LinearLayout>
-</LinearLayout>

hnqj/src/main/res/layout/yyrh_loading_progress.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:orientation="vertical"
-    android:background="#FFFFFF"
-    android:gravity="center"
-    android:layout_height="match_parent">
-
-    <com.yyrh.ui.loading.ShapeView
-        android:id="@+id/shape_view"
-        android:layout_width="25dp"
-        android:layout_marginBottom="82dp"
-        android:layout_height="25dp" />
-
-    <View
-        android:id="@+id/shadow_view"
-        android:background="@color/yyrh_white_90"
-        android:layout_width="25dp"
-        android:layout_height="3dp"/>
-
-    <TextView
-        android:layout_marginTop="5dp"
-        android:layout_width="wrap_content"
-        android:text="玩命加载中..."
-        android:layout_height="wrap_content" />
-</LinearLayout>

hnqj/src/main/res/layout/yyrh_login_dialog.xml

@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="380dp"
-    android:layout_height="280dp"
-    android:background="@drawable/yyrh_radius_white_1dp"
-    >
-
-    <LinearLayout
-
-        android:id="@+id/ll_1"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical" >
-        <RelativeLayout
-            android:id="@+id/rl1"
-            android:layout_width="match_parent"
-            android:layout_height="60dp"
-            >
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:layout_centerInParent= "true"
-                android:textColor="@color/yyrh_font_lightblack"
-                android:text="@string/yyrh_account_login"
-                android:textSize="18sp"
-                />
-
-        </RelativeLayout>
-
-
-        <RelativeLayout
-            android:id="@+id/rl_1"
-            android:layout_width="320dp"
-            android:layout_height="40dp"
-            android:layout_marginTop="5dp"
-            android:layout_gravity="center_horizontal"
-            >
-            <EditText
-                android:id="@+id/yyrh_user_edit"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@drawable/yyrh_radius_deepgrey_2dp"
-                android:drawableLeft="@mipmap/yyrh_account_icon"
-                android:drawablePadding="10dp"
-                android:hint="@string/yyrh_input_account_pls"
-                android:paddingLeft="10dp"
-                android:textSize="16sp"
-                android:maxLength="20"
-                android:digits="0123456789abcdefghijgklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                android:layout_centerVertical="true"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:gravity="center_vertical"/>
-
-            <ImageView
-                android:id="@+id/down_btn"
-                android:layout_width="28dp"
-                android:layout_height="match_parent"
-                android:layout_alignRight="@+id/yyrh_user_edit"
-                android:layout_centerHorizontal="true"
-                android:layout_centerVertical="true"
-                android:paddingRight="14dp"
-                android:src="@mipmap/yyrh_arrow_normal" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:layout_width="320dp"
-            android:layout_height="40dp"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="15dp"
-            >
-
-            <EditText
-                android:id="@+id/yyrh_pwd_edit"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_centerHorizontal="true"
-                android:background="@drawable/yyrh_radius_deepgrey_2dp"
-                android:drawableLeft="@mipmap/yyrh_pwd_icon"
-                android:drawablePadding="10dp"
-                android:hint="@string/yyrh_input_pwd_pls"
-                android:paddingLeft="10dp"
-                android:textSize="16sp"
-                android:maxLength="20"
-                android:digits="0123456789abcdefghijgklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                android:gravity="center_vertical"
-                android:inputType="textPassword"
-                />
-
-            <ImageView
-                android:id="@+id/down_eye_btn"
-                android:layout_width="30dp"
-                android:layout_height="match_parent"
-                android:paddingRight="10dp"
-                android:layout_alignRight="@+id/yyrh_pwd_edit"
-                android:layout_centerHorizontal="true"
-                android:layout_centerInParent="true"
-                android:src="@mipmap/yyrh_eye_icon_normal"
-                />
-
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/rl_2"
-            android:layout_width="320dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
-            android:layout_gravity="center_horizontal"
-            >
-            <Button
-                android:id="@+id/yyrh_enter_btn"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:layout_centerHorizontal="true"
-                android:layout_gravity="center_horizontal"
-                android:background="@drawable/yyrh_radius_main_color_bg"
-                android:text="@string/yyrh_enter_game"
-                android:textSize="16sp"
-                android:textColor="@color/yyrh_white"
-                android:gravity="center"
-                />
-
-            <Button
-                android:id="@+id/yyrh_forget_pwd_btn"
-                android:layout_below="@id/yyrh_enter_btn"
-                android:layout_width="100dp"
-                android:layout_height="40dp"
-                android:layout_marginTop="10dp"
-                android:textSize="16sp"
-                android:text="@string/yyrh_forget_pwd"
-                android:textColor="@color/yyrh_main_color"
-                android:background="@drawable/yyrh_color_white"
-                android:gravity="center_vertical" />
-
-            <Button
-                android:id="@+id/yyrh_reg_btn"
-                android:layout_below="@id/yyrh_enter_btn"
-                android:layout_alignParentRight="true"
-                android:layout_width="100dp"
-                android:layout_height="40dp"
-                android:layout_marginTop="10dp"
-                android:textSize="16sp"
-                android:text="@string/yyrh_1s_register"
-                android:textColor="@color/yyrh_main_color"
-                android:background="@drawable/yyrh_color_white"
-                android:gravity="right|center_vertical" />
-        </RelativeLayout>
-
-
-    </LinearLayout>
-
-    <ListView
-        android:layout_marginTop="105dp"
-        android:layout_centerHorizontal="true"
-        android:id="@+id/account_listview"
-        android:layout_width="320dp"
-        android:layout_height="160dp"
-        android:divider="@null"
-        android:visibility="gone"
-        />
-
-    <TextView
-        android:id="@+id/list_text"
-        android:layout_width="320dp"
-        android:layout_height="40dp"
-        android:gravity="center_vertical"
-        android:layout_centerHorizontal="true"
-        android:background="@drawable/yyrh_radius_white_1dp"
-        android:paddingLeft="10dp"
-        android:text="@string/yyrh_no_record"
-        android:layout_marginTop="105dp"
-        android:visibility="gone"
-        android:textSize="18sp"
-        android:textColor="@color/yyrh_font_lightblack"
-
-        />
-</RelativeLayout>

hnqj/src/main/res/layout/yyrh_login_dialog_protrait.xml

@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="350dp"
-    android:layout_height="280dp"
-    android:background="@drawable/yyrh_radius_white_1dp"
-    >
-
-    <LinearLayout
-        android:id="@+id/ll_1"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical" >
-        <RelativeLayout
-            android:id="@+id/rl1"
-            android:layout_width="match_parent"
-            android:layout_height="60dp"
-            >
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:layout_centerInParent= "true"
-                android:textColor="@color/yyrh_font_lightblack"
-                android:text="@string/yyrh_account_login"
-                android:textSize="18sp"
-                />
-        </RelativeLayout>
-
-
-        <RelativeLayout
-            android:id="@+id/rl_1"
-            android:layout_width="290dp"
-            android:layout_height="40dp"
-            android:layout_marginTop="5dp"
-            android:layout_gravity="center_horizontal"
-            >
-
-
-
-            <EditText
-                android:id="@+id/yyrh_user_edit"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@drawable/yyrh_radius_deepgrey_2dp"
-                android:drawableLeft="@mipmap/yyrh_account_icon"
-                android:drawablePadding="10dp"
-                android:hint="@string/yyrh_input_account_pls"
-                android:paddingLeft="10dp"
-                android:textSize="14sp"
-                android:maxLength="20"
-                android:digits="0123456789abcdefghijgklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                android:layout_centerVertical="true"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:gravity="center_vertical"/>
-
-            <ImageView
-                android:id="@+id/down_btn"
-                android:layout_width="28dp"
-                android:layout_height="match_parent"
-                android:layout_alignRight="@+id/yyrh_user_edit"
-                android:layout_centerHorizontal="true"
-                android:layout_centerVertical="true"
-                android:paddingRight="14dp"
-                android:src="@mipmap/yyrh_arrow_normal" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:layout_width="290dp"
-            android:layout_height="40dp"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="15dp"
-            >
-
-            <EditText
-                android:id="@+id/yyrh_pwd_edit"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_centerHorizontal="true"
-                android:background="@drawable/yyrh_radius_deepgrey_2dp"
-                android:drawableLeft="@mipmap/yyrh_pwd_icon"
-                android:drawablePadding="10dp"
-                android:hint="@string/yyrh_input_pwd_pls"
-                android:paddingLeft="10dp"
-                android:textSize="15sp"
-                android:maxLength="20"
-                android:digits="0123456789abcdefghijgklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                android:gravity="center_vertical"
-                android:inputType="textPassword"
-                />
-
-            <ImageView
-                android:id="@+id/down_eye_btn"
-                android:layout_width="30dp"
-                android:layout_height="match_parent"
-                android:paddingRight="10dp"
-                android:layout_alignRight="@+id/yyrh_pwd_edit"
-                android:layout_centerHorizontal="true"
-                android:layout_centerInParent="true"
-                android:src="@mipmap/yyrh_eye_icon_normal"
-                />
-
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/rl_2"
-            android:layout_width="290dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
-            android:layout_gravity="center_horizontal"
-            >
-
-            <Button
-                android:id="@+id/yyrh_enter_btn"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:layout_centerHorizontal="true"
-                android:layout_gravity="center_horizontal"
-                android:background="@drawable/yyrh_radius_main_color_bg"
-                android:text="@string/yyrh_enter_game"
-                android:textSize="18sp"
-                android:textColor="@color/yyrh_white"
-                android:gravity="center"
-                />
-
-            <Button
-                android:id="@+id/yyrh_forget_pwd_btn"
-                android:layout_below="@+id/yyrh_enter_btn"
-                android:layout_width="100dp"
-                android:layout_height="40dp"
-                android:layout_marginTop="10dp"
-                android:textSize="16sp"
-                android:text="@string/yyrh_forget_pwd"
-                android:textColor="@color/yyrh_main_color"
-                android:background="@drawable/yyrh_color_white"
-                android:gravity="center_vertical" />
-
-            <Button
-                android:id="@+id/yyrh_reg_btn"
-                android:layout_below="@+id/yyrh_enter_btn"
-                android:layout_alignParentRight="true"
-                android:layout_width="100dp"
-                android:layout_height="40dp"
-                android:layout_marginTop="10dp"
-                android:textSize="16sp"
-                android:text="@string/yyrh_1s_register"
-                android:textColor="@color/yyrh_main_color"
-                android:background="@drawable/yyrh_color_white"
-                android:gravity="right|center_vertical" />
-        </RelativeLayout>
-
-    </LinearLayout>
-
-    <ListView
-        android:layout_marginTop="105dp"
-        android:layout_centerHorizontal="true"
-        android:id="@+id/account_listview"
-        android:layout_width="290dp"
-        android:layout_height="160dp"
-        android:divider="@null"
-        android:visibility="gone"
-        />
-
-    <TextView
-        android:id="@+id/list_text"
-        android:layout_width="290dp"
-        android:layout_height="40dp"
-        android:gravity="center_vertical"
-        android:layout_centerHorizontal="true"
-        android:background="@drawable/yyrh_radius_white_1dp"
-        android:paddingLeft="10dp"
-        android:text="@string/yyrh_no_record"
-        android:layout_marginTop="105dp"
-        android:visibility="gone"
-        android:textSize="14sp"
-        android:textColor="@color/yyrh_font_lightblack"
-
-        />
-</RelativeLayout>

hnqj/src/main/res/layout/yyrh_pay_webview_portrait.xml

@@ -1,42 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="350dp"
-    android:layout_height="280dp"
-    android:gravity="center"
-    android:background="@drawable/yyrh_radius_white_3dp"
-    android:orientation="vertical"
-    >
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="20dp"
-        android:layout_weight="1.0"
-        android:orientation="horizontal">
-
-
-
-        <WebView
-            android:id="@+id/wb_with_xd"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scrollbars="none"
-            android:layout_margin="10dp"
-            />
-
-        <ImageView
-            android:id="@+id/iv_reback_close"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
-            android:layout_marginRight="5dp"
-            android:padding="10dp"
-            android:src="@mipmap/yyrh_close_btn"
-            android:layout_alignRight="@+id/tv_pay_tip"
-            android:layout_alignParentRight="true"
-
-            />
-
-
-    </RelativeLayout>
-
-
-
-</LinearLayout>

hnqj/src/main/res/layout/yyrh_phone_find_pwd_dialog.xml

@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="380dp"
-    android:layout_height="280dp"
-    android:background="@drawable/yyrh_radius_white_1dp"
-    android:orientation="vertical">
-
-    <RelativeLayout
-        android:id="@+id/rl1"
-        android:layout_width="match_parent"
-        android:layout_height="60dp"
-        >
-        <ImageView
-            android:id="@+id/close_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:padding="20dp"
-            android:layout_marginLeft="5dp"
-            android:src="@mipmap/yyrh_back_btn"
-            />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:layout_centerInParent= "true"
-            android:textColor="@color/yyrh_font_lightblack"
-            android:text="@string/yyrh_find_pwd_phone"
-            android:textSize="18sp"
-            />
-
-    </RelativeLayout>
-    <RelativeLayout
-        android:layout_width="320dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal">
-    <EditText
-        android:id="@+id/et_user_phone"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:background="@drawable/yyrh_radius_deepgrey_2dp"
-        android:drawableLeft="@mipmap/yyrh_account_icon"
-        android:drawablePadding="10dp"
-        android:hint="@string/yyrh_input_has_register_number"
-        android:paddingLeft="10dp"
-        android:textSize="14sp"
-        android:maxLength="20"
-        android:digits="0123456789"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="5dp"
-        />
-        <EditText
-            android:id="@+id/et_user_code"
-            android:layout_width="180dp"
-            android:layout_height="40dp"
-            android:layout_marginTop="15dp"
-            android:background="@drawable/yyrh_radius_deepgrey_2dp"
-            android:drawablePadding="10dp"
-            android:hint="@string/yyrh_input_code"
-            android:paddingLeft="10dp"
-            android:textSize="14sp"
-            android:maxLength="10"
-            android:digits="0123456789"
-            android:layout_below="@id/et_user_phone"
-            android:layout_alignLeft="@id/et_user_phone"
-
-            />
-        <Button
-            android:id="@+id/btn_get_code"
-            android:layout_width="120dp"
-            android:layout_height="40dp"
-            android:layout_marginTop="15dp"
-            android:background="@drawable/yyrh_radius_main_color_1dp"
-            android:textColor="@color/yyrh_main_color"
-            android:textSize="14sp"
-            android:text="@string/yyrh_get_phone_code"
-            android:gravity="center"
-            android:layout_below="@id/et_user_phone"
-            android:layout_alignRight="@id/et_user_phone"
-            android:minHeight="1dp"
-            android:minWidth="1dp"
-            />
-
-        <EditText
-            android:id="@+id/et_user_pwd"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:background="@drawable/yyrh_radius_deepgrey_2dp"
-            android:drawableLeft="@mipmap/yyrh_pwd_icon"
-            android:drawablePadding="10dp"
-            android:hint="@string/yyrh_set_new_pwd"
-            android:paddingLeft="10dp"
-            android:textSize="14sp"
-            android:maxLength="20"
-            android:digits="0123456789abcdefghijgklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="15dp"
-            android:layout_below="@id/et_user_code"
-            android:layout_alignLeft="@id/et_user_code"
-            android:inputType="textPassword"
-            />
-
-        <ImageView
-            android:id="@+id/down_eye_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_centerInParent="true"
-            android:src="@mipmap/yyrh_eye_icon_normal"
-            android:layout_alignRight="@id/et_user_pwd"
-            android:layout_below="@id/et_user_code"
-            android:layout_marginTop="25dp"
-            android:layout_marginRight="10dp"
-            android:padding="5dp"
-            />
-
-        <Button
-            android:id="@+id/reg_compete_btn"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:layout_centerHorizontal="true"
-            android:layout_gravity="center_horizontal"
-            android:background="@drawable/yyrh_radius_main_color_bg"
-            android:text="@string/yyrh_find_pwd_phone"
-            android:textSize="16sp"
-            android:textColor="@color/yyrh_white"
-            android:minHeight="1dp"
-            android:minWidth="1dp"
-            android:gravity="center"
-            android:layout_below="@id/et_user_pwd"
-            android:layout_marginTop="12dp"
-            />
-    </RelativeLayout>
-</LinearLayout>

hnqj/src/main/res/layout/yyrh_phone_find_pwd_dialog_protrait.xml

@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="350dp"
-    android:layout_height="280dp"
-    android:background="@drawable/yyrh_radius_white_3dp"
-    android:orientation="vertical"
-    >
-
-    <RelativeLayout
-        android:id="@+id/rl1"
-        android:layout_width="match_parent"
-        android:layout_height="60dp"
-        >
-        <ImageView
-            android:id="@+id/close_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="5dp"
-            android:padding="20dp"
-            android:src="@mipmap/yyrh_back_btn"/>
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:layout_centerInParent= "true"
-            android:textColor="@color/yyrh_font_lightblack"
-            android:text="@string/yyrh_find_pwd_phone"
-            android:textSize="18sp"
-            />
-
-    </RelativeLayout>
-    <RelativeLayout
-        android:layout_width="290dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        >
-    <EditText
-        android:id="@+id/et_user_phone"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:background="@drawable/yyrh_radius_deepgrey_2dp"
-        android:drawableLeft="@mipmap/yyrh_phone_icon"
-        android:drawablePadding="10dp"
-        android:hint="@string/yyrh_input_has_register_number"
-        android:paddingLeft="10dp"
-        android:textSize="14sp"
-        android:maxLength="20"
-        android:digits="0123456789"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="5dp"
-        />
-        <EditText
-            android:id="@+id/et_user_code"
-            android:layout_width="160dp"
-            android:layout_height="40dp"
-            android:layout_marginTop="15dp"
-            android:background="@drawable/yyrh_radius_deepgrey_2dp"
-            android:drawablePadding="10dp"
-            android:hint="@string/yyrh_input_code"
-            android:paddingLeft="10dp"
-            android:textSize="14sp"
-            android:maxLength="10"
-            android:digits="0123456789"
-            android:layout_below="@id/et_user_phone"
-            android:layout_alignLeft="@id/et_user_phone"
-
-            />
-        <Button
-            android:id="@+id/btn_get_code"
-            android:layout_width="120dp"
-            android:layout_height="40dp"
-            android:layout_marginTop="15dp"
-            android:background="@drawable/yyrh_radius_main_color_1dp"
-            android:textColor="@color/yyrh_main_color"
-            android:textSize="14sp"
-            android:text="@string/yyrh_get_phone_code"
-            android:gravity="center"
-            android:layout_below="@id/et_user_phone"
-            android:layout_alignRight="@id/et_user_phone"
-            android:minHeight="1dp"
-            android:minWidth="1dp"
-            />
-
-        <EditText
-            android:id="@+id/et_user_pwd"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:background="@drawable/yyrh_radius_deepgrey_2dp"
-            android:drawableLeft="@mipmap/yyrh_pwd_icon"
-            android:drawablePadding="10dp"
-            android:hint="@string/yyrh_set_new_pwd"
-            android:paddingLeft="10dp"
-            android:textSize="14sp"
-            android:maxLength="20"
-            android:digits="0123456789abcdefghijgklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="15dp"
-            android:layout_below="@id/et_user_code"
-            android:layout_alignLeft="@id/et_user_code"
-            android:inputType="textPassword"
-            />
-
-        <ImageView
-            android:id="@+id/down_eye_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingRight="10dp"
-            android:layout_centerHorizontal="true"
-            android:layout_centerInParent="true"
-            android:src="@mipmap/yyrh_eye_icon_normal"
-            android:layout_alignRight="@id/et_user_pwd"
-            android:layout_below="@id/et_user_code"
-            android:layout_marginTop="20dp"
-            android:layout_marginRight="8dp"
-            android:padding="8dp"
-            />
-
-
-        <Button
-            android:id="@+id/reg_compete_btn"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:layout_centerHorizontal="true"
-            android:layout_gravity="center_horizontal"
-            android:background="@drawable/yyrh_radius_main_color_bg"
-            android:text="@string/yyrh_find_pwd_phone"
-            android:textSize="16sp"
-            android:textColor="@color/yyrh_white"
-            android:minHeight="1dp"
-            android:minWidth="1dp"
-            android:gravity="center"
-            android:layout_below="@id/et_user_pwd"
-            android:layout_marginTop="13dp"
-            />
-    </RelativeLayout>
-</LinearLayout>

hnqj/src/main/res/layout/yyrh_phone_register_dialog.xml

@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="380dp"
-    android:layout_height="280dp"
-    android:background="@drawable/yyrh_radius_white_3dp"
-    android:orientation="vertical">
-
-    <RelativeLayout
-        android:id="@+id/rl1"
-        android:layout_width="match_parent"
-        android:layout_height="60dp"
-        >
-        <ImageView
-            android:id="@+id/close_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:padding="20dp"
-            android:layout_marginLeft="5dp"
-            android:src="@mipmap/yyrh_back_btn"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:layout_centerInParent= "true"
-            android:textColor="@color/yyrh_font_lightblack"
-            android:text="@string/yyrh_phone_register"
-            android:textSize="18sp"
-            />
-
-    </RelativeLayout>
-    <RelativeLayout
-        android:layout_width="320dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        >
-    <EditText
-        android:id="@+id/et_user_phone"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:background="@drawable/yyrh_radius_deepgrey_2dp"
-        android:drawableLeft="@mipmap/yyrh_phone_icon"
-        android:drawablePadding="10dp"
-        android:hint="@string/yyrh_input_number"
-        android:paddingLeft="10dp"
-        android:textSize="14sp"
-        android:maxLength="20"
-        android:digits="0123456789"
-        android:layout_centerHorizontal="true"
-        />
-        <EditText
-            android:id="@+id/et_user_code"
-            android:layout_width="180dp"
-            android:layout_height="40dp"
-            android:layout_marginTop="10dp"
-            android:background="@drawable/yyrh_radius_deepgrey_2dp"
-            android:drawablePadding="10dp"
-            android:hint="@string/yyrh_input_code"
-            android:paddingLeft="10dp"
-            android:textSize="14sp"
-            android:maxLength="10"
-            android:digits="0123456789"
-            android:layout_below="@id/et_user_phone"
-            android:layout_alignLeft="@id/et_user_phone"
-
-            />
-        <Button
-            android:id="@+id/btn_get_code"
-            android:layout_width="120dp"
-            android:layout_height="40dp"
-            android:layout_marginTop="10dp"
-            android:background="@drawable/yyrh_radius_main_color_1dp"
-            android:textColor="@color/yyrh_main_color"
-            android:textSize="14sp"
-            android:text="@string/yyrh_get_phone_code"
-            android:gravity="center"
-            android:layout_below="@id/et_user_phone"
-            android:layout_alignRight="@id/et_user_phone"
-            android:minHeight="1dp"
-            android:minWidth="1dp"
-            />
-
-        <EditText
-            android:id="@+id/et_user_pwd"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:background="@drawable/yyrh_radius_deepgrey_2dp"
-            android:drawableLeft="@mipmap/yyrh_pwd_icon"
-            android:drawablePadding="10dp"
-            android:hint="@string/yyrh_band_need_pwd"
-            android:paddingLeft="10dp"
-            android:textSize="14sp"
-            android:maxLength="20"
-            android:digits="0123456789abcdefghijgklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="10dp"
-            android:layout_below="@id/et_user_code"
-            android:layout_alignLeft="@id/et_user_code"
-            android:inputType="textPassword"
-            />
-
-        <ImageView
-            android:id="@+id/down_eye_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingRight="10dp"
-            android:layout_centerHorizontal="true"
-            android:layout_centerInParent="true"
-            android:src="@mipmap/yyrh_eye_icon_normal"
-            android:layout_alignRight="@id/et_user_pwd"
-            android:layout_below="@id/et_user_code"
-            android:layout_marginTop="15dp"
-            android:layout_marginRight="8dp"
-            android:padding="10dp"
-            />
-
-        <RelativeLayout
-            android:id="@+id/reg_tip_ll"
-            android:layout_width="match_parent"
-            android:layout_height="30dp"
-            android:layout_marginTop="2dp"
-            android:layout_below="@id/et_user_pwd"
-            >
-            <CheckBox
-                android:id="@+id/cb_register"
-                android:layout_width="35dp"
-                android:layout_height="35dp"
-                android:checked="true"
-                android:gravity="left|center"
-                android:scaleX="0.7"
-                android:scaleY="0.7"
-                />
-            <TextView
-                android:id="@+id/tv_agree_tip"
-                android:layout_toRightOf="@id/cb_register"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
-                android:gravity="center"
-                android:text="@string/yyrh_agreement"
-                android:textSize="10sp"
-                android:textColor="@color/yyrh_font_lightblack"/>
-            <TextView
-                android:id="@+id/tv_tip"
-                android:layout_toRightOf="@id/tv_agree_tip"
-                android:layout_width="wrap_content"
-                android:layout_height="30dp"
-                android:gravity="center"
-                android:textSize="10sp"
-                android:text="@string/yyrh_agree_register_tip"
-                android:textColor="@color/yyrh_main_color"/>
-            <TextView
-                android:id="@+id/tv_and_tip"
-                android:layout_toRightOf="@id/tv_tip"
-                android:layout_width="wrap_content"
-                android:layout_height="30dp"
-                android:gravity="center"
-                android:text="@string/yyrh_and"
-                android:textSize="10sp"
-                android:textColor="@color/yyrh_font_lightblack"/>
-            <TextView
-                android:id="@+id/tv_private_policy"
-                android:layout_toRightOf="@id/tv_and_tip"
-                android:layout_width="wrap_content"
-                android:layout_height="30dp"
-                android:gravity="center|left"
-                android:text="@string/yyrh_private_policy"
-                android:textSize="10sp"
-                android:textColor="@color/yyrh_main_color"/>
-        </RelativeLayout>
-
-        <Button
-            android:id="@+id/et_reg_compete_btn"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:layout_centerHorizontal="true"
-            android:layout_gravity="center_horizontal"
-
-            android:background="@drawable/yyrh_radius_main_color_bg"
-            android:text="@string/yyrh_register_success"
-            android:textSize="16sp"
-            android:textColor="@color/yyrh_white"
-            android:minHeight="1dp"
-            android:minWidth="1dp"
-            android:gravity="center"
-            android:layout_below="@id/reg_tip_ll"
-            />
-    </RelativeLayout>
-</LinearLayout>

hnqj/src/main/res/layout/yyrh_phone_register_dialog_protrait.xml

@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="350dp"
-    android:layout_height="280dp"
-    android:background="@drawable/yyrh_radius_white_3dp"
-    android:orientation="vertical"
-
-    >
-
-
-    <RelativeLayout
-        android:id="@+id/rl1"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        >
-        <ImageView
-            android:id="@+id/close_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:padding="15dp"
-            android:layout_marginLeft="5dp"
-            android:src="@mipmap/yyrh_back_btn"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:layout_centerInParent= "true"
-            android:textColor="@color/yyrh_font_lightblack"
-            android:text="@string/yyrh_phone_register"
-            android:textSize="18dp"
-            />
-
-    </RelativeLayout>
-    <RelativeLayout
-        android:layout_width="290dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        >
-        <EditText
-            android:id="@+id/et_user_phone"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:background="@drawable/yyrh_radius_deepgrey_2dp"
-            android:drawableLeft="@mipmap/yyrh_phone_icon"
-            android:drawablePadding="10dp"
-            android:hint="@string/yyrh_input_number"
-            android:paddingLeft="10dp"
-            android:textSize="14sp"
-            android:maxLength="20"
-            android:digits="0123456789"
-            android:layout_centerHorizontal="true"
-            />
-        <EditText
-            android:id="@+id/et_user_code"
-            android:layout_width="160dp"
-            android:layout_height="40dp"
-            android:layout_marginTop="10dp"
-            android:background="@drawable/yyrh_radius_deepgrey_2dp"
-            android:drawablePadding="10dp"
-            android:hint="@string/yyrh_input_code"
-            android:paddingLeft="10dp"
-            android:textSize="14sp"
-            android:maxLength="10"
-            android:digits="0123456789"
-            android:layout_below="@id/et_user_phone"
-            android:layout_alignLeft="@id/et_user_phone"
-
-            />
-        <Button
-            android:id="@+id/btn_get_code"
-            android:layout_width="120dp"
-            android:layout_height="40dp"
-            android:layout_marginTop="10dp"
-            android:background="@drawable/yyrh_radius_main_color_1dp"
-            android:textColor="@color/yyrh_main_color"
-            android:textSize="14sp"
-            android:text="@string/yyrh_get_phone_code"
-            android:gravity="center"
-            android:layout_below="@id/et_user_phone"
-            android:layout_alignRight="@id/et_user_phone"
-            android:minHeight="1dp"
-            android:minWidth="1dp"
-            />
-
-        <EditText
-            android:id="@+id/et_user_pwd"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:background="@drawable/yyrh_radius_deepgrey_2dp"
-            android:drawableLeft="@mipmap/yyrh_pwd_icon"
-            android:drawablePadding="10dp"
-            android:hint="@string/yyrh_band_need_pwd"
-            android:paddingLeft="10dp"
-            android:textSize="14sp"
-            android:maxLength="20"
-            android:digits="0123456789abcdefghijgklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="10dp"
-            android:layout_below="@id/et_user_code"
-            android:layout_alignLeft="@id/et_user_code"
-            android:inputType="textPassword"
-            />
-
-        <ImageView
-            android:id="@+id/down_eye_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingRight="10dp"
-            android:layout_centerHorizontal="true"
-            android:layout_centerInParent="true"
-            android:src="@mipmap/yyrh_eye_icon_normal"
-            android:layout_alignRight="@id/et_user_pwd"
-            android:layout_below="@id/et_user_code"
-            android:layout_marginTop="15dp"
-            android:layout_marginRight="8dp"
-            android:padding="10dp"
-            />
-
-        <RelativeLayout
-            android:id="@+id/reg_tip_ll"
-            android:layout_width="match_parent"
-            android:layout_height="30dp"
-            android:layout_marginTop="2dp"
-            android:layout_below="@id/et_user_pwd"
-            >
-            <CheckBox
-                android:id="@+id/cb_register"
-                android:layout_width="35dp"
-                android:layout_height="35dp"
-                android:checked="true"
-                android:gravity="left|center"
-                android:scaleX="0.7"
-                android:scaleY="0.7"
-                />
-            <TextView
-                android:id="@+id/tv_agree_tip"
-                android:layout_toRightOf="@id/cb_register"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
-                android:gravity="center"
-                android:text="@string/yyrh_agreement"
-                android:textSize="10sp"
-                android:textColor="@color/yyrh_font_lightblack"/>
-            <TextView
-                android:id="@+id/tv_tip"
-                android:layout_toRightOf="@id/tv_agree_tip"
-                android:layout_width="wrap_content"
-                android:layout_height="30dp"
-                android:gravity="center"
-                android:textSize="10sp"
-                android:text="@string/yyrh_agree_register_tip"
-                android:textColor="@color/yyrh_main_color"/>
-            <TextView
-                android:id="@+id/tv_and_tip"
-                android:layout_toRightOf="@id/tv_tip"
-                android:layout_width="wrap_content"
-                android:layout_height="30dp"
-                android:gravity="center"
-                android:text="@string/yyrh_and"
-                android:textSize="10sp"
-                android:textColor="@color/yyrh_font_lightblack"/>
-            <TextView
-                android:id="@+id/tv_private_policy"
-                android:layout_toRightOf="@id/tv_and_tip"
-                android:layout_width="wrap_content"
-                android:layout_height="30dp"
-                android:gravity="center|left"
-                android:text="@string/yyrh_private_policy"
-                android:textSize="10sp"
-                android:textColor="@color/yyrh_main_color"/>
-        </RelativeLayout>
-
-        <Button
-            android:id="@+id/et_reg_compete_btn"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:layout_centerHorizontal="true"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="5dp"
-            android:background="@drawable/yyrh_radius_main_color_bg"
-            android:text="@string/yyrh_register_success"
-            android:textSize="16sp"
-            android:textColor="@color/yyrh_white"
-            android:minHeight="1dp"
-            android:minWidth="1dp"
-            android:gravity="center"
-            android:layout_below="@id/reg_tip_ll"
-            />
-    </RelativeLayout>
-</LinearLayout>

hnqj/src/main/res/layout/yyrh_privacy_policy_dialog_protrait.xml

@@ -1,81 +0,0 @@
-<?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="400dp"
-    android:layout_margin="15dp"
-    android:background="@drawable/yyrh_radius_white_3dp"
-    android:orientation="vertical">
-
-
-<RelativeLayout
-    android:layout_width="match_parent"
-    android:layout_height="0dp"
-    android:layout_weight="8"
-    android:layout_marginTop="10dp"
-    android:layout_marginLeft="2dp"
-    android:layout_marginRight="2dp"
-    >
-        <WebView
-            android:id="@+id/wb_user_info"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            />
-
-    <ImageView
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_centerInParent="true"
-            android:id="@+id/yyrh_loading"
-            android:background="@mipmap/yyrh_loading"/>
-</RelativeLayout>
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="2"
-        android:orientation="horizontal"
-        >
-        <View
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            />
-    <Button
-
-        android:id="@+id/btn_disagree"
-        android:layout_width="0dp"
-        android:layout_height="30dp"
-        android:layout_weight="2"
-        android:layout_gravity="center"
-
-        android:text="@string/yyrh_disagreement"
-        android:textColor="@color/yyrh_white"
-        android:background="@color/yyrh_deepgrey"/>
-        <View
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            />
-        <View
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            />
-
-    <Button
-        android:id="@+id/btn_agree"
-        android:layout_width="0dp"
-        android:layout_height="30dp"
-        android:layout_weight="2"
-        android:layout_gravity="center"
-
-        android:background="@color/yyrh_btn1_color"
-        android:textColor="@color/yyrh_white"
-        android:text="@string/yyrh_agreement"/>
-        <View
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            />
-    </LinearLayout>
-</LinearLayout>

hnqj/src/main/res/layout/yyrh_progressbar.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="8dp">
-    <ProgressBar
-        android:id="@+id/pb_wb_progressbar"
-        style="?android:attr/progressBarStyleHorizontal"
-        android:layout_width="match_parent"
-        android:layout_height="8dp"
-        android:indeterminateOnly="false"
-        android:max="100"
-        android:progressDrawable="@drawable/yyrh_wevbview_progressbar"
-        android:visibility="gone" />
-
-
-</LinearLayout>

hnqj/src/main/res/layout/yyrh_register_dialog.xml

@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="380dp"
-    android:layout_height="280dp"
-    android:background="@drawable/yyrh_radius_white_3dp"
-    >
-
-    <RelativeLayout
-        android:id="@+id/rl1"
-        android:layout_width="match_parent"
-        android:layout_height="60dp"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:layout_centerInParent= "true"
-            android:textColor="@color/yyrh_font_lightblack"
-            android:text="@string/yyrh_1s_register"
-            android:textSize="18sp"
-            />
-
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/ll1"
-        android:layout_below="@+id/rl1"
-        android:layout_width="320dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
-        android:layout_centerInParent="true" >
-
-
-        <EditText
-            android:id="@+id/reg_account_edit"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:background="@drawable/yyrh_radius_deepgrey_2dp"
-            android:paddingLeft="10dp"
-            android:drawableLeft="@mipmap/yyrh_account_icon"
-            android:drawablePadding="10dp"
-            android:hint="@string/yyrh_input_your_account"
-            android:digits="0123456789abcdefghijgklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-            android:maxLength="20"
-            android:maxLines="1"
-            android:textSize="14dp"
-            android:gravity="center_vertical"
-            />
-
-
-        <EditText
-            android:layout_below="@+id/reg_account_edit"
-            android:id="@+id/reg_pwd_edit"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:background="@drawable/yyrh_radius_deepgrey_2dp"
-            android:paddingLeft="10dp"
-            android:drawableLeft="@mipmap/yyrh_pwd_icon"
-            android:drawablePadding="10dp"
-            android:hint="@string/yyrh_6_15_pwd"
-            android:digits="0123456789abcdefghijgklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-            android:maxLength="20"
-            android:maxLines="1"
-            android:textSize="14dp"
-            android:layout_marginTop="10dp"
-            android:gravity="center_vertical"
-            />
-
-    </RelativeLayout>
-    <RelativeLayout
-        android:id="@+id/reg_tip_ll"
-        android:layout_width="320dp"
-        android:layout_height="30dp"
-        android:layout_alignRight="@id/ll1"
-        android:layout_below="@+id/ll1"
-        android:gravity="center_vertical"
-        >
-        <CheckBox
-            android:id="@+id/cb_register"
-            android:layout_width="35dp"
-            android:layout_height="35dp"
-            android:checked="true"
-            android:gravity="left|center"
-            android:scaleX="0.7"
-            android:scaleY="0.7"
-             />
-        <TextView
-            android:id="@+id/tv_agree_tip"
-            android:layout_toRightOf="@id/cb_register"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:gravity="center"
-            android:textSize="10sp"
-            android:text="@string/yyrh_agreement"
-            android:textColor="@color/yyrh_font_lightblack"/>
-        <TextView
-            android:id="@+id/tv_tip"
-           android:layout_toRightOf="@id/tv_agree_tip"
-            android:layout_width="wrap_content"
-            android:layout_height="30dp"
-            android:gravity="center"
-            android:textSize="10sp"
-            android:text="@string/yyrh_agree_register_tip"
-            android:textColor="@color/yyrh_main_color"/>
-        <TextView
-            android:id="@+id/tv_and_tip"
-            android:layout_toRightOf="@id/tv_tip"
-            android:layout_width="wrap_content"
-            android:layout_height="30dp"
-            android:gravity="center"
-            android:textSize="10sp"
-            android:text="@string/yyrh_and"
-            android:textColor="@color/yyrh_font_lightblack"/>
-        <TextView
-            android:id="@+id/tv_private_policy"
-            android:layout_toRightOf="@id/tv_and_tip"
-            android:layout_width="wrap_content"
-            android:layout_height="30dp"
-            android:gravity="center|left"
-            android:textSize="10sp"
-            android:text="@string/yyrh_private_policy"
-            android:textColor="@color/yyrh_main_color"/>
-    </RelativeLayout>
-    <RelativeLayout
-        android:id="@+id/rl2"
-        android:layout_width="320dp"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/reg_tip_ll"
-        android:layout_centerHorizontal="true"
-
-        >
-
-        <Button
-            android:id="@+id/reg_compete_btn"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:layout_centerHorizontal="true"
-            android:layout_gravity="center_horizontal"
-            android:background="@drawable/yyrh_radius_main_color_bg"
-            android:text="@string/yyrh_register_success"
-            android:textSize="16sp"
-            android:textColor="@color/yyrh_white"
-            android:minHeight="1dp"
-            android:minWidth="1dp"
-            android:gravity="center"
-            android:layout_marginTop="5dp"
-            />
-
-        <Button
-            android:id="@+id/reg_phone_btn"
-            android:layout_width="120dp"
-            android:layout_height="30dp"
-            android:layout_below="@id/reg_compete_btn"
-            android:layout_marginTop="12dp"
-            android:background="@drawable/yyrh_color_white"
-            android:textColor="@color/yyrh_main_color"
-            android:textSize="14sp"
-            android:text="@string/yyrh_phone_register"
-            android:layout_alignParentLeft="true"
-            android:gravity="center_vertical"
-            />
-
-        <Button
-            android:id="@+id/reg_back_btn"
-            android:layout_width="120dp"
-            android:layout_height="30dp"
-            android:layout_below="@id/reg_compete_btn"
-            android:layout_marginTop="15dp"
-            android:background="@drawable/yyrh_color_white"
-            android:textColor="@color/yyrh_main_color"
-            android:textSize="14sp"
-            android:text="@string/yyrh_has_account"
-            android:layout_alignParentRight="true"
-            android:gravity="right|center_vertical"
-            />
-
-
-    </RelativeLayout>
-
-
-
-
-</RelativeLayout>

hnqj/src/main/res/layout/yyrh_register_dialog_protrait.xml

@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="350dp"
-    android:layout_height="280dp"
-    android:background="@drawable/yyrh_radius_white_3dp"
-
-    >
-
-
-    <RelativeLayout
-        android:id="@+id/rl1"
-        android:layout_width="match_parent"
-        android:layout_height="60dp"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:layout_centerInParent= "true"
-            android:textColor="@color/yyrh_font_lightblack"
-            android:text="@string/yyrh_1s_register"
-            android:textSize="18sp"
-            />
-
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/ll1"
-        android:layout_below="@+id/rl1"
-        android:layout_width="290dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
-        android:layout_centerInParent="true" >
-
-        <EditText
-            android:id="@+id/reg_account_edit"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:background="@drawable/yyrh_radius_deepgrey_2dp"
-            android:paddingLeft="10dp"
-            android:drawableLeft="@mipmap/yyrh_account_icon"
-            android:drawablePadding="10dp"
-            android:hint="@string/yyrh_input_your_account"
-            android:digits="0123456789abcdefghijgklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-            android:maxLength="20"
-            android:maxLines="1"
-            android:textSize="14dp"
-            android:gravity="center_vertical"
-            />
-
-
-        <EditText
-            android:layout_below="@+id/reg_account_edit"
-            android:id="@+id/reg_pwd_edit"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:background="@drawable/yyrh_radius_deepgrey_2dp"
-            android:paddingLeft="10dp"
-            android:drawableLeft="@mipmap/yyrh_pwd_icon"
-            android:drawablePadding="10dp"
-            android:hint="@string/yyrh_6_15_pwd"
-            android:digits="0123456789abcdefghijgklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-            android:maxLength="20"
-            android:maxLines="1"
-            android:textSize="14dp"
-            android:layout_marginTop="10dp"
-            android:gravity="center_vertical"
-            />
-
-    </RelativeLayout>
-    <RelativeLayout
-        android:id="@+id/reg_tip_ll"
-        android:layout_width="290dp"
-        android:layout_height="30dp"
-        android:layout_marginTop="5dp"
-        android:layout_alignRight="@id/ll1"
-        android:layout_below="@+id/ll1"
-        android:gravity="center_vertical"
-        >
-        <CheckBox
-            android:id="@+id/cb_register"
-            android:layout_width="35dp"
-            android:layout_height="35dp"
-            android:checked="true"
-            android:gravity="left|center"
-            android:scaleX="0.7"
-            android:scaleY="0.7"
-            />
-        <TextView
-            android:id="@+id/tv_agree_tip"
-            android:layout_toRightOf="@id/cb_register"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:gravity="center"
-            android:textSize="10sp"
-            android:text="@string/yyrh_agreement"
-            android:textColor="@color/yyrh_font_lightblack"/>
-        <TextView
-            android:id="@+id/tv_tip"
-            android:layout_toRightOf="@id/tv_agree_tip"
-            android:layout_width="wrap_content"
-            android:layout_height="30dp"
-            android:gravity="center"
-            android:textSize="10sp"
-            android:text="@string/yyrh_agree_register_tip"
-            android:textColor="@color/yyrh_main_color"/>
-        <TextView
-            android:id="@+id/tv_and_tip"
-            android:layout_toRightOf="@id/tv_tip"
-            android:layout_width="wrap_content"
-            android:layout_height="30dp"
-            android:gravity="center"
-            android:textSize="10sp"
-            android:text="@string/yyrh_and"
-            android:textColor="@color/yyrh_font_lightblack"/>
-        <TextView
-            android:id="@+id/tv_private_policy"
-            android:layout_toRightOf="@id/tv_and_tip"
-            android:layout_width="wrap_content"
-            android:layout_height="30dp"
-            android:gravity="center|left"
-            android:textSize="10sp"
-            android:text="@string/yyrh_private_policy"
-            android:textColor="@color/yyrh_main_color"/>
-    </RelativeLayout>
-    <RelativeLayout
-        android:id="@+id/rl2"
-        android:layout_width="290dp"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/reg_tip_ll"
-        android:layout_centerHorizontal="true"
-
-        >
-
-        <Button
-            android:id="@+id/reg_compete_btn"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:layout_marginTop="5dp"
-            android:layout_centerHorizontal="true"
-            android:layout_gravity="center_horizontal"
-            android:background="@drawable/yyrh_radius_main_color_bg"
-            android:text="@string/yyrh_register_success"
-            android:textSize="16sp"
-            android:textColor="@color/yyrh_white"
-            android:gravity="center"
-            />
-
-        <Button
-            android:id="@+id/reg_phone_btn"
-            android:layout_width="120dp"
-            android:layout_height="30dp"
-            android:layout_below="@id/reg_compete_btn"
-            android:layout_marginTop="10dp"
-            android:background="@drawable/yyrh_color_white"
-            android:textColor="@color/yyrh_main_color"
-            android:textSize="14sp"
-            android:text="@string/yyrh_phone_register"
-            android:gravity="left|center_vertical"
-            android:layout_alignParentLeft="true"
-            />
-
-        <Button
-            android:id="@+id/reg_back_btn"
-            android:layout_width="120dp"
-            android:layout_height="30dp"
-            android:layout_below="@id/reg_compete_btn"
-            android:layout_marginTop="10dp"
-            android:background="@drawable/yyrh_color_white"
-            android:textColor="@color/yyrh_main_color"
-            android:textSize="14sp"
-            android:text="@string/yyrh_has_account"
-            android:gravity="right|center"
-            android:layout_alignParentRight="true"
-            />
-
-
-    </RelativeLayout>
-
-
-
-
-</RelativeLayout>

hnqj/src/main/res/layout/yyrh_toast_style.xml

@@ -1,36 +0,0 @@
-<?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"
-    android:gravity="center"
-    >
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="46dp"
-        android:background="@drawable/yyrh_radius_white_1dp"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:id="@+id/yyrh_toast_iv"
-            android:layout_width="22dp"
-            android:layout_height="22dp"
-            android:layout_marginLeft="10dp"
-            android:layout_gravity="center_vertical"
-             />
-
-        <TextView
-            android:id="@+id/yyrh_toast_text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:maxLines="1"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
-            android:layout_gravity="center_vertical"
-            android:textColor="#666666"
-            android:textSize="15dp"/>
-    </LinearLayout>
-
-</LinearLayout>

hnqj/src/main/res/layout/yyrh_webview_common_dialog.xml

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="380dp"
-    android:layout_height="320dp"
-    android:background="@drawable/yyrh_radius_white_3dp"
-    android:orientation="vertical">
-
-    <RelativeLayout
-        android:id="@+id/rl1"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        >
-
-        <WebView
-            android:id="@+id/wb_user_info"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginTop="10dp"
-            android:layout_marginLeft="2dp"
-            android:layout_marginRight="2dp"
-            android:layout_marginBottom="10dp"
-            android:layout_gravity="center"
-            />
-        <ImageView
-            android:id="@+id/close_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_marginRight="5dp"
-            android:layout_marginTop="15dp"
-            android:padding="10dp"
-            android:src="@mipmap/yyrh_close_btn"
-
-
-
-            />
-
-        <ImageView
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_centerInParent="true"
-            android:id="@+id/yyrh_loading"
-            android:background="@mipmap/yyrh_loading"/>
-    </RelativeLayout>
-
-
-
-</LinearLayout>

hnqj/src/main/res/layout/yyrh_webview_common_dialog_portrait.xml

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="350dp"
-    android:layout_height="280dp"
-    android:background="@drawable/yyrh_radius_white_3dp"
-    android:orientation="vertical"
-    >
-
-    <RelativeLayout
-        android:id="@+id/rl1"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        >
-
-
-
-        <WebView
-            android:id="@+id/wb_user_info"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginTop="10dp"
-            android:layout_marginLeft="2dp"
-            android:layout_marginRight="2dp"
-            android:layout_marginBottom="10dp"
-            android:layout_gravity="center"
-            />
-        <ImageView
-            android:id="@+id/close_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-
-            android:layout_marginRight="13dp"
-            android:layout_marginTop="20dp"
-            android:src="@mipmap/yyrh_close_btn"
-            android:padding="10dp" />
-
-        <ImageView
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_centerInParent="true"
-            android:id="@+id/yyrh_loading"
-            android:background="@mipmap/yyrh_loading"/>
-    </RelativeLayout>
-
-</LinearLayout>