剔除多余文件。

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

@@ -201,7 +201,7 @@ public class MainActivity extends Activity implements View.OnClickListener {
             public void onShowGameExit() {
 
             }
-        }, true);
+        }, isDebug);
         sdk.sdkOnCreate(this, savedInstanceState);
         sdk.setSDKLogoutListener(this, new LogoutCallback() {
             @Override

app/src/main/res/values/colors.xml

@@ -6,21 +6,4 @@
 
 
 
-
-    <!-- yy color start -->
-
-
-
-    <color name="yyrh_font_lightblack">#3D3D3D</color>
-
-    <color name="yyrh_deepgrey">#DBDBDB</color>
-
-    <color name="yyrh_red">#cc021b</color>
-
-    <color name="yyrh_white">#FFFFFF</color>
-
-    <color name="yyrh_deepyellow">#FFA800</color>
-
-    <color name="yyrh_white_90">#E6FFFFFF</color>
-    <!--  yy color end -->
 </resources>

build.gradle

@@ -20,6 +20,7 @@ allprojects {
     repositories {
         google()
         jcenter()
+        mavenCentral()
     }
 }
 

hnqj/src/main/java/com/yyrh/constant/InitConfig.java

@@ -0,0 +1,11 @@
+package com.yyrh.constant;
+
+public class InitConfig {
+
+    public static String fristShowPage;
+
+
+
+
+
+}

hnqj/src/main/java/com/yyrh/constant/InitData.java

@@ -0,0 +1,22 @@
+package com.yyrh.constant;
+
+public class InitData {
+    public String getReg_tabs_1() {
+        return reg_tabs_1;
+    }
+
+    public String getReg_tabs_2() {
+        return reg_tabs_2;
+    }
+
+    public void setReg_tabs_1(String reg_tabs_1) {
+        this.reg_tabs_1 = reg_tabs_1;
+    }
+
+    public void setReg_tabs_2(String reg_tabs_2) {
+        this.reg_tabs_2 = reg_tabs_2;
+    }
+
+    private String reg_tabs_1;
+    private String reg_tabs_2;
+}

hnqj/src/main/java/com/yyrh/constant/SDKSettings.java

@@ -36,13 +36,15 @@ public class SDKSettings {
     public static String CHANNELUID = "";
     public static String USER_BIRTHDAY = "";
 
-    public static int orderReqCount = 0;
+
     public static String LOGINTAG = Constants.LOGIN;
     public static boolean isThirdLogin = true; //启用第3方登录
     public static boolean isThirdPay = true; //启用第3方登录
     public static String UserCentUrl = ""; //用户中心功能
     public static boolean isLandscape = true; //用户中心功能
 
+    public static String customer_service_url = "";
+
     public static boolean isOpenRealName = false;
 
     public static boolean isOpenFloatView = false;

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

@@ -29,11 +29,13 @@ import com.yyrh.sdk.callback.RegisterCallback;
 import com.yyrh.ui.ProgressDialogUtils;
 import com.yythird.sdk.ChannelSDK;
 
+import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 
@@ -118,12 +120,14 @@ public class NetRequestApi {
 
                     } else {
                         SDKSettings.UserCentUrl = data.optString("h5_web_host", "");
+                        SDKSettings.customer_service_url = data.optString("customer_service_url", "");
+
                         isThirdLogin = false;
                     }
 
 
                     SwitchUtil.ControlKFSwitch(data.optInt("bswitch"));
-
+                    SwitchUtil.saveInitData(data.optJSONArray("reg_tabs"));
                     YYLog.i("初始化成功。");
                     initCallback.onInitSuccess("init success");
 

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

@@ -10,6 +10,7 @@ import android.os.Build;
 import android.os.Handler;
 import android.util.Log;
 
+import com.yyrh.constant.InitConfig;
 import com.yyrh.constant.URLConstants;
 import com.yyrh.factory.SdkManager;
 import com.yyrh.imei.ImeiUtil;
@@ -250,24 +251,36 @@ public class YyrhSdkManager {
         SharedPreferences sp = activity.getSharedPreferences("yyrh", Activity.MODE_PRIVATE);
         if (!Utils.judgeStrNull(sp.getString("username", "")) &&
                 !SDKSettings.LOGINTAG.equals(LOGOUT)) {
-            yyrhAutoLogin(activity);
+            autoLogin(activity);
 
         }
         else {
-            yyrh_showLoginDialog(activity);
+            showLoginDialog(activity);
         }
     }
 
-    private void yyrh_showLoginDialog(Activity activity) {
+    private void showLoginDialog(Activity activity) {
         destroyFloat();
         Intent intent = new Intent(activity, UseLoginActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
         intent.putExtra("isLandscape", Utils.isLandscape(activity));
-        intent.putExtra("fragmentTag", FragmentUtils.SDK_LOGIN_TAG);
+
+        if (InitConfig.fristShowPage.equals("phone")){
+
+            intent.putExtra("fragmentTag", FragmentUtils.SDK_PHONE_REGISTER_TAG);
+
+        }else{
+
+            intent.putExtra("fragmentTag", FragmentUtils.SDK_REGISTER_TAG);
+        }
+
+
+
         activity.startActivity(intent);
+
     }
 
-    private void yyrhAutoLogin(final Activity activity) {
+    private void autoLogin(final Activity activity) {
         AutoLoginDialog.Builder builder = new AutoLoginDialog.Builder(activity);
         builder.setPositiveButton(new DialogInterface.OnClickListener() {
             @Override
@@ -275,7 +288,7 @@ public class YyrhSdkManager {
                 //取消回调
                 dialog.dismiss();
 
-                yyrh_showLoginDialog(activity);
+                showLoginDialog(activity);
 
             }
         }).setCloseDialogCallback(new AutoLoginDialog.CloseDialogCallback(){
@@ -532,7 +545,8 @@ public class YyrhSdkManager {
         hideFloat();
     }
     public void onDestroy(Activity activity){
-        destroyFloat();
+        itemList.clear();
+        mFloatMenu = null;
 
     }
 

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

@@ -26,6 +26,7 @@ import android.os.CountDownTimer;
 import android.os.Handler;
 import android.os.Looper;
 import android.text.TextUtils;
+import android.util.Log;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.MotionEvent;
@@ -829,6 +830,7 @@ private void closeMenu(){
             } else {
                 wManager.removeViewImmediate(mFloatLogo);
             }
+
             isExpaned = false;
             isDraging = false;
         } catch (Exception e) {

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

@@ -79,6 +79,7 @@ public class WvPageListDialog extends BaseDialog {
             setContentView(ResourceUtil.getLayoutId(context,
                     "qj_webview_common_dialog"));
 
+            setCancelable(false);
 
 
 
@@ -169,6 +170,10 @@ public class WvPageListDialog extends BaseDialog {
         });
 
 
+        webView.setBackgroundColor(0);
+        webView.getBackground().setAlpha(0);
+
+
         webView.loadUrl(url);
     }
 

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

@@ -7,14 +7,17 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.view.View;
 import android.widget.Button;
+import android.widget.ImageButton;
 import android.widget.Toast;
 
 
+import com.yyrh.constant.SDKSettings;
+import com.yyrh.ui.floatmenu.WvPageListDialog;
 import com.yyrh.utils.ResourceUtil;
 import com.yyrh.utils.Utils;
 
 public class BaseFragment extends Fragment implements View.OnClickListener {
-    private Button btn_kefu;
+    private ImageButton btn_kefu;
 
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
@@ -47,7 +50,14 @@ public class BaseFragment extends Fragment implements View.OnClickListener {
     @Override
     public void onClick(View v) {
         if (v.getId() == ResourceUtil.getId(getActivity(), "btn_kefu")){
-            Toast.makeText(getActivity(), "这是客服",1).show();
+
+            if (!Utils.judgeStrNull(SDKSettings.customer_service_url)){
+
+                new WvPageListDialog(getActivity(),ResourceUtil.getStyleId(getActivity(),"qj_base_dialog"),SDKSettings.customer_service_url).show();
+
+            }
+
+
         }
     }
 }

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

@@ -17,6 +17,7 @@ import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
@@ -38,7 +39,8 @@ public class UserAccountLoginFragment extends BaseFragment {
 
     private EditText reg_account_edit,reg_pwd_edit;
     private ImageView down_btn,iv_show_pwd;
-    private Button reg_compete_btn,close_btn;
+    private ImageButton close_btn;
+    private Button reg_compete_btn;
     private TextView tv_fofget_pwd;
     private boolean isShowPwd = false;
     DatabaseHelper dbHelper;
@@ -206,6 +208,7 @@ public class UserAccountLoginFragment extends BaseFragment {
                 new TosUtil(getActivity(),TosUtil.TOAST_ERROR, msg).show();
 
                 SDKEntry.getSdkInstance().loginCall.onLoginFailed(msg);
+
             }
 
             @Override

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

@@ -15,6 +15,7 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -39,7 +40,8 @@ public class UserRegisterFragment extends BaseFragment {
     private EditText reg_account_edit,reg_pwd_edit;
     private ImageView iv_clear_text,iv_show_pwd;
     private TextView tv_tip,tv_private_policy;
-    private Button reg_compete_btn,btn_account_login,btn_guest_login,close_btn;
+    private Button reg_compete_btn,btn_account_login,btn_guest_login;
+    private ImageButton close_btn;
     private CheckBox cb_register;
     private boolean isShowPwd = true;
     private TimeCount time;

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

@@ -12,7 +12,9 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.ImageButton;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.yyrh.networking.NetRequestApi;
 import com.yyrh.ui.userlist.DatabaseHelper;
@@ -23,7 +25,8 @@ import com.yyrh.utils.Utils;
 public class UserRetrievePwdFragment extends BaseFragment {
 
     private EditText et_user_phone,et_user_code,et_user_pwd;
-    private Button btn_get_code,reg_compete_btn,close_btn;
+    private Button btn_get_code,reg_compete_btn;
+    private ImageButton close_btn;
 
     private TextView tv_tip_2;
     @Nullable
@@ -46,7 +49,7 @@ public class UserRetrievePwdFragment extends BaseFragment {
         reg_compete_btn  = view.findViewById(ResourceUtil.getId(getActivity(), "reg_compete_btn"));
 
         tv_tip_2 = view.findViewById(ResourceUtil.getId(getActivity(), "tv_tip_2"));
-
+        tv_tip_2.setOnClickListener(this);
         close_btn  = view.findViewById(ResourceUtil.getId(getActivity(), "close_btn"));
 
         btn_get_code.setOnClickListener(this);
@@ -99,7 +102,7 @@ public class UserRetrievePwdFragment extends BaseFragment {
             replaceFragmentToActivity(getFragmentManager(),accountLoginFragment,ResourceUtil.getId(getActivity(),"qj_content"));
 
         }else if (id == ResourceUtil.getId(getActivity(), "tv_tip_2")) {
-
+            Toast.makeText(getActivity(), "这是客服",1).show();
         }
 
     }

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

@@ -1,29 +0,0 @@
-package com.yyrh.utils;
-
-import android.content.Context;
-
-import java.lang.reflect.Method;
-
-public class ScreenAdapterUtils {
-
-    public static final int VIVO_NOTCH = 0x00000020;//是否有刘海
-    public static final int VIVO_FILLET = 0x00000008;//是否有圆角
-
-    public static boolean hasNotchAtVivo(Context context) {
-        boolean ret = false;
-        try {
-            ClassLoader classLoader = context.getClassLoader();
-            Class FtFeature = classLoader.loadClass("android.util.FtFeature");
-            Method method = FtFeature.getMethod("isFeatureSupport", int.class);
-            ret = (boolean) method.invoke(FtFeature, VIVO_NOTCH);
-        } catch (ClassNotFoundException e) {
-
-
-        } catch (Exception e) {
-
-        } finally {
-            return ret;
-        }
-    }
-
-}

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

@@ -5,8 +5,12 @@ import android.content.Context;
 import android.view.View;
 import android.widget.RelativeLayout;
 
+import com.yyrh.constant.InitConfig;
 import com.yyrh.constant.SDKSettings;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+
 import java.text.DecimalFormat;
 
 
@@ -56,4 +60,21 @@ public class SwitchUtil {
 
     }
 
+    public  static void saveInitData(JSONArray data){
+        if (data == null){
+            InitConfig.fristShowPage = "";
+            YYLog.i("reg_tabs is null.");
+
+        }else{
+            YYLog.i("reg_tabs : data" + data);
+            try {
+                if (data.get(0).toString().equals("phone")){
+                    InitConfig.fristShowPage = "phone";
+                }
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
 }

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

@@ -60,7 +60,7 @@ public class ChannelSDK extends BaseSDK {
     @Override
     public void SDKExit(Activity ac, ChannelSdkCallback sdkCallback) {
 
-        getSdkCallback().onShowGameExit();
+
     }
 
     @Override

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

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

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

@@ -10,13 +10,14 @@
         android:layout_height="52dp"
         >
 
-        <Button
+        <ImageButton
             android:id="@+id/close_btn"
-            android:layout_width="8dp"
-            android:layout_height="16dp"
+            android:layout_width="26dp"
+            android:layout_height="match_parent"
             android:layout_marginLeft="30dp"
-            android:layout_centerVertical="true"
-            android:background="@mipmap/qj_reback"
+            android:layout_alignParentLeft="true"
+            android:src="@mipmap/qj_reback"
+            android:background="@color/qj_transparent"
             />
         <ImageView
             android:layout_width="wrap_content"
@@ -26,14 +27,15 @@
             android:background="@mipmap/qj_account_login_text"
 
             />
-        <Button
+        <ImageButton
             android:id="@+id/btn_kefu"
-            android:layout_width="20dp"
-            android:layout_height="23dp"
+            android:layout_width="26dp"
+            android:layout_height="match_parent"
             android:layout_marginRight="30dp"
             android:layout_centerVertical="true"
             android:layout_alignParentRight="true"
-            android:background="@mipmap/qj_kefu"
+            android:src="@mipmap/qj_kefu"
+            android:background="@color/qj_transparent"
             />
 
     </RelativeLayout>
@@ -118,17 +120,6 @@
             android:textSize="16sp" />
     </RelativeLayout>
 
-
-
-    <ListView
-        android:layout_marginTop="102dp"
-        android:layout_centerHorizontal="true"
-        android:id="@+id/account_listview"
-        android:layout_width="300dp"
-        android:layout_height="160dp"
-        android:divider="@null"
-        android:visibility="gone"
-        />
     <TextView
         android:id="@+id/tv_fofget_pwd"
         android:layout_marginTop="15dp"
@@ -142,6 +133,17 @@
         />
 
 
+    <ListView
+        android:layout_marginTop="102dp"
+        android:layout_centerHorizontal="true"
+        android:id="@+id/account_listview"
+        android:layout_width="300dp"
+        android:layout_height="160dp"
+        android:divider="@null"
+        android:visibility="gone"
+        />
+
+
     <TextView
         android:id="@+id/list_text"
         android:layout_width="300dp"

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

@@ -19,15 +19,16 @@
             android:background="@mipmap/qj_logo"
 
             />
-        <Button
+
+        <ImageButton
             android:id="@+id/btn_kefu"
-            android:layout_width="20dp"
-            android:layout_height="23dp"
-            android:layout_marginRight="30dp"
-            android:layout_centerVertical="true"
+            android:layout_width="26dp"
+            android:layout_height="match_parent"
             android:layout_alignParentRight="true"
-            android:background="@mipmap/qj_kefu"
-            />
+            android:layout_centerVertical="true"
+            android:layout_marginRight="30dp"
+            android:src="@mipmap/qj_kefu"
+            android:background="@color/qj_transparent"/>
 
     </RelativeLayout>
     <RelativeLayout
@@ -160,7 +161,7 @@
             android:layout_centerHorizontal="true"
             android:layout_gravity="center_horizontal"
             android:background="@drawable/qj_login_button_style"
-            android:text="@string/qj_login"
+            android:text="@string/qj_register"
             android:textSize="16sp"
             android:textColor="@color/qj_white"
             android:minHeight="1dp"

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

@@ -10,13 +10,14 @@
         android:layout_width="match_parent"
         android:layout_height="52dp">
 
-        <Button
+        <ImageButton
             android:id="@+id/close_btn"
-            android:layout_width="8dp"
-            android:layout_height="16dp"
+            android:layout_width="26dp"
+            android:layout_height="match_parent"
             android:layout_centerVertical="true"
             android:layout_marginLeft="30dp"
-            android:background="@mipmap/qj_reback" />
+            android:src="@mipmap/qj_reback"
+            android:background="@color/qj_transparent"/>
 
         <ImageView
             android:layout_width="wrap_content"
@@ -27,14 +28,15 @@
 
             />
 
-        <Button
+        <ImageButton
             android:id="@+id/btn_kefu"
-            android:layout_width="20dp"
-            android:layout_height="23dp"
+            android:layout_width="26dp"
+            android:layout_height="match_parent"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:layout_marginRight="30dp"
-            android:background="@mipmap/qj_kefu" />
+            android:src="@mipmap/qj_kefu"
+            android:background="@color/qj_transparent" />
 
     </RelativeLayout>
 

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

@@ -11,13 +11,14 @@
         android:layout_height="52dp"
         >
 
-        <Button
+        <ImageButton
             android:id="@+id/close_btn"
-            android:layout_width="8dp"
-            android:layout_height="16dp"
+            android:layout_width="26dp"
+            android:layout_height="match_parent"
             android:layout_marginLeft="30dp"
             android:layout_centerVertical="true"
-            android:background="@mipmap/qj_reback"
+            android:src="@mipmap/qj_reback"
+            android:background="@color/qj_transparent"
             />
         <ImageView
             android:layout_width="wrap_content"
@@ -27,14 +28,15 @@
             android:background="@mipmap/qj_retrieve_pwd_text"
 
             />
-        <Button
+        <ImageButton
             android:id="@+id/btn_kefu"
-            android:layout_width="20dp"
-            android:layout_height="23dp"
+            android:layout_width="26dp"
+            android:layout_height="match_parent"
             android:layout_marginRight="30dp"
             android:layout_centerVertical="true"
             android:layout_alignParentRight="true"
-            android:background="@mipmap/qj_kefu"
+            android:src="@mipmap/qj_kefu"
+            android:background="@color/qj_transparent"
             />
 
     </RelativeLayout>

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

@@ -23,7 +23,8 @@
         android:layout_alignParentRight="true"
         android:layout_marginRight="10dp"
         android:layout_centerVertical="true"
-        android:src="@mipmap/qj_close" />
+        android:src="@mipmap/qj_close"
+        android:padding="10dp"/>
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"

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

@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="360dp"
     android:layout_height="280dp"
-    android:background="@drawable/qj_radius_white_12dp"
+    android:background="@drawable/qj_common_wv_bg"
     android:orientation="vertical"
     android:id="@+id/ll_webview_common"
     >
@@ -22,7 +22,7 @@
             android:layout_marginLeft="2dp"
             android:layout_marginRight="2dp"
             android:layout_marginBottom="10dp"
-            android:background="@color/qj_white"
+            android:background="@color/qj_transparent"
             android:layout_gravity="center"
             />
 

hnqj/src/main/res/values/strings.xml

@@ -1,67 +1,5 @@
 <resources>
 
-    <string name="yyrh_input_account_pls">账号/手机号</string>
-    <string name="yyrh_input_pwd_pls">密码</string>
-    <string name="yyrh_enter_game">进入游戏</string>
-    <string name="yyrh_usercenter">用户中心</string>
-    <string name="yyrh_forget_pwd">忘记密码</string>
-    <string name="yyrh_customer_kf">联系客服</string>
-    <string name="yyrh_no_record">当前无记录账号</string>
-    <string name="yyrh_1s_register">快速注册</string>
-    <string name="yyrh_account_login">账号登录</string>
-    <string name="yyrh_exit_game">退出游戏</string>
-    <string name="yyrh_6_15_pwd">6至15位数的密码</string>
-    <string name="yyrh_register_success">完成注册</string>
-    <string name="yyrh_find_pwd">确认找回</string>
-    <string name="yyrh_back">返回</string>
-    <string name="yyrh_phone_register">手机注册</string>
-    <string name="yyrh_find_pwd_phone">重置密码</string>
-    <string name="yyrh_input_number">请输入11位手机号码</string>
-    <string name="yyrh_input_has_register_number">请输入11位手机号码</string>
-    <string name="yyrh_input_code">请输入验证码</string>
-    <string name="yyrh_has_account">已有账号</string>
-    <string name="yyrh_get_phone_code">获取验证码</string>
-    <string name="yyrh_input_your_account">请输入您的账号</string>
-    <string name="yyrh_issure_exit">是 否 确 认 退 出 游 戏？</string>
-    <string name="yyrh_sure">确 定</string>
-    <string name="yyrh_cancel">取 消</string>
-    <string name="yyrh_pay_title">确认支付方式</string>
-    <string name="yyrh_exit_tip">提 示</string>
-    <string name="yyrh_title_tip">温馨提示</string>
-    <string name="yyrh_kf_center">客服中心</string>
-    <string name="yyrh_band_need_account">请输入账号</string>
-    <string name="yyrh_band_need_pwd">请输入密码</string>
-    <string name="yyrh_set_new_pwd">请设置新的6至15位密码</string>
-    <string name="yyrh_acount_not_only_number">账号不能为纯数字</string>
-    <string name="yyrh_regist_pwd_error">密码需6至15位</string>
-    <string name="yyrh_regist_account_error">账号需6至15位</string>
-    <string name="yyrh_account_limit_6">账号不少于六位数</string>
-    <string name="yyrh_pwd_limit_6">密码不少于六位数</string>
-    <string name="yyrh_pls_checked_reg_tip">请先同意用户服务协议</string>
-    <string name="yyrh_agree_register_tip">《用户服务协议》</string>
-    <string name="yyrh_network_error_tip">网络出错，请检查网络</string>
-    <string name="yyrh_register_screen_tip">注册成功，已将账号信息保存至相册</string>
-    <string name="yyrh_pls_input_right_phone">请输入有效手机号</string>
-    <string name="yyrh_pls_input_right_code">请输入正确验证码</string>
-    <string name="yyrh_logging">登录中...</string>
-    <string name="yyrh_initing">正在初始化...</string>
-    <string name="yyrh_registering">注册中...</string>
-    <string name="yyrh_resetpwd">重置密码中...</string>
-    <string name="yyrh_pay_init">支付初始化...</string>
-    <string name="yyrh_get_code">正在获取验证码..</string>
-    <string name="yyrh_ctime_format_error">角色创建时间格式错误，需10位数精度为秒</string>
-    <string name="yyrh_login2pay">请先登录...</string>
-    <string name="yyrh_agreement">同意</string>
-    <string name="yyrh_disagreement">不同意</string>
-    <string name="yyrh_and">和</string>
-    <string name="yyrh_private_policy">《隐私政策》</string>
-    <string name="yyrh_send_code_success">验证码发送成功</string>
-    <string name="yyrh_pls_upload_roleinfo_frist">请先调用上传角色信息</string>
-    <string name="yyrh_autologin_text">数据传输登录中...</string>
-    <string name="yyrh_autologin_cancel">取消登录</string>
-
-    <string name="yyrh_confirm">确定</string>
-
 
     <string name="qj_visitors_register">游客登录</string>
     <string name="qj_input_your_account">请输入账号</string>
@@ -79,7 +17,7 @@
     <string name="qj_contact_tip">联系客服</string>
     <string name="qj_get_back_tip">找回</string>
     <string name="qj_account_login">账号登录</string>
-    <string name="qj_guset_login">游客注册</string>
+    <string name="qj_guset_login">游客登录</string>
     <string name="qj_login">登录</string>
     <string name="qj_switch_account">切换账号</string>
     <string name="qj_enter_game_tip">,欢迎进入游戏\t\t\t\t</string>
@@ -108,9 +46,7 @@
     <string name="qj_acount_not_only_number">账号不能为纯数字</string>
     <string name="qj_regist_account_error">账号需6至15位</string>
     <string name="qj_regist_pwd_error">密码需6至15位</string>
-
     <string name="qj_register_screen_tip">注册成功，已将账号信息保存至相册</string>
-
     <string name="qj_logging">登录中...</string>
     <string name="qj_initing">正在初始化...</string>
     <string name="qj_registering">注册中...</string>
@@ -120,4 +56,5 @@
     <string name="qj_ctime_format_error">角色创建时间格式错误，需10位数精度为秒</string>
     <string name="qj_pls_upload_roleinfo_frist">请先调用上传角色信息</string>
     <string name="qj_exit_tip">提 示</string>
+    <string name="qj_register">注册</string>
 </resources>