ChannelDiff/Android/yilegame/libs/yl_sdk-game_ylgame-release.aarBinary files differ
Project/yj_sdk/build.gradle
@@ -1,11 +1,11 @@ apply plugin: 'com.android.library' android { compileSdkVersion 26 compileSdkVersion 22 defaultConfig { minSdkVersion 16 targetSdkVersion 26 targetSdkVersion 22 versionCode 1 versionName "1.1.0" } @@ -27,6 +27,12 @@ } } repositories { flatDir { dirs 'libs' } } dependencies { implementation files('libs/ahelper.jar') implementation files('libs/android-support-v4.jar') Project/yj_sdk/libs/gangaonlinehelper.jarBinary files differ
Project/yj_sdk/src/game_yj/AndroidManifest.xml
@@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" package="com.secondworld.univeralsdk" android:installLocation="auto" android:versionCode="1" @@ -61,7 +62,9 @@ android:name="com.secondworld.univeralsdk.YJSplashActivity" android:label="@string/app_name" android:configChanges="keyboardHidden|orientation|screenSize" android:screenOrientation="landscape" > android:launchMode="singleTop" android:screenOrientation="landscape" tools:replace="android:launchMode"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" /> @@ -72,7 +75,7 @@ android:name="com.secondworld.univeralsdk.MainActivity" android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale|layoutDirection" android:label="@string/app_name" android:launchMode="singleTask" android:launchMode="singleTop" android:screenOrientation="sensorLandscape"> <intent-filter> <category android:name="android.intent.category.DEFAULT" /> Project/yj_sdk/src/game_yj/java/com/secondworld/univeralsdk/H2EngineSDK.java
@@ -15,6 +15,7 @@ import android.provider.Settings; import android.widget.Toast; import com.snowfish.cn.ganga.helper.SFOnlineExitListener; import com.snowfish.cn.ganga.helper.SFOnlineHelper; import com.unity3d.player.UnityPlayer; @@ -109,20 +110,26 @@ // (float) _json.getDouble("mount"), // URLEncoder.encode(_extraData.toString(), // "utf-8")); if(_yjAppID.contains("mzgame")) if (_yjAppID.contains("mzgame") || _yjAppID.contains("ucgame") || _yjAppID.contains("yybgame")) { YJPlatformUtil.getInstance().pay(_activity, _json.getString("title"), _json.getString("cpInfo"), (float) _json.getDouble("mount"), URLEncoder.encode(_extraData.toString(), "utf-8")); }else{ URLEncoder.encode( _extraData.toString(), "utf-8")); } else { YJPlatformUtil.getInstance().charge(_activity, _json.getString("title"), (float) _json.getDouble("mount"), URLEncoder.encode(_extraData.toString(), "utf-8")); _json.getString("title"), (float) _json.getDouble("mount"), URLEncoder.encode( _extraData.toString(), "utf-8")); } } catch (UnsupportedEncodingException e) @@ -187,6 +194,9 @@ break; case CodeU2A.JPushRemoveLocalMessage: removeNotification(_activity, _json.getInt("id")); break; case CodeU2A.TencentLogin: YJPlatformUtil.getInstance().loginTencent(_activity, _json.getString("param")); break; } @@ -396,9 +406,11 @@ _msgStruct.clear(); _msgStruct.put("code", CodeA2U.SdkInitComplete); _msgStruct.put("channelPlatform", "yj"); _msgStruct.put("yj_appid", UniversalUtil.getMetaString(activity, "yj_appid")); String _appid = UniversalUtil.getMetaString(activity, "yj_appid"); _msgStruct.put("yj_appid", _appid); _msgStruct.put("yj_spid", UniversalUtil.getMetaString(activity, "yj_spid")); _msgStruct.put("yj_branch", UniversalUtil.getMetaInt(activity, "yj_branch")); _msgStruct.put("banhao", activity.getResources().getString(R.string.banhao)); UniversalUtil.sendMessageToUnity(_msgStruct); LogUtil.i(TAG, "初始化执行完毕"); @@ -416,20 +428,23 @@ public static void onWindowFocusChanged(boolean b) { // if (MrPlatformUtil.getInstance().payProcessing) // { // if (b) // { // Map<String, Object> _msgStruct = new HashMap<>(); // _msgStruct.put("code", CodeA2U.FreePlatformPayCancel); // UniversalUtil.sendMessageToUnity(_msgStruct); // MrPlatformUtil.getInstance().payProcessing = false; // } // } if (b) { if (YJPlatformUtil.getInstance().payProcessing) { Map<String, Object> _msgStruct = new HashMap<>(); _msgStruct.put("code", CodeA2U.FreePlatformPayCancel); UniversalUtil.sendMessageToUnity(_msgStruct); YJPlatformUtil.getInstance().payProcessing = false; } } m_IsFocus = b; } public static void onNewIntent(final Activity activity, final Intent intent) { SFOnlineHelper.onNewIntent(activity, intent); } public static void onActivityResult(int requestCode, @@ -437,6 +452,7 @@ final Intent data, final Activity activity) { SFOnlineHelper.onActivityResult(activity, requestCode, resultCode, data); } public static void onConfigurationChanged(final Configuration newConfig) {} Project/yj_sdk/src/game_yj/java/com/secondworld/univeralsdk/YJPlatformUtil.java
@@ -1,8 +1,9 @@ package com.secondworld.univeralsdk; import android.app.Activity; import android.content.Context; import android.content.SharedPreferences; import android.os.Bundle; import android.util.Log; import com.snowfish.cn.ganga.helper.SFOnlineHelper; import com.snowfish.cn.ganga.helper.SFOnlineInitListener; @@ -13,13 +14,6 @@ import org.json.JSONException; import org.json.JSONObject; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; import java.net.HttpURLConnection; import java.net.URL; import java.net.URLEncoder; import java.util.HashMap; import java.util.Map; @@ -120,7 +114,30 @@ public void login(final Activity activity) { SFOnlineHelper.login(activity, "Login"); String _appid = UniversalUtil.getMetaString(activity, "yj_appid"); if (_appid.equals("yybgame")) { SharedPreferences _sp = activity.getPreferences(Context.MODE_PRIVATE); String _loginType = _sp.getString(StaticDefine.LS_KEY_TENCENT_LOGINPARAM, ""); if(_loginType.length() > 0) { SFOnlineHelper.login(activity, _loginType); } } else { SFOnlineHelper.login(activity, "Login"); } } public void loginTencent(final Activity activity, String param) { SFOnlineHelper.login(activity, param); SharedPreferences _sp = activity.getPreferences(Context.MODE_PRIVATE); SharedPreferences.Editor _editor = _sp.edit(); _editor.putString(StaticDefine.LS_KEY_TENCENT_LOGINPARAM, param); _editor.apply(); } public void logout(final Activity activity) @@ -165,45 +182,48 @@ LogUtil.i(TAG, "Pay Order No: " + s); } }); payProcessing = true; } public void payExtend(final Activity activity, String productName, String productID, float price, String extData) String productName, String productID, float price, String extData) { SFOnlineHelper.payExtend(activity, (int)(price * 100), productName, productID, extData, 1,"", PAY_CALLBACK_URL, new SFOnlinePayResultListener() { @Override public void onFailed(String s) { m_Message.clear(); //根据回调获取支付订单信息 LogUtil.i(TAG, "Pay Fail Info: " + s); m_Message.put("code", CodeA2U.FreePlatformPayFail); UniversalUtil.sendMessageToUnity(m_Message); payProcessing = false; } SFOnlineHelper.payExtend(activity, (int) (price * 100), productName, productID, extData, 1, "", PAY_CALLBACK_URL, new SFOnlinePayResultListener() { @Override public void onFailed(String s) { m_Message.clear(); //根据回调获取支付订单信息 LogUtil.i(TAG, "Pay Fail Info: " + s); m_Message.put("code", CodeA2U.FreePlatformPayFail); UniversalUtil.sendMessageToUnity(m_Message); payProcessing = false; } @Override public void onSuccess(String s) { m_Message.clear(); //根据回调获取支付订单信息 LogUtil.i(TAG, "Pay Success Info: " + s); m_Message.put("code", CodeA2U.FreePlatformPayOk); UniversalUtil.sendMessageToUnity(m_Message); payProcessing = false; } @Override public void onSuccess(String s) { m_Message.clear(); //根据回调获取支付订单信息 LogUtil.i(TAG, "Pay Success Info: " + s); m_Message.put("code", CodeA2U.FreePlatformPayOk); UniversalUtil.sendMessageToUnity(m_Message); payProcessing = false; } @Override public void onOderNo(String s) { LogUtil.i(TAG, "Pay Order No: " + s); } }); @Override public void onOderNo(String s) { LogUtil.i(TAG, "Pay Order No: " + s); } }); payProcessing = true; } public void pay(final Activity activity, @@ -262,7 +282,7 @@ String vipLevel, String surplusMoney) { SFOnlineHelper.setRoleData(activity, roleID, roleName, roleLevel, serverID, serverName); SFOnlineHelper.setRoleData(activity, roleID, roleName, roleLevel, "1", "默认分区"); String _info = createGameData(serverID, serverName, roleID, roleName, roleLevel, FamilyName, createTime, "", vipLevel, surplusMoney); SFOnlineHelper.setData(activity, "createrole", _info); // 创建新角色时调用 必接 @@ -278,6 +298,7 @@ String vipLevel, String surplusMoney) { SFOnlineHelper.setRoleData(activity, roleID, roleName, roleLevel, "1", "默认分区"); String _info = createGameData(serverID, serverName, roleID, roleName, roleLevel, FamilyName, "", "", vipLevel, surplusMoney); SFOnlineHelper.setData(activity, "enterServer", _info); // 创建新角色时调用 必接 Project/yj_sdk/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" package="com.secondworld.univeralsdk" android:installLocation="auto" android:versionCode="1" @@ -60,8 +61,9 @@ android:name="com.secondworld.univeralsdk.MainActivity" android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale|layoutDirection" android:label="@string/app_name" android:launchMode="singleTask" android:screenOrientation="sensorLandscape"> android:launchMode="singleTop" android:screenOrientation="sensorLandscape" tools:replace="android:launchMode"> <intent-filter> <category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.LEANBACK_LAUNCHER" /> Project/yj_sdk/src/main/java/com/secondworld/univeralsdk/CodeA2U.java
@@ -34,6 +34,10 @@ * 回调外部存储根目录地址 */ public static final int ExternalStorage = 5; /** * 触发了退出游戏逻辑, 打开二次确认界面 */ public static final int ExitGame = 6; /** * -------------------------------------------------------------------------------------------- Project/yj_sdk/src/main/java/com/secondworld/univeralsdk/CodeU2A.java
@@ -73,6 +73,7 @@ public static final int CreateRole = 106; public static final int RoleLogin = 107; public static final int RoleLevelUp = 108; public static final int TencentLogin = 109; /** * 极光推送 * */ Project/yj_sdk/src/main/java/com/secondworld/univeralsdk/MainActivity.java
@@ -8,14 +8,24 @@ import android.content.res.Configuration; import android.net.Uri; import android.os.Bundle; import android.os.Handler; import android.os.Message; import android.os.Process; import android.provider.Settings; import android.support.v4.content.PermissionChecker; import android.util.Log; import android.view.KeyEvent; import android.view.View; import android.widget.Button; import android.widget.FrameLayout; import android.widget.GridLayout; import android.widget.RelativeLayout; import com.snowfish.cn.ganga.helper.SFOnlineExitListener; import com.snowfish.cn.ganga.helper.SFOnlineHelper; import com.unity3d.player.UnityPlayerActivity; import java.util.HashMap; public class MainActivity extends UnityPlayerActivity { @@ -24,6 +34,9 @@ // 启用6.0以上权限回调code // private static final int CODE_REQUEST_PERMISSION = 1000; public static final int SHOW_TENCENT_LOGIN = 0; public static final int HIDE_TENCENT_LOGIN = 1; private RelativeLayout m_MainContainer; private int mType; private boolean isNotch = false; @@ -31,9 +44,10 @@ @Override protected void onCreate(Bundle savedInstanceState) { // sInstance = this; super.onCreate(savedInstanceState); LogUtil.i(TAG, "onCreate"); // LogUtil.i(TAG, "onCreate"); LogUtil.init(this, true); setContentView(R.layout.activity_main); @@ -75,6 +89,7 @@ @Override public void onWindowFocusChanged(boolean b) { //LogUtil.i(TAG, "onWindowFocusChanged: " + b); super.onWindowFocusChanged(b); H2EngineSDK.onWindowFocusChanged(b); } @@ -82,6 +97,7 @@ @Override protected void onNewIntent(Intent intent) { //LogUtil.i(TAG, "onNewIntent"); super.onNewIntent(intent); H2EngineSDK.onNewIntent(this, intent); } @@ -89,6 +105,7 @@ @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { //LogUtil.i(TAG, "onActivityResult"); H2EngineSDK.onActivityResult(requestCode, resultCode, data, this); super.onActivityResult(requestCode, resultCode, data); } @@ -96,6 +113,7 @@ @Override public void onConfigurationChanged(Configuration newConfig) { //LogUtil.i(TAG, "onConfigurationChanged"); NotchPhoneUtil.onConfigurationChanged(this, isNotch, mType, m_MainContainer); H2EngineSDK.onConfigurationChanged(newConfig); @@ -106,6 +124,7 @@ @Override protected void onStart() { LogUtil.i(TAG, "onStart"); H2EngineSDK.onStart(this); super.onStart(); @@ -114,6 +133,7 @@ @Override protected void onStop() { //LogUtil.i(TAG, "onStop"); isForeground = false; H2EngineSDK.onStop(this); @@ -123,6 +143,7 @@ @Override protected void onResume() { //LogUtil.i(TAG, "onResume"); isForeground = true; H2EngineSDK.onResume(this); @@ -176,6 +197,7 @@ @Override protected void onPause() { //LogUtil.i(TAG, "onPause"); H2EngineSDK.onPause(this); super.onPause(); @@ -184,6 +206,7 @@ @Override protected void onDestroy() { //LogUtil.i(TAG, "onDestroy"); H2EngineSDK.onDestroy(this); super.onDestroy(); @@ -192,9 +215,46 @@ @Override protected void onRestart() { //LogUtil.i(TAG, "onRestart"); H2EngineSDK.onRestart(this); super.onRestart(); } @Override public boolean onKeyDown(int i, KeyEvent keyEvent) { if (i == KeyEvent.KEYCODE_BACK) { SFOnlineHelper.exit(this, new SFOnlineExitListener() { /* onSDKExit * @description 当SDK有退出方法及界面，回调该函数 * @param bool 是否退出标志位 */ @Override public void onSDKExit(boolean bool) { if (bool) { //apk退出函数，demo中也有使用System.exit()方法；但请注意360SDK的退出使用exit（）会导致游戏退出异常 finish(); } } /* onNoExiterProvide * @description SDK没有退出方法及界面，回调该函数，可在此使用游戏退出界面 */ @Override public void onNoExiterProvide() { LogUtil.i(TAG, "SDK不支持, 主动调用游戏中..."); HashMap<String, Object> m_Message = new HashMap<>(); m_Message.put("code", CodeA2U.ExitGame); UniversalUtil.sendMessageToUnity(m_Message); } }); } return super.onKeyDown(i, keyEvent); } } Project/yj_sdk/src/main/java/com/secondworld/univeralsdk/StaticDefine.java
@@ -14,5 +14,6 @@ public final static String LS_KEY_IMEI = "H2Engine_DEVICE_IMEI"; public final static String LS_KEY_MAC = "H2Engine_DEVICE_MAC"; public final static String LS_KEY_ANDROID_ID = "H2Engine_DEVICE_ANDROID_ID"; public final static String LS_KEY_TENCENT_LOGINPARAM = "H2Engine_TENCENT_LOGIN_PARAM"; } Project/yj_sdk/src/main/res/layout/activity_main.xml
@@ -27,4 +27,29 @@ android:textSize="16dp" android:visibility="invisible" /> <!--<GridLayout--> <!--android:id="@+id/yyb_container"--> <!--android:layout_width="wrap_content"--> <!--android:layout_height="wrap_content"--> <!--android:layout_centerInParent="true"--> <!--android:layout_alignParentBottom="true"--> <!--android:paddingBottom="100dp"--> <!--android:visibility="invisible">--> <!--<Button--> <!--android:id="@+id/btn_qq_login"--> <!--android:layout_width="150dp"--> <!--android:layout_height="48dp"--> <!--android:layout_margin="10dp"--> <!--android:background="@drawable/qq_login" />--> <!--<Button--> <!--android:id="@+id/btn_wx_login"--> <!--android:layout_width="150dp"--> <!--android:layout_height="48dp"--> <!--android:layout_margin="10dp"--> <!--android:background="@drawable/wx_login" />--> <!--</GridLayout>--> </RelativeLayout> Project/yj_sdk/src/main/res/values/strings.xml
@@ -1,4 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">UniveralSDK</string> <string name="sf_class_name">com.secondworld.univeralsdk.MainActivity</string> <string name="banhao">著作权：江苏易乐网络科技公司 运营单位：二四六零(镇江)智慧社区信息服务有限公司</r>出版：北京伯通电子出版社 软著登记号：2015SR235627 ISBN：ISBN 978-7-7979-0154-3 审批文号：新广出审[2016]1343号</string> </resources> Project/yj_sdk/src/main/res/values/styles.xml
@@ -1,3 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <!-- Base application theme. --> Project/yl_sdk/libs/aoyou_sdk1.0.jarBinary files differ
Project/yl_sdk/src/game_ylgame/java/com/secondworld/univeralsdk/H2EngineSDK.java
@@ -112,8 +112,8 @@ _json.getString("title"), _json.getString("mount"), _json.getString("roleID"), // _extraData.toString(), "", _extraData.toString(), // "", _json.getString("sid")); YLPlatformUtil.getInstance().payProcessing = true; Project/yl_sdk/src/game_ylgame/java/com/secondworld/univeralsdk/YLPlatformUtil.java
@@ -152,13 +152,15 @@ { StringBuilder _stringBuilder = new StringBuilder(); _stringBuilder.append("http://pub.game.2460web.com:11000/event_receiver?"). append("ProductID=mhtj"). append("ProductID=snxxz"). append("&OperatorID=").append("yilegame"). append("&RegionName=data"). append("&RegionID=").append(serverID). append("&EventID=1105"). append("&Time=").append(UniversalUtil.getStringDate()). append("&AccountID=").append(m_AccountID); LogUtil.i(TAG,"注册请求: " + _stringBuilder.toString()); OkHttpClient client = new OkHttpClient(); Request request = new Request.Builder() @@ -177,7 +179,7 @@ if(response.isSuccessful()){ String _code = response.body().string().trim(); LogUtil.i(TAG,"注册返回 : " + _code); if(response.body().string().equals("1")) if(_code.equals("1")) { Tracking.setRegisterWithAccountID(m_AccountID); EventUtils.setRegister("mobile",true); Project/yl_sdk/src/game_ylgame/res/layout/main_login.xml
@@ -274,14 +274,14 @@ android:layout_height="40dip" android:orientation="horizontal" > <TextView android:id="@+id/tv_register" <Button android:id="@+id/btn_login_visitor" android:layout_width="0dip" android:layout_height="40dip" android:layout_weight="1" android:background="@drawable/ttw_login_in" android:gravity="center" android:text="一键注册" android:text="游客登录" android:textColor="@android:color/white" android:textSize="16sp" /> @@ -293,7 +293,7 @@ android:layout_weight="1" android:background="@drawable/main_go_login" android:gravity="center" android:text="立即登陆" android:text="登陆" android:textColor="@android:color/white" android:textSize="16sp" /> </LinearLayout> @@ -311,6 +311,19 @@ android:textColor="#878787" android:textSize="13sp" /> <Button android:id="@+id/btn_phone_register" android:layout_width="wrap_content" android:layout_height="25dip" android:layout_alignParentRight="true" android:layout_below="@id/rl_login_register" android:layout_margin="4dip" android:layout_marginRight="10dip" android:background="#FFFFFF" android:text="手机注册" android:textColor="#878787" android:textSize="13sp" /> <LinearLayout android:id="@+id/tv_other_loginway" android:layout_width="match_parent" Project/yl_sdk/src/game_ylgame/res/layout/main_register.xml
@@ -12,37 +12,32 @@ android:layout_marginLeft="20dip" android:layout_marginRight="20dip" android:background="@drawable/main_bg_login_noquick" android:paddingTop="10dip" android:paddingBottom="10dip" android:paddingLeft="18dip" android:paddingRight="18dip" > android:paddingTop="10dip" > <RelativeLayout android:id="@+id/ll_logo" android:layout_width="fill_parent" android:layout_height="45dip" android:layout_marginBottom="10dip" > android:layout_height="45dip" android:layout_marginBottom="10dip" > <TextView android:id="@+id/tv_logo" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" android:text="一键注册" android:text="手机注册" android:textColor="@color/red" android:textSize="20sp" /> </RelativeLayout> <RelativeLayout android:id="@+id/rl_username" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_below="@id/ll_logo" android:visibility="gone" > android:layout_below="@id/ll_logo" > <EditText android:id="@+id/et_username" @@ -50,27 +45,26 @@ android:layout_height="40dip" android:background="@drawable/ttw_edit_two_bg" android:hint="请输入手机号" android:textColorHint="#c8c8c8" android:textSize="15dip" android:textColor="#818181" android:paddingLeft="40dip" android:paddingRight="85dip" android:selectAllOnFocus="true" android:singleLine="true" /> <ImageView android:singleLine="true" android:textColor="#818181" android:textColorHint="#c8c8c8" android:textSize="15dip" /> <ImageView android:id="@+id/iv_phoneuser" android:layout_width="wrap_content" android:layout_height="40dip" android:layout_alignBottom="@id/et_username" android:layout_alignTop="@id/et_username" android:layout_alignLeft="@id/et_username" android:layout_alignLeft="@id/et_username" android:layout_alignTop="@id/et_username" android:focusable="true" android:paddingLeft="10dip" android:paddingRight="10dip" android:focusable="true" android:scaleType="center" android:src="@drawable/main_user"/> android:src="@drawable/main_user" /> </RelativeLayout> <RelativeLayout @@ -80,34 +74,35 @@ android:layout_below="@id/rl_username" android:layout_marginBottom="5dip" android:layout_marginTop="5dip" > <EditText android:id="@+id/et_normal_account" android:visibility="gone" android:layout_marginBottom="10dp" android:layout_width="fill_parent" android:layout_height="40dip" android:layout_marginBottom="10dp" android:background="@drawable/ttw_edit_two_bg" android:hint="请输入账户(六~十二位字母数字)" android:textColorHint="#c8c8c8" android:textSize="14sp" android:textColor="#818181" android:hint="请输入验证码" android:paddingLeft="40dip" android:paddingRight="20dip" android:selectAllOnFocus="true" android:singleLine="true" /> android:singleLine="true" android:textColor="#818181" android:textColorHint="#c8c8c8" android:textSize="14sp" /> <ImageView android:id="@+id/iv_user" android:layout_width="wrap_content" android:layout_height="40dip" android:layout_alignBottom="@id/et_normal_account" android:layout_alignTop="@id/et_normal_account" android:layout_alignLeft="@id/et_normal_account" android:layout_alignLeft="@id/et_normal_account" android:layout_alignTop="@id/et_normal_account" android:focusable="true" android:paddingLeft="10dip" android:paddingRight="10dip" android:focusable="true" android:scaleType="center" android:src="@drawable/main_user"/> android:src="@drawable/main_identify_code" /> <Button android:id="@+id/btn_get_identifycode" android:layout_width="85dip" @@ -115,50 +110,54 @@ android:layout_alignBottom="@id/et_normal_account" android:layout_alignRight="@id/et_normal_account" android:layout_alignTop="@id/et_normal_account" android:focusable="true" android:background="@color/gray4" android:focusable="true" android:scaleType="center" android:text="获取验证码" android:textSize="14sp" android:scaleType="center" /> android:textSize="14sp" /> <EditText android:id="@+id/et_pwd" android:layout_below="@id/et_normal_account" android:layout_width="fill_parent" android:layout_height="40dip" android:layout_below="@id/et_normal_account" android:background="@drawable/ttw_edit_two_bg" android:hint="请输入游戏密码" android:password="true" android:textColorHint="#c8c8c8" android:textSize="14sp" android:textColor="#818181" android:paddingLeft="40dip" android:paddingLeft="40dip" android:paddingRight="20dip" android:password="true" android:selectAllOnFocus="true" android:singleLine="true" /> <ImageView android:singleLine="true" android:textColor="#818181" android:textColorHint="#c8c8c8" android:textSize="14sp" /> <ImageView android:id="@+id/iv_pwd" android:layout_width="wrap_content" android:layout_height="40dip" android:layout_alignBottom="@id/et_pwd" android:layout_alignTop="@id/et_pwd" android:layout_alignLeft="@id/et_pwd" android:layout_alignLeft="@id/et_pwd" android:layout_alignTop="@id/et_pwd" android:focusable="true" android:paddingLeft="10dip" android:paddingRight="10dip" android:focusable="true" android:scaleType="center" android:src="@drawable/main_password"/> <ImageView android:src="@drawable/main_password" /> <ImageView android:id="@+id/iv_pwdishow" android:layout_width="wrap_content" android:layout_height="40dip" android:layout_alignBottom="@id/et_pwd" android:layout_alignTop="@id/et_pwd" android:layout_alignRight="@id/et_pwd" android:layout_alignRight="@id/et_pwd" android:layout_alignTop="@id/et_pwd" android:focusable="true" android:paddingLeft="10dip" android:paddingRight="10dip" android:focusable="true" android:scaleType="center" android:src="@drawable/main_eye_close"/> android:src="@drawable/main_eye_close" /> <Button android:id="@+id/btn_repwd" android:layout_width="40dip" @@ -170,20 +169,20 @@ android:textSize="12dip" android:visibility="gone" /> </RelativeLayout> <RelativeLayout android:id="@+id/rl_retext" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_below="@id/rl_pwd" android:layout_marginBottom="5dip"> <LinearLayout android:layout_marginBottom="5dip" > <LinearLayout android:id="@+id/ll_agreement" android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center" android:orientation="horizontal" > android:orientation="horizontal" > <ImageView android:id="@+id/iv_agree" @@ -209,62 +208,55 @@ android:text="《用户协议》" android:textColor="@color/red1" android:textSize="14dip" /> </LinearLayout> </RelativeLayout> </LinearLayout> </RelativeLayout> <LinearLayout <LinearLayout android:id="@+id/ll_goregister" android:layout_width="match_parent" android:layout_height="40dip" android:orientation="horizontal" android:layout_below="@id/rl_retext"> <Button android:id="@+id/btn_normalregister" android:layout_width="0dip" android:layout_height="40dip" android:layout_weight="1" android:background="@drawable/ttw_login_in" android:text="手机注册" android:textColor="@android:color/white" android:textSize="16sp" /> <Button android:id="@+id/btn_game_in" android:layout_width="0dip" android:layout_height="40dip" android:layout_marginLeft="15dip" android:layout_weight="1" android:background="@drawable/main_go_login" android:text="完成注册" android:textColor="@android:color/white" android:textSize="16sp" /> </LinearLayout> android:layout_below="@id/rl_retext" android:orientation="horizontal" > <RelativeLayout <Button android:id="@+id/btn_normalregister" android:layout_width="0dip" android:layout_height="40dip" android:layout_weight="1" android:background="@drawable/ttw_login_in" android:text="账号注册" android:textColor="@android:color/white" android:textSize="16sp" /> <Button android:id="@+id/btn_game_in" android:layout_width="0dip" android:layout_height="40dip" android:layout_marginLeft="15dip" android:layout_weight="1" android:background="@drawable/main_go_login" android:text="完成注册" android:textColor="@android:color/white" android:textSize="16sp" /> </LinearLayout> <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@id/ll_goregister" android:layout_marginBottom="10dip" android:layout_marginTop="10dip" > <TextView android:id="@+id/tv_cut" android:gravity="center" android:layout_alignParentRight="true" android:layout_width="80dip" android:layout_height="20dip" android:layout_alignParentRight="true" android:background="#FFFFFF" android:gravity="center" android:text="已有账号" android:textSize="15sp" android:textColor="#878787" /> android:textColor="#878787" android:textSize="15sp" /> </RelativeLayout> </RelativeLayout>
@@ -128,12 +128,20 @@ Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED) { _deviceId = tm.getDeviceId(); } else { _deviceId = get(context); } if (_deviceId.length() != 0) { SharedPreferences.Editor _e = _sp.edit(); _e.putString(StaticDefine.LS_KEY_IMEI, _deviceId); _e.apply(); return _deviceId; } return ""; return _deviceId; } public static String getLocalMac(Context context)
