删除多余的文件。

app/build.gradle

@@ -4,7 +4,7 @@ android {
     compileSdkVersion 28
     defaultConfig {
 
-        applicationId "com.fx.qyj2.gdtdevp100001.hnqj"
+        applicationId "com.fx.qyj2.gdtdevp100001.hnqj.portrait"
 
         minSdkVersion 15
         targetSdkVersion 26

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

@@ -1,6 +1,6 @@
 <resources>
 
-    <string name="app_name">海南奇境SDK</string>
+    <string name="app_name">海南奇境SDK_竖屏</string>
 
 
 </resources>

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

@@ -66,7 +66,7 @@ public class NetRequestApi {
     public static void init(final Activity activity, final InitCallback initCallback) {
 
 
-        ProgressDialogUtils.show(activity, activity.getString(ResourceUtil.getStringId(activity, "yyrh_initing")));
+        ProgressDialogUtils.show(activity, activity.getString(ResourceUtil.getStringId(activity, "qj_initing")));
 
         HashMap<String, String> map = getCommonParams();
 
@@ -89,7 +89,7 @@ public class NetRequestApi {
                 YYLog.i(errorMessage);
 
 
-                initCallback.onInitError(activity.getString(ResourceUtil.getStringId(activity, "yyrh_network_error_tip")));
+                initCallback.onInitError(activity.getString(ResourceUtil.getStringId(activity, "qj_network_error_tip")));
 
             }
 
@@ -138,7 +138,7 @@ public class NetRequestApi {
 
     public static void loginWithYy(boolean isShowPrg, final Activity activity, String account, String password, final LoginCallback loginCallback) {
         if (isShowPrg){
-            ProgressDialogUtils.show(activity, activity.getString(ResourceUtil.getStringId(activity, "yyrh_logging")));
+            ProgressDialogUtils.show(activity, activity.getString(ResourceUtil.getStringId(activity, "qj_logging")));
         }
 
 
@@ -169,9 +169,9 @@ public class NetRequestApi {
             @Override
             public void onFailure(int code, String errorMessage) {
                 ProgressDialogUtils.dismiss();
-                new TosUtil(activity, TosUtil.TOAST_ERROR, activity.getString(ResourceUtil.getStringId(activity, "yyrh_network_error_tip"))).show();
+                new TosUtil(activity, TosUtil.TOAST_ERROR, activity.getString(ResourceUtil.getStringId(activity, "qj_network_error_tip"))).show();
 
-                loginCallback.onLoginError(activity.getString(ResourceUtil.getStringId(activity, "yyrh_network_error_tip")));
+                loginCallback.onLoginError(activity.getString(ResourceUtil.getStringId(activity, "qj_network_error_tip")));
             }
 
             @Override
@@ -225,7 +225,7 @@ public class NetRequestApi {
         }
 
 
-        ProgressDialogUtils.show(activity, activity.getString(ResourceUtil.getStringId(activity, "yyrh_registering")));
+        ProgressDialogUtils.show(activity, activity.getString(ResourceUtil.getStringId(activity, "qj_registering")));
 
         HashMap<String, String> map = getCommonParams();
 
@@ -256,7 +256,7 @@ public class NetRequestApi {
             @Override
             public void onFailure(int code, String errorMessage) {
                 ProgressDialogUtils.dismiss();
-                registerCallback.onRegisterFailed(activity.getString(ResourceUtil.getStringId(activity, "yyrh_network_error_tip")));
+                registerCallback.onRegisterFailed(activity.getString(ResourceUtil.getStringId(activity, "qj_network_error_tip")));
 
             }
 
@@ -293,7 +293,7 @@ public class NetRequestApi {
     }
 
     public static void loginWithChannel(final Activity activity, String channelLoginInfo, final LoginCallback loginCallback) {
-        ProgressDialogUtils.show(activity, activity.getString(ResourceUtil.getStringId(activity, "yyrh_logging")));
+        ProgressDialogUtils.show(activity, activity.getString(ResourceUtil.getStringId(activity, "qj_logging")));
 
         HashMap<String, String> map = getCommonParams();
 
@@ -315,10 +315,10 @@ public class NetRequestApi {
             public void onFailure(int code, String errorMessage) {
                 ProgressDialogUtils.dismiss();
 
-                new TosUtil(activity, TosUtil.TOAST_ERROR, activity.getString(ResourceUtil.getStringId(activity, "yyrh_network_error_tip"))).show();
+                new TosUtil(activity, TosUtil.TOAST_ERROR, activity.getString(ResourceUtil.getStringId(activity, "qj_network_error_tip"))).show();
 
 
-                loginCallback.onLoginError(activity.getString(ResourceUtil.getStringId(activity, "yyrh_network_error_tip")));
+                loginCallback.onLoginError(activity.getString(ResourceUtil.getStringId(activity, "qj_network_error_tip")));
                 YYLog.i(errorMessage);
             }
 
@@ -383,7 +383,7 @@ public class NetRequestApi {
 
 
         if (createTime.length() != 10) {
-            new TosUtil(activity, TosUtil.TOAST_ERROR, activity.getString(ResourceUtil.getStringId(activity, "yyrh_ctime_format_error"))).show();
+            new TosUtil(activity, TosUtil.TOAST_ERROR, activity.getString(ResourceUtil.getStringId(activity, "qj_ctime_format_error"))).show();
 
             return;
         }
@@ -450,7 +450,7 @@ public class NetRequestApi {
                                     final Activity activity, final PayOrderCallback callback) {
 
 
-        ProgressDialogUtils.show(activity, activity.getString(ResourceUtil.getStringId(activity, "yyrh_pay_init")));
+        ProgressDialogUtils.show(activity, activity.getString(ResourceUtil.getStringId(activity, "qj_pay_init")));
         String cp_order_id = (String) map.get("game_no");
         String money = (String) map.get("pay_money");
         String server_id = (String) map.get("server_id");
@@ -484,7 +484,7 @@ public class NetRequestApi {
 
         String role_ctime = (String) map.get("role_ctime");
         if (Utils.judgeStrNull(role_ctime)) {
-            new TosUtil(activity, TosUtil.TOAST_ERROR, activity.getString(ResourceUtil.getStringId(activity, "yyrh_pls_upload_roleinfo_frist"))).show();
+            new TosUtil(activity, TosUtil.TOAST_ERROR, activity.getString(ResourceUtil.getStringId(activity, "qj_pls_upload_roleinfo_frist"))).show();
             ProgressDialogUtils.dismiss();
             return;
         }
@@ -532,9 +532,9 @@ public class NetRequestApi {
             @Override
             public void onFailure(int code, String errorMessage) {
                 ProgressDialogUtils.dismiss();
-                new TosUtil(activity, TosUtil.TOAST_ERROR, activity.getString(ResourceUtil.getStringId(activity, "yyrh_network_error_tip"))).show();
+                new TosUtil(activity, TosUtil.TOAST_ERROR, activity.getString(ResourceUtil.getStringId(activity, "qj_network_error_tip"))).show();
 
-                callback.onPayFailed(activity.getString(ResourceUtil.getStringId(activity, "yyrh_network_error_tip")));
+                callback.onPayFailed(activity.getString(ResourceUtil.getStringId(activity, "qj_network_error_tip")));
 
                 YYLog.i(errorMessage);
             }
@@ -584,7 +584,7 @@ public class NetRequestApi {
 
     public static void getPhoneCaptcha(final Activity activity, String phone, String action, final UserPhoneLoginFragment.CaptchaCallback captchaCallback) {
 
-        ProgressDialogUtils.show(activity, activity.getString(ResourceUtil.getStringId(activity, "yyrh_get_code")));
+        ProgressDialogUtils.show(activity, activity.getString(ResourceUtil.getStringId(activity, "qj_get_code")));
 
         HashMap<String, String> map = getCommonParams();
 
@@ -604,9 +604,9 @@ public class NetRequestApi {
             @Override
             public void onFailure(int code, String errorMessage) {
                 ProgressDialogUtils.dismiss();
-                new TosUtil(activity, TosUtil.TOAST_ERROR, activity.getString(ResourceUtil.getStringId(activity, "yyrh_network_error_tip"))).show();
+                new TosUtil(activity, TosUtil.TOAST_ERROR, activity.getString(ResourceUtil.getStringId(activity, "qj_network_error_tip"))).show();
 
-                captchaCallback.onGetFailed(activity.getString(ResourceUtil.getStringId(activity, "yyrh_network_error_tip")));
+                captchaCallback.onGetFailed(activity.getString(ResourceUtil.getStringId(activity, "qj_network_error_tip")));
 
                 YYLog.i(errorMessage);
             }
@@ -642,7 +642,7 @@ public class NetRequestApi {
         if (ProgressDialogUtils.isShowing()) {
             return;
         }
-        ProgressDialogUtils.show(activity, activity.getString(ResourceUtil.getStringId(activity, "yyrh_registering")));
+        ProgressDialogUtils.show(activity, activity.getString(ResourceUtil.getStringId(activity, "qj_registering")));
 
         HashMap<String, String> map = getCommonParams();
 
@@ -664,7 +664,7 @@ public class NetRequestApi {
             public void onFailure(int code, String errorMessage) {
                 ProgressDialogUtils.dismiss();
 
-                phoneRegisterCallback.onRegisterFailed(activity.getString(ResourceUtil.getStringId(activity, "yyrh_network_error_tip")));
+                phoneRegisterCallback.onRegisterFailed(activity.getString(ResourceUtil.getStringId(activity, "qj_network_error_tip")));
                 YYLog.i(errorMessage);
             }
 
@@ -726,7 +726,7 @@ public class NetRequestApi {
 
     public static void resetPwdWithPhone(Activity activity, String phone, String code, String pwd, final UserRetrievePwdFragment.ResetPwdCallback resetPwdCallback) {
 
-        ProgressDialogUtils.show(activity, activity.getString(ResourceUtil.getStringId(activity, "yyrh_resetpwd")));
+        ProgressDialogUtils.show(activity, activity.getString(ResourceUtil.getStringId(activity, "qj_resetpwd")));
 
         HashMap<String, String> map = getCommonParams();
 

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

@@ -301,7 +301,7 @@ public class SDKEntry {
 
         }
         if(inputStream != null){
-            new GameSplashDialog(activity, ResourceUtil.getStyleId(activity,"yyrh_welcome_dialog")).show();
+            new GameSplashDialog(activity, ResourceUtil.getStyleId(activity,"qj_welcome_dialog")).show();
         }
 
 

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

@@ -88,7 +88,7 @@ public class PrivacyPolicyDialog extends Dialog {
 
 
         yyrh_loading = findViewById(ResourceUtil.getId(context, "qj_loading"));
-        Animation rotateAnimation = AnimationUtils.loadAnimation(context, ResourceUtil.getAnimId(context, "yyrh_rotate_anim"));
+        Animation rotateAnimation = AnimationUtils.loadAnimation(context, ResourceUtil.getAnimId(context, "qj_rotate_anim"));
         yyrh_loading.startAnimation(rotateAnimation);
 
 

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

@@ -22,7 +22,7 @@ public class ProgressDialogUtils {
 		if(progressDialog == null || _activity != activity){
 			activity = _activity;
 
-			progressDialog = new Dialog(_activity,ResourceUtil.getStyleId(_activity, "yyrh_progress_dialog"));
+			progressDialog = new Dialog(_activity,ResourceUtil.getStyleId(_activity, "qj_progress_dialog"));
 			progressDialog.setContentView(ResourceUtil.getLayoutId(_activity, "qj_dialog_progress"));
             progressDialog.setCancelable(false);
             progressDialog.getWindow().setBackgroundDrawableResource(android.R.color.transparent);

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

@@ -99,7 +99,7 @@ public class WvPageListDialog extends BaseDialog {
                 "close_btn"));
 
         yyrh_loading = findViewById(ResourceUtil.getId(context, "qj_loading"));
-        Animation rotateAnimation = AnimationUtils.loadAnimation(context, ResourceUtil.getAnimId(context, "yyrh_rotate_anim"));
+        Animation rotateAnimation = AnimationUtils.loadAnimation(context, ResourceUtil.getAnimId(context, "qj_rotate_anim"));
         yyrh_loading.startAnimation(rotateAnimation);
 
         close_btn.setOnClickListener(new View.OnClickListener() {

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

@@ -165,26 +165,26 @@ public class UserAccountLoginFragment extends BaseFragment {
 
     private void startLogin(final String account, final String pwd) {
         if (Utils.judgeStrNull(account)){
-            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")));
+            new TosUtil(getActivity(),TosUtil.TOAST_ERROR, getString(ResourceUtil.getStringId(getActivity(), "qj_band_need_account"))).show();
+
             return;
         }
         if (Utils.judgeStrNull(pwd)){
-            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")));
+            new TosUtil(getActivity(),TosUtil.TOAST_ERROR, getString(ResourceUtil.getStringId(getActivity(), "qj_band_need_pwd"))).show();
+
             return;
         }
 
         if(account.length()<6)
         {
-            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")));
+            new TosUtil(getActivity(),TosUtil.TOAST_ERROR, getString(ResourceUtil.getStringId(getActivity(), "qj_account_limit_6"))).show();
+
             return;
         }
         if(pwd.length()<6)
         {
-            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")));
+            new TosUtil(getActivity(),TosUtil.TOAST_ERROR, getString(ResourceUtil.getStringId(getActivity(), "qj_pwd_limit_6"))).show();
+
             return;
         }
         registerInterval();
@@ -286,6 +286,6 @@ public class UserAccountLoginFragment extends BaseFragment {
         list_text.setVisibility(View.GONE);
         isShowList = false;
 
-        showListView.setImageResource(ResourceUtil.getMipmapId(getActivity(), "yyrh_arrow_normal"));
+        showListView.setImageResource(ResourceUtil.getMipmapId(getActivity(), "qj_arrow_normal"));
     }
 }

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

@@ -123,7 +123,7 @@ public class UserPhoneLoginFragment extends BaseFragment {
 
         if(account.length() < 10 || Utils.judgeStrNull(account))
         {
-            new TosUtil(getActivity(),TosUtil.TOAST_ERROR,getString(ResourceUtil.getStringId(getActivity(), "yyrh_pls_input_right_phone"))).show();
+            new TosUtil(getActivity(),TosUtil.TOAST_ERROR,getString(ResourceUtil.getStringId(getActivity(), "qj_pls_input_right_phone"))).show();
 
 
             return;
@@ -131,7 +131,7 @@ public class UserPhoneLoginFragment extends BaseFragment {
         if(pwd.length() < 6 || Utils.judgeStrNull(pwd))
         {
 
-            new TosUtil(getActivity(),TosUtil.TOAST_ERROR, getString(ResourceUtil.getStringId(getActivity(), "yyrh_pwd_limit_6"))).show();
+            new TosUtil(getActivity(),TosUtil.TOAST_ERROR, getString(ResourceUtil.getStringId(getActivity(), "qj_pwd_limit_6"))).show();
 
 
 
@@ -139,14 +139,14 @@ public class UserPhoneLoginFragment extends BaseFragment {
         }
         if(code.length() < 4 || Utils.judgeStrNull(code))
         {
-            new TosUtil(getActivity(),TosUtil.TOAST_ERROR, getString(ResourceUtil.getStringId(getActivity(), "yyrh_pls_input_right_code"))).show();
+            new TosUtil(getActivity(),TosUtil.TOAST_ERROR, getString(ResourceUtil.getStringId(getActivity(), "qj_pls_input_right_code"))).show();
 
             return;
         }
 
         if (!cb_register.isChecked()){
 
-            new TosUtil(getActivity(), TosUtil.TOAST_ERROR,getString(ResourceUtil.getStringId(getActivity(), "yyrh_pls_checked_reg_tip"))).show();
+            new TosUtil(getActivity(), TosUtil.TOAST_ERROR,getString(ResourceUtil.getStringId(getActivity(), "qj_pls_checked_reg_tip"))).show();
 
             return;
 
@@ -186,10 +186,10 @@ public class UserPhoneLoginFragment extends BaseFragment {
             public void onGetSuccess(String msg) {
                 getCodeSuccess();
 
-                new TosUtil(getActivity(),TosUtil.TOAST_GREEN,getString(ResourceUtil.getStringId(getActivity(), "yyrh_send_code_success"))).show();
+                new TosUtil(getActivity(),TosUtil.TOAST_GREEN,getString(ResourceUtil.getStringId(getActivity(), "qj_send_code_success"))).show();
+
 
 
-                // ToastUtil.show(context,context.getString(ResourceUtil.getStringId(context, "yyrh_send_code_success")));
             }
 
             @Override
@@ -227,7 +227,7 @@ public class UserPhoneLoginFragment extends BaseFragment {
             // TODO Auto-generated method stub
             btn_get_code.setEnabled(true);
 
-            btn_get_code.setText(ResourceUtil.getStringId(getActivity(), "yyrh_get_phone_code"));
+            btn_get_code.setText(ResourceUtil.getStringId(getActivity(), "qj_get_phone_code"));
         }
 
     }
@@ -255,7 +255,7 @@ public class UserPhoneLoginFragment extends BaseFragment {
 
         btn_reg_compete.setEnabled(false);
         btn_reg_compete.setText("3s");
-        btn_reg_compete.setBackgroundResource(ResourceUtil.getColorId(getActivity(),"yyrh_black_color_40"));
+        btn_reg_compete.setBackgroundResource(ResourceUtil.getDrawableId(getActivity(),"qj_login_button_grayed_style"));
         RegTimeCount time = new RegTimeCount(3000, 1000);
         time.start();
     }

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

@@ -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(),TosUtil.TOAST_ERROR, getActivity().getString(ResourceUtil.getStringId(getActivity(), "yyrh_pls_checked_reg_tip"))).show();
+            new TosUtil(getActivity(),TosUtil.TOAST_ERROR, getActivity().getString(ResourceUtil.getStringId(getActivity(), "qj_pls_checked_reg_tip"))).show();
 
             return;
         }
         if (Utils.judgeStrNull(account)){
-            new TosUtil(getActivity(),TosUtil.TOAST_ERROR,  getActivity().getString(ResourceUtil.getStringId(getActivity(), "yyrh_band_need_account"))).show();
+            new TosUtil(getActivity(),TosUtil.TOAST_ERROR,  getActivity().getString(ResourceUtil.getStringId(getActivity(), "qj_band_need_account"))).show();
 
 
 
             return;
         }
         if (Utils.isNumeric(account)){
-            new TosUtil(getActivity(),TosUtil.TOAST_ERROR,  getActivity().getString(ResourceUtil.getStringId(getActivity(), "yyrh_acount_not_only_number"))).show();
+            new TosUtil(getActivity(),TosUtil.TOAST_ERROR,  getActivity().getString(ResourceUtil.getStringId(getActivity(), "qj_acount_not_only_number"))).show();
 
             return;
         }
         if (Utils.judgeStrNull(pwd)){
-            new TosUtil(getActivity(),TosUtil.TOAST_ERROR,  getActivity().getString(ResourceUtil.getStringId(getActivity(), "yyrh_band_need_pwd"))).show();
+            new TosUtil(getActivity(),TosUtil.TOAST_ERROR,  getActivity().getString(ResourceUtil.getStringId(getActivity(), "qj_band_need_pwd"))).show();
 
 
             return;
         }
 
         if (account.length() < 6 || pwd.length() > 20) {
-            new TosUtil(getActivity(),TosUtil.TOAST_ERROR,  getActivity().getString(ResourceUtil.getStringId(getActivity(), "yyrh_regist_account_error"))).show();
+            new TosUtil(getActivity(),TosUtil.TOAST_ERROR,  getActivity().getString(ResourceUtil.getStringId(getActivity(), "qj_regist_account_error"))).show();
 
 
             return;
@@ -183,7 +183,7 @@ public class UserRegisterFragment extends BaseFragment {
 
         if (pwd.length() < 6 || pwd.length() > 20) {
 
-            new TosUtil(getActivity(), TosUtil.TOAST_ERROR, getActivity().getString(ResourceUtil.getStringId(getActivity(), "yyrh_regist_pwd_error"))).show();
+            new TosUtil(getActivity(), TosUtil.TOAST_ERROR, getActivity().getString(ResourceUtil.getStringId(getActivity(), "qj_regist_pwd_error"))).show();
             return;
         }
 
@@ -196,7 +196,7 @@ public class UserRegisterFragment extends BaseFragment {
 
                 if (ScreenShotUtil.shotByView(getActivity(),getView())){
 
-                    new TosUtil(getActivity(),TosUtil.TOAST_GREEN,  getString(ResourceUtil.getStringId(getActivity(), "yyrh_register_screen_tip"))).show();
+                    new TosUtil(getActivity(),TosUtil.TOAST_GREEN,  getString(ResourceUtil.getStringId(getActivity(), "qj_register_screen_tip"))).show();
 
                 }
 

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

@@ -64,7 +64,7 @@ public class UserRetrievePwdFragment extends BaseFragment {
             String phone =  et_user_phone.getText().toString();
 
             if (phone.length() < 10) {
-                new TosUtil(getActivity(),TosUtil.TOAST_ERROR, getString(ResourceUtil.getStringId(getActivity(), "yyrh_pls_input_right_phone"))).show();
+                new TosUtil(getActivity(),TosUtil.TOAST_ERROR, getString(ResourceUtil.getStringId(getActivity(), "qj_pls_input_right_phone"))).show();
                 return;
             }
             getPhoneCaptcha(getActivity(),phone,"modify_pwd");
@@ -74,20 +74,20 @@ public class UserRetrievePwdFragment extends BaseFragment {
             final String pwd = et_user_pwd.getText().toString();
             if (phone.length() < 10) {
 
-                new TosUtil(getActivity(),TosUtil.TOAST_ERROR,getString(ResourceUtil.getStringId(getActivity(), "yyrh_pls_input_right_phone"))).show();
+                new TosUtil(getActivity(),TosUtil.TOAST_ERROR,getString(ResourceUtil.getStringId(getActivity(), "qj_pls_input_right_phone"))).show();
 
                 return;
             }
             if(code.length() < 4 || Utils.judgeStrNull(code))
             {
-                new TosUtil(getActivity(),TosUtil.TOAST_ERROR,getString(ResourceUtil.getStringId(getActivity(), "yyrh_pls_input_right_code"))).show();
+                new TosUtil(getActivity(),TosUtil.TOAST_ERROR,getString(ResourceUtil.getStringId(getActivity(), "qj_pls_input_right_code"))).show();
 
 
                 return;
             }
             if(pwd.length() < 6 || Utils.judgeStrNull(pwd))
             {
-                new TosUtil(getActivity(),TosUtil.TOAST_ERROR, getString(ResourceUtil.getStringId(getActivity(), "yyrh_pwd_limit_6"))).show();
+                new TosUtil(getActivity(),TosUtil.TOAST_ERROR, getString(ResourceUtil.getStringId(getActivity(), "qj_pwd_limit_6"))).show();
 
                 return;
             }
@@ -110,7 +110,7 @@ public class UserRetrievePwdFragment extends BaseFragment {
             @Override
             public void onGetSuccess(String msg) {
                 getCodeSuccess();
-                new TosUtil(getActivity(),TosUtil.TOAST_GREEN, getString(ResourceUtil.getStringId(getActivity(), "yyrh_send_code_success"))).show();
+                new TosUtil(getActivity(),TosUtil.TOAST_GREEN, getString(ResourceUtil.getStringId(getActivity(), "qj_send_code_success"))).show();
 
 
             }
@@ -150,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"));
+            btn_get_code.setText(ResourceUtil.getStringId(getActivity(), "qj_get_phone_code"));
         }
 
     }

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

@@ -70,10 +70,10 @@ public class BaseSDK {
     }
 
     public void SDKExit(Activity ac, final ChannelSdkCallback sdkCallback) {
-        String tip = ac.getString(ResourceUtil.getStringId(ac, "yyrh_exit_tip"));
-        String message = ac.getString(ResourceUtil.getStringId(ac, "yyrh_issure_exit"));
-        String left = ac.getString(ResourceUtil.getStringId(ac, "yyrh_sure"));
-        String right = ac.getString(ResourceUtil.getStringId(ac, "yyrh_cancel"));
+        String tip = ac.getString(ResourceUtil.getStringId(ac, "qj_exit_tip"));
+        String message = ac.getString(ResourceUtil.getStringId(ac, "qj_issure_exit"));
+        String left = ac.getString(ResourceUtil.getStringId(ac, "qj_sure"));
+        String right = ac.getString(ResourceUtil.getStringId(ac, "qj_cancel"));
         new AlertDialog.Builder(ac)
                 .setTitle(tip)
                 .setMessage(message)

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

@@ -3,7 +3,7 @@
 
     <solid android:color="@color/qj_white_83" />
 
-    <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/qj_radius_white_1dp.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/yyrh_white" />
+    <solid android:color="@color/qj_white" />
 
     <stroke android:width="0.5dp" android:color="@color/qj_deepgrey"/>
     <corners android:radius="10dp" />

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

@@ -2,52 +2,10 @@
 <resources>
 
 
-    <!-- yy color start -->
 
 
-
-    <color name="yyrh_font_lightblack">#3D3D3D</color>
-
-    <color name="yyrh_deepgrey">#DBDBDB</color>
-
-    <color name="yyrh_EditText_bg">#F3EBEA</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>
-
-
-
-
-
-    <color name="yyrh_transparent">#00000000</color>
-
-    <color name="yyrh_btn1_color">#44a1b0</color>
-
-    <color name="yyrh_btn2_color">#169e61</color>
-
-    <color name="yyrh_btn3_color">#009ab2</color>
-
-    <color name="yyrh_btn4_color">#cfe298</color>
-
-    <color name="yyrh_black_color_40">#B2696969</color>
-
-    <color name="yyrh_blue_color">#6495ED</color>
-
-    <color name="yyrh_black">#000000</color>
-
-    <color name="yyrh_dialog_line">#999999</color>
-
-    <color name="yyrh_blues">#2abfff</color>
-
-    <!--  yy color end -->
-
     <!--    new UI color-->
-    <color name="yyrh_main_color">#43B7BB</color>
+
 
     <color name="qj_transparent_background">#50000000</color>
     <color name="qj_white_83">#D4FFFFFF</color>

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

@@ -98,4 +98,26 @@
     <string name="qj_agreement">同意</string>
     <string name="qj_find_pwd_phone">重置密码</string>
     <string name="qj_login2pay">请先登录...</string>
+    <string name="qj_band_need_account">请输入账号</string>
+    <string name="qj_band_need_pwd">请输入密码</string>
+    <string name="qj_account_limit_6">账号不少于六位数</string>
+    <string name="qj_pwd_limit_6">密码不少于六位数</string>
+    <string name="qj_pls_input_right_code">请输入正确验证码</string>
+    <string name="qj_pls_checked_reg_tip">请先同意用户服务协议</string>
+    <string name="qj_send_code_success">验证码发送成功</string>
+    <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>
+    <string name="qj_resetpwd">重置密码中...</string>
+    <string name="qj_pay_init">支付初始化...</string>
+    <string name="qj_get_code">正在获取验证码..</string>
+    <string name="qj_ctime_format_error">角色创建时间格式错误，需10位数精度为秒</string>
+    <string name="qj_pls_upload_roleinfo_frist">请先调用上传角色信息</string>
+    <string name="qj_exit_tip">提 示</string>
 </resources>

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

@@ -1,62 +1,12 @@
 <resources>
 
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="android:Theme.Light">
-        <!-- Customize your theme here. -->
 
-    </style>
-
-    <style name="yyrh_progress_dialog" parent="@android:style/Theme.Dialog">
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:background">@null</item>
-        <item name="android:windowBackground">@null</item>
-        <item name="android:backgroundDimEnabled">false</item>
-    </style>
-
-    <style name="yyrh_base_dialog" parent="@android:style/Theme.Dialog">
-        <item name="android:windowFrame">@null</item>
-        <!-- 边框 -->
-        <item name="android:windowIsFloating">true</item>
-        <!-- 是否浮现在activity之上 -->
-        <item name="android:windowIsTranslucent">false</item>
-        <!-- 半透明 -->
-        <item name="android:windowNoTitle">true</item>
-        <!-- 无标题 -->
-        <item name="android:windowBackground">@color/yyrh_transparent</item>
-        <!-- 背景透明 -->
-        <item name="android:backgroundDimEnabled">false</item>
-        <item name="android:windowCloseOnTouchOutside">false</item>
-        <item name="android:windowFullscreen">true</item>
 
 
-        <!-- 模糊 -->
-
 
-    </style>
 
-    <style name="yyrh_welcome_dialog">
 
-        <item name="android:windowBackground">@color/yyrh_transparent</item>
-        <!-- 背景透明 -->
 
-        <item name="android:windowFullscreen">true</item>
-        <item name="android:windowNoTitle">true</item>
-        <!-- 模糊 -->
-    </style>
-
-    <style name="yyrh_pay_dialog" parent="@android:style/Theme.Dialog">
-        <item name="android:windowBackground">@color/yyrh_transparent</item>
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:windowIsTranslucent">false</item>
-        <item name="android:windowFullscreen">true</item>
-        <item name="android:backgroundDimEnabled">false</item>
-        <item name="android:windowCloseOnTouchOutside">false</item>
-    </style>
 <!---qijing style-->
 
     <style name="qj_transparent">
@@ -80,7 +30,7 @@
     <!-- 半透明 -->
     <item name="android:windowNoTitle">true</item>
     <!-- 无标题 -->
-    <item name="android:windowBackground">@color/yyrh_transparent</item>
+    <item name="android:windowBackground">@color/qj_transparent</item>
     <!-- 背景透明 -->
     <item name="android:backgroundDimEnabled">false</item>
     <item name="android:windowCloseOnTouchOutside">false</item>
@@ -108,4 +58,25 @@
 
         <!-- 模糊 -->
     </style>
+
+    <style name="qj_progress_dialog" parent="@android:style/Theme.Dialog">
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:background">@null</item>
+        <item name="android:windowBackground">@null</item>
+        <item name="android:backgroundDimEnabled">false</item>
+    </style>
+
+
+    <style name="qj_welcome_dialog">
+
+        <item name="android:windowBackground">@color/qj_transparent</item>
+        <!-- 背景透明 -->
+
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowNoTitle">true</item>
+        <!-- 模糊 -->
+    </style>
 </resources>