蒋洪波 / XDYAndroidLive

转到一个项目
Toggle navigation Toggle navigation pinning
蒋洪波
03688b3f 1 parent e0ed1291

增加崩溃日志文件 修改登录界面

内嵌 并排对比
正在显示 19 个修改的文件 包含 244 行增加 和 52 行删除
@@ -19,8 +19,8 @@ @@ -19,8 +19,8 @@
19 <color name="half_transparent">#33000000</color> 19 <color name="half_transparent">#33000000</color>
20 <color name="Color_56000000">#56000000</color> 20 <color name="Color_56000000">#56000000</color>
21 21
22 - <color name="colorPrimary">#3F51B5</color>  
23 - <color name="colorPrimaryDark">#303F9F</color> 22 + <color name="colorPrimary">#3598db</color>
  23 + <color name="colorPrimaryDark">#2487ca</color>
24 <color name="colorAccent">#FF4081</color> 24 <color name="colorAccent">#FF4081</color>
25 <color name="white">#ffffff</color> 25 <color name="white">#ffffff</color>
26 <color name="black">#000000</color> 26 <color name="black">#000000</color>
@@ -5,6 +5,7 @@ import android.content.Intent; @@ -5,6 +5,7 @@ import android.content.Intent;
5 import android.os.Bundle; 5 import android.os.Bundle;
6 import android.view.WindowManager; 6 import android.view.WindowManager;
7 7
  8 +import com.flyco.systembar.SystemBarHelper;
8 import com.xdy.commonlibrary.core.TitleBaseActivity; 9 import com.xdy.commonlibrary.core.TitleBaseActivity;
9 import com.xdy.commonlibrary.core.di.AppComponent; 10 import com.xdy.commonlibrary.core.di.AppComponent;
10 import com.xdy.commonlibrary.permission.PermissifyConstants; 11 import com.xdy.commonlibrary.permission.PermissifyConstants;
@@ -12,7 +13,6 @@ import com.xdy.commonlibrary.permission.PermissifyManager; @@ -12,7 +13,6 @@ import com.xdy.commonlibrary.permission.PermissifyManager;
12 import com.xdy.commonlibrary.permission.PermissionCallOptions; 13 import com.xdy.commonlibrary.permission.PermissionCallOptions;
13 import com.xdy.home.R; 14 import com.xdy.home.R;
14 import com.xdy.home.event.ActionPushOrClose; 15 import com.xdy.home.event.ActionPushOrClose;
15 -import com.xdy.home.ui.SiteInputFragment;  
16 import com.xdy.home.vp.LivePresenter; 16 import com.xdy.home.vp.LivePresenter;
17 17
18 import org.greenrobot.eventbus.EventBus; 18 import org.greenrobot.eventbus.EventBus;
@@ -42,7 +42,7 @@ public class HomeActivity extends TitleBaseActivity<LivePresenter> { @@ -42,7 +42,7 @@ public class HomeActivity extends TitleBaseActivity<LivePresenter> {
42 42
43 @Override 43 @Override
44 protected int getLayoutId() { 44 protected int getLayoutId() {
45 - return R.layout.home_activity_home; 45 + return 0;
46 } 46 }
47 47
48 @Override 48 @Override
@@ -53,10 +53,18 @@ public class HomeActivity extends TitleBaseActivity<LivePresenter> { @@ -53,10 +53,18 @@ public class HomeActivity extends TitleBaseActivity<LivePresenter> {
53 protected void initViews(Bundle savedInstanceState) { 53 protected void initViews(Bundle savedInstanceState) {
54 getTitleHeaderBar().setVisibility(GONE); 54 getTitleHeaderBar().setVisibility(GONE);
55 loadRootFragment(SiteInputFragment.newInstance()); 55 loadRootFragment(SiteInputFragment.newInstance());
  56 + SystemBarHelper.setStatusBarDarkMode(this);
56 } 57 }
57 58
58 @Override 59 @Override
59 protected void initData() { 60 protected void initData() {
  61 + getPermissifyManager().
  62 + callWithPermission(this, PermissifyConstants.WRITE_STOREGE, Manifest.permission.WRITE_EXTERNAL_STORAGE,
  63 + new PermissionCallOptions.Builder()
  64 + .withDefaultDenyDialog(true)
  65 + .withDefaultRationaleDialog(true)
  66 + .build()
  67 + );
60 } 68 }
61 69
62 @Override 70 @Override
@@ -104,6 +112,17 @@ public class HomeActivity extends TitleBaseActivity<LivePresenter> { @@ -104,6 +112,17 @@ public class HomeActivity extends TitleBaseActivity<LivePresenter> {
104 case SHOW_PERMISSION_RATIONALE: 112 case SHOW_PERMISSION_RATIONALE:
105 break; 113 break;
106 } 114 }
  115 + }else if(callId == PermissifyConstants.WRITE_STOREGE){
  116 + switch (status) {
  117 + case PERMISSION_GRANTED:
  118 + break;
  119 + case PERMISSION_DENIED_ONCE:
  120 + case PERMISSION_DENIED_FOREVER:
  121 + finish();
  122 + break;
  123 + case SHOW_PERMISSION_RATIONALE:
  124 + break;
  125 + }
107 } 126 }
108 } 127 }
109 } 128 }
@@ -6,6 +6,7 @@ import android.support.v7.widget.AppCompatEditText; @@ -6,6 +6,7 @@ import android.support.v7.widget.AppCompatEditText;
6 import android.text.TextUtils; 6 import android.text.TextUtils;
7 import android.view.View; 7 import android.view.View;
8 import android.widget.Button; 8 import android.widget.Button;
  9 +import android.widget.RelativeLayout;
