yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

隐私协议UI修改

Browse Source 
app参数修改
动态闪退bug fix
This commit is contained in:
huangjian
2021-01-12 15:03:24 +08:00
parent 5058072fc7
commit 8aec6cff7c
6 changed files with 38 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/yizhuan/erban/application/XChatApplication.java
View File

@@ -12,7 +12,6 @@ import android.net.http.HttpResponseCache;
import android.os.Build;
import android.os.Environment;
import android.os.StrictMode;
import android.taobao.windvane.base.ILogService;
import android.text.TextUtils;
import android.util.ArrayMap;
import android.util.Log;
@@ -20,7 +19,6 @@ import android.util.Log;
import androidx.multidex.MultiDex;
import com.alibaba.security.realidentity.RPVerify;
import com.alibaba.security.rp.RPSDK;
import com.baidu.mobstat.StatService;
import com.bumptech.glide.request.target.ViewTarget;
import com.coorchice.library.utils.LogUtils;
@@ -641,7 +639,7 @@ public class XChatApplication extends Application {
Map<String, String> httpParams = new ArrayMap<>();
httpParams.put("os", "android");
httpParams.put("osVersion", Build.VERSION.RELEASE);
httpParams.put("app", "PlanetStar");
httpParams.put("app", "yinyou");
httpParams.put("ispType", String.valueOf(SystemUtils.getIspType(context)));
httpParams.put("netType", String.valueOf(SystemUtils.getNetworkType(context)));
httpParams.put("model", SystemUtils.getPhoneModel());

5
app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java
View File

@@ -12,6 +12,7 @@ import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.text.style.ForegroundColorSpan;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
@@ -203,7 +204,7 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
HomeMoreRoomActivity.start(mContext);
break;
case R.id.iv_me:
EventBus.getDefault().post(new ShowMeEvent());
EventBus.getDefault().post(new ShowMeEvent());
break;
}
}
@@ -705,7 +706,7 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
if (!TextUtils.isEmptyText(userInfo.getNick())) {
getRoomShortcut();
getHomeConcern();
ImageLoadUtilsV2.loadAvatar(mBinding.ivMe,userInfo.getAvatar());
ImageLoadUtilsV2.loadAvatar(mBinding.ivMe, userInfo.getAvatar());
}
}

3
app/src/main/java/com/yizhuan/erban/other/dialog/PrivacyAgreementDialog.java
View File

@@ -41,7 +41,6 @@ public class PrivacyAgreementDialog extends Dialog implements View.OnClickListen
setContentView(R.layout.dialog_privacy_agreement);
findViewById(R.id.tv_confirm).setOnClickListener(this);
findViewById(R.id.tv_cancel).setOnClickListener(this);
TextView tvDesc = findViewById(R.id.tv_desc);
String privacyAgreementTip = getContext().getString(R.string.tip_privacy_agreement);
@@ -81,7 +80,7 @@ public class PrivacyAgreementDialog extends Dialog implements View.OnClickListen
lp.width = (int) (screenWidth * .855 + .5f);
lp.gravity = Gravity.CENTER;
lp.height = UIUtil.dip2px(getContext(), 500);
lp.height = UIUtil.dip2px(getContext(), 425);
window.setAttributes(lp);
window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));

2
app/src/main/java/com/yizhuan/erban/ui/webview/JSInterface.java
View File

@@ -410,7 +410,7 @@ public class JSInterface {
JSONObject jsonObject = new JSONObject();
jsonObject.put("os", "android");
jsonObject.put("osVersion", Build.VERSION.RELEASE);
jsonObject.put("app", "tutu");
jsonObject.put("app", "yinyou");
jsonObject.put("ispType", String.valueOf(SystemUtils.getIspType(context)));
jsonObject.put("netType", String.valueOf(SystemUtils.getNetworkType(context)));
jsonObject.put("model", SystemUtils.getPhoneModel());

85
app/src/main/res/layout/dialog_privacy_agreement.xml
View File

@@ -7,90 +7,67 @@
android:background="@drawable/shape_dialog_privacy_agreement_bg"
android:orientation="vertical"
android:paddingTop="24dp"
tools:context="com.yizhuan.erban.other.dialog.PrivacyAgreementDialog">
tools:context="com.yizhuan.erban.other.dialog.PrivacyAgreementDialog"
tools:layout_height="420dp"
tools:layout_width="320dp">
<ScrollView
android:layout_weight="1"
android:layout_width="match_parent"
android:layout_height="0dp">
android:layout_height="0dp"
android:layout_weight="1">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="“音游”隐私政策"
android:text="音游私政策"
android:textColor="#ff1b1b1b"
android:textSize="16sp"
android:textSize="18sp"
android:textStyle="bold" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="33dp"
android:layout_marginStart="25dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="33dp"
android:lineSpacingExtra="5dp"
android:layout_marginEnd="25dp"
android:lineSpacingExtra="3dp"
android:text="@string/tip_privacy_agreement_content"
android:textColor="@color/color_333333" />
android:textColor="@color/color_999999" />
<TextView
android:id="@+id/tv_desc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="33dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="33dp"
android:lineSpacingExtra="5dp"
android:layout_marginStart="25dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="25dp"
android:lineSpacingExtra="3dp"
android:text="@string/tip_privacy_agreement_desc"
android:textColor="#1b1b1b" />
android:textColor="@color/color_999999" />
</LinearLayout>
</ScrollView>
<View
android:layout_width="match_parent"
android:layout_height=".5dp"
android:layout_marginTop="25dp"
android:background="@color/color_ebebeb" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50">
<TextView
android:id="@+id/tv_confirm"
android:layout_width="160dp"
android:layout_height="36dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="20dp"
android:layout_marginBottom="20dp"
android:background="@drawable/common_btn_bg"
android:gravity="center"
android:minHeight="50dp"
android:text="同意"
android:textColor="@color/white"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_cancel"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/selector_dialog_privacy_agreement_left_btn_bg"
android:gravity="center"
android:minHeight="50dp"
android:text="不同意"
android:textColor="@color/color_333333"
android:textSize="16sp" />
<View
android:layout_width="1px"
android:layout_height="50dp"
android:background="@color/color_ebebeb" />
<TextView
android:id="@+id/tv_confirm"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/selector_dialog_privacy_agreement_right_btn_bg"
android:gravity="center"
android:minHeight="50dp"
android:text="同意"
android:textColor="@color/appColor"
android:textSize="16sp" />
</LinearLayout>
</LinearLayout>

1
app/src/module_community/java/com/yizhuan/erban/community/square/adapter/SquareDynamicAdapter.java
View File

@@ -69,6 +69,7 @@ public class SquareDynamicAdapter extends BaseQuickAdapter<WorldDynamicBean, Bas
public SquareDynamicAdapter(Context context) {
super(R.layout.item_square_dynamic);
this.context = context;
iconWidth = UIUtil.dip2px(context, 32);
iconHeight = UIUtil.dip2px(context, 15);
imageTmHasText = UIUtil.dip2px(context, 12f);