更新demo样式

王琳
1 parent 37a8ffe7
Showing 11 changed files with 112 additions and 49 deletions
app/src/main/java/cn/vlion/simple/BannerActivity.java
app/src/main/java/cn/vlion/simple/MainActivity.java
app/src/main/java/cn/vlion/simple/NativeActivity.java
app/src/main/java/cn/vlion/simple/SplashActivity.java
app/src/main/java/cn/vlion/simple/SpotActivity.java
app/src/main/res/drawable/back.png
app/src/main/res/drawable/btn_bg.xml
app/src/main/res/layout/activity_main.xml
app/src/main/res/layout/activity_native.xml
app/src/main/res/values/colors.xml
app/src/main/res/values/styles.xml
@@ -12,6 +12,8 @@ import cn.vlion.ad.moudle.banner.BannerView;
 import cn.vlion.ad.moudle.banner.BannerViewListener;
 import cn.vlion.simple.util.ScreenUtil;
+import static cn.vlion.simple.MainActivity.TAG_ID;
+
 public class BannerActivity extends AppCompatActivity {
     private static final String TAG = "BannerActivity";
@@ -24,11 +26,12 @@ public class BannerActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_banner);
         bannerContainer = (RelativeLayout) findViewById(R.id.bannerContainer);
+        String tagId = getIntent().getStringExtra(TAG_ID);
         BannerManager.getInstance().setAdScalingModel(Config.AD_SCALING_MODE_SCALE_TO_FIT);
         //430 h5
         //431 image
-        bannerView = BannerManager.getInstance().getBannerView(this, "430", new BannerViewListener() {
+        bannerView = BannerManager.getInstance().getBannerView(this, tagId, new BannerViewListener() {
             @Override
             public void onRequestSuccess(int viewWidth, int viewHeight) {
                 Log.e(TAG, "onRequestSuccess: " + viewWidth + "," + viewHeight);
@@ -8,30 +8,31 @@ import android.view.View;
 public class MainActivity extends AppCompatActivity {
     private static final String TAG = "MainActivity";
+    public static final String TAG_ID = "tagId";
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        findViewById(R.id.bannerBtn).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                startActivity(new Intent(MainActivity.this, BannerActivity.class));
-            }
-        });
-
-        findViewById(R.id.spotBtn).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                startActivity(new Intent(MainActivity.this, SpotActivity.class));
-            }
-        });
-
-        findViewById(R.id.nativeBtn).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                startActivity(new Intent(MainActivity.this, NativeActivity.class));
-            }
-        });
+    }
+
+    public void bannerWebClick(View view) {
+        startActivity(new Intent(MainActivity.this, BannerActivity.class).putExtra(TAG_ID, "430"));
+    }
+
+    public void bannerImgClick(View view) {
+        startActivity(new Intent(MainActivity.this, BannerActivity.class).putExtra(TAG_ID, "431"));
+    }
+
+    public void spotWebClick(View view) {
+        startActivity(new Intent(MainActivity.this, SpotActivity.class).putExtra(TAG_ID, "434"));
+    }
+
+    public void spotImgClick(View view) {
+        startActivity(new Intent(MainActivity.this, SpotActivity.class).putExtra(TAG_ID, "438"));
+    }
+
+    public void nativeClick(View view) {
+        startActivity(new Intent(MainActivity.this, NativeActivity.class));
     }
 }
@@ -5,6 +5,7 @@ import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
+import android.widget.Toast;
 import com.google.gson.Gson;
@@ -24,7 +25,7 @@ public class NativeActivity extends AppCompatActivity {
     private static final String adId_AppWall = "";
     private static final String adId_Carousel = "359";
-    private static final String adId_Feeds = "357";
+    private static final String adId_Feeds = "440";
     private static final String adId_News = "";
     private static final String adId_Waterfall = "358";
@@ -39,11 +40,13 @@ public class NativeActivity extends AppCompatActivity {
             @Override
             public void onRequestSuccess(NativeAppWallData data) {
                 Log.e("DemoView", "数据获取成功 " + new Gson().toJson(data));
+                Toast.makeText(NativeActivity.this, "数据获取成功 " + new Gson().toJson(data), Toast.LENGTH_SHORT).show();
             }
             @Override
             public void onRequestFailed(int code, String message) {
                 Log.e("DemoView", "数据加载失败 : code = " + code + " , message = " + message);
+                Toast.makeText(NativeActivity.this, "数据加载失败 : code = " + code + " , message = " + message, Toast.LENGTH_SHORT).show();
             }
         });
     }