9 10
10 import com.xdy.commonlibrary.core.AppBaseFragment; 11 import com.xdy.commonlibrary.core.AppBaseFragment;
11 import com.xdy.commonlibrary.core.di.AppComponent; 12 import com.xdy.commonlibrary.core.di.AppComponent;
@@ -30,12 +31,14 @@ public class SiteInputFragment extends AppBaseFragment<LivePresenter> implements @@ -30,12 +31,14 @@ public class SiteInputFragment extends AppBaseFragment<LivePresenter> implements
30 private Button enterClass; 31 private Button enterClass;
31 private Button enterReplay; 32 private Button enterReplay;
32 33
33 -  
34 public static SiteInputFragment newInstance() { 34 public static SiteInputFragment newInstance() {
35 SiteInputFragment chatFragment = new SiteInputFragment(); 35 SiteInputFragment chatFragment = new SiteInputFragment();
36 return chatFragment; 36 return chatFragment;
37 } 37 }
38 38
  39 +
  40 + private RelativeLayout close;
  41 +
39 @Override 42 @Override
40 protected void setupFragmentComponent(AppComponent appComponent) { 43 protected void setupFragmentComponent(AppComponent appComponent) {
41 44
@@ -45,13 +48,20 @@ public class SiteInputFragment extends AppBaseFragment<LivePresenter> implements @@ -45,13 +48,20 @@ public class SiteInputFragment extends AppBaseFragment<LivePresenter> implements
45 protected void initView(View v, Bundle savedInstanceState) { 48 protected void initView(View v, Bundle savedInstanceState) {
46 classId = (AppCompatEditText) v.findViewById(R.id.acet_classid); 49 classId = (AppCompatEditText) v.findViewById(R.id.acet_classid);
47 portal = (AppCompatEditText) v.findViewById(R.id.acet_portal); 50 portal = (AppCompatEditText) v.findViewById(R.id.acet_portal);
48 - role = (AppCompatEditText) v.findViewById(R.id.acet_role); 51 + close = (RelativeLayout) v.findViewById(R.id.rl_close);
  52 + role = (AppCompatEditText) v.findViewById(R.id.acet_userrole);
49 userId = (AppCompatEditText) v.findViewById(R.id.acet_userid); 53 userId = (AppCompatEditText) v.findViewById(R.id.acet_userid);
50 enterClass = (Button) v.findViewById(R.id.btn_enter_class); 54 enterClass = (Button) v.findViewById(R.id.btn_enter_class);
51 enterReplay = (Button) v.findViewById(R.id.btn_enter_replay); 55 enterReplay = (Button) v.findViewById(R.id.btn_enter_replay);
52 56
53 enterClass.setOnClickListener(this); 57 enterClass.setOnClickListener(this);
54 enterReplay.setOnClickListener(this); 58 enterReplay.setOnClickListener(this);
  59 + close.setOnClickListener(new View.OnClickListener() {
  60 + @Override
  61 + public void onClick(View v) {
  62 + getBaseActivity().finish();
  63 + }
  64 + });
55 } 65 }
56 66
57 @Override 67 @Override
@@ -3,7 +3,6 @@ package com.xdy.home.vp; @@ -3,7 +3,6 @@ package com.xdy.home.vp;
3 3
4 import com.xdy.commonlibrary.core.di.AppComponent; 4 import com.xdy.commonlibrary.core.di.AppComponent;
5 import com.xdy.commonlibrary.di.scope.ActivityScope; 5 import com.xdy.commonlibrary.di.scope.ActivityScope;
6 -import com.xdy.home.ui.HomeActivity;  
7 import com.xdy.home.ui.LiveFragment; 6 import com.xdy.home.ui.LiveFragment;
8 7
9 import dagger.Component; 8 import dagger.Component;
@@ -15,7 +14,5 @@ import dagger.Component; @@ -15,7 +14,5 @@ import dagger.Component;
15 @ActivityScope 14 @ActivityScope
16 @Component(modules = LiveModule.class, dependencies = AppComponent.class) 15 @Component(modules = LiveModule.class, dependencies = AppComponent.class)
17 public interface LiveComponent { 16 public interface LiveComponent {
18 - void inject(HomeActivity f);  
19 -  
20 void inject(LiveFragment fragment); 17 void inject(LiveFragment fragment);
21 } 18 }
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<selector xmlns:android="http://schemas.android.com/apk/res/android">
  3 + <item android:drawable="@color/home_btn_green_press" android:state_pressed="true"></item>
  4 + <item android:drawable="@color/home_btn_green_press" android:state_checked="true"></item>
  5 + <item android:drawable="@color/home_btn_green"></item>
  6 +</selector>
@@ -4,69 +4,194 @@ @@ -4,69 +4,194 @@
4 xmlns:tools="http://schemas.android.com/tools" 4 xmlns:tools="http://schemas.android.com/tools"
5 android:layout_width="match_parent" 5 android:layout_width="match_parent"
6 android:layout_height="match_parent" 6 android:layout_height="match_parent"
7 - android:background="@color/home_background" 7 + android:background="@color/white"
8 tools:context=".ui.HomeActivity"> 8 tools:context=".ui.HomeActivity">
9 9
  10 + <RelativeLayout
  11 + android:id="@+id/rl_close"
  12 + android:layout_width="@dimen/ui_DIMEN_98.0PX"
  13 + android:layout_height="@dimen/ui_DIMEN_98.0PX">
10 14
11 - <android.support.design.widget.TextInputLayout  
12 - android:id="@+id/til_classid"  
13 - style="@style/home_site_input_style"  
14 - android:layout_marginTop="@dimen/ui_DIMEN_20.0PX"> 15 + <ImageView
  16 + style="@style/ui_wrap_wrap"
  17 + android:layout_centerInParent="true"
  18 + android:src="@mipmap/close"/>
  19 + </RelativeLayout>
  20 +
  21 + <ImageView
  22 + android:id="@+id/iv_logo"
  23 + android:layout_width="wrap_content"
  24 + android:layout_height="wrap_content"
  25 + android:layout_below="@id/rl_close"
  26 + android:layout_centerHorizontal="true"
  27 + android:layout_marginTop="@dimen/ui_DIMEN_24.0PX"
  28 + android:src="@mipmap/logo"/>
  29 +
  30 +
  31 + <!-- classId 709902904 472732494 2067973545 1895498438-->
  32 + <RelativeLayout
  33 + android:id="@+id/rl_classid"
  34 + style="@style/home_input_style"
  35 + android:layout_below="@id/iv_logo"
  36 + android:layout_marginTop="@dimen/ui_DIMEN_80.0PX">
  37 +
  38 + <TextView
  39 + android:id="@+id/tv_classid"
  40 + style="@style/home_input_title_style"
  41 + android:layout_centerVertical="true"
  42 + android:text="@string/home_classid_hint"/>
15 43
16 - <!-- 709902904 472732494 2067973545 1895498438-->  
17 <android.support.v7.widget.AppCompatEditText 44 <android.support.v7.widget.AppCompatEditText
18 android:id="@+id/acet_classid" 45 android:id="@+id/acet_classid"
19 - style="@style/ui_match_wrap" 46 + style="@style/home_input_edit_style"
  47 + android:layout_toRightOf="@id/tv_classid"
20 android:hint="@string/home_classid_hint" 48 android:hint="@string/home_classid_hint"
21 - android:inputType="number"  
22 - android:text="472732494"/>  
23 - </android.support.design.widget.TextInputLayout> 49 + android:text="472732494"
  50 + android:inputType="number"/>
  51 +
  52 + <View
  53 + style="@style/ui_divider_line_horizontal"
  54 + android:layout_alignParentBottom="true"
  55 + android:background="#cccccc"/>
  56 + </RelativeLayout>
24 57
25 - <android.support.design.widget.TextInputLayout  
26 - android:id="@+id/til_role"  
27 - style="@style/home_site_input_style"  
28 - android:layout_below="@id/til_classid"> 58 + <!-- userRole -->
  59 + <RelativeLayout
  60 + android:id="@+id/rl_userrole"
  61 + style="@style/home_input_style"
  62 + android:layout_below="@id/rl_classid">
  63 +
  64 + <TextView
  65 + android:id="@+id/tv_userrole"
  66 + style="@style/home_input_title_style"
  67 + android:layout_centerVertical="true"
  68 + android:text="@string/home_role_hint"/>
29 69
30 <android.support.v7.widget.AppCompatEditText 70 <android.support.v7.widget.AppCompatEditText
31 - android:id="@+id/acet_role"  
32 - style="@style/ui_match_wrap"  
33 - android:hint="@string/home_role_hint"  
34 - android:text="normal"/>  
35 - </android.support.design.widget.TextInputLayout> 71 + android:id="@+id/acet_userrole"
  72 + style="@style/home_input_edit_style"
  73 + android:layout_toRightOf="@id/tv_userrole"
  74 + android:text="normal"
  75 + android:hint="@string/home_role_hint"/>
  76 +
  77 + <View
  78 + style="@style/ui_divider_line_horizontal"
  79 + android:layout_alignParentBottom="true"
  80 + android:background="#cccccc"/>
  81 + </RelativeLayout>
  82 +
  83 + <!-- portal -->
  84 + <RelativeLayout
  85 + android:id="@+id/rl_portal"
  86 + style="@style/home_input_style"
  87 + android:layout_below="@id/rl_userrole">
36 88
37 - <android.support.design.widget.TextInputLayout  
38 - android:id="@+id/til_portal"  
39 - style="@style/home_site_input_style"  
40 - android:layout_below="@id/til_role"> 89 + <TextView
  90 + android:id="@+id/tv_portal"
  91 + style="@style/home_input_title_style"
  92 + android:layout_centerVertical="true"
  93 + android:text="@string/home_portal_hint"/>
41 94
42 <android.support.v7.widget.AppCompatEditText 95 <android.support.v7.widget.AppCompatEditText
43 android:id="@+id/acet_portal" 96 android:id="@+id/acet_portal"
44 - style="@style/ui_match_wrap"  
45 - android:hint="@string/home_portal_hint" 97 + style="@style/home_input_edit_style"
  98 + android:layout_toRightOf="@id/tv_portal"
  99 + android:hint="@string/home_classid_hint"
46 android:text="112.126.80.182:90"/> 100 android:text="112.126.80.182:90"/>
47 - </android.support.design.widget.TextInputLayout>  
48 101
49 - <android.support.design.widget.TextInputLayout  
50 - android:id="@+id/til_userid"  
51 - style="@style/home_site_input_style"  
52 - android:layout_below="@id/til_portal"> 102 + <View
  103 + style="@style/ui_divider_line_horizontal"
  104 + android:layout_alignParentBottom="true"
  105 + android:background="#cccccc"/>
  106 + </RelativeLayout>
  107 +
  108 + <!-- userid -->
  109 + <RelativeLayout
  110 + android:id="@+id/rl_userid"
  111 + style="@style/home_input_style"
  112 + android:layout_below="@id/rl_portal">
  113 +
  114 + <TextView
  115 + android:id="@+id/tv_userid"
  116 + style="@style/home_input_title_style"
  117 + android:layout_centerVertical="true"
  118 + android:text="@string/home_userid_hint"/>
53 119
54 <android.support.v7.widget.AppCompatEditText 120 <android.support.v7.widget.AppCompatEditText
55 android:id="@+id/acet_userid" 121 android:id="@+id/acet_userid"
56 - style="@style/ui_match_wrap"  
57 - android:hint="@string/home_userid_hint"  
58 - android:text="0"/>  
59 - </android.support.design.widget.TextInputLayout> 122 + style="@style/home_input_edit_style"
  123 + android:layout_toRightOf="@id/tv_userid"
  124 + android:text="0"
  125 + android:hint="@string/home_userid_hint"/>
  126 +
  127 + <View
  128 + style="@style/ui_divider_line_horizontal"
  129 + android:layout_alignParentBottom="true"
  130 + android:background="#cccccc"/>
  131 + </RelativeLayout>
  132 +
  133 + <!-- <android.support.design.widget.TextInputLayout
  134 + android:id="@+id/til_classid"
  135 + style="@style/home_site_input_style"
  136 + android:layout_below="@id/iv_logo"
  137 + android:layout_marginTop="@dimen/ui_DIMEN_20.0PX">
  138 +
  139 + &lt;!&ndash;&ndash;&gt;
  140 + <android.support.v7.widget.AppCompatEditText
  141 + android:id="@+id/acet_classid"
  142 + style="@style/ui_match_wrap"
  143 + android:hint="@string/home_classid_hint"
  144 + android:inputType="number"
  145 + android:text="472732494"/>
  146 + </android.support.design.widget.TextInputLayout>
  147 +
  148 + <android.support.design.widget.TextInputLayout
  149 + android:id="@+id/til_role"
  150 + style="@style/home_site_input_style"
  151 + android:layout_below="@id/til_classid">
  152 +
  153 + <android.support.v7.widget.AppCompatEditText
  154 + android:id="@+id/acet_role"
  155 + style="@style/ui_match_wrap"
  156 + android:hint="@string/home_role_hint"
  157 + android:text="normal"/>
  158 + </android.support.design.widget.TextInputLayout>
  159 +
  160 + <android.support.design.widget.TextInputLayout
  161 + android:id="@+id/til_portal"
  162 + style="@style/home_site_input_style"
  163 + android:layout_below="@id/til_role">
  164 +
  165 + <android.support.v7.widget.AppCompatEditText
  166 + android:id="@+id/acet_portal"
  167 + style="@style/ui_match_wrap"
  168 + android:hint="@string/home_portal_hint"
  169 + android:text="112.126.80.182:90"/>
  170 + </android.support.design.widget.TextInputLayout>
  171 +
  172 + <android.support.design.widget.TextInputLayout
  173 + android:id="@+id/til_userid"
  174 + style="@style/home_site_input_style"
  175 + android:layout_below="@id/til_portal">
  176 +
  177 + <android.support.v7.widget.AppCompatEditText
  178 + android:id="@+id/acet_userid"
  179 + style="@style/ui_match_wrap"
  180 + android:hint="@string/home_userid_hint"
  181 + android:text="0"/>
  182 + </android.support.design.widget.TextInputLayout>-->
60 183
61 <Button 184 <Button
62 android:id="@+id/btn_enter_class" 185 android:id="@+id/btn_enter_class"
63 style="@style/home_site_btn_style" 186 style="@style/home_site_btn_style"
64 - android:layout_below="@id/til_userid" 187 + android:layout_marginTop="@dimen/ui_DIMEN_80.0PX"
  188 + android:layout_below="@id/rl_userid"
65 android:text="@string/home_enter_class"/> 189 android:text="@string/home_enter_class"/>
66 190
67 <Button 191 <Button
68 android:id="@+id/btn_enter_replay" 192 android:id="@+id/btn_enter_replay"
69 style="@style/home_site_btn_style" 193 style="@style/home_site_btn_style"
70 android:layout_below="@id/btn_enter_class" 194 android:layout_below="@id/btn_enter_class"
  195 + android:background="@drawable/home_selector_bottom_btn_green"
71 android:text="@string/home_enter_replay"/> 196 android:text="@string/home_enter_replay"/>
72 </com.xdy.ui.viewgroup.AutoAdaptHeaderViewGroup> 197 </com.xdy.ui.viewgroup.AutoAdaptHeaderViewGroup>
@@ -4,4 +4,6 @@ @@ -4,4 +4,6 @@
4 <color name="home_tab_selected">#3598db</color> 4 <color name="home_tab_selected">#3598db</color>
5 <color name="home_tab_unselected">#666666</color> 5 <color name="home_tab_unselected">#666666</color>
6 <color name="home_chat_tab_pressed">#6633B5E5</color> 6 <color name="home_chat_tab_pressed">#6633B5E5</color>
  7 + <color name="home_btn_green_press">#16b893</color>
  8 + <color name="home_btn_green">#26c8a3</color>
7 </resources> 9 </resources>
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <resources> 2 <resources>
3 <dimen name="home_avigator_height">@dimen/ui_DIMEN_60.0PX</dimen> 3 <dimen name="home_avigator_height">@dimen/ui_DIMEN_60.0PX</dimen>
  4 + <!-- BTN的高度 -->
  5 + <dimen name="home_btn_height">@dimen/ui_DIMEN_88.0PX</dimen>
4 </resources> 6 </resources>
@@ -3,10 +3,10 @@ @@ -3,10 +3,10 @@
3 <string name="home_tinker">Hello Tinker!</string> 3 <string name="home_tinker">Hello Tinker!</string>
4 <string name="home_doc">文档</string> 4 <string name="home_doc">文档</string>
5 <string name="home_chat">聊天</string> 5 <string name="home_chat">聊天</string>
6 - <string name="home_classid_hint">课堂id</string>  
7 - <string name="home_role_hint">角色</string>  
8 - <string name="home_userid_hint">用户id</string>  
9 - <string name="home_portal_hint">服务器地址</string> 6 + <string name="home_classid_hint">classid</string>
  7 + <string name="home_role_hint">userRole</string>
  8 + <string name="home_userid_hint">userid</string>
  9 + <string name="home_portal_hint">portal</string>
10 <string name="home_enter_class">进入课堂</string> 10 <string name="home_enter_class">进入课堂</string>
11 <string name="home_enter_replay">进入录制回放</string> 11 <string name="home_enter_replay">进入录制回放</string>
12 <string name="home_enter_class_lack_param">请输入课堂地址</string> 12 <string name="home_enter_class_lack_param">请输入课堂地址</string>
@@ -51,9 +51,9 @@ @@ -51,9 +51,9 @@
51 <!-- Label标签的颜色 --> 51 <!-- Label标签的颜色 -->
52 <item name="colorAccent">#c6174e</item> 52 <item name="colorAccent">#c6174e</item>
53 <!-- 默认状态状态设置底线颜色 --> 53 <!-- 默认状态状态设置底线颜色 -->
54 - <item name="colorControlNormal">#3F51b5</item> 54 + <item name="colorControlNormal">#cccccc</item>
55 <!-- 选择的底线颜色 --> 55 <!-- 选择的底线颜色 -->
56 - <item name="colorControlActivated">#c6174e</item> 56 + <item name="colorControlActivated">#cccccc</item>
57 </style> 57 </style>
58 58
59 59
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
72 72
73 <style name="home_site_btn_style"> 73 <style name="home_site_btn_style">
74 <item name="android:layout_width">match_parent</item> 74 <item name="android:layout_width">match_parent</item>
75 - <item name="android:layout_height">@dimen/ui_navigator_height</item> 75 + <item name="android:layout_height">@dimen/home_btn_height</item>
76 <item name="android:layout_marginLeft">@dimen/ui_default_padding</item> 76 <item name="android:layout_marginLeft">@dimen/ui_default_padding</item>
77 <item name="android:layout_marginRight">@dimen/ui_default_padding</item> 77 <item name="android:layout_marginRight">@dimen/ui_default_padding</item>
78 <item name="android:layout_centerHorizontal">true</item> 78 <item name="android:layout_centerHorizontal">true</item>
@@ -80,6 +80,7 @@ @@ -80,6 +80,7 @@
80 <item name="android:gravity">center</item> 80 <item name="android:gravity">center</item>
81 <item name="android:layout_marginTop">@dimen/ui_DIMEN_20.0PX</item> 81 <item name="android:layout_marginTop">@dimen/ui_DIMEN_20.0PX</item>
82 <item name="android:textColor">@color/white</item> 82 <item name="android:textColor">@color/white</item>
  83 + <item name="android:textSize">@dimen/ui_DIMEN_34.0PX</item>
83 </style> 84 </style>
84 85
85 <style name="home_btn_login_style"> 86 <style name="home_btn_login_style">
@@ -108,4 +109,30 @@ @@ -108,4 +109,30 @@
108 <item name="android:thumbOffset">10.0dip</item> 109 <item name="android:thumbOffset">10.0dip</item>
109 </style> 110 </style>
110 111
  112 + <style name="home_input_style">
  113 + <item name="android:layout_width">match_parent</item>
  114 + <item name="android:layout_height">@dimen/ui_DIMEN_100.0PX</item>
  115 + </style>
  116 +
  117 + <style name="home_input_common_style" parent="ui_tvBaseStyle">
  118 + <item name="android:textColor">#333333</item>
  119 + <item name="android:layout_centerVertical">true</item>
  120 + </style>
  121 +
  122 + <style name="home_input_title_style" parent="home_input_common_style">
  123 + <item name="android:layout_width">@dimen/ui_DIMEN_150.0PX</item>
  124 + <item name="android:layout_marginLeft">@dimen/ui_DIMEN_40.0PX</item>
  125 + <item name="android:layout_height">wrap_content</item>
  126 + <item name="android:textSize">@dimen/ui_DIMEN_32.0PX</item>
  127 + </style>
  128 +
  129 + <style name="home_input_edit_style" parent="home_input_common_style">
  130 + <item name="android:layout_width">match_parent</item>
  131 + <item name="android:layout_height">wrap_content</item>
  132 + <item name="android:layout_marginRight">@dimen/ui_DIMEN_40.0PX</item>
  133 + <item name="android:textSize">@dimen/ui_DIMEN_30.0PX</item>
  134 + <item name="android:background">@null</item>
  135 +
  136 + </style>
  137 +
111 </resources> 138 </resources>
@@ -361,4 +361,8 @@ public static java.lang.String TABLENAME; @@ -361,4 +361,8 @@ public static java.lang.String TABLENAME;
361 -keep class com.eventhandle.**{*;} 361 -keep class com.eventhandle.**{*;}
362 -keep class com.ntjbase.**{*;} 362 -keep class com.ntjbase.**{*;}
363 -keep class com.videoengine.**{*;} 363 -keep class com.videoengine.**{*;}
364 --keep class com.voiceengine.**{*;}  
  364 +-keep class com.voiceengine.**{*;}
  365 +
  366 +-keep class com.xdy.commonlibrary.core.CrashHandler
  367 +-keep class com.xdy.commonlibrary.core.AbsCrashHandler
  368 +-keep class com.xdy.commonlibrary.core.AppConfig