From 636deb8ba39666a516b7951e49231e645f465fbd Mon Sep 17 00:00:00 2001 From: King Date: Fri, 26 Feb 2016 17:42:14 +0800 Subject: [PATCH] =?UTF-8?q?release1.0.2=20=E4=BF=AE=E6=94=B9=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E5=B8=83=E5=B1=80=E6=96=B9=E5=BC=8F=EF=BC=8C=E9=80=82?= =?UTF-8?q?=E9=85=8D=E6=96=B9=E5=BC=8F=20=E4=BF=AE=E6=94=B9=E6=8E=A8?= =?UTF-8?q?=E5=B9=BF=E7=A0=81=E5=88=86=E4=BA=AB=20=E5=A2=9E=E5=8A=A0debug?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E8=AE=BE=E7=BD=AE=E5=92=8C=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=96=B9=E6=B3=95=20=E4=BF=AE=E6=94=B9demo?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=AE=BE=E7=BD=AEuid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/PromoterDemo/AndroidManifest.xml | 2 +- android/PromoterDemo/project.properties | 2 +- android/PromoterDemo/res/layout/activity_main.xml | 22 +- .../src/com/example/promoterdemo/MainActivity.java | 37 ++- .../libs/PromoterSdk_proguard_1.0.1.jar | Bin 76999 -> 0 bytes .../libs/PromoterSdk_proguard_1.0.2.jar | Bin 0 -> 45507 bytes android/PromoterRelease/libs/picasso-2.2.0.jar | Bin 0 -> 87360 bytes .../res/color/btn_confirm_text_color.xml | 5 + .../PromoterRelease/res/color/btn_text_color.xml | 5 + .../PromoterRelease/res/drawable-hdpi/progress.png | Bin 0 -> 7627 bytes .../res/drawable-hdpi/progress_bar.png | Bin 4233 -> 0 bytes .../res/drawable-xhdpi/instructions.png.png | Bin 3033 -> 0 bytes .../res/drawable-xxhdpi/instructions.png.png | Bin 5276 -> 0 bytes .../res/drawable/btn_confirm_bg.xml | 5 + .../PromoterRelease/res/drawable/btn_reward_bg.xml | 5 + .../res/drawable/progress_drawable.xml | 10 + .../res/drawable/progressbar_horizontal_1.xml | 21 -- .../res/layout/activity_promoter.xml | 277 +++++++++++---------- .../PromoterRelease/res/layout/item_share_app.xml | 27 ++ .../PromoterRelease/res/layout/share_dialog.xml | 23 ++ .../res/values-sw720dp-land/dimens.xml | 9 - android/PromoterRelease/res/values/colors.xml | 22 +- android/PromoterRelease/res/values/strings.xml | 7 +- 23 files changed, 285 insertions(+), 194 deletions(-) delete mode 100644 android/PromoterRelease/libs/PromoterSdk_proguard_1.0.1.jar create mode 100644 android/PromoterRelease/libs/PromoterSdk_proguard_1.0.2.jar create mode 100644 android/PromoterRelease/libs/picasso-2.2.0.jar create mode 100644 android/PromoterRelease/res/color/btn_confirm_text_color.xml create mode 100644 android/PromoterRelease/res/color/btn_text_color.xml create mode 100644 android/PromoterRelease/res/drawable-hdpi/progress.png delete mode 100644 android/PromoterRelease/res/drawable-hdpi/progress_bar.png delete mode 100644 android/PromoterRelease/res/drawable-xhdpi/instructions.png.png delete mode 100644 android/PromoterRelease/res/drawable-xxhdpi/instructions.png.png create mode 100644 android/PromoterRelease/res/drawable/btn_confirm_bg.xml create mode 100644 android/PromoterRelease/res/drawable/btn_reward_bg.xml create mode 100644 android/PromoterRelease/res/drawable/progress_drawable.xml delete mode 100644 android/PromoterRelease/res/drawable/progressbar_horizontal_1.xml create mode 100644 android/PromoterRelease/res/layout/item_share_app.xml create mode 100644 android/PromoterRelease/res/layout/share_dialog.xml delete mode 100644 android/PromoterRelease/res/values-sw720dp-land/dimens.xml diff --git a/android/PromoterDemo/AndroidManifest.xml b/android/PromoterDemo/AndroidManifest.xml index 17b71dd..d94654c 100644 --- a/android/PromoterDemo/AndroidManifest.xml +++ b/android/PromoterDemo/AndroidManifest.xml @@ -21,7 +21,7 @@ android:theme="@style/AppTheme" > diff --git a/android/PromoterDemo/project.properties b/android/PromoterDemo/project.properties index 5efb5a5..ccf3f1c 100644 --- a/android/PromoterDemo/project.properties +++ b/android/PromoterDemo/project.properties @@ -12,4 +12,4 @@ # Project target. target=android-19 -android.library.reference.1=..\\PromoterRelease +android.library.reference.1=../PromoterRelease diff --git a/android/PromoterDemo/res/layout/activity_main.xml b/android/PromoterDemo/res/layout/activity_main.xml index 9b94548..547e495 100644 --- a/android/PromoterDemo/res/layout/activity_main.xml +++ b/android/PromoterDemo/res/layout/activity_main.xml @@ -1,7 +1,8 @@ - + + + android:hint="uid" /> + +