Commit e33a3de9 by sikang

AutoSize

parent 76b4eca5
...@@ -19,11 +19,11 @@ import com.scwang.smartrefresh.layout.header.ClassicsHeader; ...@@ -19,11 +19,11 @@ import com.scwang.smartrefresh.layout.header.ClassicsHeader;
import com.tencent.bugly.crashreport.CrashReport; import com.tencent.bugly.crashreport.CrashReport;
import cn.fraudmetrix.octopus.aspirit.main.OctopusManager; import cn.fraudmetrix.octopus.aspirit.main.OctopusManager;
import tech.starwin.network.Gateway; import tech.starwin.network.Gateway;
import tech.starwin.utils.FireBaseHelper; import tech.starwin.utils.FireBaseHelper;
import tech.starwin.utils.PreferencesManager; import tech.starwin.utils.PreferencesManager;
import tech.starwin.utils.ScreenAutoSize;
import tech.starwin.utils.collection.UploadManager; import tech.starwin.utils.collection.UploadManager;
import zendesk.core.AnonymousIdentity; import zendesk.core.AnonymousIdentity;
import zendesk.core.Zendesk; import zendesk.core.Zendesk;
...@@ -50,6 +50,7 @@ public class LibConfig { ...@@ -50,6 +50,7 @@ public class LibConfig {
public static String FLAVOR_default; public static String FLAVOR_default;
public static String FLAVOR_server; public static String FLAVOR_server;
public static String AGREEMENT_URL; public static String AGREEMENT_URL;
public static String REPAYMENT_H5;
public static String APP_URL; public static String APP_URL;
public static String BUGLY_APP_ID; public static String BUGLY_APP_ID;
public static String PRIVACY_POLICY; public static String PRIVACY_POLICY;
...@@ -91,6 +92,8 @@ public class LibConfig { ...@@ -91,6 +92,8 @@ public class LibConfig {
public static void initLib(Application application) { public static void initLib(Application application) {
if (application != null) { if (application != null) {
CONTEXT = application; CONTEXT = application;
//屏幕适配(360dp宽度限定)
ScreenAutoSize.resizeDensity(CONTEXT, 360f);
//上传工具 //上传工具
UploadManager.init(CONTEXT); UploadManager.init(CONTEXT);
......
...@@ -86,7 +86,7 @@ public abstract class BaseActivity extends AppCompatActivity implements IView { ...@@ -86,7 +86,7 @@ public abstract class BaseActivity extends AppCompatActivity implements IView {
@Override @Override
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
ScreenAutoSize.resizeDensity(this, 360f); // ScreenAutoSize.getInstance().resizeDensity(this, 360f);
TAG = getClass().getSimpleName(); TAG = getClass().getSimpleName();
lifecycleSubject.onNext(ActivityEvent.CREATE); lifecycleSubject.onNext(ActivityEvent.CREATE);
progressDialog = new ProgressDialog(this); progressDialog = new ProgressDialog(this);
......
...@@ -26,6 +26,7 @@ public class Gateway { ...@@ -26,6 +26,7 @@ public class Gateway {
LibConfig.GATEWAY_HOST_G1); LibConfig.GATEWAY_HOST_G1);
gatewayInfo.rest = Arrays.asList(LibConfig.API_BASE_URL); gatewayInfo.rest = Arrays.asList(LibConfig.API_BASE_URL);
gatewayInfo.privacy = Arrays.asList(LibConfig.AGREEMENT_URL); gatewayInfo.privacy = Arrays.asList(LibConfig.AGREEMENT_URL);
gatewayInfo.repay = Arrays.asList(LibConfig.REPAYMENT_H5);
gatewayInfo.admin = Arrays.asList(LibConfig.ADMIN_HOST); gatewayInfo.admin = Arrays.asList(LibConfig.ADMIN_HOST);
gatewayInfo.harvester = Arrays.asList(LibConfig.HARVESTER_IP + ":" + LibConfig.HARVESTER_PORT); gatewayInfo.harvester = Arrays.asList(LibConfig.HARVESTER_IP + ":" + LibConfig.HARVESTER_PORT);
} }
......
...@@ -5,19 +5,22 @@ import android.content.Context; ...@@ -5,19 +5,22 @@ import android.content.Context;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import tech.starwin.LibConfig;
/** /**
* Created by SiKang on 2018/11/22. * Created by SiKang on 2018/11/22.
*/ */
public class ScreenAutoSize { public class ScreenAutoSize {
public static void resizeDensity(Context context, float dpi) { public static void resizeDensity(Context context, float dpi) {
DisplayMetrics displayMetrics = context.getApplicationContext().getResources().getDisplayMetrics(); DisplayMetrics displayMetrics = LibConfig.getContext().getResources().getDisplayMetrics();
float density = displayMetrics.density; float density = displayMetrics.density;
final float[] scalldensity = {displayMetrics.scaledDensity}; final float[] scalldensity = {displayMetrics.scaledDensity};
context.getApplicationContext().registerComponentCallbacks(new ComponentCallbacks() { context.registerComponentCallbacks(new ComponentCallbacks() {
@Override @Override
public void onConfigurationChanged(Configuration newConfig) { public void onConfigurationChanged(Configuration newConfig) {
if (newConfig != null && newConfig.fontScale > 0) { if (newConfig != null && newConfig.fontScale > 0) {
scalldensity[0] = context.getApplicationContext().getResources().getDisplayMetrics().scaledDensity; scalldensity[0] = context.getResources().getDisplayMetrics().scaledDensity;
} }
} }
...@@ -31,9 +34,6 @@ public class ScreenAutoSize { ...@@ -31,9 +34,6 @@ public class ScreenAutoSize {
displayMetrics.density = targetDensity; displayMetrics.density = targetDensity;
displayMetrics.scaledDensity = targetScallDensity; displayMetrics.scaledDensity = targetScallDensity;
displayMetrics.densityDpi = targetDensityDpi; displayMetrics.densityDpi = targetDensityDpi;
DisplayMetrics thisDisplayMetrics = context.getResources().getDisplayMetrics();
thisDisplayMetrics.density = targetDensity;
thisDisplayMetrics.scaledDensity = targetScallDensity;
thisDisplayMetrics.densityDpi = targetDensityDpi;
} }
} }
...@@ -90,7 +90,7 @@ public class StringFormat { ...@@ -90,7 +90,7 @@ public class StringFormat {
ObjectOutputStream objectOutputStream = null; ObjectOutputStream objectOutputStream = null;
objectOutputStream = new ObjectOutputStream(byteArrayOutputStream); objectOutputStream = new ObjectOutputStream(byteArrayOutputStream);
objectOutputStream.writeObject(obj); objectOutputStream.writeObject(obj);
return base64(byteArrayOutputStream.toByteArray(),Base64.DEFAULT); return base64(byteArrayOutputStream.toByteArray(), Base64.DEFAULT);
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
...@@ -127,7 +127,7 @@ public class StringFormat { ...@@ -127,7 +127,7 @@ public class StringFormat {
/** /**
* String转base64 * String转base64
*/ */
public static String base64(byte[] bytes,int flag) { public static String base64(byte[] bytes, int flag) {
if (bytes != null && bytes.length > 0) if (bytes != null && bytes.length > 0)
return Base64.encodeToString(bytes, flag); return Base64.encodeToString(bytes, flag);
else else
...@@ -209,4 +209,9 @@ public class StringFormat { ...@@ -209,4 +209,9 @@ public class StringFormat {
} }
public static int dpToPx(Context context, float dp) {
return (int) (context.getApplicationContext().getResources().getDisplayMetrics().densityDpi / 160 * dp);
}
} }
...@@ -25,6 +25,7 @@ import com.qmuiteam.qmui.widget.grouplist.QMUIGroupListView; ...@@ -25,6 +25,7 @@ import com.qmuiteam.qmui.widget.grouplist.QMUIGroupListView;
import tech.starwin.R; import tech.starwin.R;
import tech.starwin.utils.BitmapUtils; import tech.starwin.utils.BitmapUtils;
import tech.starwin.utils.format_utils.StringFormat;
import tech.starwin.widget.PageStateLayout; import tech.starwin.widget.PageStateLayout;
import tech.starwin.widget.TopBar; import tech.starwin.widget.TopBar;
...@@ -40,7 +41,7 @@ public class QMUIHelper { ...@@ -40,7 +41,7 @@ public class QMUIHelper {
* 当没有合适尺寸的图片使用时,将图片强制缩放到适合的尺寸 * 当没有合适尺寸的图片使用时,将图片强制缩放到适合的尺寸
*/ */
public static ImageButton resizeTopbarBtn(ImageButton imageButton) { public static ImageButton resizeTopbarBtn(ImageButton imageButton) {
int width = (int) imageButton.getContext().getResources().getDimension(R.dimen.x_50); int width = StringFormat.dpToPx(imageButton.getContext(), 17f);
Bitmap bmp = BitmapUtils.drawableToBmp(imageButton.getDrawable()); Bitmap bmp = BitmapUtils.drawableToBmp(imageButton.getDrawable());
imageButton.setImageBitmap(BitmapUtils.scaleBitmap(bmp, width, width)); imageButton.setImageBitmap(BitmapUtils.scaleBitmap(bmp, width, width));
imageButton.setScaleType(ImageView.ScaleType.CENTER_INSIDE); imageButton.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
android:id="@+id/activity_policy_webview" android:id="@+id/activity_policy_webview"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_margin="@dimen/x_40" android:layout_margin="13dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@color/white" /> android:background="@color/white" />
...@@ -34,15 +34,15 @@ ...@@ -34,15 +34,15 @@
<CheckBox <CheckBox
android:id="@+id/activity_policy_checkbox" android:id="@+id/activity_policy_checkbox"
android:layout_width="@dimen/x_80" android:layout_width="26dp"
android:layout_height="@dimen/x_80" /> android:layout_height="26dp" />
<TextView <TextView
android:id="@+id/activity_policy_agreement_tv" android:id="@+id/activity_policy_agreement_tv"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/x_15" android:layout_marginLeft="5dp"
android:tag="read_policy" android:tag="read_policy"
android:text="@string/i_agree_this_policy" /> android:text="@string/i_agree_this_policy" />
</LinearLayout> </LinearLayout>
...@@ -52,6 +52,6 @@ ...@@ -52,6 +52,6 @@
style="@style/main_color_roundBtn" style="@style/main_color_roundBtn"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/x_50" android:layout_margin="16dp"
android:text="@string/button_ok" /> android:text="@string/button_ok" />
</LinearLayout> </LinearLayout>
\ No newline at end of file
...@@ -46,9 +46,9 @@ ...@@ -46,9 +46,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_margin="@dimen/x_20" android:layout_margin="6dp"
android:paddingBottom="@dimen/x_50" android:paddingBottom="16dp"
android:paddingTop="@dimen/x_50" android:paddingTop="16dp"
android:text="@string/take_ktp_tip_footer" android:text="@string/take_ktp_tip_footer"
android:textColor="@color/white" /> android:textColor="@color/white" />
...@@ -63,9 +63,9 @@ ...@@ -63,9 +63,9 @@
<com.qmuiteam.qmui.widget.QMUIVerticalTextView <com.qmuiteam.qmui.widget.QMUIVerticalTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_margin="@dimen/x_20" android:layout_margin="6dp"
android:paddingBottom="@dimen/x_50" android:paddingBottom="16dp"
android:paddingTop="@dimen/x_50" android:paddingTop="16dp"
android:text="@string/take_ktp_tip_header" android:text="@string/take_ktp_tip_header"
android:textColor="@color/white" /> android:textColor="@color/white" />
...@@ -87,8 +87,8 @@ ...@@ -87,8 +87,8 @@
<ImageView <ImageView
android:id="@+id/button_shoot" android:id="@+id/button_shoot"
android:layout_width="@dimen/x_200" android:layout_width="66dp"
android:layout_height="@dimen/x_200" android:layout_height="66dp"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:rotation="90" /> android:rotation="90" />
......
...@@ -3,18 +3,15 @@ ...@@ -3,18 +3,15 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@android:color/transparent"> android:background="@android:color/transparent">
<TextView
android:layout_width="@dimen/x_500"
android:layout_height="@dimen/x_500" />
<ImageView <ImageView
android:id="@+id/progress_dialog_loadingImv" android:id="@+id/progress_dialog_loadingImv"
android:layout_width="@dimen/x_200" android:layout_width="66dp"
android:layout_height="@dimen/x_200" android:layout_height="66dp"
android:layout_centerInParent="true" /> android:layout_centerInParent="true" />
<ImageView <ImageView
android:id="@+id/progress_dialog_iconImv" android:id="@+id/progress_dialog_iconImv"
android:layout_width="@dimen/x_90" android:layout_width="30dp"
android:layout_height="@dimen/x_90" android:layout_height="30dp"
android:layout_centerInParent="true" /> android:layout_centerInParent="true" />
</RelativeLayout> </RelativeLayout>
<?xml version="1.0" encoding="utf-8"?><!--<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"--><!--android:id="@+id/layout_title"--><!--android:layout_width="match_parent"--><!--android:layout_height="wrap_content"--><!--android:orientation="vertical">--> <?xml version="1.0" encoding="utf-8"?><!--<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"--><!--android:id="@+id/layout_title"--><!--android:layout_width="match_parent"--><!--android:layout_height="wrap_content"--><!--android:orientation="vertical">-->
<!--<TextView--><!--android:id="@+id/layout_statusbar"--><!--android:layout_width="match_parent"--><!--android:layout_height="@dimen/x_40"--><!--android:visibility="gone" />--> <!--<TextView--><!--android:id="@+id/layout_statusbar"--><!--android:layout_width="match_parent"--><!--android:layout_height="13dp"--><!--android:visibility="gone" />-->
<!--<com.qmuiteam.qmui.widget.QMUITopBar--><!--android:id="@+id/layout_topbar"--><!--android:layout_width="match_parent"--><!--android:layout_height="@dimen/x_150" />--> <!--<com.qmuiteam.qmui.widget.QMUITopBar--><!--android:id="@+id/layout_topbar"--><!--android:layout_width="match_parent"--><!--android:layout_height="50dp" />-->
<!----><!--</LinearLayout>--> <!----><!--</LinearLayout>-->
<tech.starwin.widget.TopBar xmlns:android="http://schemas.android.com/apk/res/android" <tech.starwin.widget.TopBar xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/topbar" android:id="@+id/topbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/x_150" /> android:layout_height="50dp" />
\ No newline at end of file \ No newline at end of file
...@@ -3,31 +3,31 @@ ...@@ -3,31 +3,31 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/x_50" android:layout_marginTop="16dp"
android:background="@color/white" android:background="@color/white"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:padding="@dimen/x_50" android:padding="16dp"
app:qmui_radius="5dp" app:qmui_radius="5dp"
app:qmui_shadowElevation="1dp"> app:qmui_shadowElevation="1dp">
<TextView <TextView
android:layout_width="@dimen/x_800" android:layout_width="266dp"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<ImageView <ImageView
android:id="@+id/iv_closed_header" android:id="@+id/iv_closed_header"
android:layout_width="@dimen/x_300" android:layout_width="100dp"
android:layout_height="@dimen/x_300" android:layout_height="100dp"
android:layout_gravity="center_horizontal" /> android:layout_gravity="center_horizontal" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/x_50" android:layout_marginTop="16dp"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="@dimen/x_50" android:paddingLeft="16dp"
android:paddingRight="@dimen/x_50"> android:paddingRight="16dp">
<TextView <TextView
android:id="@+id/tv_loanresult_title" android:id="@+id/tv_loanresult_title"
...@@ -39,14 +39,14 @@ ...@@ -39,14 +39,14 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/x_30" android:layout_marginTop="10dp"
android:text="@string/dialog_closed_tips" /> android:text="@string/dialog_closed_tips" />
<TextView <TextView
android:id="@+id/id_textview_closed_dialog_content" android:id="@+id/id_textview_closed_dialog_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/x_30" android:layout_marginTop="10dp"
android:visibility="visible" /> android:visibility="visible" />
</LinearLayout> </LinearLayout>
...@@ -55,6 +55,6 @@ ...@@ -55,6 +55,6 @@
style="@style/main_color_roundBtn" style="@style/main_color_roundBtn"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/x_30" android:layout_margin="10dp"
android:text="@string/button_ok" /> android:text="@string/button_ok" />
</com.qmuiteam.qmui.layout.QMUILinearLayout> </com.qmuiteam.qmui.layout.QMUILinearLayout>
\ No newline at end of file
...@@ -3,29 +3,29 @@ ...@@ -3,29 +3,29 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/x_50" android:layout_marginTop="16dp"
android:background="@color/white" android:background="@color/white"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:padding="@dimen/x_50" android:padding="16dp"
app:qmui_radius="5dp" app:qmui_radius="5dp"
app:qmui_shadowElevation="1dp"> app:qmui_shadowElevation="1dp">
<TextView <TextView
android:layout_width="@dimen/x_800" android:layout_width="266dp"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<ImageView <ImageView
android:id="@+id/iv_closed_header" android:id="@+id/iv_closed_header"
android:layout_width="@dimen/x_300" android:layout_width="100dp"
android:layout_height="@dimen/x_300" android:layout_height="100dp"
android:layout_gravity="center_horizontal" /> android:layout_gravity="center_horizontal" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:padding="@dimen/x_30"> android:padding="10dp">
<TextView <TextView
android:id="@+id/tv_loanresult_title" android:id="@+id/tv_loanresult_title"
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
android:id="@+id/tv_loanresult_tips" android:id="@+id/tv_loanresult_tips"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/x_30" android:layout_marginTop="10dp"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="@string/loan_result_tip_rejected" /> android:text="@string/loan_result_tip_rejected" />
</LinearLayout> </LinearLayout>
...@@ -49,6 +49,6 @@ ...@@ -49,6 +49,6 @@
style="@style/main_color_roundBtn" style="@style/main_color_roundBtn"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/x_30" android:layout_margin="10dp"
android:text="@string/text_sure" /> android:text="@string/text_sure" />
</com.qmuiteam.qmui.layout.QMUILinearLayout> </com.qmuiteam.qmui.layout.QMUILinearLayout>
\ No newline at end of file
...@@ -3,29 +3,29 @@ ...@@ -3,29 +3,29 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/x_50" android:layout_marginTop="16dp"
android:background="@color/white" android:background="@color/white"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:padding="@dimen/x_50" android:padding="16dp"
app:qmui_radius="5dp" app:qmui_radius="5dp"
app:qmui_shadowElevation="1dp"> app:qmui_shadowElevation="1dp">
<TextView <TextView
android:layout_width="@dimen/x_800" android:layout_width="266dp"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<ImageView <ImageView
android:id="@+id/iv_closed_header" android:id="@+id/iv_closed_header"
android:layout_width="@dimen/x_300" android:layout_width="100dp"
android:layout_height="@dimen/x_300" android:layout_height="100dp"
android:layout_gravity="center_horizontal" /> android:layout_gravity="center_horizontal" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/x_30" android:layout_marginBottom="10dp"
android:layout_marginTop="@dimen/x_20" android:layout_marginTop="6dp"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
android:id="@+id/tv_loanresult_tips" android:id="@+id/tv_loanresult_tips"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/x_30" android:layout_marginTop="10dp"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="@string/loan_result_tip_approved" /> android:text="@string/loan_result_tip_approved" />
</LinearLayout> </LinearLayout>
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
style="@style/main_color_roundBtn" style="@style/main_color_roundBtn"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/x_30" android:layout_marginTop="10dp"
android:gravity="center" android:gravity="center"
android:text="@string/text_sure" /> android:text="@string/text_sure" />
</com.qmuiteam.qmui.layout.QMUILinearLayout> </com.qmuiteam.qmui.layout.QMUILinearLayout>
\ No newline at end of file
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
android:gravity="center" android:gravity="center"
android:text="@string/take_id_photo_header_right" android:text="@string/take_id_photo_header_right"
android:textColor="@color/main_color" android:textColor="@color/main_color"
android:textSize="@dimen/x_45" /> android:textSize="15dp" />
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
......
...@@ -7,28 +7,28 @@ ...@@ -7,28 +7,28 @@
android:background="@color/white" android:background="@color/white"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:padding="@dimen/x_50"> android:padding="16dp">
<TextView <TextView
android:layout_width="@dimen/x_800" android:layout_width="266dp"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<ImageView <ImageView
android:id="@+id/tv_dialog_update_title" android:id="@+id/tv_dialog_update_title"
android:layout_width="@dimen/x_300" android:layout_width="100dp"
android:layout_height="@dimen/x_300" /> android:layout_height="100dp" />
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/x_30"> android:layout_marginTop="10dp">
<LinearLayout <LinearLayout
android:id="@+id/ll_dialog_update_message" android:id="@+id/ll_dialog_update_message"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:padding="@dimen/x_30"> android:padding="10dp">
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
android:id="@+id/tv_dialog_update_message" android:id="@+id/tv_dialog_update_message"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/x_30" android:layout_marginBottom="10dp"
android:layout_marginTop="@dimen/x_30" android:layout_marginTop="10dp"
android:text="@string/text_update_tips" /> android:text="@string/text_update_tips" />
<TextView <TextView
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
style="@style/main_color_roundBtn" style="@style/main_color_roundBtn"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/x_30" android:layout_marginTop="10dp"
android:gravity="center" android:gravity="center"
android:text="@string/dialog_button_download" /> android:text="@string/dialog_button_download" />
......
...@@ -9,11 +9,11 @@ ...@@ -9,11 +9,11 @@
<android.support.v7.widget.CardView <android.support.v7.widget.CardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/x_50" android:layout_marginLeft="16dp"
android:layout_marginRight="@dimen/x_50" android:layout_marginRight="16dp"
app:cardCornerRadius="@dimen/x_20" app:cardCornerRadius="6dp"
android:layout_marginTop="@dimen/x_40" android:layout_marginTop="13dp"
app:cardElevation="@dimen/x_10"> app:cardElevation="3dp">
<ImageView <ImageView
android:id="@+id/iv_image_activity_center" android:id="@+id/iv_image_activity_center"
...@@ -46,6 +46,6 @@ ...@@ -46,6 +46,6 @@
<!--<View--> <!--<View-->
<!--android:layout_width="match_parent"--> <!--android:layout_width="match_parent"-->
<!--android:layout_height="@dimen/x_20" />--> <!--android:layout_height="6dp" />-->
</LinearLayout> </LinearLayout>
\ No newline at end of file
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/x_30" android:layout_marginTop="10dp"
android:background="@color/white" android:background="@color/white"
android:orientation="vertical" android:orientation="vertical"
android:padding="@dimen/x_50"> android:padding="16dp">
<TextView <TextView
android:id="@+id/item_messageList_title_tv" android:id="@+id/item_messageList_title_tv"
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
android:id="@+id/item_messageList_detail_tv" android:id="@+id/item_messageList_detail_tv"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/x_15" android:layout_marginTop="5dp"
android:text="content" /> android:text="content" />
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
android:layout_gravity="center" android:layout_gravity="center"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:padding="@dimen/x_30" android:padding="10dp"
android:text="region" android:text="region"
android:textColor="@color/black" /> android:textColor="@color/black" />
......
...@@ -3,22 +3,22 @@ ...@@ -3,22 +3,22 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="@dimen/x_50" android:paddingLeft="16dp"
android:paddingRight="@dimen/x_50"> android:paddingRight="16dp">
<TextView <TextView
android:id="@+id/item_repaymentGuide_title_tv" android:id="@+id/item_repaymentGuide_title_tv"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/x_80" android:layout_marginTop="26dp"
android:textColor="@color/qmui_config_color_gray_4" android:textColor="@color/qmui_config_color_gray_4"
android:textSize="@dimen/x_50" /> android:textSize="16dp" />
<TextView <TextView
android:id="@+id/item_repaymentGuide_detail_tv" android:id="@+id/item_repaymentGuide_detail_tv"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/x_50" android:padding="16dp"
android:textColor="@color/qmui_config_color_gray_6" android:textColor="@color/qmui_config_color_gray_6"
android:textSize="@dimen/x_35" /> android:textSize="12dp" />
</LinearLayout> </LinearLayout>
\ No newline at end of file
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
</style> </style>
<style name="span_text"> <style name="span_text">
<item name="android:textSize">@dimen/x_42</item> <item name="android:textSize">14dp</item>
<item name="android:textColor">@color/qmui_config_color_gray_1</item> <item name="android:textColor">@color/qmui_config_color_gray_1</item>
<item name="android:gravity">center_vertical</item> <item name="android:gravity">center_vertical</item>
<item name="android:background">@color/translateColor</item> <item name="android:background">@color/translateColor</item>
...@@ -125,14 +125,14 @@ ...@@ -125,14 +125,14 @@
<!--分割线--> <!--分割线-->
<style name="gray_line_vertical"> <style name="gray_line_vertical">
<item name="android:layout_width">@dimen/x_3</item> <item name="android:layout_width">1dp</item>
<item name="android:layout_height">match_parent</item> <item name="android:layout_height">match_parent</item>
<item name="android:background">@color/qmui_config_color_gray_9</item> <item name="android:background">@color/qmui_config_color_gray_9</item>
</style> </style>
<style name="gray_line"> <style name="gray_line">
<item name="android:layout_width">match_parent</item> <item name="android:layout_width">match_parent</item>
<item name="android:layout_height">@dimen/x_3</item> <item name="android:layout_height">1dp</item>
<item name="android:background">@color/gray_bg</item> <item name="android:background">@color/gray_bg</item>
</style> </style>
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
<style name="text_8"> <style name="text_8">
<item name="android:layout_width">wrap_content</item> <item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:textSize">@dimen/x_38</item> <item name="android:textSize">12dp</item>
</style> </style>
......
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