diff --git a/LibraryAd/libs/GDTSDK.unionNormal.4.610.1480.aar b/LibraryAd/libs/GDTSDK.unionNormal.4.610.1480.aar deleted file mode 100644 index 2a568ec..0000000 Binary files a/LibraryAd/libs/GDTSDK.unionNormal.4.610.1480.aar and /dev/null differ diff --git a/LibraryAd/libs/GDTSDK.unionNormal.4.640.1510.aar b/LibraryAd/libs/GDTSDK.unionNormal.4.640.1510.aar new file mode 100644 index 0000000..9fe689a Binary files /dev/null and b/LibraryAd/libs/GDTSDK.unionNormal.4.640.1510.aar differ diff --git a/LibraryAd/libs/mediation_gdt_adapter_4.610.1480.0.aar b/LibraryAd/libs/mediation_gdt_adapter_4.610.1480.0.aar deleted file mode 100644 index cc3b94b..0000000 Binary files a/LibraryAd/libs/mediation_gdt_adapter_4.610.1480.0.aar and /dev/null differ diff --git a/LibraryAd/libs/mediation_gdt_adapter_4.640.1510.3.aar b/LibraryAd/libs/mediation_gdt_adapter_4.640.1510.3.aar new file mode 100644 index 0000000..9002f70 Binary files /dev/null and b/LibraryAd/libs/mediation_gdt_adapter_4.640.1510.3.aar differ diff --git a/LibraryAd/libs/open_ad_sdk_6.6.0.7.aar b/LibraryAd/libs/open_ad_sdk_7.0.0.8.aar similarity index 62% rename from LibraryAd/libs/open_ad_sdk_6.6.0.7.aar rename to LibraryAd/libs/open_ad_sdk_7.0.0.8.aar index 90e2a42..1981332 100644 Binary files a/LibraryAd/libs/open_ad_sdk_6.6.0.7.aar and b/LibraryAd/libs/open_ad_sdk_7.0.0.8.aar differ diff --git a/LibraryAd/src/main/java/com/tfq/ad/ad/TTAdManagerHolder.java b/LibraryAd/src/main/java/com/tfq/ad/ad/TTAdManagerHolder.java index 0b00e6d..3c66307 100644 --- a/LibraryAd/src/main/java/com/tfq/ad/ad/TTAdManagerHolder.java +++ b/LibraryAd/src/main/java/com/tfq/ad/ad/TTAdManagerHolder.java @@ -71,7 +71,7 @@ public class TTAdManagerHolder { } public static void init_not() { - + LogAd.e("未进行初始化AD"); } //step1:接入网盟广告sdk的初始化操作,详情见接入文档和穿山甲平台说明 diff --git a/LibraryAd/src/main/java/com/tfq/ad/app/AdApp.java b/LibraryAd/src/main/java/com/tfq/ad/app/AdApp.java index 86a5d97..e3f01c6 100644 --- a/LibraryAd/src/main/java/com/tfq/ad/app/AdApp.java +++ b/LibraryAd/src/main/java/com/tfq/ad/app/AdApp.java @@ -96,6 +96,13 @@ public final class AdApp { if (instance == null) { instance = new AdApp(this); } + try { + if (getInstance().getChannel() != null && getInstance().getChannel().equals("other")) { + LogAd.setDebug(true); + } + } catch (Exception e) { + e.printStackTrace(); + } // 初始化ad SDK if (!getInstance().getSlotConfig(ADConstants.AD_CSJID).equals("0")) { @@ -104,16 +111,11 @@ public final class AdApp { if (!AdApp.getInstance().isSlotConfig(ADConstants.NO_AD)) { LogAd.e("初始化AD"); initAdSdk(); - }else { + } else { TTAdManagerHolder.init_not(); } - } - try { - if (getInstance().getChannel() != null && getInstance().getChannel().equals("other")) { - LogAd.setDebug(true); - } - } catch (Exception e) { - e.printStackTrace(); + } else { + LogAd.e("不初始化AD"); } } diff --git a/app/src/main/java/com/tfq/finances/app/App.java b/app/src/main/java/com/tfq/finances/app/App.java index 0fdbb70..f1976e9 100644 --- a/app/src/main/java/com/tfq/finances/app/App.java +++ b/app/src/main/java/com/tfq/finances/app/App.java @@ -1 +1 @@ -package com.tfq.finances.app; import android.app.Application; import android.content.Context; import android.content.SharedPreferences; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.database.sqlite.SQLiteDatabase; import android.text.TextUtils; import com.tfq.ad.ad.ADStateUtils; import com.tfq.ad.app.AdApp; import com.tfq.ad.utils.LogAd; import com.tfq.finances.core.constants.Constants; import com.tfq.finances.db.DaoMaster; import com.tfq.finances.db.DaoSession; import com.tfq.finances.db.db.GDOpenHelper; import com.tfq.demo.R; import com.tfq.finances.main.AdUtils; import com.tfq.library.app.BaseConstants; import com.tfq.library.app.LibraryApp; import com.tfq.library.utils.AppSigning; import com.tfq.library.utils.AppUtil; import com.tfq.library.utils.LogK; import com.tfq.library.utils.SpManager; import com.umeng.commonsdk.UMConfigure; import static com.tfq.ad.app.ADConstants.AD_CODE_BANNER; import static com.tfq.ad.app.ADConstants.AD_CODE_FEED1; import static com.tfq.ad.app.ADConstants.AD_CODE_REWARD; import static com.tfq.ad.app.ADConstants.AD_CODE_SPLASH; import static com.tfq.ad.app.ADConstants.AD_CSJID; public class App extends Application { public static Context mContext; public static App instance; public static DaoSession mSession; private String appid; //新增参数,固定值,后台app逻辑id,优化接口调用使用 private String appinfoId; private String csjId; private String umId; private String csjIdSplash, csjIdCQP, csjIdFeed1, csjIdFeed2, csjIdFeed3, csjIdReward, csjIdBanner, csjIdDraw; public static App getInstances() { return instance; } public static String getChannel() { try { PackageManager pm = mContext.getPackageManager(); ApplicationInfo appInfo = pm.getApplicationInfo(mContext.getPackageName(), PackageManager.GET_META_DATA); String umeng_channel = appInfo.metaData.getString("UMENG_C HANNEL"); if (umeng_channel != null) { return umeng_channel; } return "other"; } catch (PackageManager.NameNotFoundException ignored) { } return "other"; } public static Context getContext() { return mContext; } public static void setNavigationBarColor(String navigationBarColor) { BaseConstants.navigationBarColor = navigationBarColor; } @Override public void onCreate() { super.onCreate(); instance = this; mContext = getApplicationContext(); UMConfigure.preInit(mContext, getUmId(), getChannel()); // AppUtil.getPublicKey(AppUtil.getSign(mContext)); // LogK.e(GetPublicKey.getSignInfo(mContext)); initDb(); // setNavigationBarColor("#ffffff"); agreeSercurity(); LogK.e("APP_INFO: " + "\n" + AppSigning.getSha1(this) + "\n" + AppUtil.getPackageName(mContext) + "\n" + getChannel() + "\n" + getCsjId() + "\n" + mContext.getResources().getString(R.string.app_name) + "\n" + AppUtil.getAppVersionName(mContext) + "\n" + AppUtil.getAppVersionCode(mContext) + "\n" ); } private void initDb() { try { GDOpenHelper gdOpenHelper = new GDOpenHelper(this, "tfq.db"); SQLiteDatabase db = gdOpenHelper.getWritableDatabase(); DaoMaster daoMaster = new DaoMaster(db); mSession = daoMaster.newSession(); } catch (Exception e) { e.printStackTrace(); } } public DaoSession getDaoSession() { return mSession; } public String getUmId() { if (TextUtils.isEmpty(umId)) { umId = mContext.getResources().getString(R.string.umId); } return umId; } public String getAppid() { if (TextUtils.isEmpty(appid)) { appid = mContext.getResources().getString(R.string.appid); } return appid; } /** * 获取appinfoId * * @return */ public String getAppinfoId() { if (TextUtils.isEmpty(appinfoId)) { appinfoId = mContext.getResources().getString(R.string.appinfoId); } return appinfoId; } public String getCsjId() { if (TextUtils.isEmpty(csjId)) { csjId = mContext.getResources().getString(R.string.csjId); } return csjId; } public void agreeSercurity() { SharedPreferences sharedPreferences = SpManager.startRead(mContext, Constants.SP_NAME); boolean openNoFirst = sharedPreferences.getBoolean("no_first_open", false); if (openNoFirst) { init_BaseLibrary(); init_ADLibrary(); UMConfigure.init(this, getUmId(), getChannel(), UMConfigure.DEVICE_TYPE_PHONE, ""); } } private void init_BaseLibrary() { new LibraryApp.Builder(this) .addSlot(BaseConstants.LOG_PRINT, String.valueOf(Constants.APP_DEBUG_PRINT)) .addSlot(BaseConstants.ANIMATION_SKIP,"1") .initialize(); } private void init_ADLibrary() { new AdApp.Builder(this, Constants.APP_NAME, getChannel(), getAppSplash()) .addSlot(AD_CSJID, getCsjId()) // CSJID .addSlot(AD_CODE_SPLASH, getCsjIdSplash()) // 添加横幅广告位 .addSlot(AD_CODE_REWARD, getCsjIdReward()) // 激励视频广告位 .addSlot(AD_CODE_FEED1, getCsjIdFeed1()) // 信息流1广告位 .addSlot(AD_CODE_BANNER, getCsjIdBanner()) // banner广告位 .initialize(); ADStateUtils.setSwitchRequestListener(new ADStateUtils.SwitchRequestListener() { @Override public void onSwitchRequestChanged() { AdUtils.getAdvFlag(); } }); } @Override protected void attachBaseContext(Context base) { super.attachBaseContext(base); } public String getCsjIdSplash() { if (TextUtils.isEmpty(csjIdSplash)) { csjIdSplash = mContext.getResources().getString(R.string.csjIdSplash); } return csjIdSplash; } public String getCsjIdCQP() { if (TextUtils.isEmpty(csjIdCQP)) { csjIdCQP = mContext.getResources().getString(R.string.csjIdCQP); } return csjIdCQP; } public String getCsjIdFeed1() { if (TextUtils.isEmpty(csjIdFeed1)) { csjIdFeed1 = mContext.getResources().getString(R.string.csjIdFeed1); } return csjIdFeed1; } public String getCsjIdFeed2() { if (TextUtils.isEmpty(csjIdFeed2)) { csjIdFeed2 = mContext.getResources().getString(R.string.csjIdFeed2); } return csjIdFeed2; } public String getCsjIdFeed3() { if (TextUtils.isEmpty(csjIdFeed3)) { csjIdFeed3 = mContext.getResources().getString(R.string.csjIdFeed3); } return csjIdFeed3; } public String getCsjIdReward() { if (TextUtils.isEmpty(csjIdReward)) { csjIdReward = mContext.getResources().getString(R.string.csjIdReward); } return csjIdReward; } public String getCsjIdBanner() { if (TextUtils.isEmpty(csjIdBanner)) { csjIdBanner = mContext.getResources().getString(R.string.csjIdBanner); } return csjIdBanner; } public String getCsjIdDraw() { if (TextUtils.isEmpty(csjIdDraw)) { csjIdDraw = mContext.getResources().getString(R.string.csjIdDraw); } return csjIdDraw; } public boolean isNeedLogin() { return mContext.getResources().getBoolean(R.bool.need_login); } public int getAppSplash() { return R.drawable.app_splash; } } \ No newline at end of file +package com.tfq.finances.app; import android.app.Application; import android.content.Context; import android.content.SharedPreferences; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.database.sqlite.SQLiteDatabase; import android.text.TextUtils; import com.tfq.ad.ad.ADStateUtils; import com.tfq.ad.app.AdApp; import com.tfq.finances.core.constants.Constants; import com.tfq.finances.db.DaoMaster; import com.tfq.finances.db.DaoSession; import com.tfq.finances.db.db.GDOpenHelper; import com.tfq.demo.R; import com.tfq.finances.main.AdUtils; import com.tfq.library.app.BaseConstants; import com.tfq.library.app.LibraryApp; import com.tfq.library.utils.AppSigning; import com.tfq.library.utils.AppUtil; import com.tfq.library.utils.LogK; import com.tfq.library.utils.SpManager; import com.umeng.commonsdk.UMConfigure; import static com.tfq.ad.app.ADConstants.AD_CODE_BANNER; import static com.tfq.ad.app.ADConstants.AD_CODE_CQP; import static com.tfq.ad.app.ADConstants.AD_CODE_FEED1; import static com.tfq.ad.app.ADConstants.AD_CODE_REWARD; import static com.tfq.ad.app.ADConstants.AD_CODE_SPLASH; import static com.tfq.ad.app.ADConstants.AD_CSJID; public class App extends Application { public static Context mContext; public static App instance; public static DaoSession mSession; private String appid; //新增参数,固定值,后台app逻辑id,优化接口调用使用 private String appinfoId; private String csjId; private String umId; private String csjIdSplash, csjIdCQP, csjIdFeed1, csjIdFeed2, csjIdFeed3, csjIdReward, csjIdBanner, csjIdDraw; public static App getInstances() { return instance; } public static String getChannel() { try { PackageManager pm = mContext.getPackageManager(); ApplicationInfo appInfo = pm.getApplicationInfo(mContext.getPackageName(), PackageManager.GET_META_DATA); String umeng_channel = appInfo.metaData.getString("UMENG_C HANNEL"); if (umeng_channel != null) { return umeng_channel; } return "other"; } catch (PackageManager.NameNotFoundException ignored) { } return "other"; } public static Context getContext() { return mContext; } public static void setNavigationBarColor(String navigationBarColor) { BaseConstants.navigationBarColor = navigationBarColor; } @Override public void onCreate() { super.onCreate(); instance = this; mContext = getApplicationContext(); UMConfigure.preInit(mContext, getUmId(), getChannel()); // AppUtil.getPublicKey(AppUtil.getSign(mContext)); // LogK.e(GetPublicKey.getSignInfo(mContext)); initDb(); // setNavigationBarColor("#ffffff"); agreeSercurity(); LogK.e("APP_INFO: " + "\n" + AppSigning.getSha1(this) + "\n" + AppUtil.getPackageName(mContext) + "\n" + getChannel() + "\n" + getCsjId() + "\n" + mContext.getResources().getString(R.string.app_name) + "\n" + AppUtil.getAppVersionName(mContext) + "\n" + AppUtil.getAppVersionCode(mContext) + "\n" ); } private void initDb() { try { GDOpenHelper gdOpenHelper = new GDOpenHelper(this, "tfq.db"); SQLiteDatabase db = gdOpenHelper.getWritableDatabase(); DaoMaster daoMaster = new DaoMaster(db); mSession = daoMaster.newSession(); } catch (Exception e) { e.printStackTrace(); } } public DaoSession getDaoSession() { return mSession; } public String getUmId() { if (TextUtils.isEmpty(umId)) { umId = mContext.getResources().getString(R.string.umId); } return umId; } public String getAppid() { if (TextUtils.isEmpty(appid)) { appid = mContext.getResources().getString(R.string.appid); } return appid; } /** * 获取appinfoId * * @return */ public String getAppinfoId() { if (TextUtils.isEmpty(appinfoId)) { appinfoId = mContext.getResources().getString(R.string.appinfoId); } return appinfoId; } public String getCsjId() { if (TextUtils.isEmpty(csjId)) { csjId = mContext.getResources().getString(R.string.csjId); } return csjId; } public void agreeSercurity() { SharedPreferences sharedPreferences = SpManager.startRead(mContext, Constants.SP_NAME); boolean openNoFirst = sharedPreferences.getBoolean("no_first_open", false); if (openNoFirst) { init_BaseLibrary(); init_ADLibrary(); UMConfigure.init(this, getUmId(), getChannel(), UMConfigure.DEVICE_TYPE_PHONE, ""); } } private void init_BaseLibrary() { new LibraryApp.Builder(this) .addSlot(BaseConstants.LOG_PRINT, String.valueOf(Constants.APP_DEBUG_PRINT)) .addSlot(BaseConstants.ANIMATION_SKIP,"1") .initialize(); } private void init_ADLibrary() { new AdApp.Builder(this, Constants.APP_NAME, getChannel(), getAppSplash()) .addSlot(AD_CSJID, getCsjId()) // CSJID .addSlot(AD_CODE_SPLASH, getCsjIdSplash()) // 添加横幅广告位 .addSlot(AD_CODE_CQP, getCsjIdCQP()) // 插全屏广告位 .addSlot(AD_CODE_REWARD, getCsjIdReward()) // 激励视频广告位 .addSlot(AD_CODE_FEED1, getCsjIdFeed1()) // 信息流1广告位 .addSlot(AD_CODE_BANNER, getCsjIdBanner()) // banner广告位 .initialize(); ADStateUtils.setSwitchRequestListener(new ADStateUtils.SwitchRequestListener() { @Override public void onSwitchRequestChanged() { AdUtils.getAdvFlag(); } }); } @Override protected void attachBaseContext(Context base) { super.attachBaseContext(base); } public String getCsjIdSplash() { if (TextUtils.isEmpty(csjIdSplash)) { csjIdSplash = mContext.getResources().getString(R.string.csjIdSplash); } return csjIdSplash; } public String getCsjIdCQP() { if (TextUtils.isEmpty(csjIdCQP)) { csjIdCQP = mContext.getResources().getString(R.string.csjIdCQP); } return csjIdCQP; } public String getCsjIdFeed1() { if (TextUtils.isEmpty(csjIdFeed1)) { csjIdFeed1 = mContext.getResources().getString(R.string.csjIdFeed1); } return csjIdFeed1; } public String getCsjIdFeed2() { if (TextUtils.isEmpty(csjIdFeed2)) { csjIdFeed2 = mContext.getResources().getString(R.string.csjIdFeed2); } return csjIdFeed2; } public String getCsjIdFeed3() { if (TextUtils.isEmpty(csjIdFeed3)) { csjIdFeed3 = mContext.getResources().getString(R.string.csjIdFeed3); } return csjIdFeed3; } public String getCsjIdReward() { if (TextUtils.isEmpty(csjIdReward)) { csjIdReward = mContext.getResources().getString(R.string.csjIdReward); } return csjIdReward; } public String getCsjIdBanner() { if (TextUtils.isEmpty(csjIdBanner)) { csjIdBanner = mContext.getResources().getString(R.string.csjIdBanner); } return csjIdBanner; } public String getCsjIdDraw() { if (TextUtils.isEmpty(csjIdDraw)) { csjIdDraw = mContext.getResources().getString(R.string.csjIdDraw); } return csjIdDraw; } public boolean isNeedLogin() { return mContext.getResources().getBoolean(R.bool.need_login); } public int getAppSplash() { return R.drawable.app_splash; } } \ No newline at end of file diff --git a/app/src/main/java/com/tfq/finances/main/fragment/Fm_Page_A.java b/app/src/main/java/com/tfq/finances/main/fragment/Fm_Page_A.java index b3fd660..9f8c009 100644 --- a/app/src/main/java/com/tfq/finances/main/fragment/Fm_Page_A.java +++ b/app/src/main/java/com/tfq/finances/main/fragment/Fm_Page_A.java @@ -1,21 +1,30 @@ package com.tfq.finances.main.fragment; import android.annotation.SuppressLint; +import android.content.Intent; import android.graphics.Bitmap; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.view.View; +import android.widget.FrameLayout; import android.widget.ImageView; +import android.widget.LinearLayout; import com.bumptech.glide.Glide; import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.transition.Transition; -import com.tfq.finances.app.App; +import com.tfq.ad.ad.AdBannerUtils; +import com.tfq.ad.ad.AdCQPUtils; +import com.tfq.ad.ad.AdFeedUtils; +import com.tfq.ad.ad.AdRewardUtils; +import com.tfq.ad.ad.activity.AdSplashActivity; import com.tfq.demo.R; +import com.tfq.finances.app.App; import com.tfq.finances.utils.BitmapUtils; import com.tfq.library.base.BaseFragment; +import com.tfq.library.utils.ToasterUtil; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -23,6 +32,8 @@ import androidx.core.content.ContextCompat; public class Fm_Page_A extends BaseFragment { + private FrameLayout fl_content; + @Override protected int getLayoutId() { return R.layout.fm_page_a; @@ -30,7 +41,17 @@ public class Fm_Page_A extends BaseFragment { @Override protected void initView() { - + fl_content = findViewBy_Id(R.id.fl_content); + LinearLayout ll0 = findViewBy_Id(R.id.ll_0); + LinearLayout ll1 = findViewBy_Id(R.id.ll_1); + LinearLayout ll2 = findViewBy_Id(R.id.ll_2); + LinearLayout ll3 = findViewBy_Id(R.id.ll_3); + LinearLayout ll4 = findViewBy_Id(R.id.ll_4); + ll0.setOnClickListener(this::onClick); + ll1.setOnClickListener(this::onClick); + ll2.setOnClickListener(this::onClick); + ll3.setOnClickListener(this::onClick); + ll4.setOnClickListener(this::onClick); } @Override @@ -79,9 +100,23 @@ public class Fm_Page_A extends BaseFragment { public void onClick(View view) { int viewId = view.getId(); -// if (viewId == R.id.iv_add) { -// -// } + if (viewId == R.id.ll_0) { + Intent intent = new Intent(requireActivity(), AdSplashActivity.class); + startActivity(intent); + } else if (viewId == R.id.ll_1) { + new AdCQPUtils().init(requireActivity()); + } else if (viewId == R.id.ll_2) { + new AdRewardUtils(requireActivity(), new AdRewardUtils.Listener() { + @Override + public void success(boolean b) { + ToasterUtil.show(b ? "获取奖励成功" : "获取奖励失败"); + } + }).init(requireActivity()); + } else if (viewId == R.id.ll_3) { + AdFeedUtils.show_ad(getActivity(), App.getInstances().getCsjIdFeed1(), fl_content,20, "page_01",1); + } else if (viewId == R.id.ll_4) { + AdBannerUtils.show_ad(getActivity(), fl_content); + } } } diff --git a/app/src/main/java/com/tfq/finances/main/fragment/Fm_Page_S.java b/app/src/main/java/com/tfq/finances/main/fragment/Fm_Page_S.java index d56f65c..ab9645e 100644 --- a/app/src/main/java/com/tfq/finances/main/fragment/Fm_Page_S.java +++ b/app/src/main/java/com/tfq/finances/main/fragment/Fm_Page_S.java @@ -37,6 +37,9 @@ import java.util.Objects; import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.contract.ActivityResultContracts; +import static android.view.View.GONE; +import static android.view.View.VISIBLE; + public class Fm_Page_S extends BaseFragment { private final ActivityResultLauncher moreSetting = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> { if (result.getResultCode() == Activity.RESULT_OK) { @@ -49,6 +52,7 @@ public class Fm_Page_S extends BaseFragment { private SlideDownView slide_down_view; private ImageView iv_avatar; private TextView tv_nickname; + private LinearLayout ll2; @Override protected int getLayoutId() { @@ -58,6 +62,11 @@ public class Fm_Page_S extends BaseFragment { @Override protected void initView() { iv_avatar = findViewBy_Id(R.id.iv_avatar); + LinearLayout ll0 = findViewBy_Id(R.id.ll_0); + ll0.setOnClickListener(this::onClick); + LinearLayout ll1 = findViewBy_Id(R.id.ll_1); + ll1.setOnClickListener(this::onClick); + ll2 = findViewBy_Id(R.id.ll_2); LinearLayout ll01 = findViewBy_Id(R.id.ll_01); ll01.setOnClickListener(this::onClick); LinearLayout ll02 = findViewBy_Id(R.id.ll_02); @@ -149,7 +158,15 @@ public class Fm_Page_S extends BaseFragment { Intent intent; int viewId = view.getId(); - if (viewId == R.id.ll_01) { + if (viewId == R.id.ll_0) { + slide_down_view.showFunctionBar(); + } else if (viewId == R.id.ll_1) { + if ((ll2.getVisibility() == GONE)) { + ll2.setVisibility(VISIBLE); + } else { + ll2.setVisibility(GONE); + } + } else if (viewId == R.id.ll_01) { intent = new Intent(getActivity(), Activity_Setting_More.class); moreSetting.launch(intent); animationStart(); diff --git a/app/src/main/res/layout/fm_page_a.xml b/app/src/main/res/layout/fm_page_a.xml index 48c790e..3177246 100644 --- a/app/src/main/res/layout/fm_page_a.xml +++ b/app/src/main/res/layout/fm_page_a.xml @@ -1,6 +1,5 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:orientation="vertical" + > @@ -13,272 +15,405 @@ android:layout_height="match_parent" android:layout_above="@+id/fl_content" android:layout_alignParentTop="true" - android:orientation="vertical"> + android:orientation="vertical" + > + android:paddingLeft="18dp" + android:paddingRight="18dp" + android:layout_marginLeft="15dp" + android:layout_marginRight="15dp" + > - - - - - + + android:layout_marginLeft="13dp" + android:text="自定义view测试" + android:textColor="#464545" + android:textSize="12sp" + android:textStyle="bold" + /> + android:layout_weight="1" + /> - - - - - - - + + + + + + + + + + + + + + android:visibility="gone" + > + android:paddingLeft="24dp" + > - + + + + + + android:layout_marginLeft="10dp" + android:ellipsize="end" + android:lines="1" + android:maxLength="30" + android:text="" + android:textColor="@color/black" + android:textSize="14sp" + android:textStyle="bold" + /> + android:layout_weight="1" + /> - + + + + + + + + android:layout_height="match_parent" + android:background="#F2F2F2" + android:orientation="vertical" + android:paddingLeft="10dp" + android:paddingRight="10dp" + > - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + - + airbnb:lottie_fileName="1234.json" + /> + android:layout_height="match_parent" + /> + android:layout_marginBottom="10dp" + /> \ No newline at end of file diff --git a/maven/com/chuangketie/jk/ad-lib/1.0.0/ad-lib-1.0.0.aar b/maven/com/chuangketie/jk/ad-lib/1.0.0/ad-lib-1.0.0.aar index 375bd58..a9f9a44 100644 Binary files a/maven/com/chuangketie/jk/ad-lib/1.0.0/ad-lib-1.0.0.aar and b/maven/com/chuangketie/jk/ad-lib/1.0.0/ad-lib-1.0.0.aar differ diff --git a/maven/com/chuangketie/jk/ad-lib/1.0.0/ad-lib-1.0.0.aar.md5 b/maven/com/chuangketie/jk/ad-lib/1.0.0/ad-lib-1.0.0.aar.md5 index cd42033..a38cdde 100644 --- a/maven/com/chuangketie/jk/ad-lib/1.0.0/ad-lib-1.0.0.aar.md5 +++ b/maven/com/chuangketie/jk/ad-lib/1.0.0/ad-lib-1.0.0.aar.md5 @@ -1 +1 @@ -dcccbac080f5741436ad85ae8e657051 \ No newline at end of file +31ae7795386ce894b560e3e83ad09240 \ No newline at end of file diff --git a/maven/com/chuangketie/jk/ad-lib/1.0.0/ad-lib-1.0.0.aar.sha1 b/maven/com/chuangketie/jk/ad-lib/1.0.0/ad-lib-1.0.0.aar.sha1 index 409378a..957e944 100644 --- a/maven/com/chuangketie/jk/ad-lib/1.0.0/ad-lib-1.0.0.aar.sha1 +++ b/maven/com/chuangketie/jk/ad-lib/1.0.0/ad-lib-1.0.0.aar.sha1 @@ -1 +1 @@ -b4a7e464a9f87c9e4ad7f02641263f975b8d1d66 \ No newline at end of file +e13f8c834e5755f7dc3ed51a31e0589da862e6f0 \ No newline at end of file diff --git a/maven/com/chuangketie/jk/ad-lib/1.0.0/ad-lib-1.0.0.aar.sha256 b/maven/com/chuangketie/jk/ad-lib/1.0.0/ad-lib-1.0.0.aar.sha256 index 0d2a34d..fc5c284 100644 --- a/maven/com/chuangketie/jk/ad-lib/1.0.0/ad-lib-1.0.0.aar.sha256 +++ b/maven/com/chuangketie/jk/ad-lib/1.0.0/ad-lib-1.0.0.aar.sha256 @@ -1 +1 @@ -4511ee6a275b8809146fe0f90f44196328a8f1596ef714c3cd640d50c1d8a6b7 \ No newline at end of file +ec8f2d1ad62d8fc249ce5e0d93bdb9fdcfde5e7ffe586a11ecef36f9cf3ee474 \ No newline at end of file diff --git a/maven/com/chuangketie/jk/ad-lib/1.0.0/ad-lib-1.0.0.aar.sha512 b/maven/com/chuangketie/jk/ad-lib/1.0.0/ad-lib-1.0.0.aar.sha512 index 41d0e4a..2a6d1bc 100644 --- a/maven/com/chuangketie/jk/ad-lib/1.0.0/ad-lib-1.0.0.aar.sha512 +++ b/maven/com/chuangketie/jk/ad-lib/1.0.0/ad-lib-1.0.0.aar.sha512 @@ -1 +1 @@ -65e4ddca936917c3c9926dfaf342f759e0dac6fc38abebff47cc87b8beb0fe63b1579dd93c832c1b844f51ce0ad19ec4f15a6fee08d24bc96c42d14335bd9684 \ No newline at end of file +cab6e2ab2ada9ddf2eabaac188e79a93707ffd61e1e19c2a44132076238cdf972b121ca220273fe8c7cddd380080be4d1fd34173930b0e2e1d07de431ef8d9c8 \ No newline at end of file diff --git a/maven/com/chuangketie/jk/ad-lib/maven-metadata.xml b/maven/com/chuangketie/jk/ad-lib/maven-metadata.xml index b9373de..b29c81e 100644 --- a/maven/com/chuangketie/jk/ad-lib/maven-metadata.xml +++ b/maven/com/chuangketie/jk/ad-lib/maven-metadata.xml @@ -8,6 +8,6 @@ 1.0.0 - 20250709075923 + 20250715070058 diff --git a/maven/com/chuangketie/jk/ad-lib/maven-metadata.xml.md5 b/maven/com/chuangketie/jk/ad-lib/maven-metadata.xml.md5 index 946120a..907c0a8 100644 --- a/maven/com/chuangketie/jk/ad-lib/maven-metadata.xml.md5 +++ b/maven/com/chuangketie/jk/ad-lib/maven-metadata.xml.md5 @@ -1 +1 @@ -b475cf6d51c8f0b2965700f4cee0e5e8 \ No newline at end of file +42ef1e8155ee361e3f69283439ed0bcb \ No newline at end of file diff --git a/maven/com/chuangketie/jk/ad-lib/maven-metadata.xml.sha1 b/maven/com/chuangketie/jk/ad-lib/maven-metadata.xml.sha1 index 70591ce..2d69aa0 100644 --- a/maven/com/chuangketie/jk/ad-lib/maven-metadata.xml.sha1 +++ b/maven/com/chuangketie/jk/ad-lib/maven-metadata.xml.sha1 @@ -1 +1 @@ -d3866672dff4d6f00f88503af6effeb8a422f0cc \ No newline at end of file +92943de8dff51ac76087ee199692bb8803954988 \ No newline at end of file diff --git a/maven/com/chuangketie/jk/ad-lib/maven-metadata.xml.sha256 b/maven/com/chuangketie/jk/ad-lib/maven-metadata.xml.sha256 index 264acc2..1b2e9a7 100644 --- a/maven/com/chuangketie/jk/ad-lib/maven-metadata.xml.sha256 +++ b/maven/com/chuangketie/jk/ad-lib/maven-metadata.xml.sha256 @@ -1 +1 @@ -ef19c7ead094facc61d5db6d87208c061de084e951e8ccc8a9e450ddf8a0443e \ No newline at end of file +014a4db2ef2adc743ce443bd17b7f22bfff180b08b6c67a7dea659303c2489e0 \ No newline at end of file diff --git a/maven/com/chuangketie/jk/ad-lib/maven-metadata.xml.sha512 b/maven/com/chuangketie/jk/ad-lib/maven-metadata.xml.sha512 index e9d20d8..fc60e1e 100644 --- a/maven/com/chuangketie/jk/ad-lib/maven-metadata.xml.sha512 +++ b/maven/com/chuangketie/jk/ad-lib/maven-metadata.xml.sha512 @@ -1 +1 @@ -f5f41e8dfd6d18e78601fe02e2a049f2599149c5704ae1543269201cbfb48a06f71154268fa3c5ce1a56acb219f75d2a71820b696b0e0735d91ac5762ef2af6c \ No newline at end of file +52c2104c116dec62436971da840fe2a20da6eedafbfb38ed5e572b3ed0ebfce15d44814e5d2df91d4993269902b07a86bdecc6446d46d10e4f8a5371a82a5201 \ No newline at end of file diff --git a/maven/com/chuangketie/jk/base-lib/maven-metadata.xml b/maven/com/chuangketie/jk/base-lib/maven-metadata.xml index 64d4d43..f74f7bb 100644 --- a/maven/com/chuangketie/jk/base-lib/maven-metadata.xml +++ b/maven/com/chuangketie/jk/base-lib/maven-metadata.xml @@ -8,6 +8,6 @@ 1.0.0 - 20250709085547 + 20250715070055 diff --git a/maven/com/chuangketie/jk/base-lib/maven-metadata.xml.md5 b/maven/com/chuangketie/jk/base-lib/maven-metadata.xml.md5 index c5372df..eb0352a 100644 --- a/maven/com/chuangketie/jk/base-lib/maven-metadata.xml.md5 +++ b/maven/com/chuangketie/jk/base-lib/maven-metadata.xml.md5 @@ -1 +1 @@ -75910bb2eb75453eb2a08d613fef738f \ No newline at end of file +63c83b472d4cf7dccd156aca6de41507 \ No newline at end of file diff --git a/maven/com/chuangketie/jk/base-lib/maven-metadata.xml.sha1 b/maven/com/chuangketie/jk/base-lib/maven-metadata.xml.sha1 index 55408cc..c20a555 100644 --- a/maven/com/chuangketie/jk/base-lib/maven-metadata.xml.sha1 +++ b/maven/com/chuangketie/jk/base-lib/maven-metadata.xml.sha1 @@ -1 +1 @@ -d483ab25d875f84892ef0f48ad614db6b80cf02c \ No newline at end of file +3b1ab9df76f2cf00ec4a94987f6e3832934aada6 \ No newline at end of file diff --git a/maven/com/chuangketie/jk/base-lib/maven-metadata.xml.sha256 b/maven/com/chuangketie/jk/base-lib/maven-metadata.xml.sha256 index 23929c5..b3efd0d 100644 --- a/maven/com/chuangketie/jk/base-lib/maven-metadata.xml.sha256 +++ b/maven/com/chuangketie/jk/base-lib/maven-metadata.xml.sha256 @@ -1 +1 @@ -5062af5a0f440c321b9071bebe6eb8c043f5279b66bf3e394fe7dd1e02d111e8 \ No newline at end of file +3e6e6d08bac26ad2e8d15264db1fa21060e86085fa94a423c46eb9ec7bd4c5fe \ No newline at end of file diff --git a/maven/com/chuangketie/jk/base-lib/maven-metadata.xml.sha512 b/maven/com/chuangketie/jk/base-lib/maven-metadata.xml.sha512 index 36009df..216b15c 100644 --- a/maven/com/chuangketie/jk/base-lib/maven-metadata.xml.sha512 +++ b/maven/com/chuangketie/jk/base-lib/maven-metadata.xml.sha512 @@ -1 +1 @@ -6377b9313f1df1634a13a2e49839ffbfbc693da505ee3b91ff36b8db56fc35accc443d37c6aee1530bf43367b9cb087784cff16a868f68e3f8d5b649e508c8ae \ No newline at end of file +b3c41304e3c497c7578206ee7bbbca8aa8be0e6e099c6b0a068eafa05d0e4005939bc46fdae0b414933294822575ca0474a33ddd13b1d1010cac4fdba274c98d \ No newline at end of file