Skip to content

GitLab

Commit f29826f9 authored by zhengyingbing's avatar zhengyingbing
Browse files

Merge branch 'dev' into 'master' 

(feat)app: 1.更新FastSdk版本 2.增加海外新接口调用示例 3.更新过时接口 4.界面优化

See merge request !1
parents 8167bdc4 d74004da
Show whitespace changes
Inline Side-by-side
app/build.gradle
View file @ f29826f9
apply plugin: 'com.android.application'
android {
compileSdkVersion 29
compileSdkVersion 30
defaultConfig {
applicationId "com.hoolai.demo"
minSdkVersion 21
targetSdkVersion 29
targetSdkVersion 30
versionCode 1
versionName "1.0"
}
......@@ -33,5 +33,5 @@ android {
}
dependencies {
implementation 'com.hoolai.access.open:hoolai-core:1.0.3.13'
implementation 'com.hoolai.access.open:hoolai-core:1.0.3.18'
}
\ No newline at end of file
app/src/main/assets/access.config
View file @ f29826f9
U5D6xeVbpFwWQ1mWngHD1tk8ZfRe5b2AHfHIfiHkH+saDUbOm4IaliwNG8OrlZYQwlwM/a2VRx9UPrmY8PfMvOtVhmEAr3QhvvPePyjaxlD5bV3JPCdRtDXHY016AJJkOA0z19r+ykw7InaQl6EPQqBMrG40JdcoLX1bUExcP6kUErM235MqneofskC5jNJs/IOGUmNGWEIaYJYXNdIN08Z1Tn6CQgIYGdxTlcziJ1kCzWDOa8N0jN+r1qxAChgGVPFctW4rA9qj7AGG/xMyELEVJMTu4dSQh5BdfCgY0RrqaZclgxXtK4pYEcec7pB5+caZVeyspgHaxCEGshYeYkl66JnOO2doPTKYt51px0IVx4PoW+IzMKe7Q30xuf0937UrEMSFnYMA77Zs7GnTaZswkKh1kbrzxks8Cf7ZwCN7sKfqXjBFeE/8ojWFoRIUVDdBr4CzShjvI42wRsTky9flFhjHy7SQFXv/17udeETDuruV8PJCZOzZ04h+hLrvrCbZK9PHJV+bpd/ydGkXsB8sP25IRUVSpiEAPRvB955DBQepTrCz+kgQnlWimq0pRauP8PiPxGsomOGdV8aW26ujm/FmicteW9j2Gn1vdF0U5njXYlM+5bLnlYeU8MvKZvjTahbXY5fXRjPMv8z5JKHJZAeXnYIiuKtRV/MiABY=
\ No newline at end of file
U5D6xeVbpFwWQ1mWngHD1tk8ZfRe5b2AHfHIfiHkH+saDUbOm4IaliwNG8OrlZYQwlwM/a2VRx9UPrmY8PfMvOtVhmEAr3QhvvPePyjaxlD5bV3JPCdRtDXHY016AJJkOA0z19r+ykw7InaQl6EPQqBMrG40JdcoLX1bUExcP6kUErM235MqneofskC5jNJs/IOGUmNGWEIaYJYXNdIN08Z1Tn6CQgIYGdxTlcziJ1kCzWDOa8N0jN+r1qxAChgGVPFctW4rA9qj7AGG/xMyELEVJMTu4dSQh5BdfCgY0RrqaZclgxXtK4pYEcec7pB5+caZVeyspgHaxCEGshYeYkEeAVnvJxwM2w7Cl74le4b/biHCWwwoqJEnAd2dwVdgx/y3yzJm46VJTeMcndrxV9rkN3S4a0xRMhPh2xW6eSUs1u8aJ5j9lCx8yV2g1Sr5e5MuYiJqF79AEwH3PHEEevMbhFriSzn8Vwk/+aD9E66LpFuby9uKzxePC+3aIE8/Awepb5FRD/udQj1mktA6KhtdXOPnFrwpAAXi3z66eIsK6sJ0PEAlRrzYefP6eJ9iGyDRPrjernWDjH83n5V/1QTaBqdQu1ZJHiid9oaQRkoZdpL3TodZI/Zd7BEJ+ysvQxsS+g8iHFDyRJWZlvo3gMrKxMPncf2h19PkMniGuAlwu77kb13TCxw/fAz6UTDK5sxveFOM4zyCfM5NLNfJJKMC1A4TyrpMv7GTjZHn2pIBkEJmn3BHg0KuJmYOFil9/D0RSGlPpBej/VOAnPZ+B/MzDs9XEhvIwuJR8B76Mt/lRJnv11hqus93usKfIG4k8MgP+LAAGCa80vrGu30Dx1j9wH0s9Fdf/DYxwLJ/V4PG6K5nosQNx1Bh09wiR6Zsno+2YipX1I8G5cbY+Kf2YyZrYH6d2cA2SSzxJDNUDrA5UPJNWp31duByk9tkOslJMm95b357yfOiNWJRGofvtTbXXdbHfu89v3TSHAsIFyOhayaSSzm0U6pQ39PxqBgD
\ No newline at end of file
app/src/main/java/com/hl/demo/MainActivity.java
View file @ f29826f9
......@@ -7,8 +7,11 @@ import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.os.Bundle;
import android.os.Handler;
import android.view.View;
import android.widget.Button;
import android.widget.LinearLayout;
import android.widget.ScrollView;
import android.widget.TextView;
import com.hoolai.access.open.fastaccess.channel.FastSdk;
......@@ -19,6 +22,7 @@ import com.hoolai.access.open.fastaccess.channel.request.PlayerInfo;
import com.hoolai.access.open.fastaccess.channel.result.InitResult;
import com.hoolai.access.open.fastaccess.channel.result.LoginResult;
import com.hoolai.access.open.fastaccess.interf.HLAccountListener;
import com.hoolai.access.open.fastaccess.interf.HLDeepLinkListener;
import com.hoolai.access.open.fastaccess.interf.HLPaymentListener;
import com.hoolai.access.open.fastaccess.interf.HLShareListener;
import com.hoolai.access.open.fastaccess.interf.HLSystemListener;
......@@ -39,6 +43,8 @@ public class MainActivity extends Activity {
private boolean isInit, isLogin;
private TextView textView;
private Button initBtn;
private ScrollView scrollView;
private LinearLayout linearLayout;
private String str = "";
@Override
......@@ -47,16 +53,23 @@ public class MainActivity extends Activity {
setContentView(R.layout.activity_main);
textView = findViewById(R.id.textview);
initBtn = findViewById(R.id.initBtn);
scrollView = findViewById(R.id.scrollView);
linearLayout = findViewById(R.id.linearLayout);
setText("调用初始化");
//先注册回调监听，再调用初始化
registerListeners();
FastSdk.onCreate(MainActivity.this);
}
//声明系统回调（初始化，退出，版本升级）监听
private void registerListeners(){
//TODO：系统回调监听（必接）
FastSdk.hlSystemListener = new HLSystemListener() {
@Override
public void onInitSuccess(InitResult initResult) {
isInit = true;
Logger.data(TAG,"初始化成功");
setText(">>初始化成功");
setText(">>初始化成功：" + initResult.toString());
initBtn.setVisibility(View.GONE);
// 如用到敏感权限，调用以下方法
//单个权限申请
boolean hasPermission = FastSdk.checkPermission(MainActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE);
//批量权限申请，showRefusedTip：拒绝后是否弹框提示（一般当拒绝权限会影响功能时设置为true）
......@@ -70,8 +83,8 @@ public class MainActivity extends Activity {
@Override
public void onInitFailed(String reason) {
Logger.data(TAG,"初始化失败:"+reason);
setText(">>初始化失败");
Logger.data(TAG,"初始化失败：" + reason);
setText(">>初始化失败：" + reason);
initBtn.setVisibility(View.VISIBLE);
}
......@@ -106,7 +119,7 @@ public class MainActivity extends Activity {
Logger.data(TAG,"升级：" + data);
}
};
//声明账号回调监听
//TODO：账号回调监听（必接）
FastSdk.hlAccountListener = new HLAccountListener() {
@Override
public void onRefreshUser(LoginResult result) {
......@@ -123,7 +136,7 @@ public class MainActivity extends Activity {
@Override
public void onLoginFailed(String reason) {
Logger.data(TAG,"登录失败:" + reason);
setText(">>登录失败");
setText(">>登录失败：" + reason);
}
@Override
......@@ -133,6 +146,7 @@ public class MainActivity extends Activity {
isLogin = false;
}
};
//TODO：支付回调监听（必接）
FastSdk.hlPaymentListener = new HLPaymentListener() {
@Override
public void onPaySuccess(String result) {
......@@ -143,7 +157,7 @@ public class MainActivity extends Activity {
@Override
public void onPayFailed(String reason) {
Logger.data(TAG,"支付失败:" + reason);
setText(">>支付失败");
setText(">>支付失败：" + reason);
}
@Override
......@@ -153,6 +167,7 @@ public class MainActivity extends Activity {
setText(">>商品信息获取成功");
}
};
//TODO：如果没有分享功能可忽略
FastSdk.hlShareListener = new HLShareListener() {
@Override
public void onShareSuccess() {
......@@ -164,11 +179,113 @@ public class MainActivity extends Activity {
}
};
FastSdk.onCreate(MainActivity.this);
//TODO：如果没有Facebook的deeplink功能可忽略
FastSdk.hlDeepLinkListener = new HLDeepLinkListener() {
@Override
public void onDeepLinkSuccess(String result) {
HLDeepLinkListener.super.onDeepLinkSuccess(result);
}
};
}
public void init(View v){
setText("调用初始化");
FastSdk.onCreate(this);
}
public void login(View v){
if (isInit){
setText("调用登录");
FastSdk.login();
}else{
ToastUtils.toast("请先初始化");
}
}
public void baseTrack(View v){
if (isLogin){
setText("创角，进服，升级报送");
FastSdk.report(EventType.CreateRole, getPlayerInfo());
FastSdk.report(EventType.EnterServer, getPlayerInfo());
FastSdk.report(EventType.LevelUp, getPlayerInfo());
setText(">>报送内容：" + getPlayerInfo());
}else{
loginFirst();
}
}
public void customTrack(View v){
if (isInit){
setText("自定义报送");
FastSdk.report(EventType.CustomerAction, getPlayerInfo());
setText(">>报送内容：" + getPlayerInfo());
}else{
ToastUtils.toast("请先初始化");
}
}
/**
* 方舟报送-自定义报点
* action：报点名称
* @param v
*/
public void fangZhouReport(View v){
setText("方舟报送");
String action = "game_xxx";
Map<String, Object> hashMap = new HashMap<>();
hashMap.put("xxx", 123);
hashMap.put("ooo", "321");
FastSdk.gameDataReport(action, hashMap);
}
public void logout(View v){
if (isLogin){
setText("调用登出");
FastSdk.logout();
}else{
loginFirst();
}
}
public void getPriceInfo(View v){
if (isLogin){
setText("查询商品");
FastSdk.queryGoodsInfo();
}else{
loginFirst();
}
}
public void doPay(View v){
if (isLogin){
int amount = 1;//单位：分
setText("调用支付：" + getPayParams(amount));
FastSdk.pay(getPayParams(amount));
}else{
loginFirst();
}
}
public void exit(View v){
setText("调用退出");
FastSdk.exit();
}
public void openAccountCenter(View v){
setText("打开用户中心");
FastSdk.openAccountCenter(this);
}
public void openKeFu(View v){
setText("打开客服");
FastSdk.openService(this);
}
public void share(View v){
ShareActivity.start(this);
}
//TODO +++++++++++++++++++++++++++++++++++生命周期方法接入start+++++++++++++++++++++++++++++++++++
@Override
protected void onSaveInstanceState(Bundle outState) {
FastSdk.onSaveInstanceState(outState);
......@@ -221,6 +338,7 @@ public class MainActivity extends Activity {
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
Logger.i("MainActivity.onActivityResult");
FastSdk.onActivityResult(this, requestCode, resultCode, data);
}
......@@ -236,9 +354,6 @@ public class MainActivity extends Activity {
Logger.i("权限已被拒绝");
}
}
// else if (requestCode == Math.abs(Manifest.permission.CAMERA.hashCode())){
//
// }
}
@Override
......@@ -247,6 +362,7 @@ public class MainActivity extends Activity {
FastSdk.onConfigurationChanged(this, newConfig, getResources());
}
@Override
public void onBackPressed() {
setText("调用返回");
......@@ -265,84 +381,9 @@ public class MainActivity extends Activity {
FastSdk.onWindowFocusChanged(hasFocus);
}
public void init(View v){
setText("调用初始化");
FastSdk.onCreate(this);
}
public void login(View v){
if (isInit){
setText("调用登录");
FastSdk.login();
}else{
ToastUtils.toast("请先初始化");
}
}
public void createRole(View v){
if (isLogin){
setText("创角，进服，升级报送");
FastSdk.report(EventType.CreateRole, getPlayerInfo());
FastSdk.report(EventType.EnterServer, getPlayerInfo());
FastSdk.report(EventType.LevelUp, getPlayerInfo());
}else{
loginFirst();
}
}
public void customTrack(View v){
if (isInit){
setText("自定义报送");
FastSdk.report(EventType.CustomerAction, getPlayerInfo());
}else{
ToastUtils.toast("请先初始化");
}
}
public void fangZhouReport(View v){
String action = "game_xxx";
Map<String, Object> hashMap = new HashMap<>();
hashMap.put("xxx", 123);
hashMap.put("ooo", "321");
FastSdk.gameDataReport(action, hashMap);
}
public void logout(View v){
if (isLogin){
setText("调用登出");
FastSdk.logout();
}else{
loginFirst();
}
}
//TODO ++++++++++++++++++++++++++++++++++ 生命周期方法接入end +++++++++++++++++++++++++++++++++++
public void getPriceInfo(View v){
if (isLogin){
setText("查询商品");
FastSdk.queryGoodsInfo();
}else{
loginFirst();
}
}
public void doPay(View v){
if (isLogin){
int amount = 1;//单位：分
setText("调用支付");
FastSdk.pay(this, getPayParams(amount));
}else{
loginFirst();
}
}
public void exit(View v){
setText("调用退出");
FastSdk.exit();
}
public void share(View v){
ShareActivity.start(this);
}
private PlayerInfo getPlayerInfo(){
PlayerInfo playerInfo = new PlayerInfo();
playerInfo.setRoleId("1235761");//角色唯一标识id
......@@ -356,10 +397,10 @@ public class MainActivity extends Activity {
playerInfo.setVip("1");
playerInfo.setPartyName("帮派名称");
playerInfo.setClassField("aaaa");
//扩展信息,格式:key:value,key:value，需要探测的地址放到此参数中
//extra格式:key:value,key:value，需要探测的地址放到此参数中
//注意：探测地址的冒号用@替换，key必须使用以下三个字段：gameResourceUrl/gameLoginServerUrl/gameServerUrl
//TODO 详情:https://wanda.feishu.cn/wiki/wikcniSxQbyvqU3bzuXeOtpEcGc
playerInfo.setExtra("a:arm,b:bom,gameResourceUrl:aaa,gameLoginServerUrl:bbb,gameServerUrl:ccc");
playerInfo.setExtra("a:arm,b:bom,gameResourceUrl:http@game1.com,gameLoginServerUrl:tcp@game2.com,gameServerUrl:https@game3.com");
playerInfo.setPhylum("1");
return playerInfo;
}
......@@ -376,8 +417,23 @@ public class MainActivity extends Activity {
return payParams;
}
private void setText(String temp){
str = str + temp + "\n";
str = str + temp + "\n\n";
textView.setText(str);
Handler mHandler = new Handler();
mHandler.postDelayed(new Runnable() {
@Override
public void run() {
if (scrollView == null || linearLayout == null) {
return;
}
//end要显示的位置，可以根据自己的需要来计算
int end = (linearLayout.getMeasuredHeight() - scrollView.getHeight());
if (end < 0) {
end = 0;
}
scrollView.scrollTo(0, end);
}
}, 500);//延迟500ms启动
}
private void loginFirst(){
......
app/src/main/java/com/hl/demo/ProductUtils.java
View file @ f29826f9
......@@ -23,6 +23,7 @@ public class ProductUtils {
return;
}
AlertDialog.Builder builder = new AlertDialog.Builder(activity);
AlertDialog dialog = builder.create();
ListView listView = new ListView(activity);
listView.setAdapter(new ArrayAdapter(activity, android.R.layout.simple_list_item_1, android.R.id.text1, list));
listView.setOnItemClickListener((parent, view1, position, id) -> {
......@@ -46,11 +47,12 @@ public class ProductUtils {
Map<String, String> map = new ConcurrentHashMap<>();
map.put("isSupportThirdPayment", "true");//是否支持google之外的三方支付
map.put("payType", "1");// 1 钱包(默认此类型) 2 点卡
map.put("currency", payInfo.getShowTag());//币种
map.put("currency", "CNY");//币种
payParams.setOpt(map);
FastSdk.pay(activity, payParams);
FastSdk.pay(payParams);
dialog.dismiss();
});
builder.setView(listView);
builder.show();
dialog.setView(listView);
dialog.show();
}
}
app/src/main/java/com/hl/demo/ShareActivity.java
View file @ f29826f9
......@@ -12,9 +12,6 @@ import android.net.Uri;
import android.os.Bundle;
import android.provider.MediaStore;
import android.view.View;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.EditText;
import android.widget.TextView;
import com.hoolai.access.open.fastaccess.channel.FastSdk;
......@@ -26,10 +23,6 @@ public class ShareActivity extends Activity {
private TextView picPathTv, contentTv;
private String picPath = "";//图片url
private ShareParams params;//分享参数
private ShareType shareType;//分享类型
private EditText share_title, share_content, share_url;
private CheckBox share_check;
private int qqShareType;//qq分享类型，1:图片+文字 2:图片
private static final int REQUEST_CODE = 100;
......@@ -39,17 +32,6 @@ public class ShareActivity extends Activity {
setContentView(R.layout.activity_share);
picPathTv = findViewById(R.id.pic_path);
contentTv = findViewById(R.id.main_tv);
share_title = findViewById(R.id.share_title);
share_content = findViewById(R.id.share_content);
share_url = findViewById(R.id.share_url);
share_check = findViewById(R.id.share_check);
qqShareType = 1;
share_check.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
qqShareType = isChecked ? 1 : 2;
}
});
FastSdk.hlShareListener = new HLShareListener() {
@Override
public void onShareSuccess() {
......@@ -86,14 +68,13 @@ public class ShareActivity extends Activity {
if (requestCode == Manifest.permission.WRITE_EXTERNAL_STORAGE.hashCode()){
if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
params = new ShareParams();
params.setTitle(share_title.getText().toString());
params.setContent(share_content.getText().toString());
params.setTitle("分享标题");
params.setContent("分享内容");
params.setShareUrl("dongqiudi://share/circle/");
params.setCallbackUrl("game://share/callback");
params.setId("100");
params.setPicPath(picPath);
shareType = ShareType.DQD;
share();
FastSdk.share(ShareType.DQD, ShareType.ChildType.DQD, params);
}
}
}
......@@ -104,88 +85,59 @@ public class ShareActivity extends Activity {
startActivityForResult(intent, 100);
}
//分享懂球帝
public void shareDQD(View v){
//懂球帝分享
public void shareDQD(){
if(FastSdk.checkPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE)){
params = new ShareParams();
params.setTitle(share_title.getText().toString());
params.setContent(share_content.getText().toString());
params.setTitle("分享标题");
params.setContent("分享内容");
params.setShareUrl("dongqiudi://share/circle/");
params.setCallbackUrl("game://share/callback");
params.setId("100");
params.setPicPath(picPath);
shareType = ShareType.DQD;
share();
}
FastSdk.share(ShareType.DQD, ShareType.ChildType.DQD, params);
}
//分享QQ列表包含QQZone
public void shareQQZone(View v){
shareType = ShareType.QQ;
params = new ShareParams();
params.setTitle(share_title.getText().toString());
params.setContent(share_content.getText().toString());
params.setQqType(qqShareType);
params.setShowQQZone(true);
params.setPicPath(picPath);
params.setShareUrl(share_url.getText().toString());
share();
}
//分享QQ列表不包含QQZone
//QQ分享（文字、图片）
public void shareQQ(View v){
shareType = ShareType.QQ;
params = new ShareParams();
params.setTitle(share_title.getText().toString());
params.setContent(share_content.getText().toString());
params.setQqType(qqShareType);
params.setShowQQZone(false);
ShareParams params = new ShareParams();
params.setTitle("分享标题");
params.setContent("分享内容");
params.setPicPath(picPath);
params.setShareUrl(share_url.getText().toString());
share();
FastSdk.share(ShareType.QQ, ShareType.ChildType.QQ_IMG, params);
}
//分享微信-聊天
//微信分享（文字、图片）
public void shareWX(View v){
Bitmap bmp = BitmapFactory.decodeResource(this.getResources(), R.drawable.icon);
shareType = ShareType.WX;
params = new ShareParams();
params.setTitle(share_title.getText().toString());
params.setContent(share_content.getText().toString());
params.setShareUrl(share_url.getText().toString());
params.setBmp(bmp);
params.setWxType(1);
share();
}
//分享微信-朋友圈
public void sharePYQ(View v){
Bitmap bmp = BitmapFactory.decodeResource(this.getResources(), R.drawable.icon);
shareType = ShareType.WX;
params = new ShareParams();
params.setTitle(share_title.getText().toString());
params.setContent(share_content.getText().toString());
params.setShareUrl(share_url.getText().toString());
params.setBmp(bmp);
params.setWxType(2);
share();
}
//分享微信-收藏
public void shareWXSC(View v){
Bitmap bmp = BitmapFactory.decodeResource(this.getResources(), R.drawable.icon);
shareType = ShareType.WX;
params = new ShareParams();
params.setTitle(share_title.getText().toString());
params.setContent(share_content.getText().toString());
params.setShareUrl(share_url.getText().toString());
ShareParams params = new ShareParams();
params.setTitle("分享标题");
params.setContent("分享内容");
params.setShareUrl("分享链接");
params.setPicPath("图片地址");
params.setBmp(bmp);
params.setWxType(3);
share();
}
private void share(){
FastSdk.share(this, shareType, params);
FastSdk.share(ShareType.WX, ShareType.ChildType.WX_CHAT, params);
}
//Facebook分享（链接、图片、视频）
public void shareFacebook(View v){
ShareParams params = new ShareParams();
params.setTitle("分享标题");
params.setContent("分享内容");
params.setShareUrl("分享链接");
params.setPicPath("图片/视频链接");
FastSdk.share(ShareType.FACEBOOK, ShareType.ChildType.FACEBOOK_IMG, params);
}
//系统分享（文字、图片、文件）
public void shareSystem(View v){
ShareParams params = new ShareParams();
params.setTitle("分享标题");
params.setContent("分享内容");
params.setShareUrl("分享链接");
params.setPicPath("图片/视频链接");
FastSdk.share(ShareType.SYSTEM, ShareType.ChildType.SYSTEM_IMG, params);
}
private String getImagePath(Uri uri) {
......
app/src/main/res/layout-land/activity_main.xml
View file @ f29826f9
......@@ -6,104 +6,137 @@
android:orientation="horizontal">
<ScrollView
android:id="@+id/scrollView"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_margin="10dp"
android:padding="20dp"
android:fadeScrollbars="false"
android:layout_weight="1"
android:background="#eee"
android:fadeScrollbars="false"
android:fillViewport="true">
<LinearLayout
android:id="@+id/linearLayout"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:padding="20dp">
<TextView
android:id="@+id/textview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="4dp"
android:textSize="12dp"
android:textColor="#111"/>
android:textColor="#111"
android:textSize="12dp" />
</LinearLayout>
</ScrollView>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical"
android:paddingTop="10dp"
android:paddingRight="5dp"
android:orientation="vertical">
android:paddingRight="5dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="48dp"
android:orientation="horizontal">
<Button
android:id="@+id/initBtn"
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_weight="1"
android:layout_gravity="center"
android:visibility="gone"
android:layout_weight="1"
android:onClick="init"
android:text="初始化" />
android:text="初始化"
android:visibility="gone" />
<Button
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_weight="1"
android:layout_gravity="center"
android:layout_weight="1"
android:onClick="login"
android:text="登录" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="48dp"
android:orientation="horizontal">
<Button
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_gravity="center"
android:layout_weight="2"
android:onClick="baseTrack"
android:text="创角/进服/升级" />
<Button
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_gravity="center"
android:layout_weight="1"
android:onClick="logout"
android:text="登出" />
android:onClick="customTrack"
android:text="自定义" />
<Button
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_gravity="center"
android:layout_weight="1"
android:onClick="exit"
android:text="退出" />
android:onClick="fangZhouReport"
android:text="方舟报送" />
</LinearLayout>
<Button
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_gravity="center"
android:onClick="doPay"
android:text="支付" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="48dp"
android:orientation="horizontal">
<Button
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_weight="2"
android:layout_gravity="center"
android:onClick="createRole"
android:text="创角/进服/升级" />
android:layout_weight="1"
android:onClick="share"
android:text="分享" />
<Button
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_gravity="center"
android:layout_weight="1"
android:onClick="customTrack"
android:text="自定义" />
android:onClick="logout"
android:text="登出" />
<Button
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_weight="1"
android:layout_gravity="center"
android:onClick="fangZhouReport"
android:text="方舟报送" />
android:layout_weight="1"
android:onClick="exit"
android:text="退出" />
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:gravity="center"
android:text="————以下接口仅海外项目参考————"
android:textColor="#e00" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="48dp"
......@@ -115,28 +148,33 @@
android:layout_gravity="center"
android:layout_weight="1"
android:onClick="getPriceInfo"
android:text="商品信息(海外)" />
android:text="商品信息" />
<Button
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_gravity="center"
android:layout_weight="1"
android:onClick="doPay"
android:text="定额支付" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="48dp"
android:orientation="horizontal">
<Button
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_gravity="center"
android:layout_weight="1"
android:onClick="share"
android:text="分享" />
android:onClick="openAccountCenter"
android:text="用户中心" />
<Button
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_gravity="center"
android:layout_weight="1"
android:onClick="openKeFu"
android:text="客服(可选)" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout-land/activity_share.xml
View file @ f29826f9
......@@ -32,111 +32,68 @@
android:layout_weight="1"
android:orientation="vertical">
<EditText
android:id="@+id/share_title"
android:layout_width="match_parent"
android:layout_height="42dp"
android:text="我是标题"
android:hint="标题" />
<EditText
android:id="@+id/share_content"
android:layout_width="match_parent"
android:layout_height="48dp"
android:text="我是内容"
android:hint="内容" />
<EditText
android:id="@+id/share_url"
android:layout_width="match_parent"
android:layout_height="42dp"
android:hint="链接"
android:text="https://xx.com" />
<Button
android:id="@+id/share_select"
android:layout_width="match_parent"
android:layout_height="42dp"
android:layout_height="48dp"
android:layout_gravity="center"
android:layout_margin="10dp"
android:onClick="shareSelect"
android:text="选择图片" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:orientation="horizontal"
android:paddingRight="10dp">
<TextView
android:id="@+id/pic_path"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:textSize="12sp"
android:layout_weight="1"/>
<CheckBox
android:id="@+id/share_check"
android:layout_width="100dp"
android:layout_height="match_parent"
android:text="QQ图文"/>
</LinearLayout>
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:textColor="#009FEC"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:orientation="horizontal">
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:onClick="shareDQD"
android:text="分享懂球帝" />
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:onClick="shareQQ"
android:text="分享QQ" />
android:text="QQ分享" />
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:onClick="shareQQZone"
android:text="分享QQ+空间" />
</LinearLayout>
android:layout_gravity="center"
android:onClick="shareWX"
android:text="微信分享" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:orientation="horizontal">
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:onClick="shareWX"
android:text="分享微信" />
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:onClick="sharePYQ"
android:text="分享朋友圈" />
android:onClick="shareFacebook"
android:text="FaceBook分享" />
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:onClick="shareWXSC"
android:text="分享微信收藏" />
android:layout_gravity="center"
android:onClick="shareSystem"
android:text="系统分享" />
</LinearLayout>
</LinearLayout>
......
app/src/main/res/layout/activity_main.xml
View file @ f29826f9
......@@ -6,50 +6,59 @@
android:orientation="vertical">
<ScrollView
android:id="@+id/scrollView"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_margin="10dp"
android:padding="20dp"
android:fadeScrollbars="false"
android:layout_weight="1"
android:background="#eee"
android:fadeScrollbars="false"
android:fillViewport="true">
<LinearLayout
android:id="@+id/linearLayout"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:padding="20dp">
<TextView
android:id="@+id/textview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="4dp"
android:textSize="12dp"
android:textColor="#111"/>
android:textColor="#111"
android:textSize="12dp" />
</LinearLayout>
</ScrollView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="48dp"
android:orientation="horizontal">
<Button
android:id="@+id/initBtn"
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_weight="1"
android:layout_gravity="center"
android:visibility="gone"
android:layout_weight="1"
android:onClick="init"
android:text="初始化" />
android:text="初始化"
android:visibility="gone" />
<Button
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_weight="1"
android:layout_gravity="center"
android:layout_weight="1"
android:onClick="login"
android:text="登录" />
<Button
android:layout_width="0dp"
android:layout_height="48dp"
......@@ -57,6 +66,7 @@
android:layout_weight="1"
android:onClick="logout"
android:text="登出" />
<Button
android:layout_width="0dp"
android:layout_height="48dp"
......@@ -74,22 +84,24 @@
<Button
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_weight="2"
android:layout_gravity="center"
android:onClick="createRole"
android:layout_weight="2"
android:onClick="baseTrack"
android:text="创角/进服/升级" />
<Button
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_weight="1"
android:layout_gravity="center"
android:layout_weight="1"
android:onClick="customTrack"
android:text="自定义" />
<Button
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_weight="1"
android:layout_gravity="center"
android:layout_weight="1"
android:onClick="fangZhouReport"
android:text="方舟报送" />
</LinearLayout>
......@@ -99,33 +111,66 @@
android:layout_height="48dp"
android:orientation="horizontal">
<Button
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_gravity="center"
android:layout_weight="1"
android:onClick="getPriceInfo"
android:text="商品信息(海外)" />
android:onClick="doPay"
android:text="定额支付" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="48dp"
android:orientation="horizontal">
<Button
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_gravity="center"
android:layout_weight="1"
android:onClick="doPay"
android:text="定额支付" />
android:onClick="share"
android:text="分享" />
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:gravity="center"
android:text="————以下接口仅海外项目参考————"
android:textColor="#e00" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="48dp"
android:orientation="horizontal">
<Button
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_gravity="center"
android:layout_weight="1"
android:onClick="share"
android:text="分享" />
android:onClick="getPriceInfo"
android:text="商品信息" />
<Button
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_gravity="center"
android:layout_weight="1"
android:onClick="openAccountCenter"
android:text="用户中心" />
<Button
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_gravity="center"
android:layout_weight="1"
android:onClick="openKeFu"
android:text="客服(可选)" />
</LinearLayout>
</LinearLayout>
......
app/src/main/res/layout/activity_share.xml
View file @ f29826f9
......@@ -20,114 +20,73 @@
android:layout_marginTop="5dp"
android:textColor="#333"
android:text="分享结果"
android:textSize="18sp" />
android:textSize="14sp" />
</ScrollView>
<EditText
android:id="@+id/share_title"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:text="我是标题"
android:hint="标题"/>
<EditText
android:id="@+id/share_content"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_margin="10dp"
android:text="我是内容"
android:hint="内容"/>
<EditText
android:id="@+id/share_url"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:text="https://xx.com"
android:hint="链接"/>
<Button
android:id="@+id/share_select"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_margin="10dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_gravity="center"
android:onClick="shareSelect"
android:text="选择图片" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="48dp"
android:orientation="horizontal"
android:paddingRight="10dp">
<TextView
android:id="@+id/pic_path"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"/>
<CheckBox
android:id="@+id/share_check"
android:layout_width="80dp"
android:layout_height="match_parent"
android:text="图文"/>
</LinearLayout>
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:textColor="#009FEC"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="48dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:orientation="horizontal">
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center"
android:onClick="shareDQD"
android:text="分享懂球帝" />
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center"
android:onClick="shareQQ"
android:text="分享QQ" />
android:text="QQ分享" />
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center"
android:onClick="shareQQZone"
android:text="分享QQ+空间" />
</LinearLayout>
android:onClick="shareWX"
android:text="微信分享" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="48dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:orientation="horizontal">
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center"
android:onClick="shareWX"
android:text="分享微信" />
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center"
android:onClick="sharePYQ"
android:text="分享朋友圈" />
android:onClick="shareFacebook"
android:text="FaceBook分享" />
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center"
android:onClick="shareWXSC"
android:text="分享微信收藏" />
android:onClick="shareSystem"
android:text="系统分享" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment