Commit 636deb8ba39666a516b7951e49231e645f465fbd

Authored by 赵康
1 parent 0c3f8e86af
Exists in master

release1.0.2

修改界面布局方式,适配方式
修改推广码分享
增加debug模式设置和获取版本方法
修改demo,增加设置uid

Showing 23 changed files with 285 additions and 194 deletions Side-by-side Diff

android/PromoterDemo/AndroidManifest.xml
... ... @@ -21,7 +21,7 @@
21 21 android:theme="@style/AppTheme" >
22 22 <activity
23 23 android:name="com.example.promoterdemo.MainActivity"
24   - android:screenOrientation="portrait"
  24 + android:screenOrientation="landscape"
25 25 android:label="@string/app_name" >
26 26 <intent-filter>
27 27 <action android:name="android.intent.action.MAIN" />
android/PromoterDemo/project.properties
... ... @@ -12,4 +12,4 @@
12 12  
13 13 # Project target.
14 14 target=android-19
15   -android.library.reference.1=..\\PromoterRelease
  15 +android.library.reference.1=../PromoterRelease
android/PromoterDemo/res/layout/activity_main.xml
1   -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
  1 +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2 2 xmlns:tools="http://schemas.android.com/tools"
3 3 android:layout_width="match_parent"
4 4 android:layout_height="match_parent"
  5 + android:orientation="vertical"
5 6 android:paddingBottom="@dimen/activity_vertical_margin"
6 7 android:paddingLeft="@dimen/activity_horizontal_margin"
7 8 android:paddingRight="@dimen/activity_horizontal_margin"
... ... @@ -9,10 +10,21 @@
9 10 tools:context=".MainActivity" >
10 11  
11 12 <TextView
12   - android:id="@+id/click_textview"
  13 + android:id="@+id/app_info"
13 14 android:layout_width="match_parent"
14   - android:layout_height="match_parent"
  15 + android:layout_height="wrap_content" />
  16 +
  17 + <EditText
  18 + android:id="@+id/uid"
  19 + android:layout_width="match_parent"
  20 + android:layout_height="wrap_content"
15 21 android:gravity="center"
16   - android:text="@string/hello_world" />
  22 + android:hint="uid" />
  23 +
  24 + <Button
  25 + android:id="@+id/goin"
  26 + android:layout_width="match_parent"
  27 + android:layout_height="wrap_content"
  28 + android:text="Go into Promoter" />
17 29  
18   -</RelativeLayout>
  30 +</LinearLayout>
19 31 \ No newline at end of file
android/PromoterDemo/src/com/example/promoterdemo/MainActivity.java
1 1 package com.example.promoterdemo;
  2 +
  3 +import com.gumptech.promoter.Entrance;
  4 +
2 5 import android.app.Activity;
3 6 import android.os.Bundle;
4 7 import android.util.Log;
5 8 import android.view.View;
6 9 import android.view.View.OnClickListener;
  10 +import android.widget.Button;
  11 +import android.widget.EditText;
7 12 import android.widget.TextView;
8   -import com.gumptech.promoter.util.Constant;
9   -import com.gumptech.promoter.Entrance;
  13 +
10 14 public class MainActivity extends Activity implements OnClickListener {
11   - @Override
12   - protected void onCreate(Bundle savedInstanceState) {
13   - super.onCreate(savedInstanceState);
14   - setContentView(R.layout.activity_main);
15   - TextView clickText=(TextView) findViewById(R.id.click_textview);
16   - clickText.setOnClickListener(this);
17   - Log.d("MainActivity", "VERSION_CODE="+Constant.VERSION_CODE);
18   - }
  15 + EditText etUid;
  16 + String appId = "10022";
  17 + String serverID = "";
  18 + String roleId = "";
  19 +
  20 + @Override
  21 + protected void onCreate(Bundle savedInstanceState) {
  22 + super.onCreate(savedInstanceState);
  23 + setContentView(R.layout.activity_main);
  24 + TextView info = (TextView) findViewById(R.id.app_info);
  25 + etUid = (EditText) findViewById(R.id.uid);
  26 + Button goin = (Button) findViewById(R.id.goin);
  27 + goin.setOnClickListener(this);
  28 + info.setText("appId=" + appId + "\nserverId=" + serverID + "\nroleId=" + roleId + "\nsdk version:" + Entrance.getVersion());
  29 + }
19 30  
20 31 @Override
21 32 public void onClick(View v) {
22   - // TODO Auto-generated method stub
23   - Entrance.DoPromoter("1545402", "10022", "", "", this);
24   -
  33 + String uid = etUid.getText().toString();
  34 + Entrance.enableDebug(true);
  35 + Entrance.DoPromoter(uid, appId, serverID, roleId, this);
25 36 }
26 37 }
android/PromoterRelease/libs/PromoterSdk_proguard_1.0.1.jar
No preview for this file type
android/PromoterRelease/libs/PromoterSdk_proguard_1.0.2.jar
No preview for this file type
android/PromoterRelease/libs/picasso-2.2.0.jar
No preview for this file type
android/PromoterRelease/res/color/btn_confirm_text_color.xml
... ... @@ -0,0 +1,5 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<selector xmlns:android="http://schemas.android.com/apk/res/android">
  3 + <item android:state_enabled="true" android:color="@color/red"/>
  4 + <item android:state_enabled="false" android:color="@color/gray2"/>
  5 +</selector>
android/PromoterRelease/res/color/btn_text_color.xml
... ... @@ -0,0 +1,5 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<selector xmlns:android="http://schemas.android.com/apk/res/android">
  3 + <item android:state_enabled="true" android:color="@color/red"/>
  4 + <item android:state_enabled="false" android:color="@color/gray"/>
  5 +</selector>
android/PromoterRelease/res/drawable-hdpi/progress.png

7.45 KB

android/PromoterRelease/res/drawable-hdpi/progress_bar.png

4.13 KB

android/PromoterRelease/res/drawable-xhdpi/instructions.png.png

2.96 KB

android/PromoterRelease/res/drawable-xxhdpi/instructions.png.png

5.15 KB

android/PromoterRelease/res/drawable/btn_confirm_bg.xml
... ... @@ -0,0 +1,5 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<selector xmlns:android="http://schemas.android.com/apk/res/android" >
  3 + <item android:state_enabled="true" android:drawable="@drawable/confirm"/>
  4 + <item android:state_enabled="false" android:drawable="@drawable/confirm_grey"/>
  5 +</selector>
android/PromoterRelease/res/drawable/btn_reward_bg.xml
... ... @@ -0,0 +1,5 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<selector xmlns:android="http://schemas.android.com/apk/res/android" >
  3 + <item android:state_enabled="true" android:drawable="@drawable/reward"/>
  4 + <item android:state_enabled="false" android:drawable="@drawable/reward_grey"/>
  5 +</selector>
android/PromoterRelease/res/drawable/progress_drawable.xml
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
  3 +
  4 + <item android:id="@android:id/progress">
  5 + <clip>
  6 + <bitmap android:src="@drawable/progress" />
  7 + </clip>
  8 + </item>
  9 +
  10 +</layer-list>
0 11 \ No newline at end of file
android/PromoterRelease/res/drawable/progressbar_horizontal_1.xml
... ... @@ -1,21 +0,0 @@
1   -<?xml version="1.0" encoding="utf-8"?>
2   -<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
3   -
4   - <item
5   - android:id="@android:id/background"
6   - android:drawable="@drawable/progress_bar_background">
7   - </item>
8   - <item android:id="@android:id/secondaryProgress">
9   - <scale
10   - android:drawable="@drawable/confirm"
11   - android:scaleGravity="center_vertical"
12   - android:scaleHeight="percentage"
13   - android:scaleWidth="percentage" />
14   - </item>
15   - <item android:id="@android:id/progress">
16   - <scale
17   - android:drawable="@drawable/edite_hint"
18   - android:scaleWidth="100%" />
19   - </item>
20   -
21   -</layer-list>
22 0 \ No newline at end of file
android/PromoterRelease/res/layout/activity_promoter.xml
1 1 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2   - xmlns:tools="http://schemas.android.com/tools"
3   - android:id="@+id/root_layout"
4 2 android:layout_width="match_parent"
5   - android:layout_height="match_parent"
6   - android:background="@color/bankground"
7   - android:orientation="horizontal" >
  3 + android:layout_height="match_parent" >
8 4  
9   - <!-- 左边宣传图片 -->
10   -
11   - <ImageView
12   - android:id="@+id/left_imge"
13   - android:layout_width="wrap_content"
14   - android:layout_height="match_parent"
15   - android:layout_alignParentLeft="true"
16   - android:scaleType="fitXY"
17   - />
18   - <!-- 右边宣传图片 -->
19   -
20   - <ImageView
21   - android:id="@+id/right_imge"
  5 + <LinearLayout
22 6 android:layout_width="match_parent"
23 7 android:layout_height="match_parent"
24   - android:layout_toRightOf="@+id/left_imge"
25   - android:scaleType="fitXY"
26   - android:visibility="gone" />
27   - <!-- 右边上 -->
  8 + android:background="@color/common_bg"
  9 + android:orientation="horizontal" >
28 10  
29   - <ImageView
30   - android:id="@+id/right_top_imge"
31   - android:layout_width="match_parent"
32   - android:layout_height="match_parent"
33   - android:layout_toRightOf="@+id/left_imge"
34   - android:scaleType="fitXY"
35   - />
36   - <!-- 右边上下 -->
  11 + <!-- 左边宣传图片 -->
37 12  
38   - <ImageView
39   - android:id="@+id/right_down_imge"
40   - android:layout_width="match_parent"
41   - android:layout_height="match_parent"
42   - android:layout_below="@+id/right_top_imge"
43   - android:layout_toRightOf="@+id/left_imge"
44   - android:scaleType="fitXY"
45   - />
46   - <!-- 获取推广链接按钮 -->
  13 + <RelativeLayout
  14 + android:layout_width="match_parent"
  15 + android:layout_height="match_parent"
  16 + android:layout_marginRight="6dp"
  17 + android:layout_weight="9" >
  18 +
  19 + <ImageView
  20 + android:id="@+id/left_imge"
  21 + android:layout_width="match_parent"
  22 + android:layout_height="match_parent"
  23 + android:scaleType="fitXY" />
  24 +
  25 + <Button
  26 + android:id="@+id/promoter_linked"
  27 + android:layout_width="wrap_content"
  28 + android:layout_height="wrap_content"
  29 + android:layout_alignParentBottom="true"
  30 + android:layout_centerHorizontal="true"
  31 + android:layout_marginBottom="20dp"
  32 + android:background="@drawable/promoter_linked"
  33 + android:gravity="center"
  34 + android:text="@string/promote"
  35 + android:textColor="@color/red" />
  36 + </RelativeLayout>
  37 +
  38 + <LinearLayout
  39 + android:layout_width="match_parent"
  40 + android:layout_height="match_parent"
  41 + android:layout_weight="5"
  42 + android:orientation="vertical" >
  43 +
  44 + <RelativeLayout
  45 + android:layout_weight="2"
  46 + android:layout_width="match_parent"
  47 + android:layout_height="match_parent" >
  48 +
  49 + <ImageView
  50 + android:id="@+id/right_top"
  51 + android:layout_width="match_parent"
  52 + android:layout_height="match_parent"
  53 + android:scaleType="fitXY"
  54 + />
  55 + <!-- 进度条上方进度提示 -->
  56 +
  57 + <RelativeLayout
  58 + android:layout_width="match_parent"
  59 + android:layout_height="wrap_content"
  60 + android:layout_marginLeft="32dp"
  61 + android:layout_marginTop="28dp"
  62 + android:gravity="bottom"
  63 + android:orientation="horizontal" >
  64 +
  65 + <!-- 进度条 -->
  66 +
  67 + <LinearLayout
  68 + android:id="@+id/playout"
  69 + android:layout_width="match_parent"
  70 + android:layout_height="wrap_content"
  71 + android:layout_toLeftOf="@+id/reward"
  72 + android:orientation="vertical" >
  73 +
  74 + <LinearLayout
  75 + android:id="@+id/progress_instructions"
  76 + android:layout_width="match_parent"
  77 + android:layout_height="wrap_content"
  78 + android:orientation="horizontal" />
  79 +
  80 + <ProgressBar
  81 + android:id="@+id/prgress_bar"
  82 + style="?android:attr/progressBarStyleHorizontal"
  83 + android:layout_width="match_parent"
  84 + android:layout_height="wrap_content"
  85 + android:layout_marginRight="12.5dp"
  86 + android:background="@drawable/progress_bar_background"
  87 + android:progressDrawable="@drawable/progress_drawable" />
  88 + </LinearLayout>
  89 + <!-- 获取奖励 -->
47 90  
48   - <Button
49   - android:id="@+id/promoter_linked"
  91 + <Button
  92 + android:id="@id/reward"
  93 + android:layout_width="wrap_content"
  94 + android:layout_height="wrap_content"
  95 + android:layout_alignBottom="@id/playout"
  96 + android:layout_alignParentRight="true"
  97 + android:layout_marginRight="26dp"
  98 + android:background="@drawable/btn_reward_bg"
  99 + android:enabled="true"
  100 + android:gravity="bottom|center_horizontal"
  101 + android:paddingBottom="2dp"
  102 + android:text="@string/claim"
  103 + android:textColor="@color/btn_text_color" />
  104 + </RelativeLayout>
  105 + </RelativeLayout>
  106 +
  107 + <RelativeLayout
  108 + android:layout_weight="3"
  109 + android:layout_width="match_parent"
  110 + android:layout_height="match_parent" >
  111 +
  112 + <ImageView
  113 + android:id="@+id/right_down"
  114 + android:layout_width="match_parent"
  115 + android:layout_height="match_parent"
  116 + android:scaleType="fitXY"
  117 + />
  118 +
  119 + <LinearLayout
  120 + android:layout_width="wrap_content"
  121 + android:layout_height="wrap_content"
  122 + android:layout_alignParentBottom="true"
  123 + android:layout_centerHorizontal="true"
  124 + android:layout_marginBottom="21dp"
  125 + android:gravity="center_vertical"
  126 + android:orientation="horizontal" >
  127 +
  128 + <EditText
  129 + android:id="@+id/edittext"
  130 + android:layout_width="wrap_content"
  131 + android:layout_height="36.5dp"
  132 + android:layout_marginRight="22.5dp"
  133 + android:background="@drawable/edite_hint"
  134 + android:paddingLeft="10dp"
  135 + android:textColor="@color/edit_text_color" />
  136 +
  137 + <Button
  138 + android:id="@+id/confirm"
  139 + android:layout_width="wrap_content"
  140 + android:layout_height="30dp"
  141 + android:background="@drawable/btn_confirm_bg"
  142 + android:enabled="false"
  143 + android:paddingBottom="2dp"
  144 + android:text="@string/verify"
  145 + android:textColor="@color/btn_confirm_text_color" />
  146 + </LinearLayout>
  147 + </RelativeLayout>
  148 + </LinearLayout>
  149 + </LinearLayout>
  150 + <!-- 中间指示 -->
  151 +
  152 + <ImageView
  153 + android:id="@+id/middle_instructions"
