蒋洪波 / XDYAndroidLive

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

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

内嵌 并排对比
正在显示 19 个修改的文件 包含 244 行增加 和 52 行删除
... ... @@ -19,8 +19,8 @@
<color name="half_transparent">#33000000</color>
<color name="Color_56000000">#56000000</color>
<color name="colorPrimary">#3F51B5</color>
<color name="colorPrimaryDark">#303F9F</color>
<color name="colorPrimary">#3598db</color>
<color name="colorPrimaryDark">#2487ca</color>
<color name="colorAccent">#FF4081</color>
<color name="white">#ffffff</color>
<color name="black">#000000</color>
... ...
... ... @@ -5,6 +5,7 @@ import android.content.Intent;
import android.os.Bundle;
import android.view.WindowManager;
import com.flyco.systembar.SystemBarHelper;
import com.xdy.commonlibrary.core.TitleBaseActivity;
import com.xdy.commonlibrary.core.di.AppComponent;
import com.xdy.commonlibrary.permission.PermissifyConstants;
... ... @@ -12,7 +13,6 @@ import com.xdy.commonlibrary.permission.PermissifyManager;
import com.xdy.commonlibrary.permission.PermissionCallOptions;
import com.xdy.home.R;
import com.xdy.home.event.ActionPushOrClose;
import com.xdy.home.ui.SiteInputFragment;
import com.xdy.home.vp.LivePresenter;
import org.greenrobot.eventbus.EventBus;
... ... @@ -42,7 +42,7 @@ public class HomeActivity extends TitleBaseActivity<LivePresenter> {
@Override
protected int getLayoutId() {
return R.layout.home_activity_home;
return 0;
}
@Override
... ... @@ -53,10 +53,18 @@ public class HomeActivity extends TitleBaseActivity<LivePresenter> {
protected void initViews(Bundle savedInstanceState) {
getTitleHeaderBar().setVisibility(GONE);
loadRootFragment(SiteInputFragment.newInstance());
SystemBarHelper.setStatusBarDarkMode(this);
}
@Override
protected void initData() {
getPermissifyManager().
callWithPermission(this, PermissifyConstants.WRITE_STOREGE, Manifest.permission.WRITE_EXTERNAL_STORAGE,
new PermissionCallOptions.Builder()
.withDefaultDenyDialog(true)
.withDefaultRationaleDialog(true)
.build()
);
}
@Override
... ... @@ -104,6 +112,17 @@ public class HomeActivity extends TitleBaseActivity<LivePresenter> {
case SHOW_PERMISSION_RATIONALE:
break;
}
}else if(callId == PermissifyConstants.WRITE_STOREGE){
switch (status) {
case PERMISSION_GRANTED:
break;
case PERMISSION_DENIED_ONCE:
case PERMISSION_DENIED_FOREVER:
finish();
break;
case SHOW_PERMISSION_RATIONALE:
break;
}
}
}
}
... ...
... ... @@ -6,6 +6,7 @@ import android.support.v7.widget.AppCompatEditText;
import android.text.TextUtils;
import android.view.View;
import android.widget.Button;
import android.widget.RelativeLayout;
import com.xdy.commonlibrary.core.AppBaseFragment;
import com.xdy.commonlibrary.core.di.AppComponent;
... ... @@ -30,12 +31,14 @@ public class SiteInputFragment extends AppBaseFragment<LivePresenter> implements
private Button enterClass;
private Button enterReplay;
public static SiteInputFragment newInstance() {
SiteInputFragment chatFragment = new SiteInputFragment();
return chatFragment;
}
private RelativeLayout close;
@Override
protected void setupFragmentComponent(AppComponent appComponent) {
... ... @@ -45,13 +48,20 @@ public class SiteInputFragment extends AppBaseFragment<LivePresenter> implements
protected void initView(View v, Bundle savedInstanceState) {
classId = (AppCompatEditText) v.findViewById(R.id.acet_classid);
portal = (AppCompatEditText) v.findViewById(R.id.acet_portal);
role = (AppCompatEditText) v.findViewById(R.id.acet_role);
close = (RelativeLayout) v.findViewById(R.id.rl_close);
role = (AppCompatEditText) v.findViewById(R.id.acet_userrole);
userId = (AppCompatEditText) v.findViewById(R.id.acet_userid);
enterClass = (Button) v.findViewById(R.id.btn_enter_class);
enterReplay = (Button) v.findViewById(R.id.btn_enter_replay);
enterClass.setOnClickListener(this);
enterReplay.setOnClickListener(this);
close.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
getBaseActivity().finish();
}
});
}
@Override
... ...
... ... @@ -3,7 +3,6 @@ package com.xdy.home.vp;
import com.xdy.commonlibrary.core.di.AppComponent;
import com.xdy.commonlibrary.di.scope.ActivityScope;
import com.xdy.home.ui.HomeActivity;
import com.xdy.home.ui.LiveFragment;
import dagger.Component;
... ... @@ -15,7 +14,5 @@ import dagger.Component;
@ActivityScope
@Component(modules = LiveModule.class, dependencies = AppComponent.class)
public interface LiveComponent {
void inject(HomeActivity f);
void inject(LiveFragment fragment);
}
... ...
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/home_btn_green_press" android:state_pressed="true"></item>
<item android:drawable="@color/home_btn_green_press" android:state_checked="true"></item>
<item android:drawable="@color/home_btn_green"></item>
</selector>
\ No newline at end of file
... ...
... ... @@ -4,69 +4,194 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/home_background"
android:background="@color/white"
tools:context=".ui.HomeActivity">
<RelativeLayout
android:id="@+id/rl_close"
android:layout_width="@dimen/ui_DIMEN_98.0PX"
android:layout_height="@dimen/ui_DIMEN_98.0PX">
<android.support.design.widget.TextInputLayout
android:id="@+id/til_classid"
style="@style/home_site_input_style"
android:layout_marginTop="@dimen/ui_DIMEN_20.0PX">
<ImageView
style="@style/ui_wrap_wrap"
android:layout_centerInParent="true"
android:src="@mipmap/close"/>
</RelativeLayout>
<ImageView
android:id="@+id/iv_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/rl_close"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/ui_DIMEN_24.0PX"
android:src="@mipmap/logo"/>
<!-- classId 709902904 472732494 2067973545 1895498438-->
<RelativeLayout
android:id="@+id/rl_classid"
style="@style/home_input_style"
android:layout_below="@id/iv_logo"
android:layout_marginTop="@dimen/ui_DIMEN_80.0PX">
<TextView
android:id="@+id/tv_classid"
style="@style/home_input_title_style"
android:layout_centerVertical="true"
android:text="@string/home_classid_hint"/>
<!-- 709902904 472732494 2067973545 1895498438-->
<android.support.v7.widget.AppCompatEditText
android:id="@+id/acet_classid"
style="@style/ui_match_wrap"
style="@style/home_input_edit_style"
android:layout_toRightOf="@id/tv_classid"
android:hint="@string/home_classid_hint"
android:inputType="number"
android:text="472732494"/>
</android.support.design.widget.TextInputLayout>
android:text="472732494"
android:inputType="number"/>
<View
style="@style/ui_divider_line_horizontal"
android:layout_alignParentBottom="true"
android:background="#cccccc"/>
</RelativeLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/til_role"
style="@style/home_site_input_style"
android:layout_below="@id/til_classid">
<!-- userRole -->
<RelativeLayout
android:id="@+id/rl_userrole"
style="@style/home_input_style"
android:layout_below="@id/rl_classid">
<TextView
android:id="@+id/tv_userrole"
style="@style/home_input_title_style"
android:layout_centerVertical="true"
android:text="@string/home_role_hint"/>
<android.support.v7.widget.AppCompatEditText
android:id="@+id/acet_role"
style="@style/ui_match_wrap"
android:hint="@string/home_role_hint"
android:text="normal"/>
</android.support.design.widget.TextInputLayout>
android:id="@+id/acet_userrole"
style="@style/home_input_edit_style"
android:layout_toRightOf="@id/tv_userrole"
android:text="normal"
android:hint="@string/home_role_hint"/>
<View
style="@style/ui_divider_line_horizontal"
android:layout_alignParentBottom="true"
android:background="#cccccc"/>
</RelativeLayout>
<!-- portal -->
<RelativeLayout
android:id="@+id/rl_portal"
style="@style/home_input_style"
android:layout_below="@id/rl_userrole">
<android.support.design.widget.TextInputLayout
android:id="@+id/til_portal"
style="@style/home_site_input_style"
android:layout_below="@id/til_role">
<TextView
android:id="@+id/tv_portal"
style="@style/home_input_title_style"
android:layout_centerVertical="true"
android:text="@string/home_portal_hint"/>
<android.support.v7.widget.AppCompatEditText
android:id="@+id/acet_portal"
style="@style/ui_match_wrap"
android:hint="@string/home_portal_hint"
style="@style/home_input_edit_style"
android:layout_toRightOf="@id/tv_portal"
android:hint="@string/home_classid_hint"
android:text="112.126.80.182:90"/>
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/til_userid"
style="@style/home_site_input_style"
android:layout_below="@id/til_portal">
<View
style="@style/ui_divider_line_horizontal"
android:layout_alignParentBottom="true"
android:background="#cccccc"/>
</RelativeLayout>
<!-- userid -->
<RelativeLayout
android:id="@+id/rl_userid"
style="@style/home_input_style"
android:layout_below="@id/rl_portal">
<TextView
android:id="@+id/tv_userid"
style="@style/home_input_title_style"
android:layout_centerVertical="true"
android:text="@string/home_userid_hint"/>
<android.support.v7.widget.AppCompatEditText
android:id="@+id/acet_userid"
style="@style/ui_match_wrap"
android:hint="@string/home_userid_hint"
android:text="0"/>
</android.support.design.widget.TextInputLayout>
style="@style/home_input_edit_style"
android:layout_toRightOf="@id/tv_userid"
android:text="0"
android:hint="@string/home_userid_hint"/>
<View
style="@style/ui_divider_line_horizontal"
android:layout_alignParentBottom="true"
android:background="#cccccc"/>
</RelativeLayout>
<!-- <android.support.design.widget.TextInputLayout
android:id="@+id/til_classid"
style="@style/home_site_input_style"
android:layout_below="@id/iv_logo"
android:layout_marginTop="@dimen/ui_DIMEN_20.0PX">
&lt;!&ndash;&ndash;&gt;
<android.support.v7.widget.AppCompatEditText
android:id="@+id/acet_classid"
style="@style/ui_match_wrap"
android:hint="@string/home_classid_hint"
android:inputType="number"
android:text="472732494"/>
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/til_role"
style="@style/home_site_input_style"
android:layout_below="@id/til_classid">
<android.support.v7.widget.AppCompatEditText
android:id="@+id/acet_role"
style="@style/ui_match_wrap"
android:hint="@string/home_role_hint"
android:text="normal"/>
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/til_portal"
style="@style/home_site_input_style"
android:layout_below="@id/til_role">
<android.support.v7.widget.AppCompatEditText
android:id="@+id/acet_portal"
style="@style/ui_match_wrap"
android:hint="@string/home_portal_hint"
android:text="112.126.80.182:90"/>
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/til_userid"
style="@style/home_site_input_style"
android:layout_below="@id/til_portal">
<android.support.v7.widget.AppCompatEditText
android:id="@+id/acet_userid"
style="@style/ui_match_wrap"
android:hint="@string/home_userid_hint"
android:text="0"/>
</android.support.design.widget.TextInputLayout>-->
<Button
android:id="@+id/btn_enter_class"
style="@style/home_site_btn_style"
android:layout_below="@id/til_userid"
android:layout_marginTop="@dimen/ui_DIMEN_80.0PX"
android:layout_below="@id/rl_userid"
android:text="@string/home_enter_class"/>
<Button
android:id="@+id/btn_enter_replay"
style="@style/home_site_btn_style"
android:layout_below="@id/btn_enter_class"
android:background="@drawable/home_selector_bottom_btn_green"
android:text="@string/home_enter_replay"/>
</com.xdy.ui.viewgroup.AutoAdaptHeaderViewGroup>
\ No newline at end of file
... ...
... ... @@ -4,4 +4,6 @@
<color name="home_tab_selected">#3598db</color>
<color name="home_tab_unselected">#666666</color>
<color name="home_chat_tab_pressed">#6633B5E5</color>
<color name="home_btn_green_press">#16b893</color>
<color name="home_btn_green">#26c8a3</color>
</resources>
\ No newline at end of file
... ...
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="home_avigator_height">@dimen/ui_DIMEN_60.0PX</dimen>
<!-- BTN的高度 -->
<dimen name="home_btn_height">@dimen/ui_DIMEN_88.0PX</dimen>
</resources>
\ No newline at end of file
... ...
... ... @@ -3,10 +3,10 @@
<string name="home_tinker">Hello Tinker!</string>
<string name="home_doc">文档</string>
<string name="home_chat">聊天</string>
<string name="home_classid_hint">课堂id</string>
<string name="home_role_hint">角色</string>
<string name="home_userid_hint">用户id</string>
<string name="home_portal_hint">服务器地址</string>
<string name="home_classid_hint">classid</string>
<string name="home_role_hint">userRole</string>
<string name="home_userid_hint">userid</string>
<string name="home_portal_hint">portal</string>
<string name="home_enter_class">进入课堂</string>
<string name="home_enter_replay">进入录制回放</string>
<string name="home_enter_class_lack_param">请输入课堂地址</string>
... ...
... ... @@ -51,9 +51,9 @@
<!-- Label标签的颜色 -->
<item name="colorAccent">#c6174e</item>
<!-- 默认状态状态设置底线颜色 -->
<item name="colorControlNormal">#3F51b5</item>
<item name="colorControlNormal">#cccccc</item>
<!-- 选择的底线颜色 -->
<item name="colorControlActivated">#c6174e</item>
<item name="colorControlActivated">#cccccc</item>
</style>
... ... @@ -72,7 +72,7 @@
<style name="home_site_btn_style">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">@dimen/ui_navigator_height</item>
<item name="android:layout_height">@dimen/home_btn_height</item>
<item name="android:layout_marginLeft">@dimen/ui_default_padding</item>
<item name="android:layout_marginRight">@dimen/ui_default_padding</item>
<item name="android:layout_centerHorizontal">true</item>
... ... @@ -80,6 +80,7 @@
<item name="android:gravity">center</item>
<item name="android:layout_marginTop">@dimen/ui_DIMEN_20.0PX</item>
<item name="android:textColor">@color/white</item>
<item name="android:textSize">@dimen/ui_DIMEN_34.0PX</item>
</style>
<style name="home_btn_login_style">
... ... @@ -108,4 +109,30 @@
<item name="android:thumbOffset">10.0dip</item>
</style>
<style name="home_input_style">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">@dimen/ui_DIMEN_100.0PX</item>
</style>
<style name="home_input_common_style" parent="ui_tvBaseStyle">
<item name="android:textColor">#333333</item>
<item name="android:layout_centerVertical">true</item>
</style>
<style name="home_input_title_style" parent="home_input_common_style">
<item name="android:layout_width">@dimen/ui_DIMEN_150.0PX</item>
<item name="android:layout_marginLeft">@dimen/ui_DIMEN_40.0PX</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textSize">@dimen/ui_DIMEN_32.0PX</item>
</style>
<style name="home_input_edit_style" parent="home_input_common_style">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginRight">@dimen/ui_DIMEN_40.0PX</item>
<item name="android:textSize">@dimen/ui_DIMEN_30.0PX</item>
<item name="android:background">@null</item>
</style>
</resources>
\ No newline at end of file
... ...
... ... @@ -361,4 +361,8 @@ public static java.lang.String TABLENAME;
-keep class com.eventhandle.**{*;}
-keep class com.ntjbase.**{*;}
-keep class com.videoengine.**{*;}
-keep class com.voiceengine.**{*;}
\ No newline at end of file
-keep class com.voiceengine.**{*;}
-keep class com.xdy.commonlibrary.core.CrashHandler
-keep class com.xdy.commonlibrary.core.AbsCrashHandler
-keep class com.xdy.commonlibrary.core.AppConfig
\ No newline at end of file
... ...