@@ -53,11 +56,13 @@ public class NativeActivity extends AppCompatActivity {
             @Override
             public void onRequestSuccess(NativeCarouselData data) {
                 Log.e("DemoView", "数据获取成功 " + new Gson().toJson(data));
+                Toast.makeText(NativeActivity.this, "数据获取成功 " + new Gson().toJson(data), Toast.LENGTH_SHORT).show();
             }
             @Override
             public void onRequestFailed(int code, String message) {
                 Log.e("DemoView", "数据加载失败 : code = " + code + " , message = " + message);
+                Toast.makeText(NativeActivity.this, "数据加载失败 : code = " + code + " , message = " + message, Toast.LENGTH_SHORT).show();
             }
         });
     }
@@ -67,11 +72,13 @@ public class NativeActivity extends AppCompatActivity {
             @Override
             public void onRequestSuccess(NativeFeedsData data) {
                 Log.e("DemoView", "数据获取成功 " + new Gson().toJson(data));
+                Toast.makeText(NativeActivity.this, "数据获取成功 " + new Gson().toJson(data), Toast.LENGTH_SHORT).show();
             }
             @Override
             public void onRequestFailed(int code, String message) {
                 Log.e("DemoView", "数据加载失败 : code = " + code + " , message = " + message);
+                Toast.makeText(NativeActivity.this, "数据加载失败 : code = " + code + " , message = " + message, Toast.LENGTH_SHORT).show();
             }
         });
     }
@@ -81,11 +88,13 @@ public class NativeActivity extends AppCompatActivity {
             @Override
             public void onRequestSuccess(NativeNewsData data) {
                 Log.e("DemoView", "数据获取成功 " + new Gson().toJson(data));
+                Toast.makeText(NativeActivity.this, "数据获取成功 " + new Gson().toJson(data), Toast.LENGTH_SHORT).show();
             }
             @Override
             public void onRequestFailed(int code, String message) {
                 Log.e("DemoView", "数据加载失败 : code = " + code + " , message = " + message);
+                Toast.makeText(NativeActivity.this, "数据加载失败 : code = " + code + " , message = " + message, Toast.LENGTH_SHORT).show();
             }
         });
     }
@@ -95,11 +104,13 @@ public class NativeActivity extends AppCompatActivity {
             @Override
             public void onRequestSuccess(NativeWaterfallData data) {
                 Log.e("DemoView", "数据获取成功 " + new Gson().toJson(data));
+                Toast.makeText(NativeActivity.this, "数据获取成功 " + new Gson().toJson(data), Toast.LENGTH_SHORT).show();
             }
             @Override
             public void onRequestFailed(int code, String message) {
                 Log.e("DemoView", "数据加载失败 : code = " + code + " , message = " + message);
+                Toast.makeText(NativeActivity.this, "数据加载失败 : code = " + code + " , message = " + message, Toast.LENGTH_SHORT).show();
             }
         });
     }
