Commit d18b5696 authored by mengcuiguang's avatar mengcuiguang

代码优化

parent 1f2a0a88
...@@ -9,8 +9,8 @@ android { ...@@ -9,8 +9,8 @@ android {
applicationId "com.wenshu.youyou" applicationId "com.wenshu.youyou"
minSdkVersion rootProject.ext.androidMinSdkVersion minSdkVersion rootProject.ext.androidMinSdkVersion
targetSdkVersion rootProject.ext.androidTargetSdkVersion targetSdkVersion rootProject.ext.androidTargetSdkVersion
versionCode 6 versionCode 7
versionName "1.0.6" versionName "1.0.7"
flavorDimensions "default" flavorDimensions "default"
// dex突破65535的限制 // dex突破65535的限制
......
...@@ -106,13 +106,13 @@ class SettingsActivity : BaseActivity(), View.OnClickListener, OnLoginListener, ...@@ -106,13 +106,13 @@ class SettingsActivity : BaseActivity(), View.OnClickListener, OnLoginListener,
item_wechat.findViewById<TextView>(R.id.tv_right).text = "未授权" item_wechat.findViewById<TextView>(R.id.tv_right).text = "未授权"
} }
item_invitedCode.findViewById<TextView>(R.id.tv_title).text = "邀请码" item_invitedCode.findViewById<TextView>(R.id.tv_title).text = "用户ID"
val invitedCode = resources.getDrawable(R.mipmap.icon_settings_invite) val invitedCode = resources.getDrawable(R.mipmap.icon_settings_invite)
invitedCode.setBounds(0, 0, 56, 56) invitedCode.setBounds(0, 0, 56, 56)
item_invitedCode.findViewById<TextView>(R.id.tv_title).setCompoundDrawables(invitedCode, null, null, null) item_invitedCode.findViewById<TextView>(R.id.tv_title).setCompoundDrawables(invitedCode, null, null, null)
item_invitedCode.findViewById<TextView>(R.id.tv_right).visibility = View.VISIBLE item_invitedCode.findViewById<TextView>(R.id.tv_right).visibility = View.VISIBLE
item_invitedCode.findViewById<ImageView>(R.id.iv_right).visibility = View.GONE item_invitedCode.findViewById<ImageView>(R.id.iv_right).visibility = View.GONE
item_invitedCode.findViewById<TextView>(R.id.tv_right).text = UserManager.getInstance().codeID item_invitedCode.findViewById<TextView>(R.id.tv_right).text = "YY-"+UserManager.getInstance().codeID
item_cleanCache.findViewById<TextView>(R.id.tv_title).text = "清理缓存" item_cleanCache.findViewById<TextView>(R.id.tv_title).text = "清理缓存"
val cleanCache = ContextCompat.getDrawable(this,R.mipmap.icon_settings_clean) val cleanCache = ContextCompat.getDrawable(this,R.mipmap.icon_settings_clean)
......
...@@ -34,6 +34,9 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Base ...@@ -34,6 +34,9 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Base
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
if (android.os.Build.VERSION.SDK_INT != Build.VERSION_CODES.O) { if (android.os.Build.VERSION.SDK_INT != Build.VERSION_CODES.O) {
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
} }
......
...@@ -235,8 +235,6 @@ class MainFragment : BaseFragment(), HomeView, View.OnClickListener { ...@@ -235,8 +235,6 @@ class MainFragment : BaseFragment(), HomeView, View.OnClickListener {
// 设置视频权重 // 设置视频权重
UserWeight.initAdWeight(data) UserWeight.initAdWeight(data)
// 设置视频权重
UserWeight.initAdWeight(data)
initExpress(data.flowAdRules) initExpress(data.flowAdRules)
// 调用金币视频信息接口 // 调用金币视频信息接口
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
android:nestedScrollingEnabled="false" android:nestedScrollingEnabled="false"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
<!-- <include layout="@layout/item_fragment_main_my_customer_service" />--> <include layout="@layout/item_fragment_main_my_customer_service" />
</LinearLayout> </LinearLayout>
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:paddingTop="10dp" android:paddingTop="10dp"
android:visibility="gone"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:text="官方QQ群(点击咨询):" /> android:text="官方QQ群(点击咨询):" />
...@@ -16,14 +17,16 @@ ...@@ -16,14 +17,16 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:visibility="gone"
android:layout_marginBottom="10dp" /> android:layout_marginBottom="10dp" />
<TextView <TextView
android:layout_marginTop="10dp"
android:id="@+id/item_bottom_info" android:id="@+id/item_bottom_info"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginBottom="20dp" android:layout_marginBottom="20dp"
android:text="请关注公众号:金币宝箱,获取更多赚钱资讯" /> android:text="请关注公众号:淘金空间,获取更多赚钱资讯" />
</merge> </merge>
\ 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