50 154 android:layout_width="wrap_content"
51 155 android:layout_height="wrap_content"
52   - android:layout_alignParentBottom="true"
53   - android:layout_alignParentLeft="true"
54   - android:background="@drawable/promoter_linked"
55   - android:gravity="center"
56   - android:paddingBottom="3dp"
57   - android:textSize="15sp"
58   - android:text="Promote"
59   - android:textColor="#ff000000" />
  156 + android:layout_marginLeft="210dp"
  157 + android:layout_marginTop="101dp"
  158 + android:scaleType="fitXY"
  159 + android:src="@drawable/middle_instructions" />
60 160 <!-- 关闭按钮 -->
61 161  
62 162 <ImageView
63 163 android:id="@+id/close_image"
64   - android:layout_width="54px"
65   - android:layout_height="54px"
  164 + android:layout_width="wrap_content"
  165 + android:layout_height="wrap_content"
66 166 android:layout_alignParentRight="true"
67 167 android:layout_alignParentTop="true"
68 168 android:src="@drawable/close_image" />
69   - <!-- 进度条上方进度提示 -->
70   -
71   - <LinearLayout
72   - android:id="@+id/progress_instructions"
73   - android:layout_width="470px"
74   - android:layout_height="51px"
75   - android:layout_alignParentTop="true"
76   - android:layout_toRightOf="@+id/left_imge"
77   - android:orientation="horizontal" />
78   - <!-- 进度条 -->
79   -
80   - <com.gumptech.promoter.view.ProgressBar
81   - android:id="@+id/prgress_bar"
82   - android:layout_width="470px"
83   - android:layout_height="64px"
84   - android:layout_below="@+id/progress_instructions"
85   - android:layout_toRightOf="@+id/left_imge"
86   - android:max="100"
87   - android:progress="30"
88   - android:progressDrawable="@drawable/progressbar_horizontal_1" />
89   - <!-- 获取奖励 -->
90   -
91   - <Button
92   - android:id="@+id/reward"
93   - android:layout_width="207px"
94   - android:layout_height="86px"
95   - android:layout_alignParentTop="true"
96   - android:layout_toRightOf="@+id/prgress_bar"
97   - android:background="@drawable/reward_grey"
98   - android:gravity="bottom|center_horizontal"
99   - android:paddingBottom="2dp"
100   - android:scaleType="fitXY"
101   - android:text="claim"
102   - android:textColor="#ff0000" />
103   - <!-- 中间指示 -->
104   -
105   - <ImageView
106   - android:id="@+id/middle_instructions"
107   - android:layout_width="57px"
108   - android:layout_height="38px"
109   - android:layout_alignParentLeft="true"
110   - android:layout_alignParentTop="true"
111   - android:scaleType="fitXY"
112   - android:src="@drawable/middle_instructions" />
113   - <!-- 邀请码编辑框 -->
114   - <EditText
115   - android:id="@+id/edittext"
116   - android:layout_width="336px"
117   - android:layout_height="78px"
118   - android:layout_alignParentBottom="true"
119   - android:layout_toRightOf="@+id/left_imge"
120   - android:background="@drawable/edite_hint"
121   - android:textColor="#ff9000" />
122   -
123   - <Button
124   - android:id="@+id/confirm"
125   - android:layout_width="173px"
126   - android:layout_height="60px"
127   - android:layout_alignParentBottom="true"
128   - android:layout_toRightOf="@+id/edittext"
129   - android:background="@drawable/confirm"
130   - android:gravity="center"
131   - android:textSize="15sp"
132   - android:paddingBottom="5dp"
133   - android:text="Verify" />
134   - <!--
135   - <TextView android:id="@+id/data_load"
136   - android:layout_width="match_parent"
137   - android:layout_height="match_parent"
138   - android:gravity="center"
139   - android:visibility="gone"
140   - android:background="@color/no_reward_color"
141   - android:textSize="25sp"
142   - android:text="Data loading failed Click to reload"/>
143   - -->
144 169  
145 170 </RelativeLayout>
146 171 \ No newline at end of file
android/PromoterRelease/res/layout/item_share_app.xml
... ... @@ -0,0 +1,27 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
  3 + android:layout_width="match_parent"
  4 + android:layout_height="match_parent" >
  5 +
  6 + <ImageView
  7 + android:id="@+id/app_icon"
  8 + android:layout_width="69dp"
  9 + android:layout_height="69dp"
  10 + android:layout_centerHorizontal="true"
  11 + android:layout_marginTop="15dp"
  12 + android:scaleType="fitXY" />
  13 +
  14 + <TextView
  15 + android:id="@+id/app_name"
  16 + android:layout_width="wrap_content"
  17 + android:layout_height="wrap_content"
  18 + android:layout_below="@id/app_icon"
  19 + android:layout_centerHorizontal="true"
  20 + android:layout_marginTop="7dp"
  21 + android:ellipsize="end"
  22 + android:gravity="center"
  23 + android:singleLine="true"
  24 + android:text="game name"
  25 + android:textSize="12sp" />
  26 +
  27 +</RelativeLayout>