@@ -74,7 +74,7 @@ public class SplashActivity extends AppCompatActivity {
         SplashManager.getInstance().setAdScalingModel(Config.AD_SCALING_MODE_SCALE_TO_FIT);
         //432 h5
         //433 image
-        SplashManager.getInstance().showSplash(this, "432", new SplashViewListener() {
+        SplashManager.getInstance().showSplash(this, "433", new SplashViewListener() {
             @Override
             public void onRequestSuccess(int viewWidth, int viewHeight) {
@@ -7,6 +7,7 @@ import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.RelativeLayout;
+import android.widget.Toast;
 import cn.vlion.ad.core.Config;
 import cn.vlion.ad.moudle.spot.SpotManager;
@@ -14,6 +15,8 @@ import cn.vlion.ad.moudle.spot.SpotViewListener;
 import cn.vlion.simple.util.ScreenUtil;
+import static cn.vlion.simple.MainActivity.TAG_ID;
+
 /**
  * Created by gujun on 2017/10/12.
  */
@@ -23,11 +26,13 @@ public class SpotActivity extends AppCompatActivity {
     private static final String TAG = "SpotActivity";
     private RelativeLayout spotAdContainer;
     private RelativeLayout adLayout;
+    private String tagId;
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_spot);
+        tagId = getIntent().getStringExtra(TAG_ID);
         addSpotAd();
     }
@@ -39,7 +44,7 @@ public class SpotActivity extends AppCompatActivity {
         SpotManager.getInstance().setAdScalingModel(Config.AD_SCALING_MODE_SCALE_TO_FIT);
         //434 h5
         //438 image
-        SpotManager.getInstance().showSpot(this, "438", new SpotViewListener() {
+        SpotManager.getInstance().showSpot(this, tagId, new SpotViewListener() {
             @Override
             public void onRequestSuccess(int viewWidth, int viewHeight, int closeViewHeight) {
@@ -51,6 +56,7 @@ public class SpotActivity extends AppCompatActivity {
             @Override
             public void onRequestFailed(int code, String errorMsg) {
                 Log.e(TAG, "onRequestFailed: " + code + "," + errorMsg);
+                Toast.makeText(SpotActivity.this, "onRequestFailed: " + code + "," + errorMsg, Toast.LENGTH_SHORT).show();
             }
             @Override
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    android:useLevel="false">
+
+    <solid android:color="@color/colorAccent" />
+
+    <corners
+        android:bottomLeftRadius="20dp"
+        android:bottomRightRadius="20dp"
+        android:topLeftRadius="20dp"
+        android:topRightRadius="20dp" />
+
+</shape>
 \ No newline at end of file
@@ -7,26 +7,42 @@
     tools:context="cn.vlion.simple.MainActivity">
     <Button
-        android:id="@+id/bannerBtn"
+        android:id="@+id/bannerWebBtn"
+        style="@style/buttonTheme"
         android:layout_width="200dp"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:text="横幅广告" />
+        android:onClick="bannerWebClick"
+        android:text="横幅广告(web)" />
     <Button
-        android:id="@+id/spotBtn"
+        android:id="@+id/bannerImgBtn"
+        style="@style/buttonTheme"
         android:layout_width="200dp"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:text="插屏广告广告" />
+        android:onClick="bannerImgClick"
+        android:text="横幅广告(img)" />
+
+    <Button
+        android:id="@+id/spotWebBtn"
+        style="@style/buttonTheme"
+        android:layout_width="200dp"
+        android:layout_height="wrap_content"
+        android:onClick="spotWebClick"
+        android:text="插屏广告(web)" />
+
+    <Button
+        android:id="@+id/spotImgBtn"
+        style="@style/buttonTheme"
+        android:layout_width="200dp"
+        android:layout_height="wrap_content"
+        android:onClick="spotImgClick"
+        android:text="插屏广告(img)" />
     <Button
         android:id="@+id/nativeBtn"
+        style="@style/buttonTheme"
         android:layout_width="200dp"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
+        android:onClick="nativeClick"
         android:text="原生广告" />
 </LinearLayout>
@@ -3,46 +3,51 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:gravity="center"
     android:orientation="vertical"
-    tools:context="cn.vlion.simple.NativeActivity"
-    android:gravity="center">
+    tools:context="cn.vlion.simple.NativeActivity">
     <Button
         android:id="@+id/loadAppWall"
+        style="@style/buttonTheme"
         android:layout_width="200dp"
         android:layout_height="wrap_content"
-        android:text="@string/loadAppWall"
-        android:onClick="loadAppWall"/>
+        android:onClick="loadAppWall"
+        android:text="@string/loadAppWall" />
     <Button
         android:id="@+id/loadCarousel"
+        style="@style/buttonTheme"
         android:layout_width="200dp"
         android:layout_height="wrap_content"
-        android:text="@string/loadCarousel"
         android:layout_marginTop="16dp"
-        android:onClick="loadCarousel"/>
+        android:onClick="loadCarousel"
+        android:text="@string/loadCarousel" />
     <Button
         android:id="@+id/loadFeeds"
+        style="@style/buttonTheme"
         android:layout_width="200dp"
         android:layout_height="wrap_content"
-        android:text="@string/loadFeeds"
         android:layout_marginTop="16dp"
-        android:onClick="loadFeeds"/>
+        android:onClick="loadFeeds"
+        android:text="@string/loadFeeds" />
     <Button
         android:id="@+id/loadNews"
+        style="@style/buttonTheme"
         android:layout_width="200dp"
         android:layout_height="wrap_content"
-        android:text="@string/loadNews"
         android:layout_marginTop="16dp"
-        android:onClick="loadNews"/>
+        android:onClick="loadNews"
+        android:text="@string/loadNews" />
     <Button
         android:id="@+id/loadWaterfall"
+        style="@style/buttonTheme"
         android:layout_width="200dp"
         android:layout_height="wrap_content"
-        android:text="@string/loadWaterfall"
         android:layout_marginTop="16dp"
-        android:onClick="loadWaterfall"/>
+        android:onClick="loadWaterfall"
+        android:text="@string/loadWaterfall" />
 </LinearLayout>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
+    <color name="colorPrimary">#4685CA</color>
+    <color name="colorPrimaryDark">#25609E</color>
+    <color name="colorAccent">#5892D0</color>
 </resources>
@@ -8,4 +8,11 @@
         <item name="colorAccent">@color/colorAccent</item>
     </style>
+    <style name="buttonTheme">
+        <item name="android:background">@drawable/btn_bg</item>
+        <item name="android:textColor">@android:color/white</item>
+        <item name="android:layout_gravity">center_horizontal</item>
+        <item name="android:layout_marginTop">20dp</item>
+    </style>
+
 </resources>