tinker_base-3.7.3-splash

.editorconfig

@@ -1,555 +0,0 @@
-[*]
-charset = utf-8
-end_of_line = lf
-indent_size = 4
-indent_style = space
-insert_final_newline = false
-max_line_length = 120
-tab_width = 4
-ij_continuation_indent_size = 8
-ij_formatter_off_tag = @formatter:off
-ij_formatter_on_tag = @formatter:on
-ij_formatter_tags_enabled = false
-ij_smart_tabs = false
-ij_visual_guides = none
-ij_wrap_on_typing = false
-
-[*.java]
-ij_java_align_consecutive_assignments = false
-ij_java_align_consecutive_variable_declarations = false
-ij_java_align_group_field_declarations = false
-ij_java_align_multiline_annotation_parameters = false
-ij_java_align_multiline_array_initializer_expression = false
-ij_java_align_multiline_assignment = false
-ij_java_align_multiline_binary_operation = false
-ij_java_align_multiline_chained_methods = false
-ij_java_align_multiline_extends_list = false
-ij_java_align_multiline_for = true
-ij_java_align_multiline_method_parentheses = false
-ij_java_align_multiline_parameters = true
-ij_java_align_multiline_parameters_in_calls = false
-ij_java_align_multiline_parenthesized_expression = false
-ij_java_align_multiline_records = true
-ij_java_align_multiline_resources = true
-ij_java_align_multiline_ternary_operation = false
-ij_java_align_multiline_text_blocks = false
-ij_java_align_multiline_throws_list = false
-ij_java_align_subsequent_simple_methods = false
-ij_java_align_throws_keyword = false
-ij_java_align_types_in_multi_catch = true
-ij_java_annotation_parameter_wrap = off
-ij_java_array_initializer_new_line_after_left_brace = false
-ij_java_array_initializer_right_brace_on_new_line = false
-ij_java_array_initializer_wrap = off
-ij_java_assert_statement_colon_on_next_line = false
-ij_java_assert_statement_wrap = off
-ij_java_assignment_wrap = off
-ij_java_binary_operation_sign_on_next_line = false
-ij_java_binary_operation_wrap = off
-ij_java_blank_lines_after_anonymous_class_header = 0
-ij_java_blank_lines_after_class_header = 0
-ij_java_blank_lines_after_imports = 1
-ij_java_blank_lines_after_package = 1
-ij_java_blank_lines_around_class = 1
-ij_java_blank_lines_around_field = 0
-ij_java_blank_lines_around_field_in_interface = 0
-ij_java_blank_lines_around_initializer = 1
-ij_java_blank_lines_around_method = 1
-ij_java_blank_lines_around_method_in_interface = 1
-ij_java_blank_lines_before_class_end = 0
-ij_java_blank_lines_before_imports = 1
-ij_java_blank_lines_before_method_body = 0
-ij_java_blank_lines_before_package = 0
-ij_java_block_brace_style = end_of_line
-ij_java_block_comment_add_space = false
-ij_java_block_comment_at_first_column = true
-ij_java_builder_methods = none
-ij_java_call_parameters_new_line_after_left_paren = false
-ij_java_call_parameters_right_paren_on_new_line = false
-ij_java_call_parameters_wrap = off
-ij_java_case_statement_on_separate_line = true
-ij_java_catch_on_new_line = false
-ij_java_class_annotation_wrap = split_into_lines
-ij_java_class_brace_style = end_of_line
-ij_java_class_count_to_use_import_on_demand = 99
-ij_java_class_names_in_javadoc = 1
-ij_java_do_not_indent_top_level_class_members = false
-ij_java_do_not_wrap_after_single_annotation = false
-ij_java_do_not_wrap_after_single_annotation_in_parameter = false
-ij_java_do_while_brace_force = never
-ij_java_doc_add_blank_line_after_description = true
-ij_java_doc_add_blank_line_after_param_comments = false
-ij_java_doc_add_blank_line_after_return = false
-ij_java_doc_add_p_tag_on_empty_lines = true
-ij_java_doc_align_exception_comments = true
-ij_java_doc_align_param_comments = true
-ij_java_doc_do_not_wrap_if_one_line = false
-ij_java_doc_enable_formatting = true
-ij_java_doc_enable_leading_asterisks = true
-ij_java_doc_indent_on_continuation = false
-ij_java_doc_keep_empty_lines = true
-ij_java_doc_keep_empty_parameter_tag = true
-ij_java_doc_keep_empty_return_tag = true
-ij_java_doc_keep_empty_throws_tag = true
-ij_java_doc_keep_invalid_tags = true
-ij_java_doc_param_description_on_new_line = false
-ij_java_doc_preserve_line_breaks = false
-ij_java_doc_use_throws_not_exception_tag = true
-ij_java_else_on_new_line = false
-ij_java_enum_constants_wrap = off
-ij_java_extends_keyword_wrap = off
-ij_java_extends_list_wrap = off
-ij_java_field_annotation_wrap = split_into_lines
-ij_java_finally_on_new_line = false
-ij_java_for_brace_force = never
-ij_java_for_statement_new_line_after_left_paren = false
-ij_java_for_statement_right_paren_on_new_line = false
-ij_java_for_statement_wrap = off
-ij_java_generate_final_locals = false
-ij_java_generate_final_parameters = false
-ij_java_if_brace_force = never
-ij_java_imports_layout = $android.**,$androidx.**,$com.**,$junit.**,$net.**,$org.**,$java.**,$javax.**,$*,|,android.**,|,androidx.**,|,com.**,|,junit.**,|,net.**,|,org.**,|,java.**,|,javax.**,|,*,|
-ij_java_indent_case_from_switch = true
-ij_java_insert_inner_class_imports = false
-ij_java_insert_override_annotation = true
-ij_java_keep_blank_lines_before_right_brace = 2
-ij_java_keep_blank_lines_between_package_declaration_and_header = 2
-ij_java_keep_blank_lines_in_code = 2
-ij_java_keep_blank_lines_in_declarations = 2
-ij_java_keep_builder_methods_indents = false
-ij_java_keep_control_statement_in_one_line = true
-ij_java_keep_first_column_comment = true
-ij_java_keep_indents_on_empty_lines = false
-ij_java_keep_line_breaks = true
-ij_java_keep_multiple_expressions_in_one_line = false
-ij_java_keep_simple_blocks_in_one_line = false
-ij_java_keep_simple_classes_in_one_line = false
-ij_java_keep_simple_lambdas_in_one_line = false
-ij_java_keep_simple_methods_in_one_line = false
-ij_java_label_indent_absolute = false
-ij_java_label_indent_size = 0
-ij_java_lambda_brace_style = end_of_line
-ij_java_layout_static_imports_separately = true
-ij_java_line_comment_add_space = false
-ij_java_line_comment_add_space_on_reformat = false
-ij_java_line_comment_at_first_column = true
-ij_java_method_annotation_wrap = split_into_lines
-ij_java_method_brace_style = end_of_line
-ij_java_method_call_chain_wrap = off
-ij_java_method_parameters_new_line_after_left_paren = false
-ij_java_method_parameters_right_paren_on_new_line = false
-ij_java_method_parameters_wrap = off
-ij_java_modifier_list_wrap = false
-ij_java_multi_catch_types_wrap = normal
-ij_java_names_count_to_use_import_on_demand = 99
-ij_java_new_line_after_lparen_in_annotation = false
-ij_java_new_line_after_lparen_in_record_header = false
-ij_java_parameter_annotation_wrap = off
-ij_java_parentheses_expression_new_line_after_left_paren = false
-ij_java_parentheses_expression_right_paren_on_new_line = false
-ij_java_place_assignment_sign_on_next_line = false
-ij_java_prefer_longer_names = true
-ij_java_prefer_parameters_wrap = false
-ij_java_record_components_wrap = normal
-ij_java_repeat_synchronized = true
-ij_java_replace_instanceof_and_cast = false
-ij_java_replace_null_check = true
-ij_java_replace_sum_lambda_with_method_ref = true
-ij_java_resource_list_new_line_after_left_paren = false
-ij_java_resource_list_right_paren_on_new_line = false
-ij_java_resource_list_wrap = off
-ij_java_rparen_on_new_line_in_annotation = false
-ij_java_rparen_on_new_line_in_record_header = false
-ij_java_space_after_closing_angle_bracket_in_type_argument = false
-ij_java_space_after_colon = true
-ij_java_space_after_comma = true
-ij_java_space_after_comma_in_type_arguments = true
-ij_java_space_after_for_semicolon = true
-ij_java_space_after_quest = true
-ij_java_space_after_type_cast = true
-ij_java_space_before_annotation_array_initializer_left_brace = false
-ij_java_space_before_annotation_parameter_list = false
-ij_java_space_before_array_initializer_left_brace = false
-ij_java_space_before_catch_keyword = true
-ij_java_space_before_catch_left_brace = true
-ij_java_space_before_catch_parentheses = true
-ij_java_space_before_class_left_brace = true
-ij_java_space_before_colon = true
-ij_java_space_before_colon_in_foreach = true
-ij_java_space_before_comma = false
-ij_java_space_before_do_left_brace = true
-ij_java_space_before_else_keyword = true
-ij_java_space_before_else_left_brace = true
-ij_java_space_before_finally_keyword = true
-ij_java_space_before_finally_left_brace = true
-ij_java_space_before_for_left_brace = true
-ij_java_space_before_for_parentheses = true
-ij_java_space_before_for_semicolon = false
-ij_java_space_before_if_left_brace = true
-ij_java_space_before_if_parentheses = true
-ij_java_space_before_method_call_parentheses = false
-ij_java_space_before_method_left_brace = true
-ij_java_space_before_method_parentheses = false
-ij_java_space_before_opening_angle_bracket_in_type_parameter = false
-ij_java_space_before_quest = true
-ij_java_space_before_switch_left_brace = true
-ij_java_space_before_switch_parentheses = true
-ij_java_space_before_synchronized_left_brace = true
-ij_java_space_before_synchronized_parentheses = true
-ij_java_space_before_try_left_brace = true
-ij_java_space_before_try_parentheses = true
-ij_java_space_before_type_parameter_list = false
-ij_java_space_before_while_keyword = true
-ij_java_space_before_while_left_brace = true
-ij_java_space_before_while_parentheses = true
-ij_java_space_inside_one_line_enum_braces = false
-ij_java_space_within_empty_array_initializer_braces = false
-ij_java_space_within_empty_method_call_parentheses = false
-ij_java_space_within_empty_method_parentheses = false
-ij_java_spaces_around_additive_operators = true
-ij_java_spaces_around_annotation_eq = true
-ij_java_spaces_around_assignment_operators = true
-ij_java_spaces_around_bitwise_operators = true
-ij_java_spaces_around_equality_operators = true
-ij_java_spaces_around_lambda_arrow = true
-ij_java_spaces_around_logical_operators = true
-ij_java_spaces_around_method_ref_dbl_colon = false
-ij_java_spaces_around_multiplicative_operators = true
-ij_java_spaces_around_relational_operators = true
-ij_java_spaces_around_shift_operators = true
-ij_java_spaces_around_type_bounds_in_type_parameters = true
-ij_java_spaces_around_unary_operator = false
-ij_java_spaces_within_angle_brackets = false
-ij_java_spaces_within_annotation_parentheses = false
-ij_java_spaces_within_array_initializer_braces = false
-ij_java_spaces_within_braces = false
-ij_java_spaces_within_brackets = false
-ij_java_spaces_within_cast_parentheses = false
-ij_java_spaces_within_catch_parentheses = false
-ij_java_spaces_within_for_parentheses = false
-ij_java_spaces_within_if_parentheses = false
-ij_java_spaces_within_method_call_parentheses = false
-ij_java_spaces_within_method_parentheses = false
-ij_java_spaces_within_parentheses = false
-ij_java_spaces_within_record_header = false
-ij_java_spaces_within_switch_parentheses = false
-ij_java_spaces_within_synchronized_parentheses = false
-ij_java_spaces_within_try_parentheses = false
-ij_java_spaces_within_while_parentheses = false
-ij_java_special_else_if_treatment = true
-ij_java_subclass_name_suffix = Impl
-ij_java_ternary_operation_signs_on_next_line = false
-ij_java_ternary_operation_wrap = off
-ij_java_test_name_suffix = Test
-ij_java_throws_keyword_wrap = off
-ij_java_throws_list_wrap = off
-ij_java_use_external_annotations = false
-ij_java_use_fq_class_names = false
-ij_java_use_relative_indents = false
-ij_java_use_single_class_imports = true
-ij_java_variable_annotation_wrap = off
-ij_java_visibility = public
-ij_java_while_brace_force = never
-ij_java_while_on_new_line = false
-ij_java_wrap_comments = false
-ij_java_wrap_first_method_in_call_chain = false
-ij_java_wrap_long_lines = false
-
-[.editorconfig]
-ij_editorconfig_align_group_field_declarations = false
-ij_editorconfig_space_after_colon = false
-ij_editorconfig_space_after_comma = true
-ij_editorconfig_space_before_colon = false
-ij_editorconfig_space_before_comma = false
-ij_editorconfig_spaces_around_assignment_operators = true
-
-[{*.ant,*.fxml,*.jhm,*.jnlp,*.jrxml,*.rng,*.tld,*.wsdl,*.xml,*.xsd,*.xsl,*.xslt,*.xul}]
-ij_continuation_indent_size = 4
-ij_xml_align_attributes = false
-ij_xml_align_text = false
-ij_xml_attribute_wrap = normal
-ij_xml_block_comment_add_space = false
-ij_xml_block_comment_at_first_column = true
-ij_xml_keep_blank_lines = 2
-ij_xml_keep_indents_on_empty_lines = false
-ij_xml_keep_line_breaks = false
-ij_xml_keep_line_breaks_in_text = true
-ij_xml_keep_whitespaces = false
-ij_xml_keep_whitespaces_around_cdata = preserve
-ij_xml_keep_whitespaces_inside_cdata = false
-ij_xml_line_comment_at_first_column = true
-ij_xml_space_after_tag_name = false
-ij_xml_space_around_equals_in_attribute = false
-ij_xml_space_inside_empty_tag = true
-ij_xml_text_wrap = normal
-ij_xml_use_custom_settings = true
-
-[{*.gant,*.groovy,*.gy}]
-ij_groovy_align_group_field_declarations = false
-ij_groovy_align_multiline_array_initializer_expression = false
-ij_groovy_align_multiline_assignment = false
-ij_groovy_align_multiline_binary_operation = false
-ij_groovy_align_multiline_chained_methods = false
-ij_groovy_align_multiline_extends_list = false
-ij_groovy_align_multiline_for = true
-ij_groovy_align_multiline_list_or_map = true
-ij_groovy_align_multiline_method_parentheses = false
-ij_groovy_align_multiline_parameters = true
-ij_groovy_align_multiline_parameters_in_calls = false
-ij_groovy_align_multiline_resources = true
-ij_groovy_align_multiline_ternary_operation = false
-ij_groovy_align_multiline_throws_list = false
-ij_groovy_align_named_args_in_map = true
-ij_groovy_align_throws_keyword = false
-ij_groovy_array_initializer_new_line_after_left_brace = false
-ij_groovy_array_initializer_right_brace_on_new_line = false
-ij_groovy_array_initializer_wrap = off
-ij_groovy_assert_statement_wrap = off
-ij_groovy_assignment_wrap = off
-ij_groovy_binary_operation_wrap = off
-ij_groovy_blank_lines_after_class_header = 0
-ij_groovy_blank_lines_after_imports = 1
-ij_groovy_blank_lines_after_package = 1
-ij_groovy_blank_lines_around_class = 1
-ij_groovy_blank_lines_around_field = 0
-ij_groovy_blank_lines_around_field_in_interface = 0
-ij_groovy_blank_lines_around_method = 1
-ij_groovy_blank_lines_around_method_in_interface = 1
-ij_groovy_blank_lines_before_imports = 1
-ij_groovy_blank_lines_before_method_body = 0
-ij_groovy_blank_lines_before_package = 0
-ij_groovy_block_brace_style = end_of_line
-ij_groovy_block_comment_add_space = false
-ij_groovy_block_comment_at_first_column = true
-ij_groovy_call_parameters_new_line_after_left_paren = false
-ij_groovy_call_parameters_right_paren_on_new_line = false
-ij_groovy_call_parameters_wrap = off
-ij_groovy_catch_on_new_line = false
-ij_groovy_class_annotation_wrap = split_into_lines
-ij_groovy_class_brace_style = end_of_line
-ij_groovy_class_count_to_use_import_on_demand = 5
-ij_groovy_do_while_brace_force = never
-ij_groovy_else_on_new_line = false
-ij_groovy_enable_groovydoc_formatting = true
-ij_groovy_enum_constants_wrap = off
-ij_groovy_extends_keyword_wrap = off
-ij_groovy_extends_list_wrap = off
-ij_groovy_field_annotation_wrap = split_into_lines
-ij_groovy_finally_on_new_line = false
-ij_groovy_for_brace_force = never
-ij_groovy_for_statement_new_line_after_left_paren = false
-ij_groovy_for_statement_right_paren_on_new_line = false
-ij_groovy_for_statement_wrap = off
-ij_groovy_if_brace_force = never
-ij_groovy_import_annotation_wrap = 2
-ij_groovy_imports_layout = *,|,javax.**,java.**,|,$*
-ij_groovy_indent_case_from_switch = true
-ij_groovy_indent_label_blocks = true
-ij_groovy_insert_inner_class_imports = false
-ij_groovy_keep_blank_lines_before_right_brace = 2
-ij_groovy_keep_blank_lines_in_code = 2
-ij_groovy_keep_blank_lines_in_declarations = 2
-ij_groovy_keep_control_statement_in_one_line = true
-ij_groovy_keep_first_column_comment = true
-ij_groovy_keep_indents_on_empty_lines = false
-ij_groovy_keep_line_breaks = true
-ij_groovy_keep_multiple_expressions_in_one_line = false
-ij_groovy_keep_simple_blocks_in_one_line = false
-ij_groovy_keep_simple_classes_in_one_line = true
-ij_groovy_keep_simple_lambdas_in_one_line = true
-ij_groovy_keep_simple_methods_in_one_line = true
-ij_groovy_label_indent_absolute = false
-ij_groovy_label_indent_size = 0
-ij_groovy_lambda_brace_style = end_of_line
-ij_groovy_layout_static_imports_separately = true
-ij_groovy_line_comment_add_space = false
-ij_groovy_line_comment_add_space_on_reformat = false
-ij_groovy_line_comment_at_first_column = true
-ij_groovy_method_annotation_wrap = split_into_lines
-ij_groovy_method_brace_style = end_of_line
-ij_groovy_method_call_chain_wrap = off
-ij_groovy_method_parameters_new_line_after_left_paren = false
-ij_groovy_method_parameters_right_paren_on_new_line = false
-ij_groovy_method_parameters_wrap = off
-ij_groovy_modifier_list_wrap = false
-ij_groovy_names_count_to_use_import_on_demand = 3
-ij_groovy_packages_to_use_import_on_demand = java.awt.*,javax.swing.*
-ij_groovy_parameter_annotation_wrap = off
-ij_groovy_parentheses_expression_new_line_after_left_paren = false
-ij_groovy_parentheses_expression_right_paren_on_new_line = false
-ij_groovy_prefer_parameters_wrap = false
-ij_groovy_resource_list_new_line_after_left_paren = false
-ij_groovy_resource_list_right_paren_on_new_line = false
-ij_groovy_resource_list_wrap = off
-ij_groovy_space_after_assert_separator = true
-ij_groovy_space_after_colon = true
-ij_groovy_space_after_comma = true
-ij_groovy_space_after_comma_in_type_arguments = true
-ij_groovy_space_after_for_semicolon = true
-ij_groovy_space_after_quest = true
-ij_groovy_space_after_type_cast = true
-ij_groovy_space_before_annotation_parameter_list = false
-ij_groovy_space_before_array_initializer_left_brace = false
-ij_groovy_space_before_assert_separator = false
-ij_groovy_space_before_catch_keyword = true
-ij_groovy_space_before_catch_left_brace = true
-ij_groovy_space_before_catch_parentheses = true
-ij_groovy_space_before_class_left_brace = true
-ij_groovy_space_before_closure_left_brace = true
-ij_groovy_space_before_colon = true
-ij_groovy_space_before_comma = false
-ij_groovy_space_before_do_left_brace = true
-ij_groovy_space_before_else_keyword = true
-ij_groovy_space_before_else_left_brace = true
-ij_groovy_space_before_finally_keyword = true
-ij_groovy_space_before_finally_left_brace = true
-ij_groovy_space_before_for_left_brace = true
-ij_groovy_space_before_for_parentheses = true
-ij_groovy_space_before_for_semicolon = false
-ij_groovy_space_before_if_left_brace = true
-ij_groovy_space_before_if_parentheses = true
-ij_groovy_space_before_method_call_parentheses = false
-ij_groovy_space_before_method_left_brace = true
-ij_groovy_space_before_method_parentheses = false
-ij_groovy_space_before_quest = true
-ij_groovy_space_before_record_parentheses = false
-ij_groovy_space_before_switch_left_brace = true
-ij_groovy_space_before_switch_parentheses = true
-ij_groovy_space_before_synchronized_left_brace = true
-ij_groovy_space_before_synchronized_parentheses = true
-ij_groovy_space_before_try_left_brace = true
-ij_groovy_space_before_try_parentheses = true
-ij_groovy_space_before_while_keyword = true
-ij_groovy_space_before_while_left_brace = true
-ij_groovy_space_before_while_parentheses = true
-ij_groovy_space_in_named_argument = true
-ij_groovy_space_in_named_argument_before_colon = false
-ij_groovy_space_within_empty_array_initializer_braces = false
-ij_groovy_space_within_empty_method_call_parentheses = false
-ij_groovy_spaces_around_additive_operators = true
-ij_groovy_spaces_around_assignment_operators = true
-ij_groovy_spaces_around_bitwise_operators = true
-ij_groovy_spaces_around_equality_operators = true
-ij_groovy_spaces_around_lambda_arrow = true
-ij_groovy_spaces_around_logical_operators = true
-ij_groovy_spaces_around_multiplicative_operators = true
-ij_groovy_spaces_around_regex_operators = true
-ij_groovy_spaces_around_relational_operators = true
-ij_groovy_spaces_around_shift_operators = true
-ij_groovy_spaces_within_annotation_parentheses = false
-ij_groovy_spaces_within_array_initializer_braces = false
-ij_groovy_spaces_within_braces = true
-ij_groovy_spaces_within_brackets = false
-ij_groovy_spaces_within_cast_parentheses = false
-ij_groovy_spaces_within_catch_parentheses = false
-ij_groovy_spaces_within_for_parentheses = false
-ij_groovy_spaces_within_gstring_injection_braces = false
-ij_groovy_spaces_within_if_parentheses = false
-ij_groovy_spaces_within_list_or_map = false
-ij_groovy_spaces_within_method_call_parentheses = false
-ij_groovy_spaces_within_method_parentheses = false
-ij_groovy_spaces_within_parentheses = false
-ij_groovy_spaces_within_switch_parentheses = false
-ij_groovy_spaces_within_synchronized_parentheses = false
-ij_groovy_spaces_within_try_parentheses = false
-ij_groovy_spaces_within_tuple_expression = false
-ij_groovy_spaces_within_while_parentheses = false
-ij_groovy_special_else_if_treatment = true
-ij_groovy_ternary_operation_wrap = off
-ij_groovy_throws_keyword_wrap = off
-ij_groovy_throws_list_wrap = off
-ij_groovy_use_flying_geese_braces = false
-ij_groovy_use_fq_class_names = false
-ij_groovy_use_fq_class_names_in_javadoc = true
-ij_groovy_use_relative_indents = false
-ij_groovy_use_single_class_imports = true
-ij_groovy_variable_annotation_wrap = off
-ij_groovy_while_brace_force = never
-ij_groovy_while_on_new_line = false
-ij_groovy_wrap_chain_calls_after_dot = false
-ij_groovy_wrap_long_lines = false
-
-[{*.kt,*.kts,*.main.kts}]
-ij_kotlin_align_in_columns_case_branch = false
-ij_kotlin_align_multiline_binary_operation = false
-ij_kotlin_align_multiline_extends_list = false
-ij_kotlin_align_multiline_method_parentheses = false
-ij_kotlin_align_multiline_parameters = true
-ij_kotlin_align_multiline_parameters_in_calls = false
-ij_kotlin_allow_trailing_comma = false
-ij_kotlin_allow_trailing_comma_on_call_site = false
-ij_kotlin_assignment_wrap = normal
-ij_kotlin_blank_lines_after_class_header = 0
-ij_kotlin_blank_lines_around_block_when_branches = 0
-ij_kotlin_blank_lines_before_declaration_with_comment_or_annotation_on_separate_line = 1
-ij_kotlin_block_comment_add_space = false
-ij_kotlin_block_comment_at_first_column = true
-ij_kotlin_call_parameters_new_line_after_left_paren = true
-ij_kotlin_call_parameters_right_paren_on_new_line = true
-ij_kotlin_call_parameters_wrap = on_every_item
-ij_kotlin_catch_on_new_line = false
-ij_kotlin_class_annotation_wrap = split_into_lines
-ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
-ij_kotlin_continuation_indent_for_chained_calls = false
-ij_kotlin_continuation_indent_for_expression_bodies = false
-ij_kotlin_continuation_indent_in_argument_lists = false
-ij_kotlin_continuation_indent_in_elvis = false
-ij_kotlin_continuation_indent_in_if_conditions = false
-ij_kotlin_continuation_indent_in_parameter_lists = false
-ij_kotlin_continuation_indent_in_supertype_lists = false
-ij_kotlin_else_on_new_line = false
-ij_kotlin_enum_constants_wrap = off
-ij_kotlin_extends_list_wrap = normal
-ij_kotlin_field_annotation_wrap = split_into_lines
-ij_kotlin_finally_on_new_line = false
-ij_kotlin_if_rparen_on_new_line = true
-ij_kotlin_import_nested_classes = false
-ij_kotlin_imports_layout = *,java.**,javax.**,kotlin.**,^
-ij_kotlin_insert_whitespaces_in_simple_one_line_method = true
-ij_kotlin_keep_blank_lines_before_right_brace = 2
-ij_kotlin_keep_blank_lines_in_code = 2
-ij_kotlin_keep_blank_lines_in_declarations = 2
-ij_kotlin_keep_first_column_comment = true
-ij_kotlin_keep_indents_on_empty_lines = false
-ij_kotlin_keep_line_breaks = true
-ij_kotlin_lbrace_on_next_line = false
-ij_kotlin_line_comment_add_space = false
-ij_kotlin_line_comment_add_space_on_reformat = false
-ij_kotlin_line_comment_at_first_column = true
-ij_kotlin_method_annotation_wrap = split_into_lines
-ij_kotlin_method_call_chain_wrap = normal
-ij_kotlin_method_parameters_new_line_after_left_paren = true
-ij_kotlin_method_parameters_right_paren_on_new_line = true
-ij_kotlin_method_parameters_wrap = on_every_item
-ij_kotlin_name_count_to_use_star_import = 5
-ij_kotlin_name_count_to_use_star_import_for_members = 3
-ij_kotlin_packages_to_use_import_on_demand = java.util.*,kotlinx.android.synthetic.**,io.ktor.**
-ij_kotlin_parameter_annotation_wrap = off
-ij_kotlin_space_after_comma = true
-ij_kotlin_space_after_extend_colon = true
-ij_kotlin_space_after_type_colon = true
-ij_kotlin_space_before_catch_parentheses = true
-ij_kotlin_space_before_comma = false
-ij_kotlin_space_before_extend_colon = true
-ij_kotlin_space_before_for_parentheses = true
-ij_kotlin_space_before_if_parentheses = true
-ij_kotlin_space_before_lambda_arrow = true
-ij_kotlin_space_before_type_colon = false
-ij_kotlin_space_before_when_parentheses = true
-ij_kotlin_space_before_while_parentheses = true
-ij_kotlin_spaces_around_additive_operators = true
-ij_kotlin_spaces_around_assignment_operators = true
-ij_kotlin_spaces_around_equality_operators = true
-ij_kotlin_spaces_around_function_type_arrow = true
-ij_kotlin_spaces_around_logical_operators = true
-ij_kotlin_spaces_around_multiplicative_operators = true
-ij_kotlin_spaces_around_range = false
-ij_kotlin_spaces_around_relational_operators = true
-ij_kotlin_spaces_around_unary_operator = false
-ij_kotlin_spaces_around_when_arrow = true
-ij_kotlin_use_custom_formatting_for_modifiers = true
-ij_kotlin_variable_annotation_wrap = off
-ij_kotlin_while_on_new_line = false
-ij_kotlin_wrap_elvis_expressions = 1
-ij_kotlin_wrap_expression_body_functions = 1
-ij_kotlin_wrap_first_method_in_call_chain = false

.gitignore

@@ -7,6 +7,5 @@ local.properties
 captures/
 build/
 release-app/
-test-app/
 scripts/apk-channel/
 app/src/test/java/com/gh/gamecenter

.gitlab-ci.yml

@@ -1,43 +0,0 @@
-stages:
-  - analysis
-  - sendmail
-
-## 代码检查
-sonarqube_analysis:
-  tags:
-    - offline-test
-  stage: analysis
-  image: sonarsource/sonar-scanner-cli:latest
-  dependencies: []    #禁止传递来的artifact
-  script:
-    ## 获取项目的一级组和二级组和项目名作为projectKey，例如projectKey=platform-backend-eci-monitor
-    - group=`echo $CI_PROJECT_PATH | sed 's#/#-#g'`
-    - sonar-scanner
-      -Dsonar.host.url=http://sonarqube-server.sonarqube:9000/
-      -Dsonar.login=be43de7264ce4c4766eb0c020373c3e74e6df257
-      -Dsonar.jacoco.reportPaths=target/jacoco.exec
-      -Dsonar.projectKey=$group
-      -Dsonar.projectName=$CI_PROJECT_PATH
-      -Dsonar.sourceEncoding=UTF-8
-      -Dsonar.exclusions=**/vendor/**,**/errcode/**
-      -Dsonar.gitlab.project_id=$CI_PROJECT_ID
-      -Dsonar.gitlab.commit_sha=$CI_COMMIT_SHA
-      -Dsonar.gitlab.ref_name=$CI_COMMIT_REF_NAME
-      -Dsonar.gitlab.ci_merge_request_iid=$CI_MERGE_REQUEST_IID
-      -Dsonar.gitlab.merge_request_discussion=true
-      -Dsonar.java.binaries=.                 # 如果不使用Maven或Gradle进行分析，则必须手动提供测试二进制文件
-  only:
-    - dev
- 
-## 发送简易检测结果报告
-send_sonar_report:
-  tags:
-    - offline-test
-  stage: sendmail
-  image: hub.shanqu.cc/library/docker:latest
-  dependencies: []    #禁止传递来的artifact
-  script:
-    - group=`echo $CI_PROJECT_PATH | sed 's#/#-#g'`
-    - docker run -e PROJECTKEY=$group -e EMAIL=$GITLAB_USER_EMAIL --name send-email --rm hub.shanqu.cc/platform/send-sonar-report:latest
-  only:
-    - dev

.gitmodules

@@ -1,10 +1,4 @@
 [submodule "libraries/LGLibrary"]
 	path = libraries/LGLibrary
-	url = git@git.shanqu.cc:android/common-library.git
+	url = git@gitlab.ghzs.com:android/common-library.git
 	branch = master
-[submodule "vspace-bridge"]
-	path = vspace-bridge
-	url = git@git.shanqu.cc:cwzs/android/vspace-bridge.git
-[submodule "module_common/src/debug/assets/assistant-android-mock"]
-	path = module_common/src/debug/assets/assistant-android-mock
-	url = git@git.shanqu.cc:halo/android/assistant-android-mock.git

README.md

@@ -1,66 +1,69 @@
 # 光环助手Android客户端
 
-### 概述
-
-光环助手Android客户端目前使用 Kotlin 作为主要开发语言，以 MVVM 作为参考架构模式进行开发
-
-### 约束
-
-为编写易读易维护且较健壮的代码，可参考以下约束
-
-1. 尽量将逻辑代码放置于 ViewModel 中，View 中只执行 UI 操作
-2. 尽量使 View 在被销毁之后仍能恢复状态，处理方式可参考 [保存界面状态](https://developer.android.com/topic/libraries/architecture/saving-states)
-3. 尽量参考原有文件结构及命名规范，即以 大模块 - 小模块 的形式生成包关系
-4. 遵循最小改动原则，在提交代码前务必先检查变动的代码，尽量以可控的变动规模来构成一个 commit ，以便日后追踪问题
-5. Commit message 提交规范可参考 [Conventional Commits](https://www.conventionalcommits.org/zh-hans/v1.0.0/)
-6. 代码规范可参考 [AOSP Java 风格](https://source.android.com/setup/contribute/code-style)
-7. 尽量使用 Kotlin 来写新文件
-8. 不要使用 DataBinding
-9. Commit 前请确保不带入非项目必须文件，可手动修改 [.gitignore](https://stackoverflow.com/questions/8527597/how-do-i-ignore-files-in-a-directory-in-git) 文件忽略
-10. 优先使用 ViewBinding 获取 View 对象
-11. No AsyncTask!
-
-### 公用部分
-
-本项目使用 LiveData 实现了一个简单通用的基础列表分页功能，具体可见 `ListFragment`, `ListViewModel` 等类，理想情况下只需少量代码即可新建一个简单分页列表
-
-### 首次拉取项目代码
-
-`git clone -b dev git@git.shanqu.cc:halo/android/assistant-android.git --recursive`
-
-### git 版本管理
-
-本项目使用简化版的 git flow 来管理分支，细节请看 [光环安卓简单 git 规范](https://git.ghzs.com/halo/android/assistant-android/-/wikis/%E5%85%89%E7%8E%AF%E5%AE%89%E5%8D%93%E7%AE%80%E5%8D%95-git-%E8%A7%84%E8%8C%83)
-
-### API 环境配置
-
-本项目使用 Build Variants 来切换 API 环境
-
-* internal 为测试环境
-* publish 为正式环境
-
-### 图片资源配置
-
-* 新增图片资源时，默认只添加最高规格的 xxxhdpi 文件
-* 新增图片资源时，需要将其转换为 .webp 格式 (包括含透明图层的图片，默认质量为90%) (转换后体积变大的文件除外)
-
-### 第三方appkey等配置
-
-* 修改 `gradle.properties` 文件将各种key填入其中，实现统一管理
-* 通过 gradle 文件内的 resValue/buildConfigField/manifestPlaceHolder 方式实现编译期间修改，具体情况请参考 ``./build.gradle`` 和 ``./app/build.gradle`` 配置
-
-### 混淆配置
-
-* 本项目使用了微信的 [AndResGuard](https://github.com/shwenzhang/AndResGuard) 作为资源混淆压缩方案，新增需要使用 `getIdentifier` 获取的资源文件时需要添加至白名单
-* 本项目默认使用 R8 作为混淆工具，往 proguard-rules.txt 添加 proguard 新配置项时请检查可用性(如语法等)
-
 ### APK打包配置
 
-> 打内部测试包：`./scripts/test_build.sh`
-> 打邮件测试包：`./scripts/jenkins_build.sh`
+* 使用[ApkChannelPackage](https://github.com/ltlovezh/ApkChannelPackage)的方案
+* 打包命令，视情况使用：
+
+    > 打包Tinker基准包：`./scripts/tinker_release_base.sh`
+
+    > 以Tinker基准包打渠道包：`./scripts/tinker_release_channel.sh`
+
+    > 以Tinker基准包打补丁包：`./scripts/tinker_release_patch.sh`
+
+### 混淆配置
+
+* 配置文件：Android默认配置+proguard-rules.txt等
+* 参考libraries下每个项目独立的配置文件`proguard-project.txt`
+
+### apk大小优化
+
+* 限制resConfig资源集
+* 开启ShrinkResources
+* 开启混淆，使用minifyEnabled(仅在release开启）
+* pngquant对png压缩、png/jpg->webp(未尝试)
+
+### 第三方appkey等配置
+
+* 修改`gradle.properties`文件将各种key填入其中，实现统一管理
+* 通过gradle文件内的resValue/buildConfigField/manifestPlaceHolder方式实现编译期间修改，具体情况请参考``./build.gradle``和``./app/build.gradle``配置
+
+### 拉取代码步骤
+
+1. 拉取主项目代码: `git clone -b dev git@gitlab.ghzhushou.com:halo/assistant-android.git`
+2. 初始化公用类库: `bash ./scripts/submodules_init.sh`
+
+### submodule管理方式(只拉取master)
+
+* 提交代码，需要cd到submodule文件夹去做修改
+* 更新远端代码，`bash ./scripts/submodules_update.sh`
 
 ### TODO
 
-* 把原有 EventBus 的消息 Type 统一到一个文件内
-* 将实现细节从 View(Fragment、Activity) 剥离并以 MVVM 结构改造
-* 重构 MainActivity
+* GSON 序列化用统一的一个, GsonUtil fromJson
+* CleanApkAdapter 转化字符串size工具函数 比如SpeedUtils
+* getString 解决 字符串hardcode问题
+* ~~Adapter 里面clicklistener 用接口传参将点击操作委托给controller~~
+* ~~Adapter ViewHolder的功能，部分重写到ViewHolder类本身~~
+
+* ~~activity 统一入口未完成(外部入口相关)，去除多余activity使用，统一toolbar~~
+* ~~release / debug compile不同的类库，不需要再做什么开关~~
+
+* ~~Toolbar分离，有图形按钮/没有图形按钮~~
+
+### TODO Since 3.1
+
+- 解决 Utils 工具类引发的内存泄漏问题
+- 把原有 EventBus 的消息 Type 统一到一个文件内
+- 将实现细节从 View(Fragment、Activity) 剥离并以 MVVM 结构改造
+- ~~将 ListViewModel 所对应的 ListRepository 合并到 ListViewModel 中~~
+- 依照光环助手界面功能以大模块 - 小模块的方式去修改包结构，包内文件建议以包名摘要作为前缀
+- ~~使用 RxJava 的 Debounce 和 Map 操作优化搜索触发机制 参考资料:[1](https://proandroiddev.com/building-an-autocompleting-edittext-using-rxjava-f69c5c3f5a40),[2](https://medium.com/@kurtisnusbaum/rxandroid-basics-part-2-6e877af352)~~
+
+- ~~把 ListViewModel 的数据结构类型转换方式换为抽象方法，让继承的类实现，避免出现无响应的问题~~
+
+- ~~rxjava2 如果接口返回为空 会发生异常:java.lang.NullPointerException: Null is not a valid element (答案编辑) 解决方法->com.gh.gamecenter.retrofit.Response~~
+- constraintLayout 1.1.2 导致布局出现异常(问题编辑标签选择弹窗)
+
+- 搞清楚 GameManager 的用途，看能不能去掉
+- 重构一下 MainActivity

app/build.gradle

@@ -1,17 +1,21 @@
-// This comment exists for a reason, do not delete
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android' // kotlin
-apply plugin: 'kotlin-parcelize'
+apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'AndResGuard'
 
-import groovy.xml.XmlUtil
+// apkChannelPackage
+apply plugin: 'channel'
+
+apply from: 'tinker-support.gradle'
 
 android {
 
-    buildFeatures {
-        viewBinding true
-        dataBinding true
+    androidExtensions {
+        experimental = true
+    }
+
+    dataBinding {
+        enabled = true
     }
 
     compileOptions {
@@ -19,42 +23,23 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-
     dexOptions {
 //        jumboMode = true
         javaMaxHeapSize "4g"
-        preDexLibraries true
-        maxProcessCount 8
-    }
-
-    aaptOptions {
-        additionalParameters "--no-version-vectors"
-    }
-
-    kapt {
-        useBuildCache = true
-        javacOptions {
-            // 增加注解处理器的最大错误次数,默认为 100
-            option("-Xmaxerrs", 500)
-        }
     }
 
     defaultConfig {
-        vectorDrawables.useSupportLibrary = true
-        multiDexEnabled true
 
-        ndk {
-            // x86 本来是为了模拟器用户使用 RenderScript 用的，但是其实用到 RenderScript 的人本来就不多 (一天不到 100)，用模拟器的人就更少了
-            // 加了 x86 反而会导致用户没法使用微博登录，因为微博没有提供 x86 的 SO ...
-            // 还会增大 APK 体积，所以还是去掉吧。数据可见 https://sentry.shanqu.cc/organizations/lightgame/issues/144232/?project=22
-            abiFilters "armeabi-v7a", "arm64-v8a"
+        multiDexEnabled true
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = [eventBusIndex: 'com.gh.EventBusIndex']
+            }
         }
 
-        renderscriptTargetApi 18
-        renderscriptSupportModeEnabled true
+        ndk {
+            abiFilters "armeabi-v7a", "x86"
+        }
 
         // 由于app只针对中文用户，所以仅保留zh资源，其他删掉
         resConfigs "zh"
@@ -70,13 +55,18 @@ android {
         /**
          * All third-party appid/appkey
          */
-        buildConfigField "String", "API_HOST", "\"${API_HOST}\""
-        buildConfigField "String", "NEW_API_HOST", "\"${NEW_API_HOST}\""
-        buildConfigField "String", "VAPI_HOST", "\"${VAPI_HOST}\""
         buildConfigField "String", "WECHAT_APPID", "\"${WECHAT_APPID}\""
         buildConfigField "String", "WECHAT_SECRET", "\"${WECHAT_SECRET}\""
         buildConfigField "String", "TENCENT_APPID", "\"${TENCENT_APPID}\""
         buildConfigField "String", "WEIBO_APPKEY", "\"${WEIBO_APPKEY}\""
+        buildConfigField "String", "MTA_APPKEY", "\"${MTA_APPKEY}\""
+        buildConfigField "String", "TD_APPID", "\"${TD_APPID}\""
+
+        /**
+         * Build Time 供区分 jenkins 打包时间用
+         */
+        buildConfigField "long", "BUILD_TIME", "0"
+
     }
 
     // gradle 2.2以上默认同时启用v1和v2（优先用于Android N）
@@ -91,12 +81,6 @@ android {
         }
     }
 
-    kapt {
-        arguments {
-            arg("AROUTER_MODULE_NAME", project.name)
-        }
-    }
-
     buildTypes {
         debug {
             debuggable true
@@ -105,7 +89,7 @@ android {
             signingConfig signingConfigs.debug
 
             buildConfigField "String", "EXPOSURE_REPO", "\"test\""
-            buildConfigField "String", "EXPOSURE_VERSION", "\"E4\""
+            buildConfigField "String", "EXPOSURE_VERSION", "\"E3\""
 
             multiDexKeepProguard file("tinker_multidexkeep.pro")
         }
@@ -117,76 +101,75 @@ android {
             signingConfig signingConfigs.release
 
             buildConfigField "String", "EXPOSURE_REPO", "\"exposure\""
-            buildConfigField "String", "EXPOSURE_VERSION", "\"E4\""
+            buildConfigField "String", "EXPOSURE_VERSION", "\"E3\""
 
             multiDexKeepProguard file("tinker_multidexkeep.pro")
         }
     }
 
-    // Ignore useless variant
-    variantFilter { variant ->
-        def names = variant.flavors*.name
-        def isDebugType = variant.buildType.name == "debug"
-        if ((names.contains("tea")) && isDebugType) {
-            setIgnore(true)
-        }
-    }
-
-    flavorDimensions("env")
-
-    sourceSets {
-        publish {
-            java.srcDirs = ['src/main/java', "src/default/java"]
-        }
-        internal {
-            java.srcDirs = ['src/main/java', "src/default/java"]
-        }
-        tea {
-            java.srcDirs = ['src/main/java', 'src/tea/java']
-        }
-    }
+    flavorDimensions "nonsense"
 
+    /**
+     * 多渠道打包，渠道请参考"channel.txt"文件，所有渠道值均通过java code设置
+     */
     productFlavors {
-        // internal test dev host
-        internal {
-            dimension "env"
-            versionNameSuffix "-debug"
-
-            buildConfigField "String", "DEV_API_HOST", "\"${DEV_API_HOST}\""
-            buildConfigField "String", "NEW_DEV_API_HOST", "\"${NEW_DEV_API_HOST}\""
-            buildConfigField "String", "DEV_VAPI_HOST", "\"${DEV_VAPI_HOST}\""
-            buildConfigField "String", "QUICK_LOGIN_APPID", "\"${DEV_QUICK_LOGIN_APPID}\""
-            buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${DEV_QUICK_LOGIN_APPKEY}\""
-        }
-
         // publish release host
         publish {
-            dimension "env"
+            dimension "nonsense"
+            buildConfigField "String", "API_HOST", "\"${API_HOST}\""
+            buildConfigField "String", "COMMENT_HOST", "\"${COMMENT_HOST}\""
+            buildConfigField "String", "DATA_HOST", "\"${DATA_HOST}\""
 
-            buildConfigField "String", "DEV_API_HOST", "\"${API_HOST}\""
-            buildConfigField "String", "NEW_DEV_API_HOST", "\"${NEW_API_HOST}\""
-            buildConfigField "String", "DEV_VAPI_HOST", "\"${VAPI_HOST}\""
-            buildConfigField "String", "QUICK_LOGIN_APPID", "\"${QUICK_LOGIN_APPID}\""
-            buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
+            buildConfigField "String", "UMENG_APPKEY", "\"${UMENG_APPKEY}\""
+            buildConfigField "String", "UMENG_MESSAGE_SECRET", "\"${UMENG_MESSAGE_SECRET}\""
+            buildConfigField "String", "MIPUSH_APPID", "\"${MIPUSH_APPID}\""
+            buildConfigField "String", "MIPUSH_APPKEY", "\"${MIPUSH_APPKEY}\""
+            buildConfigField "String", "MEIZUPUSH_APPID", "\"${MEIZUPUSH_APPID}\""
+            buildConfigField "String", "MEIZUPUSH_APPKEY", "\"${MEIZUPUSH_APPKEY}\""
+
+            buildConfigField "String", "BUGLY_APPID", "\"${BUGLY_APPID}\""
         }
+        // internal test dev host
+        internal {
+            dimension "nonsense"
+            versionNameSuffix "-debug"
 
-        tea {
-            dimension "env"
+            buildConfigField "String", "API_HOST", "\"${DEV_API_HOST}\""
+            buildConfigField "String", "COMMENT_HOST", "\"${DEV_COMMENT_HOST}\""
+            buildConfigField "String", "DATA_HOST", "\"${DEV_DATA_HOST}\""
 
-            buildConfigField "String", "DEV_API_HOST", "\"${API_HOST}\""
-            buildConfigField "String", "NEW_DEV_API_HOST", "\"${NEW_API_HOST}\""
-            buildConfigField "String", "DEV_VAPI_HOST", "\"${VAPI_HOST}\""
-            buildConfigField "String", "QUICK_LOGIN_APPID", "\"${QUICK_LOGIN_APPID}\""
-            buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
+            buildConfigField "String", "UMENG_APPKEY", "\"${DEBUG_UMENG_APPKEY}\""
+            buildConfigField "String", "UMENG_MESSAGE_SECRET", "\"${DEBUG_UMENG_MESSAGE_SECRET}\""
+            buildConfigField "String", "MIPUSH_APPID", "\"${DEBUG_MIPUSH_APPID}\""
+            buildConfigField "String", "MIPUSH_APPKEY", "\"${DEBUG_MIPUSH_APPKEY}\""
+            buildConfigField "String", "MEIZUPUSH_APPID", "\"${DEBUG_MEIZUPUSH_APPID}\""
+            buildConfigField "String", "MEIZUPUSH_APPKEY", "\"${DEBUG_MEIZUPUSH_APPKEY}\""
 
-            manifestPlaceholders.put("APPLOG_SCHEME", "rangersapplog.byAx6uYt".toLowerCase())
+            buildConfigField "String", "BUGLY_APPID", "\"${DEBUG_BUGLY_APPID}\""
         }
     }
 }
 
+// apkChannelPackage
+channel {
+    //多渠道包的输出目录，默认为new File(project.buildDir,"channel")
+    baseOutputDir = new File(project.buildDir, "channel")
+    //多渠道包的命名规则，默认为：${appName}-${versionName}-${versionCode}-${flavorName}-${buildType}
+    apkNameFormat = '${appName}-${versionName}-${versionCode}-${flavorName}-${buildType}'
+}
+
+rebuildChannel {
+//    baseDebugApk = 已有Debug APK
+//    baseReleaseApk = 已有Release APK
+//    //默认为new File(project.buildDir, "rebuildChannel/debug")
+//    debugOutputDir = Debug渠道包输出目录
+//    //默认为new File(project.buildDir, "rebuildChannel/release")
+//    releaseOutputDir = Release渠道包输出目录
+}
+
 repositories {
     flatDir {
-        dirs 'libs', 'libs/aars'
+        dirs 'libs/aars'
     }
 }
 
@@ -194,84 +177,129 @@ dependencies {
 
     implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
 
-    teaImplementation fileTree(include: ['*.jar', '*.aar'], dir: 'src/tea/libs')
     testImplementation 'junit:junit:4.12'
 
     debugImplementation "com.squareup.leakcanary:leakcanary-android:${leakcanary}"
-    debugImplementation "com.squareup.leakcanary:leakcanary-android-process:${leakcanary}"
-
-//    debugImplementation "com.gu.android:toolargetool:${toolargetool}" // 需要使用调试时才启用
-    debugImplementation "com.github.nichbar:WhatTheStack:${whatTheStack}"
-    debugImplementation "io.github.didi.dokit:dokitx:${dokit}"
-
+    debugImplementation "com.facebook.stetho:stetho:${stetho}"
+    debugImplementation "com.facebook.stetho:stetho-okhttp3:${stetho}"
+    debugImplementation "com.squareup.okhttp3:logging-interceptor:${okHttp}"
 
+    implementation "androidx.core:core:${core}"
+    implementation "androidx.fragment:fragment:${fragment}"
     implementation "androidx.multidex:multidex:${multiDex}"
-    implementation "androidx.fragment:fragment-ktx:${fragment}"
-
+    implementation "androidx.appcompat:appcompat:${appCompat}"
+    implementation "androidx.cardview:cardview:${cardView}"
     implementation "androidx.annotation:annotation:${annotation}"
-
-    implementation "androidx.viewpager2:viewpager2:${viewpager2}"
+    implementation "androidx.constraintlayout:constraintlayout:${constraintLayout}"
+    implementation "androidx.recyclerview:recyclerview:${recyclerView}"
+    implementation "androidx.lifecycle:lifecycle-runtime:${lifeCycle}"
+    implementation "androidx.lifecycle:lifecycle-extensions:${lifeCycle}"
+    kapt "androidx.lifecycle:lifecycle-compiler:${lifeCycle}"
+    implementation "androidx.room:room-runtime:${room}"
+    implementation "androidx.room:room-rxjava2:${room}"
+    implementation "androidx.core:core-ktx:${ktx}"
     kapt "androidx.room:room-compiler:${room}"
+    kapt "androidx.databinding:databinding-compiler:${databinding}"
+
+    implementation "com.google.android.material:material:${material}"
 
     implementation "com.kyleduo.switchbutton:library:${switchButton}"
 
+    implementation "com.facebook.fresco:fresco:${fresco}"
+    implementation "com.facebook.fresco:animated-gif:${fresco}"
+    implementation "com.facebook.fresco:animated-drawable:${fresco}"
+
+    implementation "com.squareup.okhttp3:okhttp:${okHttp}"
+
     implementation "com.leon.channel:helper:${apkChannelPackage}"
 
+    implementation "com.squareup.retrofit2:retrofit:${retrofit}"
+    implementation "com.squareup.retrofit2:converter-gson:${retrofit}"   // include gson 2.7
+    implementation "com.squareup.retrofit2:adapter-rxjava2:${retrofit}"
+
     implementation "com.j256.ormlite:ormlite-android:${ormlite}"
     implementation "com.j256.ormlite:ormlite-core:${ormlite}"
 
+    implementation "com.jakewharton:butterknife:${butterKnife}"
+    kapt "com.jakewharton:butterknife-compiler:${butterKnife}"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"
 
+    implementation "org.greenrobot:eventbus:${eventbus}"
+    kapt "org.greenrobot:eventbus-annotation-processor:${eventbusApt}"
+
+    implementation "io.reactivex.rxjava2:rxjava:${rxJava2}"
+    implementation "io.reactivex.rxjava2:rxandroid:${rxAndroid2}"
+    implementation "com.jakewharton.rxbinding2:rxbinding:${rxBinding2}"
+
+    implementation "com.google.zxing:core:${zxing}"
+    implementation "com.google.zxing:android-core:${zxing}"
+
+    implementation "com.daimajia.swipelayout:library:${swipeLayout}"
+
+    implementation "com.sina.weibo.sdk:core:${weiboSDK}"
+
+    // bugly with tinker support
+    implementation "com.tencent.bugly:crashreport_upgrade:${buglyTinkerSupport}"
+
+    implementation 'com.google.android:flexbox:1.1.0'
+
+    implementation "pub.devrel:easypermissions:${easypermissions}"
+
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-    implementation "com.contrarywind:Android-PickerView:${pickerView}"
+    implementation 'com.contrarywind:Android-PickerView:4.1.3'
 
+    implementation "com.scwang.smartrefresh:SmartRefreshLayout:${smartRefreshLayout}"
     implementation "net.cachapa.expandablelayout:expandablelayout:${expandableLayout}"
 
     // 用于比较 versionName 是大于小于或等于
     implementation "com.g00fy2:versioncompare:${versioncompare}"
 
+    implementation "top.zibin:Luban:${luban}"
+
+    implementation "com.squareup.picasso:picasso:${picasso}"
+
     // for video streaming
-    implementation("com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-java:$gsyVideo", {
+    implementation ("com.shuyu:gsyVideoPlayer-java:$gsyVideo",{
         exclude module: "gsyvideoplayer-androidvideocache"
-        exclude group: "tv.danmaku.ijk.media"
     })
-    implementation "com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-exo_player2:$gsyVideo"
+    implementation "com.shuyu:gsyVideoPlayer-armv7a:$gsyVideo"
+    implementation "com.shuyu:gsyVideoPlayer-x86:$gsyVideo"
 
-//    implementation "androidx.work:work-runtime:${workManager}"
+    implementation "com.github.wendux:DSBridge-Android:$dsBridge"
 
-    implementation "com.llew.huawei:verifier:${verifier}"
+    implementation "android.arch.work:work-runtime:${workManager}"
 
-    teaImplementation "com.bytedance.applog:RangersAppLog-Lite-cn:${bytedanceApplog}"
+    implementation "com.llew.huawei:verifier:1.0.6"
 
-    implementation "net.lingala.zip4j:zip4j:${zip4j}"
+    implementation "com.github.tbruyelle:rxpermissions:${rxPermissions}"
 
-    implementation "com.github.hsiafan:apk-parser:${apkParser}"
-    implementation "org.nanohttpd:nanohttpd:${nanohttpd}"
+    implementation 'com.ethanhua:skeleton:1.1.1'
+    implementation 'io.supercharge:shimmerlayout:2.1.0'
+    implementation "com.tencent.mm.opensdk:wechat-sdk-android-without-mta:5.3.1"
+    implementation 'com.walkud.rom.checker:RomChecker:1.0.0'
 
-    implementation "com.lg:easyfloat:${easyFloat}"
+    debugImplementation "com.github.nichbar.chucker:library:$chucker"
+    releaseImplementation "com.github.nichbar.chucker:library-no-op:$chucker"
+    implementation "com.bytedance.applog:RangersAppLog-Lite-cn:$bytedanceApplog"
 
-    implementation "io.github.florent37:shapeofview:${shapeOfView}"
+    implementation 'com.aliyun.dpa:oss-android-sdk:2.9.2'
 
-    implementation "com.lg:apksig:${apksig}"
+    implementation "com.airbnb.android:lottie:$lottie"
 
-    implementation "com.lg:gid:${gid}"
+    implementation("com.github.piasy:BigImageViewer:$bigImageViewer", {
+        exclude group: 'com.squareup.okhttp3'
+    })
 
-    compileOnly "com.github.axen1314.lancet:lancet-base:${lancet_version}"
-    kapt "com.alibaba:arouter-compiler:$arouterVersion"
-
-    implementation project(':vspace-bridge:vspace')
-
-    implementation (project(':module_common')) {
-        exclude group: 'androidx.swiperefreshlayout'
-    }
-    implementation(project(':module_login')) {
-        exclude group: 'androidx.swiperefreshlayout'
-    }
-    // 默认不接入光能模块，提高编译速度
-//    debugImplementation(project(':module_energy')) {
-//        exclude group: 'androidx.swiperefreshlayout'
-//    }
+    implementation project(':libraries:LGLibrary')
+    implementation project(':libraries:MTA')
+    implementation project(':libraries:QQShare')
+    implementation project(':libraries:TalkingData')
+    implementation project(':libraries:UmengPush')
+//    implementation project(':libraries:WechatShare')
+    implementation project(':libraries:im')
+    implementation project(':libraries:Matisse')
+    implementation project(path: ':libraries:gsyVideoPlayer-proxy_cache')
 }
 File propFile = file('sign.properties')
 if (propFile.exists()) {
@@ -302,7 +330,7 @@ if (propFile.exists()) {
     android.buildTypes.release.signingConfig = null
 }
 
-// 用于测试读取 META-INF 里的文件
+// 用于测试读取 META-INF 里的 JSON 的代码
 //task generateMetaJson {
 //    def resDir = new File(buildDir, 'generated/FILES_FOR_META_INF/')
 //    def destDir = new File(resDir, 'META-INF/')
@@ -329,183 +357,3 @@ if (propFile.exists()) {
 //        task.name.startsWith('merge') && task.name.endsWith('Resources')
 //    }.each { t -> t.dependsOn generateMetaJson }
 //}
-
-andResGuard {
-    mappingFile = null
-    use7zip = true
-    useSign = true
-    // 打开这个开关，会keep住所有资源的原始路径，只混淆资源的名字
-    keepRoot = false
-    // 设置这个值，会把arsc name列混淆成相同的名字，减少string常量池的大小
-    fixedResName = "arg"
-    // 打开这个开关会合并所有哈希值相同的资源，但请不要过度依赖这个功能去除去冗余资源
-    mergeDuplicatedRes = true
-    whiteList = [
-            "R.drawable.icon",
-            "R.drawable.ic_bar_back",
-            "R.drawable.toolbar_search_icon",
-            "R.drawable.bg_notification_answer_style_1",
-            "R.drawable.bg_notification_answer_style_2",
-            "R.drawable.bg_notification_article_style_1",
-            "R.drawable.bg_notification_article_style_2",
-            "R.drawable.bg_notification_feedback_style_1",
-            "R.drawable.bg_notification_feedback_style_2",
-            "R.drawable.bg_notification_gift_style_1",
-            "R.drawable.bg_notification_gift_style_2",
-            "R.drawable.bg_notification_login_style_1",
-            "R.drawable.bg_notification_login_style_2",
-            "R.drawable.bg_notification_question_style_1",
-            "R.drawable.bg_notification_question_style_2",
-            "R.drawable.bg_notification_rating_style_1",
-            "R.drawable.bg_notification_rating_style_2",
-            "R.drawable.bg_notification_reserve_game_style_1",
-            "R.drawable.bg_notification_reserve_game_style_2",
-            "R.drawable.bg_notification_video_style_1",
-            "R.drawable.bg_notification_video_style_2",
-            "R.drawable.ic_recommend_activity",
-            "R.drawable.ic_recommend_discount",
-            "R.drawable.ic_recommend_function",
-            "R.drawable.ic_recommend_gift",
-            "R.drawable.ic_recommend_role",
-            "R.drawable.download_button_normal_style",
-            "R.drawable.ic_selector_selected",
-            "R.drawable.ic_selector_default",
-            "R.id.download_speed",
-            "R.id.download_percentage",
-            "R.id.comment",
-            "R.id.vote",
-            "R.id.watermark_hint",
-            "R.id.watermark_sb",
-            "R.id.bottomShareIv",
-            "R.id.bottomShareTv",
-            "R.id.recommendStarPref",
-            "R.id.recommendStar",
-            "R.id.iv_vmode_badge",
-            "R.id.tv_vmode",
-            "R.id.iv_vmode",
-            "R.drawable.help_search_delete",
-            "R.drawable.suggest_type_normal",
-            "R.drawable.suggest_type_crash",
-            "R.drawable.suggest_type_game_question",
-            "R.drawable.suggest_type_game_collect",
-            "R.drawable.suggest_type_function_suggest",
-            "R.drawable.suggest_type_article_collect",
-            "R.drawable.suggest_type_copyright",
-            "R.drawable.help_result_empty",
-            "R.drawable.news_comment_detail_read",
-            "R.drawable.news_comment_detail_comment",
-            "R.drawable.news_comment_detail_share",
-            "R.drawable.ic_libao",
-            "R.drawable.ic_link",
-            "R.drawable.concern_message_icon",
-            "R.drawable.reuse_blank_hint",
-            "R.drawable.ic_concern",
-            "R.drawable.concern_down",
-            "R.drawable.concern_up",
-            "R.drawable.ic_libao_more",
-            "R.drawable.ic_libao_delete",
-            "R.drawable.ic_dialog_close",
-            "R.drawable.occupy2",
-            "R.drawable.kc_checkbox_unselect",
-            "R.drawable.kc_checkbox_select",
-            "R.drawable.ic_type_unselect",
-            "R.drawable.ic_type_selected",
-            "R.drawable.suggest_add_pic_icon",
-            "R.drawable.icon_pic_add",
-            "R.drawable.ask_search_input_delete",
-            "R.drawable.suggest_pic_delete"
-    ]
-    compressFilePattern = [
-            "*.png",
-            "*.jpg",
-            "*.jpeg",
-            "*.gif",
-    ]
-    sevenzip {
-        artifact = 'com.tencent.mm:SevenZip:1.2.20'
-    }
-}
-
-project.afterEvaluate {
-    def variants = null
-    try {
-        variants = android.applicationVariants
-    } catch (Throwable t) {
-        t.printStackTrace()
-        try {
-            variants = android.libraryVariants
-        } catch (Throwable tt) {
-            tt.printStackTrace()
-        }
-    }
-    if (variants != null) {
-        variants.all { variant ->
-            variant.outputs.each { output ->
-                def task = output.processManifestProvider.get()
-                if (task == null) {
-                    return
-                }
-
-                /**
-                 * 为 Manifest 的 Activity 的 configChanges 添加自己手动处理 configurationChanges 配置 [https://developer.android.com/guide/topics/resources/runtime-changes]
-                 * AGP 4.1.0 从 ProcessManifest task 里拿 manifest 的 API 变更调整可以参考这里 [https://github.com/Tencent/tinker/pull/1476/commits/d71645729b13d545ca4ba6826f93fbf558751434]
-                 * (搞半天还是不会抽离方法，有空再把 gradle 改成用 kotlin 实现吧)
-                 */
-                task.doLast {
-                    def manifestFile = new File(multiApkManifestOutputDirectory.get().asFile, "AndroidManifest.xml")
-                    if (manifestFile == null || !manifestFile.exists()) {
-                        return
-                    }
-
-                    String[] configChanges = [
-                            "density",
-                            "fontScale",
-                            "keyboard",
-                            "keyboardHidden",
-                            "layoutDirection",
-                            "locale",
-                            "mcc",
-                            "mnc",
-                            "navigation",
-                            "orientation",
-                            "screenLayout",
-                            "screenSize",
-                            "smallestScreenSize",
-                            "touchscreen",
-                            "uiMode"]
-
-                    def parser = new XmlSlurper(false, true)
-                    def manifest = parser.parse(manifestFile)
-                    def app = manifest.'application'[0]
-                    app.'activity'.each { act ->
-                        String value = act.attributes()['android:configChanges']
-                        if (value == null || value.isEmpty()) {
-                            if (value == null) value = ""
-                            configChanges.eachWithIndex { config, index ->
-                                if (index != configChanges.length - 1) {
-                                    value += config + "|"
-                                } else {
-                                    value += config
-                                }
-                            }
-                            act.attributes()['androidconfigChanges'] = value
-                        } else {
-                            String[] valueSplit = value.split("\\|")
-                            println configChanges
-                            configChanges.eachWithIndex { config, index ->
-                                if (!valueSplit.contains(config)) {
-                                    value += ("|" + config)
-                                }
-                            }
-                            act.attributes()['android:configChanges'] = value
-                        }
-                    }
-
-                    def tmpManifest = XmlUtil.serialize(manifest).replaceAll("androidconfigChanges", "android:configChanges")
-                    manifest = parser.parseText(tmpManifest)
-                    manifestFile.setText(XmlUtil.serialize(manifest), "utf-8")
-                }
-            }
-        }
-    }
-}

app/proguard-rules.txt

@@ -1,68 +1,243 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:\Android\sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
 
-# inline getter method
--allowaccessmodification
+# Add any project specific keep options here:
 
-# TODO Dicard sourceFile in final release build but remain in internal build.
--renamesourcefileattribute SourceFile
-# Keep Attribute
--keepattributes *Annotation*,Signature,InnerClasses,EnclosingMethod,SourceFile,LineNumberTable
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
 
-# OrmLite
--keep class com.j256.*
--keepclassmembers class com.j256.* { *; }
--keep enum com.j256.*
--keepclassmembers enum com.j256.* { *; }
--keep interface com.j256.*
--keepclassmembers interface com.j256.* { *; }
+#--------- remove logs start  ----------------
+-assumenosideeffects class com.lightgame.config.CommonDebug {
+   private static String getLogTag(...);
+   private static String getMethodName();
+   public static void logMethodName(...);
+   public static void logParams(...);
+   public static void logFields(...);
+   public static void logMethodWithParams(...);
+}
+
+#-assumenosideeffects class com.lightgame.config.CommonDebug {*;}
+
+#-dontoptimize
+#--------- remove logs end  ----------------
+
+-keepattributes *Annotation*,Signature,InnerClasses,EnclosingMethod
+-dontwarn InnerClasses
+
+# OrmLite uses reflection
+-keep class com.j256.**
+-keepclassmembers class com.j256.** { *; }
+-keep enum com.j256.**
+-keepclassmembers enum com.j256.** { *; }
+-keep interface com.j256.**
+-keepclassmembers interface com.j256.** { *; }
 -dontwarn com.j256.**
 
-### app models
--keep class com.gh.common.view.* {*;}
--keep class com.gh.gamecenter.db.info.* {*;}
--keep class com.gh.gamecenter.entity.* {*;}
--keep class com.gh.gamecenter.qa.entity.* {*;}
--keep class com.gh.gamecenter.retrofit.* {*;}
--keep class com.gh.gamecenter.eventbus.* {*;}
--keep class com.gh.gamecenter.video.detail.* {*;}
--keep class com.gh.gamecenter.home.gamecollection.* {*;}
+#okhttp3
+-dontwarn com.squareup.okhttp3.**
+-dontwarn okio.**
+-keep class com.squareup.okhttp3.** { *;}
+
+# stetho
+-keep class com.facebook.stetho.** { *; }
+-dontwarn com.facebook.stetho.**
+
+# Retrofit 2.2
+# Platform calls Class.forName on types which do not exist on Android to determine platform.
+-dontnote retrofit2.Platform
+# Platform used when running on Java 8 VMs. Will not be used at runtime.
+-dontwarn retrofit2.Platform$Java8
+# Retain generic type information for use by reflection by converters and adapters.
+-keepattributes Signature
+# Retain declared checked exceptions for use by a Proxy instance.
+-keepattributes Exceptions
+
+# Retrofit 2.X
+## https://square.github.io/retrofit/ ##
+
+-dontwarn retrofit2.**
+-keep class retrofit2.** { *; }
+-keepattributes Signature
+-keepattributes Exceptions
+
+-keepclasseswithmembers class * {
+    @retrofit2.http.* <methods>;
+}
 
 
-# TODO What's this ?
+# rxjava
+-keep class rx.schedulers.Schedulers {
+    public static <methods>;
+}
+-keep class rx.schedulers.ImmediateScheduler {
+    public <methods>;
+}
+-keep class rx.schedulers.TestScheduler {
+    public <methods>;
+}
+-keep class rx.schedulers.Schedulers {
+    public static ** test();
+}
+-keepclassmembers class rx.internal.util.unsafe.*ArrayQueue*Field* {
+    long producerIndex;
+    long consumerIndex;
+}
+-keepclassmembers class rx.internal.util.unsafe.BaseLinkedQueueProducerNodeRef {
+    long producerNode;
+    long consumerNode;
+}
+-dontwarn rx.internal.util.**
+
+## AutoScrollViewPager
+-keep class cn.trinea.android.** { *; }
+-keepclassmembers class cn.trinea.android.** { *; }
+-dontwarn cn.trinea.android.**
+
+## butterknife
+# Retain generated class which implement Unbinder.
+#-keep public class * implements butterknife.Unbinder { public <init>(**, android.view.View); }
+#
+## Prevent obfuscation of types which use ButterKnife annotations since the simple name
+## is used to reflectively look up the generated ViewBinding.
+#-keep class butterknife.*
+#-keepclasseswithmembernames class * { @butterknife.* <methods>; }
+#-keepclasseswithmembernames class * { @butterknife.* <fields>; }
+
+-dontwarn butterknife.internal.**
+-keep class **$$ViewInjector { *; }
+-keepnames class * { @butterknife.InjectView *;}
+-dontwarn butterknife.Views$InjectViewProcessor
+-dontwarn com.gc.materialdesign.views.**
+
+# eventbus
+-keepattributes *Annotation*
+-keepclassmembers class ** {
+    @org.greenrobot.eventbus.Subscribe <methods>;
+}
+-keep enum org.greenrobot.eventbus.ThreadMode { *; }
+
+# Only required if you use AsyncExecutor
+-keepclassmembers class * extends org.greenrobot.eventbus.util.ThrowableFailureEvent {
+    <init>(java.lang.Throwable);
+}
+
+# weiboSdk
+-keep class com.sina.weibo.sdk.** { *; }
+-dontwarn android.webkit.WebView
+-dontwarn android.webkit.WebViewClient
+
+# app models
+-keep class com.gh.common.view.** {*;}
+-keep class com.gh.gamecenter.db.info.** {*;}
+-keep class com.gh.gamecenter.entity.** {*;}
+-keep class com.gh.gamecenter.qa.entity.** {*;}
+-keep class com.gh.gamecenter.retrofit.** {*;}
+-keep class com.gh.gamecenter.eventbus.** {*;}
+-keep class * extends rx.Subscriber
+
+#---------------------------------webview------------------------------------
+-keepclassmembers class * extends android.webkit.WebViewClient {
+    public void *(android.webkit.WebView, java.lang.String, android.graphics.Bitmap);
+    public boolean *(android.webkit.WebView, java.lang.String);
+}
+-keepclassmembers class * extends android.webkit.WebViewClient {
+    public void *(android.webkit.WebView, java.lang.String);
+}
+#----------------------------------------------------------------------------
+
+
+##---------------Begin: proguard configuration for Gson  ----------
+# Gson uses generic type information stored in a class file when working with fields. Proguard
+# removes such information by default, so configure it to keep all of it.
+-keepattributes Signature
+
+# For using GSON @Expose annotation
+-keepattributes *Annotation*
+
+# Gson specific classes
+-keep class sun.misc.Unsafe { *; }
+#-keep class com.google.gson.stream.** { *; }
+
+# Prevent proguard from stripping interface information from TypeAdapterFactory,
+# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
+-keep class * implements com.google.gson.TypeAdapterFactory
+-keep class * implements com.google.gson.JsonSerializer
+-keep class * implements com.google.gson.JsonDeserializer
+
+-keepclassmembers enum * { *; }
+
+##---------------End: proguard configuration for Gson  ----------
+
+# ------ bugly ---------
+-dontwarn com.tencent.bugly.**
+-keep public class com.tencent.bugly.**{*;}
+
+# easypermission
+-keepclassmembers class * {
+    @pub.devrel.easypermissions.AfterPermissionGranted <methods>;
+}
+
+# 重命名文件为SourceFile，再配合mapping符号表，可以拿到真实的类名
+-renamesourcefileattribute SourceFile
+# 保留源文件行号
+-keepattributes SourceFile,LineNumberTable
+
 -ignorewarnings
 
-### 视频相关
--keep class com.shuyu.gsyvideoplayer.video.* { *; }
+-keep @androidx.annotation.Keep class *
+-keepclassmembers class ** {
+    @androidx.annotation.Keep *;
+}
+
+-keep class com.gh.loghub.** { *; }
+
+### greenDAO 3
+-keepclassmembers class * extends org.greenrobot.greendao.AbstractDao {
+    public static java.lang.String TABLENAME;
+}
+-keep class **$Properties
+-keep class org.greenrobot.greendao.** { *; }
+# If you do not use SQLCipher:
+-dontwarn org.greenrobot.greendao.database.**
+# If you do not use RxJava:
+-dontwarn rx.**
+-dontwarn org.greenrobot.greendao.rx.**
+-dontwarn org.greenrobot.greendao.**
+
+### fastJson
+-dontwarn com.alibaba.fastjson.**
+-keep class com.alibaba.fastjson.** { *; }
+-keepattributes Signature
+-keepattributes Annotation
+
+### 广点通
+-dontwarn com.qq.gdt.action.**
+-keep class com.qq.gdt.action.** {*;}
+
+### AndroidX
+-keep class androidx.core.app.CoreComponentFactory { *; }
+
+#阿里云上传
+-keep class com.alibaba.sdk.android.oss.** { *; }
+-dontwarn okio.**
+-dontwarn org.apache.commons.codec.binary.**
+
+#视频相关
+-keep class com.shuyu.gsyvideoplayer.video.** { *; }
 -dontwarn com.shuyu.gsyvideoplayer.video.**
--keep class com.shuyu.gsyvideoplayer.video.base.* { *; }
+-keep class com.shuyu.gsyvideoplayer.video.base.** { *; }
 -dontwarn com.shuyu.gsyvideoplayer.video.base.**
--keep class com.shuyu.gsyvideoplayer.utils.* { *; }
+-keep class com.shuyu.gsyvideoplayer.utils.** { *; }
 -dontwarn com.shuyu.gsyvideoplayer.utils.**
--keep class tv.danmaku.ijk.* { *; }
--dontwarn tv.danmaku.ijk.**
--keep public class * extends android.view.View{
-    *** get*();
-    void set*(***);
-    public <init>(android.content.Context);
-    public <init>(android.content.Context, android.util.AttributeSet);
-    public <init>(android.content.Context, android.util.AttributeSet, int);
-}
-
-### TEA
--keep class com.gh.gamecenter.TeaHelper { *; }
-
-### EasyFloat
--keep class com.lzf.easyfloat.* {*;}
-
-### dokit
--keep class com.didichuxing.** {*;}
-
-# Flutter模块
--keep class com.gh.common.util.DirectUtils {
-    public static void directToQa(...);
-    public static void directToQaCollection(...);
-    public static void directToGift(...);
-    public static void directToConcernInfo(...);
-    public static void directToFeedback(...);
-    public static void directToSuggestion(...);
-}
-
+-keep class tv.danmaku.ijk.** { *; }
+-dontwarn tv.danmaku.ijk.**

app/src/debug/java/com/gh/gamecenter/Injection.java

@@ -0,0 +1,46 @@
+package com.gh.gamecenter;
+
+import android.app.Application;
+
+import com.facebook.stetho.Stetho;
+import com.facebook.stetho.okhttp3.StethoInterceptor;
+import com.squareup.leakcanary.LeakCanary;
+
+import okhttp3.OkHttpClient;
+import okhttp3.logging.HttpLoggingInterceptor;
+
+/**
+ * @author CsHeng
+ * @Date 03/09/2017
+ * @Time 4:34 PM
+ */
+
+public class Injection {
+
+    public static boolean appInit(Application application) {
+
+        // init leakcanary
+        if (LeakCanary.isInAnalyzerProcess(application)) {
+            // This process is dedicated to LeakCanary for heap analysis.
+            // You should not init your app in this process.
+            return false;
+        }
+        LeakCanary.install(application);
+
+        // init stetho
+        Stetho.initializeWithDefaults(application);
+
+        return true;
+    }
+
+    public static OkHttpClient.Builder provideRetrofitBuilder() {
+        OkHttpClient.Builder builder = new OkHttpClient.Builder();
+        HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor();
+        interceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
+        builder.addNetworkInterceptor(interceptor);
+        builder.addNetworkInterceptor(new StethoInterceptor());
+        return builder;
+    }
+
+
+}

app/src/default/java/com/gh/gamecenter/provider/ChannelProviderImp.kt

@@ -1,26 +0,0 @@
-package com.gh.gamecenter.provider
-
-import android.app.Application
-import android.text.TextUtils
-import com.gh.gamecenter.common.constant.Config
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.utils.PackageFlavorHelper
-import com.gh.gamecenter.core.utils.SPUtils
-import com.leon.channel.helper.ChannelReaderUtil
-
-class ChannelProviderImp : ChannelProvider {
-    override fun getChannelStr(application: Application): String {
-        var channel = ChannelReaderUtil.getChannel(application)
-        if (channel == null || TextUtils.isEmpty(channel.trim())) {
-            channel = if (PackageFlavorHelper.IS_TEST_FLAVOR) {
-                Config.DEFAULT_CHANNEL
-            } else {
-                Config.DEFAULT_CHANNEL_FOR_RELEASE
-            }
-        }
-        if (PackageFlavorHelper.IS_TEST_FLAVOR) {
-            channel = SPUtils.getString(Constants.SP_TEST_FLAVOR_CHANNEL, channel)
-        }
-        return channel
-    }
-}

app/src/main/AndroidManifest.xml

@@ -3,69 +3,52 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.gh.gamecenter">
 
-    <queries>
-        <package android:name="com.gh.gamecenter" />
-    </queries>
     <!-- 允许应用程序访问网络连接 -->
     <uses-permission android:name="android.permission.INTERNET" />
     <!-- 允许应用程序写入外部存储，如SD卡上写文件 -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <!-- 允许应用程序读取扩展存储器 -->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <!-- 允许挂载和反挂载文件系统可移动存储 -->
+    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
     <!-- 允许应用程序访问Wi-Fi网络状态信息 -->
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <!-- 允许应用程序获取网络信息状态 -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <!-- 允许应用程序读取电话状态 -->
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <!-- 允许应用程序获取当前或最近运行的应用 -->
+    <uses-permission android:name="android.permission.GET_TASKS" />
     <!-- 允许访问振动设备 -->
     <uses-permission android:name="android.permission.VIBRATE" />
     <!-- 允许应用程序改变Wi-Fi连接状态 -->
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <!-- 允许应用程序改变网络连接状态 -->
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <!-- 允许应用程序快捷方式 -->
-    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
-    <!-- 应用安装相关 -->
-    <uses-permission android:name="com.android.permission.GET_INSTALLED_APPS" />
-
-    <!-- 前台服务权限-->
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <!-- 允许应用程序打开系统窗口，显示其他应用程序 -->
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+    <!-- 修改系统设置的权限 -->
+    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
 
     <uses-permission
         android:name="android.permission.PACKAGE_USAGE_STATS"
         tools:ignore="ProtectedPermissions" />
 
+    <!-- bugly with tinker -->
+    <uses-permission android:name="android.permission.READ_LOGS" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
-    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
-
-    <!-- 如果有视频相关的广告且使用textureView播放，请务必添加，否则黑屏 -->
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-
     <uses-sdk tools:overrideLibrary="com.shuyu.gsyvideoplayer,
         com.shuyu.gsyvideoplayer.lib,
-        com.haroldadmin.whatthestack,
         com.shuyu.gsyvideoplayer.armv7a,
         com.shuyu.gsyvideoplayer.x86,
         com.shuyu.gsy.base,
         shuyu.com.androidvideocache,
-        com.google.android.exoplayer2,
-        tv.danmaku.ijk.media.exo2,
-        pl.droidsonroids.gif,
-        com.lzf.easyfloat" />
+        pl.droidsonroids.gif" />
 
     <!-- 去掉 SDK 一些流氓权限 -->
     <uses-permission
         android:name="android.permission.READ_CONTACTS"
         tools:node="remove" />
 
-    <uses-permission
-        android:name="android.permission.READ_PHONE_STATE"
-        tools:node="remove" />
-
-    <uses-permission
-        android:name="android.permission.GET_TASKS"
-        tools:node="remove" />
-
     <supports-screens
         android:anyDensity="true"
         android:largeScreens="true"
@@ -75,25 +58,16 @@
 
     <!--android:largeHeap = "true"-->
     <application
-        android:name="com.halo.assistant.HaloApp"
+        android:name="com.halo.assistant.TinkerApp"
         android:allowBackup="true"
         android:icon="@mipmap/logo"
         android:label="@string/app_name"
         android:largeHeap="true"
         android:resizeableActivity="true"
         android:theme="@style/AppCompatTheme.APP"
-        tools:replace="android:name,android:allowBackup"
         tools:targetApi="n">
 
-        <meta-data
-            android:name="io.sentry.auto-init"
-            android:value="false" />
-
-        <!-- 不让 sentry 读取系统事件 -->
-        <meta-data
-            android:name="io.sentry.breadcrumbs.system-events"
-            android:value="false" />
-
+        <!--android:launchMode = "singleTask"-->
         <activity
             android:name="com.gh.gamecenter.SplashScreenActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -120,9 +94,8 @@
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name="com.gh.gamecenter.ImageViewerActivity"
-            android:theme="@style/Theme.Transparent" />
+        <!--android:theme = "@android:style/Theme.Black.NoTitleBar.Fullscreen"  退出时屏幕抖动 -->
+        <activity android:name="com.gh.gamecenter.ViewImageActivity" />
 
         <activity
             android:name="com.gh.gamecenter.SearchActivity"
@@ -140,10 +113,6 @@
             android:name="com.gh.gamecenter.ShellActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name="com.gh.gamecenter.gamedetail.history.HistoryApkListActivity"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name="com.gh.gamecenter.NewsDetailActivity"
             android:screenOrientation="portrait" />
@@ -177,14 +146,6 @@
             android:name="com.gh.gamecenter.WebActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name="com.gh.gamecenter.SingletonWebActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.gh.gamecenter.FullScreenWebActivity"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name="com.gh.gamecenter.ShareCardPicActivity"
             android:screenOrientation="portrait" />
@@ -195,8 +156,7 @@
 
         <activity
             android:name="com.gh.gamecenter.MessageDetailActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/TransparentStatusBarAndNavigationBar" />
+            android:screenOrientation="portrait" />
 
         <activity
             android:name="com.gh.gamecenter.LibaoActivity"
@@ -223,18 +183,9 @@
             android:name="com.gh.gamecenter.AboutActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name="com.gh.gamecenter.security.SecurityActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.gh.gamecenter.security.BindPhoneActivity"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name="com.gh.gamecenter.CommentDetailActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/TransparentStatusBarAndNavigationBar" />
+            android:screenOrientation="portrait" />
 
         <activity
             android:name="com.gh.gamecenter.mygame.MyGameActivity"
@@ -253,6 +204,11 @@
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateAlwaysHidden|adjustResize" />
 
+        <activity
+            android:name="com.gh.gamecenter.ToolBoxActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden" />
+
         <activity
             android:name="com.gh.gamecenter.WeiBoShareActivity"
             android:screenOrientation="portrait"
@@ -266,6 +222,11 @@
             android:name=".category.CategoryListActivity"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name="com.gh.gamecenter.LoginActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden" />
+
         <activity
             android:name="com.gh.gamecenter.UserInfoActivity"
             android:screenOrientation="portrait" />
@@ -287,10 +248,22 @@
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden" />
 
+        <activity
+            android:name="com.gh.gamecenter.qa.search.AskSearchActivity"
+            android:screenOrientation="portrait" />
+
         <activity
             android:name="com.gh.gamecenter.qa.answer.detail.AnswerDetailActivity"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name="com.gh.gamecenter.qa.questions.detail.QuestionsDetailActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".qa.answer.fold.AnswerFoldActivity"
+            android:screenOrientation="portrait" />
+
         <activity
             android:name="com.gh.gamecenter.qa.answer.edit.AnswerEditActivity"
             android:screenOrientation="portrait" />
@@ -307,6 +280,14 @@
             android:name="com.gh.gamecenter.MessageKeFuActivity"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name="com.gh.gamecenter.qa.select.CommunitiesSelectActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.subject.CommunitySubjectActivity"
+            android:screenOrientation="portrait" />
+
         <activity
             android:name="com.gh.gamecenter.MessageInviteActivity"
             android:screenOrientation="portrait" />
@@ -323,6 +304,10 @@
             android:name="com.gh.gamecenter.qa.myqa.MyAskActivity"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name="com.gh.gamecenter.qa.column.order.AskTabOrderActivity"
+            android:screenOrientation="portrait" />
+
         <activity
             android:name="com.gh.gamecenter.qa.questions.edit.QuestionEditActivity"
             android:screenOrientation="portrait" />
@@ -344,6 +329,10 @@
             android:name="com.gh.gamecenter.amway.AmwayActivity"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name="com.gh.gamecenter.qa.column.detail.AskColumnDetailActivity"
+            android:screenOrientation="portrait" />
+
         <activity
             android:name="com.gh.gamecenter.NetworkDiagnosisActivity"
             android:screenOrientation="portrait" />
@@ -385,6 +374,14 @@
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateVisible" />
 
+        <activity
+            android:name="com.gh.gamecenter.qa.questions.edit.manager.HistoryDetailActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.questions.edit.manager.HistoryActivity"
+            android:screenOrientation="portrait" />
+
         <activity
             android:name="com.gh.gamecenter.qa.editor.InsertAnswerWrapperActivity"
             android:screenOrientation="portrait" />
@@ -399,8 +396,7 @@
 
         <activity
             android:name="com.gh.gamecenter.gamedetail.rating.RatingReplyActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/TransparentStatusBarAndNavigationBar" />
+            android:screenOrientation="portrait" />
 
         <activity
             android:name="com.gh.gamecenter.history.HistoryActivity"
@@ -418,21 +414,24 @@
             android:name="com.gh.gamecenter.tag.TagsActivity"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name="com.gh.gamecenter.qa.article.SimpleArticleListActivity"
+            android:screenOrientation="portrait" />
+
         <activity
             android:name="com.gh.gamecenter.video.videomanager.VideoManagerActivity"
             android:screenOrientation="portrait" />
 
         <activity
             android:name="com.gh.gamecenter.video.upload.view.UploadVideoActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden" />
+            android:screenOrientation="portrait" />
 
         <activity
             android:name="com.gh.gamecenter.video.game.GameVideoActivity"
             android:screenOrientation="portrait" />
 
         <activity
-            android:name="com.gh.gamecenter.qa.editor.LocalMediaActivity"
+            android:name="com.gh.gamecenter.qa.editor.VideoActivity"
             android:screenOrientation="portrait" />
 
         <activity
@@ -457,8 +456,8 @@
 
         <activity
             android:name="com.gh.gamecenter.HelpAndFeedbackActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden" />
+            android:windowSoftInputMode="stateHidden"
+            android:screenOrientation="portrait" />
 
         <activity
             android:name="com.gh.gamecenter.help.HelpDetailActivity"
@@ -466,11 +465,7 @@
 
         <activity
             android:name="com.gh.gamecenter.qa.comment.CommentActivity"
-            android:theme="@style/Theme.Transparent"
-            android:windowSoftInputMode="adjustNothing" />
-
-        <activity
-            android:name=".qa.dialog.ChooseForumActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.Transparent"
             android:windowSoftInputMode="adjustNothing" />
 
@@ -483,166 +478,13 @@
             android:name=".gamedetail.myrating.MyRatingActivity"
             android:screenOrientation="portrait" />
 
+        <!-- 使用小米/华为推送弹窗功能提高推送成功率-->
         <activity
-            android:name="com.gh.gamecenter.gamedetail.fuli.kaifu.ServersCalendarActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.gh.gamecenter.QaActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".qa.answer.draft.AnswerDraftActivity"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name=".gamedetail.rating.RatingFoldActivity"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name=".video.data.VideoDataActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".video.poster.PosterEditActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".video.poster.PosterClipActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".forum.detail.ForumDetailActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".forum.moderator.ModeratorListActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".forum.moderator.ApplyModeratorActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".video.label.VideoLabelActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".personalhome.border.AvatarBorderActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".personalhome.background.PersonalityBackgroundActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".personalhome.background.BackgroundPreviewActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".personalhome.background.BackgroundClipActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/TransparentStatusBarAndNavigationBar" />
-
-        <activity
-            android:name=".simulatorgame.SimulatorGameActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".simulatorgame.SimulatorManagementActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".catalog.CatalogActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".catalog.NewCatalogListActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".forum.search.ForumOrUserSearchActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".qa.questions.draft.QuestionDraftActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".servers.GameServerTestActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".category2.CategoryV2Activity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".personal.DeliveryInfoActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".qa.editor.PreviewVideoActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".qa.video.publish.VideoPublishActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".setting.GameDownloadSettingActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".setting.VideoSettingActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".qa.video.detail.ForumVideoDetailActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".video.videomanager.VideoDraftActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".qa.questions.newdetail.NewQuestionDetailActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".qa.editor.FullScreenVideoActivity"
-            android:theme="@style/AppFullScreenTheme" />
-
-        <activity
-            android:name=".forum.list.ForumListActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".qa.answer.detail.SimpleAnswerDetailActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".game.commoncollection.detail.CommonCollectionDetailActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".gamecollection.detail.GameCollectionDetailActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".gamecollection.detail.GameCollectionPosterActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".home.skip.PackageSkipActivity"
-            android:screenOrientation="portrait" />
-
-        <!--        &lt;!&ndash; 使用小米/华为推送弹窗功能提高推送成功率&ndash;&gt;-->
-        <!--        <activity-->
-        <!--            android:name="com.gh.gamecenter.PushProxyActivity"-->
-        <!--            android:exported="true"-->
-        <!--            android:launchMode="singleTask"-->
-        <!--            android:theme="@android:style/Theme.Translucent" />-->
-
-        <activity
+            android:name="com.gh.gamecenter.PushProxyActivity"
             android:exported="true"
+            android:theme="@android:style/Theme.Translucent" />
+
+        <activity
             android:name="com.gh.gamecenter.SkipActivity"
             android:theme="@style/Theme.AppCompat.Light.Fullscreen.Transparent">
             <intent-filter>
@@ -652,92 +494,15 @@
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.BROWSABLE" />
             </intent-filter>
-
-            <intent-filter>
-                <data android:scheme="market" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.BROWSABLE" />
-            </intent-filter>
         </activity>
 
         <activity
-            android:name="com.gh.gamecenter.teenagermode.TeenagerModeActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".gamecollection.publish.GameCollectionEditActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".gamecollection.choose.ChooseGamesActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".gamecollection.choose.AddGamesActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".gamecollection.mine.MyGameCollectionActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.gh.gamecenter.gamecollection.square.GameCollectionSquareActivity"
-            android:screenOrientation="portrait" />
-
-
-        <activity
-            android:name="com.gh.gamecenter.gamecollection.tag.GameCollectionTagSelectActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".qa.editor.InsertGameCollectionWrapperActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".qa.editor.InsertVideoWrapperActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.gh.gamecenter.toolbox.ToolBoxBlockActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.gh.vspace.VDownloadManagerActivity"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.gh.vspace.VSpaceLoadingActivity"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.gh.gamecenter.qa.subject.CommunitySubjectActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".qa.comment.NewCommentDetailActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.gh.gamecenter.mypost.MyPostActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".VerifyPhoneActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".BbsCertificationActivity"
-            android:screenOrientation="portrait" />
-
-        <!--        <activity-->
-        <!--            android:name="${applicationId}.douyinapi.DouYinEntryActivity"-->
-        <!--            android:launchMode="singleTask"-->
-        <!--            android:taskAffinity="${applicationId}"-->
-        <!--            android:exported="true" />-->
+            android:name="${applicationId}.wxapi.WXEntryActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"></activity>
 
         <provider
             android:name="androidx.core.content.FileProvider"
@@ -749,24 +514,6 @@
                 android:resource="@xml/provider_paths" />
         </provider>
 
-        <provider
-            android:name="com.gh.gamecenter.provider.GhContentProvider"
-            android:authorities="${applicationId}.provider"
-            android:enabled="true"
-            android:exported="true" />
-
-        <!--        <provider-->
-        <!--            android:name="androidx.startup.InitializationProvider"-->
-        <!--            android:authorities="${applicationId}.androidx-startup"-->
-        <!--            android:exported="false"-->
-        <!--            tools:node="merge">-->
-        <!--            &lt;!&ndash; If you are using androidx.startup to initialize other components &ndash;&gt;-->
-        <!--            <meta-data-->
-        <!--                android:name="androidx.work.WorkManagerInitializer"-->
-        <!--                android:value="androidx.startup"-->
-        <!--                tools:node="remove" />-->
-        <!--        </provider>-->
-
         <receiver
             android:name="com.gh.gamecenter.receiver.DownloadReceiver"
             android:exported="false">
@@ -790,39 +537,42 @@
             </intent-filter>
         </receiver>
 
-        <!-- 梦工厂配置 开始 -->
-        <!--<meta-data
-            android:name="MGC_APPID"
-            android:value="1001276" />
+        <receiver android:name="com.gh.gamecenter.receiver.UmengMessageReceiver">
+            <intent-filter>
+                <action android:name="com.gh.gamecenter.UMENG" />
+            </intent-filter>
+        </receiver>
 
-        <provider
-            android:name="com.leto.game.base.provider.LetoFileProvider"
-            android:authorities="${applicationId}.leto.fileprovider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/leto_file_path"
-                tools:replace="android:resource" />
-        </provider>-->
-        <!-- 梦工厂配置 结束 -->
+        <!--魅族push应用定义消息receiver声明 -->
+        <receiver android:name="com.gh.gamecenter.receiver.MeizuPushReceiver">
+            <intent-filter>
+                <!-- 接收push消息 -->
+                <action android:name="com.meizu.flyme.push.intent.MESSAGE" />
+                <!-- 接收register消息 -->
+                <action android:name="com.meizu.flyme.push.intent.REGISTER.FEEDBACK" />
+                <!-- 接收unregister消息-->
+                <action android:name="com.meizu.flyme.push.intent.UNREGISTER.FEEDBACK" />
+                <!-- 兼容低版本Flyme3推送服务配置 -->
+                <action android:name="com.meizu.c2dm.intent.REGISTRATION" />
+                <action android:name="com.meizu.c2dm.intent.RECEIVE" />
 
-        <!-- 穿山甲配置 开始 -->
-        <!--<provider
-            android:name="com.bytedance.sdk.openadsdk.TTFileProvider"
-            android:authorities="${applicationId}.TTFileProvider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths" />
-        </provider>
+                <category android:name="${applicationId}" />
+            </intent-filter>
+        </receiver>
+
+        <receiver
+            android:name="com.gh.common.im.ImReceiver"
+            android:enabled="true">
+            <intent-filter android:priority="2147483647">
+                <action android:name="com.gh.im" />
+                <action android:name="action_finish" />
+            </intent-filter>
+        </receiver>
+
+        <service android:name="com.gh.base.GHUmengNotificationService" />
+
+        <!--<service android:name = "com.gh.gamecenter.statistics.AppStaticService" />-->
 
-        <provider
-            android:name="com.bytedance.sdk.openadsdk.multipro.TTMultiProvider"
-            android:authorities="${applicationId}.TTMultiProvider"
-            android:exported="false" />-->
-        <!-- 穿山甲配置 结束 -->
     </application>
 
 </manifest>

app/src/main/assets/editor.html

@@ -2,20 +2,16 @@
 <html>
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
     <link rel="stylesheet" type="text/css" href="normalize.css">
     <link rel="stylesheet" type="text/css" href="style.css">
     <link rel="stylesheet" type="text/css" href="video-js.min.css">
-<!--    <link rel="stylesheet" href="https://static-web.ghzs.com/website-static/lib/video-js.min.css">--> <!--在web页面播放视频-->
     <!--<link rel="stylesheet" type="text/css" href="https://resource.ghzs.com/css/halo_app.css">-->
 </head>
-
-<body style="overflow-x: hidden; word-break: break-all;">
+<body>
 <div id="editor" contenteditable="false"></div>
 <script type="text/javascript" src="zepto.min.js"></script>
 <script type="text/javascript" src="rich_editor.js"></script>
 <script type="text/javascript" src="video.min.js"></script>
-<!--<script src="https://static-web.ghzs.com/website-static/lib/video.min.js"></script>--> <!--在web页面播放视频-->
 <!--<script type="text/javascript" src="content.js"></script>-->
 <!--<script type="text/javascript" src="https://resource.ghzs.com/js/halo_app.js"></script>-->
 </body>

app/src/main/assets/emojikf

@@ -0,0 +1,40 @@
+emoji_kf_1.png,:smile:
+emoji_kf_2.png,:smiley:
+emoji_kf_3.png,:laughing:
+emoji_kf_4.png,:blush:
+emoji_kf_5.png,:heart_eyes:
+emoji_kf_6.png,:smirk:
+emoji_kf_7.png,:flushed:
+emoji_kf_8.png,:kissing_heart:
+emoji_kf_9.png,:grin:
+emoji_kf_10.png,:wink:
+emoji_kf_11.png,:stuck_out_tongue_winking_eye:
+emoji_kf_12.png,:stuck_out_tongue_closed eyes:
+emoji_kf_13.png,:worried:
+emoji_kf_14.png,:sleeping:
+emoji_kf_15.png,:expressionless:
+emoji_kf_16.png,:sweat_smile:
+emoji_kf_17.png,:joy:
+emoji_kf_18.png,:cold_sweat:
+emoji_kf_19.png,:sob:
+emoji_kf_20.png,:angry:
+emoji_kf_21.png,:mask:
+emoji_kf_22.png,:scream:
+emoji_kf_23.png,:sunglasses:
+emoji_kf_24.png,:heart:
+emoji_kf_25.png,:broken_heart:
+emoji_kf_26.png,:star:
+emoji_kf_27.png,:anger:
+emoji_kf_28.png,:exclamation:
+emoji_kf_29.png,:question:
+emoji_kf_30.png,:zzz:
+emoji_kf_31.png,:thumbsup:
+emoji_kf_32.png,:thumbsdown:
+emoji_kf_33.png,:ok_hand:
+emoji_kf_34.png,:punch:
+emoji_kf_35.png,:yeah:
+emoji_kf_36.png,:clap:
+emoji_kf_37.png,:muscle:
+emoji_kf_38.png,:pray:
+emoji_kf_39.png,:skull:
+emoji_kf_40.png,:trollface:

app/src/main/assets/lottie/double_click_guide.json

@@ -1 +0,0 @@
-{"v":"5.6.4","fr":25,"ip":0,"op":35,"w":1080,"h":214,"nm":"点赞","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"椭圆形 2","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.588],"y":[0]},"t":17,"s":[15]},{"t":20,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[468.04,73.68,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.659,0.659,0.333],"y":[0,0,0]},"t":10,"s":[50,50,100]},{"t":19,"s":[150,150,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[24,24],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":10,"op":1510,"st":10,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"椭圆形 3","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.588],"y":[0]},"t":27,"s":[15]},{"t":30,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[468.04,73.68,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.659,0.659,0.333],"y":[0,0,0]},"t":20,"s":[50,50,100]},{"t":28,"s":[140,140,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[24,24],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":20,"op":1520,"st":20,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"路径备份 2","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.602],"y":[0]},"t":0,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":5,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.663],"y":[0]},"t":24,"s":[100]},{"t":29,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[531.02,129.675,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.514,0.514,0.333],"y":[0,0,0]},"t":5,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.533,0.533,0.333],"y":[0,0,0]},"t":10,"s":[90,90,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.586,0.586,0.333],"y":[0,0,0]},"t":15,"s":[95,95,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.499,0.499,0.333],"y":[0,0,0]},"t":19,"s":[90,90,100]},{"t":24,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-5.33,-8.3],[3.89,0.27],[-4.4,-1.68],[-4.33,-0.67],[-4.08,9.32],[3.33,5.44],[3.39,4.6],[0.87,-3.7],[3.6,-0.86],[1.03,-0.21],[2.34,-0.53],[0.96,1.15],[4.22,5.48],[-1.18,-4.56]],"o":[[1.11,1.71],[-3.89,-0.27],[6.42,2.5],[4.33,0.66],[1.63,-5.32],[-3.34,-5.45],[-1.68,-2.1],[-0.71,3.14],[-3.43,0.95],[-0.57,0.08],[-3.86,1.12],[-3.23,-3.94],[-1.89,-2.28],[2.42,4.64]],"v":[[-5.387,9.698],[-10.717,8.498],[-12.327,15.628],[5.813,21.748],[23.313,11.778],[20.273,-1.202],[11.563,-13.962],[5.393,-12.362],[1.083,-13.722],[-2.087,-9.742],[-5.707,-11.752],[-8.777,-7.572],[-18.297,-20.542],[-23.827,-17.832]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"路径备份 2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1500,"st":0,"bm":0}],"markers":[]}

app/src/main/assets/lottie/switch_turnoff.json

@@ -1 +0,0 @@
-{"v":"5.6.9","fr":60,"ip":0,"op":36,"w":120,"h":66,"nm":"开关动画-关闭","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"按钮手柄","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.667,"y":0},"t":0,"s":[87,33,0],"to":[7.682,0,0],"ti":[-13.443,0,0]},{"i":{"x":0.333,"y":1},"o":{"x":0.333,"y":0},"t":18,"s":[31,33,0],"to":[2.306,0,0],"ti":[-1.318,0,0]},{"t":24,"s":[33,33,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[16,16],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"指示器-on","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[100]},{"t":18,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.667,0.667],"y":[0,0]},"t":0,"s":[6.5,6.5]},{"t":18,"s":[4.5,4.5]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[0.966666666667,0.966666666667,0.966666666667,0.420000005762],"ix":3},"o":{"a":0,"k":40,"ix":4},"w":{"a":0,"k":1.5,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"指示器-off","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[87,33,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.667,0.667],"y":[0,0]},"t":0,"s":[1.5,4]},{"t":18,"s":[1.5,6]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0.75,"ix":4},"nm":"矩形路径 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":5,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":90,"ix":6},"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[0]},{"t":18,"s":[100]}],"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"矩形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"按钮背景","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[60,33,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"sy":[{"c":{"a":0,"k":[0,0,0,1],"ix":2},"o":{"a":0,"k":5,"ix":3},"a":{"a":0,"k":120,"ix":5},"s":{"a":0,"k":1,"ix":8},"d":{"a":0,"k":0,"ix":6},"ch":{"a":0,"k":100,"ix":7},"bm":{"a":0,"k":5,"ix":1},"no":{"a":0,"k":0,"ix":9},"ty":2,"nm":"内阴影"}],"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[40,22],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":12,"ix":4},"nm":"矩形路径 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[0.141176477075,0.588235318661,1,1]},{"t":18,"s":[0.933333337307,0.933333337307,0.933333337307,1]}],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"filling","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0.118,0.006],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"矩形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0}],"markers":[]}

app/src/main/assets/lottie/switch_turnoff_dark.json

@@ -1 +0,0 @@
-{"v":"5.9.1","fr":60,"ip":0,"op":36,"w":120,"h":66,"nm":"开关动画-关闭","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"按钮手柄","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.667,"y":0},"t":0,"s":[87,33,0],"to":[7.682,0,0],"ti":[-13.443,0,0]},{"i":{"x":0.333,"y":1},"o":{"x":0.333,"y":0},"t":18,"s":[31,33,0],"to":[2.306,0,0],"ti":[-1.318,0,0]},{"t":24,"s":[33,33,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[16,16],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"指示器-on","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[100]},{"t":18,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.667,0.667],"y":[0,0]},"t":0,"s":[6.5,6.5]},{"t":18,"s":[4.5,4.5]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":40,"ix":4},"w":{"a":0,"k":1.5,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"指示器-off","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[87,33,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.667,0.667],"y":[0,0]},"t":0,"s":[1.5,4]},{"t":18,"s":[1.5,6]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0.75,"ix":4},"nm":"矩形路径 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":20,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":90,"ix":6},"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[0]},{"t":18,"s":[100]}],"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"矩形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"按钮背景","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[60,33,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[40,22],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":12,"ix":4},"nm":"矩形路径 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[0.156862750649,0.533333361149,0.878431379795,1]},{"t":18,"s":[1,1,1,1]}],"ix":4},"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[100]},{"t":18,"s":[8]}],"ix":5},"r":1,"bm":0,"nm":"filling","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0.118,0.006],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"矩形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0}],"markers":[]}

app/src/main/assets/lottie/switch_turnoff_light.json

@@ -1 +0,0 @@
-{"v":"5.9.1","fr":60,"ip":0,"op":36,"w":120,"h":66,"nm":"开关动画-关闭","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"按钮手柄","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.667,"y":0},"t":0,"s":[87,33,0],"to":[7.682,0,0],"ti":[-13.443,0,0]},{"i":{"x":0.333,"y":1},"o":{"x":0.333,"y":0},"t":18,"s":[31,33,0],"to":[2.306,0,0],"ti":[-1.318,0,0]},{"t":24,"s":[33,33,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[16,16],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"指示器-on","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[100]},{"t":18,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.667,0.667],"y":[0,0]},"t":0,"s":[6.5,6.5]},{"t":18,"s":[4.5,4.5]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":40,"ix":4},"w":{"a":0,"k":1.5,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"指示器-off","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[87,33,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.667,0.667],"y":[0,0]},"t":0,"s":[1.5,4]},{"t":18,"s":[1.5,6]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0.75,"ix":4},"nm":"矩形路径 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":5,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":90,"ix":6},"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[0]},{"t":18,"s":[100]}],"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"矩形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"按钮背景","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[60,33,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[40,22],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":12,"ix":4},"nm":"矩形路径 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[0.141176477075,0.588235318661,1,1]},{"t":18,"s":[0.933333337307,0.933333337307,0.933333337307,1]}],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"filling","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0.118,0.006],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"矩形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0}],"markers":[]}

app/src/main/assets/lottie/switch_turnon_dark.json

@@ -1 +0,0 @@
-{"v":"5.9.1","fr":60,"ip":0,"op":36,"w":120,"h":66,"nm":"开关动画-打开","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"按钮手柄","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.667,"y":0},"t":0,"s":[33,33,0],"to":[7.682,0,0],"ti":[-13.443,0,0]},{"i":{"x":0.333,"y":1},"o":{"x":0.333,"y":0},"t":18,"s":[89,33,0],"to":[2.306,0,0],"ti":[-1.318,0,0]},{"t":24,"s":[87,33,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[16,16],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"指示器-on","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[0]},{"t":18,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.667,0.667],"y":[0,0]},"t":0,"s":[4.5,4.5]},{"t":18,"s":[6.5,6.5]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":40,"ix":4},"w":{"a":0,"k":1.5,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"指示器-off","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[87,33,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.667,0.667],"y":[0,0]},"t":0,"s":[1.5,6]},{"t":18,"s":[1.5,4]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0.75,"ix":4},"nm":"矩形路径 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":20,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":90,"ix":6},"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[100]},{"t":18,"s":[0]}],"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"矩形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"按钮背景","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[60,33,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[40,22],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":12,"ix":4},"nm":"矩形路径 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[1,1,1,1]},{"t":18,"s":[0.156862750649,0.533333361149,0.878431379795,1]}],"ix":4},"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[8]},{"t":18,"s":[100]}],"ix":5},"r":1,"bm":0,"nm":"filling","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0.118,0.006],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"矩形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0}],"markers":[]}

app/src/main/assets/lottie/switch_turnon_light.json

@@ -1 +0,0 @@
-{"v":"5.9.1","fr":60,"ip":0,"op":36,"w":120,"h":66,"nm":"开关动画-打开","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"按钮手柄","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.667,"y":0},"t":0,"s":[33,33,0],"to":[7.682,0,0],"ti":[-13.443,0,0]},{"i":{"x":0.333,"y":1},"o":{"x":0.333,"y":0},"t":18,"s":[89,33,0],"to":[2.306,0,0],"ti":[-1.318,0,0]},{"t":24,"s":[87,33,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[16,16],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"指示器-on","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[0]},{"t":18,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.667,0.667],"y":[0,0]},"t":0,"s":[4.5,4.5]},{"t":18,"s":[6.5,6.5]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":40,"ix":4},"w":{"a":0,"k":1.5,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"指示器-off","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[87,33,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.667,0.667],"y":[0,0]},"t":0,"s":[1.5,6]},{"t":18,"s":[1.5,4]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0.75,"ix":4},"nm":"矩形路径 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":5,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":90,"ix":6},"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[100]},{"t":18,"s":[0]}],"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"矩形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"按钮背景","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[60,33,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[40,22],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":12,"ix":4},"nm":"矩形路径 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[0.933332979679,0.933332979679,0.933332979679,1]},{"t":18,"s":[0.141176477075,0.588235318661,1,1]}],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"filling","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0.118,0.006],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"矩形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0}],"markers":[]}

app/src/main/assets/lottie/tab_forum.json

@@ -1 +0,0 @@
-{"v":"5.6.9","fr":30,"ip":0,"op":20,"w":66,"h":66,"nm":"bottom bar tab/论坛/选中/E","ddd":0,"assets":[{"id":"comp_0","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"白-修正","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":4,"s":[80,80,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":9,"s":[110,110,100]},{"t":13,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":1,"y":0},"t":0,"s":[{"i":[[0,-0.66],[0,0],[1.38,0],[0,1.38],[0,0],[-0.66,0],[0,0]],"o":[[0,0],[0,1.38],[-1.38,0],[0,0],[0,-0.66],[0,0],[0.66,0]],"v":[[2.5,-1.3],[2.5,0],[0,2.5],[-2.5,0],[-2.5,-1.3],[-1.3,-2.5],[1.3,-2.5]],"c":true}]},{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"t":4,"s":[{"i":[[0,-0.66],[0,0],[1.38,0],[0,1.38],[0,0],[-0.66,0],[0,0]],"o":[[0,0],[0,1.38],[-1.38,0],[0,0],[0,-0.66],[0,0],[0.66,0]],"v":[[2.5,-0.102],[2.5,0],[0,2.109],[-2.5,0],[-2.5,-0.102],[-1.3,-1.302],[1.3,-1.302]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":1,"y":0},"t":9,"s":[{"i":[[0,-0.66],[0,0],[1.38,0],[0,1.38],[0,0],[-0.66,0],[0,0]],"o":[[0,0],[0,1.38],[-1.38,0],[0,0],[0,-0.66],[0,0],[0.66,0]],"v":[[2.498,-1.845],[2.5,0],[0,2.734],[-2.5,0],[-2.502,-1.845],[-1.302,-3.045],[1.298,-3.045]],"c":true}]},{"t":13,"s":[{"i":[[0,-0.66],[0,0],[1.38,0],[0,1.38],[0,0],[-0.66,0],[0,0]],"o":[[0,0],[0,1.38],[-1.38,0],[0,0],[0,-0.66],[0,0],[0.66,0]],"v":[[2.5,-1.3],[2.5,0],[0,2.5],[-2.5,0],[-2.5,-1.3],[-1.3,-2.5],[1.3,-2.5]],"c":true}]}],"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"矩形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":150,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"蓝","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33.76,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.8,0.42],[-3.44,-0.79],[-0.09,-1.71],[0,0],[0,0],[1.98,-0.1],[0,0],[0,0],[0,0],[0.62,0.57],[0,0],[0,0],[0,0],[0,0],[0,0],[0.2,1.89],[0,0],[0,0],[0,0]],"o":[[3.44,-0.79],[1.74,0.41],[0,0],[0,0],[0,2],[0,0],[0,0],[0,0],[-0.69,0.52],[0,0],[0,0],[0,0],[0,0],[0,0],[-1.94,0],[0,0],[0,0],[0,0],[0,-1.8]],"v":[[-6.39,-8.971],[6.39,-8.971],[9.49,-5.471],[9.5,-5.271],[9.5,3.249],[5.95,6.989],[5.75,6.999],[3.25,6.999],[0.3,9.209],[-1.95,9.089],[-2.06,8.969],[-2.17,8.849],[-2.21,8.779],[-3.4,6.999],[-5.75,6.999],[-9.48,3.639],[-9.49,3.449],[-9.5,3.249],[-9.5,-5.271]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.266,0.638,1,0.5,0.242,0.595,1,1,0.217,0.552,1],"ix":9}},"s":{"a":0,"k":[-9.5,-9.561],"ix":5},"e":{"a":0,"k":[9.5,9.561],"ix":6},"t":1,"nm":"color","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"路径","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":150,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"预合成 1","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33,0],"ix":2},"a":{"a":0,"k":[33,33,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":0,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":4,"s":[70,70,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":9,"s":[110,110,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":13,"s":[90,90,100]},{"t":16,"s":[100,100,100]}],"ix":6}},"ao":0,"w":66,"h":66,"ip":0,"op":20,"st":0,"bm":0}],"markers":[]}

app/src/main/assets/microlog.properties

@@ -0,0 +1,5 @@
+# This is a simple Microlog configuration file
+microlog.level=DEBUG
+microlog.appender=LogCatAppender;FileAppender
+microlog.formatter=PatternFormatter
+microlog.formatter.PatternFormatter.pattern=%c [%P] %m %T

app/src/main/assets/rich_editor.js

@@ -280,8 +280,12 @@ RE.replaceAllDfImage = function(imgRuleFlag, gifRuleFlag) {
             i--;
          } else {
            if(img.src.indexOf(".gif") > 0) {
-              img.src = img.src.split("?")[0] + gifRuleFlag
+              if(gifRuleFlag.indexOf(",default") > 0) {
+                 img.style.cssText = "max-width: 100%; display:block; margin:8px auto; height: auto;"
+                 img.src = img.src.split("?")[0] + gifRuleFlag
+              }
            } else {
+             img.style.cssText = "max-width: 100%; display:block; margin:8px auto; height: auto;"
              img.src = img.src.split("?")[0] + imgRuleFlag
            }
          }
@@ -297,7 +301,7 @@ RE.hideShowBigPic = function() {
          var img = imgs[i];
          var imageClassName = img.className;
          if (imageClassName == "image-link" || img.className == "poster") continue;
-         if (img.src.indexOf(".gif") == -1) {
+         if(img.src.indexOf(",thumbnail") > 0 && img.src.indexOf(".gif") == -1) {
             j++;
          }
     }
@@ -323,6 +327,7 @@ RE.replaceDfImageByUrl = function(imgUrl, imgRuleFlag, gifRuleFlag) {
          var imageClassName = img.className;
          if (imageClassName == "image-link" || img.className == "poster") continue;
          if (img.src.indexOf(imgUrl) != -1) {
+             img.style.cssText = "max-width: 100%; display:block; margin:8px auto; height: auto;"
              if(img.src.indexOf(".gif") > 0) {
                img.src = img.src.split("?")[0] + gifRuleFlag
              } else {
@@ -612,25 +617,3 @@ RE.sendElementNameToNative = function() {
         }
     }
 }
-
-// android function to open link
-function customLinkgo(self) {
-  var datas = self.dataset.datas
-  // console.log(datas)
-  window.OnLinkClickListener.onClick(datas)
-}
-
-// 在web页面播放视频
-//RE.initArticleVideo = function(){
-//    initArticleVideo()
-//}
-
-function showNativeDialog(title, message, positive, negative, callback) {
-    var jsCallbackCode = "(" + function (v) {
-        window.onNativeDialogCallback(v);
-        delete window.onNativeDialogCallback;
-    }.toString() + ")";
-
-    window.onNativeDialogCallback = callback;
-    window.NativeCallBack.showDialog(title, message, positive, negative, jsCallbackCode);
-}

app/src/main/java/com/gh/base/AppUncaughtHandler.java

@@ -0,0 +1,124 @@
+package com.gh.base;
+
+import android.app.AlarmManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Looper;
+import android.preference.PreferenceManager;
+import android.util.Log;
+
+import com.gh.common.constant.Config;
+import com.gh.common.util.DataCollectionUtils;
+import com.gh.common.util.DataUtils;
+import com.gh.gamecenter.SplashScreenActivity;
+import com.lightgame.config.CommonDebug;
+import com.lightgame.download.FileUtils;
+import com.lightgame.utils.AppManager;
+import com.lightgame.utils.Utils;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.lang.Thread.UncaughtExceptionHandler;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
+public class AppUncaughtHandler implements UncaughtExceptionHandler {
+
+    private Context mContext;
+
+    public AppUncaughtHandler(Context context) {
+        // 获取系统默认的UncaughtException处理器
+        mContext = context;
+    }
+
+    @Override
+    public void uncaughtException(Thread thread, Throwable ex) {
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                Looper.prepare();
+                Utils.toast(mContext.getApplicationContext(), "\"光环助手\"发生错误");
+                Looper.loop();
+            }
+        });
+        saveLocalLog(mContext, ex);
+        restart(mContext);
+    }
+
+    public static void restart(final Context context) {
+
+        // 防止重复奔溃，导致助手一直重启，20秒内不做处理
+        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
+        long curTime = System.currentTimeMillis();
+        long time = sp.getLong("last_restart_time", 0);
+        if (curTime - time > 20 * 1000) {
+            sp.edit().putLong("last_restart_time", curTime).apply();
+            Intent intent = new Intent(context, SplashScreenActivity.class);
+            intent.setAction(Intent.ACTION_MAIN);
+            intent.addCategory(Intent.CATEGORY_LAUNCHER);
+            PendingIntent restartIntent = PendingIntent.getActivity(context, 0, intent,
+                    PendingIntent.FLAG_UPDATE_CURRENT);
+            // 退出程序并重启
+            AlarmManager mgr = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
+            mgr.set(AlarmManager.RTC, curTime + 3000, restartIntent); // 1秒钟后重启应用
+        }
+
+        //error restart
+//        System.exit(2);
+        AppManager.getInstance().finishAllActivity();
+    }
+
+    // 保存log到本地
+    public static void saveLocalLog(Context context, Throwable ex) {
+        String errorMsg = Log.getStackTraceString(ex);
+        Config.setExceptionMsg(errorMsg);
+
+        // 保存到本地
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss", Locale.getDefault());
+        File file = new File(FileUtils.getLogPath(context.getApplicationContext(),
+                format.format(new Date()) + "_gh_assist" + ".log"));
+        FileWriter writer = null;
+        try {
+            file.createNewFile();
+            writer = new FileWriter(file);
+            writer.write(errorMsg);
+            writer.flush();
+        } catch (IOException e1) {
+            e1.printStackTrace();
+        } finally {
+            if (writer != null) {
+                try {
+                    writer.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+    }
+
+    /**
+     * 下次应用启动再上报
+     *
+     * @param context
+     * @param throwable
+     */
+    public static void reportException(Context context, Throwable throwable) {
+
+        CommonDebug.logMethodWithParams(context, "ERRMSG", throwable);
+
+        // 上传错误数据
+        try {
+            DataCollectionUtils.uploadError(context, Log.getStackTraceString(throwable));
+        } catch (Exception e) {
+        }
+
+        DataUtils.onError(context, throwable);
+
+    }
+
+}

app/src/main/java/com/gh/base/BaseActivity.java

@@ -0,0 +1,238 @@
+package com.gh.base;
+
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.text.TextUtils;
+import android.view.Window;
+import android.view.WindowManager;
+
+import com.gh.common.constant.Constants;
+import com.gh.common.util.DialogUtils;
+import com.gh.common.util.MtaHelper;
+import com.gh.common.util.PackageUtils;
+import com.gh.common.util.RunningUtils;
+import com.gh.common.util.ShareUtils;
+import com.gh.common.util.StringUtils;
+import com.gh.gamecenter.BuildConfig;
+import com.gh.gamecenter.LoginActivity;
+import com.gh.gamecenter.R;
+import com.gh.gamecenter.eventbus.EBShowDialog;
+import com.lightgame.BaseAppCompatActivity;
+import com.lightgame.download.FileUtils;
+import com.lightgame.utils.Utils;
+import com.tencent.tauth.Tencent;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+import org.json.JSONObject;
+
+import java.lang.ref.WeakReference;
+import java.util.List;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.Lifecycle;
+import butterknife.ButterKnife;
+import pub.devrel.easypermissions.EasyPermissions;
+
+import static com.gh.common.util.EntranceUtils.KEY_ENTRANCE;
+
+/**
+ * 只提供基础的服务(EventBus/ButterKnife/Share/GlobalDialog/Permissions)
+ * <p>
+ * 需要工具栏的页面请继承{@link ToolBarActivity}
+ */
+
+public abstract class BaseActivity extends BaseAppCompatActivity implements EasyPermissions.PermissionCallbacks {
+
+    // global dialog key
+    public final static String DOWNLOAD_HIJACK = "hijack";
+    public final static String LOGIN_EXCEPTION = "loginException";
+    public final static String PLUGGABLE = "plugin";
+
+    @NonNull
+    protected String mEntrance;
+
+    private boolean mIsExistLogoutDialog;
+
+    protected final Handler mBaseHandler = new BaseHandler(this);
+
+    protected static class BaseHandler extends Handler {
+
+        private final WeakReference<BaseActivity> mActivityWeakReference;
+
+        BaseHandler(BaseActivity activity) {
+            mActivityWeakReference = new WeakReference<>(activity);
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+            BaseActivity activity = mActivityWeakReference.get();
+            if (activity != null) activity.handleMessage(msg);
+        }
+    }
+
+    protected void handleMessage(Message msg) {
+
+    }
+
+    //接收QQ或者QQ空间分享回调
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == com.tencent.connect.common.Constants.REQUEST_QQ_SHARE
+                || requestCode == com.tencent.connect.common.Constants.REQUEST_QZONE_SHARE) {
+            Tencent.onActivityResultData(requestCode, resultCode, data, ShareUtils.getInstance(this).QqShareListener);
+        }
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        EventBus.getDefault().register(this);
+        ButterKnife.bind(this);
+        mEntrance = getIntent().getStringExtra(KEY_ENTRANCE);
+        if (TextUtils.isEmpty(mEntrance)) {
+            mEntrance = Constants.ENTRANCE_UNKNOWN;
+        }
+
+        if (BuildConfig.DEBUG) {
+            Utils.log("ACTIVITY_ENTRANCE -> " + mEntrance);
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        EventBus.getDefault().unregister(this);
+        mBaseHandler.removeCallbacksAndMessages(null);
+        super.onDestroy();
+    }
+
+    public void toast(String msg) {
+        Utils.toast(this, msg);
+    }
+
+    public void toast(int msg) {
+        toast(getString(msg));
+    }
+
+    public void showShare(String url,
+                          String icon,
+                          String shareTitle,
+                          String shareSummary,
+                          ShareUtils.ShareType shareType) {
+        ShareUtils.getInstance(this).showShareWindows(this,
+                getWindow().getDecorView(),
+                url,
+                icon,
+                shareTitle,
+                shareSummary,
+                shareType);
+        if (shareType == ShareUtils.ShareType.game || shareType == ShareUtils.ShareType.plugin) {
+            MtaHelper.onEvent("内容分享", "内容分享", shareTitle + shareSummary);
+        } else {
+            MtaHelper.onEvent("内容分享", "内容分享", shareTitle);
+        }
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onEventMainThread(final EBShowDialog showDialog) {
+        if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED)
+                && this.getClass().getName().equals(RunningUtils.getTopActivity(this))) {
+            if (DOWNLOAD_HIJACK.equals(showDialog.getType())) {
+                DialogUtils.showQqSessionDialog(this);// 建议用户联系客服
+            } else if (PLUGGABLE.equals(showDialog.getType())) {
+                DialogUtils.showPluginDialog(this, () -> {
+                    if (FileUtils.isEmptyFile(showDialog.getPath())) {
+                        toast(R.string.install_failure_hint);
+                    } else {
+                        startActivity(PackageUtils.getUninstallIntent(BaseActivity.this, showDialog.getPath()));
+                    }
+                });
+            } else if (LOGIN_EXCEPTION.equals(showDialog.getType())) {
+                if (mIsExistLogoutDialog) return;
+                mIsExistLogoutDialog = true;
+                try {
+                    JSONObject object = new JSONObject(showDialog.getPath());
+                    JSONObject device = object.getJSONObject("device");
+                    String model = device.getString("model");
+                    DialogUtils.showAlertDialog(this, "你的账号已在另外一台设备登录"
+                            , StringUtils.buildString("（", model, "）")
+                            , "知道了", "重新登录"
+                            , null
+                            , () -> startActivity(LoginActivity.getIntent(BaseActivity.this,
+                                    "你的账号已在另外一台设备登录多设备-重新登录"))
+                    );
+                    mBaseHandler.postDelayed(() -> mIsExistLogoutDialog = false, 5000);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode,
+                                           @NonNull String[] permissions,
+                                           @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
+    }
+
+    @Override
+    public void onPermissionsDenied(int requestCode, List<String> perms) {
+
+    }
+
+    @Override
+    public void onPermissionsGranted(int requestCode, List<String> perms) {
+
+    }
+
+    protected void setStatusBarColor(int color) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            Window window = getWindow();
+            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+            window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+            window.setStatusBarColor(color);
+        }
+    }
+
+    /**
+     * 提供当前 activity 的中文名 (不重载的话为类名)
+     */
+    public String getActivityNameInChinese() {
+        return getClass().getSimpleName();
+    }
+
+    /**
+     * @param entrance 上一个页面的链式入口名称
+     * @param path     当前页面名称
+     * @return 完整的链式入口名称
+     */
+    public static String mergeEntranceAndPath(String entrance, String path) {
+        if (TextUtils.isEmpty(entrance) && TextUtils.isEmpty(path)) return "";
+        if (TextUtils.isEmpty(entrance) && !TextUtils.isEmpty(path)) {
+            return StringUtils.buildString("(", path, ")");
+        }
+        if (!TextUtils.isEmpty(entrance) && TextUtils.isEmpty(path)) {
+            return entrance;
+        }
+        return StringUtils.buildString(entrance, "+(", path, ")");
+    }
+
+}

app/src/main/java/com/gh/base/BaseActivity_TabLayout.java

@@ -0,0 +1,113 @@
+package com.gh.base;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
+
+import com.gh.base.adapter.FragmentAdapter;
+import com.gh.common.view.TabIndicatorView;
+import com.gh.gamecenter.R;
+import com.google.android.material.tabs.TabLayout;
+import com.lightgame.view.NoScrollableViewPager;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+
+/**
+ * Created by khy on 15/03/18.
+ */
+
+public abstract class BaseActivity_TabLayout extends ToolBarActivity implements ViewPager.OnPageChangeListener {
+
+    public static final String PAGE_INDEX = "PAGE_INDEX";
+
+    @BindView(R.id.activity_tab_layout)
+    protected TabLayout mTabLayout;
+    @BindView(R.id.activity_view_pager)
+    protected NoScrollableViewPager mViewPager;
+    @BindView(R.id.activity_tab_indicator)
+    protected TabIndicatorView mTabIndicatorView;
+
+    protected List<Fragment> mFragmentsList;
+
+    protected List<String> mTabTitleList;
+
+    protected int mCheckedIndex = 0;
+
+    protected abstract void initFragmentList(List<Fragment> fragments);
+
+    protected abstract void initTabTitleList(List<String> tabTitleList);
+
+    protected int provideIndicatorWidth() {
+        return 65;
+    }
+
+    protected View provideTabView(int position, String tabTitle) {
+        return null;
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_tablayout_viewpager;
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        List<Fragment> fragments = getSupportFragmentManager().getFragments();
+        if (fragments != null) {
+            for (Fragment fragment : fragments) {
+                fragment.onActivityResult(requestCode, resultCode, data);
+            }
+        }
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (getIntent() != null) mCheckedIndex = getIntent().getIntExtra(PAGE_INDEX, 0);
+        mFragmentsList = new ArrayList<>();
+        initFragmentList(mFragmentsList);
+        mTabTitleList = new ArrayList<>();
+        initTabTitleList(mTabTitleList);
+
+        mViewPager.setOffscreenPageLimit(mFragmentsList.size());
+        mViewPager.addOnPageChangeListener(this);
+        mViewPager.setAdapter(new FragmentAdapter(getSupportFragmentManager(), mFragmentsList, mTabTitleList));
+        mViewPager.setCurrentItem(mCheckedIndex);
+        mTabLayout.setupWithViewPager(mViewPager);
+        mTabIndicatorView.setupWithTabLayout(mTabLayout);
+        mTabIndicatorView.setupWithViewPager(mViewPager);
+        mTabIndicatorView.setIndicatorWidth(provideIndicatorWidth());
+
+        for (int i = 0; i < mTabLayout.getTabCount(); i++) {
+            TabLayout.Tab tab = mTabLayout.getTabAt(i);
+            if (tab == null) continue;
+            View tabView = provideTabView(i, tab.getText() != null ? tab.getText().toString() : "");
+            if (tabView == null) continue;
+            tab.setCustomView(tabView);
+        }
+
+    }
+
+    @Override
+    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+
+    }
+
+    @Override
+    public void onPageSelected(int position) {
+
+    }
+
+    @Override
+    public void onPageScrollStateChanged(int state) {
+
+    }
+}

app/src/main/java/com/gh/base/BaseRecyclerViewHolder.java

@@ -1,10 +1,9 @@
-package com.gh.gamecenter.common.base;
-
-import android.view.View;
+package com.gh.base;
 
 import androidx.recyclerview.widget.RecyclerView;
+import android.view.View;
 
-import com.gh.gamecenter.common.callback.OnListClickListener;
+import butterknife.ButterKnife;
 
 /**
  * 目前仅提供butterknife bind方法
@@ -21,6 +20,7 @@ public abstract class BaseRecyclerViewHolder<T> extends RecyclerView.ViewHolder
 
     public BaseRecyclerViewHolder(View itemView) {
         super(itemView);
+        ButterKnife.bind(this, itemView);
     }
 
     /**

app/src/main/java/com/gh/base/BaseRichEditorActivity.kt

@@ -1,6 +1,5 @@
 package com.gh.base
 
-import android.animation.ObjectAnimator
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.ClipboardManager
@@ -10,589 +9,204 @@ import android.os.Bundle
 import android.text.TextUtils
 import android.view.View
 import android.webkit.JavascriptInterface
-import android.widget.CheckBox
-import android.widget.FrameLayout
-import android.widget.TextView
-import androidx.lifecycle.Observer
+import butterknife.OnClick
 import com.gh.common.util.DialogUtils
-import com.gh.common.util.NewLogUtils
+import com.gh.common.util.MtaHelper
 import com.gh.common.view.RichEditor
-import com.gh.gamecenter.CropImageActivity
 import com.gh.gamecenter.R
-import com.gh.gamecenter.common.base.activity.ToolBarActivity
-import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.core.AppExecutor
-import com.gh.gamecenter.core.runOnIoThread
-import com.gh.gamecenter.core.utils.*
-import com.gh.gamecenter.entity.*
-import com.gh.gamecenter.qa.editor.*
+import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.entity.MyVideoEntity
+import com.gh.gamecenter.qa.editor.GameActivity
+import com.gh.gamecenter.qa.editor.InsertAnswerWrapperActivity
+import com.gh.gamecenter.qa.editor.InsertArticleWrapperActivity
+import com.gh.gamecenter.qa.editor.VideoActivity
 import com.gh.gamecenter.qa.entity.AnswerEntity
 import com.gh.gamecenter.qa.entity.ArticleEntity
 import com.gh.gamecenter.qa.entity.EditorInsertEntity
-import com.gh.gamecenter.video.poster.PosterEditActivity
-import com.gh.gamecenter.video.upload.UploadManager
-import com.google.gson.JsonObject
 import com.halo.assistant.HaloApp
-import com.lightgame.utils.Util_System_Keyboard
 import com.lightgame.utils.Utils
 import com.lightgame.view.CheckableImageView
-import io.reactivex.disposables.Disposable
-import org.json.JSONArray
-import org.json.JSONObject
-import java.io.File
+import kotterknife.bindView
 
-// TODO: 移动到module_bbs模块
-abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarActivity(),
-    KeyboardHeightObserver, UploadVideoListener {
+abstract class BaseRichEditorActivity : ToolBarActivity() {
 
-    lateinit var mRichEditor: RichEditor
+    val mRichEditor by bindView<RichEditor>(R.id.rich_editor)
 
-    private lateinit var mEditorTextNumTv: TextView
-    private lateinit var mEditorFont: CheckableImageView
-    private lateinit var mEditorLink: CheckableImageView
-
-    private lateinit var mEditorFontBold: CheckableImageView
-    private lateinit var mEditorFontItalic: CheckableImageView
-    private lateinit var mEditorFontStrikeThrough: CheckableImageView
-    private lateinit var mEditorFontUnderline: CheckableImageView
-    private lateinit var mEditorParagraphH1: CheckableImageView
-    private lateinit var mEditorParagraphH2: CheckableImageView
-    private lateinit var mEditorParagraphH3: CheckableImageView
-    private lateinit var mEditorParagraphH4: CheckableImageView
-    private lateinit var mEditorParagraphQuote: CheckableImageView
-    private lateinit var mEditorFontContainer: View
-    private lateinit var mEditorParagraphContainer: View
-    private lateinit var mEditorLinkContainer: View
-    private lateinit var mEditorInsertDetailContainer: View
-    private lateinit var mTagsContainer: FrameLayout
-    private lateinit var mUploadVideoGuideContainer: View
-    protected lateinit var mOriginalCb: CheckBox
-    private lateinit var mOriginalTipsContainer: View
-    private lateinit var mOriginalTipsClose: TextView
+    private val mEditorFont by bindView<CheckableImageView>(R.id.editor_font)
+    private val mEditorLink by bindView<CheckableImageView>(R.id.editor_link)
+    private val mEditorParagraph by bindView<CheckableImageView>(R.id.editor_paragraph)
+    private val mEditorFontBold by bindView<CheckableImageView>(R.id.editor_font_bold)
+    private val mEditorFontItalic by bindView<CheckableImageView>(R.id.editor_font_italic)
+    private val mEditorFontStrikeThrough by bindView<CheckableImageView>(R.id.editor_font_strikethrough)
+    private val mEditorParagraphH1 by bindView<CheckableImageView>(R.id.editor_paragraph_h1)
+    private val mEditorParagraphH2 by bindView<CheckableImageView>(R.id.editor_paragraph_h2)
+    private val mEditorParagraphH3 by bindView<CheckableImageView>(R.id.editor_paragraph_h3)
+    private val mEditorParagraphH4 by bindView<CheckableImageView>(R.id.editor_paragraph_h4)
+    private val mEditorParagraphQuote by bindView<CheckableImageView>(R.id.editor_paragraph_quote)
+    private val mEditorFontContainer by bindView<View>(R.id.editor_font_container)
+    private val mEditorParagraphContainer by bindView<View>(R.id.editor_paragraph_container)
+    private val mEditorLinkContainer by bindView<View>(R.id.editor_link_container)
+    private val mEditorInsertDetail by bindView<View>(R.id.editor_insert_detail)
 
     private var mCurrentParagraphStyle = ""
-    private var mIsExtendedKeyboardShow = false
-    private var mAgreePostPic: Boolean = false
-    private var mGuideDisposable: Disposable? = null
-    protected lateinit var mViewModel: VM
-    protected var mIsKeyBoardShow = false
-    private var mKeyboardHeightProvider: KeyboardHeightProvider? = null
-    private var mMaxUploadVideoGuideCount = 2
-    val FILE_HOST = "file:///"
+
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         DialogUtils.fixWebViewKeyboardNotWorking(this)
         if (resultCode != Activity.RESULT_OK) return
-        val insertData: EditorInsertEntity?
+        var insertData: EditorInsertEntity? = null
         when (requestCode) {
             INSERT_ANSWER_CODE -> {
-                val answer =
-                    data?.getParcelableExtra<AnswerEntity>(AnswerEntity::class.java.simpleName)
-                if (answer != null) {
-                    mRichEditor.focusEditor()
-                    insertData = EditorInsertEntity.transform(answer)
-                    mRichEditor.insertCustomStyleLink(insertData)
-                }
+                val answer = data?.getParcelableExtra<AnswerEntity>(AnswerEntity::class.java.simpleName)
+                if (answer != null) insertData = EditorInsertEntity.transform(answer)
             }
             INSERT_ARTICLE_CODE -> {
-                val article =
-                    data?.getParcelableExtra<ArticleEntity>(ArticleEntity::class.java.simpleName)
-                if (article != null) {
-                    mRichEditor.focusEditor()
-                    insertData = EditorInsertEntity.transform(article)
-                    mRichEditor.insertCustomStyleLink(insertData)
-                }
+                val article = data?.getParcelableExtra<ArticleEntity>(ArticleEntity::class.java.simpleName)
+                if (article != null) insertData = EditorInsertEntity.transform(article)
             }
             INSERT_GAME_CODE -> {
                 val game = data?.getParcelableExtra<GameEntity>(GameEntity::class.java.simpleName)
-                if (game != null) {
-                    mRichEditor.focusEditor()
-                    insertData = EditorInsertEntity.transform(game)
-                    mRichEditor.insertCustomStyleLink(insertData)
-                }
+                if (game != null) insertData = EditorInsertEntity.transform(game)
             }
-            INSERT_GAME_COLLECTION_CODE -> {
-                val gameCollectionEntity =
-                    data?.getParcelableExtra<GamesCollectionEntity>(GamesCollectionEntity::class.java.simpleName)
-                if (gameCollectionEntity != null) {
-                    mRichEditor.focusEditor()
-                    insertData = EditorInsertEntity.transform(gameCollectionEntity)
-                    mRichEditor.insertCustomStyleLink(insertData)
-                }
-            }
-            REQUEST_CODE_IMAGE -> {
-                if (data != null) mViewModel.uploadPic(data)
-            }
-            INSERT_MEDIA_VIDEO_CODE -> {
-                val localVideoList =
-                    data?.getParcelableArrayListExtra<LocalVideoEntity>(LocalVideoEntity::class.java.name)
-                        ?: arrayListOf()
-                if (localVideoList.isNotEmpty()) {
-                    mRichEditor.focusEditor()
-                    uploadVideo(localVideoList)
-                }
-            }
-            REQUEST_CODE_IMAGE_CROP -> {
-                val imagePath = data?.getStringExtra(CropImageActivity.RESULT_CLIP_PATH)
-                if (!imagePath.isNullOrEmpty()) {
-                    mViewModel.uploadPoster(imagePath)
-                }
-            }
-            INSERT_VIDEO_CODE -> {
-                val videoEntity = data?.getParcelableExtra<MyVideoEntity>(MyVideoEntity::class.java.simpleName)
-                if (videoEntity != null) {
-                    mRichEditor.focusEditor()
-                    insertData = EditorInsertEntity.transform(videoEntity)
-                    mRichEditor.insertCustomStyleLink(insertData)
-                }
+            VideoActivity.INSERT_VIDEO_CODE -> {
+                val video = data?.getParcelableExtra<MyVideoEntity>(MyVideoEntity::class.java.simpleName)
+                if (video != null) mRichEditor.insertCustomVideo(video)
+                return
             }
         }
-        closeExtendedKeyboard()
-        AppExecutor.uiExecutor.executeWithDelay(Runnable {
-            Util_System_Keyboard.showSoftKeyboard(this)
-        }, 100)
+
+        mRichEditor.insertCustomStyleLink(insertData)
     }
 
-    private fun uploadVideo(localVideoList: ArrayList<LocalVideoEntity>) {
-        mViewModel.localVideoList.addAll(localVideoList)
-        runOnIoThread {
-            localVideoList.forEach {
-                if (it.poster.startsWith("http")) {
-                    runOnUiThread {
-                        mRichEditor.focusEditor()
-                        mRichEditor.insertPlaceholderVideo(it.id, it.poster)
-                    }
-                } else {
-                    val videoThumbnail = BitmapUtils.getVideoThumbnail(it.filePath)
-                    val filePath = "${cacheDir.absolutePath}${File.separator}${it.id}.webp"
-                    BitmapUtils.saveBitmap(videoThumbnail, filePath)
-                    it.poster = filePath
-                    runOnUiThread {
-                        mRichEditor.focusEditor()
-                        mRichEditor.insertPlaceholderVideo(it.id, "$FILE_HOST${it.poster}")
-                    }
-                }
-            }
-            mViewModel.uploadVideo()
-        }
-
-    }
-
-    private fun findView() {
-        mRichEditor = findViewById(R.id.rich_editor)
-        mEditorTextNumTv = findViewById(R.id.editorTextNumTv)
-        mEditorFont = findViewById(R.id.editor_font)
-        mEditorLink = findViewById(R.id.editor_link)
-        mEditorFontBold = findViewById(R.id.editor_font_bold)
-        mEditorFontItalic = findViewById(R.id.editor_font_italic)
-        mEditorFontStrikeThrough = findViewById(R.id.editor_font_strikethrough)
-        mEditorFontUnderline = findViewById(R.id.editor_font_underline)
-        mEditorParagraphH1 = findViewById(R.id.editor_paragraph_h1)
-        mEditorParagraphH2 = findViewById(R.id.editor_paragraph_h2)
-        mEditorParagraphH3 = findViewById(R.id.editor_paragraph_h3)
-        mEditorParagraphH4 = findViewById(R.id.editor_paragraph_h4)
-        mEditorParagraphQuote = findViewById(R.id.editor_paragraph_quote)
-        mEditorFontContainer = findViewById(R.id.editor_font_container)
-        mEditorParagraphContainer = findViewById(R.id.editor_paragraph_container)
-        mEditorLinkContainer = findViewById(R.id.editor_link_container)
-        mEditorInsertDetailContainer = findViewById(R.id.editor_insert_detail_container)
-        mTagsContainer = findViewById(R.id.tagsContainer)
-        mUploadVideoGuideContainer = findViewById(R.id.uploadVideoGuideContainer)
-        mOriginalCb = findViewById(R.id.originalCb)
-        mOriginalTipsContainer = findViewById(R.id.originalTipsContainer)
-        mOriginalTipsClose = findViewById(R.id.originalTipsClose)
-    }
-
-    @SuppressLint("AddJavascriptInterface", "ClickableViewAccessibility")
+    @SuppressLint("AddJavascriptInterface")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        findView()
-        onRichClick()
-        mViewModel = provideViewModel()
-        mViewModel.setUploadVideoListener(this)
-        mKeyboardHeightProvider = KeyboardHeightProvider(this)
-        mRichEditor.post { mKeyboardHeightProvider?.start() }
-        mRichEditor.enableForceDark(DarkModeUtils.isDarkModeOn(this))
+        mRichEditor.setPadding(20, 15, 20, 15)
         // 防止个别手机在Js里无法获取粘贴内容
         mRichEditor.addJavascriptInterface(OnPasteListener(), "onPasteListener")
         mRichEditor.addJavascriptInterface(OnCursorChangeListener(), "OnCursorChangeListener")
-        mRichEditor.addJavascriptInterface(
-            OnEditorTextChangeListener(),
-            "OnEditorTextChangeListener"
-        )
-        mRichEditor.addJavascriptInterface(OnVideoListener(), "onVideoListener")
-        mRichEditor.addJavascriptInterface(
-            OnQuoteCountChangeListener(),
-            "OnQuoteCountChangeListener"
-        )
         mRichEditor.setInputEnabled(true)
-        mRichEditor.setPadding(16, 12, 16, 12)
-
-        mRichEditor.setOnTouchListener { _, _ ->
-            if (mIsExtendedKeyboardShow) {
-                closeExtendedKeyboard()
-                Util_System_Keyboard.showSoftKeyboard(this)
-                //是否消费事件根据mRichEditor是否含有焦点决定，mRichEditor没有焦点则不消费事件
-                mRichEditor.hasFocus()
-            } else false
-        }
-        mOriginalCb.setOnCheckedChangeListener { _, isChecked ->
-            if (isChecked) {
-                mOriginalTipsContainer.alpha = 0f
-                mOriginalTipsContainer.visibility = View.VISIBLE
-                ObjectAnimator.ofFloat(mOriginalTipsContainer, "alpha", 0f, 1f).setDuration(200).start()
-            }
-        }
-        observeData()
     }
 
-    private fun observeData() {
-        mViewModel.chooseImagesUpload.observe(this, Observer {
-            mRichEditor.focusEditor()
-            for (key in it.keys) {
-                mRichEditor.insertPlaceholderImage(key)
+    @OnClick(R.id.editor_image, R.id.editor_font, R.id.editor_link, R.id.editor_paragraph,
+            R.id.editor_font_bold, R.id.editor_font_italic, R.id.editor_font_strikethrough,
+            R.id.editor_paragraph_h1, R.id.editor_paragraph_h2, R.id.editor_paragraph_h3,
+            R.id.editor_paragraph_h4, R.id.editor_font_container, R.id.editor_paragraph_container,
+            R.id.editor_paragraph_quote, R.id.editor_link_answer, R.id.editor_link_article,
+            R.id.editor_link_game, R.id.editor_link_video)
+    fun onRichClick(view: View) {
+        when (view.id) {
+            R.id.editor_font -> {
+                mEditorFont.isChecked = !mEditorFont.isChecked
+                mEditorParagraph.isChecked = false
+                mEditorLink.isChecked = false
+                mEditorFontContainer.visibility = if (mEditorFont.isChecked) View.VISIBLE else View.GONE
+                mEditorParagraphContainer.visibility = if (!mEditorFont.isChecked) View.VISIBLE else View.GONE
+                mEditorLinkContainer.visibility = if (!mEditorFont.isChecked) View.VISIBLE else View.GONE
+                mEditorInsertDetail.visibility = mEditorFontContainer.visibility
             }
-        })
-        mViewModel.chooseImagesUploadSuccess.observe(this, Observer {
-            val jsonArray = JSONArray()
-            for (key in it.keys) {
-                val jsonObject = JSONObject()
-                jsonObject.put("id", key)
-                jsonObject.put("url", it[key])
-                jsonArray.put(jsonObject)
+            R.id.editor_paragraph -> {
+                mEditorParagraph.isChecked = !mEditorParagraph.isChecked
+                mEditorFont.isChecked = false
+                mEditorLink.isChecked = false
+                mEditorParagraphContainer.visibility = if (mEditorParagraph.isChecked) View.VISIBLE else View.GONE
+                mEditorFontContainer.visibility = if (!mEditorParagraph.isChecked) View.VISIBLE else View.GONE
+                mEditorLinkContainer.visibility = if (!mEditorParagraph.isChecked) View.VISIBLE else View.GONE
+                mEditorInsertDetail.visibility = mEditorParagraphContainer.visibility
             }
-            mRichEditor.replacePlaceholderImage(jsonArray.toString())
-        })
-    }
-
-    override fun onKeyboardHeightChanged(height: Int, orientation: Int) {
-        mIsKeyBoardShow = height > 0
-        if (height > 0) {
-            closeExtendedKeyboard()
-        }
-    }
-
-    fun closeExtendedKeyboard() {
-        mEditorInsertDetailContainer.visibility = View.GONE
-        mEditorFont.isChecked = false
-        mEditorLink.isChecked = false
-        mIsExtendedKeyboardShow = false
-    }
-
-    protected fun controlEditorInsertContainerEnabled(isEnabled: Boolean) {
-        mEditorFont.isEnabled = isEnabled
-    }
-
-    private fun onRichClick() {
-        mEditorFont.setOnClickListener {
-            controlEditorFontContainer()
-        }
-        mEditorLink.setOnClickListener {
-            controlEditorLinkContainer()
-        }
-        mEditorFontBold.setOnClickListener {
-            mEditorFontBold.isChecked = !mEditorFontBold.isChecked
-            mRichEditor.setBold()
-            if (mEditorFontBold.isChecked) {
-                MtaHelper.onEvent(mtaEventName(), "文字样式", "文字样式-加粗")
+            R.id.editor_link -> {
+                mEditorLink.isChecked = !mEditorLink.isChecked
+                mEditorFont.isChecked = false
+                mEditorParagraph.isChecked = false
+                mEditorLinkContainer.visibility = if (mEditorLink.isChecked) View.VISIBLE else View.GONE
+                mEditorParagraphContainer.visibility = if (!mEditorLink.isChecked) View.VISIBLE else View.GONE
+                mEditorFontContainer.visibility = if (!mEditorLink.isChecked) View.VISIBLE else View.GONE
+                mEditorInsertDetail.visibility = mEditorLinkContainer.visibility
             }
-        }
-        mEditorFontItalic.setOnClickListener {
-            mEditorFontItalic.isChecked = !mEditorFontItalic.isChecked
-            mRichEditor.setItalic()
-            if (mEditorFontItalic.isChecked) {
-                MtaHelper.onEvent(mtaEventName(), "文字样式", "文字样式-斜体")
-            }
-        }
-        mEditorFontStrikeThrough.setOnClickListener {
-            mEditorFontStrikeThrough.isChecked = !mEditorFontStrikeThrough.isChecked
-            mRichEditor.setStrikeThrough()
-
-            if (mEditorFontStrikeThrough.isChecked) {
-                MtaHelper.onEvent(mtaEventName(), "文字样式", "文字样式-删除线")
-            }
-        }
-        mEditorFontUnderline.setOnClickListener {
-            mEditorFontUnderline.isChecked = !mEditorFontUnderline.isChecked
-            mRichEditor.setUnderline()
-
-            if (mEditorFontUnderline.isChecked) {
-                MtaHelper.onEvent(mtaEventName(), "文字样式", "文字样式-下滑线")
-            }
-        }
-        mEditorParagraphH1.setOnClickListener {
-            if (mEditorParagraphH1.isChecked) {
-                mRichEditor.formatBlock()
-            } else {
-                MtaHelper.onEvent(mtaEventName(), "段落样式", "段落样式-1级标题")
-                mRichEditor.setHeading(1)
-            }
-            mEditorParagraphH1.isChecked = !mEditorParagraphH1.isChecked
-        }
-        mEditorParagraphH2.setOnClickListener {
-            if (mEditorParagraphH2.isChecked) {
-                mRichEditor.formatBlock()
-            } else {
-                MtaHelper.onEvent(mtaEventName(), "段落样式", "段落样式-2级标题")
-                mRichEditor.setHeading(2)
-            }
-            mEditorParagraphH2.isChecked = !mEditorParagraphH2.isChecked
-        }
-        mEditorParagraphH3.setOnClickListener {
-            if (mEditorParagraphH3.isChecked) {
-                mRichEditor.formatBlock()
-            } else {
-                MtaHelper.onEvent(mtaEventName(), "段落样式", "段落样式-3级标题")
-                mRichEditor.setHeading(3)
-            }
-            mEditorParagraphH3.isChecked = !mEditorParagraphH3.isChecked
-        }
-        mEditorParagraphH4.setOnClickListener {
-            if (mEditorParagraphH4.isChecked) {
-                mRichEditor.formatBlock()
-            } else {
-                MtaHelper.onEvent(mtaEventName(), "段落样式", "段落样式-4级标题")
-                mRichEditor.setHeading(4)
-            }
-            mEditorParagraphH4.isChecked = !mEditorParagraphH4.isChecked
-        }
-        mEditorParagraphQuote.setOnClickListener {
-            if (mEditorParagraphQuote.isChecked) {
-                mRichEditor.formatBlock()
-            } else {
-                MtaHelper.onEvent(mtaEventName(), "段落样式", "段落样式-引用")
-                mRichEditor.setBlockquote()
-            }
-            mEditorParagraphQuote.isChecked = !mEditorParagraphQuote.isChecked
-        }
-        findViewById<View>(R.id.editor_link_answer).setOnClickListener {
-            MtaHelper.onEvent(mtaEventName(), "插入链接", "插入链接-回答")
-            startActivityForResult(
-                InsertAnswerWrapperActivity.getIntent(this),
-                INSERT_ANSWER_CODE
-            )
-        }
-        findViewById<View>(R.id.editor_link_article).setOnClickListener {
-            MtaHelper.onEvent(mtaEventName(), "插入链接", "插入链接-文章")
-            startActivityForResult(
-                InsertArticleWrapperActivity.getIntent(this),
-                INSERT_ARTICLE_CODE
-            )
-        }
-        findViewById<View>(R.id.editor_link_game).setOnClickListener {
-            MtaHelper.onEvent(mtaEventName(), "插入链接", "插入链接-游戏")
-            startActivityForResult(
-                GameActivity.getIntent(this, GameActivity.INSERT_GAME_TITLE),
-                INSERT_GAME_CODE
-            )
-        }
-        findViewById<View>(R.id.editor_link_video).setOnClickListener {
-            startActivityForResult(
-                InsertVideoWrapperActivity.getIntent(this),
-                INSERT_VIDEO_CODE
-            )
-        }
-        findViewById<View>(R.id.editor_link_game_collection).setOnClickListener {
-            startActivityForResult(
-                InsertGameCollectionWrapperActivity.getIntent(this),
-                INSERT_GAME_COLLECTION_CODE
-            )
-        }
-        findViewById<View>(R.id.editor_video).setOnClickListener {
-            chooseVideo()
-        }
-        findViewById<View>(R.id.editor_image).setOnClickListener {
-            if (!mAgreePostPic && !NetworkUtils.isWifiOr4GOr3GConnected(this)) {
-                mAgreePostPic = true
-                DialogHelper.showDialog(
-                    this,
-                    "警告",
-                    "当前使用移动网络，上传图片会消耗手机流量",
-                    "我知道了", "", { chooseImage() },
-                    extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
-                )
-                return@setOnClickListener
-            }
-            chooseImage()
-            NewLogUtils.logChooseMedia(
-                "view_media",
-                if (mtaEventName() == "提问帖") "提问帖" else "帖子",
-                "图片"
-            )
-        }
-        findViewById<View>(R.id.uploadVideoGuideClose).setOnClickListener {
-            hideUploadVideoGuide()
-            if (mGuideDisposable != null && !mGuideDisposable!!.isDisposed) {
-                mGuideDisposable!!.dispose()
-                mGuideDisposable = null
-            }
-        }
-        findViewById<View>(R.id.originalTipsClose).setOnClickListener {
-            val animator = ObjectAnimator.ofFloat(mOriginalTipsContainer, "alpha", 1f, 0f).setDuration(200)
-            animator.doOnEnd {
-                mOriginalTipsContainer.visibility = View.GONE
-            }
-            animator.start()
-        }
-    }
-
-    private fun chooseVideo() {
-        MtaHelper.onEvent(mtaEventName(), "插入链接", "插入链接-视频")
-        val videoCount = mViewModel.quoteCountEntity.videoCount
-        if (videoCount >= MAX_MEDIA_COUNT) {
-            toast(R.string.answer_edit_max_video_hint)
-            return
-        }
-        try {
-            PermissionHelper.checkStoragePermissionBeforeAction(this,
-                object : EmptyCallback {
-                    override fun onCallback() {
-                        val maxChooseCount = if (videoCount + 3 <= MAX_MEDIA_COUNT) 3 else MAX_MEDIA_COUNT - videoCount
-                        startActivityForResult(
-                            LocalMediaActivity.getIntent(
-                                this@BaseRichEditorActivity,
-                                LocalMediaActivity.ChooseType.VIDEO,
-                                maxChooseCount,
-                                if (mtaEventName() == "提问帖") "发提问帖" else "发帖子"
-                            ), INSERT_MEDIA_VIDEO_CODE
-                        )
-                        NewLogUtils.logChooseMedia(
-                            "view_media",
-                            if (mtaEventName() == "提问帖") "提问帖" else "帖子",
-                            "视频"
-                        )
-                    }
-                })
-        } catch (e: Exception) {
-            toast(R.string.media_image_hint)
-            e.printStackTrace()
-        }
-    }
-
-    private fun chooseImage() {
-        MtaHelper.onEvent(mtaEventName(), "插入图片", "插入图片")
-        val imageCount = mViewModel.quoteCountEntity.imageCount
-        if (imageCount >= MAX_MEDIA_COUNT) {
-            toast(R.string.answer_edit_max_img_hint)
-            return
-        }
-        try {
-            PermissionHelper.checkStoragePermissionBeforeAction(this, object : EmptyCallback {
-                override fun onCallback() {
-                    val maxChooseCount = if (imageCount + 10 <= MAX_MEDIA_COUNT) 10 else MAX_MEDIA_COUNT - imageCount
-                    val intent = LocalMediaActivity.getIntent(
-                        this@BaseRichEditorActivity,
-                        LocalMediaActivity.ChooseType.IMAGE,
-                        maxChooseCount,
-                        if (mtaEventName() == "提问帖") "发提问帖" else "发帖子"
-                    )
-                    startActivityForResult(intent, REQUEST_CODE_IMAGE)
-                }
-            })
-        } catch (e: Exception) {
-            toast(R.string.media_image_hint)
-            e.printStackTrace()
-        }
-    }
-
-    private fun controlEditorFontContainer() {
-        mEditorFont.isChecked = !mEditorFont.isChecked
-        mEditorLink.isChecked = false
-        val isShouldDelay = if (mEditorFont.isChecked) {
-            Util_System_Keyboard.hideSoftKeyboard(this)
-            true
-        } else {
-            Util_System_Keyboard.showSoftKeyboard(this)
-            false
-        }
-        mEditorInsertDetailContainer.postDelayed({
-            mEditorInsertDetailContainer.visibility =
-                if (mEditorFont.isChecked) View.VISIBLE else View.GONE
-            mEditorFontContainer.visibility = if (mEditorFont.isChecked) View.VISIBLE else View.GONE
-            mEditorParagraphContainer.visibility =
-                if (mEditorFont.isChecked) View.VISIBLE else View.GONE
-            mEditorLinkContainer.visibility = View.GONE
-            mTagsContainer.visibility = View.GONE
-            mIsExtendedKeyboardShow = mEditorFont.isChecked
-        }, if (isShouldDelay) 200 else 0L)
-    }
-
-    private fun controlEditorLinkContainer() {
-        mEditorLink.isChecked = !mEditorLink.isChecked
-        mEditorFont.isChecked = false
-        val isShouldDelay = if (mEditorLink.isChecked) {
-            Util_System_Keyboard.hideSoftKeyboard(this)
-            true
-        } else {
-            Util_System_Keyboard.showSoftKeyboard(this)
-            false
-        }
-        mEditorInsertDetailContainer.postDelayed({
-            mEditorInsertDetailContainer.visibility =
-                if (mEditorLink.isChecked) View.VISIBLE else View.GONE
-            mEditorLinkContainer.visibility = if (mEditorLink.isChecked) View.VISIBLE else View.GONE
-            mEditorFontContainer.visibility = View.GONE
-            mEditorParagraphContainer.visibility = View.GONE
-            mTagsContainer.visibility = View.GONE
-            mIsExtendedKeyboardShow = mEditorLink.isChecked
-        }, if (isShouldDelay) 200 else 0L)
-    }
-
-
-    override fun handleBackPressed(): Boolean {
-        if (mIsExtendedKeyboardShow) {
-            closeExtendedKeyboard()
-            return true
-        }
-        return super.handleBackPressed()
-    }
-
-    override fun onResume() {
-        super.onResume()
-        mKeyboardHeightProvider?.setKeyboardHeightObserver(this)
-    }
-
-    override fun onPause() {
-        super.onPause()
-        mKeyboardHeightProvider?.setKeyboardHeightObserver(null)
-    }
-
-    //视频上传功能引导
-    fun showUploadVideoGuide() {
-        mUploadVideoGuideContainer.postDelayed({
-            val count = SPUtils.getInt(getVideoGuideKey(), 0)
-            if (count >= mMaxUploadVideoGuideCount) return@postDelayed
-            mUploadVideoGuideContainer.alpha = 0f
-            mUploadVideoGuideContainer.visibility = View.VISIBLE
-            mUploadVideoGuideContainer.animate().alpha(1f).setDuration(200).start()
-            mGuideDisposable = countDownTimer(3) { finish, _ ->
-                if (finish) {
-                    hideUploadVideoGuide()
+            R.id.editor_font_bold -> {
+                mEditorFontBold.isChecked = !mEditorFontBold.isChecked
+                mRichEditor.setBold()
+                if (mEditorFontBold.isChecked) {
+                    MtaHelper.onEvent(mtaEventName(), "文字样式", "文字样式-加粗")
                 }
             }
-            SPUtils.setInt(getVideoGuideKey(), count + 1)
-        }, 1000)
-    }
+            R.id.editor_font_italic -> {
+                mEditorFontItalic.isChecked = !mEditorFontItalic.isChecked
+                mRichEditor.setItalic()
+                if (mEditorFontItalic.isChecked) {
+                    MtaHelper.onEvent(mtaEventName(), "文字样式", "文字样式-斜体")
+                }
+            }
+            R.id.editor_font_strikethrough -> {
+                mEditorFontStrikeThrough.isChecked = !mEditorFontStrikeThrough.isChecked
+                mRichEditor.setStrikeThrough()
 
-    fun hideUploadVideoGuide() {
-        val animate = mUploadVideoGuideContainer.animate().alpha(0f).setDuration(200)
-        animate.doOnEnd {
-            mUploadVideoGuideContainer.visibility = View.GONE
-        }
-        animate.start()
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        mKeyboardHeightProvider?.close()
-        val path = mViewModel.currentUploadingVideo?.filePath
-        if (path != null && UploadManager.isUploading(path)) {
-            UploadManager.cancelTask(path)
-        }
-        if (mGuideDisposable != null && !mGuideDisposable!!.isDisposed) {
-            mGuideDisposable!!.dispose()
-            mGuideDisposable = null
+                if (mEditorFontStrikeThrough.isChecked) {
+                    MtaHelper.onEvent(mtaEventName(), "文字样式", "文字样式-删除线")
+                }
+            }
+            R.id.editor_paragraph_h1 -> {
+                if (mEditorParagraphH1.isChecked) {
+                    mRichEditor.formatBlock()
+                } else {
+                    MtaHelper.onEvent(mtaEventName(), "段落样式", "段落样式-1级标题")
+                    mRichEditor.setHeading(1)
+                }
+                mEditorParagraphH1.isChecked = !mEditorParagraphH1.isChecked
+            }
+            R.id.editor_paragraph_h2 -> {
+                if (mEditorParagraphH2.isChecked) {
+                    mRichEditor.formatBlock()
+                } else {
+                    MtaHelper.onEvent(mtaEventName(), "段落样式", "段落样式-2级标题")
+                    mRichEditor.setHeading(2)
+                }
+                mEditorParagraphH2.isChecked = !mEditorParagraphH2.isChecked
+            }
+            R.id.editor_paragraph_h3 -> {
+                if (mEditorParagraphH3.isChecked) {
+                    mRichEditor.formatBlock()
+                } else {
+                    MtaHelper.onEvent(mtaEventName(), "段落样式", "段落样式-3级标题")
+                    mRichEditor.setHeading(3)
+                }
+                mEditorParagraphH3.isChecked = !mEditorParagraphH3.isChecked
+            }
+            R.id.editor_paragraph_h4 -> {
+                if (mEditorParagraphH4.isChecked) {
+                    mRichEditor.formatBlock()
+                } else {
+                    MtaHelper.onEvent(mtaEventName(), "段落样式", "段落样式-4级标题")
+                    mRichEditor.setHeading(4)
+                }
+                mEditorParagraphH4.isChecked = !mEditorParagraphH4.isChecked
+            }
+            R.id.editor_paragraph_quote -> {
+                if (mEditorParagraphQuote.isChecked) {
+                    mRichEditor.formatBlock()
+                } else {
+                    MtaHelper.onEvent(mtaEventName(), "段落样式", "段落样式-引用")
+                    mRichEditor.setBlockquote()
+                }
+                mEditorParagraphQuote.isChecked = !mEditorParagraphQuote.isChecked
+            }
+            R.id.editor_link_answer -> {
+                MtaHelper.onEvent(mtaEventName(), "插入链接", "插入链接-回答")
+                startActivityForResult(InsertAnswerWrapperActivity.getIntent(this), INSERT_ANSWER_CODE)
+            }
+            R.id.editor_link_article -> {
+                MtaHelper.onEvent(mtaEventName(), "插入链接", "插入链接-文章")
+                startActivityForResult(InsertArticleWrapperActivity.getIntent(this), INSERT_ARTICLE_CODE)
+            }
+            R.id.editor_link_game -> {
+                MtaHelper.onEvent(mtaEventName(), "插入链接", "插入链接-游戏")
+                startActivityForResult(GameActivity.getIntent(this, "插入游戏"), INSERT_GAME_CODE)
+            }
+            R.id.editor_link_video -> {
+                MtaHelper.onEvent(mtaEventName(), "插入链接", "插入链接-视频")
+                startActivityForResult(VideoActivity.getIntent(this), VideoActivity.INSERT_VIDEO_CODE)
+            }
         }
     }
 
@@ -614,7 +228,6 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                 mEditorFontBold.isChecked = elements.contains(ELEMENT_NAME_BOLD)
                 mEditorFontItalic.isChecked = elements.contains(ELEMENT_NAME_ITALIC)
                 mEditorFontStrikeThrough.isChecked = elements.contains(ELEMENT_NAME_STRIKE)
-                mEditorFontUnderline.isChecked = elements.contains(ELEMENT_NAME_UNDERLINE)
                 mEditorParagraphH1.isChecked = elements.contains(ELEMENT_PARAGRAPH_H1)
                 mEditorParagraphH2.isChecked = elements.contains(ELEMENT_PARAGRAPH_H2)
                 mEditorParagraphH3.isChecked = elements.contains(ELEMENT_PARAGRAPH_H3)
@@ -628,135 +241,22 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
         @JavascriptInterface
         fun onPaste() {
             val clipboard =
-                HaloApp.getInstance().application.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+                    HaloApp.getInstance().application.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
             val clipText = clipboard.text.toString()
             if (!TextUtils.isEmpty(clipText)) {
                 // 替换换行符号否则 插入失败
-                val text = clipText.replace("[  ]".toRegex(), "&nbsp;")
-                    .replace("[\r\n]".toRegex(), "<br/>")
+                val text = clipText.replace("[  ]".toRegex(), "&nbsp;").replace("[\r\n]".toRegex(), "<br/>")
                 mBaseHandler.post { mRichEditor.insertHtml(text) }
             }
         }
     }
 
-    private inner class OnEditorTextChangeListener {
-        @JavascriptInterface
-        fun onTextChange(count: Int) {
-            val num = if (count > MAX_INPUT_TEXT_NUM) MAX_INPUT_TEXT_NUM - count else count
-            mEditorTextNumTv.post {
-                mEditorTextNumTv.text = num.toString()
-                mViewModel.quoteCountEntity.textCount = num
-            }
-        }
-    }
-
-    private inner class OnQuoteCountChangeListener {
-        @JavascriptInterface
-        fun onQuoteCountChange(
-            imageCount: Int,
-            articleCount: Int,
-            answerCount: Int,
-            videoCount: Int,
-            gameCount: Int
-        ) {
-            mEditorTextNumTv.post {
-                mViewModel.quoteCountEntity.apply {
-                    this.imageCount = imageCount
-                    this.articleCount = articleCount
-                    this.answerCount = answerCount
-                    this.videoCount = videoCount
-                    this.gameCount = gameCount
-                }
-            }
-        }
-    }
-
-    private inner class OnVideoListener {
-        @JavascriptInterface
-        fun showDeleteDialog(id: String) {
-            DialogHelper.showDialog(this@BaseRichEditorActivity, "提示", "确定删除吗？", "确定", "取消", {
-                runOnUiThread {
-                    mRichEditor.delPlaceholderVideo(id)
-                    mViewModel.deleteVideo(id)
-                }
-            })
-        }
-
-        @JavascriptInterface
-        fun updatePoster(id: String, videoId: String, url: String) {
-            mViewModel.id = id
-            mViewModel.videoId = videoId
-            val videoEntity = VideoEntity(url = url)
-            val intent =
-                PosterEditActivity.getIntentByVideo(this@BaseRichEditorActivity, videoEntity)
-            startActivityForResult(intent, REQUEST_CODE_IMAGE_CROP)
-        }
-
-        @JavascriptInterface
-        fun deleteUploadingVideo(id: String) {
-            mViewModel.deleteVideo(id)
-        }
-
-        @JavascriptInterface
-        fun reUploadVideo(id: String) {
-            val video = mViewModel.uploadVideoErrorList.find { it.id == id }
-            if (video != null) {
-                mViewModel.localVideoList.add(video)
-                mViewModel.uploadVideoErrorList.remove(video)
-                mViewModel.uploadVideo()
-            }
-        }
-    }
-
-    override fun insertPlaceholderVideo(id: String, poster: String) {
-        mRichEditor.insertPlaceholderVideo(id, poster)
-    }
-
-    override fun updateVideoProgress(id: String, progress: String) {
-        mRichEditor.updateVideoProgress(id, progress)
-    }
-
-    override fun videoUploadFinished(id: String, url: String, msg: JsonObject) {
-        try {
-            val obj = JSONObject()
-            obj.put("poster", msg.get("poster").asString)
-            obj.put("url", msg.get("url").asString)
-            obj.put("duration", RichEditor.formatVideoDuration(msg.get("length").asLong))
-            obj.put("id", msg.get("_id").asString)
-            obj.put("status", "pending")
-            mRichEditor.videoUploadFinished(id, url, obj.toString())
-        } catch (e: java.lang.Exception) {
-            e.printStackTrace()
-        }
-    }
-
-    override fun changePoster(id: String, poster: String) {
-        mRichEditor.changePoster(id, poster)
-    }
-
-    override fun videoUploadFailed(id: String) {
-        mRichEditor.videoUploadFailed(id)
-    }
-
-    open fun getSelectedLabel(): Int = 0
-    open fun onActivityDialogResult(requestCode: Int, resultCode: Int, data: Intent?) {}
     abstract fun mtaEventName(): String
-    abstract fun provideViewModel(): VM
-    abstract fun getVideoGuideKey(): String
-
-    override fun isAutoResetViewBackgroundEnabled(): Boolean = true
-
-    override fun onDarkModeChanged() {
-        super.onDarkModeChanged()
-        updateStatusBarColor(R.color.background_white, R.color.background_white)
-        mRichEditor.enableForceDark(DarkModeUtils.isDarkModeOn(this))
-    }
 
     companion object {
         const val ELEMENT_NAME_BOLD = " b "
         const val ELEMENT_NAME_ITALIC = " i "
         const val ELEMENT_NAME_STRIKE = " strike "
-        const val ELEMENT_NAME_UNDERLINE = " u "
         const val ELEMENT_PARAGRAPH_H1 = " h1 "
         const val ELEMENT_PARAGRAPH_H2 = " h2 "
         const val ELEMENT_PARAGRAPH_H3 = " h3 "
@@ -766,13 +266,5 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
         const val INSERT_ANSWER_CODE = 411
         const val INSERT_ARTICLE_CODE = 412
         const val INSERT_GAME_CODE = 413
-        const val INSERT_GAME_COLLECTION_CODE = 414
-        const val INSERT_VIDEO_CODE = 415
-        const val MAX_INPUT_TEXT_NUM = 10000
-        const val MAX_MEDIA_COUNT = 20
-
-        const val REQUEST_CODE_IMAGE = 120
-        const val INSERT_MEDIA_VIDEO_CODE = 121
-        const val REQUEST_CODE_IMAGE_CROP = 122
     }
 }

app/src/main/java/com/gh/base/BaseRichEditorViewModel.kt

@@ -1,448 +0,0 @@
-package com.gh.base
-
-import android.app.Application
-import android.content.Intent
-import android.graphics.Bitmap
-import android.media.ThumbnailUtils
-import android.provider.MediaStore
-import android.text.TextUtils
-import androidx.lifecycle.AndroidViewModel
-import androidx.lifecycle.MediatorLiveData
-import androidx.lifecycle.MutableLiveData
-import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment
-import com.gh.gamecenter.core.runOnUiThread
-import com.gh.gamecenter.R
-import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.core.utils.*
-import com.gh.gamecenter.entity.ErrorEntity
-import com.gh.gamecenter.entity.LocalVideoEntity
-import com.gh.gamecenter.entity.QuoteCountEntity
-import com.gh.gamecenter.qa.BbsType
-import com.gh.gamecenter.common.retrofit.Response
-import com.gh.gamecenter.retrofit.RetrofitManager
-import com.gh.gamecenter.retrofit.service.ApiService
-import com.gh.gamecenter.video.upload.OnUploadListener
-import com.gh.gamecenter.video.upload.UploadManager
-import com.google.gson.JsonObject
-import com.lightgame.utils.Utils
-import com.zhihu.matisse.Matisse
-import com.zhihu.matisse.internal.utils.PathUtils
-import io.reactivex.disposables.Disposable
-import okhttp3.ResponseBody
-import retrofit2.HttpException
-import java.io.File
-import java.io.FileOutputStream
-import java.util.*
-import kotlin.collections.HashMap
-import kotlin.collections.LinkedHashMap
-import kotlin.collections.List
-import kotlin.collections.Map
-import kotlin.collections.find
-import kotlin.collections.forEach
-import kotlin.collections.set
-
-// TODO: 移动到module_bbs模块
-abstract class BaseRichEditorViewModel(application: Application) : AndroidViewModel(application) {
-    val mApi: ApiService = RetrofitManager.getInstance().api
-    val processDialog = MediatorLiveData<WaitingDialogFragment.WaitingDialogData>()
-    val uploadingImage = ArrayList<LinkedHashMap<String, String>>()
-    val chooseImagesUpload = MutableLiveData<LinkedHashMap<String, String>>()
-    val chooseImagesUploadSuccess = MutableLiveData<LinkedHashMap<String, String>>()
-    var uploadImageSubscription: Disposable? = null
-    val mapImages = HashMap<String, String>()
-    val localVideoList = ArrayList<LocalVideoEntity>()
-    val uploadVideoErrorList = ArrayList<LocalVideoEntity>()
-    var currentUploadingVideo: LocalVideoEntity? = null
-    var type: String = "" //游戏论坛：game_bbs  官方论坛：official_bbs
-    private var mUploadVideoListener: UploadVideoListener? = null
-    val TITLE_MIN_LENGTH = 6
-    val MIN_TEXT_LENGTH = 6
-    val MAX_TEXT_LENGTH = 10000
-    val FILE_HOST = "file:///"
-    var id = ""//视频标记
-    var videoId = ""//更改封面视频id
-    val quoteCountEntity = QuoteCountEntity()//数据上报用
-
-    fun setUploadVideoListener(uploadVideoListener: UploadVideoListener) {
-        this.mUploadVideoListener = uploadVideoListener
-    }
-
-    //检查图片是否符合规则并上传图片
-    fun uploadPic(data: Intent) {
-        val uris = Matisse.obtainResult(data)
-        val pictureList = ArrayList<String>()
-        for (uri in uris) {
-            val picturePath = PathUtils.getPath(getApplication(), uri)
-            if (picturePath != null) {
-                if (File(picturePath).length() > ImageUtils.getUploadFileMaxSize()) {
-                    val count = ImageUtils.getUploadFileMaxSize() / 1024 / 1024
-                    val application: Application = getApplication()
-                    Utils.toast(
-                        getApplication(),
-                        application.getString(R.string.pic_max_hint, count)
-                    )
-                    continue
-                }
-                Utils.log("picturePath = $picturePath")
-                pictureList.add(picturePath)
-            } else {
-                Utils.log("picturePath is null")
-            }
-        }
-        if (pictureList.size == 0) return
-        val imageType = when (getRichType()) {
-            RichType.ARTICLE -> UploadImageUtils.UploadType.community_article
-            RichType.QUESTION -> UploadImageUtils.UploadType.question
-            else -> UploadImageUtils.UploadType.poster
-        }
-        uploadImageSubscription = UploadImageUtils.compressAndUploadImageList(
-            imageType,
-            pictureList,
-            false,
-            object : UploadImageUtils.OnUploadImageListListener {
-                override fun onProgress(total: Long, progress: Long) {}
-
-                override fun onCompressSuccess(imageUrls: List<String>) {
-                    val chooseImageMd5Map = LinkedHashMap<String, String>()
-                    imageUrls.forEach {
-                        chooseImageMd5Map[MD5Utils.getUrlMD5(it)] = ""
-                    }
-                    uploadingImage.add(chooseImageMd5Map)
-                    chooseImagesUpload.postValue(chooseImageMd5Map)
-                }
-
-                override fun onSingleSuccess(imageUrl: Map<String, String>) {
-                    val map = LinkedHashMap<String, String>()
-                    for (key in imageUrl.keys) {
-                        map[MD5Utils.getUrlMD5(key)] = FILE_HOST + key.decodeURI()
-                        mapImages[TextUtils.htmlEncode(key).decodeURI()] = imageUrl[key] ?: ""
-                    }
-                    chooseImagesUploadSuccess.postValue(map)
-                }
-
-                override fun onSuccess(
-                    imageUrl: LinkedHashMap<String, String>,
-                    errorMap: Map<String, Exception>
-                ) {
-                    val uploadMap = uploadingImage.find {
-                        it.containsKey(
-                            MD5Utils.getUrlMD5(
-                                imageUrl.entries.iterator().next().key
-                            )
-                        )
-                    }
-                    uploadMap?.let {
-                        uploadingImage.remove(uploadMap)
-                    }
-
-                    val errorSize = pictureList.size - imageUrl.size
-                    if (errorSize > 0) {
-                        val map = LinkedHashMap<String, String>()
-                        for (key in errorMap.keys) {
-                            map[MD5Utils.getUrlMD5(key)] = ""
-                        }
-                        //value为空会删除PlaceholderImage
-                        chooseImagesUploadSuccess.postValue(map)
-
-                        for (error in errorMap.values) {
-                            if (error is HttpException && error.code() == 403) {
-                                Utils.toast(getApplication(), errorSize.toString() + "张违规图片上传失败")
-                                return
-                            }
-                        }
-                        Utils.toast(getApplication(), errorSize.toString() + "张图片上传失败")
-                    }
-                }
-
-                override fun onError(errorMap: Map<String, Exception>) {
-                    val errorSize = errorMap.size
-                    if (errorSize > 0) {
-                        val map = LinkedHashMap<String, String>()
-                        for (key in errorMap.keys) {
-                            map[MD5Utils.getUrlMD5(key)] = ""
-                        }
-                        //value为空会删除PlaceholderImage
-                        chooseImagesUploadSuccess.postValue(map)
-                    }
-
-                    for (error in errorMap.values) {
-                        if (error is HttpException && error.code() == 403) {
-                            val e = error.response()?.errorBody()?.string()?.toObject<ErrorEntity>()
-                            if (e != null && e.code == 403017) {
-                                Utils.toast(
-                                    getApplication(),
-                                    errorSize.toString() + "张图片的宽或高超过限制，请裁剪后上传"
-                                )
-                            } else {
-                                Utils.toast(getApplication(), errorSize.toString() + "张违规图片上传失败")
-                            }
-                            return
-                        }
-                    }
-                    if (errorSize == 1) {
-                        Utils.toast(getApplication(), "图片上传失败")
-                    } else {
-                        Utils.toast(getApplication(), errorSize.toString() + "张图片上传失败")
-                    }
-                }
-            })
-    }
-
-    fun uploadPoster(picturePath: String) {
-        processDialog.postValue(WaitingDialogFragment.WaitingDialogData("封面上传中...", true))
-        uploadImageSubscription =
-            UploadImageUtils.compressAndUploadImage(
-                UploadImageUtils.UploadType.poster,
-                picturePath,
-                false,
-                object : UploadImageUtils.OnUploadImageListener {
-                    override fun onSuccess(imageUrl: String) {
-                        patchVideoPoster(imageUrl)
-                    }
-
-                    override fun onError(e: Throwable?) {
-                        handleUploadPosterResult(true)
-                    }
-
-                    override fun onProgress(total: Long, progress: Long) {
-
-                    }
-                })
-    }
-
-    private fun patchVideoPoster(poster: String) {
-        if (id.isEmpty() || videoId.isEmpty()) return
-        val map = hashMapOf("poster" to poster, "type" to getVideoType())
-        mApi.patchInsertVideo(videoId, map.toRequestBody())
-            .compose(observableToMain())
-            .subscribe(object : Response<ResponseBody>() {
-                override fun onResponse(response: ResponseBody?) {
-                    super.onResponse(response)
-                    mUploadVideoListener?.changePoster(id, poster)
-                    handleUploadPosterResult(false)
-                }
-
-                override fun onFailure(e: HttpException?) {
-                    super.onFailure(e)
-                    handleUploadPosterResult(true)
-                }
-            })
-    }
-
-    private fun handleUploadPosterResult(isFailure: Boolean = false) {
-        processDialog.postValue(WaitingDialogFragment.WaitingDialogData("封面上传中...", false))
-        if (isFailure) {
-            ToastUtils.showToast("封面更改失败")
-        }
-        id = ""
-        videoId = ""
-    }
-
-    fun deleteVideo(id: String) {
-        if (localVideoList.isNotEmpty()) {
-            val video = localVideoList.find { it.id == id }
-            if (video != null) {
-                if (UploadManager.isUploading(video.filePath)) {
-                    UploadManager.cancelTask(video.filePath)
-                }
-                localVideoList.remove(video)
-            }
-        }
-        if (uploadVideoErrorList.isNotEmpty()) {
-            val video = uploadVideoErrorList.find { it.id == id }
-            if (video != null) {
-                uploadVideoErrorList.remove(video)
-            }
-        }
-        if (currentUploadingVideo?.id == id) {
-            currentUploadingVideo = null
-            uploadVideo()
-        }
-    }
-
-    fun uploadVideo() {
-        if (currentUploadingVideo != null) return
-        if (localVideoList.isEmpty()) return
-        currentUploadingVideo = localVideoList[0]
-        UploadManager.createUploadTask(currentUploadingVideo?.filePath
-            ?: "", object : OnUploadListener {
-            override fun onProgressChanged(
-                uploadFilePath: String,
-                currentSize: Long,
-                totalSize: Long,
-                speed: Long
-            ) {
-                runOnUiThread {
-                    val percent = (currentSize * 100 / totalSize.toFloat()).roundTo(1)
-                    currentUploadingVideo?.id?.let {
-                        mUploadVideoListener?.updateVideoProgress(it, percent.toString())
-                    }
-                }
-            }
-
-            override fun onUploadSuccess(uploadFilePath: String, url: String) {
-                if (currentUploadingVideo != null) {
-                    postVideoPosterAndInfo(uploadFilePath, url)
-                }
-            }
-
-            override fun onUploadFailure(uploadFilePath: String, errorMsg: String) {
-                uploadVideoFailure()
-            }
-        })
-    }
-
-    private fun postVideoPosterAndInfo(uploadFilePath: String, url: String) {
-        val localVideoPoster =
-            getApplication<Application>().cacheDir.absolutePath + File.separator + System.currentTimeMillis() + ".jpg"
-        try {
-            val bmp = ThumbnailUtils.createVideoThumbnail(
-                uploadFilePath,
-                MediaStore.Images.Thumbnails.MINI_KIND
-            )
-            // bmp 可能为空
-            FileOutputStream(localVideoPoster).use { out ->
-                bmp?.compress(Bitmap.CompressFormat.PNG, 100, out)
-            }
-        } catch (e: java.lang.Exception) {
-            e.printStackTrace()
-            ToastUtils.showToast("视频封面操作失败")
-            uploadVideoFailure()
-            return
-        }
-        uploadImageSubscription =
-            UploadImageUtils.compressAndUploadImage(
-                UploadImageUtils.UploadType.poster,
-                localVideoPoster,
-                false,
-                object : UploadImageUtils.OnUploadImageListener {
-                    override fun onSuccess(imageUrl: String) {
-                        postVideoInfo(url, imageUrl)
-                    }
-
-                    override fun onError(e: Throwable?) {
-                        uploadVideoFailure()
-                    }
-
-                    override fun onProgress(total: Long, progress: Long) {
-
-                    }
-                })
-    }
-
-    private fun postVideoInfo(url: String, poster: String) {
-        val map = HashMap<String, Any>().apply {
-            put("poster", poster)
-            put("url", url)
-            put("format", currentUploadingVideo?.format ?: "")
-            put("size", currentUploadingVideo?.size ?: 0)
-            put("length", (currentUploadingVideo?.duration ?: 0) / 1000)
-            put("type", getVideoType())
-        }
-        val requestBody = map.toRequestBody()
-        mApi.insertVideo(requestBody)
-            .compose(observableToMain())
-            .subscribe(object : Response<JsonObject>() {
-                override fun onResponse(response: JsonObject?) {
-                    super.onResponse(response)
-                    if (response != null) {
-                        uploadVideoSuccess(poster, url, response)
-                    }
-                }
-
-                override fun onFailure(e: HttpException?) {
-                    super.onFailure(e)
-                    uploadVideoFailure()
-                }
-            })
-    }
-
-    private fun uploadVideoSuccess(poster: String, url: String, data: JsonObject) {
-        processDialog.postValue(WaitingDialogFragment.WaitingDialogData("封面上传中...", false))
-        currentUploadingVideo?.let {
-            mUploadVideoListener?.changePoster(it.id, poster)
-            mUploadVideoListener?.videoUploadFinished(it.id, url, data)
-            UploadManager.cancelTask(it.filePath)
-            localVideoList.remove(it)
-        }
-        currentUploadingVideo = null
-        uploadVideo()
-    }
-
-    private fun uploadVideoFailure() {
-        processDialog.postValue(WaitingDialogFragment.WaitingDialogData("封面上传中...", false))
-        currentUploadingVideo?.let {
-            runOnUiThread {
-                mUploadVideoListener?.videoUploadFailed(it.id)
-            }
-            uploadVideoErrorList.add(it)
-            localVideoList.remove(it)
-            UploadManager.cancelTask(it.filePath)
-        }
-        currentUploadingVideo = null
-        uploadVideo()
-    }
-
-    fun checkIsAllUploadedAndToast(): Boolean {
-        if (localVideoList.isNotEmpty() || uploadVideoErrorList.isNotEmpty()) {
-            ToastUtils.showToast("视频未上传完成，视频内容保存失败")
-            return false
-        }
-        return true
-    }
-
-    private fun getVideoType(): String {
-        return when (type) {
-            BbsType.GAME_BBS.value -> {
-                when (getRichType()) {
-                    RichType.ARTICLE -> BbsType.GAME_BBS_ARTICLE_INSERT.value
-                    RichType.QUESTION -> BbsType.GAME_BBS_QUESTION_INSERT.value
-                    else -> ""
-                }
-            }
-            BbsType.OFFICIAL_BBS.value -> {
-                when (getRichType()) {
-                    RichType.ARTICLE -> BbsType.OFFICIAL_BBS_ARTICLE_INSERT.value
-                    RichType.QUESTION -> BbsType.OFFICIAL_BBS_QUESTION_INSERT.value
-                    else -> ""
-                }
-            }
-            else -> ""
-        }
-    }
-
-    abstract fun getRichType(): RichType
-}
-
-interface UploadVideoListener {
-    /**
-     * 插入视频占位图
-     */
-    fun insertPlaceholderVideo(id: String, poster: String)
-
-    /**
-     * 更新视频进度条
-     */
-    fun updateVideoProgress(id: String, progress: String)
-
-    /**
-     * 上传视频完成
-     */
-    fun videoUploadFinished(id: String, url: String, msg: JsonObject)
-
-    /**
-     * 更换封面图
-     */
-    fun changePoster(id: String, poster: String)
-
-    /**
-     * 上传失败
-     */
-    fun videoUploadFailed(id: String)
-}
-
-enum class RichType {
-    ARTICLE,
-    QUESTION,
-    ANSWER
-}

app/src/main/java/com/gh/base/CurrentActivityHolder.kt

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.core.utils
+package com.gh.base
 
 import android.app.Activity
 

app/src/main/java/com/gh/base/DarkModeSwitchHelper.kt

@@ -1,86 +0,0 @@
-package com.gh.base
-
-import android.view.Gravity
-import androidx.appcompat.app.AppCompatActivity
-import com.gh.gamecenter.R
-import com.gh.gamecenter.common.utils.DarkModeUtils
-import com.gh.gamecenter.common.utils.DialogHelper
-import com.gh.gamecenter.common.utils.PackageFlavorHelper
-import com.gh.gamecenter.common.utils.dip2px
-import com.lzf.easyfloat.EasyFloat
-import com.lzf.easyfloat.enums.ShowPattern
-import com.lzf.easyfloat.enums.SidePattern
-
-object DarkModeSwitchHelper {
-
-    fun showDarkModeSwitchFloatingView(activity: AppCompatActivity) {
-        if (PackageFlavorHelper.IS_TEST_FLAVOR) {
-            EasyFloat.with(activity)
-                .setLayout(R.layout.layout_day_mode_night_mode_switch)
-                .setTag("night_mode_switch_floating_view")
-                .setAnimator(null)
-                .setGravity(Gravity.TOP.xor(Gravity.END), 0, 114F.dip2px())
-                .setSidePattern(SidePattern.RESULT_SIDE)
-                .setDragEnable(true)
-                .setShowPattern(ShowPattern.CURRENT_ACTIVITY)
-                .registerCallback {
-                    createResult { _, _, view ->
-                        view?.setOnClickListener {
-                            showDarkModeSwitchDialog(activity)
-                        }
-                    }
-                }
-                .show()
-        }
-    }
-
-    fun dismissDarkModeSwitchFloatingView() {
-        if (PackageFlavorHelper.IS_TEST_FLAVOR) {
-            EasyFloat.dismiss("night_mode_switch_floating_view")
-        }
-    }
-
-    private fun showDarkModeSwitchDialog(activity: AppCompatActivity) {
-        if (PackageFlavorHelper.IS_TEST_FLAVOR) {
-            //切换深色模式
-            var mode = "普通模式"
-            var positive = "跟随系统模式"
-            var negative = "深色模式"
-            if (DarkModeUtils.isFollowSystemDarkModeFromSp()) {
-                mode = "跟随系统模式"
-                positive = "普通模式"
-                negative = "深色模式"
-            } else if (DarkModeUtils.isAppDarkModeEnabledFromSp()) {
-                mode = "深色模式"
-                positive = "跟随系统模式"
-                negative = "普通模式"
-            }
-            DialogHelper.showDialog(
-                context = activity,
-                title = "选择模式",
-                content = "当前为 $mode",
-                confirmText = positive,
-                cancelText = negative,
-                confirmClickCallback = {
-                    if (DarkModeUtils.isFollowSystemDarkModeFromSp()) {
-                        DarkModeUtils.updateAppDarkModeStatusToSp(false)
-                        DarkModeUtils.updateFollowSystemDarkModeToSp(false)
-                    } else {
-                        DarkModeUtils.updateFollowSystemDarkModeToSp(true)
-                    }
-                    DarkModeUtils.initDarkMode()
-                },
-                cancelClickCallback = {
-                    if (DarkModeUtils.isFollowSystemDarkModeFromSp()) {
-                        DarkModeUtils.updateAppDarkModeStatusToSp(true)
-                    } else {
-                        DarkModeUtils.updateAppDarkModeStatusToSp(!DarkModeUtils.isAppDarkModeEnabledFromSp())
-                    }
-                    DarkModeUtils.updateFollowSystemDarkModeToSp(false)
-                    DarkModeUtils.initDarkMode()
-                },
-                extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
-            )
-        }
-    }
-}

app/src/main/java/com/gh/base/DownloadToolbarActivity.kt

@@ -1,112 +0,0 @@
-package com.gh.base
-
-import android.os.Bundle
-import android.text.TextUtils
-import android.view.MenuItem
-import android.view.View
-import android.widget.ImageView
-import android.widget.TextView
-import com.gh.download.DownloadManager
-import com.gh.gamecenter.DownloadManagerActivity
-import com.gh.gamecenter.R
-import com.gh.gamecenter.common.base.activity.ToolBarActivity
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.utils.viewModelProvider
-import com.gh.gamecenter.core.utils.DisplayUtils
-import com.gh.gamecenter.core.utils.SPUtils.getBoolean
-import com.gh.gamecenter.entity.GameUpdateEntity
-import com.gh.gamecenter.eventbus.EBDownloadStatus
-import com.gh.gamecenter.packagehelper.PackageViewModel
-import org.greenrobot.eventbus.Subscribe
-import org.greenrobot.eventbus.ThreadMode
-
-// TODO:移动到module_download模块中
-abstract class DownloadToolbarActivity : ToolBarActivity() {
-
-    private var mDownloadCountHint: TextView? = null
-    private var mPackageViewModel: PackageViewModel? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        if (!getBoolean(Constants.SP_TEENAGER_MODE) && showDownloadMenu()) {
-            mPackageViewModel = viewModelProvider(PackageViewModel.Factory())
-            mPackageViewModel?.filterSameUpdateLiveData?.observe(this) { updateList: List<GameUpdateEntity> ->
-                updateDownloadCountHint(updateList)
-            }
-        }
-    }
-
-    override fun setToolbarMenu(res: Int) {
-        // 青少年模式下要隐藏下载按钮
-        if (getBoolean(Constants.SP_TEENAGER_MODE) && res == R.menu.menu_download) return
-        super.setToolbarMenu(res)
-    }
-
-    override fun inflateMenu(res: Int) {
-        super.inflateMenu(res)
-        if (showDownloadMenu()) {
-            createDownloadMenu(res)
-        }
-    }
-
-    private fun createDownloadMenu(res: Int) {
-        if (res != R.menu.menu_download) {
-            menuInflater.inflate(R.menu.menu_download, mActionMenuView.menu)
-        }
-        if (mPackageViewModel != null) {
-            updateDownloadCountHint(mPackageViewModel?.filterSameUpdateLiveData?.value)
-        }
-        val downloadMenuView = mActionMenuView.menu.findItem(R.id.menu_download).actionView
-        mDownloadCountHint = downloadMenuView?.findViewById(R.id.menu_download_count_hint)
-    }
-
-    override fun onMenuItemClick(item: MenuItem?): Boolean {
-        if (item!!.itemId == R.id.menu_download) {
-//            MtaHelper.onEvent("下载管理", "下载管理入口", getActivityNameInChinese());
-            val intent = DownloadManagerActivity.getDownloadMangerIntent(this, mEntrance)
-            startActivity(intent)
-            return true
-        }
-        return super.onMenuItemClick(item)
-    }
-
-    private fun updateDownloadCountHint(updateList: List<GameUpdateEntity>?) {
-        if (mDownloadCountHint == null) return
-        val count = DownloadManager.getInstance().getDownloadOrUpdateCount(updateList)
-        if (count != null) {
-            mDownloadCountHint!!.visibility = View.VISIBLE
-            mDownloadCountHint!!.text = count
-            val params = mDownloadCountHint!!.layoutParams
-            if (TextUtils.isEmpty(count)) {
-                params.width = DisplayUtils.dip2px(6f)
-                params.height = DisplayUtils.dip2px(6f)
-            } else {
-                params.width = DisplayUtils.dip2px(12f)
-                params.height = DisplayUtils.dip2px(12f)
-            }
-            mDownloadCountHint!!.layoutParams = params
-        } else {
-            mDownloadCountHint!!.visibility = View.GONE
-        }
-    }
-
-    protected open fun showDownloadMenu(): Boolean {
-        return false
-    }
-
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    fun onEventMainThread(status: EBDownloadStatus?) {
-        if (!getBoolean(Constants.SP_TEENAGER_MODE) && showDownloadMenu() && mPackageViewModel != null) {
-            updateDownloadCountHint(mPackageViewModel?.filterSameUpdateLiveData?.value)
-        }
-    }
-
-    override fun onDarkModeChanged() {
-        super.onDarkModeChanged()
-        if (showDownloadMenu() && getMenuItem(R.id.menu_download) != null) {
-            (getMenuItem(R.id.menu_download).actionView?.findViewById(R.id.menu_download_iv) as ImageView).setImageResource(
-                R.drawable.toolbar_download
-            )
-        }
-    }
-}

app/src/main/java/com/gh/base/GHActivityLifecycleCallbacksImpl.java

@@ -0,0 +1,71 @@
+package com.gh.base;
+
+import android.app.Activity;
+import android.app.Application.ActivityLifecycleCallbacks;
+import android.os.Bundle;
+
+import com.gh.common.im.ImManager;
+import com.gh.common.notifier.Notifier;
+import com.gh.common.util.DataUtils;
+import com.gh.download.DownloadManager;
+import com.lightgame.utils.AppManager;
+
+/**
+ * 1、写点针对生命周期的统计代码
+ * 2、写点通用的逻辑
+ * 3、接口解耦
+ *
+ * @author CsHeng
+ * @Date 09/05/2017
+ * @Time 6:22 PM
+ */
+public class GHActivityLifecycleCallbacksImpl implements ActivityLifecycleCallbacks {
+
+    @Override
+    public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
+
+        AppManager.getInstance().addActivity(activity);
+    }
+
+    @Override
+    public void onActivityStarted(Activity activity) {
+
+    }
+
+    @Override
+    public void onActivityResumed(Activity activity) {
+
+        DataUtils.onResume(activity);
+        CurrentActivityHolder.getActivitySet().add(activity);
+        ImManager.updateFloatingWindow();
+        //FIXME 这里应该只是部分Activity需要
+        try {
+            // 初始化gameMap
+            DownloadManager.getInstance(activity).initGameMap();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void onActivityPaused(Activity activity) {
+        DataUtils.onPause(activity);
+        CurrentActivityHolder.getActivitySet().remove(activity);
+    }
+
+    @Override
+    public void onActivityStopped(Activity activity) {
+        Notifier.hide();
+    }
+
+    @Override
+    public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
+
+    }
+
+    @Override
+    public void onActivityDestroyed(Activity activity) {
+        AppManager.getInstance().finishActivity(activity);
+    }
+
+}

app/src/main/java/com/gh/base/GHUmengNotificationService.kt

@@ -0,0 +1,231 @@
+package com.gh.base
+
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.os.Bundle
+import android.preference.PreferenceManager
+import android.text.TextUtils
+import android.view.View
+import androidx.core.app.NotificationCompat
+import com.gh.common.notifier.Notifier
+import com.gh.common.util.EntranceUtils
+import com.gh.common.util.MtaHelper
+import com.gh.common.util.StringUtils
+import com.gh.common.util.toObject
+import com.gh.gamecenter.R
+import com.gh.gamecenter.entity.PushEntity
+import com.gh.gamecenter.entity.PushMessageEntity
+import com.gh.gamecenter.entity.PushMessageUnreadEntity
+import com.gh.gamecenter.entity.PushNotificationEntity
+import com.gh.gamecenter.manager.UserManager
+import com.gh.gamecenter.message.MessageUnreadRepository
+import com.gh.gamecenter.qa.answer.detail.AnswerDetailActivity
+import com.gh.gamecenter.receiver.UmengMessageReceiver
+import com.gh.gamecenter.receiver.UmengMessageReceiver.Companion.TYPE_CLICK
+import com.gh.gamecenter.receiver.UmengMessageReceiver.Companion.TYPE_REMOVE
+import com.gh.gamecenter.retrofit.Response
+import com.gh.gamecenter.retrofit.RetrofitManager
+import com.google.gson.Gson
+import com.umeng.message.UmengMessageService
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+import okhttp3.MediaType
+import okhttp3.RequestBody
+import okhttp3.ResponseBody
+import org.android.agoo.common.AgooConstants
+import org.json.JSONObject
+import retrofit2.HttpException
+import java.util.*
+
+class GHUmengNotificationService : UmengMessageService() {
+
+    companion object {
+        const val ACTION_UMENG = "com.gh.gamecenter.UMENG"
+        const val MESSAGE_FROM_SYSTEM = "message_from_system"
+        const val HALO_MESSAGE_DIALOG = "HALO_MESSAGE_DIALOG"
+        const val HALO_MESSAGE_CENTER = "HALO_MESSAGE_CENTER"
+        const val ANSWER = "answer"
+        const val FOLLOW_QUESTION = "follow_question"
+        const val NOTIFICATION_ID = 2015
+        const val DISPLAY_TYPE_NOTIFICATION = "notification"
+        const val DISPLAY_TYPE_CUSTOM = "custom"
+        const val MESSAGE_ID = "message_id"
+        const val NOTIFICATION_MESSAGE_ID = "notification_message_id" // 通知中心消息 ID
+        const val PUSH_ID = "push_id"
+    }
+
+    val notificationTags = arrayOf("GH_UMENG_TAG_1", "GH_UMENG_TAG_2", "GH_UMENG_TAG_3")
+    val gson = Gson()
+
+    override fun onMessage(context: Context, intent: Intent) {
+        val message = intent.getStringExtra(AgooConstants.MESSAGE_BODY)
+        val isMessageFromSystem = intent.getBooleanExtra(MESSAGE_FROM_SYSTEM, false)
+
+        try {
+            val pushData = message.toObject<PushEntity>()
+            pushData?.let { handlePushData(context, it, message, isMessageFromSystem) }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+
+    private fun handlePushData(context: Context, pushData: PushEntity, message: String, isMessageFromSystem: Boolean) {
+        val notificationManager = context.applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+
+        if (pushData.displayType == DISPLAY_TYPE_NOTIFICATION) {
+            // 其它类型的透传信息
+            // 显示到通知栏
+            val msg = message.toObject<PushNotificationEntity>()
+            val data = msg?.extra?.data
+
+            // 系统推送(非自定义信息)，直接处理跳转
+            if (isMessageFromSystem) {
+                val intent = Intent()
+                intent.setClass(context, UmengMessageReceiver::class.java)
+                intent.putExtra(EntranceUtils.KEY_DATA, data?.link)
+                intent.putExtra(EntranceUtils.KEY_TYPE, UmengMessageReceiver.DIRECT_ONLY)
+                intent.putExtra(EntranceUtils.KEY_MESSAGE, message)
+                intent.putExtra(NOTIFICATION_MESSAGE_ID, data?.messageId)
+                context.sendBroadcast(intent)
+                return
+            }
+
+            // 用户未登录的情况下不生成消息中心通知，避免用户掉登录了还收到跳转至消息中心的通知
+            if (data != null
+                    && data.link?.target == "system"
+                    && !UserManager.getInstance().isLoggedIn) {
+                return
+            }
+
+            val clickIntent = Intent()
+            val removeIntent = Intent()
+
+            clickIntent.setClass(context, UmengMessageReceiver::class.java)
+            clickIntent.putExtra(EntranceUtils.KEY_DATA, data?.link)
+            clickIntent.putExtra(EntranceUtils.KEY_MESSAGE, message)
+            clickIntent.putExtra(MESSAGE_ID, msg?.msgId)
+            clickIntent.putExtra(PUSH_ID, data?.pushId)
+            clickIntent.putExtra(NOTIFICATION_MESSAGE_ID, data?.messageId)
+            clickIntent.putExtra(EntranceUtils.KEY_TYPE, TYPE_CLICK)
+
+            removeIntent.setClass(context, UmengMessageReceiver::class.java)
+            removeIntent.putExtra(EntranceUtils.KEY_TYPE, TYPE_REMOVE)
+            removeIntent.putExtra(EntranceUtils.KEY_MESSAGE, message)
+
+            val clickPendingIntent = PendingIntent.getBroadcast(context, System.currentTimeMillis().toInt(),
+                    clickIntent, PendingIntent.FLAG_UPDATE_CURRENT)
+
+            val deletePendingIntent = PendingIntent.getBroadcast(context, System.currentTimeMillis().toInt() + 1,
+                    removeIntent, PendingIntent.FLAG_UPDATE_CURRENT)
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                val channel = NotificationChannel("Halo_Push", "Halo_Push", NotificationManager.IMPORTANCE_DEFAULT)
+                notificationManager.createNotificationChannel(channel)
+            }
+
+            val notification = NotificationCompat.Builder(context, "Halo_Push")
+                    .setSmallIcon(R.drawable.ic_notification)
+                    .setTicker(pushData.body?.ticker)
+                    .setContentTitle(pushData.body?.title)
+                    .setContentText(pushData.body?.text)
+                    .setContentIntent(clickPendingIntent)
+                    .setDeleteIntent(deletePendingIntent)
+                    .build()
+            notification.flags = notification.flags or Notification.FLAG_AUTO_CANCEL
+
+            notificationManager.notify(getNotificationTag(context), NOTIFICATION_ID, notification)
+        } else {
+            if (UserManager.getInstance().isLoggedIn &&
+                    HALO_MESSAGE_DIALOG == pushData.body?.custom &&
+                    MessageUnreadRepository.unreadLiveData.value != null) {
+                // 回答了问题或者关注了问题的消息
+                val msg = gson.fromJson(message, PushMessageEntity::class.java)
+                val data = msg?.extra?.data
+
+                val type = if (ANSWER == data?.type) {
+                    "回答了你的问题"
+                } else {
+                    "回答了你关注的问题"
+                }
+
+                val userName = StringUtils.shrinkStringWithDot(data?.userEntity?.name, 8)
+                val displayText = userName + type
+
+                if (Notifier.isActivityValid(CurrentActivityHolder.getCurrentActivity()) &&
+                        Notifier.shouldShowNotifier(data?.answer?.id + displayText)) {
+                    Notifier.create(CurrentActivityHolder.getCurrentActivity())
+                            .setText(displayText)
+                            .setDuration(5000)
+                            .setIcon(data?.userEntity?.icon)
+                            .setOnClickListener(View.OnClickListener {
+                                val bundle = Bundle()
+                                bundle.putString(EntranceUtils.KEY_ANSWER_ID, data?.answer?.id)
+                                bundle.putString(EntranceUtils.KEY_ENTRANCE, EntranceUtils.ENTRANCE_UMENG)
+                                bundle.putString(EntranceUtils.KEY_TO, AnswerDetailActivity::class.java.name)
+                                EntranceUtils.jumpActivity(context, bundle)
+
+                                MtaHelper.onEvent("消息弹窗", type, "Does not contains any parameter.")
+
+                                // 标记已读
+                                val jsonObject = JSONObject()
+                                jsonObject.put("type", type)
+                                val body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString())
+
+                                RetrofitManager.getInstance(application).api.postMessageRead(UserManager.getInstance().userId, data?.id, body)
+                                        .subscribeOn(Schedulers.io())
+                                        .observeOn(AndroidSchedulers.mainThread())
+                                        .subscribe(object : Response<ResponseBody>() {
+                                            override fun onResponse(response: ResponseBody?) {
+                                                super.onResponse(response)
+                                                MessageUnreadRepository.loadMessageUnreadData()
+                                            }
+
+                                            override fun onFailure(e: HttpException?) {
+                                                e?.printStackTrace()
+                                            }
+                                        })
+                                Notifier.hide()
+                            })
+                            .show(false)
+                    Notifier.tagNotifierAsShowed(data?.answer?.id + displayText)
+                }
+            } else if (HALO_MESSAGE_CENTER == pushData.body?.custom) {
+                // 消息中心逻辑
+                val msg = gson.fromJson(message, PushMessageUnreadEntity::class.java)
+                val data = msg?.extra?.data
+                data?.let { MessageUnreadRepository.loadMessageUnreadData() }
+            }
+        }
+    }
+
+    /**
+     * 规则:最多三条消息,以旧换新
+     *
+     * @return NotificationTag
+     */
+    private fun getNotificationTag(context: Context): String {
+        val sp = PreferenceManager.getDefaultSharedPreferences(context)
+        val edit = sp.edit()
+
+        val timeTagMap = HashMap<Long, String>()
+        for (tag in notificationTags) {
+            val time = sp.getLong(tag, 0)
+            if (time == 0L) {
+                edit.putLong(tag, System.currentTimeMillis()).apply()
+                return tag
+            } else {
+                timeTagMap[time] = tag
+            }
+        }
+
+        val minTime = Collections.min(timeTagMap.keys)
+        val tag = timeTagMap[minTime]
+        edit.putLong(tag, System.currentTimeMillis()).apply()
+        return if (TextUtils.isEmpty(tag)) notificationTags[0] else tag!!
+    }
+}

app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt

@@ -1,96 +0,0 @@
-package com.gh.base
-
-import android.app.Activity
-import android.app.Application
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
-import com.gh.common.util.FloatingBackViewManager
-import com.gh.download.DownloadManager
-import com.gh.gamecenter.MainActivity
-import com.gh.gamecenter.SplashScreenActivity
-import com.gh.gamecenter.common.utils.PackageFlavorHelper
-import com.gh.gamecenter.forum.detail.ForumDetailActivity
-import com.gh.gamecenter.forum.list.ForumListActivity
-import com.gh.gamecenter.qa.article.detail.ArticleDetailActivity
-import com.gh.gamecenter.qa.questions.newdetail.NewQuestionDetailActivity
-import com.gh.gamecenter.qa.video.detail.ForumVideoDetailActivity
-import com.gh.vspace.VHelper
-import com.halo.assistant.HaloApp
-
-// TODO：移动到对应的模块
-class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
-
-    override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
-        // do nothing
-    }
-
-    override fun onActivityStarted(activity: Activity) {
-        GlobalActivityManager.currentActivity = activity
-    }
-
-    override fun onActivityResumed(activity: Activity) {
-        // 判断是否需要显示或隐藏返回小浮窗
-        if (FloatingBackViewManager.getType().isNotEmpty()) {
-            if ((activity::class.java.name == "EnergyCenterActivity")
-                && FloatingBackViewManager.getType() == FloatingBackViewManager.TYPE_TASK
-            ) {
-                FloatingBackViewManager.disableBackView()
-            } else if (!shouldShowActivityBackView(activity)
-                && FloatingBackViewManager.getType() == FloatingBackViewManager.TYPE_ACTIVITY
-            ) {
-                FloatingBackViewManager.disableBackView()
-            } else {
-                FloatingBackViewManager.showBackView(activity)
-            }
-        }
-
-        if (HaloApp.isUserAcceptPrivacyPolicy(activity)) {
-            // FIXME 这里应该只是部分Activity需要
-            try {
-                // 初始化gameMap
-                if (activity !is SplashScreenActivity) {
-                    DownloadManager.getInstance().initGameMap()
-                }
-            } catch (e: Exception) {
-                e.printStackTrace()
-            }
-        }
-
-        if (PackageFlavorHelper.IS_TEST_FLAVOR && activity is AppCompatActivity) {
-            DarkModeSwitchHelper.showDarkModeSwitchFloatingView(activity)
-        }
-
-        if (activity is AppCompatActivity && activity !is SplashScreenActivity) {
-            VHelper.showFeedbackDialogIfLastSuccessfulLaunchedGameExitUnexpectedly(activity)
-        }
-    }
-
-    private fun shouldShowActivityBackView(activity: Activity): Boolean {
-        return (activity is MainActivity
-                || activity is ArticleDetailActivity
-                || activity is ForumVideoDetailActivity
-                || activity is ForumDetailActivity
-                || activity is ForumListActivity
-                || activity is NewQuestionDetailActivity)
-    }
-
-    override fun onActivityPaused(activity: Activity) {
-        FloatingBackViewManager.dismissBackView()
-        if (PackageFlavorHelper.IS_TEST_FLAVOR && activity is AppCompatActivity) {
-            DarkModeSwitchHelper.dismissDarkModeSwitchFloatingView()
-        }
-    }
-
-    override fun onActivityStopped(activity: Activity) {
-        // do nothing
-    }
-
-    override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
-        // do nothing
-    }
-
-    override fun onActivityDestroyed(activity: Activity) {
-        // do nothing
-    }
-
-}

app/src/main/java/com/gh/base/GlobalActivityManager.kt

@@ -1,14 +0,0 @@
-package com.gh.base
-
-import android.app.Activity
-import java.lang.ref.WeakReference
-
-object GlobalActivityManager {
-    private var mCurrentActivityWeakRef: WeakReference<Activity>? = null
-
-    var currentActivity: Activity?
-        get() = mCurrentActivityWeakRef?.get()
-        set(activity) {
-            mCurrentActivityWeakRef = WeakReference<Activity>(activity)
-        }
-}

app/src/main/java/com/gh/base/OnDoubleTapListener.java

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.callback;
+package com.gh.base;
 
 import android.content.Context;
 import android.view.GestureDetector;

app/src/main/java/com/gh/base/OnListClickListener.java

@@ -0,0 +1,19 @@
+package com.gh.base;
+
+import android.view.View;
+
+/**
+ * Created by khy on 26/09/17.
+ */
+
+public interface OnListClickListener  {
+
+    /**
+     *
+     * @param view
+     * @param position list position
+     * @param data list data (直接强转 如果列表传入不同数据类型 请做好判断)
+     * @param <T>
+     */
+    <T> void onListClick(View view, int position, T data);
+}

app/src/main/java/com/gh/base/OnRequestCallBackListener.java

@@ -0,0 +1,20 @@
+package com.gh.base;
+
+/**
+ * Created by Administrator on 2016/9/8.
+ *
+ * 逐步移除
+ */
+
+@Deprecated
+public interface OnRequestCallBackListener<T> {
+
+    void loadDone();
+
+    void loadDone(T obj);
+
+    void loadError();
+
+    void loadEmpty();
+
+}

app/src/main/java/com/gh/base/OnViewClickListener.java

@@ -0,0 +1,7 @@
+package com.gh.base;
+
+import android.view.View;
+
+public interface OnViewClickListener<T> {
+    void onClick(View v, T data);
+}

app/src/main/java/com/gh/base/SearchBarHint.java

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.core.iinterface;
+package com.gh.base;
 
 import java.util.ArrayList;
 

app/src/main/java/com/gh/base/ToolBarActivity.java

@@ -0,0 +1,256 @@
+package com.gh.base;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.gh.common.util.DisplayUtils;
+import com.gh.common.util.MtaHelper;
+import com.gh.download.DownloadManager;
+import com.gh.gamecenter.DownloadManagerActivity;
+import com.gh.gamecenter.R;
+import com.gh.gamecenter.entity.GameUpdateEntity;
+import com.gh.gamecenter.eventbus.EBDownloadStatus;
+import com.gh.gamecenter.normal.ToolbarController;
+import com.gh.gamecenter.packagehelper.PackageViewModel;
+import com.lightgame.OnTitleClickListener;
+
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.List;
+
+import androidx.annotation.DrawableRes;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.ViewModelProviders;
+
+/**
+ * 需要用到工具栏的页面使用
+ * <p>
+ * 特殊页面请参考{@link BaseActivity}
+ */
+
+public abstract class ToolBarActivity extends BaseActivity implements ToolbarController, Toolbar.OnMenuItemClickListener {
+
+    @Nullable
+    private PackageViewModel mPackageViewModel;
+
+    protected Toolbar mToolbar;
+
+    protected TextView mTitleTv;
+
+    @Nullable
+    private TextView mDownloadCountHint;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setStatusBarDarkMode(true, this);
+        initToolbar();
+
+        if (showDownloadMenu()) {
+            mPackageViewModel = ViewModelProviders.of(this, new PackageViewModel.Factory()).get(PackageViewModel.class);
+            mPackageViewModel.getFilterSameUpdateLiveData().observe(this, this::updateDownloadCountHint);
+        }
+    }
+
+    // 小米沉浸式黑色字体
+    @SuppressLint("PrivateApi")
+    public void setStatusBarDarkMode(boolean darkmode, Activity activity) {
+        Class<? extends Window> clazz = activity.getWindow().getClass();
+        try {
+            Class<?> layoutParams = Class.forName("android.view.MiuiWindowManager$LayoutParams");
+            Field field = layoutParams.getField("EXTRA_FLAG_STATUS_BAR_DARK_MODE");
+            int darkModeFlag = field.getInt(layoutParams);
+            Method extraFlagField = clazz.getMethod("setExtraFlags", int.class, int.class);
+            extraFlagField.invoke(activity.getWindow(), darkmode ? darkModeFlag : 0, darkModeFlag);
+        } catch (Exception ignore) {
+
+        }
+    }
+
+    private void initToolbar() {
+        mToolbar = findViewById(R.id.normal_toolbar);
+        mTitleTv = findViewById(R.id.normal_title);
+        if (mToolbar != null) {
+//            setSupportActionBar(mToolbar); // 替换actionBar后 toolBar无法控制
+            mToolbar.setNavigationIcon(provideNavigationIcon());
+            mToolbar.setNavigationOnClickListener(provideNavigationItemClickListener());
+            if (mTitleTv != null) {
+                mTitleTv.setOnClickListener(view -> {
+                    final List<Fragment> fragmentList = getSupportFragmentManager().getFragments();
+                    for (Fragment fragment : fragmentList) {
+                        if (fragment instanceof OnTitleClickListener) {
+                            ((OnTitleClickListener) fragment).onTitleClick();
+                        }
+                    }
+                });
+            }
+        }
+    }
+
+    @DrawableRes
+    public int provideNavigationIcon() {
+        return R.drawable.ic_bar_back; // default navigation icon
+    }
+
+    @Override
+    public void setNavigationTitle(String title) {
+        if (mTitleTv != null) mTitleTv.setText(title);
+    }
+
+    @Override
+    public void setNavigationTitle(@StringRes int res) {
+        setNavigationTitle(getString(res));
+    }
+
+    /**
+     * 重写此方法以将标题靠左显示
+     */
+    public boolean showToolbarAtLeft() {
+        return false;
+    }
+
+    @Override
+    public void setToolbarMenu(int res) {
+        if (mToolbar == null) return;
+        mToolbar.inflateMenu(res);
+        mToolbar.setOnMenuItemClickListener(this);
+
+        if (showDownloadMenu()) {
+            createDownloadMenu(res);
+        }
+
+        Menu menu = mToolbar.getMenu();
+        for (int i = 0; i < menu.size(); i++) {
+            MenuItem menuItem = menu.getItem(i);
+            // menu设置actionLayout后，无法捕捉点击事件，以icon为tag，如果icon is null 手动设置menuItem点击事件
+            if (menuItem != null && menuItem.getIcon() == null) {
+                if (menuItem.getActionView() != null) {
+                    menuItem.getActionView().setOnClickListener((v) -> this.onMenuItemClick(menuItem));
+                }
+            }
+        }
+
+        // 限制标题实际宽度 防止标题挡住toolbar menu按钮
+        if (menu.size() > 2 && mTitleTv != null) {
+            ViewGroup.LayoutParams layoutParams = mTitleTv.getLayoutParams();
+            if (layoutParams instanceof RelativeLayout.LayoutParams) {
+                RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) layoutParams;
+                if (showToolbarAtLeft()) {
+                    params.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
+                    params.addRule(RelativeLayout.CENTER_VERTICAL);
+                    params.setMargins(DisplayUtils.dip2px(55), 0, DisplayUtils.dip2px(48 * menu.size()), 0);
+                } else {
+                    params.setMargins(DisplayUtils.dip2px(90), 0, DisplayUtils.dip2px(90), 0);
+                }
+                mTitleTv.setLayoutParams(params);
+            }
+        } else {
+            if (showToolbarAtLeft()) {
+                ViewGroup.LayoutParams layoutParams = mTitleTv.getLayoutParams();
+                if (layoutParams instanceof RelativeLayout.LayoutParams) {
+                    RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) layoutParams;
+                    params.addRule(RelativeLayout.CENTER_VERTICAL);
+                    params.setMargins(DisplayUtils.dip2px(55), 0, DisplayUtils.dip2px(48 * menu.size()), 0);
+                    mTitleTv.setLayoutParams(params);
+                }
+            }
+        }
+    }
+
+    private void createDownloadMenu(int res) {
+        if (res != R.menu.menu_download) {
+            MenuInflater inflater = getMenuInflater();
+            inflater.inflate(R.menu.menu_download, mToolbar.getMenu());
+        }
+
+        if (mPackageViewModel != null) {
+            updateDownloadCountHint(mPackageViewModel.getFilterSameUpdateLiveData().getValue());
+        }
+
+        View downloadMenuView = mToolbar.getMenu().findItem(R.id.menu_download).getActionView();
+        mDownloadCountHint = downloadMenuView.findViewById(R.id.menu_download_count_hint);
+    }
+
+    private void updateDownloadCountHint(List<GameUpdateEntity> updateList) {
+        if (mDownloadCountHint == null) return;
+
+        String count = DownloadManager.getInstance(getApplicationContext()).getDownloadOrUpdateCount(updateList);
+        if (count != null) {
+            mDownloadCountHint.setVisibility(View.VISIBLE);
+            mDownloadCountHint.setText(count);
+
+            ViewGroup.LayoutParams params = mDownloadCountHint.getLayoutParams();
+            if (TextUtils.isEmpty(count)) {
+                params.width = DisplayUtils.dip2px(6);
+                params.height = DisplayUtils.dip2px(6);
+            } else {
+                params.width = DisplayUtils.dip2px(12);
+                params.height = DisplayUtils.dip2px(12);
+            }
+            mDownloadCountHint.setLayoutParams(params);
+        } else {
+            mDownloadCountHint.setVisibility(View.GONE);
+        }
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onEventMainThread(EBDownloadStatus status) {
+        if (showDownloadMenu() && mPackageViewModel != null) {
+            updateDownloadCountHint(mPackageViewModel.getFilterSameUpdateLiveData().getValue());
+        }
+    }
+
+    @Override
+    public MenuItem getMenuItem(int res) {
+        if (mToolbar == null) return null; //后续页面做好判断
+        return mToolbar.getMenu().findItem(res);
+    }
+
+    public void clearMenu() {
+        if (mToolbar != null) {
+            mToolbar.getMenu().clear();
+        }
+    }
+
+    public Menu getMenu() {
+        return mToolbar.getMenu();
+    }
+
+    @Override
+    public boolean onMenuItemClick(MenuItem item) {
+        if (item.getItemId() == R.id.menu_download) {
+            MtaHelper.onEvent("下载管理", "下载管理入口", getActivityNameInChinese());
+            Intent intent = DownloadManagerActivity.getDownloadMangerIntent(this, mEntrance);
+            startActivity(intent);
+        }
+        return false;
+    }
+
+    protected View.OnClickListener provideNavigationItemClickListener() {
+        return view -> onBackPressed();
+    }
+
+    protected boolean showDownloadMenu() {
+        return false;
+    }
+}

app/src/main/java/com/gh/base/adapter/FragmentAdapter.java

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.base.adapter;
+package com.gh.base.adapter;
 
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;

app/src/main/java/com/gh/base/adapter/FragmentStateAdapter.java

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.base.adapter;
+package com.gh.base.adapter;
 
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;

app/src/main/java/com/gh/base/fragment/BaseDialogFragment.java

@@ -0,0 +1,64 @@
+package com.gh.base.fragment;
+
+import android.app.Dialog;
+import android.os.Bundle;
+import android.view.KeyEvent;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+import androidx.fragment.app.DialogFragment;
+import androidx.lifecycle.Lifecycle;
+
+import com.gh.common.util.ClickUtils;
+import com.gh.gamecenter.R;
+import com.lightgame.utils.RuntimeUtils;
+import com.lightgame.utils.Utils;
+
+/**
+ * @author CsHeng
+ * @Date 17/05/2017
+ * @Time 4:30 PM
+ */
+
+public class BaseDialogFragment extends DialogFragment {
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        final Dialog dialog = new Dialog(getActivity(), R.style.DialogWindowTransparent);
+        dialog.setCanceledOnTouchOutside(false);
+        dialog.setOnKeyListener((dialog1, keyCode, event) -> {
+            if (keyCode == KeyEvent.KEYCODE_BACK && !ClickUtils.isFastDoubleClick()) {
+                return onBack();
+            }
+            return false;
+        });
+        dialog.setCancelable(false);
+        return dialog;
+    }
+
+    public void toast(@StringRes int res) {
+        if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
+            toast(getString(res));
+    }
+
+    public void toast(String msg) {
+        if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
+            Utils.toast(getContext(), msg);
+    }
+
+    public void toastLong(@StringRes int msg) {
+        toastLong(getString(msg));
+    }
+
+    public void toastLong(String msg) {
+        RuntimeUtils.getInstance().toastLong(getContext(), msg);
+    }
+
+    public boolean onBack() {
+        return false;
+    }
+}
+
+
+

app/src/main/java/com/gh/base/fragment/BaseDialogWrapperFragment.java

@@ -1,18 +1,16 @@
-package com.gh.gamecenter.common.base.fragment;
+package com.gh.base.fragment;
 
 import android.app.Dialog;
 import android.os.Bundle;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-
-import com.gh.gamecenter.common.R;
-
+import com.gh.gamecenter.R;
 
 /**
  * Wrap another fragment with dialog fragment.

app/src/main/java/com/gh/base/fragment/BaseFragment.java

@@ -0,0 +1,258 @@
+package com.gh.base.fragment;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.gh.base.OnListClickListener;
+import com.gh.base.OnRequestCallBackListener;
+import com.gh.common.constant.Constants;
+import com.gh.gamecenter.BuildConfig;
+import com.gh.gamecenter.eventbus.EBMiPush;
+import com.lightgame.OnTitleClickListener;
+import com.lightgame.utils.RuntimeUtils;
+import com.lightgame.utils.Utils;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
+import java.lang.ref.WeakReference;
+import java.util.List;
+
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+import butterknife.ButterKnife;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
+
+import static com.gh.common.util.EntranceUtils.KEY_ENTRANCE;
+
+/**
+ * Created by LGT on 2016/9/4.
+ * Fragment 基类
+ */
+public abstract class BaseFragment<T> extends Fragment implements OnRequestCallBackListener<T>,
+        View.OnClickListener, OnListClickListener, OnTitleClickListener {
+
+    public static final int RESULT_REFRESH = 9528;
+
+    protected View mCachedView;
+
+    protected boolean isEverPause;
+
+    @NonNull
+    protected String mEntrance;
+
+    protected final Handler mBaseHandler = new BaseFragment.BaseHandler(this);
+
+    protected static class BaseHandler extends Handler {
+        private final WeakReference<BaseFragment> mFragmentWeakReference;
+
+        BaseHandler(BaseFragment fragment) {
+            mFragmentWeakReference = new WeakReference<>(fragment);
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+            BaseFragment fragment = mFragmentWeakReference.get();
+            if (fragment != null) fragment.handleMessage(msg);
+        }
+    }
+
+    protected void handleMessage(Message msg) {
+
+    }
+
+    @LayoutRes
+    protected abstract int getLayoutId();
+
+    /**
+     * 提供 Inflated 的 view ，可用于 data binding.
+     */
+    protected View getInflatedLayout() {
+        return null;
+    }
+
+    /**
+     * 责任链，谁处理了就返回true，否则返回super.handleOnClick(View view)
+     *
+     * @return
+     */
+    protected boolean handleOnClick(View view) {
+        return true;
+    }
+
+    @Override
+    public void onClick(View v) {
+        handleOnClick(v);
+    }
+
+
+    protected void initView(View view) {
+    }
+
+    protected void postRunnable(Runnable runnable) {
+        RuntimeUtils.getInstance().runOnUiThread(runnable);
+    }
+
+    // 定时任务全部改用这个方法, 在onDestroy做统一取消定时
+    protected void postDelayedRunnable(Runnable runnable, long delayMillis) {
+        RuntimeUtils.getInstance().runOnUiThread(runnable, delayMillis);
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        final Intent intent = getActivity().getIntent();
+        mEntrance = intent.getStringExtra(KEY_ENTRANCE);
+        if (TextUtils.isEmpty(mEntrance) && getArguments() != null) {
+            mEntrance = getArguments().getString(KEY_ENTRANCE);
+        }
+
+        if (TextUtils.isEmpty(mEntrance)) {
+            mEntrance = Constants.ENTRANCE_UNKNOWN;
+        }
+
+        if (BuildConfig.DEBUG) {
+            Utils.log("FRAGMENT_ENTRANCE -> " + mEntrance);
+        }
+
+        isEverPause = false;
+        EventBus.getDefault().register(this);
+
+        // For data binding.
+        if (getInflatedLayout() != null) {
+            mCachedView = getInflatedLayout();
+        } else {
+            mCachedView = View.inflate(getContext(), getLayoutId(), null);
+        }
+        ButterKnife.bind(this, mCachedView);
+
+        initView(mCachedView);
+    }
+
+    // 必须的有subscribe才能register
+    @Subscribe(threadMode = ThreadMode.BACKGROUND)
+    public void onDummyEvent(EBMiPush push) {
+
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        if (container != null) {
+            container.removeView(mCachedView);
+        }
+        return mCachedView;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        isEverPause = false;
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        isEverPause = true;
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        mBaseHandler.removeCallbacksAndMessages(null);
+        RuntimeUtils.getInstance().removeRunnable();
+        EventBus.getDefault().unregister(this);
+    }
+
+    public void toast(@StringRes int res) {
+        toast(getString(res));
+    }
+
+    public void toast(String msg) {
+        try {
+            Utils.toast(getContext(), msg);
+        } catch (Exception ignore) {
+        
+        }
+    }
+
+    public void toastLong(@StringRes int msg) {
+        toastLong(getString(msg));
+    }
+
+    public void toastLong(String msg) {
+        RuntimeUtils.getInstance().toastLong(getContext(), msg);
+    }
+
+    public boolean isEverPause() {
+        return isEverPause;
+    }
+
+    @Override
+    public void loadDone() {
+
+    }
+
+    @Override
+    public void loadDone(T obj) {
+
+    }
+
+    @Override
+    public void loadError() {
+
+    }
+
+    @Override
+    public void loadEmpty() {
+
+    }
+
+    @Override
+    public <LIST> void onListClick(View view, int position, LIST data) {
+
+    }
+
+    protected <K> Observable<K> asyncCall(Observable<K> observable) {
+        return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread());
+    }
+
+    // 将所有的Fragment都置为隐藏状态。
+    protected void hideFragments(FragmentTransaction transaction) {
+        List<Fragment> list = getChildFragmentManager().getFragments();
+        for (Fragment fragment : list) {
+            transaction.hide(fragment);
+        }
+    }
+
+    @Override
+    public void onTitleClick() {
+        List<Fragment> list = getChildFragmentManager().getFragments();
+        for (Fragment fragment : list) {
+            if (fragment instanceof OnTitleClickListener) {
+                ((OnTitleClickListener) fragment).onTitleClick();
+            }
+        }
+    }
+
+    // 为 fragment 附加 bundle (setArgument())
+    public BaseFragment with(Bundle bundle) {
+        this.setArguments(bundle);
+        return this;
+    }
+
+}

app/src/main/java/com/gh/base/fragment/BaseFragment_TabLayout.java

@@ -0,0 +1,118 @@
+package com.gh.base.fragment;
+
+import android.content.Intent;
+import android.os.Bundle;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.tabs.TabLayout;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
+import android.view.View;
+
+import com.gh.base.adapter.FragmentAdapter;
+import com.gh.common.view.TabIndicatorView;
+import com.gh.gamecenter.R;
+import com.gh.gamecenter.normal.NormalFragment;
+import com.lightgame.view.NoScrollableViewPager;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+
+/**
+ * Created by khy on 15/03/18.
+ */
+
+public abstract class BaseFragment_TabLayout extends NormalFragment implements ViewPager.OnPageChangeListener {
+
+    public static final String PAGE_INDEX = "PAGE_INDEX";
+
+    @BindView(R.id.fragment_tab_layout)
+    protected TabLayout mTabLayout;
+    @BindView(R.id.fragment_view_pager)
+    protected NoScrollableViewPager mViewPager;
+    @BindView(R.id.fragment_tab_indicator)
+    protected TabIndicatorView mTabIndicatorView;
+
+    protected List<Fragment> mFragmentsList;
+
+    protected List<String> mTabTitleList;
+
+    protected int mCheckedIndex = 0;
+
+    protected abstract void initFragmentList(List<Fragment> fragments);
+
+    protected abstract void initTabTitleList(List<String> tabTitleList);
+
+    protected int provideIndicatorWidth() {
+        return 65;
+    }
+
+    protected View provideTabView(int position, String tabTitle) {
+        return null;
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.fragment_tablayout_viewpager;
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        List<Fragment> fragments = getChildFragmentManager().getFragments();
+        if (fragments != null) {
+            for (Fragment fragment : fragments) {
+                fragment.onActivityResult(requestCode, resultCode, data);
+            }
+        }
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (getArguments() != null) mCheckedIndex = getArguments().getInt(PAGE_INDEX, 0);
+        mFragmentsList = new ArrayList<>();
+        initFragmentList(mFragmentsList);
+        mTabTitleList = new ArrayList<>();
+        initTabTitleList(mTabTitleList);
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        mViewPager.setOffscreenPageLimit(mFragmentsList.size());
+        mViewPager.addOnPageChangeListener(this);
+        mViewPager.setAdapter(new FragmentAdapter(getChildFragmentManager(), mFragmentsList, mTabTitleList));
+        mViewPager.setCurrentItem(mCheckedIndex);
+        mTabLayout.setupWithViewPager(mViewPager);
+        mTabIndicatorView.setupWithTabLayout(mTabLayout);
+        mTabIndicatorView.setupWithViewPager(mViewPager);
+        mTabIndicatorView.setIndicatorWidth(provideIndicatorWidth());
+
+        for (int i = 0; i < mTabLayout.getTabCount(); i++) {
+            TabLayout.Tab tab = mTabLayout.getTabAt(i);
+            if (tab == null) continue;
+            View tabView = provideTabView(i, tab.getText() != null ? tab.getText().toString() : "");
+            if (tabView == null) continue;
+            tab.setCustomView(tabView);
+        }
+
+    }
+
+    @Override
+    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+
+    }
+
+    @Override
+    public void onPageSelected(int position) {
+
+    }
+
+    @Override
+    public void onPageScrollStateChanged(int state) {
+
+    }
+}

app/src/main/java/com/gh/base/fragment/BaseFragment_ViewPager.java

@@ -7,19 +7,19 @@
  * 2013-3-6			    CsHeng
  */
 
-package com.gh.gamecenter.common.base.fragment;
+package com.gh.base.fragment;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.view.View;
-
 import androidx.annotation.IdRes;
 import androidx.annotation.LayoutRes;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.viewpager.widget.PagerAdapter;
 import androidx.viewpager.widget.ViewPager;
+import android.view.View;
 
+import com.gh.gamecenter.normal.NormalFragment;
 import com.lightgame.adapter.BaseFragmentPagerAdapter;
 import com.lightgame.config.CommonDebug;
 import com.lightgame.view.DoubleTapTextView;
@@ -34,7 +34,7 @@ import java.util.List;
  * @author CsHeng
  * @date 2013-3-6
  */
-public abstract class BaseFragment_ViewPager extends ToolbarFragment implements DoubleTapTextView.OnDoubleTapListener {
+public abstract class BaseFragment_ViewPager extends NormalFragment implements DoubleTapTextView.OnDoubleTapListener {
 
     public static final String ARGS_INDEX = "index";
     protected int mCheckedIndex = 0;
@@ -53,21 +53,19 @@ public abstract class BaseFragment_ViewPager extends ToolbarFragment implements
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        mViewPager = view.findViewById(getViewPagerId());
-        mFragmentsList = restoreFragments();
-        if (mFragmentsList.size() == 0) {
-            initFragmentList(mFragmentsList);
-        }
+        mFragmentsList = new ArrayList<>();
+        initFragmentList(mFragmentsList);
         mAdapter = BaseFragmentPagerAdapter.newInstance(getChildFragmentManager(), mFragmentsList);
         final Bundle args = getArguments();
         if (args != null) {
             mCheckedIndex = args.getInt(ARGS_INDEX);
         }
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        mViewPager = (ViewPager) view.findViewById(getViewPagerId());
         mViewPager.setOffscreenPageLimit(mFragmentsList.size());
         mViewPager.setAdapter(mAdapter);
         if (mCheckedIndex < mFragmentsList.size()) {
@@ -118,24 +116,9 @@ public abstract class BaseFragment_ViewPager extends ToolbarFragment implements
                 fragment.onActivityResult(requestCode, resultCode, data);
             }
         }
+
     }
 
-    public ArrayList<Fragment> restoreFragments() {
-        String tag = "android:switcher:" + mViewPager.getId() + ":";
-        ArrayList<Fragment> fragments = new ArrayList<>();
-        int childCount = getChildCount();
-        for (int index = 0; index < childCount; index++) {
-            Fragment fragment = getChildFragmentManager().findFragmentByTag(tag + index);
-            if (fragment != null) {
-                fragments.add(fragment);
-            }
-        }
-
-        return fragments;
-    }
-
-    public abstract int getChildCount();
-
     public int getCurrentItem() {
         return mViewPager != null ? mViewPager.getCurrentItem() : 0;
     }

app/src/main/java/com/gh/base/fragment/BaseFragment_ViewPager_Checkable.java

@@ -7,21 +7,23 @@
  * 2013-3-6			    CsHeng
  */
 
-package com.gh.gamecenter.common.base.fragment;
+package com.gh.base.fragment;
 
 import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Checkable;
 
+import com.gh.gamecenter.fragment.MainWrapperFragment;
+
+import java.util.List;
+
 import androidx.annotation.IdRes;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.viewpager.widget.ViewPager;
 
-import java.util.List;
-
 
 /**
  * ViewPager 配合ViewGroup Checkable实现双切换<br/>
@@ -36,7 +38,7 @@ public abstract class BaseFragment_ViewPager_Checkable extends BaseFragment_View
 
     protected ViewGroup mCheckableGroup;
 
-    private int mLastPosition = 0;
+    private int mLastPosition = MainWrapperFragment.INDEX_HOME;
 
     @IdRes
     protected abstract int getCheckableGroupId();
@@ -80,14 +82,14 @@ public abstract class BaseFragment_ViewPager_Checkable extends BaseFragment_View
             if (mFragmentsList.size() > mLastPosition) {
                 Fragment fragment = mFragmentsList.get(mLastPosition);
                 fragment.onPause();
-
+        
                 FragmentManager childFragmentManager = fragment.getChildFragmentManager();
                 List<Fragment> fragments = childFragmentManager.getFragments();
                 for (Fragment childFragment : fragments) {
                     childFragment.onPause();
                 }
             }
-
+            
             if (mFragmentsList.size() > index) {
                 Fragment fragment = mFragmentsList.get(index);
                 fragment.onResume();

app/src/main/java/com/gh/base/fragment/BaseLazyFragment.kt

@@ -1,20 +1,21 @@
-package com.gh.gamecenter.common.base.fragment
+package com.gh.base.fragment
 
 import android.os.Bundle
+import com.gh.gamecenter.normal.NormalFragment
 
 /**
  * 懒加载（支持多层嵌套）
  */
-abstract class BaseLazyFragment : ToolbarFragment() {
+abstract class BaseLazyFragment : NormalFragment() {
 
     private var mIsFirstVisible = true
 
     private var isViewCreated = false
 
-    protected var isSupportVisible = false
+    private var isSupportVisible = false
 
     /**
-     * 用于分发可见时间的时候获取 父fragment 是否隐藏
+     * 用于分发可见时间的时候父获取 fragment 是否隐藏
      *
      * @return true fragment 不可见， false 父 fragment 可见
      */
@@ -103,13 +104,6 @@ abstract class BaseLazyFragment : ToolbarFragment() {
         isSupportVisible = visible
 
         if (visible) {
-
-            // TODO 当 fragment 重建时这里的被调用很奇怪，onActivityCreated 回调触发，但此时的 view 是空的，原因是 createView 还没被调用
-            // TODO 这样就造成了 onFragmentResume 里可能用到 view 的地方出现空指针异常，所以这里遇到 view 为空的时候 return 等下一次被调用才进去
-            if (view == null) {
-                return
-            }
-
             if (mIsFirstVisible) {
                 mIsFirstVisible = false
                 onFragmentFirstVisible()
@@ -117,11 +111,8 @@ abstract class BaseLazyFragment : ToolbarFragment() {
             onFragmentResume()
             dispatchChildVisibleState(true)
         } else {
-            // 当 fragment 重建时，这个代码块可能在第一次 view 为空的 visible 后调用导致在 onFragmentPause 里可能用到 view 的地方出现空指针异常
-            if (!mIsFirstVisible) {
-                dispatchChildVisibleState(false)
-                onFragmentPause()
-            }
+            dispatchChildVisibleState(false)
+            onFragmentPause()
         }
     }
 

app/src/main/java/com/gh/base/fragment/OnDialogBackListener.java

@@ -0,0 +1,5 @@
+package com.gh.base.fragment;
+
+public interface OnDialogBackListener {
+    void onBack();
+}

app/src/main/java/com/gh/base/fragment/WaitingDialogFragment.java

@@ -1,19 +1,16 @@
-package com.gh.gamecenter.common.base.fragment;
+package com.gh.base.fragment;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.FragmentManager;
 
-import com.gh.gamecenter.common.R;
-import com.gh.gamecenter.common.callback.OnDialogBackListener;
-import com.gh.gamecenter.core.utils.DisplayUtils;
+import com.gh.gamecenter.R;
 
 /**
  * @author CsHeng
@@ -55,14 +52,6 @@ public class WaitingDialogFragment extends BaseDialogFragment {
         return view;
     }
 
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        WindowManager.LayoutParams layoutParams = getDialog().getWindow().getAttributes();
-        layoutParams.width = DisplayUtils.dip2px(160);
-        getDialog().getWindow().setAttributes(layoutParams);
-    }
-
     @Override
     public void show(FragmentManager manager, String tag) {
         try {
@@ -92,17 +81,8 @@ public class WaitingDialogFragment extends BaseDialogFragment {
 
     @Override
     public void dismiss() {
-        dismissAllowingStateLoss();
-    }
-
-    @Override
-    public void dismissAllowingStateLoss() {
         mBackListener = null;
-        try {
-            super.dismissAllowingStateLoss();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        super.dismiss();
     }
 
     public static class WaitingDialogData {

app/src/main/java/com/gh/common/AppExecutor.kt

@@ -0,0 +1,33 @@
+package com.gh.common
+
+import android.os.Handler
+import android.os.Looper
+import java.util.concurrent.Executor
+import java.util.concurrent.Executors
+
+object AppExecutor {
+    @JvmStatic
+    var ioExecutor = Executors.newSingleThreadExecutor()
+    @JvmStatic
+    var uiExecutor = MainThreadExecutor()
+
+    class MainThreadExecutor : Executor {
+        private val mainThreadHandler = Handler(Looper.getMainLooper())
+
+        override fun execute(command: Runnable) {
+            mainThreadHandler.post(command)
+        }
+
+        fun executeWithDelay(command: Runnable, delay: Long) {
+            mainThreadHandler.postDelayed(command, delay)
+        }
+    }
+}
+
+fun runOnIoThread(f: () -> Unit) {
+    AppExecutor.ioExecutor.execute(f)
+}
+
+fun runOnUiThread(f: () -> Unit) {
+    AppExecutor.uiExecutor.execute(f)
+}

app/src/main/java/com/gh/common/Base64ImageHolder.kt

@@ -0,0 +1,5 @@
+package com.gh.common
+
+object Base64ImageHolder {
+    var image: String = ""
+}

app/src/main/java/com/gh/common/DefaultJsApi.kt

@@ -1,53 +1,29 @@
 package com.gh.common
 
 import android.annotation.SuppressLint
-import android.app.Activity
 import android.content.Context
-import android.util.Base64
 import android.webkit.JavascriptInterface
 import androidx.annotation.Keep
-import androidx.appcompat.app.AppCompatActivity
-import androidx.fragment.app.FragmentActivity
+import com.gh.base.CurrentActivityHolder
 import com.gh.common.util.*
-import com.gh.common.util.LogUtils
-import com.gh.gamecenter.*
-import com.gh.gamecenter.common.callback.BiCallback
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.entity.NotificationUgc
-import com.gh.gamecenter.common.loghub.LoghubUtils
-import com.gh.gamecenter.common.tracker.Tracker
-import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.common.view.dsbridge.CompletionHandler
-import com.gh.gamecenter.core.AppExecutor
-import com.gh.gamecenter.core.runOnIoThread
-import com.gh.gamecenter.core.runOnUiThread
-import com.gh.gamecenter.core.utils.CurrentActivityHolder
-import com.gh.gamecenter.core.utils.DisplayUtils
-import com.gh.gamecenter.core.utils.MtaHelper
-import com.gh.gamecenter.core.utils.SPUtils
-import com.gh.gamecenter.energy.EnergyBridge
-import com.gh.gamecenter.entity.MtaEvent
-import com.gh.gamecenter.help.QaFeedbackDialogFragment
-import com.gh.gamecenter.login.entity.Badge
-import com.gh.gamecenter.login.user.LoginTag
-import com.gh.gamecenter.login.view.LoginActivity
-import com.gh.gamecenter.login.user.UserManager
-import com.gh.gamecenter.personalhome.border.AvatarBorderActivity
-import com.gh.gamecenter.security.BindPhoneActivity
-import com.gh.gamecenter.login.user.UserRepository
-import com.gh.gamecenter.login.utils.LoginHelper
-import com.gh.gamecenter.login.utils.QuickLoginHelper
+import com.gh.gamecenter.LoginActivity
+import com.gh.gamecenter.ViewImageActivity
+import com.gh.gamecenter.entity.Badge
+import com.gh.gamecenter.manager.UserManager
+import com.gh.gamecenter.retrofit.BiResponse
+import com.gh.gamecenter.retrofit.RetrofitManager
+import com.gh.gamecenter.room.AppDatabase
+import com.gh.gamecenter.user.LoginTag
 import com.halo.assistant.HaloApp
 import com.lightgame.utils.Utils
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+import okhttp3.ResponseBody
 import org.json.JSONObject
-import java.io.BufferedOutputStream
-import java.io.File
-import java.io.FileOutputStream
-import java.util.*
+import retrofit2.HttpException
+import wendu.dsbridge.CompletionHandler
 
-class DefaultJsApi(var context: Context, val entrance: String = "") {
-
-    private var mLoginHandler: CompletionHandler<Any>? = null
+class DefaultJsApi(var context: Context) {
 
     @JavascriptInterface
     fun isGhzs(msg: Any): String {
@@ -68,7 +44,7 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
 
     @JavascriptInterface
     fun getUserInfo(msg: Any): String {
-        return UserManager.getInstance().userInfoEntity?.toJson() ?: ""
+        return UserManager.getInstance().userInfoEntity.toJson()
     }
 
     @JavascriptInterface
@@ -78,12 +54,8 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
 
     @JavascriptInterface
     fun login(msg: Any) {
-        if (SPUtils.getBoolean(Constants.SP_HAS_GET_PHONE_INFO) || NetworkUtils.isOpenMobileData(context)) {
-            QuickLoginHelper.startLogin(context, "浏览器")
-        } else {
-            val intent = LoginActivity.getIntent(context, "浏览器")
-            context.startActivity(intent)
-        }
+        val intent = LoginActivity.getIntent(context, "浏览器")
+        context.startActivity(intent)
     }
 
     @JavascriptInterface
@@ -91,11 +63,12 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
         val userInfoEntity = UserManager.getInstance().userInfoEntity
         if (msg.toString().isNotEmpty()) {
             val badge = msg.toString().toObject() ?: Badge()
-            userInfoEntity?.badge = badge
+            userInfoEntity.badge = badge
         } else {
-            userInfoEntity?.badge = null
+            userInfoEntity.badge = null
         }
         UserManager.getInstance().userInfoEntity = userInfoEntity
+        AppDatabase.getInstance(context).userInfoDao().updateUserInfo(userInfoEntity)
     }
 
     @JavascriptInterface
@@ -103,16 +76,6 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
         return HaloApp.getInstance().channel
     }
 
-    @JavascriptInterface
-    fun getAppVersion(msg: Any): String {
-        return BuildConfig.VERSION_NAME
-    }
-
-    @JavascriptInterface
-    fun getAppVersionCode(msg: Any): Int {
-        return PackageUtils.getGhVersionCode()
-    }
-
     @JavascriptInterface
     fun bindWechat(msg: Any, handler: CompletionHandler<Any>) {
         context.ifLogin("浏览器") {
@@ -126,39 +89,35 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
                     wechatLoginInfoMap["access_token"] = jsonContent.getString("access_token")
                     wechatLoginInfoMap["refresh_token"] = jsonContent.getString("refresh_token")
 
-                    WechatBindHelper.bindWechat(wechatLoginInfoMap, object : BiCallback<Boolean, Boolean> {
-                        override fun onFirst(first: Boolean) {
-                            EnergyBridge.postEnergyTask("bind_wechat")
-                            handler.complete(true)
-                        }
+                    RetrofitManager.getInstance(HaloApp.getInstance().application)
+                            .api
+                            .postBindWechat(wechatLoginInfoMap.createRequestBody())
+                            .subscribeOn(Schedulers.io())
+                            .observeOn(AndroidSchedulers.mainThread())
+                            .subscribe(object : BiResponse<ResponseBody>() {
+                                override fun onSuccess(data: ResponseBody) {
+                                    handler.complete(true)
+                                }
 
-                        override fun onSecond(second: Boolean) {
-                            handler.complete(false)
-                        }
-                    })
-
-                    LoginHelper.unregisterCallback()
+                                override fun onFailure(exception: Exception) {
+                                    handler.complete(false)
+                                    if (exception is HttpException) {
+                                        ErrorHelper.handleError(HaloApp.getInstance().application, exception.response().errorBody()?.string())
+                                    }
+                                }
+                            })
                 }
 
                 override fun onLoginFailure(loginType: LoginTag, error: String) {
                     handler.complete(false)
-
-                    LoginHelper.unregisterCallback()
                 }
             })
         }
     }
 
-    @JavascriptInterface
-    fun refreshWechatBindData(msg: Any) {
-        WechatBindHelper.getWechatConfig(null)
-    }
-
     @JavascriptInterface
     fun copyText(msg: Any) {
-        runOnUiThread {
-            msg.toString().copyTextAndToast()
-        }
+        msg.toString().copyTextAndToast()
     }
 
     @JavascriptInterface
@@ -173,297 +132,22 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
 
         val context = CurrentActivityHolder.getCurrentActivity()
 
-        context?.startActivity(ImageViewerActivity.getIntent(context, imageEvent.imageList, imageEvent.position, "浏览器"))
-    }
-
-    @JavascriptInterface
-    fun isInstalled(event: Any): String {
-        val localInstalledPackageList = PackageUtils.getAllPackageName(HaloApp.getInstance().application)
-        val packageNameList: ArrayList<String> = event.toString().toObject() ?: ArrayList()
-
-        for (packageName in packageNameList) {
-            if (!localInstalledPackageList.contains(packageName)) {
-                return "false"
-            }
-        }
-
-        return "true"
+        context?.startActivity(ViewImageActivity.getViewImageIntent(context, imageEvent.imageList, imageEvent.position, "浏览器"))
     }
 
     @JavascriptInterface
     fun openBase64Image(event: Any) {
         val context = CurrentActivityHolder.getCurrentActivity()
 
-        ImageViewerActivity.base64Image = event.toString()
+        Base64ImageHolder.image = event.toString()
 
-        context?.startActivity(ImageViewerActivity.getBase64Intent(context, true))
+        context?.startActivity(ViewImageActivity.getBase64ViewImageIntent(context, true))
     }
 
-    @JavascriptInterface
-    fun openNotificationSetting(msg: Any) {
-        NotificationHelper.show(context as AppCompatActivity, NotificationUgc.LOGIN)
-    }
-
-    @JavascriptInterface
-    fun useDarkStatusBarText(msg: Any) {
-        runOnUiThread {
-            DisplayUtils.transparentStatusBar(context as AppCompatActivity)
-            DisplayUtils.setLightStatusBar(context as AppCompatActivity, msg.toString() == "true")
-        }
-    }
-
-    @JavascriptInterface
-    fun exitWebView(msg: Any) {
-        runOnUiThread { (context as Activity).finish() }
-    }
-
-    @JavascriptInterface
-    fun updateRegulationTestStatus(msg: Any) {
-        if (msg.toString().toLowerCase(Locale.getDefault()) == "pass") {
-            EnergyBridge.postEnergyTask("finish_etiquette_exam")
-            SPUtils.setString(Constants.SP_REGULATION_TEST_PASS_STATUS, "pass")
-        }
-    }
-
-    @JavascriptInterface
-    fun getStatusBarHeight(msg: Any): String {
-        val statusBarHeight = DisplayUtils.getStatusBarHeight(context.resources)
-        return "$statusBarHeight"
-    }
-
-    @JavascriptInterface
-    fun getGid(msg: Any): String {
-        return HaloApp.getInstance().gid
-    }
-
-    @JavascriptInterface
-    fun showIncompatibleVersionDialog(msg: Any) {
-        DialogHelper.showUpgradeDialog(context)
-    }
-
-    @JavascriptInterface
-    fun shareBase64Image(event: Any) {
-        val imageShareEvent = event.toString().toObject() ?: ImageShareEvent()
-        val context = CurrentActivityHolder.getCurrentActivity()
-        ImageViewerActivity.base64Image = imageShareEvent.image.run {
-            if (this.startsWith("data:image/png;base64")) this.split(",")[1] else this
-        }
-        MessageShareUtils.getInstance(context).shareFromWeb(context, imageShareEvent.type)
-    }
-
-    @JavascriptInterface
-    fun inviteFriends(event: Any) {
-        val inviteEvent = event.toString().toObject() ?: InviteFriendsEvent()
-        val context = CurrentActivityHolder.getCurrentActivity()
-        if ("poster" == inviteEvent.type) {
-            ImageViewerActivity.base64Image = inviteEvent.poster.run {
-                if (this.startsWith("data:image/png;base64")) this.split(",")[1] else this
-            }
-            MessageShareUtils.getInstance(context).shareInviteFriends(context, inviteEvent.way)
-        } else {
-            ShareUtils.getInstance(context).shareInviteFriends(context, inviteEvent.url, inviteEvent.way)
-        }
-    }
-
-    @JavascriptInterface
-    fun bindPhone(msg: Any) {
-        val intent = BindPhoneActivity.getNormalIntent(context, false)
-        context.startActivity(intent)
-    }
-
-    @JavascriptInterface
-    fun updateTitle(msg: Any) {
-        if (context is WebActivity) {
-            runOnUiThread { (context as WebActivity).setNavigationTitle(msg.toString()) }
-        }
-    }
-
-    @JavascriptInterface
-    fun logoutExitWebViewAndRedirectToLogin() {
-        UserRepository.getInstance().logout()
-        if (context is Activity) {
-            AppExecutor.uiExecutor.executeWithDelay(Runnable {
-                context.ifLogin("内部网页")
-                (context as Activity).finish()
-            }, 100)
-        }
-    }
-
-    @JavascriptInterface
-    fun openInNewWebview(url: Any) {
-        runOnUiThread { DirectUtils.directToWebView(context, url.toString(), entrance.ifBlank { "内部网页" }) }
-    }
-
-    @JavascriptInterface
-    fun postWearBadgeTask(msg: Any) {
-        EnergyBridge.postEnergyTask("wear_badge")
-    }
-
-    @JavascriptInterface
-    fun startEnergyCenter(msg: Any) {
-        context.startActivity(EnergyBridge.getEnergyCenterIntent(context))
-    }
-
-    @JavascriptInterface
-    fun startEnergyHouse(msg: Any) {
-        context.startActivity(EnergyBridge.getEnergyHouseIntent(context, null))
-    }
-
-    @JavascriptInterface
-    fun showQaFeedbackDialog(msg: Any) {
-        QaFeedbackDialogFragment.show(context as AppCompatActivity, msg.toString())
-    }
-
-    @JavascriptInterface
-    fun getMetaObject(msg: Any): String {
-        return LogUtils.getMetaObject().toString()
-    }
-
-    @JavascriptInterface
-    fun getLaunchId(msg: Any): String {
-        return Tracker.launchId
-    }
-
-    @JavascriptInterface
-    fun getSessionId(msg: Any): String {
-        return Tracker.sessionId
-    }
-
-    @JavascriptInterface
-    fun postLogEvent(event: Any) {
-        val logEvent = event.toString().toObject() ?: LogEvent()
-        debugOnly {
-            Utils.log("LogUtils->${logEvent.jsonString}")
-        }
-        LoghubUtils.log(logEvent.jsonString, logEvent.logStore, false)
-    }
-
-    @JavascriptInterface
-    fun startAvatarBorderPage(msg: Any) {
-        context.startActivity(AvatarBorderActivity.getIntent(context, msg.toString()))
-    }
-
-    @JavascriptInterface
-    fun isNetworkConnected(): Boolean {
-        return NetworkUtils.isNetworkConnected(context)
-    }
-
-    @JavascriptInterface
-    fun isWifiConnected(): Boolean {
-        return NetworkUtils.isWifiConnected(context)
-    }
-
-    @JavascriptInterface
-    fun enableBackToActivity(msg: Any) {
-        FloatingBackViewManager.enableBackView(FloatingBackViewManager.TYPE_ACTIVITY, msg.toString())
-    }
-
-    @JavascriptInterface
-    fun startBBSStayTimeCount(msg: Any) {
-        BbsStayTimeHelper.enableStayTimeCount(msg.toString().toInt())
-    }
-
-    @JavascriptInterface
-    fun saveBase64ImageToGallery(msg: Any) {
-        val base64StringData = msg.toString()
-        runOnUiThread {
-            (context as? FragmentActivity)?.checkStoragePermissionBeforeAction {
-                runOnIoThread {
-                    val base64String = base64StringData.replace("data:image/png;base64", "")
-                    tryWithDefaultCatch {
-                        val imageFile =
-                            File(HaloApp.getInstance().cacheDir.absolutePath + File.separator + System.currentTimeMillis() + ".png")
-                        val decodedString = Base64.decode(base64String, Base64.DEFAULT)
-                        val bos = BufferedOutputStream(FileOutputStream(imageFile))
-                        bos.write(decodedString)
-                        bos.flush()
-                        bos.close()
-
-                        ImageUtils.saveImageToFile(imageFile, "", true)
-                    }
-                }
-            }
-        }
-    }
-
-    @JavascriptInterface
-    fun loginWithCallback(msg: Any, handler: CompletionHandler<Any>) {
-        mLoginHandler = handler
-        login(msg)
-    }
-
-    fun onLogin() {
-        mLoginHandler?.complete(true)
-        mLoginHandler = null
-    }
-
-    @JavascriptInterface
-    fun openInNewFullWebview(url: Any) {
-        runOnUiThread { DirectUtils.directToFullScreenWebPage(context, url.toString(), true, entrance) }
-    }
-
-    @JavascriptInterface
-    fun startGameCollectionSquareBrowseTask(event: Any) {
-        val browseTimeEvent = event.toString().toObject() ?: BrowseTaskEvent()
-        GameCollectionSquareBrowseTaskHelper.enableBrowseTimeCount(
-            browseTimeEvent.timeout.toInt(),
-            browseTimeEvent.isFinished == "true"
-        )
-    }
-
-    @JavascriptInterface
-    fun checkUpdateGhzs(msg: Any) {
-        context.startActivity(AboutActivity.getIntent(context, true))
-    }
-
-    @JavascriptInterface
-    public fun clickGameActivityDownloadBtn(event: Any) {
-        val gameActivityEvent = event.toString().toObject() ?: GameActivityEvent()
-        GameActivityDownloadHelper.start(context, gameActivityEvent)
-    }
-
-    @JavascriptInterface
-    fun isGameActivityTaskCompleted(event: Any, handler: CompletionHandler<Any>) {
-        val gameActivityEvent = event.toString().toObject() ?: GameActivityEvent()
-        GameActivityDownloadHelper.checkTaskComplete(context, gameActivityEvent, handler)
-    }
-
-    @JavascriptInterface
-    fun postGameActivityExposureEvent(event: Any) {
-        val gameActivityEvent = event.toString().toObject() ?: GameActivityEvent()
-        GameActivityDownloadHelper.postExposureEvent(gameActivityEvent)
-    }
-
-    @JavascriptInterface
-    fun getEntrance(msg: Any): String {
-        return entrance
-    }
+    @Keep
+    internal data class MtaEvent(var name: String = "", var key: String = "", var value: String = "")
 
     @Keep
     internal data class ImageEvent(var imageList: ArrayList<String> = arrayListOf(), var position: Int = 0)
 
-    @Keep
-    internal data class ImageShareEvent(var image: String = "", var type: String = "")
-
-    @Keep
-    internal data class InviteFriendsEvent(
-        var type: String = "",
-        var way: String = "",
-        var url: String = "",
-        var poster: String = ""
-    )
-
-    @Keep
-    internal data class LogEvent(var jsonString: String = "", var logStore: String = "")
-
-    @Keep
-    internal data class BrowseTaskEvent(var timeout: String = "", var isFinished: String = "")
-
-    @Keep
-    data class GameActivityEvent(
-        var gameId: String = "",
-        var activityTitle: String = "",
-        var activityId: String = "",
-        var platform: String = ""
-    )
 }

app/src/main/java/com/gh/common/DefaultUrlHandler.kt

@@ -1,713 +0,0 @@
-package com.gh.common
-
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.text.TextUtils
-import android.util.Base64
-import com.gh.gamecenter.core.utils.CurrentActivityHolder
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.common.util.*
-import com.gh.common.util.DirectUtils.directToFeedback
-import com.gh.common.util.DirectUtils.directToGameDetailVideoStreaming
-import com.gh.common.util.DirectUtils.directToGameServerCalendar
-import com.gh.common.util.DirectUtils.directToGameVideo
-import com.gh.common.util.DirectUtils.directToLegacyVideoDetail
-import com.gh.common.util.DirectUtils.directToLinkPage
-import com.gh.common.util.DirectUtils.directToQa
-import com.gh.gamecenter.core.utils.GsonUtils.gson
-import com.gh.gamecenter.LibaoDetailActivity
-import com.gh.gamecenter.MainActivity
-import com.gh.gamecenter.NewsDetailActivity
-import com.gh.gamecenter.WebActivity
-import com.gh.gamecenter.common.constant.EntranceConsts
-import com.gh.gamecenter.common.entity.CommunityEntity
-import com.gh.gamecenter.common.entity.LinkEntity
-import com.gh.gamecenter.core.AppExecutor
-import com.gh.gamecenter.common.utils.DialogHelper
-import com.gh.gamecenter.common.utils.EnvHelper
-import com.gh.gamecenter.core.utils.ToastUtils
-import com.gh.gamecenter.entity.*
-import com.gh.gamecenter.gamecollection.publish.GameCollectionEditActivity
-import com.gh.gamecenter.qa.BbsType
-import com.gh.gamecenter.qa.video.publish.VideoPublishActivity
-import com.gh.gamecenter.subject.SubjectActivity
-import com.gh.gamecenter.video.detail.VideoDetailContainerViewModel
-import com.lightgame.utils.Utils
-import java.nio.charset.Charset
-
-object DefaultUrlHandler {
-
-    @JvmStatic
-    fun interceptUrl(context: Context, url: String, entrance: String): Boolean {
-        return interceptUrl(context, url, entrance, false)
-    }
-
-    /**
-     * @param bringAppToFront 是否需要在不匹配 host 的时候把 APP 调回到前台 (如微信调起)
-     */
-    @JvmStatic
-    fun interceptUrl(context: Context, url: String, entrance: String, bringAppToFront: Boolean = false): Boolean {
-        val uri = Uri.parse(url)
-        if ("ghzhushou" == uri.scheme) {
-            Utils.log("url = $url")
-            Utils.log("url = " + uri.scheme!!)
-            val host = uri.host
-            val path = uri.path
-            var id = ""
-            if (!TextUtils.isEmpty(path)) {
-                id = path!!.substring(1)
-            }
-            if (TextUtils.isEmpty(id)) {
-                id = uri.getQueryParameter("id") ?: ""
-            }
-
-            val intent: Intent
-            when (host) {
-                "article" -> context.startActivity(NewsDetailActivity.getIntentById(context, id, entrance))
-
-                "game" -> DirectUtils.directToGameDetail(
-                    context,
-                    id = id,
-                    tab = uri.getQueryParameter("to"),
-                    autoDownload = uri.getQueryParameter("auto_download") == "true",
-                    entrance = entrance
-                )
-
-                "column" -> SubjectActivity.startSubjectActivity(
-                    context,
-                    id,
-                    uri.getQueryParameter("name"),
-                    false,
-                    entrance
-                )
-
-                "libao" -> context.startActivity(LibaoDetailActivity.getIntentById(context, id, entrance))
-
-                "qq" -> try {
-                    DirectUtils.directToQqConversation(context, id)
-                } catch (e: Throwable) {
-                    Utils.toast(context, "请检查是否已经安装手机QQ")
-                    e.printStackTrace()
-                }
-
-                EntranceConsts.HOST_QQ_QUN -> {
-                    val key = uri.getQueryParameter("key")
-                    if (!DirectUtils.directToQqGroup(context, key)) {
-                        Utils.toast(context, "请检查是否已经安装手机QQ")
-                    }
-                }
-
-                "inurl" -> {
-                    DirectUtils.directToWebView(context, uri.getQueryParameter("url") ?: "", entrance)
-                }
-
-                "outurl" -> {
-                    intent = Intent()
-                    intent.action = Intent.ACTION_VIEW
-                    intent.data = Uri.parse(uri.getQueryParameter("url"))
-                    try {
-                        context.startActivity(intent)
-                    } catch (e: Exception) {
-                        Utils.toast(context, "请检查是否已经安装手机浏览器")
-                        e.printStackTrace()
-                    }
-
-                }
-                "question" -> DirectUtils.directToQuestionDetail(context, id, entrance, "文章链接")
-
-                "real_name" -> DirectUtils.directToRealName(context)
-
-                "community" -> {
-                    val community = CommunityEntity()
-                    community.id = id
-                    community.name = uri.getQueryParameter("name") ?: ""
-                    DirectUtils.directToCommunity(context, community)
-                }
-
-                "community_column" -> {
-                    val community = CommunityEntity()
-                    community.id = uri.getQueryParameter("community_id") ?: ""
-                    community.name = uri.getQueryParameter("community_name") ?: ""
-                    val columnId = uri.getQueryParameter("column_id") ?: ""
-                    DirectUtils.directToCommunityColumn(context, community, columnId, entrance, "文章链接")
-                }
-
-                "answer" -> DirectUtils.directToAnswerDetail(context, id, entrance, "文章链接")
-
-                "communities" -> {
-                    // ghzhushou://communities/5a32405b2397ab000f688de3/articles/5c99d262c140b321564f04e3
-                    var communityId = ""
-                    var type = ""
-                    var typeId = ""
-                    val split = id.split("/".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
-                    for (text in split) {
-                        if (TextUtils.isEmpty(communityId)) {
-                            communityId = text
-                            continue
-                        }
-                        if (TextUtils.isEmpty(type)) {
-                            type = text
-                            continue
-                        }
-                        if (TextUtils.isEmpty(typeId)) {
-                            typeId = text
-                        }
-                    }
-                    if ("articles" == type) {
-                        DirectUtils.directToCommunityArticle(
-                            context, typeId, communityId,
-                            entrance, "文章链接"
-                        )
-                    }
-                }
-                EntranceConsts.HOST_UPLOAD_VIDEO -> {
-                    val titleParameter = uri.getQueryParameter("title")
-                    val title = if (titleParameter.isNullOrEmpty()) "" else "#$titleParameter#"
-                    val categoryId = uri.getQueryParameter("category_id") ?: ""
-                    val link = uri.getQueryParameter("link") ?: ""
-                    val gameId = uri.getQueryParameter("gameId") ?: ""
-                    val gameName = uri.getQueryParameter("gameName") ?: ""
-                    val tagActivityId = uri.getQueryParameter("tagActivityId") ?: ""
-                    val tagActivityName = uri.getQueryParameter("tagActivityName") ?: ""
-                    val linkEntity = VideoLinkEntity(title, categoryId, link, tagActivityId, tagActivityName)
-                    val simpleGameEntity = SimpleGameEntity(gameId, gameName)
-                    CheckLoginUtils.checkLogin(context, null, true, EntranceConsts.ENTRANCE_BROWSER) {
-                        DirectUtils.directToVideoManager(
-                            context,
-                            linkEntity,
-                            simpleGameEntity,
-                            EntranceConsts.ENTRANCE_BROWSER,
-                            ""
-                        )
-                    }
-                }
-                EntranceConsts.HOST_USERHOME -> {
-                    val position = uri.getQueryParameter("position")
-                    val subtype = uri.getQueryParameter("sub_type") ?: ""
-                    DirectUtils.directToHomeActivity(
-                        context,
-                        id,
-                        subtype,
-                        if (position.isNullOrEmpty()) -1 else position.toInt(),
-                        entrance,
-                        ""
-                    )
-                }
-                EntranceConsts.HOST_VIDEO_MORE -> {
-                    val referer = uri.getQueryParameter("referer") ?: ""
-                    val type = uri.getQueryParameter("type") ?: ""
-                    val act = uri.getQueryParameter("act") ?: ""
-                    val gameId = uri.getQueryParameter("gameId") ?: ""
-                    val fieldId = uri.getQueryParameter("fieldId") ?: ""
-                    val sectionName = uri.getQueryParameter("sectionName") ?: ""
-                    val paginationType = uri.getQueryParameter("paginationType")
-                        ?: "page"//活动分页方式 page filter
-                    val location = if (!TextUtils.isEmpty(act)) {
-                        VideoDetailContainerViewModel.Location.VIDEO_ACTIVITY.value
-                    } else if (!TextUtils.isEmpty(fieldId)) {
-                        VideoDetailContainerViewModel.Location.GAME_ZONE.value
-                    } else {
-                        id
-                    }
-                    directToLegacyVideoDetail(
-                        context,
-                        id,
-                        location,
-                        false,
-                        gameId,
-                        entrance,
-                        "",
-                        referer,
-                        type,
-                        act,
-                        paginationType,
-                        fieldId,
-                        sectionName
-                    )
-                }
-                EntranceConsts.HOST_VIDEO_DETAIL -> {
-                    DirectUtils.directToVideoDetail(context, id, entrance, path)
-                }
-                EntranceConsts.HOST_VIDEO_SINGLE -> {
-                    val referer = uri.getQueryParameter("referer") ?: ""
-                    DirectUtils.directToVideoDetail(
-                        context, id, VideoDetailContainerViewModel.Location.SINGLE_VIDEO.value,
-                        false, "", entrance, "", if (TextUtils.isEmpty(referer)) "" else referer
-                    )
-                }
-                EntranceConsts.HOST_VIDEO_STREAMING_HOME -> {
-                    intent = Intent(context, MainActivity::class.java)
-                    intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
-                    intent.putExtra(MainActivity.SWITCH_TO_VIDEO, true)
-                    context.startActivity(intent)
-                }
-                EntranceConsts.HOST_VIDEO_STREAMING_DESC -> {
-                    directToGameDetailVideoStreaming(context, id, entrance)
-                }
-                EntranceConsts.HOST_VIDEO_COLLECTION -> {
-                    directToGameVideo(context, id, entrance, "")
-                }
-
-                EntranceConsts.HOST_CATEGORY -> {
-                    val title = uri.getQueryParameter("title")
-                    DirectUtils.directCategoryDirectory(context, id, title ?: "", entrance, "")
-                }
-                EntranceConsts.HOST_COLUMN_COLLECTION -> {
-                    val name = uri.getQueryParameter("name")
-                    DirectUtils.directToColumnCollection(context, id, -1, entrance, name ?: "")
-                }
-                EntranceConsts.HOST_COLUMN -> {
-                    DirectUtils.directToSubject(context, id, uri.getQueryParameter(EntranceConsts.KEY_NAME), entrance)
-                }
-                EntranceConsts.HOST_COMMUNITY_QUESTION_LABEL_DETAIL -> {
-                    val community = CommunityEntity()
-                    community.id = uri.getQueryParameter("community_id") ?: ""
-                    community.name = uri.getQueryParameter("community_name") ?: ""
-                    val tag = uri.getQueryParameter("tag") ?: ""
-                    DirectUtils.directAskColumnLabelDetail(context, tag, community, entrance, "")
-                }
-                EntranceConsts.HOST_COMMUNITY_COLUMN_DETAIL -> {
-                    val community = CommunityEntity()
-                    community.id = uri.getQueryParameter("community_id") ?: ""
-                    community.name = uri.getQueryParameter("community_name") ?: ""
-                    val columnId = uri.getQueryParameter("column_id") ?: ""
-                    DirectUtils.directAskColumnDetail(context, columnId, community, entrance, "")
-                }
-
-                EntranceConsts.HOST_BLOCK -> {
-                    val name = uri.getQueryParameter("name")
-                        ?: ""
-                    val entity = SubjectRecommendEntity(link = id, name = name, text = name)
-                    DirectUtils.directToBlock(context, entity, entrance)
-                }
-
-                EntranceConsts.HOST_SERVER_BLOCK -> {
-                    DirectUtils.directToGameServers(context, entrance = entrance, path = "")
-                }
-
-                EntranceConsts.HOST_AMWAY_BLOCK -> {
-                    DirectUtils.directToAmway(context, entrance = entrance, path = "")
-                }
-
-                EntranceConsts.HOST_HELP -> {
-                    val name = uri.getQueryParameter("name")
-                        ?: ""
-                    DirectUtils.directToQa(context, name, id)
-                }
-
-                EntranceConsts.HOST_HELP_COLLECTION -> {
-                    val name = uri.getQueryParameter("name")
-                        ?: ""
-                    DirectUtils.directToQaCollection(context, name, id)
-                }
-
-                EntranceConsts.HOST_GAME_UPLOAD -> {
-                    DirectUtils.directGameUpload(context, entrance = entrance, path = "")
-                }
-                EntranceConsts.HOST_GAME_ZONE -> {
-                    val zoneUrl = uri.getQueryParameter("url") ?: ""
-                    DirectUtils.directGameZone(context, id, zoneUrl, entrance)
-                }
-
-                EntranceConsts.HOST_LINK -> {
-                    try {
-                        val dataString = uri.getQueryParameter("data")
-                        if (!TextUtils.isEmpty(dataString)) {
-                            val linkData = Base64.decode(dataString, Base64.DEFAULT)
-                            val linkDataString = String(linkData, Charset.defaultCharset())
-                            val le = gson.fromJson(linkDataString, LinkEntity::class.java)
-                            directToLinkPage(context, le, entrance, "")
-                        }
-                    } catch (e: Exception) {
-                        e.printStackTrace()
-                    }
-                }
-
-                EntranceConsts.HOST_GAME_NEWS -> {
-                    DirectUtils.directToGameNews(
-                        context,
-                        uri.getQueryParameter(EntranceConsts.KEY_GAME_ID),
-                        uri.getQueryParameter(EntranceConsts.KEY_GAME_NAME),
-                        entrance
-                    );
-                }
-
-                EntranceConsts.HOST_GAME_CALENDAR -> {
-                    directToGameServerCalendar(context, uri.getQueryParameter(EntranceConsts.KEY_GAME_ID))
-                }
-
-                EntranceConsts.HOST_HISTORY_APK -> {
-                    DirectUtils.directToHistoryApk(context, uri.getQueryParameter(EntranceConsts.KEY_GAME_ID))
-                }
-
-                EntranceConsts.HOST_FORUM_DETAIL -> {
-                    DirectUtils.directForumDetail(context, id, entrance)
-                }
-
-                EntranceConsts.HOST_GAME_RATING_DETAIL -> {
-                    DirectUtils.directToGameRatingDetail(
-                        context,
-                        uri.getQueryParameter(EntranceConsts.KEY_GAME_ID),
-                        uri.getQueryParameter(EntranceConsts.KEY_COMMENT_ID),
-                        EntranceConsts.ENTRANCE_BROWSER
-                    )
-                }
-
-                EntranceConsts.HOST_FORUM -> {
-                    val position = uri.getQueryParameter(EntranceConsts.KEY_POSITION)?.toInt()
-
-                    DirectUtils.directToForum(context, position ?: 0)
-                }
-
-                EntranceConsts.HOST_UPLOAD_VIDEO_NEW -> {
-                    val activityName = uri.getQueryParameter("activity_name") ?: ""
-                    val activityId = uri.getQueryParameter("activity_id") ?: ""
-                    val original = uri.getQueryParameter("original") ?: ""
-                    val forumName = uri.getQueryParameter("forum_name") ?: ""
-                    val forumId = uri.getQueryParameter("forum_id") ?: ""
-                    val forumIcon = uri.getQueryParameter("forum_icon") ?: ""
-                    val forumType = uri.getQueryParameter("forum_type") ?: BbsType.OFFICIAL_BBS.value
-                    val gameId = uri.getQueryParameter("game_id") ?: ""
-                    val gameName = uri.getQueryParameter("game_name") ?: ""
-                    val icon = uri.getQueryParameter("game_icon") ?: ""
-                    val iconSubscript = uri.getQueryParameter("game_icon_subscript") ?: ""
-                    val gameEntity =
-                        if (forumType == BbsType.OFFICIAL_BBS.value && gameId.isNotEmpty() && gameName.isNotEmpty() && icon.isNotEmpty()) {
-                            GameEntity(id = gameId, mName = gameName, mIcon = icon, mIconSubscript = iconSubscript)
-                        } else null
-                    val activityLabelEntity = if (activityId.isNotEmpty() && activityName.isNotEmpty()) {
-                        ActivityLabelEntity(
-                            id = activityId,
-                            name = activityName,
-                            original = original.ifEmpty { "false" }.toBoolean()
-                        )
-                    } else null
-                    val communityEntity =
-                        if (forumId.isNotEmpty() && forumName.isNotEmpty() && forumIcon.isNotEmpty()) {
-                            CommunityEntity(id = forumId, name = forumName, icon = forumIcon)
-                        } else null
-
-                    context.startActivity(
-                        VideoPublishActivity.getIntent(
-                            context,
-                            communityEntity,
-                            gameEntity,
-                            activityLabelEntity,
-                            forumType,
-                            disableForumSelection = false,
-                            isFromCommunityActivity = true,
-                            entrance,
-                            ""
-                        )
-                    )
-                }
-
-                EntranceConsts.HOST_SUGGESTION -> {
-                    val platform = uri.getQueryParameter(EntranceConsts.KEY_PLATFORM)
-                    val platformName = PlatformUtils.getInstance(context).getPlatformName(platform)
-                    val gameId = uri.getQueryParameter(EntranceConsts.KEY_GAMEID)
-                    val packageMd5 = uri.getQueryParameter(EntranceConsts.KEY_PACKAGE_MD5)
-                    val isQaFeedback = uri.getQueryParameter(EntranceConsts.KEY_IS_QA_FEEDBACK) == "true"
-                    val content = if (TextUtils.isEmpty(gameId) || TextUtils.isEmpty(packageMd5)) String.format(
-                        "%s-%s-V%s，",
-                        uri.getQueryParameter(EntranceConsts.KEY_GAME_NAME),
-                        if (TextUtils.isEmpty(platformName)) platform else platformName,
-                        uri.getQueryParameter(EntranceConsts.KEY_VERSION)
-                    ) else String.format(
-                        "%s-%s-V%s\n游戏ID：%s\n游戏包MD5：%s\n",
-                        uri.getQueryParameter(EntranceConsts.KEY_GAME_NAME),
-                        if (TextUtils.isEmpty(platformName)) platform else platformName,
-                        uri.getQueryParameter(EntranceConsts.KEY_VERSION), gameId, packageMd5
-                    )
-                    val qaId = uri.getQueryParameter("qa_id") ?: ""
-                    val qaContentId = uri.getQueryParameter(EntranceConsts.KEY_QA_CONTENT_ID) ?: ""
-                    val qaTitle = uri.getQueryParameter(EntranceConsts.KEY_QA_TITLE)
-                    if (!TextUtils.isEmpty(qaId)) {
-                        directToQa(context, qaTitle, qaId)
-                    } else {
-                        directToFeedback(
-                            context,
-                            content,
-                            null,
-                            isQaFeedback,
-                            qaContentId,
-                            EntranceConsts.ENTRANCE_BROWSER
-                        )
-                    }
-                }
-
-                EntranceConsts.HOST_HELP_AND_FEEDBACK -> {
-                    val position = uri.getQueryParameter("position") ?: ""
-                    DirectUtils.directToHelpAndFeedback(context, position.toInt())
-                }
-
-                EntranceConsts.HOST_HELP_DETAIL -> {
-                    var url = uri.getQueryParameter("url")
-                    if (!url.isNullOrEmpty()) {
-                        context.startActivity(WebActivity.getIntent(context, url, false))
-                    } else {
-                        url = if (EnvHelper.isDevEnv) {
-                            Constants.HELP_ADDRESS_DEV
-                        } else {
-                            Constants.HELP_ADDRESS
-                        }
-                        val id = uri.getQueryParameter("id")
-                        val name = uri.getQueryParameter("name")
-                        val qaCollectionId = uri.getQueryParameter("collection_id")
-                        context.startActivity(
-                            WebActivity.getIntent(
-                                context,
-                                "$url$id",
-                                name,
-                                true,
-                                !qaCollectionId.isNullOrEmpty()
-                            )
-                        )
-                    }
-                }
-
-                EntranceConsts.HOST_GAME_COLLECTION_DETAIL -> {
-                    DirectUtils.directToGameCollectionDetail(context, id, entrance)
-                }
-
-                EntranceConsts.HOST_GAME_COLLECTION_SQUARE -> {
-                    DirectUtils.directToGameCollectionSquare(context, entrance)
-                }
-
-                EntranceConsts.HOST_GAME_COLLECTION_EDIT -> {
-                    val activityId = uri.getQueryParameter("activity_id") ?: ""
-                    val activityName = uri.getQueryParameter("activity_name") ?: ""
-                    val gameId = uri.getQueryParameter("game_id") ?: ""
-                    context.startActivity(
-                        GameCollectionEditActivity.getIntent(
-                            context,
-                            activityId,
-                            activityName,
-                            gameId,
-                            entrance
-                        )
-                    )
-                }
-
-                else -> {
-                    if (bringAppToFront) {
-                        DirectUtils.directToMainActivity(context)
-                        if (!TextUtils.isEmpty(host)) {
-                            AppExecutor.uiExecutor.executeWithDelay({
-                                CurrentActivityHolder.getCurrentActivity()?.let {
-                                    DialogHelper.showUpgradeDialog(it)
-                                }
-                            }, 200)
-                        }
-                    } else {
-                        DialogHelper.showUpgradeDialog(context)
-                    }
-                }
-            }
-            return true
-        } else if ("zhiqu" == uri.scheme) {
-            if (PackageUtils.isInstalled(context, "com.beieryouxi.zqyxh")) {
-                val intent = Intent()
-                intent.data = Uri.parse(url)
-                intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-                context.startActivity(intent)
-            } else {
-                Utils.toast(context, "请安装指趣游戏盒")
-            }
-        }
-
-        if (url.startsWith("alipays:") || url.startsWith("alipay")) {
-            try {
-                context.startActivity(Intent("android.intent.action.VIEW", Uri.parse(url)))
-            } catch (e: Exception) {
-                ToastUtils.showToast("请安装支付宝客户端")
-            }
-            return true
-        } else if (url.startsWith("weixin")) {
-            try {
-                context.startActivity(Intent("android.intent.action.VIEW", Uri.parse(url)))
-            } catch (e: Exception) {
-                ToastUtils.showToast("请安装微信客户端")
-            }
-            return true
-        } else if (url.startsWith("mqqwpa")) {
-            try {
-                context.startActivity(Intent("android.intent.action.VIEW", Uri.parse(url)))
-            } catch (e: Exception) {
-                ToastUtils.showToast("请安装QQ客户端")
-            }
-            return true
-        }
-
-        // 处理内部页面逻辑
-        if (transformNormalScheme(context, url, entrance)) {
-            return true
-        }
-
-        if ("http" != uri.scheme && "https" != uri.scheme) return true
-        return false
-    }
-
-    @JvmStatic
-    fun transformNormalScheme(context: Context, url: String, entrance: String): Boolean {
-        val b = transformNewNormalScheme(context, url, entrance)
-        if (b) return b
-        return transformOldNormalScheme(context, url, entrance)
-    }
-
-    @JvmStatic
-    fun transformOldNormalScheme(context: Context, url: String, entrance: String): Boolean {
-        val uri = Uri.parse(url)
-        if (uri.host == "www.ghzs666.com"
-            || uri.host == "www.ghzs.com"
-            || uri.host == "ask.ghzs.com"
-            || uri.host == "m.ghzs.com"
-            || uri.host == "m.ghzs666.com"
-        ) {
-            Utils.log(uri.path)
-            uri.path?.apply {
-                when {
-                    contains("game") -> {
-                        val gameId = uri.getQueryParameter("gameId") ?: uri.pathSegments.last() ?: ""
-                        DirectUtils.directToGameDetail(
-                            context,
-                            gameId,
-                            entrance,
-                            autoDownload = false,
-                            traceEvent = null
-                        )
-                    }
-                    contains("question") -> {
-                        val questionId = split("/")[2]
-                        val answerId = uri.getQueryParameter("answer")
-                        if (answerId.isNullOrEmpty()) {
-                            DirectUtils.directToQuestionDetail(context, questionId, entrance, "")
-                        } else {
-                            DirectUtils.directToAnswerDetail(context, answerId, entrance, "")
-                        }
-                    }
-                    ((contains("bbs")) && contains("article") ||
-                            (contains("communities")) && contains("article")) -> {
-                        var communityId = ""
-                        var type = ""
-                        var typeId = ""
-                        val split =
-                            replace("/communities", "").replace("/bbs", "").replace(".html", "").split("/".toRegex())
-                                .dropLastWhile { it.isEmpty() }
-                                .toTypedArray()
-                        for (text in split) {
-                            if (TextUtils.isEmpty(communityId)) {
-                                communityId = text
-                                continue
-                            }
-                            if (TextUtils.isEmpty(type)) {
-                                type = text
-                                continue
-                            }
-                            if (TextUtils.isEmpty(typeId)) {
-                                typeId = text
-                            }
-                        }
-                        if ("articles" == type || "article" == type) {
-                            DirectUtils.directToCommunityArticle(
-                                context, typeId, communityId,
-                                entrance, "文章链接"
-                            )
-                        }
-                    }
-                    contains("article") -> {
-                        val articleId = split("/")[2].replace(".html", "")
-                        if (entrance == "隐私政策") {
-                            DirectUtils.directToArticle(context, articleId, true, entrance)
-                        } else {
-                            DirectUtils.directToArticle(context, articleId, entrance)
-                        }
-                    }
-                    contains("columns") -> {
-                        val columnsId = split("/")[3]
-                        val id = uri.getQueryParameter("communityId") ?: ""
-                        val name = uri.getQueryParameter("communityName") ?: ""
-                        DirectUtils.directToCommunityColumn(context, CommunityEntity(id, name), columnsId, entrance, "")
-                    }
-                    contains("zone") && split("/").size > 2 -> {
-                        val gameId = split("/")[2]
-                        DirectUtils.directGameZone(context, gameId, url, entrance)
-                    }
-                    else -> return false
-                }
-            }
-            return true
-        }
-        return false
-    }
-
-    @JvmStatic
-    fun transformNewNormalScheme(context: Context, url: String, entrance: String): Boolean {
-        val uri = Uri.parse(url)
-        if (uri.host == "www.ghzs666.com"
-            || uri.host == "www.ghzs.com"
-            || uri.host == "ask.ghzs.com"
-            || uri.host == "m.ghzs.com"
-            || uri.host == "m.ghzs666.com"
-            || uri.host == "dev-bbs-mobile.ghzs.com"
-        ) {
-            Utils.log(uri.path)
-            uri.path?.apply {
-                val splits = split("/")
-                when {
-                    //https://m.ghzs666.com/bbs/thread-帖子ID
-                    splits.size >= 3 && splits[1] == "bbs" && splits[2].startsWith("thread-") -> {
-                        val articleId = splits[2].substring(7)
-                        DirectUtils.directToCommunityArticle(
-                            context, articleId, "",
-                            entrance, "文章链接"
-                        )
-                    }
-                    //https://m.ghzs666.com/article/文章ID
-                    splits.size >= 3 && splits[1] == "article" -> {
-                        val articleId = splits[2]
-                        DirectUtils.directToArticle(context, articleId, entrance)
-                    }
-                    //https://m.ghzs666.com/column/专题ID
-                    splits.size >= 3 && splits[1] == "column" -> {
-                        val columnId = splits[2]
-                        DirectUtils.directToSubject(context, columnId, "", entrance)
-                    }
-                    //https://m.ghzs666.com/zone/游戏ID
-                    splits.size >= 3 && splits[1] == "zone" -> {
-                        DirectUtils.directToWebView(context, url, entrance)
-                    }
-                    //https://m.ghzs666.com/bbs/video-视频ID
-                    splits.size >= 3 && splits[1] == "bbs" && splits[2].startsWith("video-") -> {
-                        val videoId = splits[2].substring(6)
-                        DirectUtils.directToVideoDetail(context, videoId, entrance)
-                    }
-                    else -> return false
-                }
-            }
-            return true
-        }
-        return false
-    }
-
-    /**
-     * 将 url 转换为 LinkEntity (实际只有 type 和 link 两个字段，仅供日志，不保证能用)
-     */
-    fun urlToLinkEntity(url: String): LinkEntity? {
-        val uri = Uri.parse(url)
-        if ("ghzhushou" == uri.scheme) {
-            Utils.log("url = $url")
-            Utils.log("url = " + uri.scheme!!)
-            val host = uri.host
-            val path = uri.path
-            var id = ""
-            if (!TextUtils.isEmpty(path)) {
-                id = path!!.substring(1)
-            }
-            return LinkEntity(type = host, link = id)
-        }
-        return null
-    }
-
-}

app/src/main/java/com/gh/common/DefaultWebViewUrlHandler.kt

@@ -0,0 +1,133 @@
+package com.gh.common
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.text.TextUtils
+import com.gh.common.util.CheckLoginUtils
+import com.gh.common.util.DialogUtils
+import com.gh.common.util.DirectUtils
+import com.gh.common.util.EntranceUtils
+import com.gh.gamecenter.GameDetailActivity
+import com.gh.gamecenter.LibaoDetailActivity
+import com.gh.gamecenter.NewsDetailActivity
+import com.gh.gamecenter.WebActivity
+import com.gh.gamecenter.entity.CommunityEntity
+import com.gh.gamecenter.entity.VideoLinkEntity
+import com.gh.gamecenter.subject.SubjectActivity
+import com.halo.assistant.HaloApp
+import com.lightgame.utils.Utils
+
+object DefaultWebViewUrlHandler {
+
+    @JvmStatic
+    fun interceptUrl(context: Context, url: String, entrance: String): Boolean {
+        val uri = Uri.parse(url)
+        if ("ghzhushou" == uri.scheme) {
+            Utils.log("url = $url")
+            Utils.log("url = " + uri.scheme!!)
+            val host = uri.host
+            val path = uri.path
+            var id = ""
+            if (!TextUtils.isEmpty(path)) {
+                id = path!!.substring(1)
+            }
+            val intent: Intent
+            when (host) {
+                "article" -> context.startActivity(NewsDetailActivity.getIntentById(context, id, entrance))
+
+                "game" -> GameDetailActivity.startGameDetailActivity(context, id, entrance)
+
+                "column" -> SubjectActivity.startSubjectActivity(context, id, uri.getQueryParameter("name"), false, entrance)
+
+                "libao" -> context.startActivity(LibaoDetailActivity.getIntentById(context, id, entrance))
+
+                "qq" -> try {
+                    DirectUtils.directToQqConversation(context, id)
+                } catch (e: Exception) {
+                    Utils.toast(context, "请检查是否已经安装手机QQ")
+                    e.printStackTrace()
+                }
+
+                "qqqun" -> {
+                    val key = uri.getQueryParameter("key")
+                    if (!DirectUtils.directToQqGroup(context, key)) {
+                        Utils.toast(context, "请检查是否已经安装手机QQ")
+                    }
+                }
+
+                "inurl" -> {
+                    intent = Intent(context, WebActivity::class.java)
+                    intent.putExtra(EntranceUtils.KEY_URL, uri.getQueryParameter("url"))
+                    context.startActivity(intent)
+                }
+
+                "outurl" -> {
+                    intent = Intent()
+                    intent.action = Intent.ACTION_VIEW
+                    intent.data = Uri.parse(uri.getQueryParameter("url"))
+                    try {
+                        context.startActivity(intent)
+                    } catch (e: Exception) {
+                        Utils.toast(context, "请检查是否已经安装手机浏览器")
+                        e.printStackTrace()
+                    }
+
+                }
+                "question" -> DirectUtils.directToQuestionDetail(context, id, entrance, "文章链接")
+
+                "community" -> {
+                    val community = CommunityEntity()
+                    community.id = id
+                    community.name = uri.getQueryParameter("name")
+                    DirectUtils.directToCommunity(context, community)
+                }
+
+                "answer" -> DirectUtils.directToAnswerDetail(context, id, entrance, "文章链接")
+
+                "communities" -> {
+                    // ghzhushou://communities/5a32405b2397ab000f688de3/articles/5c99d262c140b321564f04e3
+                    var communityId = ""
+                    var type = ""
+                    var typeId = ""
+                    val split = id.split("/".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
+                    for (text in split) {
+                        if (TextUtils.isEmpty(communityId)) {
+                            communityId = text
+                            continue
+                        }
+                        if (TextUtils.isEmpty(type)) {
+                            type = text
+                            continue
+                        }
+                        if (TextUtils.isEmpty(typeId)) {
+                            typeId = text
+                        }
+                    }
+                    if ("articles" == type) {
+                        DirectUtils.directToCommunityArticle(
+                                context, typeId, communityId,
+                                entrance, "文章链接")
+                    }
+                }
+                EntranceUtils.HOST_UPLOAD_VIDEO -> {
+                    val titleParameter = uri.getQueryParameter("title")
+                    val title = if (titleParameter.isNullOrEmpty()) "" else "#$titleParameter#"
+                    val categoryId = uri.getQueryParameter("category_id") ?: ""
+                    val link = uri.getQueryParameter("link") ?: ""
+                    val linkEntity = VideoLinkEntity(title, categoryId, link)
+                    if (!CheckLoginUtils.isLogin()) {
+                        HaloApp.put(EntranceUtils.HOST_UPLOAD_VIDEO, linkEntity)
+                    }
+                    CheckLoginUtils.checkLogin(context, EntranceUtils.ENTRANCE_BROWSER) {
+                        DirectUtils.directToVideoManager(context, linkEntity, EntranceUtils.ENTRANCE_BROWSER, "")
+                    }
+                }
+                else -> DialogUtils.showLowVersionDialog(context)
+            }
+            return true
+        }
+        if ("http" != uri.scheme && "https" != uri.scheme) return true
+        return false
+    }
+}

app/src/main/java/com/gh/common/FixedRateJobHelper.kt

@@ -1,90 +0,0 @@
-package com.gh.common
-
-import com.gh.common.exposure.ExposureManager
-import com.gh.common.filter.RegionSettingHelper
-import com.gh.gamecenter.common.loghub.LoghubUtils
-import com.gh.gamecenter.common.utils.doOnMainProcessOnly
-import com.gh.gamecenter.common.utils.tryCatchInRelease
-import com.gh.common.videolog.VideoRecordUtils
-import com.gh.download.DownloadDataHelper
-import com.gh.gamecenter.entity.TimeEntity
-import com.gh.gamecenter.common.retrofit.Response
-import com.gh.gamecenter.core.runOnUiThread
-import com.gh.gamecenter.retrofit.RetrofitManager
-import com.halo.assistant.HaloApp
-import io.reactivex.schedulers.Schedulers
-import kotlin.concurrent.fixedRateTimer
-
-object FixedRateJobHelper {
-    private const val CHECKER_PERIOD: Long = 15 * 1000L
-    private const val TIME_PERIOD: Long = 600 * 1000L
-    private const val LOGHUB_PERIOD: Long = 120 * 1000L
-    private const val EXPOSURE_PERIOD: Long = 300 * 1000L
-    private const val REGION_SETTING_PERIOD: Long = 300 * 1000L
-    private const val VIDEO_RECORD_PERIOD: Long = 60 * 1000L
-
-    private const val DOWNLOAD_HEARTBEAT_PERIOD: Long = 60 * 1000L
-    private const val DOWNLOAD_HEARTBEAT_SHEET_PERIOD: Long = 15 * 1000L
-
-    private var mExecuteCount: Int = 0
-
-    var timeDeltaBetweenServerAndClient: Long = 0
-
-    @JvmStatic
-    fun begin() {
-        doOnMainProcessOnly {
-            fixedRateTimer("Global-Fixed-Rate-Timer", initialDelay = 100, period = CHECKER_PERIOD) {
-                // 时间校对，10分钟一次
-                if ((mExecuteCount * CHECKER_PERIOD) % TIME_PERIOD == 0L) {
-                    RetrofitManager.getInstance().api.time
-                        .subscribeOn(Schedulers.io())
-                        .subscribe(object : Response<TimeEntity>() {
-                            override fun onResponse(response: TimeEntity?) {
-                                val serverTime = response?.time
-                                serverTime?.let {
-                                    timeDeltaBetweenServerAndClient = it * 1000 - System.currentTimeMillis()
-                                }
-                            }
-                        })
-                }
-
-                // 提交曝光数据
-                if ((mExecuteCount * CHECKER_PERIOD) % EXPOSURE_PERIOD == 0L) {
-                    runOnUiThread {
-                        ExposureManager.commitSavedExposureEvents(true)
-                    }
-                }
-
-                // 分片检测下载进度
-                if ((mExecuteCount * CHECKER_PERIOD) % DOWNLOAD_HEARTBEAT_SHEET_PERIOD == 0L) {
-                    tryCatchInRelease {
-                        val upload = (mExecuteCount * CHECKER_PERIOD) % DOWNLOAD_HEARTBEAT_PERIOD == 0L
-                        DownloadDataHelper.uploadDownloadHeartbeat(upload)
-                    }
-                }
-
-                // 提交普通 loghub 数据
-                if ((mExecuteCount * CHECKER_PERIOD) % LOGHUB_PERIOD == 0L) {
-                    runOnUiThread {
-                        LoghubUtils.commitSavedLoghubEvents(true)
-                    }
-                }
-
-                // 更新游戏屏蔽信息
-                if ((mExecuteCount * CHECKER_PERIOD) % REGION_SETTING_PERIOD == 0L) {
-                    if (HaloApp.getInstance().isRunningForeground) {
-                        RegionSettingHelper.getRegionSetting()
-                    }
-                }
-
-                // 提交视频浏览记录数据
-                if ((mExecuteCount * CHECKER_PERIOD) % VIDEO_RECORD_PERIOD == 0L) {
-                    VideoRecordUtils.commitVideoRecord()
-                }
-
-//              ExposureUtils.logADownloadCompleteExposureEvent(GameEntity(id = mExecuteCount.toString(), name = "测试曝光上传"), platform = "", trace = null, downloadType = ExposureUtils.DownloadType.DOWNLOAD)
-                mExecuteCount++
-            }
-        }
-    }
-}

app/src/main/java/com/gh/common/LocalBroadcastReceiver.kt

@@ -0,0 +1,39 @@
+package com.gh.common
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.gh.common.im.ImManager
+import com.gh.gamecenter.manager.UserManager
+import com.gh.gamecenter.retrofit.RetrofitManager
+import com.halo.assistant.HaloApp
+import com.m7.imkfsdk.chat.ChatActivity
+import io.reactivex.schedulers.Schedulers
+
+/**
+ * 可使用 [LocalBroadcastManager] 来进行简单的模块间消息通知
+ */
+
+class LocalBroadcastReceiver : BroadcastReceiver() {
+
+    override fun onReceive(context: Context?, intent: Intent?) {
+        intent?.let {
+            when (intent.action) {
+                ChatActivity.ACTION_DISMISS_FLOATING_WINDOW -> {
+                    ImManager.dismissFloatingWindow()
+
+                    RetrofitManager.getInstance(HaloApp.getInstance().application).api.postImEnding(UserManager.getInstance().userId)
+                            .subscribeOn(Schedulers.io())
+                            .subscribe()
+                }
+
+                ChatActivity.ACTION_HIDE_UNREAD_DOT -> {
+                    ImManager.updateShouldShowFloatingWindowDot(false)
+                }
+
+                else -> return
+            }
+        }
+    }
+
+}

app/src/main/java/com/gh/common/PushManager.kt

@@ -0,0 +1,140 @@
+package com.gh.common
+
+import android.annotation.SuppressLint
+import android.preference.PreferenceManager
+import com.gh.base.GHUmengNotificationService
+import com.gh.common.constant.Config
+import com.gh.common.exposure.meta.MetaUtil
+import com.gh.common.util.edit
+import com.gh.common.util.toJson
+import com.gh.common.util.toObject
+import com.gh.gamecenter.BuildConfig
+import com.gh.gamecenter.entity.AliasEntity
+import com.gh.gamecenter.retrofit.RetrofitManager
+import com.halo.assistant.HaloApp
+import com.lightgame.utils.Utils
+import com.umeng.commonsdk.UMConfigure
+import com.umeng.message.IUmengRegisterCallback
+import com.umeng.message.PushAgent
+import io.reactivex.schedulers.Schedulers
+import okhttp3.MediaType
+import okhttp3.RequestBody
+import org.android.agoo.huawei.HuaWeiRegister
+import org.android.agoo.mezu.MeizuRegister
+import org.android.agoo.xiaomi.MiPushRegistar
+import org.json.JSONObject
+
+object PushManager {
+
+    var deviceToken: String? = ""
+
+    private var mPreviousAlias: AliasEntity? = null
+    private var mApplication = HaloApp.getInstance().application
+
+    const val SP_PUSH_ALIAS = "push_alias"
+
+    @JvmStatic
+    fun init(channel: String) {
+        //初始化友盟推送
+        UMConfigure.init(mApplication,
+                Config.UMENG_APPKEY, channel,
+                UMConfigure.DEVICE_TYPE_PHONE,
+                Config.UMENG_MESSAGE_SECRET)
+
+        // 注册小米、华为和魅族通道
+        MiPushRegistar.register(mApplication, Config.MIPUSH_APPID, Config.MIPUSH_APPKEY)
+        HuaWeiRegister.register(mApplication)
+        MeizuRegister.register(mApplication, BuildConfig.MEIZUPUSH_APPID, BuildConfig.MEIZUPUSH_APPKEY)
+
+        //友盟推送
+        val pushAgent = PushAgent.getInstance(mApplication)
+        pushAgent.onAppStart() // 开启App统计
+
+        //注册推送服务，每次调用register方法都会回调该接口
+        registerDevice()
+
+        val aliasInSp = PreferenceManager.getDefaultSharedPreferences(mApplication).getString(SP_PUSH_ALIAS, "")
+        mPreviousAlias = aliasInSp?.toObject()
+
+        if (mPreviousAlias == null) {
+            getAndSetAlias()
+        }
+
+        // 完全自定义处理（透传）
+        pushAgent.setPushIntentServiceClass(GHUmengNotificationService::class.java)
+    }
+
+    private fun registerDevice() {
+        PushAgent.getInstance(mApplication).register(object : IUmengRegisterCallback {
+            override fun onSuccess(dToken: String) {
+                //注册成功会返回device token
+                deviceToken = dToken
+                getAndSetAlias()
+                Utils.log("deviceToken::$dToken")
+            }
+
+            override fun onFailure(s: String, s1: String) {
+                Utils.log("deviceToken::" + "注册失败")
+            }
+        })
+    }
+
+    @SuppressLint("CheckResult")
+    @JvmStatic
+    fun getAndSetAlias() {
+        if (deviceToken.isNullOrEmpty()) {
+            registerDevice()
+            return
+        }
+
+        val meta = MetaUtil.getMeta()
+
+        val jsonObject = JSONObject()
+        jsonObject.put("device_token", deviceToken)
+        jsonObject.put("imei", meta.imei)
+        jsonObject.put("android_id", meta.android_id)
+        jsonObject.put("model", meta.model)
+        jsonObject.put("manufacturer", meta.manufacturer)
+        jsonObject.put("os", meta.os)
+        jsonObject.put("os_version", meta.android_version)
+        jsonObject.put("mac", meta.mac)
+
+        val body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString())
+
+        RetrofitManager.getInstance(mApplication).api.getAlias(body)
+                .subscribeOn(Schedulers.io())
+                .subscribe(
+                        { setAlias(it) },
+                        { it.printStackTrace() }
+                )
+    }
+
+    @JvmStatic
+    fun setAlias(alias: AliasEntity) {
+        val pushAgent = PushAgent.getInstance(mApplication)
+
+        mPreviousAlias = alias
+        PreferenceManager.getDefaultSharedPreferences(mApplication).edit {
+            putString(SP_PUSH_ALIAS, mPreviousAlias?.toJson())
+        }
+
+        pushAgent.setAlias(alias.alias, alias.aliasType) { b, s ->
+            Utils.log("注册别名 $b + $s")
+        }
+    }
+
+    @JvmStatic
+    fun deleteAlias() {
+        val pushAgent = PushAgent.getInstance(mApplication)
+
+        mPreviousAlias?.let {
+            pushAgent.deleteAlias(it.alias, it.aliasType) { b, s ->
+                Utils.log("删除别名 $b + $s")
+            }
+        }
+        PreferenceManager.getDefaultSharedPreferences(mApplication).edit {
+            putString(SP_PUSH_ALIAS, "")
+        }
+        mPreviousAlias = null
+    }
+}

app/src/main/java/com/gh/common/TimeElapsedHelper.kt

@@ -0,0 +1,121 @@
+package com.gh.common
+
+import android.app.Activity
+import android.app.Application
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import com.halo.assistant.HaloApp
+import java.util.concurrent.Executors
+
+/**
+ * 统计用户在当前 Fragment 的停留时间，在 onViewDestroy 或 onDestroy 里获取 elapsedTime 即可，单位为秒
+ */
+class TimeElapsedHelper(val fragment: Fragment?, val activity: Activity?) {
+
+    constructor() : this(null, null)
+
+    constructor(fragment: Fragment) : this(fragment, null)
+
+    constructor(activity: Activity) : this(null, activity)
+
+    private var isWorking = false
+
+    var elapsedTime: Int = 0
+
+    var timeout: Int = 0
+    var timeoutCallback: TimeoutCallback? = null
+
+    init {
+        activity?.application?.registerActivityLifecycleCallbacks(object : Application.ActivityLifecycleCallbacks {
+            override fun onActivityStarted(a: Activity?) {
+            }
+
+            override fun onActivitySaveInstanceState(a: Activity?, outState: Bundle?) {
+            }
+
+            override fun onActivityStopped(a: Activity?) {
+            }
+
+            override fun onActivityCreated(a: Activity?, savedInstanceState: Bundle?) {
+            }
+
+            override fun onActivityPaused(a: Activity?) {
+                if (activity == a) {
+                    pauseCounting()
+                }
+            }
+
+            override fun onActivityResumed(a: Activity?) {
+                if (activity == a) {
+                    resumeCounting()
+                }
+            }
+
+            override fun onActivityDestroyed(a: Activity?) {
+                if (activity == a) {
+                    HaloApp.getInstance().application.unregisterActivityLifecycleCallbacks(this)
+                }
+            }
+        })
+
+        fragment?.fragmentManager?.registerFragmentLifecycleCallbacks(
+                object : FragmentManager.FragmentLifecycleCallbacks() {
+                    override fun onFragmentResumed(fm: FragmentManager, f: Fragment) {
+                        if (f === fragment) {
+                            resumeCounting()
+                        }
+                    }
+
+                    override fun onFragmentPaused(fm: FragmentManager, f: Fragment) {
+                        if (f === fragment) {
+                            pauseCounting()
+                        }
+                    }
+
+                    override fun onFragmentViewDestroyed(fm: FragmentManager, f: Fragment) {
+                        if (f === fragment) {
+                            fragment.fragmentManager?.unregisterFragmentLifecycleCallbacks(this)
+                        }
+                    }
+                }, false)
+    }
+
+    fun resumeCounting() {
+        isWorking = true
+        TimeElapsedThreadHolder.threadService.execute {
+            while (isWorking) {
+                try {
+                    elapsedTime++
+                    if (timeout != 0 && timeout == elapsedTime) {
+                        timeoutCallback?.run {
+                            AppExecutor.uiExecutor.execute {
+                                onTimeout()
+                            }
+                        }
+                    }
+                    Thread.sleep(1000)
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                }
+            }
+        }
+    }
+
+    fun resetCounting() {
+        elapsedTime = 0
+    }
+
+    fun pauseCounting() {
+        isWorking = false
+    }
+
+}
+
+object TimeElapsedThreadHolder {
+    val threadService = Executors.newSingleThreadExecutor()
+}
+
+interface TimeoutCallback {
+    fun onTimeout()
+}

app/src/main/java/com/gh/common/annotation/Synchronize.java

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.annotation;
+package com.gh.common.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

app/src/main/java/com/gh/common/chain/BrowserInstallHandler.kt

@@ -1,21 +0,0 @@
-package com.gh.common.chain
-
-import android.content.Context
-import com.gh.download.server.BrowserInstallHelper
-import com.gh.gamecenter.core.utils.EmptyCallback
-import com.gh.gamecenter.entity.GameEntity
-
-class BrowserInstallHandler : ChainHandler() {
-
-    override fun handleRequest(context: Context, gameEntity: GameEntity) {
-        BrowserInstallHelper.showBrowserInstallHintDialog(context, gameEntity.isVGame(), object : EmptyCallback {
-            override fun onCallback() {
-                if (hasNext()) {
-                    getNext()?.handleRequest(context, gameEntity)
-                } else {
-                    processEndCallback?.invoke(null)
-                }
-            }
-        })
-    }
-}

app/src/main/java/com/gh/common/chain/CertificationHandler.kt

@@ -1,18 +0,0 @@
-package com.gh.common.chain
-
-import android.content.Context
-import com.gh.common.dialog.CertificationDialog
-import com.gh.gamecenter.entity.GameEntity
-
-class CertificationHandler : ChainHandler() {
-
-    override fun handleRequest(context: Context, gameEntity: GameEntity) {
-        CertificationDialog.showCertificationDialog(context, gameEntity) {
-            if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity)
-            } else {
-                processEndCallback?.invoke(null)
-            }
-        }
-    }
-}

app/src/main/java/com/gh/common/chain/ChainBuilder.kt

@@ -1,28 +0,0 @@
-package com.gh.common.chain
-
-class ChainBuilder {
-
-    private val handlers: MutableList<ChainHandler> = ArrayList()
-
-    private var processEndCallback: ((Any?) -> Unit)? = null
-
-    fun setProcessEndCallback(callback: (Any?) -> Unit): ChainBuilder {
-        processEndCallback = callback
-        return this
-    }
-
-    fun addHandler(handler: ChainHandler): ChainBuilder {
-        handlers.add(handler)
-        return this
-    }
-
-    fun buildHandlerChain(): ChainHandler? {
-        for (i in handlers.indices) {
-            handlers[i].processEndCallback = processEndCallback
-            if (i + 1 < handlers.size) {
-                handlers[i].setNext(handlers[i + 1])
-            }
-        }
-        return if (handlers.isEmpty()) null else handlers[0]
-    }
-}

app/src/main/java/com/gh/common/chain/ChainHandler.kt

@@ -1,24 +0,0 @@
-package com.gh.common.chain
-
-import android.content.Context
-import com.gh.gamecenter.entity.GameEntity
-
-abstract class ChainHandler {
-    private var next: ChainHandler? = null
-    var processEndCallback: ((Any?) -> Unit)? = null
-
-    fun setNext(next: ChainHandler?) {
-        this.next = next
-    }
-
-    fun getNext(): ChainHandler? {
-        return next
-    }
-
-    fun hasNext(): Boolean {
-        return next != null
-    }
-
-    abstract fun handleRequest(context: Context, gameEntity: GameEntity)
-
-}

app/src/main/java/com/gh/common/chain/CheckDownloadHandler.kt

@@ -1,21 +0,0 @@
-package com.gh.common.chain
-
-import android.content.Context
-import com.gh.common.util.DialogUtils
-import com.gh.gamecenter.common.utils.safelyGetInRelease
-import com.gh.gamecenter.entity.GameEntity
-
-class CheckDownloadHandler : ChainHandler() {
-
-    override fun handleRequest(context: Context, gameEntity: GameEntity) {
-        val apk = gameEntity.getApk().safelyGetInRelease(0) ?: return
-        DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
-            if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity)
-            } else {
-                processEndCallback?.invoke(isSubscribe)
-            }
-        }
-
-    }
-}

app/src/main/java/com/gh/common/chain/CheckStoragePermissionHandler.kt

@@ -1,21 +0,0 @@
-package com.gh.common.chain
-
-import android.content.Context
-import com.gh.gamecenter.common.utils.PermissionHelper
-import com.gh.gamecenter.core.utils.EmptyCallback
-import com.gh.gamecenter.entity.GameEntity
-
-class CheckStoragePermissionHandler : ChainHandler() {
-
-    override fun handleRequest(context: Context, gameEntity: GameEntity) {
-        PermissionHelper.checkStoragePermissionBeforeAction(context, object : EmptyCallback {
-            override fun onCallback() {
-                if (hasNext()) {
-                    getNext()?.handleRequest(context, gameEntity)
-                } else {
-                    processEndCallback?.invoke(null)
-                }
-            }
-        })
-    }
-}

app/src/main/java/com/gh/common/chain/DownloadDialogHelperHandler.kt

@@ -1,23 +0,0 @@
-package com.gh.common.chain
-
-import android.content.Context
-import com.gh.common.util.DownloadDialogHelper
-import com.gh.gamecenter.common.utils.safelyGetInRelease
-import com.gh.gamecenter.core.utils.EmptyCallback
-import com.gh.gamecenter.entity.GameEntity
-
-class DownloadDialogHelperHandler : ChainHandler() {
-
-    override fun handleRequest(context: Context, gameEntity: GameEntity) {
-        val apk = gameEntity.getApk().safelyGetInRelease(0) ?: return
-        DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, object : EmptyCallback {
-            override fun onCallback() {
-                if (hasNext()) {
-                    getNext()?.handleRequest(context, gameEntity)
-                } else {
-                    processEndCallback?.invoke(null)
-                }
-            }
-        })
-    }
-}

app/src/main/java/com/gh/common/chain/GamePermissionHandler.kt

@@ -1,19 +0,0 @@
-package com.gh.common.chain
-
-import android.content.Context
-import androidx.appcompat.app.AppCompatActivity
-import com.gh.gamecenter.entity.GameEntity
-import com.gh.gamecenter.gamedetail.dialog.GamePermissionDialogFragment
-
-class GamePermissionHandler : ChainHandler() {
-
-    override fun handleRequest(context: Context, gameEntity: GameEntity) {
-        GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info) {
-            if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity)
-            } else {
-                processEndCallback?.invoke(null)
-            }
-        }
-    }
-}

app/src/main/java/com/gh/common/chain/OverseaDownloadHandler.kt

@@ -1,18 +0,0 @@
-package com.gh.common.chain
-
-import android.content.Context
-import com.gh.common.util.DialogUtils
-import com.gh.gamecenter.entity.GameEntity
-
-class OverseaDownloadHandler : ChainHandler() {
-
-    override fun handleRequest(context: Context, gameEntity: GameEntity) {
-        DialogUtils.showOverseaDownloadDialog(context, gameEntity) {
-            if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity)
-            } else {
-                processEndCallback?.invoke(null)
-            }
-        }
-    }
-}

app/src/main/java/com/gh/common/chain/PackageCheckHandler.kt

@@ -1,19 +0,0 @@
-package com.gh.common.chain
-
-import android.content.Context
-import androidx.appcompat.app.AppCompatActivity
-import com.gh.common.dialog.PackageCheckDialogFragment
-import com.gh.gamecenter.entity.GameEntity
-
-class PackageCheckHandler : ChainHandler() {
-
-    override fun handleRequest(context: Context, gameEntity: GameEntity) {
-        PackageCheckDialogFragment.show((context as AppCompatActivity), gameEntity) {
-            if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity)
-            } else {
-                processEndCallback?.invoke(null)
-            }
-        }
-    }
-}

app/src/main/java/com/gh/common/chain/UpdateNewSimulatorHandler.kt

@@ -1,35 +0,0 @@
-package com.gh.common.chain
-
-import android.content.Context
-import com.gh.common.simulator.NewSimulatorGameManager
-import com.gh.common.simulator.SimulatorGameManager
-import com.gh.gamecenter.entity.GameEntity
-
-class UpdateNewSimulatorHandler: ChainHandler() {
-
-    override fun handleRequest(context: Context, gameEntity: GameEntity) {
-        if (SimulatorGameManager.isSimulatorGame(gameEntity)) {
-            if (NewSimulatorGameManager.shouldShowUpdateNewSimulatorAlert(context)) {
-                NewSimulatorGameManager.showUpdateNewsSimulator(context) {
-                    if (hasNext()) {
-                        getNext()?.handleRequest(context, gameEntity)
-                    } else {
-                        processEndCallback?.invoke(null)
-                    }
-                }
-            }
-            else{
-                if (hasNext()) {
-                    getNext()?.handleRequest(context, gameEntity)
-                }
-            }
-        }
-        else{
-            if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity)
-            }
-        }
-
-
-    }
-}

app/src/main/java/com/gh/common/chain/ValidateVSpaceHandler.kt

@@ -1,18 +0,0 @@
-package com.gh.common.chain
-
-import android.content.Context
-import com.gh.gamecenter.entity.GameEntity
-import com.gh.vspace.VHelper
-
-class ValidateVSpaceHandler : ChainHandler() {
-
-    override fun handleRequest(context: Context, gameEntity: GameEntity) {
-        VHelper.validateVSpaceBeforeAction(context, gameEntity, true) {
-            if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity)
-            } else {
-                processEndCallback?.invoke(null)
-            }
-        }
-    }
-}

app/src/main/java/com/gh/common/chain/VersionNumberHandler.kt

@@ -1,18 +0,0 @@
-package com.gh.common.chain
-
-import android.content.Context
-import com.gh.common.util.DialogUtils
-import com.gh.gamecenter.entity.GameEntity
-
-class VersionNumberHandler : ChainHandler() {
-
-    override fun handleRequest(context: Context, gameEntity: GameEntity) {
-        DialogUtils.showVersionNumberDialog(context, gameEntity) {
-            if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity)
-            } else {
-                processEndCallback?.invoke(null)
-            }
-        }
-    }
-}

app/src/main/java/com/gh/common/constant/Config.java

@@ -1,75 +1,64 @@
 package com.gh.common.constant;
 
-import android.annotation.SuppressLint;
+import android.content.Context;
 import android.content.SharedPreferences;
-import android.os.Build;
 import android.preference.PreferenceManager;
 import android.text.TextUtils;
 
 import androidx.annotation.Nullable;
 
-import com.gh.gamecenter.common.utils.DarkModeUtils;
-import com.gh.gamecenter.common.utils.EnvHelper;
-import com.gh.gamecenter.common.constant.Constants;
-import com.gh.gamecenter.core.utils.GsonUtils;
+import com.gh.common.util.GsonUtils;
 import com.gh.common.util.PackageHelper;
 import com.gh.common.util.PackageUtils;
+import com.gh.common.util.SPUtils;
 import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.SuggestionActivity;
-import com.gh.gamecenter.core.utils.SPUtils;
-import com.gh.gamecenter.entity.GameGuidePopupEntity;
-import com.gh.gamecenter.entity.NewSettingsEntity;
 import com.gh.gamecenter.entity.NewsEntity;
 import com.gh.gamecenter.entity.SettingsEntity;
-import com.gh.gamecenter.common.eventbus.EBReuse;
-import com.gh.gamecenter.entity.SimulatorEntity;
-import com.gh.gamecenter.entity.VSetting;
-import com.gh.gamecenter.common.retrofit.BiResponse;
-import com.gh.gamecenter.common.retrofit.Response;
+import com.gh.gamecenter.eventbus.EBReuse;
+import com.gh.gamecenter.retrofit.Response;
 import com.gh.gamecenter.retrofit.RetrofitManager;
-import com.gh.vspace.VHelper;
 import com.halo.assistant.HaloApp;
 import com.lightgame.utils.Utils;
 
 import org.greenrobot.eventbus.EventBus;
-import org.json.JSONException;
-import org.json.JSONObject;
 
-import java.io.IOException;
 import java.util.List;
-import java.util.Locale;
 
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
-import okhttp3.ResponseBody;
 
 public class Config {
 
-    // 这个 API_HOST 在测试包里会随着选择的环境切换，正式包里会一直保持正式 host
-    public static final String API_HOST = EnvHelper.getHost();
-    public static final String NEW_API_HOST = EnvHelper.getNewHost();
-    public static final String VAPI_HOST = EnvHelper.getVHost();
+    public static final String API_HOST = BuildConfig.API_HOST;
+    public static final String COMMENT_HOST = BuildConfig.COMMENT_HOST;
+    public static final String DATA_HOST = BuildConfig.DATA_HOST;
+
+    /**
+     * 需要配置的请使用{@link PreferenceManager#getDefaultSharedPreferences(Context)}
+     */
 
     // Third-Party confs
     public static final String WECHAT_APPID = BuildConfig.WECHAT_APPID;
     public static final String WECHAT_SECRET = BuildConfig.WECHAT_SECRET;
     public static final String TENCENT_APPID = BuildConfig.TENCENT_APPID;
     public static final String WEIBO_APPKEY = BuildConfig.WEIBO_APPKEY;
-    public static final String QUICK_LOGIN_APPID = BuildConfig.QUICK_LOGIN_APPID;
-    public static final String QUICK_LOGIN_APPKEY = BuildConfig.QUICK_LOGIN_APPKEY;
+    public static final String MIPUSH_APPID = BuildConfig.MIPUSH_APPID;
+    public static final String MIPUSH_APPKEY = BuildConfig.MIPUSH_APPKEY;
+    public static final String MTA_APPKEY = BuildConfig.MTA_APPKEY;
+    public static final String TALKINGDATA_APPID = BuildConfig.TD_APPID;// TalkingData
+    public static final String UMENG_APPKEY = BuildConfig.UMENG_APPKEY;
+    public static final String UMENG_MESSAGE_SECRET = BuildConfig.UMENG_MESSAGE_SECRET;
+    public static final String BUGLY_APPID = BuildConfig.BUGLY_APPID;
     // http://www.ghzs666.com/article/${articleId}.html
     public static final String URL_ARTICLE = "http://www.ghzs666.com/article/"; // ghzs/ghzs666 统一
+    public static final String PATCHES = "patches";
 
-    private static final String SETTINGS_KEY = "settingsKey";
+    public static final String DEFAULT_CHANNEL = "GH_TEST";
+
+    private static String SETTINGS_KEY = "settingsKey";
 
     private static SettingsEntity mSettingsEntity;
-    private static NewSettingsEntity mNewSettingsEntity;
-
-    private static NewSettingsEntity.NightMode mNightModeSetting;
-    private static SimulatorEntity mNewSimulatorEntity;
-    private static VSetting mVSetting;
-    private static GameGuidePopupEntity mGameGuidePopupEntity;
-    private static SharedPreferences mDefaultSharedPreferences;
 
     public static final String FIX_DOWNLOAD_KEY = "isFixDownload";
     public static final String FIX_PLUGIN_KEY = "isFixPlugin";
@@ -79,8 +68,6 @@ public class Config {
     public static final int VIDEO_PAGE_SIZE = 21; // 视频列表大多都是一行3个
 
     public static boolean isShow() {
-        if (SPUtils.getBoolean(Constants.SP_TEENAGER_MODE)) return false;
-
         if (getPreferences().getBoolean(FIX_DOWNLOAD_KEY, false)) return true;
 
         if (!isExistDownloadFilter()) return false;
@@ -95,6 +82,13 @@ public class Config {
         return false;
     }
 
+    public static String getExceptionMsg() {
+        return getPreferences().getString("errMsg", null);
+    }
+
+    public static void setExceptionMsg(String errMsg) {
+        SPUtils.setString(getPreferences(), "errMsg", errMsg);  //先用apply(),保存不了再用commit() 9.0机型保存不了信息
+    }
 
     public static boolean isShowDownload(String gameId) {
 
@@ -120,17 +114,6 @@ public class Config {
         return false;
     }
 
-    /**
-     * 是否启用畅玩游戏
-     */
-    public static boolean isVGameEnabled() {
-        if (getSettings() == null) {
-            return false;
-        }
-
-        return !"off".equals(getSettings().getGameSmooth());
-    }
-
 
     public static boolean isShowPlugin(String gameId) {
         SharedPreferences preferences = getPreferences();
@@ -196,15 +179,11 @@ public class Config {
         getPreferences().edit().putString(SETTINGS_KEY, GsonUtils.toJson(settingsEntity)).apply();
         mSettingsEntity = settingsEntity;
 
-        // 更新设置状态
+        // 更新 FIX_ARTICLE_KEY 状态
         mSettingsEntity.showArticleEntrance();
-        mSettingsEntity.showCommunityEntrance();
 
         // 加载完设置后刷新下
         PackageHelper.initList();
-
-        // 初始化畅玩相关的东西
-        VHelper.init(HaloApp.getInstance());
     }
 
     @Nullable
@@ -222,64 +201,6 @@ public class Config {
         return mSettingsEntity;
     }
 
-    //新模拟器
-    @Nullable
-    public static SimulatorEntity getNewSimulatorEntitySetting() {
-        if (mNewSimulatorEntity != null) {
-            return mNewSimulatorEntity;
-        } else if (mNewSettingsEntity != null && mNewSettingsEntity.getSimulator() != null) {
-            return mNewSettingsEntity.getSimulator();
-        } else {
-            return null;
-        }
-    }
-
-    @Nullable
-    public static NewSettingsEntity.NightMode getNightModeSetting() {
-        if (mNightModeSetting != null) {
-            return mNightModeSetting;
-        } else if (mNewSettingsEntity != null && mNewSettingsEntity.getNightMode() != null) {
-            return mNewSettingsEntity.getNightMode();
-        } else {
-            return null;
-        }
-    }
-
-    @Nullable
-    public static NewSettingsEntity getNewSettingsEntity() {
-        if (mNewSettingsEntity == null) {
-            try {
-                String json = SPUtils.getString(Constants.SP_NEW_SETTINGS);
-                if (!TextUtils.isEmpty(json)) {
-                    mNewSettingsEntity = GsonUtils.fromJson(json, NewSettingsEntity.class);
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-        return mNewSettingsEntity;
-    }
-
-    @Nullable
-    public static VSetting getVSettingEntity() {
-        if (mVSetting == null) {
-            try {
-                String json = SPUtils.getString(Constants.SP_V_SETTINGS);
-                if (!TextUtils.isEmpty(json)) {
-                    mVSetting = GsonUtils.fromJson(json, VSetting.class);
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-        return mVSetting;
-    }
-
-    @Nullable
-    public static GameGuidePopupEntity getGameGuidePopupEntity() {
-        return mGameGuidePopupEntity;
-    }
-
     private static boolean isExistDownloadFilter() {
         if (getSettings() == null || getSettings().getDownload() == null || getSettings().getDownload().size() == 0) {
             return false;
@@ -302,11 +223,7 @@ public class Config {
     }
 
     public static SharedPreferences getPreferences() {
-        if (mDefaultSharedPreferences == null) {
-            mDefaultSharedPreferences = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication());
-        }
-
-        return mDefaultSharedPreferences;
+        return PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication());
     }
 
     public static boolean isExistHideFunction() {
@@ -329,11 +246,10 @@ public class Config {
         editor.apply();
     }
 
-    @SuppressLint("CheckResult")
     public static void getGhzsSettings() {
         String channel = HaloApp.getInstance().getChannel();
-        RetrofitManager.getInstance()
-                .getApi().getSettings(PackageUtils.getGhVersionName(), channel)
+        RetrofitManager.getInstance(HaloApp.getInstance().getApplication())
+                .getApi().getSettings(PackageUtils.getVersionName(), channel)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Response<SettingsEntity>() {
@@ -350,94 +266,8 @@ public class Config {
                         if (!getPreferences().getBoolean(Config.FIX_DOWNLOAD_KEY, false) && Config.isShow()) {
                             getPreferences().edit().putBoolean(Config.FIX_DOWNLOAD_KEY, true).apply();
                         }
-                        if (!SPUtils.getBoolean(Constants.SP_TEENAGER_MODE)) {
-                            EventBus.getDefault().post(new EBReuse("Refresh"));
-                        }
+                        EventBus.getDefault().post(new EBReuse("Refresh"));
                     }
                 });
-
-        RetrofitManager.getInstance()
-                .getApi().getNewSettings(Build.MANUFACTURER, Build.MODEL, channel, Build.VERSION.SDK_INT, BuildConfig.VERSION_NAME)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new BiResponse<NewSettingsEntity>() {
-                    @Override
-                    public void onSuccess(NewSettingsEntity data) {
-                        mNewSettingsEntity = data;
-                        if (mNightModeSetting != null) {
-                            mNewSettingsEntity.setNightMode(mNightModeSetting);
-                        }
-                        SPUtils.setString(Constants.SP_NEW_SETTINGS, GsonUtils.toJson(data));
-                    }
-                });
-
-        if (mVSetting == null) {
-            RetrofitManager.getInstance()
-                    .getVApi().getSettings(BuildConfig.VERSION_NAME)
-                    .subscribeOn(Schedulers.io())
-                    .subscribe(new BiResponse<VSetting>() {
-                        @Override
-                        public void onSuccess(VSetting data) {
-                            mVSetting = data;
-                            SPUtils.setString(Constants.SP_V_SETTINGS, GsonUtils.toJson(data));
-                        }
-                    });
-        }
-
-        if (mNightModeSetting == null && mNewSimulatorEntity == null) {
-            RetrofitManager.getInstance()
-                    .getNewApi().getNewSettings(PackageUtils.getGhVersionName(), channel)
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new BiResponse<NewSettingsEntity>() {
-                        @Override
-                        public void onSuccess(NewSettingsEntity data) {
-                            mNightModeSetting = data.getNightMode();
-                            mNewSimulatorEntity = data.getSimulator();
-                            if (HaloApp.getInstance().isNewForThisVersion && mNightModeSetting != null && mNightModeSetting.getInstall()) {
-                                DarkModeUtils.INSTANCE.updateFollowSystemDarkModeToSp(true);
-                                DarkModeUtils.INSTANCE.updateAppDarkModeStatusToSp(true);
-                                DarkModeUtils.INSTANCE.initDarkMode();
-                            }
-
-                            if (mNewSettingsEntity != null) {
-                                mNewSettingsEntity.setSimulator(mNewSimulatorEntity);
-                                mNewSettingsEntity.setNightMode(mNightModeSetting);
-                                SPUtils.setString(Constants.SP_NEW_SETTINGS, GsonUtils.toJson(data));
-                            }
-                        }
-                    });
-        }
-
-        RetrofitManager.getInstance()
-                .getApi().getGameGuidePopup(Build.MANUFACTURER, Build.VERSION.RELEASE, Build.MODEL, channel, BuildConfig.VERSION_NAME)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new BiResponse<GameGuidePopupEntity>() {
-                    @Override
-                    public void onSuccess(GameGuidePopupEntity data) {
-                        mGameGuidePopupEntity = data;
-                    }
-                });
-
-        String manufacturer = Build.MANUFACTURER.toUpperCase(Locale.CHINA);
-        if (manufacturer.equals("OPPO") || manufacturer.equals("VIVO")) {
-            RetrofitManager.getInstance().getNewApi().getBrowserHintUrl(manufacturer)
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new BiResponse<ResponseBody>() {
-                        @Override
-                        public void onSuccess(ResponseBody data) {
-                            try {
-                                JSONObject jsonObject = new JSONObject(data.string());
-                                if (!TextUtils.isEmpty(jsonObject.getJSONObject("data").getString("link"))) {
-                                    SPUtils.setString(Constants.SP_BROWSER_HINT_URL, jsonObject.getJSONObject("data").getString("link"));
-                                }
-                            } catch (JSONException | IOException e) {
-                                e.printStackTrace();
-                            }
-                        }
-                    });
-        }
     }
 }

app/src/main/java/com/gh/common/constant/Constants.java

@@ -0,0 +1,96 @@
+package com.gh.common.constant;
+
+import com.gh.common.util.PackageUtils;
+
+public class Constants {
+
+    public static final int SEND_NEWS_FEEDBACK = 0x126;
+    public static final int SEND_COMMENT_FEEDBACK = 0x127;
+
+    public final static int LIST_FOOTER_ITEM = 1;
+    public final static int LIST_HEAD_ITEM = 1;
+
+    public final static int NOT_NETWORK_CODE = 504; // 没有网络的状态码(应该是这个吧!)
+
+    public static final String LOGIN_TOKEN_ID = "userToken_id"; // 用户ID 与服务器无关
+
+    public static final String USER_TOKEN_KEY = "userTokenKey";
+    public static final String USER_INFO_KEY = "userInfoKey";
+
+    public static final String DEVICE_KEY = "deviceKey";
+
+    public static final String HAS_REQUESTED_NOTIFICATION_PERMISSIONS = "has_requested_notification_permissions";
+
+    public static final String SHOULD_SHOW_VIDEO_MOBILE_WARNING = "should_show_video_mobile_warning";
+
+    public static final String GAME_DETAIL_COME_IN = "game_detail_come_in"; // 从游戏详情进入
+
+    public static final String XPOSED_INSTALLER_PACKAGE_NAME = "de.robv.android.xposed.installer";
+
+    public static final String EB_QUIT_LOGIN = "quit_login";
+
+    // 最近显示的弹窗信息
+    public static final String SP_LAST_OPENING_ID = "last_opening_dialog_id";
+    public static final String SP_LAST_OPENING_TIME = "last_opening_dialog_time";
+
+    //引导设置 “通知管理” 引导弹窗
+    public static final String SP_SHOWED_NOTIFICATION_LOGIN = "show_notification_login_hint";
+    public static final String SP_SHOWED_NOTIFICATION_QUESTION = "show_notification_question_hint";
+    public static final String SP_SHOWED_NOTIFICATION_ANSWER = "show_notification_answer_hint";
+    public static final String SP_SHOWED_NOTIFICATION_ARTICLE = "show_notification_article_hint";
+    public static final String SP_SHOWED_NOTIFICATION_VIDEO = "show_notification_video_hint";
+    public static final String SP_SHOWED_NOTIFICATION_RATING = "show_notification_rating_hint";
+    // 新版本 也要触发一次“通知管理” 引导弹窗
+    public static final String SP_SHOWED_NOTIFICATION_NEW_VERSION = "show_notification_new_version";
+    // 今天是否已经触发了 “通知管理” 引导弹窗
+    public static final String SP_IS_SHOWED_NOTIFICATION_TODAY = "show_is_notification_today";
+    // 标记安装的游戏为已玩过弹窗，最多取消2次 (https://gitlab.ghzs.com/pm/halo-app-issues/issues/722 调整为版本相关) (不是常量了也放这里好像有点奇怪)
+    public static final String SP_MARK_INSTALLED_GAME = "mark_installed_game" + PackageUtils.getVersionName();
+    //视频详情滑动引导
+    public static final String SP_SHOW_SLIDE_GUIDE = "show_slide_guide";
+    //视频详情点击引导
+    public static final String SP_SHOW_CLICK_GUIDE = "show_click_guide";
+
+    //手机号码匹配规则
+    public static final String REGEX_MOBILE = "^((13[0-9])|(15[^4,\\D])|(18[0,5-9]))\\d{8}$";
+    public static final String REGEX_ACCOUNT = "^[a-zA-Z_]\\w{5,17}$";
+    public static final String REGEX_PASSWORD = "^[a-zA-Z]\\w{5,31}$";
+
+    //输入规则
+    public static final String INPUT_RULE = "0123456789abcdefghijklnmopqrstuvwxyzABCDEFGHIJKLNMOPQRSTUVWXYZ_";
+
+    // 微信绑定地址地址
+    public static final String WECHAT_BIND_ADDRESS_DEV = "https://resource.ghzs.com/page/wechat_dev/index.html#/";
+    public static final String WECHAT_BIND_ADDRESS = "https://resource.ghzs.com/page/wechat_pro/index.html#/";
+
+    // 徽章
+    public static final String BADGE_ADDRESS_DEV = "http://resource.ghzs.com/page/badge_dev/index.html#/";
+    public static final String BADGE_ADDRESS = "http://resource.ghzs.com/page/badge_pro/index.html#/";
+
+    //最少需要多少数据才能上传
+    public static final int DATA_AMOUNT = 20;
+
+    //游戏 cd间隔
+    public static final int GAME_CD = 5 * 60 * 1000;
+    //新闻 cd间隔
+    public static final int NEWS_CD = 10 * 60 * 1000;
+    //platform cd间隔
+    public static final int PLATFORM_CD = 10 * 60 * 1000;
+    //update cd间隔
+    public static final int UPDATE_CD = 5 * 60 * 1000;
+    //搜索 cd间隔
+    public static final int SEARCH_CD = 5 * 60 * 1000;
+    //评论 cd间隔
+    public static final int COMMENT_CD = 60 * 1000;
+    //我的光环功能分组 cd间隔
+    public static final int ADDONS_CD = 10 * 60 * 1000;
+
+    public static final String[] REPORT_LIST = new String[]{"垃圾广告营销", "恶意攻击谩骂", "淫秽色情信息", "违法有害信息", "其它"};
+
+    public static final String ENTRANCE_UNKNOWN = "(unknown)";
+
+    public static final String DEFAULT_TEXT_WRAPPER = "###";
+    
+    // 触发了安装事件的标记
+    public static final String MARK_ALREADY_TRIGGERED_INSTALLATION = "triggered_installation";
+}

app/src/main/java/com/gh/common/constant/ItemViewType.java

@@ -0,0 +1,43 @@
+package com.gh.common.constant;
+
+/**
+ * Created by LGT on 2016/10/16.
+ */
+public class ItemViewType {
+
+    public static final int COLUMN_HEADER = 0;  // 专题头部布局
+    public static final int GAME_SLIDE = 1;     // 滚动图布局
+    public static final int GAME_NORMAL = 2;    // 正常游戏布局
+    public static final int GAME_SUBJECT = 19;
+    public static final int GAME_SUBJECT_SLIDE = 26;
+    public static final int GAME_TEST = 3;      // 测试游戏布局
+    public static final int GAME_IMAGE = 4;     // 游戏大图布局
+    public static final int NEWS_HEADER = 5;    // 新闻头部布局
+    public static final int NEWS_TEXT = 6;      // 新闻文本布局
+    public static final int NEWS_IMAGE = 7;     // 新闻带图布局
+    public static final int NEWS_IMAGE1 = 8;    // 新闻带一张小图布局
+    public static final int NEWS_IMAGE2 = 9;    // 新闻带三张小图布局
+    public static final int NEWS_IMAGE3 = 10;   // 新闻带一张大图布局
+    public static final int NEWS_DIGEST = 11;   // 新闻摘要布局
+    public static final int SEARCH_NORMAL = 12; // 搜索正常布局
+    public static final int LOADING = 14;       // 加载布局
+    public static final int LIBAO_NORMAL = 15;   // 礼包正常布局
+    public static final int LIBAO_SKIP_CONCERN = 16;  // 跳转关注管理页面布局
+    public static final int KC_HINT = 17;
+    public static final int GAME_PLUGIN = 18;     // 游戏插件模块
+    public static final int ASK_REFRESH = 19;     // 问答精选 刷新
+    public static final int ITEM_EMPTY = 20;
+    public static final int ASK_CONCERN = 21;     // 问答精选 关注
+    public static final int RATING_ITEM = 22;     // 问答精选 关注
+    public static final int IMAGE_SLIDE_ITEM = 23;
+    public static final int VERTICAL_SLIDE_ITEM = 24;
+    public static final int COLUMN_COLLECTION = 25;
+
+    /**
+     * 普通列表
+     */
+    public static final int ITEM_BODY = 100;
+    public static final int ITEM_FOOTER = 101;
+    public static final int ITEM_HEADER = 102;
+
+}

app/src/main/java/com/gh/common/databind/AddKaiFuBindingAdapter.kt

@@ -1,187 +0,0 @@
-package com.gh.common.databind
-
-import android.os.Build
-import android.text.Editable
-import android.text.Html
-import android.text.TextWatcher
-import android.view.Gravity
-import android.view.LayoutInflater
-import android.view.View
-import android.widget.EditText
-import android.widget.LinearLayout
-import android.widget.PopupWindow
-import androidx.core.content.ContextCompat
-import androidx.databinding.BindingAdapter
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.gh.gamecenter.common.callback.OnViewClickListener
-import com.gh.gamecenter.common.utils.dip2px
-import com.gh.gamecenter.common.utils.toDrawable
-import com.gh.gamecenter.common.view.BugFixedPopupWindow
-import com.gh.gamecenter.R
-import com.gh.gamecenter.databinding.KaifuAddItemBinding
-import com.gh.gamecenter.databinding.LayoutAddKaifuPopupBinding
-import com.gh.gamecenter.databinding.LayoutPopupContainerBinding
-import com.gh.gamecenter.entity.ServerCalendarEntity
-import com.gh.gamecenter.servers.add.AddKaiFuPopupAdapter
-import java.text.SimpleDateFormat
-import java.util.*
-
-object AddKaiFuBindingAdapter {
-    private var popupWindow: BugFixedPopupWindow? = null
-
-    @JvmStatic
-    @BindingAdapter("addKaiFuView", "clickListener")
-    fun addKaiFuView(
-        view: LinearLayout,
-        list: List<ServerCalendarEntity?>?,
-        listener: OnViewClickListener<*>?
-    ) {
-        if (list == null) return
-        view.removeAllViews()
-        view.addView(LayoutInflater.from(view.context).inflate(R.layout.kaifu_new_add_item_title, null))
-        for (i in list.indices) {
-            val inflate = LayoutInflater.from(view.context).inflate(R.layout.kaifu_add_item, null)
-            val binding = KaifuAddItemBinding.bind(inflate)
-            binding.clickListener = listener
-            binding.entity = list[i]
-            binding.position = i
-            binding.isCloseBottom = list.size - 1 == i
-            view.addView(inflate)
-            binding.kaifuAddFirstName.setOnFocusChangeListener { _, hasFocus ->
-                if (hasFocus) {
-                    binding.kaifuAddFirstName.hint = ""
-                    if (binding.kaifuAddFirstName.text.isNullOrEmpty()) {
-                        showPopupOption(binding.kaifuAddFirstName) {
-                            binding.kaifuAddFirstName.setText(it)
-                            binding.kaifuAddFirstName.setSelection(it.length)
-                        }
-                    }
-                } else {
-                    binding.kaifuAddFirstName.hint = "点击填写"
-                }
-            }
-            binding.kaifuAddServerName.setOnFocusChangeListener { _, hasFocus ->
-                if (hasFocus) {
-                    binding.kaifuAddServerName.hint = ""
-                } else {
-                    binding.kaifuAddServerName.hint = "点击填写"
-                }
-            }
-            binding.kaifuAddFirstName.addTextChangedListener(object : TextWatcher {
-                override fun beforeTextChanged(
-                    s: CharSequence?,
-                    start: Int,
-                    count: Int,
-                    after: Int
-                ) {
-                }
-
-                override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                    if (!s.isNullOrEmpty()) {
-                        popupWindow?.dismiss()
-                    }
-                }
-
-                override fun afterTextChanged(s: Editable?) {
-                }
-
-            })
-            if (i == list.size - 1) {
-                binding.kaifuAddTime.background = R.drawable.bg_add_kaifu_bottom_left.toDrawable(view.context)
-                binding.kaifuAddServerName.background = R.drawable.bg_add_kaifu_bottom_right.toDrawable(view.context)
-            }
-        }
-    }
-
-    @JvmStatic
-    @BindingAdapter("addKaiFuTime", "addKaiFuPosition")
-    fun addKaiFuTime(view: EditText, time: Long, position: Int) {
-        if (time == 0L) {
-            view.hint = "点击选择"
-            view.setText("")
-        } else {
-            val pattern = "yyy-MM-dd HH:mm"
-            val format = SimpleDateFormat(pattern, Locale.CHINA)
-            view.setText(format.format(time * 1000))
-            if (position == 0) {
-                view.append(
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) Html.fromHtml(
-                        String.format(
-                            "<font color='#2496FF'>%1\$s</font>",
-                            "&nbsp+"
-                        ), Html.FROM_HTML_MODE_LEGACY
-                    ) else Html.fromHtml(String.format("<font color='#2496FF'>%1\$s</font>", "&nbsp+"))
-                )
-            }
-        }
-    }
-
-    @JvmStatic
-    @BindingAdapter("kaiFuTextColor", "kaiFuTextPosition")
-    fun kaiFuTextColor(view: EditText, dataMark: Int, position: Int) {
-        if (dataMark == 1 && view.id == R.id.kaifu_add_time || dataMark == 2 && view.id == R.id.kaifu_add_first_name || dataMark == 3 && view.id == R.id.kaifu_add_server_name || dataMark == 4) {
-            view.setTextColor(ContextCompat.getColor(view.context, R.color.theme_red))
-            view.setHintTextColor(ContextCompat.getColor(view.context, R.color.theme_red))
-        } else if (position == 0) {
-            view.setTextColor(ContextCompat.getColor(view.context, R.color.hint))
-            view.setHintTextColor(ContextCompat.getColor(view.context, R.color.hint))
-        } else {
-            view.setTextColor(ContextCompat.getColor(view.context, R.color.text_title))
-            view.setHintTextColor(ContextCompat.getColor(view.context, R.color.hint))
-        }
-    }
-
-    @JvmStatic
-    private fun showPopupOption(view: View, callback: (text: String) -> Unit) {
-        val inflater = LayoutInflater.from(view.context)
-        val mainBinding = LayoutPopupContainerBinding.inflate(inflater)
-        popupWindow = BugFixedPopupWindow(
-            mainBinding.root,
-            LinearLayout.LayoutParams.WRAP_CONTENT,
-            LinearLayout.LayoutParams.WRAP_CONTENT
-        )
-        val windowPos = IntArray(2)
-        val anchorLoc = IntArray(2)
-        // 获取锚点View在屏幕上的左上角坐标位置
-        view.getLocationOnScreen(anchorLoc)
-        val anchorHeight = view.height
-        // 获取屏幕的高宽
-        val screenHeight = view.context.resources.displayMetrics.heightPixels
-        popupWindow?.let { popupWindow ->
-            // 测量contentView
-            popupWindow.contentView.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED)
-            val windowHeight = popupWindow.contentView.measuredHeight
-
-            // 判断需要向上弹出还是向下弹出显示
-            val isNeedShowUp = screenHeight - anchorLoc[1] - anchorHeight < windowHeight
-            windowPos[1] = if (isNeedShowUp) {
-                anchorLoc[1] - windowHeight
-            } else anchorLoc[1] + anchorHeight
-
-            LayoutAddKaifuPopupBinding.inflate(inflater, mainBinding.container, false).apply {
-                root.layoutParams = root.layoutParams.apply {
-                    width = view.width + 16F.dip2px()
-                }
-                popupRv.adapter = AddKaiFuPopupAdapter(
-                    root.context,
-                    arrayListOf("安卓混服", "硬核专服", "官方专服", "官方渠道服", "腾讯QQ服", "腾讯微信服")
-                ) {
-                    callback.invoke(it)
-                    popupWindow.dismiss()
-                }
-                popupRv.layoutManager = LinearLayoutManager(root.context)
-                mainBinding.container.addView(root)
-            }
-
-            popupWindow.isTouchable = true
-            popupWindow.inputMethodMode = PopupWindow.INPUT_METHOD_NEEDED
-            popupWindow.isOutsideTouchable = true
-            popupWindow.animationStyle = R.style.popwindow_option_anim_style
-
-            // 设置偏移
-            windowPos[1] = windowPos[1] - 12F.dip2px()
-            windowPos[0] = anchorLoc[0] - 11F.dip2px()
-            popupWindow.showAtLocation(view, Gravity.TOP or Gravity.START, windowPos[0], windowPos[1])
-        }
-    }
-}

app/src/main/java/com/gh/common/databind/BindingAdapters.java

@@ -2,7 +2,6 @@ package com.gh.common.databind;
 
 import android.content.Intent;
 import android.graphics.Color;
-import android.graphics.Typeface;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.TextUtils;
@@ -10,83 +9,67 @@ import android.text.style.ForegroundColorSpan;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
+import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.content.ContextCompat;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-
 import com.facebook.drawee.view.SimpleDraweeView;
-import com.gh.common.chain.BrowserInstallHandler;
-import com.gh.common.chain.CertificationHandler;
-import com.gh.common.chain.ChainBuilder;
-import com.gh.common.chain.ChainHandler;
-import com.gh.common.chain.CheckDownloadHandler;
-import com.gh.common.chain.DownloadDialogHelperHandler;
-import com.gh.common.chain.GamePermissionHandler;
-import com.gh.common.chain.OverseaDownloadHandler;
-import com.gh.common.chain.PackageCheckHandler;
-import com.gh.common.chain.ValidateVSpaceHandler;
-import com.gh.common.chain.VersionNumberHandler;
+import com.gh.base.OnViewClickListener;
 import com.gh.common.constant.Config;
+import com.gh.common.dialog.ReserveDialogFragment;
 import com.gh.common.exposure.ExposureEvent;
-import com.gh.common.filter.RegionSetting;
-import com.gh.common.filter.RegionSettingHelper;
-import com.gh.common.history.HistoryHelper;
+import com.gh.common.exposure.ExposureUtils;
 import com.gh.common.repository.ReservationRepository;
-import com.gh.common.simulator.SimulatorDownloadManager;
-import com.gh.common.simulator.SimulatorGameManager;
 import com.gh.common.util.CheckLoginUtils;
+import com.gh.common.util.DataUtils;
 import com.gh.common.util.DialogUtils;
+import com.gh.common.util.DisplayUtils;
+import com.gh.common.util.DownloadDialogHelper;
 import com.gh.common.util.GameUtils;
 import com.gh.common.util.GameViewUtils;
+import com.gh.common.util.ImageUtils;
 import com.gh.common.util.LogUtils;
+import com.gh.common.util.MtaHelper;
 import com.gh.common.util.NewsUtils;
-import com.gh.common.util.PackageInstaller;
+import com.gh.common.util.NumberUtils;
 import com.gh.common.util.PackageUtils;
+import com.gh.common.util.PermissionHelper;
 import com.gh.common.util.PlatformUtils;
 import com.gh.common.util.ReservationHelper;
-import com.gh.common.view.DownloadButton;
-import com.gh.common.view.GameIconView;
+import com.gh.common.view.DownloadDialog;
+import com.gh.common.view.DownloadProgressBar;
+import com.gh.common.view.DrawableView;
 import com.gh.download.DownloadManager;
-import com.gh.download.dialog.DownloadDialog;
 import com.gh.gamecenter.DownloadManagerActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.WebActivity;
-import com.gh.gamecenter.common.baselist.LoadStatus;
-import com.gh.gamecenter.common.callback.OnViewClickListener;
-import com.gh.gamecenter.common.utils.ExtensionsKt;
-import com.gh.gamecenter.common.utils.ImageUtils;
-import com.gh.gamecenter.common.utils.DarkModeUtils;
-import com.gh.gamecenter.common.view.DrawableView;
-import com.gh.gamecenter.core.utils.DisplayUtils;
-import com.gh.gamecenter.core.utils.MtaHelper;
-import com.gh.gamecenter.core.utils.NumberUtils;
+import com.gh.gamecenter.baselist.LoadStatus;
+import com.gh.gamecenter.databinding.KaifuAddItemBinding;
 import com.gh.gamecenter.databinding.KaifuDetailItemRowBinding;
 import com.gh.gamecenter.entity.ApkEntity;
 import com.gh.gamecenter.entity.GameEntity;
-import com.gh.gamecenter.common.entity.LinkEntity;
+import com.gh.gamecenter.entity.LinkEntity;
 import com.gh.gamecenter.entity.PluginLocation;
 import com.gh.gamecenter.entity.ServerCalendarEntity;
 import com.gh.gamecenter.entity.TagStyleEntity;
-import com.gh.gamecenter.entity.TestEntity;
-import com.gh.gamecenter.common.eventbus.EBReuse;
-import com.gh.gamecenter.gamedetail.dialog.GamePermissionDialogFragment;
+import com.gh.gamecenter.eventbus.EBReuse;
 import com.gh.gamecenter.manager.PackagesManager;
 import com.gh.gamecenter.qa.entity.CommunityVideoEntity;
-import com.gh.vspace.VDownloadManagerActivity;
-import com.gh.vspace.VHelper;
 import com.lightgame.download.DownloadEntity;
 import com.lightgame.download.FileUtils;
 import com.lightgame.utils.Utils;
 
 import org.greenrobot.eventbus.EventBus;
 
-import java.io.File;
-import java.util.ArrayList;
+import java.text.SimpleDateFormat;
 import java.util.List;
+import java.util.Locale;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+import androidx.databinding.BindingAdapter;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 /**
  * Created by khy on 12/02/18.
@@ -94,37 +77,22 @@ import java.util.List;
 
 public class BindingAdapters {
 
+    @BindingAdapter("imageIcon")
     public static void loadIcon(SimpleDraweeView view, String imageUrl) {
         ImageUtils.displayIcon(view, imageUrl);
     }
 
+    @BindingAdapter("imageUrl")
     public static void loadImage(SimpleDraweeView view, String imageUrl) {
         ImageUtils.display(view, imageUrl);
     }
 
+    @BindingAdapter("setTextSize")
     public static void setTextSize(TextView view, int number) {
         view.setTextSize(number);
     }
 
-    public static void setTypeface(TextView view, String type) {
-        if (type == null) return;
-
-        switch (type) {
-            case "bold":
-                view.setTypeface(null, Typeface.BOLD);
-                break;
-            case "italic":
-                view.setTypeface(null, Typeface.ITALIC);
-                break;
-            case "bold_italic":
-                view.setTypeface(null, Typeface.BOLD_ITALIC);
-                break;
-            default:
-                view.setTypeface(null, Typeface.NORMAL);
-                break;
-        }
-    }
-
+    @BindingAdapter({"addDetailKaiFuView", "addDetailKaiFuViewListener", "isReadyPatch"})
     public static void addDetailKaiFuView(LinearLayout view, List<ServerCalendarEntity> list
             , OnViewClickListener listener, Boolean isReadyPatch) {
         if (list == null) return;
@@ -132,13 +100,13 @@ public class BindingAdapters {
         for (int i = 0; i < list.size() + 1; i++) { // 1 is Title
             View inflate = LayoutInflater.from(view.getContext()).inflate(R.layout.kaifu_detail_item_row, null);
             KaifuDetailItemRowBinding binding = KaifuDetailItemRowBinding.bind(inflate);
-            binding.getRoot().setBackgroundColor(isReadyPatch != null && isReadyPatch ? ExtensionsKt.toColor(R.color.theme) : ExtensionsKt.toColor(R.color.white));
-            binding.getRoot().setPadding(DisplayUtils.dip2px(1), DisplayUtils.dip2px(1), DisplayUtils.dip2px(1), i == list.size() ? DisplayUtils.dip2px(1) : 0);
-            ServerCalendarEntity serverEntity = list.get(i - 1);
-            binding.timeTv.setText(i == 0 ? "时间" : serverEntity.getFormatTime("HH:mm"));
-            binding.remarkTv.setText(i == 0 ? "备注" : serverEntity.getRemark());
-            binding.nameTv.setText(i == 0 ? "名字" : (TextUtils.isEmpty(serverEntity.getNote()) ? "-" : serverEntity.getNote()));
-            if (i != 0) {
+            binding.setIsCloseBottom(i == list.size());
+            binding.setIsReadyPatch(isReadyPatch);
+            if (i == 0) {
+                binding.setIsTitle(true);
+            } else {
+                ServerCalendarEntity serverEntity = list.get(i - 1);
+                binding.setEntity(serverEntity);
                 binding.getRoot().setOnClickListener(v -> {
                     listener.onClick(v, isReadyPatch != null && isReadyPatch ? serverEntity : null);
                 });
@@ -160,20 +128,77 @@ public class BindingAdapters {
     }
 
     // 如果超过10000，则转换为1.0W
+    @BindingAdapter("transSimpleCount")
     public static void transSimpleCount(TextView view, int count) {
         view.setText(NumberUtils.transSimpleCount(count));
     }
 
-    public static void textColorFromString(TextView tv, String hexString) {
-        if (TextUtils.isEmpty(hexString)) return;
+    @BindingAdapter({"addKaiFuView", "clickListener"})
+    public static void addKaiFuView(LinearLayout view, List<ServerCalendarEntity> list, OnViewClickListener listener) {
+        if (list == null) return;
+        view.removeAllViews();
+        view.addView(LayoutInflater.from(view.getContext()).inflate(R.layout.kaifu_add_item_title, null));
+        for (int i = 0; i < list.size(); i++) {
+            View inflate = LayoutInflater.from(view.getContext()).inflate(R.layout.kaifu_add_item, null);
+            KaifuAddItemBinding binding = KaifuAddItemBinding.bind(inflate);
+            binding.setClickListener(listener);
+            binding.setEntity(list.get(i));
+            binding.setPosition(i);
+            binding.setIsCloseBottom(list.size() - 1 == i);
+            view.addView(inflate);
 
-        try {
-            tv.setTextColor(Color.parseColor(hexString));
-        } catch (Exception e) {
-            e.printStackTrace();
+            binding.kaifuAddName.setOnFocusChangeListener((v, hasFocus) -> {
+                if (hasFocus) {
+                    binding.kaifuAddName.setHint("");
+                } else {
+                    binding.kaifuAddName.setHint("点击填写");
+                }
+            });
+            binding.kaifuAddRemark.setOnFocusChangeListener((v, hasFocus) -> {
+                if (hasFocus) {
+                    binding.kaifuAddRemark.setHint("");
+                } else {
+                    binding.kaifuAddRemark.setHint("点击填写");
+                }
+            });
         }
     }
 
+    @BindingAdapter({"addKaiFuTime", "addKaiFuPosition"})
+    public static void addKaiFuTime(EditText view, Long time, Integer position) {
+        if (time == 0) {
+            view.setHint("点击选择");
+            view.setText("");
+        } else {
+            String pattern;
+            if (position == 0) {
+                pattern = "yyy-MM-dd HH:mm +";
+            } else {
+                pattern = "yyy-MM-dd HH:mm";
+            }
+            SimpleDateFormat format = new SimpleDateFormat(pattern, Locale.CHINA);
+            view.setText(format.format(time * 1000));
+        }
+    }
+
+    @BindingAdapter({"kaiFuTextColor", "kaiFuTextPosition"})
+    public static void kaiFuTextColor(EditText view, Integer dataMark, Integer position) {
+        if (dataMark == 1 && view.getId() == R.id.kaifu_add_time
+                || dataMark == 2 && view.getId() == R.id.kaifu_add_name
+                || dataMark == 3 && view.getId() == R.id.kaifu_add_remark
+                || dataMark == 4 && (view.getId() == R.id.kaifu_add_time || view.getId() == R.id.kaifu_add_name)) {
+            view.setTextColor(ContextCompat.getColor(view.getContext(), R.color.red));
+            view.setHintTextColor(ContextCompat.getColor(view.getContext(), R.color.red));
+        } else if (position == 0) {
+            view.setTextColor(ContextCompat.getColor(view.getContext(), R.color.hint));
+            view.setHintTextColor(ContextCompat.getColor(view.getContext(), R.color.hint));
+        } else {
+            view.setTextColor(ContextCompat.getColor(view.getContext(), R.color.title));
+            view.setHintTextColor(ContextCompat.getColor(view.getContext(), R.color.hint));
+        }
+    }
+
+    @BindingAdapter("visibleGone")
     public static void showHide(View view, Boolean show) {
         if (show != null && show) {
             view.setVisibility(View.VISIBLE);
@@ -182,43 +207,7 @@ public class BindingAdapters {
         }
     }
 
-    public static void goneIf(View view, Boolean gone) {
-        if (gone != null && gone) {
-            view.setVisibility(View.GONE);
-        } else {
-            view.setVisibility(View.VISIBLE);
-        }
-    }
-
-    /**
-     * lazy 的 paddingTop
-     */
-    public static void lazyPaddingLeft(View view, int paddingLeftInDp) {
-        view.setPadding(DisplayUtils.dip2px(paddingLeftInDp), view.getPaddingTop(), view.getPaddingRight(), view.getPaddingBottom());
-    }
-
-    /**
-     * lazy 的 paddingTop
-     */
-    public static void lazyPaddingTop(View view, int paddingTopInDp) {
-        view.setPadding(view.getPaddingLeft(), DisplayUtils.dip2px(paddingTopInDp), view.getPaddingRight(), view.getPaddingBottom());
-    }
-
-    /**
-     * lazy 的 paddingBottom
-     */
-    public static void lazyPaddingBottom(View view, int paddingBottomInDp) {
-        view.setPadding(view.getPaddingLeft(), view.getPaddingTop(), view.getPaddingRight(), DisplayUtils.dip2px(paddingBottomInDp));
-    }
-
-    public static void visibleInvisible(View view, Boolean show) {
-        if (show != null && show) {
-            view.setVisibility(View.VISIBLE);
-        } else {
-            view.setVisibility(View.INVISIBLE);
-        }
-    }
-
+    @BindingAdapter("messageUnread")
     public static void setMessageUnread(TextView view, int unreadCount) {
         if (unreadCount < 100) {
             view.setText(String.valueOf(unreadCount));
@@ -227,6 +216,7 @@ public class BindingAdapters {
         }
     }
 
+    @BindingAdapter("serverTypePadding")
     public static void setServerTypePadding(TextView view, String serverType) {
         int paddRight = 0;
         if (TextUtils.isEmpty(serverType)) {
@@ -244,6 +234,7 @@ public class BindingAdapters {
         view.setPadding(0, 0, paddRight, 0);
     }
 
+    @BindingAdapter("serverType")
     public static void setServerType(TextView view, String serverType) {
         view.setText(serverType);
         if ("删档内测".equals(serverType) || "不删档内测".equals(serverType)) {
@@ -253,22 +244,12 @@ public class BindingAdapters {
         }
     }
 
-    public static void setGame(View view, GameEntity gameEntity) {
-        if (gameEntity != null && view instanceof GameIconView) {
-            ((GameIconView) view).displayGameIcon(gameEntity);
-        }
-    }
-
-    public static void setGameIcon(View view, GameEntity gameEntity) {
-        if (gameEntity != null && view instanceof GameIconView) {
-            ((GameIconView) view).displayGameIcon(gameEntity.getIcon(), gameEntity.getIconSubscript());
-        }
-    }
-
+    @BindingAdapter("articleType")
     public static void setArticleType(TextView view, String articleType) {
         NewsUtils.setNewsType(view, articleType, 0, 0);
     }
 
+    @BindingAdapter("detailDownloadText")
     public static void setDetailDownloadText(TextView view, GameEntity gameEntity) {
         if (gameEntity == null || gameEntity.getApk().isEmpty()) {
             view.setBackgroundResource(R.drawable.game_item_btn_pause_style);
@@ -277,6 +258,7 @@ public class BindingAdapters {
         }
     }
 
+    @BindingAdapter("liBaoBtn")
     public static void setLiBaoBtn(TextView view, String status) {
         if (TextUtils.isEmpty(status)) return;
         switch (status) {
@@ -341,16 +323,14 @@ public class BindingAdapters {
     }
 
     // 大图下的进度条
-    public static void setDownloadButton(DownloadButton progressBar,
+    @BindingAdapter({"downloadButton", "traceEvent", "clickCallBack", "entrance", "location"})
+    public static void setDownloadButton(DownloadProgressBar progressBar,
                                          GameEntity gameEntity,
                                          ExposureEvent traceEvent,
                                          @Nullable View.OnClickListener clickCallBack,
                                          @Nullable String entrance,
                                          @Nullable String location) {
 
-        // 恢复DialogFragment
-        restoreDialogFragment(progressBar);
-
         // 判断是否显示按钮
         if (gameEntity != null
                 && Config.isShowDownload(gameEntity.getId())
@@ -364,134 +344,59 @@ public class BindingAdapters {
         // 点击事件
         progressBar.setOnClickListener(v -> {
             if (clickCallBack != null) clickCallBack.onClick(v);
-            switch (progressBar.getButtonStyle()) {
+            switch (progressBar.getDownloadType()) {
                 case DOWNLOADING_PLUGIN:
                 case DOWNLOADING_NORMAL:
-                    if (gameEntity.isVGame()) {
-                        v.getContext().startActivity(VDownloadManagerActivity.getIntent(v.getContext(), true));
-                    } else {
-                        Intent intent = DownloadManagerActivity.getDownloadMangerIntent(v.getContext(),
-                                gameEntity.getApk().get(0).getUrl(), entrance);
-                        v.getContext().startActivity(intent);
-                    }
+                    Intent intent = DownloadManagerActivity.getDownloadMangerIntent(v.getContext(),
+                            gameEntity.getApk().get(0).getUrl(), entrance);
+                    v.getContext().startActivity(intent);
                     break;
                 case NONE:
                     Utils.toast(v.getContext(), "该游戏已关闭下载");
                     break;
                 case NORMAL:
                 case PLUGIN:
-                    final RegionSetting.GameH5Download gameH5Download = RegionSettingHelper.getGameH5DownloadByGameId(gameEntity.getId());
-                    if (gameH5Download != null) {
-                        DialogUtils.showGameH5DownloadDialog(v.getContext(), gameEntity, gameH5Download);
+                    if (gameEntity.getApk().size() == 1) {
+                        ApkEntity apk = gameEntity.getApk().get(0);
+                        DownloadDialogHelper.findAvailableDialogAndShow(
+                                v.getContext(),
+                                gameEntity,
+                                apk,
+                                () -> {
+                                    DialogUtils.checkDownload(v.getContext(), apk.getSize(),
+                                            isSubscribe -> download(progressBar, gameEntity, traceEvent, isSubscribe, entrance, location));
+                                });
                     } else {
-                        if (gameEntity.getApk().size() == 1) {
-                            ApkEntity apk = gameEntity.getApk().get(0);
-                            DownloadEntity downloadEntity = SimulatorGameManager.findDownloadEntityByUrl(apk.getUrl());
-                            if (gameEntity.getSimulator() != null) {
-                                boolean isInstalled = PackageUtils.isInstalledFromAllPackage(v.getContext(), gameEntity.getSimulator().getApk().getPackageName());
-                                if (downloadEntity != null && SimulatorGameManager.isSimulatorGame(gameEntity) && !isInstalled) {
-                                    SimulatorDownloadManager.getInstance().showDownloadDialog(v.getContext(), gameEntity.getSimulator(),
-                                            SimulatorDownloadManager.SimulatorLocation.LAUNCH, gameEntity.getId(), gameEntity.getName(), null);
-                                    return;
-                                }
-                            }
-
-                            ChainBuilder builder = new ChainBuilder();
-                            builder.addHandler(new ValidateVSpaceHandler());
-                            builder.addHandler(new GamePermissionHandler());
-                            builder.addHandler(new BrowserInstallHandler());
-                            builder.addHandler(new PackageCheckHandler());
-                            builder.addHandler(new DownloadDialogHelperHandler());
-                            builder.addHandler(new CertificationHandler());
-                            builder.addHandler(new VersionNumberHandler());
-                            builder.addHandler(new OverseaDownloadHandler());
-                            builder.addHandler(new CheckDownloadHandler());
-
-                            builder.setProcessEndCallback(o -> {
-                                download(progressBar, gameEntity, traceEvent, (boolean) o, entrance, location);
-                                return null;
-                            });
-                            final ChainHandler chainHandler = builder.buildHandlerChain();
-                            if (chainHandler != null) {
-                                chainHandler.handleRequest(v.getContext(), gameEntity);
-                            }
-                        } else {
-                            ChainBuilder builder = new ChainBuilder();
-                            builder.addHandler(new GamePermissionHandler());
-                            builder.addHandler(new CertificationHandler());
-                            builder.addHandler(new VersionNumberHandler());
-
-                            builder.setProcessEndCallback(o -> {
-                                DownloadDialog.showDownloadDialog(
-                                        v.getContext(),
-                                        gameEntity,
-                                        traceEvent,
-                                        entrance,
-                                        location + ":" + gameEntity.getName());
-                                return null;
-                            });
-                            final ChainHandler chainHandler = builder.buildHandlerChain();
-                            if (chainHandler != null) {
-                                chainHandler.handleRequest(v.getContext(), gameEntity);
-                            }
-                        }
+                        DownloadDialog.getInstance(v.getContext()).showPopupWindow(v, gameEntity,
+                                entrance, location + gameEntity.getName(), traceEvent);
                     }
                     break;
                 case LAUNCH_OR_OPEN:
                     if (gameEntity.getApk().size() == 1) {
-                        //启动模拟器游戏
-                        if (SimulatorGameManager.isSimulatorGame(gameEntity)) {
-                            DownloadEntity downloadEntity = SimulatorGameManager.findDownloadEntityByUrl(gameEntity.getApk().get(0).getUrl());
-                            if (downloadEntity != null) {
-                                File file = new File(downloadEntity.getPath());
-                                if (!file.exists()) {
-                                    download(progressBar, gameEntity, traceEvent, false, entrance, location);
-                                    return;
-                                }
-
-                                SimulatorGameManager.launchSimulatorGame(downloadEntity, gameEntity);
-                            }
-                            return;
-                        }
-
-                        if (gameEntity.isVGame()) {
-                            VHelper.installOrLaunch((AppCompatActivity) v.getContext(), gameEntity.getApk().get(0).getPackageName());
-                            return;
-                        }
-
+                        DataUtils.onGameLaunchEvent(v.getContext(), gameEntity.getName(), gameEntity.getApk().get(0).getPlatform(), location);
                         PackageUtils.launchApplicationByPackageName(v.getContext(), gameEntity.getApk().get(0).getPackageName());
                     } else {
-                        DownloadDialog.showDownloadDialog(
-                                v.getContext(),
-                                gameEntity,
-                                traceEvent,
-                                entrance,
-                                location + ":" + gameEntity.getName());
+                        DownloadDialog.getInstance(v.getContext()).showPopupWindow(v, gameEntity,
+                                entrance, location + gameEntity.getName(), traceEvent);
                     }
                     break;
                 case INSTALL_PLUGIN:
                 case INSTALL_NORMAL:
                     if (gameEntity.getApk().size() == 1) {
-                        DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity);
-                        String packageName = gameEntity.getApk().get(0).getPackageName();
-
-                        if (gameEntity.isVGame()) {
-                            VHelper.installOrLaunch(v.getContext(), packageName);
-                            return;
-                        }
-
+                        DownloadEntity downloadEntity = DownloadManager.getInstance(progressBar.getContext()).getDownloadEntityByUrl(gameEntity.getApk().get(0).getUrl());
                         if (downloadEntity != null) {
-                            PackageInstaller.install(v.getContext(), downloadEntity);
+                            PackageUtils.launchSetup(v.getContext(), downloadEntity);
                         }
                     }
                     break;
                 case RESERVABLE:
-                    GamePermissionDialogFragment.show((AppCompatActivity) v.getContext(), gameEntity, gameEntity.getInfo(), () -> {
-                        CheckLoginUtils.checkLogin(progressBar.getContext(), "", () -> {
-                            ReservationHelper.reserve(v.getContext(), gameEntity.getId(), () -> {
+                    CheckLoginUtils.checkLogin(progressBar.getContext(), "", () -> {
+                        PermissionHelper.checkReadPhoneStatePermissionBeforeAction(progressBar.getContext(), () -> {
+                            ReserveDialogFragment dialogFragment = ReserveDialogFragment.getInstance(gameEntity, () -> {
                                 LogUtils.logReservation(gameEntity, traceEvent);
                                 updateReservation(progressBar, gameEntity);
                             });
+                            dialogFragment.show(((AppCompatActivity) progressBar.getContext()).getSupportFragmentManager(), "reserve");
                         });
                     });
                     break;
@@ -511,21 +416,10 @@ public class BindingAdapters {
                     }
                     break;
                 case H5_GAME:
-                    LinkEntity linkEntity = gameEntity.getH5Link();
-                    boolean isPlay = "play".equals(linkEntity.getType()); // 是否为开始玩
                     MtaHelper.onEvent("H5页面", "入口", "列表页_" + gameEntity.getName());
-
-                    if (isPlay) {
-                        HistoryHelper.insertGameEntity(gameEntity);
-                    }
-
-                    GamePermissionDialogFragment.show((AppCompatActivity) v.getContext(), gameEntity, gameEntity.getInfo(), () -> {
-                        Intent i = new Intent(WebActivity.getIntentForWebGame(progressBar.getContext(), linkEntity.getLink(), gameEntity.getName(), isPlay, linkEntity.getCloseButton()));
-                        progressBar.getContext().startActivity(i);
-                    });
-                    break;
-                case UPDATING:
-                    Utils.toast(progressBar.getContext(), "正在加急更新版本，敬请后续留意");
+                    LinkEntity linkEntity = gameEntity.getH5Link();
+                    Intent i = new Intent(WebActivity.getIntentForWebGame(progressBar.getContext(), linkEntity.getLink(), gameEntity.getName(), "play".equals(linkEntity.getType())));
+                    progressBar.getContext().startActivity(i);
                     break;
             }
         });
@@ -534,10 +428,10 @@ public class BindingAdapters {
         if (gameEntity.isReservable()) {
             if (!ReservationRepository.thisGameHasBeenReserved(gameEntity.getId())) {
                 progressBar.setText("预约");
-                progressBar.setButtonStyle(DownloadButton.ButtonStyle.RESERVABLE);
+                progressBar.setDownloadType(DownloadProgressBar.DownloadType.RESERVABLE);
             } else {
                 progressBar.setText("已预约");
-                progressBar.setButtonStyle(DownloadButton.ButtonStyle.RESERVED);
+                progressBar.setDownloadType(DownloadProgressBar.DownloadType.RESERVED);
             }
             return;
         }
@@ -552,32 +446,28 @@ public class BindingAdapters {
                 } else {
                     progressBar.setText("查看");
                 }
-                progressBar.setButtonStyle(DownloadButton.ButtonStyle.H5_GAME);
+                progressBar.setDownloadType(DownloadProgressBar.DownloadType.H5_GAME);
             } else {
                 if (offStatus != null && "dialog".equals(offStatus)) {
                     progressBar.setText("查看");
-                    progressBar.setButtonStyle(DownloadButton.ButtonStyle.NONE);
-                } else if ("updating".equals(offStatus)) {
-                    progressBar.setText("更新中");
-                    progressBar.setButtonStyle(DownloadButton.ButtonStyle.UPDATING);
                 } else {
                     progressBar.setText("暂无");
-                    progressBar.setButtonStyle(DownloadButton.ButtonStyle.NONE);
                 }
+                progressBar.setDownloadType(DownloadProgressBar.DownloadType.NONE);
             }
-
+            
         } else {
             String status = GameUtils.getDownloadBtnText(progressBar.getContext(), gameEntity, PluginLocation.only_game);
             switch (status) {
                 case "插件化":
-                    progressBar.setButtonStyle(DownloadButton.ButtonStyle.PLUGIN);
+                    progressBar.setDownloadType(DownloadProgressBar.DownloadType.PLUGIN);
                     break;
                 case "打开":
                 case "启动":
-                    progressBar.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
+                    progressBar.setDownloadType(DownloadProgressBar.DownloadType.LAUNCH_OR_OPEN);
                     break;
                 default:
-                    progressBar.setButtonStyle(DownloadButton.ButtonStyle.NORMAL);
+                    progressBar.setDownloadType(DownloadProgressBar.DownloadType.NORMAL);
                     break;
             }
             progressBar.setText(status);
@@ -585,7 +475,7 @@ public class BindingAdapters {
 
         // 显示下载过程状态
         if (gameEntity.getApk().size() == 1) {
-            DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity);
+            DownloadEntity downloadEntity = DownloadManager.getInstance(progressBar.getContext()).getDownloadEntityByUrl(gameEntity.getApk().get(0).getUrl());
             if (downloadEntity != null) {
                 progressBar.setProgress((int) (downloadEntity.getPercent() * 10));
                 switch (downloadEntity.getStatus()) {
@@ -596,27 +486,23 @@ public class BindingAdapters {
                     case waiting:
                         progressBar.setText(R.string.downloading);
                         if (downloadEntity.isPluggable() && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
-                            progressBar.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_PLUGIN);
+                            progressBar.setDownloadType(DownloadProgressBar.DownloadType.DOWNLOADING_PLUGIN);
                         } else {
-                            progressBar.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
+                            progressBar.setDownloadType(DownloadProgressBar.DownloadType.DOWNLOADING_NORMAL);
                         }
                         break;
                     case done:
                         progressBar.setText(R.string.install);
                         if (downloadEntity.isPluggable()
                                 && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
-                            progressBar.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_PLUGIN);
+                            progressBar.setDownloadType(DownloadProgressBar.DownloadType.INSTALL_PLUGIN);
                         } else {
-                            progressBar.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
+                            progressBar.setDownloadType(DownloadProgressBar.DownloadType.INSTALL_NORMAL);
                         }
                         break;
                     case cancel:
                     case hijack:
                     case notfound:
-                    case uncertificated:
-                    case unqualified:
-                    case unavailable:
-                    case banned:
                         break;
                     default:
                         break;
@@ -625,58 +511,29 @@ public class BindingAdapters {
         }
     }
 
-    /**
-     * 当页面完全重建时，若存在重建的DialogFragment，则需要手动恢复该DialogFragment之前配置的回调(因为DialogFragment重建时只会从arguments中获取之前的配置内容，
-     * 而arguments无法传递回调)，或者dismiss该DialogFragment
-     */
-    private static void restoreDialogFragment(DownloadButton progressBar) {
-        GamePermissionDialogFragment gamePermissionDialogFragment =
-                ((GamePermissionDialogFragment) ((AppCompatActivity) progressBar.getContext()).getSupportFragmentManager().findFragmentByTag(GamePermissionDialogFragment.class.getName()));
-        if (gamePermissionDialogFragment != null) {
-            gamePermissionDialogFragment.dismissAllowingStateLoss();
-        }
-    }
 
-    /*private static void download(DownloadProgressBar progressBar, GameEntity gameEntity, ExposureEvent traceEvent, @Nullable String entrance, @Nullable String location, View v) {
-        if (gameEntity.getApk().size() == 1) {
-            ApkEntity apk = gameEntity.getApk().get(0);
-            DownloadDialogHelper.findAvailableDialogAndShow(
-                    v.getContext(),
-                    gameEntity,
-                    apk,
-                    () -> {
-                        DialogUtils.checkDownload(v.getContext(), apk.getSize(),
-                                isSubscribe -> download(progressBar, gameEntity, traceEvent, isSubscribe, entrance, location));
-                    });
-        } else {
-            DownloadDialog.getInstance(v.getContext()).showPopupWindow(v, gameEntity,
-                    entrance, location + gameEntity.getName(), traceEvent);
-        }
-    }*/
-
-
-    private static void updateReservation(DownloadButton progressBar, GameEntity gameEntity) {
+    private static void updateReservation(DownloadProgressBar progressBar, GameEntity gameEntity) {
         // 显示预约
         if (gameEntity.isReservable()) {
             if (!ReservationRepository.thisGameHasBeenReserved(gameEntity.getId())) {
                 progressBar.setText("预约");
-                progressBar.setButtonStyle(DownloadButton.ButtonStyle.RESERVABLE);
+                progressBar.setDownloadType(DownloadProgressBar.DownloadType.RESERVABLE);
             } else {
                 progressBar.setText("已预约");
-                progressBar.setButtonStyle(DownloadButton.ButtonStyle.RESERVED);
+                progressBar.setDownloadType(DownloadProgressBar.DownloadType.RESERVED);
             }
         }
     }
 
 
     // 开始下载
-    private static void download(DownloadButton progressBar,
+    private static void download(DownloadProgressBar progressBar,
                                  GameEntity gameEntity,
                                  ExposureEvent traceEvent,
                                  boolean isSubscribe,
                                  String entrance,
                                  String location) {
-        String str = progressBar.getText().toString();
+        String str = progressBar.getText();
         String method;
         if (str.contains("更新")) {
             method = "更新";
@@ -688,6 +545,11 @@ public class BindingAdapters {
         ApkEntity apkEntity = gameEntity.getApk().get(0);
         String msg = FileUtils.isCanDownload(progressBar.getContext(), apkEntity.getSize());
         if (TextUtils.isEmpty(msg)) {
+            DataUtils.onGameDownloadEvent(progressBar.getContext(), gameEntity.getName(), apkEntity.getPlatform(), entrance, "下载开始", method);
+    
+            ExposureUtils.DownloadType downloadType = ExposureUtils.getDownloadType(apkEntity, method);
+            ExposureEvent downloadExposureEvent = ExposureUtils.logADownloadExposureEvent(gameEntity, apkEntity.getPlatform(), traceEvent, downloadType);
+    
             DownloadManager.createDownload(progressBar.getContext(),
                     apkEntity,
                     gameEntity,
@@ -695,107 +557,59 @@ public class BindingAdapters {
                     entrance,
                     location + gameEntity.getName(),
                     isSubscribe,
-                    traceEvent);
+                    downloadExposureEvent);
 
             progressBar.setProgress(0);
-            progressBar.setButtonStyle("插件化".equals(method) ?
-                    DownloadButton.ButtonStyle.DOWNLOADING_PLUGIN : DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
+            progressBar.setDownloadType("插件化".equals(method) ?
+                    DownloadProgressBar.DownloadType.DOWNLOADING_PLUGIN : DownloadProgressBar.DownloadType.DOWNLOADING_NORMAL);
         } else {
             Utils.toast(progressBar.getContext(), msg);
         }
     }
 
-    public static void setGameLabelList(LinearLayout layout, List<TagStyleEntity> tagStyle) {
-        GameViewUtils.setLabelList(layout.getContext(), layout, tagStyle);
-    }
+    @BindingAdapter({"gameLabelList", "subjectTag"})
+    public static void setGameLabelList(LinearLayout layout, GameEntity gameEntity, String subjectTag) {
+        if (gameEntity == null) return;
+        if (gameEntity.getTest() != null) {
+            layout.removeAllViews();
+            View testView = LayoutInflater.from(layout.getContext()).inflate(R.layout.game_test_label, null);
+            TextView testType = testView.findViewById(R.id.test_type);
+            TextView testTime = testView.findViewById(R.id.test_time);
+            testType.setText(gameEntity.getTest().getType());
+            testType.setBackgroundColor(ContextCompat.getColor(layout.getContext(), R.color.tag_yellow));
 
-    // 包含测试开服标签
-    public static void setGameTags(LinearLayout layout, GameEntity gameEntity) {
-        try {
-            if (layout.getVisibility() == View.GONE) return;
-            ArrayList<TagStyleEntity> tagStyle = new ArrayList<>();
-            TestEntity test = gameEntity.getTest();
-            if (test != null
-                    // 这个判断用于开测表列表
-                    && !"type_tag".equals(test.getGameTag())) {
-                if ("custom".equals(test.getGameTag())) {
-                    TagStyleEntity typeTag = new TagStyleEntity();
-                    if (!TextUtils.isEmpty(test.getText())) {
-                        typeTag.setName(test.getText() != null ? test.getText() : "");
-                    } else {
-                        typeTag.setName(test.getType() != null ? test.getType() : "");
-                    }
-                    typeTag.setBackground("E8F3FF");
-                    typeTag.setColor("1383EB");
-                    tagStyle.add(typeTag);
-                } else {
-                    TagStyleEntity typeTag = new TagStyleEntity();
-                    boolean isDarkModeOn = DarkModeUtils.INSTANCE.isDarkModeOn(layout.getContext());
-                    typeTag.setName(test.getType() != null ? test.getType() : "");
-                    typeTag.setBackground("1AFFA142");
-                    typeTag.setColor(isDarkModeOn ? "EB9238" : "FFA142");
-                    tagStyle.add(typeTag);
-
-                    TagStyleEntity timeTag = new TagStyleEntity();
-                    timeTag.setName(GameViewUtils.getGameTestDate(test.getStart()));
-                    timeTag.setBackground("1A06CEA8");
-                    timeTag.setColor(isDarkModeOn ? "07A385" : "06CEA8");
-                    tagStyle.add(timeTag);
-                }
+            if (gameEntity.getTest().getStart() == 0) {
+                testTime.setVisibility(View.GONE);
             } else {
-                tagStyle = gameEntity.getTagStyle();
+                testTime.setText(GameViewUtils.getGameTestDate(gameEntity.getTest().getStart()));
             }
-            GameViewUtils.setLabelList(layout.getContext(), layout, tagStyle);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    public static void setVideoDetailGameTags(LinearLayout layout, GameEntity gameEntity) {
-        try {
-            ArrayList<TagStyleEntity> tagStyle = new ArrayList<>();
-            TestEntity test = gameEntity.getTest();
-            if (test != null
-                    // 这个判断用于开测表列表
-                    && !"type_tag".equals(test.getGameTag())) {
-                TagStyleEntity typeTag = new TagStyleEntity();
-                typeTag.setName(test.getType() != null ? test.getType() : "");
-                typeTag.setBackground("FFF3E0");
-                typeTag.setColor("FA8500");
-                tagStyle.add(typeTag);
-
-                TagStyleEntity timeTag = new TagStyleEntity();
-                timeTag.setName(GameViewUtils.getGameTestDate(test.getStart()));
-                timeTag.setBackground("E0FFF9");
-                timeTag.setColor("00A887");
-                tagStyle.add(timeTag);
-            } else {
-                tagStyle = gameEntity.getTagStyle();
-            }
-            GameViewUtils.setLabelList(layout.getContext(), layout, tagStyle, 4);
-        } catch (Exception e) {
-            e.printStackTrace();
+            layout.addView(testView);
+        } else {
+            GameViewUtils.setLabelList(layout.getContext(), layout, gameEntity.getTag(), subjectTag, gameEntity.getTagStyle());
         }
+
     }
 
+    @BindingAdapter("isRefreshing")
     public static void isRefreshing(SwipeRefreshLayout layout, LoadStatus status) {
         if (status != LoadStatus.INIT_LOADING && status != LoadStatus.LIST_LOADING) {
             layout.setRefreshing(false);
         }
     }
 
-    public static void setGameName(TextView view, GameEntity game, boolean isShowPlatform, @Nullable Boolean isShowSuffix) {
-        if (isShowSuffix == null) isShowSuffix = true; // 默认显示
+    @BindingAdapter({"setGameName", "isShowPlatform"})
+    public static void setGameName(TextView view, GameEntity game, boolean isShowPlatform) {
         if (isShowPlatform && game.getApk().size() > 0) {
-            view.setText(String.format("%s - %s", !isShowSuffix ? game.getNameWithoutSuffix() : game.getName(),
+            view.setText(String.format("%s - %s", game.getName(),
                     PlatformUtils.getInstance(view.getContext()).getPlatformName(
                             game.getApk().get(0).getPlatform())));
         } else {
-            view.setText(!isShowSuffix ? game.getNameWithoutSuffix() : game.getName());
+            view.setText(game.getName());
         }
 
     }
 
+    @BindingAdapter({"setCommunityImage", "setCommunityVideoImage"})
     public static void setCommunityImage(SimpleDraweeView imageView, List<String> images, List<CommunityVideoEntity> videos) {
         if (videos.size() > 0) {
             CommunityVideoEntity videoEntity = videos.get(0);
@@ -809,10 +623,11 @@ public class BindingAdapters {
         }
     }
 
+    @BindingAdapter({"setCommunityVideoDuration"})
     public static void setCommunityVideoDuration(TextView mVideoDuration, List<CommunityVideoEntity> videos) {
         if (videos != null && videos.size() > 0) {
             CommunityVideoEntity videoEntity = videos.get(0);
-            mVideoDuration.setBackground(DrawableView.getOvalDrawable(R.color.black_alpha_50, 999F));
+            mVideoDuration.setBackground(DrawableView.getOvalDrawable(R.color.black_alpha_80, 999F));
             mVideoDuration.setText(videoEntity.getDuration());
             mVideoDuration.setVisibility(View.VISIBLE);
         } else {
@@ -820,6 +635,7 @@ public class BindingAdapters {
         }
     }
 
+    @BindingAdapter({"setGameTags", "setMaxGameTags"})
     public static void setGameTags(TextView view, List<TagStyleEntity> tags, int maxTags) {
         if (tags == null) {
             view.setText("");
@@ -847,16 +663,4 @@ public class BindingAdapters {
         }
         view.setText(span);
     }
-
-    public static void setVideoData(TextView view, int count) {
-        if (count > 0) {
-            view.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(view.getContext(), R.drawable.ic_video_data_up), null, null, null);
-            view.setTextColor(ContextCompat.getColor(view.getContext(), R.color.text_EA3333));
-            view.setText(count + "");
-        } else {
-            view.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null);
-            view.setTextColor(ContextCompat.getColor(view.getContext(), R.color.text_subtitleDesc));
-            view.setText("-");
-        }
-    }
 }

app/src/main/java/com/gh/common/dialog/ApplyModeratorDialogFragment.kt

@@ -1,100 +0,0 @@
-package com.gh.common.dialog
-
-import android.app.Activity
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.appcompat.app.AppCompatActivity
-import com.gh.common.util.DirectUtils
-import com.gh.gamecenter.R
-import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
-import com.gh.gamecenter.common.constant.EntranceConsts
-import com.gh.gamecenter.common.utils.dip2px
-import com.gh.gamecenter.common.view.CustomLinkMovementMethod
-import com.gh.gamecenter.core.utils.SpanBuilder
-import com.gh.gamecenter.databinding.DialogApplyModeratorBinding
-
-
-class ApplyModeratorDialogFragment : BaseDialogFragment() {
-    private lateinit var binding: DialogApplyModeratorBinding
-    private var mGroupNumber = ""
-    private var mGroupKey = ""
-    private var mParentTag = ""
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        requireArguments().run {
-            mGroupNumber = getString(KEY_GROUP_NUMBER) ?: ""
-            mGroupKey = getString(KEY_GROUP_KEY) ?: ""
-            mParentTag = getString(EntranceConsts.KEY_PARENT_TAG) ?: ""
-        }
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        binding = DialogApplyModeratorBinding.inflate(inflater, container, false)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        val startText = "版主考核群："
-        val text = "$startText$mGroupNumber\n感谢你对论坛建设的支持\n请加入版主考核群并联系群主进行版主资格考核"
-        binding.desTv.text = SpanBuilder(text)
-            .click(
-                requireContext(),
-                startText.length,
-                startText.length + mGroupNumber.length,
-                R.color.theme_font,
-                true
-            ) {
-                DirectUtils.directToQqGroup(
-                    requireContext(),
-                    mGroupKey
-                )
-            }
-            .build()
-        binding.desTv.movementMethod = CustomLinkMovementMethod.getInstance()
-        binding.confirmTv.setOnClickListener {
-            dismissAllowingStateLoss()
-            activity?.supportFragmentManager?.findFragmentByTag(mParentTag)
-                ?.onActivityResult(REQUEST_CODE, Activity.RESULT_OK, null)
-        }
-    }
-
-    override fun onStart() {
-        super.onStart()
-        val width = requireContext().resources.displayMetrics.widthPixels - 60F.dip2px()
-        val height = ViewGroup.LayoutParams.WRAP_CONTENT
-        dialog?.window?.setLayout(width, height)
-    }
-
-    companion object {
-        const val KEY_GROUP_NUMBER = "group_number"
-        const val KEY_GROUP_KEY = "group_key"
-        const val REQUEST_CODE = 1103
-
-        @JvmStatic
-        fun show(
-            activity: AppCompatActivity,
-            number: String,
-            key: String,
-            tag: String
-        ) {
-            ApplyModeratorDialogFragment().apply {
-                arguments = Bundle().apply {
-                    putString(KEY_GROUP_NUMBER, number)
-                    putString(KEY_GROUP_KEY, key)
-                    putString(EntranceConsts.KEY_PARENT_TAG, tag)
-                }
-            }.show(
-                activity.supportFragmentManager,
-                ApplyModeratorDialogFragment::class.java.name
-            )
-        }
-    }
-}

app/src/main/java/com/gh/common/dialog/BaseTrackableDialogFragment.kt

@@ -0,0 +1,62 @@
+package com.gh.common.dialog
+
+import android.content.DialogInterface
+import android.os.Bundle
+import android.view.KeyEvent
+import android.view.View
+import com.gh.common.util.MtaHelper
+import com.lightgame.dialog.BaseDialogFragment
+import java.util.concurrent.atomic.AtomicBoolean
+
+/**
+ * 对 dialog 操作进行 MTA 事件记录的 dialog fragment
+ */
+abstract class BaseTrackableDialogFragment : BaseDialogFragment() {
+
+    abstract fun getEvent(): String
+    abstract fun getKey(): String
+
+    // 区分此 dialog 是点击 dialog 外部取消的还是点击返回取消的
+    private val mIsCanceledByClickOutsideOfDialog = AtomicBoolean(true)
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        if (getEvent().isEmpty()) {
+            throw IllegalStateException("需要提供非空的 Event 来供 MTA 进行事件记录")
+        }
+
+        if (getKey().isEmpty()) {
+            throw IllegalStateException("需要提供非空的 Key 来供 MTA 进行事件记录")
+        }
+
+        onEvent("出现弹窗")
+
+        dialog?.setCanceledOnTouchOutside(true)
+        dialog?.setOnKeyListener { _, keyCode, event ->
+            if (keyCode == KeyEvent.KEYCODE_BACK && event.action == KeyEvent.ACTION_UP) {
+                mIsCanceledByClickOutsideOfDialog.set(false)
+                onEvent("点击返回")
+            }
+            false
+        }
+    }
+
+    fun onEvent(value: String) {
+        if (trackWithBasicDeviceInfo()) {
+            MtaHelper.onEventWithBasicDeviceInfo(getEvent(), getKey(), value)
+        } else {
+            MtaHelper.onEvent(getEvent(), getKey(), value)
+        }
+    }
+
+    override fun onCancel(dialog: DialogInterface) {
+        super.onCancel(dialog)
+        if (mIsCanceledByClickOutsideOfDialog.get()) {
+            onEvent("点击空白")
+        }
+    }
+
+    open fun trackWithBasicDeviceInfo() = false
+
+}

app/src/main/java/com/gh/common/dialog/CertificationDialog.kt

@@ -1,204 +0,0 @@
-package com.gh.common.dialog
-
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.app.Dialog
-import android.content.Context
-import android.content.Intent
-import android.graphics.Color
-import android.graphics.Paint
-import android.graphics.drawable.ColorDrawable
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.widget.CheckBox
-import android.widget.TextView
-import androidx.appcompat.app.AppCompatActivity
-import com.gh.gamecenter.common.avoidcallback.AvoidOnResultManager
-import com.gh.gamecenter.common.avoidcallback.Callback
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.common.util.*
-import com.gh.gamecenter.R
-import com.gh.gamecenter.ShellActivity
-import com.gh.gamecenter.common.callback.ConfirmListener
-import com.gh.gamecenter.common.constant.EntranceConsts
-import com.gh.gamecenter.core.utils.GsonUtils
-import com.gh.gamecenter.core.utils.SPUtils
-import com.gh.gamecenter.entity.AuthDialogEntity
-import com.gh.gamecenter.entity.AuthDialogLevel
-import com.gh.gamecenter.entity.GameEntity
-import com.gh.gamecenter.login.user.UserManager
-import com.google.gson.reflect.TypeToken
-import com.halo.assistant.fragment.user.UserInfoEditFragment
-import com.lightgame.utils.AppManager
-
-class CertificationDialog(
-    context: Context,
-    private val authDialogEntity: AuthDialogEntity,
-    val gameId: String,
-    val listener: ConfirmListener
-) :
-    Dialog(context, R.style.GhAlertDialog) {
-
-    private lateinit var view: View
-    private lateinit var detailedDesTv: TextView
-    private lateinit var noRemindAgainCb: CheckBox
-    private lateinit var actionLeftTv: TextView
-    private lateinit var actionRightTv: TextView
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-        view = LayoutInflater.from(context).inflate(R.layout.dialog_sertification, null)
-        setContentView(view)
-        detailedDesTv = view.findViewById(R.id.detailedDesTv)
-        noRemindAgainCb = view.findViewById(R.id.noRemindAgainCb)
-        actionLeftTv = view.findViewById(R.id.actionLeftTv)
-        actionRightTv = view.findViewById(R.id.actionRightTv)
-
-        detailedDesTv.paint.flags = Paint.UNDERLINE_TEXT_FLAG
-        detailedDesTv.paint.isAntiAlias = true
-
-        detailedDesTv.setOnClickListener {
-            DirectUtils.directToWebView(context, authDialogEntity.link)
-        }
-
-        when (authDialogEntity.level) {
-            AuthDialogLevel.MUST_PASS.value -> {
-                actionLeftTv.text = "暂不下载"
-                actionRightTv.text = "去实名认证"
-                noRemindAgainCb.visibility = View.GONE
-                actionLeftTv.setOnClickListener {
-                    dismiss()
-                }
-                actionRightTv.setOnClickListener {
-                    if (UserManager.getInstance().isLoggedIn) {
-                        gotoAuthPage()
-                    } else {
-                        gotoLoginPage()
-                    }
-                }
-            }
-            AuthDialogLevel.ALWAYS_HINT.value -> {
-                actionLeftTv.text = "去实名认证"
-                actionRightTv.text = "继续下载"
-                noRemindAgainCb.visibility = View.GONE
-                actionLeftTv.setOnClickListener {
-                    if (UserManager.getInstance().isLoggedIn) {
-                        gotoAuthPage()
-                    } else {
-                        gotoLoginPage()
-                    }
-                }
-                actionRightTv.setOnClickListener {
-                    listener.onConfirm()
-                    dismiss()
-                }
-            }
-            AuthDialogLevel.OPTIONAL_HINT.value -> {
-                actionLeftTv.text = "去实名认证"
-                actionRightTv.text = "继续下载"
-                noRemindAgainCb.visibility = View.VISIBLE
-                actionLeftTv.setOnClickListener {
-                    if (noRemindAgainCb.isChecked) {
-                        SPUtils.setBoolean(gameId, true)
-                    }
-                    if (UserManager.getInstance().isLoggedIn) {
-                        gotoAuthPage()
-                    } else {
-                        gotoLoginPage()
-                    }
-                }
-                actionRightTv.setOnClickListener {
-                    if (noRemindAgainCb.isChecked) {
-                        SPUtils.getBoolean(gameId, true)
-                    }
-                    listener.onConfirm()
-                    dismiss()
-                }
-            }
-        }
-    }
-
-    //跳转登录页面
-    private fun gotoLoginPage() {
-        val currentActivity = AppManager.getInstance().currentActivity() ?: return
-
-        CheckLoginUtils.checkLogin(
-            currentActivity as AppCompatActivity,
-            null, true, "实名认证弹窗"
-        ) {
-            if (UserManager.getInstance().isAuth) {
-                listener.onConfirm()
-                dismiss()
-            }
-        }
-    }
-
-    //跳转实名认证页面
-    private fun gotoAuthPage() {
-        val currentActivity = AppManager.getInstance().currentActivity() ?: return
-
-        AvoidOnResultManager.getInstance(currentActivity as AppCompatActivity)
-            .startForResult(
-                ShellActivity.getIntent(
-                    context,
-                    ShellActivity.Type.REAL_NAME_INFO,
-                ).apply {
-                    putExtra(EntranceConsts.KEY_GAME_ID, gameId)
-                }, object : Callback {
-                    override fun onActivityResult(resultCode: Int, data: Intent?) {
-                        if (resultCode == Activity.RESULT_OK && data != null) {
-                            val isAuthSuccess =
-                                data.getBooleanExtra(UserInfoEditFragment.AUTH_SUCCESS, false)
-                            if (isAuthSuccess) {
-                                listener.onConfirm()
-                                dismiss()
-                            }
-                        }
-                    }
-                })
-    }
-
-
-    companion object {
-        @JvmStatic
-        fun showCertificationDialog(context: Context, game: GameEntity, listener: ConfirmListener) {
-            //1.先判断是否登录 是执行2 否执行3
-            //2.判断是否实名认证 是终止 否执行3
-            //3.判断是否需要弹出认证弹窗接口
-            if (UserManager.getInstance().isLoggedIn) {
-                if (UserManager.getInstance().isAuth) {//已实名认证
-                    listener.onConfirm()
-                } else {
-                    authDialog(context, game, listener)
-                }
-            } else {
-                authDialog(context, game, listener)
-            }
-        }
-
-        @SuppressLint("CheckResult")
-        private fun authDialog(context: Context, game: GameEntity, listener: ConfirmListener) {
-            var authDialog: AuthDialogEntity? = null
-            if (game.authDialog != null) {
-                authDialog = game.authDialog
-            }
-            if (authDialog == null) {
-                val datas = SPUtils.getString(Constants.SP_AUTH_DIALOG)
-                val type = object : TypeToken<List<AuthDialogEntity>>() {}.type
-                val authDialogs = GsonUtils.gson.fromJson<List<AuthDialogEntity>>(datas, type)
-                if (!authDialogs.isNullOrEmpty()) {
-                    authDialog = authDialogs.find { it.gameCategory == game.category }
-                }
-            }
-            val isCloseAuthDialog = SPUtils.getBoolean(game.id, false)
-            if (authDialog != null && (authDialog.level != AuthDialogLevel.OPTIONAL_HINT.value || !isCloseAuthDialog)) {
-                val dialog = CertificationDialog(context, authDialog, game.id, listener)
-                dialog.show()
-            } else {
-                listener.onConfirm()
-            }
-        }
-    }
-}

app/src/main/java/com/gh/common/dialog/DeviceRemindDialog.kt

@@ -1,248 +0,0 @@
-package com.gh.common.dialog
-
-import android.app.Dialog
-import android.content.Context
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
-import android.os.Build
-import android.os.Bundle
-import android.os.Handler
-import android.os.Message
-import android.view.LayoutInflater
-import android.view.MotionEvent
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.LinearLayout
-import androidx.core.content.ContextCompat
-import androidx.recyclerview.widget.RecyclerView
-import androidx.viewpager2.widget.ViewPager2
-import com.facebook.drawee.view.SimpleDraweeView
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.download.DownloadManager
-import com.gh.gamecenter.R
-import com.gh.gamecenter.core.utils.GsonUtils
-import com.gh.gamecenter.core.utils.SPUtils
-import com.gh.gamecenter.common.utils.countDownTimer
-import com.gh.gamecenter.core.utils.DisplayUtils
-import com.gh.gamecenter.common.utils.ImageUtils
-import com.gh.gamecenter.databinding.DialogDeviceRemindBinding
-import com.gh.gamecenter.entity.DeviceDialogEntity
-import com.gh.gamecenter.entity.GameEntity
-import com.google.gson.reflect.TypeToken
-import com.gh.gamecenter.setting.GameDownloadSettingFragment.Companion.AUTO_INSTALL_SP_KEY
-import com.lightgame.download.DataWatcher
-import com.lightgame.download.DownloadEntity
-import com.lightgame.download.DownloadStatus
-import io.reactivex.disposables.Disposable
-import java.lang.ref.WeakReference
-
-/**
- * 设备提醒弹窗
- */
-class DeviceRemindDialog(context: Context, val entity: DeviceDialogEntity, val gameEntity: GameEntity) :
-    Dialog(context, R.style.GhAlertDialog) {
-    private val mBinding: DialogDeviceRemindBinding by lazy { DialogDeviceRemindBinding.inflate(layoutInflater) }
-    private var currentPage = 0
-    private var mSlideLooperInterval = 3000L
-    private lateinit var mLooperHandle: LooperHandle
-    private lateinit var mAdapter: BannerAdapter
-    private var mDatas: ArrayList<String> = ArrayList()
-    private val mSlideLooperKey = 100
-    private var disposable: Disposable? = null
-    private val dataWatcher = object : DataWatcher() {
-        override fun onDataChanged(downloadEntity: DownloadEntity) {
-            if (downloadEntity.status == DownloadStatus.done && downloadEntity.name == gameEntity.name) {
-                val autoInstall = SPUtils.getBoolean(AUTO_INSTALL_SP_KEY, true)
-                if (autoInstall) {
-                    dismiss()
-                }
-            }
-        }
-    }
-
-    companion object {
-        fun showDeviceRemindDialog(context: Context, gameEntity: GameEntity) {
-            val datas = SPUtils.getString(Constants.SP_DEVICE_REMIND)
-            if (datas.isNotEmpty()) {
-                val pair = shouldShowDeviceRemindDialog(gameEntity)
-                if (pair.first) {
-                    val dialog = DeviceRemindDialog(context, pair.second!!, gameEntity)
-                    dialog.show()
-                }
-            }
-        }
-
-        fun shouldShowDeviceRemindDialog(gameEntity: GameEntity): Pair<Boolean, DeviceDialogEntity?> {
-            val datas = SPUtils.getString(Constants.SP_DEVICE_REMIND)
-            if (datas.isNotEmpty()) {
-                val type = object : TypeToken<List<DeviceDialogEntity>>() {}.type
-                val entities = GsonUtils.gson.fromJson<List<DeviceDialogEntity>>(datas, type)
-                //1.判断设备是否匹配
-                val entity =
-                    entities.find { it.manufacturer.toLowerCase().startsWith(Build.MANUFACTURER.toLowerCase()) }
-                        ?: return Pair(false, null)
-                //2.判断游戏不含剔除标签
-                gameEntity.tagStyle.forEach {
-                    if (entity.excludeTags.contains(it.name)) {
-                        return Pair(false, null)
-                    }
-                }
-                //3.不再弹出提示判断
-                val isNoRemindAgain = SPUtils.getBoolean(Constants.SP_NO_REMIND_AGAIN, false)
-                if (isNoRemindAgain) return Pair(false, null)
-                return Pair(true, entity)
-            }
-            return Pair(false, null)
-        }
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-        setContentView(mBinding.root)
-        mDatas.addAll(entity.gallery)
-        mBinding.titleTv.text = entity.title
-        mBinding.contentTv.text = entity.content
-
-        mBinding.bannerView.apply {
-            orientation = ViewPager2.ORIENTATION_HORIZONTAL
-            mAdapter = BannerAdapter()
-            val recyclerView = getChildAt(0) as RecyclerView
-            recyclerView.overScrollMode = RecyclerView.OVER_SCROLL_NEVER
-            registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
-                override fun onPageSelected(position: Int) {
-                    super.onPageSelected(position)
-                    currentPage = position
-                    slideIndicator(currentPage % mDatas.size)
-                }
-            })
-            recyclerView.addOnItemTouchListener(object : RecyclerView.SimpleOnItemTouchListener() {
-                override fun onInterceptTouchEvent(rv: RecyclerView, e: MotionEvent): Boolean {
-                    val isStop = e.action == MotionEvent.ACTION_DOWN || e.action == MotionEvent.ACTION_MOVE
-                    if (isStop) mAdapter.stopScroll() else mAdapter.startScroll()
-                    return false
-                }
-            })
-            adapter = mAdapter
-            mLooperHandle = LooperHandle(mAdapter)
-            currentPage = (adapter as BannerAdapter).getActualFirstPositionInCenter()
-            setCurrentItem(currentPage, false)
-            if (mDatas.size > 1) {
-                addIndicator()
-                slideIndicator(currentPage % mDatas.size)
-                autoPlay()
-            }
-        }
-        val isFirst = SPUtils.getBoolean(Constants.SP_FIRST_DEVICE_REMIND, false)
-        if (!isFirst) {
-            mBinding.cancelTv.isEnabled = false
-            mBinding.cancelTv.background = ContextCompat.getDrawable(context, R.drawable.button_round_f5f5f5)
-            disposable = countDownTimer(3) { finish, time ->
-                if (finish) {
-                    mBinding.cancelTv.isEnabled = true
-                    mBinding.cancelTv.background = ContextCompat.getDrawable(context, R.drawable.button_blue_oval)
-                    mBinding.cancelTv.text = "我知道了"
-                    mBinding.cancelTv.setTextColor(ContextCompat.getColor(context, R.color.white))
-                } else {
-                    mBinding.cancelTv.text = "我知道了(${time}S)"
-                }
-            }
-
-            SPUtils.setBoolean(Constants.SP_FIRST_DEVICE_REMIND, true)
-        } else {
-            mBinding.noRemindAgainCb.visibility = View.VISIBLE
-            mBinding.cancelTv.text = "我知道了"
-            mBinding.cancelTv.isEnabled = true
-            mBinding.cancelTv.setTextColor(ContextCompat.getColor(context, R.color.white))
-            mBinding.cancelTv.background = ContextCompat.getDrawable(context, R.drawable.button_blue_oval)
-        }
-        mBinding.cancelTv.setOnClickListener {
-            SPUtils.setBoolean(Constants.SP_NO_REMIND_AGAIN, mBinding.noRemindAgainCb.isChecked)
-            dismiss()
-        }
-        DownloadManager.getInstance().addObserver(dataWatcher)
-    }
-
-    private fun addIndicator() {
-        mBinding.indicatorLl.removeAllViews()
-        mDatas.forEach { _ ->
-            val indicatorView = ImageView(context).apply {
-                setImageResource(R.drawable.selector_device_remind_indicator)
-                val params = LinearLayout.LayoutParams(DisplayUtils.dip2px(8F), LinearLayout.LayoutParams.WRAP_CONTENT)
-                params.leftMargin = DisplayUtils.dip2px(1F)
-                params.rightMargin = DisplayUtils.dip2px(1F)
-                layoutParams = params
-            }
-            mBinding.indicatorLl.addView(indicatorView)
-        }
-    }
-
-    private fun slideIndicator(position: Int) {
-        for (i in 0 until mBinding.indicatorLl.childCount) {
-            val childAt = mBinding.indicatorLl.getChildAt(i)
-            childAt.isSelected = i == position
-        }
-    }
-
-    private fun autoPlay() {
-        mAdapter.startScroll()
-    }
-
-    inner class BannerAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-            return object : RecyclerView.ViewHolder(
-                LayoutInflater.from(context).inflate(R.layout.item_device_remind_banner, parent, false)
-            ) {}
-        }
-
-        override fun getItemCount(): Int = if (mDatas.size == 1) mDatas.size else Int.MAX_VALUE
-
-        override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-            val data = mDatas[position % mDatas.size]
-            val view = holder.itemView as SimpleDraweeView
-            ImageUtils.display(view, data)
-        }
-
-        fun getActualFirstPositionInCenter(): Int {
-            if (mDatas.size == 1) return 0
-            var index = itemCount / 2
-            if (index % mDatas.size != 0) {
-                index -= (index % mDatas.size)
-            }
-            return index
-        }
-
-        fun scrollToNextPage() {
-            currentPage++
-            mBinding.bannerView.setCurrentItem(currentPage, true)
-        }
-
-        fun startScroll() {
-            mLooperHandle.removeMessages(mSlideLooperKey)
-            mLooperHandle.sendEmptyMessageDelayed(mSlideLooperKey, mSlideLooperInterval)
-        }
-
-        fun stopScroll() {
-            mLooperHandle.removeMessages(mSlideLooperKey)
-        }
-    }
-
-    class LooperHandle(val mAdapter: BannerAdapter) : Handler() {
-        private val mWeakReference: WeakReference<BannerAdapter> = WeakReference(mAdapter)
-        override fun handleMessage(msg: Message) {
-            val adapter = mWeakReference.get()
-            adapter?.scrollToNextPage()
-            adapter?.startScroll()
-        }
-    }
-
-    override fun onDetachedFromWindow() {
-        super.onDetachedFromWindow()
-        if (disposable != null && !disposable!!.isDisposed) {
-            disposable!!.dispose()
-            disposable = null
-        }
-        DownloadManager.getInstance().removeObserver(dataWatcher)
-    }
-}

app/src/main/java/com/gh/common/dialog/GameOffServiceDialogFragment.kt

@@ -1,6 +1,5 @@
 package com.gh.common.dialog
 
-import android.app.Dialog
 import android.graphics.Paint
 import android.os.Bundle
 import android.util.TypedValue
@@ -9,84 +8,62 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.core.content.ContextCompat
 import androidx.core.text.HtmlCompat
-import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
 import com.gh.common.util.DirectUtils
-import com.gh.gamecenter.common.utils.dip2px
-import com.gh.gamecenter.common.utils.toColor
+import com.gh.common.util.DisplayUtils
+import com.gh.common.util.MtaHelper
 import com.gh.gamecenter.R
-import com.gh.gamecenter.databinding.DialogGameOffServiceBinding
 import com.gh.gamecenter.entity.GameEntity
+import kotlinx.android.synthetic.main.dialog_game_off_service.*
 
 // 游戏关闭下载弹窗
-class GameOffServiceDialogFragment : BaseDialogFragment() {
-
+class GameOffServiceDialogFragment : BaseTrackableDialogFragment() {
     private var mDialog: GameEntity.Dialog? = null
-    private var mBinding: DialogGameOffServiceBinding? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        mDialog = requireArguments().getParcelable(KEY_DIALOG)
-    }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return DialogGameOffServiceBinding
-            .inflate(inflater)
-            .apply { mBinding = this }
-            .root
+        return inflater.inflate(R.layout.dialog_game_off_service, null)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        mBinding?.run {
-            mDialog?.run {
-                titleTv.text = title
-                contentTv.text = HtmlCompat.fromHtml(content, HtmlCompat.FROM_HTML_MODE_LEGACY)
-                okTv.setOnClickListener {
-                    dismissAllowingStateLoss()
+        mDialog?.run {
+            titleTv.text = title
+            contentTv.text = HtmlCompat.fromHtml(content, HtmlCompat.FROM_HTML_MODE_LEGACY)
+
+            for (site in sites) {
+                val siteTv = TextView(context)
+                siteTv.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply {
+                    topMargin = DisplayUtils.dip2px(12f)
+                }
+                siteTv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14f)
+                siteTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.theme))
+                siteTv.text = site.text
+                siteTv.paintFlags = siteTv.paintFlags or Paint.UNDERLINE_TEXT_FLAG
+                siteTv.setOnClickListener {
+                    MtaHelper.onEvent("游戏下载状态按钮", getKey(), site.text)
+                    DirectUtils.directToWebView(requireContext(), site.url, "(关闭下载弹窗)")
+                    dismiss()
                 }
 
-                // 过滤内容为空的元素
-                val notEmptySite = sites.filter { it.text.isNotBlank() }
-
-                notEmptySite.forEachIndexed { index, site ->
-                    val siteTv = TextView(context)
-                    siteTv.layoutParams = LinearLayout.LayoutParams(
-                        ViewGroup.LayoutParams.WRAP_CONTENT,
-                        ViewGroup.LayoutParams.WRAP_CONTENT
-                    ).apply {
-                        topMargin = 24F.dip2px()
-                        if (index == notEmptySite.size - 1) bottomMargin = 8F.dip2px()
-                    }
-                    siteTv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14F)
-                    siteTv.setTextColor(R.color.theme_font.toColor(requireContext()))
-                    siteTv.text = site.text
-                    siteTv.paintFlags = siteTv.paintFlags or Paint.UNDERLINE_TEXT_FLAG
-                    siteTv.setOnClickListener {
-                        //                    MtaHelper.onEvent("游戏下载状态按钮", getKey(), site.text)
-                        DirectUtils.directToWebView(requireContext(), site.url, "(关闭下载弹窗)")
-                        dismissAllowingStateLoss()
-                    }
-
-                    container.addView(siteTv)
-                }
+                container.addView(siteTv)
             }
         }
     }
 
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        return super.onCreateDialog(savedInstanceState).apply { setCanceledOnTouchOutside(true) }
+    override fun getEvent(): String {
+        return "游戏下载状态按钮"
+    }
+
+    override fun getKey(): String {
+        return "查看详情弹窗"
     }
 
     companion object {
-        const val KEY_DIALOG = "dialog"
-
         @JvmStatic
         fun getInstance(dialog: GameEntity.Dialog) = GameOffServiceDialogFragment().apply {
-            arguments = Bundle().apply {
-                putParcelable(KEY_DIALOG, dialog)
-            }
+            mDialog = dialog
         }
     }
 

app/src/main/java/com/gh/common/dialog/InstallPermissionDialogFragment.kt

@@ -1,143 +0,0 @@
-package com.gh.common.dialog
-
-import android.app.Activity.RESULT_OK
-import android.content.Intent
-import android.os.Build
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.appcompat.app.AppCompatActivity
-import androidx.fragment.app.FragmentTransaction
-import com.airbnb.lottie.LottieAnimationView
-import com.gh.common.constant.Config
-import com.gh.common.xapk.XapkInstaller
-import com.gh.gamecenter.R
-import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.utils.PermissionHelper
-import com.gh.gamecenter.common.utils.PermissionHelper.INSTALL_PERMISSION_CODE
-import com.gh.gamecenter.common.utils.getExtension
-import com.gh.gamecenter.common.utils.goneIf
-import com.gh.gamecenter.core.utils.SPUtils
-import com.lightgame.download.DownloadEntity
-import com.lightgame.utils.Utils
-import kotlin.random.Random
-
-class InstallPermissionDialogFragment : BaseDialogFragment() {
-
-    lateinit var mView: View
-    var isXapk = false
-    var url: String = ""
-    var mCallBack: ((isFromPermissionGrantedCallback: Boolean) -> Unit)? = null
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        mView = inflater.inflate(R.layout.dialog_install_permission, null, false)
-        return mView
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        val closeTv = mView.findViewById<TextView>(R.id.closeTv)
-        val closeIv = mView.findViewById<ImageView>(R.id.closeIv)
-        val activateTv = mView.findViewById<TextView>(R.id.activateTv)
-        val contentTv = mView.findViewById<TextView>(R.id.contentTv)
-        val switchLottie = mView.findViewById<LottieAnimationView>(R.id.switchLottie)
-        contentTv.text = if (isXapk) "未授权下解压XAPK可能导致解压失败" else "以保证游戏的安装和更新"
-
-        switchLottie.setAnimation("lottie/install_permission_switch.json")
-        switchLottie.playAnimation()
-
-        val randomNumber = if (isXapk) 1 else Random.nextInt(2)
-        closeTv.goneIf(randomNumber == 0)
-        closeIv.goneIf(randomNumber != 0)
-        if (isXapk) {
-            closeTv.text = "暂不，尝试解压"
-            closeIv.visibility = View.VISIBLE
-        }
-
-        closeTv.setOnClickListener {
-            if (isXapk) {
-                mCallBack?.invoke(false)
-            }
-            dismiss()
-        }
-        closeIv.setOnClickListener {
-            dismiss()
-        }
-        activateTv.setOnClickListener {
-            PermissionHelper.toInstallPermissionSetting(requireActivity())
-            if (isXapk) {
-                SPUtils.setString(Constants.SP_XAPK_UNZIP_ACTIVITY, requireActivity().javaClass.name)
-                SPUtils.setString(Constants.SP_XAPK_URL, url)
-            }
-        }
-    }
-
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-        if (resultCode == RESULT_OK && requestCode == INSTALL_PERMISSION_CODE) {
-            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
-                SPUtils.setString(Constants.SP_XAPK_UNZIP_ACTIVITY, "")
-                SPUtils.setString(Constants.SP_XAPK_URL, "")
-            }
-            mCallBack?.invoke(true)
-            dismiss()
-        }
-    }
-
-    companion object {
-        @JvmStatic
-        fun show(
-            activity: AppCompatActivity,
-            downloadEntity: DownloadEntity,
-            callBack: ((isFromPermissionGrantedCallback: Boolean) -> Unit)?
-        ) {
-            val isXapk = XapkInstaller.XAPK_EXTENSION_NAME == downloadEntity.path.getExtension()
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-                callBack?.invoke(false)
-                return
-            }
-            val haveInstallPermission = activity.packageManager.canRequestPackageInstalls()
-            if (haveInstallPermission) {
-                callBack?.invoke(false)
-                return
-            }
-            if (isXapk) {
-                val xapkUnzipVersions = Config.getSettings()?.permissionPopupAppliedVersions?.xapkUnzip
-                if (xapkUnzipVersions?.contains(Build.VERSION.SDK_INT.toString()) == false) {
-                    callBack?.invoke(false)
-                    return
-                }
-            } else {
-                val installVersions = Config.getSettings()?.permissionPopupAppliedVersions?.install
-                if (installVersions?.contains(Build.VERSION.SDK_INT.toString()) == false) {
-                    callBack?.invoke(false)
-                    return
-                }
-            }
-            var installPermissionDialogFragment =
-                activity.supportFragmentManager.findFragmentByTag(InstallPermissionDialogFragment::class.java.name) as? InstallPermissionDialogFragment
-            if (installPermissionDialogFragment != null) {
-                installPermissionDialogFragment.mCallBack = callBack
-                installPermissionDialogFragment.isXapk = isXapk
-                installPermissionDialogFragment.url = downloadEntity.url
-                val transaction: FragmentTransaction = activity.supportFragmentManager.beginTransaction()
-                transaction.show(installPermissionDialogFragment)
-                transaction.commit()
-            } else {
-                installPermissionDialogFragment = InstallPermissionDialogFragment().apply {
-                    this.mCallBack = callBack
-                    this.isXapk = isXapk
-                    this.url = downloadEntity.url
-                }
-                installPermissionDialogFragment.show(
-                    activity.supportFragmentManager,
-                    InstallPermissionDialogFragment::class.java.name
-                )
-            }
-        }
-    }
-}

app/src/main/java/com/gh/common/dialog/NewPrivacyPolicyDialogFragment.kt

@@ -1,172 +0,0 @@
-package com.gh.common.dialog
-
-import android.app.Dialog
-import android.content.DialogInterface
-import android.os.Bundle
-import android.text.SpannableStringBuilder
-import android.text.Spanned
-import android.text.TextPaint
-import android.text.style.ClickableSpan
-import android.view.*
-import androidx.core.content.ContextCompat
-import androidx.fragment.app.FragmentActivity
-import androidx.fragment.app.FragmentTransaction
-import com.gh.common.util.DirectUtils
-import com.gh.gamecenter.R
-import com.gh.gamecenter.WebActivity
-import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
-import com.gh.gamecenter.common.utils.dip2px
-import com.gh.gamecenter.common.view.CustomLinkMovementMethod
-import com.gh.gamecenter.databinding.DialogPrivacyProtocolNewBinding
-import com.gh.gamecenter.entity.DialogEntity
-import splitties.bundle.put
-
-class NewPrivacyPolicyDialogFragment : BaseDialogFragment() {
-
-    private var mCallBack: ((isSuccess: Boolean) -> Unit)? = null
-    private val mBinding by lazy { DialogPrivacyProtocolNewBinding.inflate(layoutInflater) }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        return mBinding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        updateView()
-    }
-
-    private fun updateView() {
-        val contentText = SpannableStringBuilder(
-            "1.您可以通过《光环助手隐私政策》以及《儿童隐私保护声明》，了解我们如何收集、使用、存储、保护、对外提供您的个人信息以及您享有的权利\n" +
-                    "2.您可以通过《接入第三方SDK目录》了解本产品接入的第三方SDK的具体信息\n" +
-                    "3.您可以通过《应用权限列表》了解权限申请与使用情况说明\n" +
-                    "4.如果您是14周岁以下的未成年人，您需要和您监护人一起仔细阅读《儿童隐私保护声明》，并在征得您监护人同意后，使用我们的产品、服务或向我们提供信息"
-        )
-
-        val privacyPolicyText = "《光环助手隐私政策》"
-        val childrenPrivacyPolicyText = "《儿童隐私保护声明》"
-        val thirdPartySdkText = "《接入第三方SDK目录》"
-        val permissionListText = "《应用权限列表》"
-
-        val hypertextList = arrayListOf(
-            privacyPolicyText,
-            childrenPrivacyPolicyText,
-            thirdPartySdkText,
-            permissionListText
-        )
-
-        val positionListPairList = arrayListOf<Pair<Int, Int>>()
-
-        for (hypertext in hypertextList) {
-            var start = 0
-            var index = 0
-            while (index != -1) {
-                index = contentText.indexOf(hypertext, start)
-                start = index + hypertext.length
-                if (index != -1) {
-                    positionListPairList.add(Pair(index, start))
-                }
-            }
-        }
-
-        for (hypertextPositionPair in positionListPairList) {
-            contentText.setSpan(object : ClickableSpan() {
-                override fun updateDrawState(ds: TextPaint) {
-                    super.updateDrawState(ds)
-                    ds.color = ContextCompat.getColor(requireContext(), R.color.theme_font)
-                    ds.isUnderlineText = false
-                }
-
-                override fun onClick(widget: View) {
-                    val privacyPolicyUrl = requireContext().getString(R.string.privacy_policy_url)
-                    val childrenPrivacyPolicyUrl = requireContext().getString(R.string.children_policy_url)
-                    val thirdPartySdkUrl = requireContext().getString(R.string.sdk_list_url)
-                    val permissionListUrl = requireContext().getString(R.string.permission_and_usage_url)
-
-                    val selectedUrl =
-                        when (contentText.substring(hypertextPositionPair.first, hypertextPositionPair.second)) {
-                            privacyPolicyText -> privacyPolicyUrl
-                            childrenPrivacyPolicyText -> childrenPrivacyPolicyUrl
-                            thirdPartySdkText -> thirdPartySdkUrl
-                            permissionListText -> permissionListUrl
-                            else -> ""
-                        }
-
-                    DirectUtils.directToExternalBrowser(requireContext(), selectedUrl)
-                }
-            }, hypertextPositionPair.first, hypertextPositionPair.second, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
-        }
-
-        mBinding.contentTv.movementMethod = CustomLinkMovementMethod.getInstance()
-        mBinding.contentTv.text = contentText
-
-        mBinding.refuseTv.setOnClickListener {
-            mCallBack?.invoke(false)
-            dismissAllowingStateLoss()
-        }
-        mBinding.agreeTv.setOnClickListener {
-            mCallBack?.invoke(true)
-            dismissAllowingStateLoss()
-        }
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val createDialog = super.onCreateDialog(savedInstanceState)
-        createDialog.setCanceledOnTouchOutside(false)
-        createDialog.setOnKeyListener(object : DialogInterface.OnKeyListener {
-            override fun onKey(dialog: DialogInterface?, keyCode: Int, event: KeyEvent?): Boolean {
-                if (keyCode == KeyEvent.KEYCODE_BACK) {
-                    return true
-                }
-                return false
-            }
-        })
-
-        val window = createDialog.window
-        window?.setGravity(Gravity.CENTER)
-        return createDialog
-    }
-
-    override fun onStart() {
-        super.onStart()
-        val width = 300F.dip2px()
-        val height = ViewGroup.LayoutParams.WRAP_CONTENT
-        dialog?.window?.setLayout(width, height)
-    }
-
-    companion object {
-        const val KEY_DATA = "data"
-
-        @JvmStatic
-        fun show(
-            activity: FragmentActivity,
-            privacyPolicyEntity: DialogEntity.PrivacyPolicyEntity? = null,
-            callBack: ((isSuccess: Boolean) -> Unit)?
-        ) {
-            var privacyDialogFragment =
-                activity.supportFragmentManager.findFragmentByTag(NewPrivacyPolicyDialogFragment::class.java.name) as? NewPrivacyPolicyDialogFragment
-            if (privacyDialogFragment != null) {
-                privacyDialogFragment.mCallBack = callBack
-                val transaction: FragmentTransaction = activity.supportFragmentManager.beginTransaction()
-                transaction.show(privacyDialogFragment)
-                transaction.commit()
-            } else {
-                privacyDialogFragment = NewPrivacyPolicyDialogFragment().apply {
-                    mCallBack = callBack
-                }
-            }
-            privacyDialogFragment.arguments = Bundle().apply {
-                put(KEY_DATA, privacyPolicyEntity)
-            }
-            privacyDialogFragment.show(
-                activity.supportFragmentManager,
-                NewPrivacyPolicyDialogFragment::class.java.name
-            )
-        }
-    }
-}

app/src/main/java/com/gh/common/dialog/NotificationHintDialogFragment.kt

@@ -0,0 +1,90 @@
+package com.gh.common.dialog
+
+import android.annotation.SuppressLint
+import android.content.Intent
+import android.graphics.Color
+import android.os.Build
+import android.os.Bundle
+import android.provider.Settings
+import android.util.TypedValue
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.LinearLayout
+import android.widget.TextView
+import com.gh.common.util.DisplayUtils
+import com.gh.common.util.MtaHelper
+import com.gh.common.util.PermissionHelper
+import com.gh.gamecenter.BuildConfig
+import com.gh.gamecenter.R
+import com.gh.gamecenter.entity.NotificationHint
+import kotlinx.android.synthetic.main.dialog_notification_hint.*
+
+// 通知权限弹窗
+class NotificationHintDialogFragment : BaseTrackableDialogFragment() {
+
+    private var mNotificationHint: NotificationHint? = null
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.dialog_notification_hint, null)
+    }
+
+    @Suppress("DEPRECATION")
+    @SuppressLint("SetTextI18n")
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        titleTv.text = mNotificationHint?.title
+
+        contentContainer.removeAllViews()
+        for (item in mNotificationHint?.content!!) {
+            val tv = TextView(context)
+
+            tv.layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT).apply {
+                topMargin = if (contentContainer.childCount == 0) 0 else DisplayUtils.dip2px(12f)
+            }
+            tv.text = item
+            tv.setTextColor(Color.parseColor("#1383EB"))
+            tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14f)
+            contentContainer.addView(tv)
+        }
+
+        activateTv.setOnClickListener {
+            MtaHelper.onEventWithBasicDeviceInfo(getEvent(), getKey(), "点击立即开启")
+            dismiss()
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                //这种方案适用于 API 26, 即8.0（含8.0）以上可以用
+                val intent = Intent()
+                intent.action = Settings.ACTION_APP_NOTIFICATION_SETTINGS
+                intent.putExtra(Settings.EXTRA_APP_PACKAGE, BuildConfig.APPLICATION_ID)
+                startActivity(intent)
+            } else {
+                PermissionHelper.toPermissionSetting(requireActivity())
+            }
+        }
+
+        laterTv.setOnClickListener {
+            dismiss()
+            MtaHelper.onEventWithBasicDeviceInfo(getEvent(), getKey(), "点击以后再说")
+        }
+
+        dialog?.setCanceledOnTouchOutside(true)
+    }
+
+    override fun getEvent(): String {
+        return "推送引导弹窗"
+    }
+
+    override fun getKey(): String {
+        return "引导弹窗"
+    }
+
+    override fun trackWithBasicDeviceInfo() = true
+
+    companion object {
+        @JvmStatic
+        fun getInstance(hint: NotificationHint) = NotificationHintDialogFragment().apply {
+            mNotificationHint = hint
+        }
+    }
+}