0 28 \ No newline at end of file
android/PromoterRelease/res/layout/share_dialog.xml
... ... @@ -0,0 +1,23 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  3 + android:layout_width="match_parent"
  4 + android:layout_height="match_parent"
  5 + android:orientation="vertical"
  6 + android:padding="5dp" >
  7 +
  8 + <TextView
  9 + android:id="@+id/intro"
  10 + android:layout_width="match_parent"
  11 + android:layout_height="wrap_content"
  12 + android:layout_margin="5dp"
  13 + android:textColor="@color/black"
  14 + android:background="@color/common_bg"
  15 + android:text="259egeg" />
  16 +
  17 + <GridView
  18 + android:id="@+id/app_list"
  19 + android:layout_width="match_parent"
  20 + android:layout_height="match_parent"
  21 + android:numColumns="3" />
  22 +
  23 +</LinearLayout>
0 24 \ No newline at end of file
android/PromoterRelease/res/values-sw720dp-land/dimens.xml
... ... @@ -1,9 +0,0 @@
1   -<resources>
2   -
3   - <!--
4   - Customize dimensions originally defined in res/values/dimens.xml (such as
5   - screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here.
6   - -->
7   - <dimen name="activity_horizontal_margin">128dp</dimen>
8   -
9   -</resources>
android/PromoterRelease/res/values/colors.xml
... ... @@ -3,21 +3,11 @@
3 3  
4 4 <color name="white">#ffffff</color>
5 5 <color name="black">#000000</color>
6   - <!-- 有奖励 -->
7   - <color name="have_reward_color">#ff9d1e</color>
8   - <!-- 没奖励 -->
9   - <color name="no_reward_color">#514c52</color>
10   - <!-- 验证 -->
11   - <color name="validate">#ff0000</color>
12   - <!-- 验证 -->
13   - <color name="already_verification">#6c6a6e</color>
14   - <!-- 验证 -->
15   - <color name="bankground">#CDc1c1</color>
16   -
  6 + <color name="transparent">#00FFFFFF</color>
  7 + <color name="common_bg">#cdc1c1</color>
  8 + <color name="gray2">#6c6a6e</color>
  9 + <color name="edit_text_color">#ff9000</color>
  10 + <color name="red">#ff0000</color>
  11 + <color name="gray">#514c52</color>
17 12  
18   -
19   -
20   -
21   -
22   -
23 13 </resources>
24 14 \ No newline at end of file
android/PromoterRelease/res/values/strings.xml
... ... @@ -2,7 +2,10 @@
2 2 <resources>
3 3  
4 4 <string name="app_name">Promoter</string>
5   - <string name="action_settings">Settings</string>
6   - <string name="hello_world">Hello world!</string>
  5 + <string name="share_title">Copy and share</string>
7 6  
  7 + <string name="claim">Claim</string>
  8 + <string name="promote">Promote</string>
  9 + <string name="verify">Verify</string>
  10 + <string name="invalid_request">Invalid request</string>
8 11 </resources>