Merge remote-tracking branch 'origin/release' into dev

fix: 修复设置中设置不保留 activity 时，返回单个 activity 会造成整个应用退出的问题

See merge request halo/android/assistant-android!363

.editorconfig

@@ -0,0 +1,555 @@
+[*]
+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

.gitlab-ci.yml

@@ -38,7 +38,6 @@ send_sonar_report:
   dependencies: []    #禁止传递来的artifact
   script:
     - group=`echo $CI_PROJECT_PATH | sed 's#/#-#g'`
-    - docker login -u "${HARBOR_REGISTRY_USERNAME}" -p "${HARBOR_REGISTRY_PASSWORD}" "${HARBOR_REGISTRY}"
     - 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

@@ -5,3 +5,6 @@
 [submodule "assistant_flutter"]
 	path = assistant_flutter
 	url = git@git.shanqu.cc:halo/android/flutter-module.git
+[submodule "vspace-bridge"]
+	path = vspace-bridge
+	url = git@git.shanqu.cc:cwzs/android/vspace-bridge.git

README.md

@@ -12,12 +12,13 @@
 2. 尽量使 View 在被销毁之后仍能恢复状态，处理方式可参考 [保存界面状态](https://developer.android.com/topic/libraries/architecture/saving-states)
 3. 尽量参考原有文件结构及命名规范，即以 大模块 - 小模块 的形式生成包关系
 4. 遵循最小改动原则，在提交代码前务必先检查变动的代码，尽量以可控的变动规模来构成一个 commit ，以便日后追踪问题
-5. 代码规范可参考 [AOSP Java 风格](https://source.android.com/setup/contribute/code-style)
-6. 尽量使用 Kotlin 来写新文件
-7. 尽量不要使用 DataBinding
-8. Commit 前请确保不带入非项目必须文件，可手动修改 [.gitignore](https://stackoverflow.com/questions/8527597/how-do-i-ignore-files-in-a-directory-in-git) 文件忽略
-9. 优先使用 ViewBinding 获取 View 对象
-10. No AsyncTask!
+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!
 
 ### 公用部分
 

app/build.gradle

@@ -43,22 +43,14 @@ android {
     }
 
     defaultConfig {
-
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = [eventBusIndex: 'com.gh.EventBusIndex']
-            }
-        }
 
         ndk {
-            // 如果不添加 `arm64` 调用系统的 PackageManager 的方法读取安装包信息的时候会出现 native 层闪退，草
-            // 添加了 `arm64` 以后部分 5.0 的设备会报用错 so 的问题，
-            // couldn't find DSO to load: libimagepipeline.so caused by: dlopen failed: "/data/data/com.gh.gamecenter/lib-main/libimagepipeline.so" is 64-bit instead of 32-bit result: 0
-            // 以 OPPO R7PLUS 为例，明明设备是骁龙 615，ARMv8-64 bit 的设备却不支持 arm64 的 abi，限制了只使用 java 后还是报错，只有 5.0，5.1 设备无法复现 : (
-            // 惊了
-            abiFilters "armeabi-v7a", "arm64-v8a", "x86"
+            // x86 本来是为了模拟器用户使用 RenderScript 用的，但是其实用到 RenderScript 的人本来就不多 (一天不到 100)，用模拟器的人就更少了
+            // 加了 x86 反而会导致用户没法使用微博登录，因为微博没有提供 x86 的 SO ...
+            // 还会增大 APK 体积，所以还是去掉吧。数据可见 https://sentry.shanqu.cc/organizations/lightgame/issues/144232/?project=22
+            abiFilters "armeabi-v7a", "arm64-v8a"
         }
 
         renderscriptTargetApi 18
@@ -80,19 +72,13 @@ android {
          */
         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", "QUICK_LOGIN_APPID", "\"${QUICK_LOGIN_APPID}\""
         buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
-
-        /**
-         * Build Time 供区分 jenkins 打包时间用
-         * IS_NIGHT_MODE_ON 供区分夜间模式功能是否启用
-         */
-        buildConfigField "long", "BUILD_TIME", "0"
-        buildConfigField "boolean", "IS_NIGHT_MODE_ON", "true"
     }
 
     // gradle 2.2以上默认同时启用v1和v2（优先用于Android N）
@@ -107,6 +93,12 @@ android {
         }
     }
 
+    kapt {
+        arguments {
+            arg("AROUTER_MODULE_NAME", project.name)
+        }
+    }
+
     buildTypes {
         debug {
             debuggable true
@@ -146,10 +138,10 @@ android {
 
     sourceSets {
         publish {
-            java.srcDirs = ['src/main/java']
+            java.srcDirs = ['src/main/java', "src/default/java"]
         }
         internal {
-            java.srcDirs = ['src/main/java']
+            java.srcDirs = ['src/main/java', "src/default/java"]
         }
         tea {
             java.srcDirs = ['src/main/java', 'src/tea/java']
@@ -164,14 +156,16 @@ android {
 
             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}\""
         }
 
-        // publish release host˛
+        // publish release host
         publish {
             dimension "env"
 
             buildConfigField "String", "DEV_API_HOST", "\"${API_HOST}\""
             buildConfigField "String", "NEW_DEV_API_HOST", "\"${NEW_API_HOST}\""
+            buildConfigField "String", "DEV_VAPI_HOST", "\"${VAPI_HOST}\""
         }
 
         tea {
@@ -179,6 +173,7 @@ android {
 
             buildConfigField "String", "DEV_API_HOST", "\"${API_HOST}\""
             buildConfigField "String", "NEW_DEV_API_HOST", "\"${NEW_API_HOST}\""
+            buildConfigField "String", "DEV_VAPI_HOST", "\"${VAPI_HOST}\""
 
             manifestPlaceholders.put("APPLOG_SCHEME", "rangersapplog.byAx6uYt".toLowerCase())
         }
@@ -200,86 +195,43 @@ 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.okhttp3:logging-interceptor:${okHttp}"
+    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}"
 
-    implementation "androidx.core:core-ktx:${core}"
-    implementation "androidx.fragment:fragment-ktx:${fragment}"
-    implementation "androidx.multidex:multidex:${multiDex}"
-    implementation "androidx.appcompat:appcompat:${appCompat}"
-    implementation "androidx.cardview:cardview:${cardView}"
-    implementation "androidx.annotation:annotation:${annotation}"
-    implementation "androidx.constraintlayout:constraintlayout:${constraintLayout}"
-    implementation "androidx.recyclerview:recyclerview:${recyclerView}"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifeCycle"
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifeCycle"
-    implementation "androidx.lifecycle:lifecycle-common-java8:$lifeCycle"
-    implementation "androidx.lifecycle:lifecycle-extensions:$lifeCycleExtensions"
-    implementation "androidx.room:room-runtime:${room}"
-    implementation "androidx.room:room-rxjava2:${room}"
-    implementation "androidx.core:core-ktx:${ktx}"
-    implementation "androidx.viewpager2:viewpager2:${viewpager2}"
-    implementation "androidx.webkit:webkit:${webkit}"
-    kapt "androidx.room:room-compiler:${room}"
 
-    implementation "com.google.android.material:material:${material}"
+    implementation "androidx.multidex:multidex:${multiDex}"
+    implementation "androidx.fragment:fragment-ktx:${fragment}"
+
+    implementation "androidx.annotation:annotation:${annotation}"
+
+    implementation "androidx.viewpager2:viewpager2:${viewpager2}"
+    kapt "androidx.room:room-compiler:${room}"
 
     implementation "com.kyleduo.switchbutton:library:${switchButton}"
 
-    implementation "com.facebook.fresco:fresco:${fresco}"
-    implementation "com.facebook.fresco:animated-gif-lite:${fresco}"
-    implementation "com.facebook.fresco:animated-drawable:${fresco}"
-    implementation "com.facebook.fresco:animated-webp:${fresco}"
-    implementation "com.facebook.fresco:webpsupport:${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 "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.google.android:flexbox:${flexbox}"
-
-    implementation "pub.devrel:easypermissions:${easypermissions}"
-
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     implementation "com.contrarywind:Android-PickerView:${pickerView}"
 
-    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", {
         exclude module: "gsyvideoplayer-androidvideocache"
@@ -287,59 +239,39 @@ dependencies {
     })
     implementation "com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-exo_player2:$gsyVideo"
 
-    implementation "androidx.work:work-runtime:${workManager}"
+//    implementation "androidx.work:work-runtime:${workManager}"
 
     implementation "com.llew.huawei:verifier:${verifier}"
 
-    implementation "com.github.tbruyelle:rxpermissions:${rxPermissions}"
-
-    implementation "com.lg:skeleton:${skeleton}"
-    implementation "com.tencent.mm.opensdk:wechat-sdk-android-without-mta:${mta}"
-    implementation "com.github.nichbar:AndroidRomChecker:${romChecker}"
-
-    debugImplementation "com.github.nichbar.chucker:library:${chucker}"
-    releaseImplementation "com.github.nichbar.chucker:library-no-op:${chucker}"
     teaImplementation "com.bytedance.applog:RangersAppLog-Lite-cn:${bytedanceApplog}"
 
-    implementation "com.aliyun.dpa:oss-android-sdk:${oss}"
-
-    implementation "com.airbnb.android:lottie:${lottie}"
-
     implementation "net.lingala.zip4j:zip4j:${zip4j}"
 
-    implementation "io.sentry:sentry-android:4.3.0"
-
-    implementation("com.github.piasy:BigImageViewer:${bigImageViewer}", {
-        exclude group: 'com.squareup.okhttp3'
-        exclude group: 'androidx.swiperefreshlayout'
-        exclude group: 'com.github.bumptech.glide'
-        exclude group: 'com.facebook.fresco'
-    })
-    implementation "com.github.PhilJay:MPAndroidChart:${chart}"
-
-    implementation "com.lahm.library:easy-protector-release:${easyProtector}"
-
     implementation "com.github.hsiafan:apk-parser:${apkParser}"
     implementation "org.nanohttpd:nanohttpd:${nanohttpd}"
 
-    implementation "com.aliyun.openservices:aliyun-log-android-sdk:${aliyunLog}"
     implementation "com.lg:easyfloat:${easyFloat}"
 
     implementation "io.github.florent37:shapeofview:${shapeOfView}"
 
-    implementation "io.github.sinaweibosdk:core:${weiboSDK}"
-
     implementation "com.lg:apksig:${apksig}"
 
     implementation "com.lg:gid:${gid}"
 
-    implementation "com.louiscad.splitties:splitties-fun-pack-android-base-with-views-dsl:${splitties}"
-
     compileOnly "com.github.axen1314.lancet:lancet-base:${lancet_version}"
+    kapt "com.alibaba:arouter-compiler:$arouterVersion"
 
-    implementation project(':libraries:LGLibrary')
-    implementation project(':libraries:QQShare')
-    implementation project(':libraries:Matisse')
+    implementation project(':vspace-bridge:vspace')
+
+    implementation (project(':module_common')) {
+        exclude group: 'androidx.swiperefreshlayout'
+    }
+    implementation(project(':module_login')) {
+        exclude group: 'androidx.swiperefreshlayout'
+    }
+    implementation(project(':module_energy')) {
+        exclude group: 'androidx.swiperefreshlayout'
+    }
 }
 File propFile = file('sign.properties')
 if (propFile.exists()) {
@@ -455,7 +387,7 @@ andResGuard {
             "R.drawable.ic_recommend_function",
             "R.drawable.ic_recommend_gift",
             "R.drawable.ic_recommend_role",
-            "R.drawable.login_btn_bg",
+            "R.drawable.download_button_normal_style",
             "R.drawable.ic_quick_login_check",
             "R.drawable.ic_quick_login_uncheck",
             "R.anim.anim_auth_in",
@@ -470,6 +402,9 @@ andResGuard {
             "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",
@@ -595,4 +530,4 @@ project.afterEvaluate {
             }
         }
     }
-}
+}

app/proguard-rules.txt

@@ -14,8 +14,11 @@
 }
 #--------- remove logs end  ----------------
 
+# inline getter method
+-allowaccessmodification
+
 #--------- remove useless mtahelper class --------
--assumenosideeffects class com.gh.common.util.MtaHelper {
+-assumenosideeffects class com.gh.gamecenter.core.utils.MtaHelper {
     public static void onEvent(...);
     public static void onEventWithTime(...);
     public static void onEventWithBasicDeviceInfo(...);
@@ -36,6 +39,9 @@
 -keepclassmembers interface com.j256.* { *; }
 -dontwarn com.j256.**
 
+# 避免 gson 找不到 enum
+-keepclassmembers enum * { *; }
+
 ### AutoScrollViewPager
 -keep class cn.trinea.android.* { *; }
 -keepclassmembers class cn.trinea.android.* { *; }
@@ -65,9 +71,14 @@
 -keep class com.gh.common.view.* {*;}
 -keep class com.gh.gamecenter.db.info.* {*;}
 -keep class com.gh.gamecenter.entity.* {*;}
+-keep class com.gh.gamecenter.common.entity.* {*;}
 -keep class com.gh.gamecenter.qa.entity.* {*;}
+-keep class com.gh.gamecenter.login.entity.* {*;}
+-keep class com.gh.gamecenter.energy.entity.* {*;}
 -keep class com.gh.gamecenter.retrofit.* {*;}
 -keep class com.gh.gamecenter.eventbus.* {*;}
+-keep class com.gh.gamecenter.common.eventbus.* {*;}
+-keep class com.gh.gamecenter.energy.eventbus.* {*;}
 -keep class com.gh.gamecenter.video.detail.* {*;}
 -keep class com.gh.gamecenter.home.gamecollection.* {*;}
 
@@ -155,3 +166,12 @@
     public static void directToSuggestion(...);
 }
 
+# ARouter
+-keep public class com.alibaba.android.arouter.routes.**{*;}
+-keep public class com.alibaba.android.arouter.facade.**{*;}
+-keep class * implements com.alibaba.android.arouter.facade.template.ISyringe{*;}
+# 如果使用了 byType 的方式获取 Service，需添加下面规则，保护接口
+-keep interface * implements com.alibaba.android.arouter.facade.template.IProvider
+# 如果使用了 单类注入，即不定义接口实现 IProvider，需添加下面规则，保护实现
+-keep class * implements com.alibaba.android.arouter.facade.template.IProvider
+

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

@@ -0,0 +1,26 @@
+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,6 +3,9 @@
     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卡上写文件 -->
@@ -13,10 +16,6 @@
     <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连接状态 -->
@@ -25,6 +24,9 @@
     <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"/>
 
@@ -56,6 +58,14 @@
         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"
@@ -70,7 +80,6 @@
         android:icon="@mipmap/logo"
         android:label="@string/app_name"
         android:largeHeap="true"
-        android:networkSecurityConfig="@xml/network_security_config"
         android:resizeableActivity="true"
         android:theme="@style/AppCompatTheme.APP"
         tools:replace="android:name,android:allowBackup"
@@ -257,11 +266,6 @@
             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" />
@@ -570,15 +574,6 @@
             android:name=".forum.search.ForumOrUserSearchActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name=".energy.EnergyCenterActivity"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".energy.EnergyHouseActivity"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name=".personal.NewPersonalActivity"
             android:screenOrientation="portrait" />
@@ -651,14 +646,6 @@
             android:name=".gamecollection.detail.GameCollectionPosterActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name="com.cmic.sso.sdk.activity.LoginAuthActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:launchMode="singleTop"
-            android:screenOrientation="portrait"
-            android:theme="@android:style/Theme.Dialog" />
-
-
         <activity
             android:name=".home.skip.PackageSkipActivity"
             android:screenOrientation="portrait" />
@@ -732,16 +719,33 @@
             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="${applicationId}.wxapi.WXEntryActivity"
-            android:exported="true"
-            android:label="@string/app_name"
-            android:launchMode="singleTop"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar"></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"-->
@@ -760,16 +764,22 @@
         </provider>
 
         <provider
-            android:name="androidx.startup.InitializationProvider"
-            android:authorities="${applicationId}.androidx-startup"
-            android:exported="false"
-            tools:node="merge">
-            <!-- If you are using androidx.startup to initialize other components -->
-            <meta-data
-                android:name="androidx.work.WorkManagerInitializer"
-                android:value="androidx.startup"
-                tools:node="remove" />
-        </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"

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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1 @@
+{"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.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":[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},"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":[0]},{"t":18,"s":[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":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":[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":[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,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},"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.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/switch_turnon_dark.json

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1 @@
+{"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/java/com/gh/base/AppUncaughtHandler.java

@@ -1,134 +0,0 @@
-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.Build;
-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;
-import java.util.concurrent.TimeoutException;
-
-import io.sentry.Sentry;
-
-public class AppUncaughtHandler implements UncaughtExceptionHandler {
-
-    private Context mContext;
-
-    public AppUncaughtHandler(Context context) {
-        // 获取系统默认的UncaughtException处理器
-        mContext = context;
-    }
-
-    @Override
-    public void uncaughtException(Thread t, Throwable e) {
-        if (("FinalizerWatchdogDaemon").equals(t.getName())
-            && e instanceof TimeoutException) {
-            // ignore timeoutException
-            // detail can be found in this didi tech blog post https://mp.weixin.qq.com/s?__biz=MzU1ODEzNjI2NA==&mid=2247487185&idx=2&sn=cf2d9e10053f625bde0f61d246f14870&source=41#wechat_redirect
-        } else {
-            new Thread(() -> {
-                Looper.prepare();
-                Utils.toast(mContext.getApplicationContext(), "\"光环助手\"发生错误");
-                Looper.loop();
-            });
-            saveLocalLog(mContext, e);
-            restart(mContext);
-            Sentry.captureException(e);
-        }
-    }
-
-    public static void restart(final Context context) {
-        // S450 这机器会无限重启循环 : (
-        if ("S450".equals(Build.MODEL)) return;
-
-        // 防止重复奔溃，导致助手一直重启，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

@@ -1,629 +0,0 @@
-package com.gh.base;
-
-import static com.gh.common.util.EntranceUtils.KEY_ENTRANCE;
-
-import android.content.Intent;
-import android.content.res.ColorStateList;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.graphics.Color;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.os.Parcel;
-import android.os.TransactionTooLargeException;
-import android.text.TextUtils;
-import android.util.TypedValue;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatDelegate;
-import androidx.core.content.ContextCompat;
-import androidx.core.view.LayoutInflaterCompat;
-import androidx.fragment.app.Fragment;
-import androidx.lifecycle.Lifecycle;
-
-import com.gh.base.fragment.BaseFragment;
-import com.gh.common.constant.Constants;
-import com.gh.common.tracker.IBusiness;
-import com.gh.common.util.DialogHelper;
-import com.gh.common.util.DialogUtils;
-import com.gh.common.util.DisplayUtils;
-import com.gh.common.util.EntranceUtils;
-import com.gh.common.util.EnvHelper;
-import com.gh.common.util.ExtensionsKt;
-import com.gh.common.util.MtaHelper;
-import com.gh.common.util.NetworkUtils;
-import com.gh.common.util.NightModeUtils;
-import com.gh.common.util.PackageFlavorHelper;
-import com.gh.common.util.PackageInstaller;
-import com.gh.common.util.QuickLoginHelper;
-import com.gh.common.util.RunningUtils;
-import com.gh.common.util.SPUtils;
-import com.gh.common.util.ShareUtils;
-import com.gh.common.util.StringUtils;
-import com.gh.download.DownloadManager;
-import com.gh.gamecenter.BuildConfig;
-import com.gh.gamecenter.LoginActivity;
-import com.gh.gamecenter.R;
-import com.gh.gamecenter.SplashScreenActivity;
-import com.gh.gamecenter.eventbus.EBShowDialog;
-import com.lightgame.BaseAppCompatActivity;
-import com.lightgame.download.DownloadEntity;
-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 kotlin.Pair;
-import pub.devrel.easypermissions.EasyPermissions;
-
-/**
- * 只提供基础的服务(EventBus/Share/GlobalDialog/Permissions)
- * <p>
- * 需要工具栏的页面请继承{@link ToolBarActivity}
- */
-
-public abstract class BaseActivity extends BaseAppCompatActivity implements EasyPermissions.PermissionCallbacks, IBusiness {
-
-    // global dialog key
-    public final static String DOWNLOAD_HIJACK = "hijack";
-    public final static String LOGIN_EXCEPTION = "loginException";
-    public final static String PLUGGABLE = "plugin";
-    public final static String SIGNATURE_CONFLICT = "signature_conflict";
-    public final static int ID_ROOT_INDICATOR = 999;
-    public final static int ID_NIGHT_INDICATOR = 998;
-    public final int MAX_BUNDLE_SIZE = 300;
-
-    @NonNull
-    protected String mEntrance;
-
-    private boolean mIsExistLogoutDialog;
-    protected boolean mNightMode;
-    public long startPageTime = 0;
-
-    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);
-        ExtensionsKt.tryCatchInRelease(() -> {
-            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);
-            }
-            return null;
-        });
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        if (PackageFlavorHelper.IS_TEST_FLAVOR && isAutoResetViewBackgroundEnabled()) {
-            LayoutInflaterCompat.setFactory2(getLayoutInflater(), new CustomLayoutInflaterFactory(this));
-        }
-
-        super.onCreate(savedInstanceState);
-
-        if (useEventBus()) EventBus.getDefault().register(this);
-        mEntrance = getIntent().getStringExtra(KEY_ENTRANCE);
-        if (TextUtils.isEmpty(mEntrance)) {
-            mEntrance = Constants.ENTRANCE_UNKNOWN;
-        }
-
-        if (BuildConfig.DEBUG) {
-            Utils.log("ACTIVITY_ENTRANCE -> " + mEntrance);
-        }
-
-        disableAutofill();
-
-        if (savedInstanceState != null) {
-            String xapkUnzipActivity = SPUtils.getString(Constants.SP_XAPK_UNZIP_ACTIVITY);
-            String xapkUrl = SPUtils.getString(Constants.SP_XAPK_URL);
-            Utils.log("页面重建了--" + xapkUnzipActivity + "--" + xapkUrl);
-            if (this.getClass().isAssignableFrom(SplashScreenActivity.class)) {
-                SPUtils.setString(Constants.SP_XAPK_UNZIP_ACTIVITY, "");
-                SPUtils.setString(Constants.SP_XAPK_URL, "");
-                return;
-            }
-            if (this.getClass().getName().equals(xapkUnzipActivity) && !TextUtils.isEmpty(xapkUrl)) {
-                DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntityByUrl(xapkUrl);
-                if (downloadEntity != null) {
-                    PackageInstaller.install(this, downloadEntity, false);
-                    SPUtils.setString(Constants.SP_XAPK_UNZIP_ACTIVITY, "");
-                    SPUtils.setString(Constants.SP_XAPK_URL, "");
-                }
-            }
-        }
-
-        mNightMode = NightModeUtils.INSTANCE.isNightMode(this);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        startPageTime = System.currentTimeMillis();
-
-        if (BuildConfig.IS_NIGHT_MODE_ON
-            && !NightModeUtils.INSTANCE.getSystemMode()
-            && mNightMode != NightModeUtils.INSTANCE.isNightMode(this)) {
-            onNightModeChange();
-        }
-    }
-
-    @SuppressWarnings("ConstantConditions")
-    @Override
-    public void setContentView(View view) {
-        if (!(this instanceof SplashScreenActivity) && PackageFlavorHelper.IS_TEST_FLAVOR) {
-            view = getRootViewWithEnvIndicator(view);
-        }
-        super.setContentView(view);
-    }
-
-    @Override
-    protected void onDestroy() {
-        if (useEventBus()) 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.ShareEntrance shareEntrance, String id) {
-        ShareUtils.getInstance(this).showShareWindows(this,
-                getWindow().getDecorView(),
-                url,
-                icon,
-                shareTitle,
-                shareSummary,
-                shareEntrance, id);
-        if (shareEntrance == ShareUtils.ShareEntrance.game || shareEntrance == ShareUtils.ShareEntrance.plugin) {
-            MtaHelper.onEvent("内容分享", "内容分享", shareTitle + shareSummary);
-        } else {
-            MtaHelper.onEvent("内容分享", "内容分享", shareTitle);
-        }
-    }
-
-    /**
-     * 关闭 editText 自动填充帐号 （我们也用不上），开启的时候有小概率出发 TimeoutException
-     */
-    private void disableAutofill() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            getWindow().getDecorView().setImportantForAutofill(View.IMPORTANT_FOR_AUTOFILL_NO_EXCLUDE_DESCENDANTS);
-        }
-    }
-
-    private View getRootViewWithEnvIndicator(View view) {
-        RelativeLayout screenRootView = new RelativeLayout(this);
-        screenRootView.setLayoutParams(new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.MATCH_PARENT));
-
-        LinearLayout ll = new LinearLayout(this);
-        TextView tv = new TextView(this);
-        String envText = "正式环境";
-        tv.setBackground(ContextCompat.getDrawable(this, R.color.theme));
-        if (EnvHelper.isDevEnv()) {
-            envText = "测试环境";
-            tv.setBackground(ContextCompat.getDrawable(this, R.color.theme_red));
-        }
-        tv.setText(envText);
-        tv.setGravity(Gravity.CENTER);
-        tv.setTextColor(Color.WHITE);
-        tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 13);
-        tv.measure(0, 0);
-        tv.setAlpha(0.15F);
-        tv.setId(ID_ROOT_INDICATOR);
-        int height = tv.getMeasuredHeight();
-        int width = tv.getMeasuredWidth();
-        tv.setPadding(DisplayUtils.dip2px(20), 0, DisplayUtils.dip2px(20), 0);
-        ll.setTranslationX(DisplayUtils.dip2px(20));
-        ll.setRotation(45);
-        ll.addView(tv);
-        ll.setPadding(0, (width - height) / 2, 0, (width - height) / 2);
-
-        if (BuildConfig.DEBUG) {
-            tv.setOnLongClickListener(v -> {
-                EntranceUtils.saveShortcut(this.getClass().getName(), getIntent().getExtras());
-                return true;
-            });
-        }
-
-        screenRootView.addView(view);
-        screenRootView.addView(ll);
-        if (BuildConfig.IS_NIGHT_MODE_ON) {
-            screenRootView.addView(getNightModeIndicatorView());
-        }
-
-        RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) ll.getLayoutParams();
-        lp.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
-        view.setLayoutParams(new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.MATCH_PARENT));
-        return screenRootView;
-    }
-
-    private View getNightModeIndicatorView() {
-        LinearLayout ll = new LinearLayout(this);
-        TextView tv = new TextView(this);
-        String envText = NightModeUtils.INSTANCE.isNightMode(this) ? "夜间模式" : "日间模式";
-        tv.setBackground(ContextCompat.getDrawable(this, R.color.theme));
-        tv.setText(envText);
-        tv.setGravity(Gravity.CENTER);
-        tv.setTextColor(Color.WHITE);
-        tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 13);
-        tv.measure(0, 0);
-        tv.setAlpha(NightModeUtils.INSTANCE.isNightMode(this) ? 0.8F : 0.15F);
-        tv.setId(ID_NIGHT_INDICATOR);
-        int height = tv.getMeasuredHeight();
-        int width = tv.getMeasuredWidth();
-        tv.setPadding(DisplayUtils.dip2px(20), 0, DisplayUtils.dip2px(20), 0);
-        ll.setTranslationX(DisplayUtils.dip2px(-20));
-        ll.setRotation(-45);
-        ll.addView(tv);
-        ll.setPadding(0, (width - height) / 2, 0, (width - height) / 2);
-
-        if (PackageFlavorHelper.IS_TEST_FLAVOR) {
-            tv.setOnClickListener(v -> {
-                //切换深色模式
-                String mode;
-                String positive;
-                String negative;
-                if (NightModeUtils.INSTANCE.getSystemMode()) {
-                    mode = "跟随系统模式";
-                    positive = "普通模式";
-                    negative = "深色模式";
-                } else if (NightModeUtils.INSTANCE.getNightMode()) {
-                    mode = "深色模式";
-                    positive = "跟随系统模式";
-                    negative = "普通模式";
-                } else {
-                    mode = "普通模式";
-                    positive = "跟随系统模式";
-                    negative = "深色模式";
-                }
-                DialogHelper.showCenterDialog(this, "选择模式", "当前为 " + mode, positive, negative, () -> {
-                    if (NightModeUtils.INSTANCE.getSystemMode()) {
-                        NightModeUtils.INSTANCE.setNightMode(false);
-                        NightModeUtils.INSTANCE.setSystemMode(false);
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-                            getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_NO);
-                        }
-                    } else {
-                        NightModeUtils.INSTANCE.setSystemMode(true);
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-                            getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
-                        }
-                    }
-                    NightModeUtils.INSTANCE.initNightMode();
-                }, () -> {
-                    if (NightModeUtils.INSTANCE.getSystemMode()) {
-                        NightModeUtils.INSTANCE.setNightMode(true);
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-                            getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_YES);
-                        }
-                    } else {
-                        boolean nightMode = NightModeUtils.INSTANCE.getNightMode();
-                        NightModeUtils.INSTANCE.setNightMode(!NightModeUtils.INSTANCE.getNightMode());
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-                            getDelegate().setLocalNightMode(nightMode ? AppCompatDelegate.MODE_NIGHT_NO : AppCompatDelegate.MODE_NIGHT_YES);
-                        }
-                    }
-                    NightModeUtils.INSTANCE.setSystemMode(false);
-                    NightModeUtils.INSTANCE.initNightMode();
-                });
-            });
-        }
-        return ll;
-    }
-
-    @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())) {
-                DialogHelper.showPluginDialog(this, () -> {
-                    if (FileUtils.isEmptyFile(showDialog.getPath())) {
-                        toast(R.string.install_failure_hint);
-                    } else {
-                        PackageInstaller.uninstall(BaseActivity.this, showDialog.getPath());
-                    }
-                    return null;
-                });
-            } else if (SIGNATURE_CONFLICT.equals(showDialog.getType())) {
-                DialogHelper.showSignatureConflictDialog(this, () -> {
-                    PackageInstaller.uninstall(BaseActivity.this, showDialog.getPath());
-                    return null;
-                });
-            } 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");
-                    DialogHelper.showCenterDialog(this, "你的账号已在另外一台设备登录"
-                            , StringUtils.buildString("（", model, "）")
-                            , "知道了", "重新登录"
-                            , () -> {
-                            }
-                            , () -> {
-                                if (SPUtils.getBoolean(Constants.SP_HAS_GET_PHONE_INFO) || NetworkUtils.isOpenMobileData(BaseActivity.this)) {
-                                    QuickLoginHelper.startLogin(BaseActivity.this, "你的账号已在另外一台设备登录多设备-重新登录");
-                                } else {
-                                    startActivity(LoginActivity.getIntent(BaseActivity.this,
-                                            "你的账号已在另外一台设备登录多设备-重新登录"));
-                                }
-                            }
-                    );
-                    mBaseHandler.postDelayed(() -> mIsExistLogoutDialog = false, 5000);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-
-        if (isFinishing()) {
-            onFinish();
-            for (Fragment fragment : getSupportFragmentManager().getFragments()) {
-                if (fragment.isAdded() && fragment instanceof BaseFragment) {
-                    ((BaseFragment) fragment).onParentActivityFinish();
-                }
-            }
-        }
-    }
-
-    /**
-     * 此回调可用于确认当前 activity 已经执行了 finish() 方法并处于 isFinishing 状态
-     */
-    protected void onFinish() {
-
-    }
-
-    @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, ")");
-    }
-
-    protected boolean useEventBus() {
-        return true;
-    }
-
-    @Override
-    public Resources getResources() {
-        Resources resources = super.getResources();
-        if (resources.getConfiguration().fontScale != 1.0f) {
-            Configuration configuration = resources.getConfiguration();
-            configuration.fontScale = 1.0f;
-            resources.updateConfiguration(configuration, resources.getDisplayMetrics());
-        }
-        return resources;
-    }
-
-
-    /**
-     * ActivityThread每次调用onSaveInstanceState时outState大小都会累加，最终会导致{@link TransactionTooLargeException}异常
-     * 解决方案：判断每次获取到的outState大小，当达到300k时手动clear掉
-     */
-    @Override
-    protected void onSaveInstanceState(@NonNull Bundle outState) {
-        super.onSaveInstanceState(outState);
-
-        if (preventRecreateFragmentByFragmentManager()) {
-            outState = discardFragmentFromSaveInstanceState(outState);
-        }
-
-        long bundleSize = getBundleSize(outState);
-        if (bundleSize > MAX_BUNDLE_SIZE * 1024) {
-            outState.clear();
-        }
-    }
-
-    /**
-     * 是否停用 Activity 重建时 FragmentManager 根据 saveState 自动重建保存的 Fragment 的功能
-     */
-    protected boolean preventRecreateFragmentByFragmentManager() {
-        return false;
-    }
-
-    private Bundle discardFragmentFromSaveInstanceState(Bundle outState) {
-        if (outState != null) {
-            outState.remove("android:support:fragments");
-        }
-        return outState;
-    }
-
-    private long getBundleSize(Bundle bundle) {
-        long dataSize;
-        Parcel obtain = Parcel.obtain();
-        try {
-            obtain.writeBundle(bundle);
-            dataSize = obtain.dataSize();
-        } finally {
-            obtain.recycle();
-        }
-        return dataSize;
-    }
-
-    @Override
-    public Pair<String, String> getBusinessId() {
-        return null;
-    }
-
-    @Override
-    public void onConfigurationChanged(@NonNull Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        onNightModeChange();
-    }
-
-    protected void onNightModeChange() {
-        if (BuildConfig.IS_NIGHT_MODE_ON) {
-            mNightMode = NightModeUtils.INSTANCE.isNightMode(this);
-            TextView tv = findViewById(ID_NIGHT_INDICATOR);
-            if (tv != null) {
-                tv.setText(NightModeUtils.INSTANCE.isNightMode(this) ? "夜间模式" : "日间模式");
-                tv.setAlpha(NightModeUtils.INSTANCE.isNightMode(this) ? 0.8F : 0.15F);
-            }
-            if (isAutoResetViewBackgroundEnabled()) {
-                updateStaticViewBackground(getWindow().getDecorView());
-            }
-        }
-    }
-
-    protected boolean isAutoResetViewBackgroundEnabled() {
-        return false;
-    }
-
-    /**
-     * 自动重置部分 view 的背景颜色/资源
-     *
-     * @param view 父 view
-     */
-    private void updateStaticViewBackground(View view) {
-        if (view instanceof ViewGroup) {
-            for (int i = 0; i < ((ViewGroup) view).getChildCount(); i++) {
-                View child = ((ViewGroup) view).getChildAt(i);
-                updateStaticViewBackground(child);
-            }
-        }
-
-        String backgroundString = (String) view.getTag(CustomLayoutInflaterFactory.TAG_BACKGROUND_ID);
-        String textColorString = (String) view.getTag(CustomLayoutInflaterFactory.TAG_TEXT_COLOR_ID);
-        if (backgroundString != null) {
-            if (backgroundString.startsWith("#")) return;
-            int backgroundId = Integer.parseInt(
-                    backgroundString
-                            .replace("@", "")
-                            .replace("?", "")
-            );
-
-            if (backgroundId != 0) {
-                try {
-                    TypedValue value = new TypedValue();
-                    getResources().getValue(backgroundId, value, true);
-
-                    if (value.type >= TypedValue.TYPE_FIRST_COLOR_INT && value.type <= TypedValue.TYPE_LAST_COLOR_INT) {
-                        view.setBackgroundColor(ExtensionsKt.toColor(backgroundId, this));
-                    } else {
-                        view.setBackground(ExtensionsKt.toDrawable(backgroundId, this));
-                    }
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        if (textColorString != null && view instanceof TextView) {
-            if (textColorString.startsWith("#")) return;
-            int textColorId = Integer.parseInt(
-                    textColorString
-                            .replace("@", "")
-                            .replace("?", "")
-            );
-
-            if (textColorId != 0) {
-                try {
-                    final ColorStateList colorStateList = ContextCompat.getColorStateList(this, textColorId);
-                    ((TextView) view).setTextColor(colorStateList);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-
-            }
-        }
-    }
-
-}

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

@@ -14,12 +14,16 @@ import android.widget.CheckBox
 import android.widget.FrameLayout
 import android.widget.TextView
 import androidx.lifecycle.Observer
-import com.gh.common.AppExecutor
-import com.gh.common.runOnIoThread
-import com.gh.common.util.*
+import com.gh.common.util.DialogUtils
+import com.gh.common.util.NewLogUtils
 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.qa.entity.AnswerEntity
@@ -37,6 +41,7 @@ import org.json.JSONArray
 import org.json.JSONObject
 import java.io.File
 
+// TODO: 移动到module_bbs模块
 abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarActivity(),
     KeyboardHeightObserver, UploadVideoListener {
 
@@ -205,6 +210,7 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
         mViewModel.setUploadVideoListener(this)
         mKeyboardHeightProvider = KeyboardHeightProvider(this)
         mRichEditor.post { mKeyboardHeightProvider?.start() }
+        mRichEditor.enableForceDark(DarkModeUtils.isDarkModeOn(this))
         // 防止个别手机在Js里无法获取粘贴内容
         mRichEditor.addJavascriptInterface(OnPasteListener(), "onPasteListener")
         mRichEditor.addJavascriptInterface(OnCursorChangeListener(), "OnCursorChangeListener")
@@ -735,6 +741,14 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
     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 "

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

@@ -9,15 +9,16 @@ import android.text.TextUtils
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.MutableLiveData
-import com.gh.base.fragment.WaitingDialogFragment
-import com.gh.common.runOnUiThread
-import com.gh.common.util.*
+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.retrofit.Response
+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
@@ -40,6 +41,7 @@ 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>()
@@ -189,7 +191,8 @@ abstract class BaseRichEditorViewModel(application: Application) : AndroidViewMo
     fun uploadPoster(picturePath: String) {
         processDialog.postValue(WaitingDialogFragment.WaitingDialogData("封面上传中...", true))
         uploadImageSubscription =
-            UploadImageUtils.compressAndUploadImage(UploadImageUtils.UploadType.poster,
+            UploadImageUtils.compressAndUploadImage(
+                UploadImageUtils.UploadType.poster,
                 picturePath,
                 false,
                 object : UploadImageUtils.OnUploadImageListener {
@@ -308,7 +311,8 @@ abstract class BaseRichEditorViewModel(application: Application) : AndroidViewMo
             return
         }
         uploadImageSubscription =
-            UploadImageUtils.compressAndUploadImage(UploadImageUtils.UploadType.poster,
+            UploadImageUtils.compressAndUploadImage(
+                UploadImageUtils.UploadType.poster,
                 localVideoPoster,
                 false,
                 object : UploadImageUtils.OnUploadImageListener {

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

@@ -1,53 +0,0 @@
-package com.gh.base
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import android.view.View
-import androidx.appcompat.app.AppCompatActivity
-import com.gh.gamecenter.R
-
-class CustomLayoutInflaterFactory(
-    private val mAppCompatActivity: AppCompatActivity
-) : LayoutInflater.Factory2 {
-
-    override fun onCreateView(
-        parent: View?,
-        name: String,
-        context: Context,
-        attrs: AttributeSet
-    ): View? {
-
-        val view: View?
-
-        try {
-            view = mAppCompatActivity.delegate.createView(parent, name, context, attrs)
-                ?: mAppCompatActivity.onCreateView(parent, name, context, attrs)
-                ?: mAppCompatActivity.layoutInflater.createView(name, null, attrs)
-        } catch (e: Exception) {
-            return null
-        }
-
-        val n = attrs.attributeCount
-        for (i in 0 until n) {
-            val attributeName = attrs.getAttributeName(i).toString()
-            if (attributeName.contains("background")) {
-                view?.setTag(TAG_BACKGROUND_ID, attrs.getAttributeValue(i))
-            } else if (attributeName.contains("textColor")) {
-                view?.setTag(TAG_TEXT_COLOR_ID, attrs.getAttributeValue(i))
-            }
-        }
-
-        return view
-    }
-
-    override fun onCreateView(name: String, context: Context, attrs: AttributeSet): View? {
-        return mAppCompatActivity.onCreateView(name, context, attrs)
-    }
-
-    companion object {
-        const val TAG_BACKGROUND_ID = R.string.background_id
-        const val TAG_TEXT_COLOR_ID = R.string.text_color_id
-    }
-
-}

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

@@ -0,0 +1,86 @@
+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

@@ -0,0 +1,110 @@
+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/GHUmengNotificationService.kt

@@ -1,229 +0,0 @@
-//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 androidx.core.text.htmlEncode
-//import com.gh.common.notifier.Notifier
-//import com.gh.common.util.*
-//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?.link == "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?.fromHtml())
-//                    .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().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

@@ -3,34 +3,33 @@ package com.gh.base
 import android.app.Activity
 import android.app.Application
 import android.os.Bundle
-import com.gh.common.notifier.Notifier
-import com.gh.common.util.DataUtils
+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.energy.EnergyCenterActivity
+import com.gh.gamecenter.common.utils.PackageFlavorHelper
+import com.gh.gamecenter.energy.view.EnergyCenterActivity
 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
-import com.lightgame.utils.AppManager
 
+// TODO：移动到对应的模块
 class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
 
     override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
-        AppManager.getInstance().addActivity(activity)
+        // do nothing
     }
 
     override fun onActivityStarted(activity: Activity) {
-
+        GlobalActivityManager.currentActivity = activity
     }
 
     override fun onActivityResumed(activity: Activity) {
-        CurrentActivityHolder.activitySet.add(activity)
-
         // 判断是否需要显示或隐藏返回小浮窗
         if (FloatingBackViewManager.getType().isNotEmpty()) {
             if (activity is EnergyCenterActivity
@@ -47,7 +46,6 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
         }
 
         if (HaloApp.isUserAcceptPrivacyPolicy(activity)) {
-            DataUtils.onResume(activity)
             // FIXME 这里应该只是部分Activity需要
             try {
                 // 初始化gameMap
@@ -58,6 +56,14 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
                 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 {
@@ -70,28 +76,22 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
     }
 
     override fun onActivityPaused(activity: Activity) {
-        CurrentActivityHolder.activitySet.remove(activity)
         FloatingBackViewManager.dismissBackView()
-
-        if (HaloApp.isUserAcceptPrivacyPolicy(activity)) {
-            DataUtils.onPause(activity)
-        }
-
-        if (activity.isFinishing) {
-            AppManager.getInstance().finishActivity(activity)
+        if (PackageFlavorHelper.IS_TEST_FLAVOR && activity is AppCompatActivity) {
+            DarkModeSwitchHelper.dismissDarkModeSwitchFloatingView()
         }
     }
 
     override fun onActivityStopped(activity: Activity) {
-        Notifier.hide()
+        // do nothing
     }
 
     override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
-
+        // do nothing
     }
 
     override fun onActivityDestroyed(activity: Activity) {
-        AppManager.getInstance().finishActivity(activity)
+        // do nothing
     }
 
 }

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

@@ -0,0 +1,14 @@
+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/common/Base64ImageHolder.kt

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

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

@@ -8,22 +8,37 @@ 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.constant.Constants
-import com.gh.common.loghub.LoghubUtils
-import com.gh.common.tracker.Tracker
 import com.gh.common.util.*
-import com.gh.common.view.dsbridge.CompletionHandler
+import com.gh.common.util.LogUtils
 import com.gh.gamecenter.*
-import com.gh.gamecenter.energy.EnergyCenterActivity
-import com.gh.gamecenter.energy.EnergyHouseActivity
-import com.gh.gamecenter.entity.*
+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.utils.EnergyTaskHelper
+import com.gh.gamecenter.energy.view.EnergyCenterActivity
+import com.gh.gamecenter.energy.view.EnergyHouseActivity
+import com.gh.gamecenter.entity.MtaEvent
 import com.gh.gamecenter.help.QaFeedbackDialogFragment
-import com.gh.gamecenter.manager.UserManager
+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.user.LoginTag
-import com.gh.gamecenter.user.UserRepository
+import com.gh.gamecenter.login.user.UserRepository
+import com.gh.gamecenter.login.utils.LoginHelper
+import com.gh.gamecenter.login.utils.QuickLoginHelper
 import com.halo.assistant.HaloApp
 import com.lightgame.utils.Utils
 import org.json.JSONObject
@@ -32,7 +47,7 @@ import java.io.File
 import java.io.FileOutputStream
 import java.util.*
 
-class DefaultJsApi(var context: Context) {
+class DefaultJsApi(var context: Context, val entrance: String = "") {
 
     private var mLoginHandler: CompletionHandler<Any>? = null
 
@@ -181,7 +196,7 @@ class DefaultJsApi(var context: Context) {
     fun openBase64Image(event: Any) {
         val context = CurrentActivityHolder.getCurrentActivity()
 
-        Base64ImageHolder.image = event.toString()
+        ImageViewerActivity.base64Image = event.toString()
 
         context?.startActivity(ImageViewerActivity.getBase64Intent(context, true))
     }
@@ -232,7 +247,7 @@ class DefaultJsApi(var context: Context) {
     fun shareBase64Image(event: Any) {
         val imageShareEvent = event.toString().toObject() ?: ImageShareEvent()
         val context = CurrentActivityHolder.getCurrentActivity()
-        Base64ImageHolder.image = imageShareEvent.image.run {
+        ImageViewerActivity.base64Image = imageShareEvent.image.run {
             if (this.startsWith("data:image/png;base64")) this.split(",")[1] else this
         }
         MessageShareUtils.getInstance(context).shareFromWeb(context, imageShareEvent.type)
@@ -243,7 +258,7 @@ class DefaultJsApi(var context: Context) {
         val inviteEvent = event.toString().toObject() ?: InviteFriendsEvent()
         val context = CurrentActivityHolder.getCurrentActivity()
         if ("poster" == inviteEvent.type) {
-            Base64ImageHolder.image = inviteEvent.poster.run {
+            ImageViewerActivity.base64Image = inviteEvent.poster.run {
                 if (this.startsWith("data:image/png;base64")) this.split(",")[1] else this
             }
             MessageShareUtils.getInstance(context).shareInviteFriends(context, inviteEvent.way)
@@ -420,6 +435,11 @@ class DefaultJsApi(var context: Context) {
         GameActivityDownloadHelper.postExposureEvent(gameActivityEvent)
     }
 
+    @JavascriptInterface
+    fun getEntrance(msg: Any): String {
+        return entrance
+    }
+
     @Keep
     internal data class ImageEvent(var imageList: ArrayList<String> = arrayListOf(), var position: Int = 0)
 

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

@@ -5,8 +5,8 @@ import android.content.Intent
 import android.net.Uri
 import android.text.TextUtils
 import android.util.Base64
-import com.gh.base.CurrentActivityHolder
-import com.gh.common.constant.Constants
+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
@@ -15,11 +15,18 @@ 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.common.util.GsonUtils.gson
+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
@@ -78,7 +85,7 @@ object DefaultUrlHandler {
                     e.printStackTrace()
                 }
 
-                EntranceUtils.HOST_QQ_QUN -> {
+                EntranceConsts.HOST_QQ_QUN -> {
                     val key = uri.getQueryParameter("key")
                     if (!DirectUtils.directToQqGroup(context, key)) {
                         Utils.toast(context, "请检查是否已经安装手机QQ")
@@ -103,6 +110,8 @@ object DefaultUrlHandler {
                 }
                 "question" -> DirectUtils.directToQuestionDetail(context, id, entrance, "文章链接")
 
+                "real_name" -> DirectUtils.directToRealName(context)
+
                 "community" -> {
                     val community = CommunityEntity()
                     community.id = id
@@ -146,7 +155,7 @@ object DefaultUrlHandler {
                         )
                     }
                 }
-                EntranceUtils.HOST_UPLOAD_VIDEO -> {
+                EntranceConsts.HOST_UPLOAD_VIDEO -> {
                     val titleParameter = uri.getQueryParameter("title")
                     val title = if (titleParameter.isNullOrEmpty()) "" else "#$titleParameter#"
                     val categoryId = uri.getQueryParameter("category_id") ?: ""
@@ -157,16 +166,16 @@ object DefaultUrlHandler {
                     val tagActivityName = uri.getQueryParameter("tagActivityName") ?: ""
                     val linkEntity = VideoLinkEntity(title, categoryId, link, tagActivityId, tagActivityName)
                     val simpleGameEntity = SimpleGameEntity(gameId, gameName)
-                    CheckLoginUtils.checkLogin(context, null, true, EntranceUtils.ENTRANCE_BROWSER) {
-                        DirectUtils.directToVideoManager(context, linkEntity, simpleGameEntity, EntranceUtils.ENTRANCE_BROWSER, "")
+                    CheckLoginUtils.checkLogin(context, null, true, EntranceConsts.ENTRANCE_BROWSER) {
+                        DirectUtils.directToVideoManager(context, linkEntity, simpleGameEntity, EntranceConsts.ENTRANCE_BROWSER, "")
                     }
                 }
-                EntranceUtils.HOST_USERHOME -> {
+                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, "")
                 }
-                EntranceUtils.HOST_VIDEO_MORE -> {
+                EntranceConsts.HOST_VIDEO_MORE -> {
                     val referer = uri.getQueryParameter("referer") ?: ""
                     val type = uri.getQueryParameter("type") ?: ""
                     val act = uri.getQueryParameter("act") ?: ""
@@ -198,48 +207,48 @@ object DefaultUrlHandler {
                         sectionName
                     )
                 }
-                EntranceUtils.HOST_VIDEO_DETAIL -> {
+                EntranceConsts.HOST_VIDEO_DETAIL -> {
                     DirectUtils.directToVideoDetail(context, id, entrance, path)
                 }
-                EntranceUtils.HOST_VIDEO_SINGLE -> {
+                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
                     )
                 }
-                EntranceUtils.HOST_VIDEO_STREAMING_HOME -> {
+                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)
                 }
-                EntranceUtils.HOST_VIDEO_STREAMING_DESC -> {
+                EntranceConsts.HOST_VIDEO_STREAMING_DESC -> {
                     directToGameDetailVideoStreaming(context, id, entrance)
                 }
-                EntranceUtils.HOST_VIDEO_COLLECTION -> {
+                EntranceConsts.HOST_VIDEO_COLLECTION -> {
                     directToGameVideo(context, id, entrance, "")
                 }
 
-                EntranceUtils.HOST_CATEGORY -> {
+                EntranceConsts.HOST_CATEGORY -> {
                     val title = uri.getQueryParameter("title")
                     DirectUtils.directCategoryDirectory(context, id, title ?: "", entrance, "")
                 }
-                EntranceUtils.HOST_COLUMN_COLLECTION -> {
+                EntranceConsts.HOST_COLUMN_COLLECTION -> {
                     val name = uri.getQueryParameter("name")
                     DirectUtils.directToColumnCollection(context, id, -1, entrance, name ?: "")
                 }
-                EntranceUtils.HOST_COLUMN -> {
-                    DirectUtils.directToSubject(context, id, uri.getQueryParameter(EntranceUtils.KEY_NAME), entrance)
+                EntranceConsts.HOST_COLUMN -> {
+                    DirectUtils.directToSubject(context, id, uri.getQueryParameter(EntranceConsts.KEY_NAME), entrance)
                 }
-                EntranceUtils.HOST_COMMUNITY_QUESTION_LABEL_DETAIL -> {
+                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, "")
                 }
-                EntranceUtils.HOST_COMMUNITY_COLUMN_DETAIL -> {
+                EntranceConsts.HOST_COMMUNITY_COLUMN_DETAIL -> {
                     val community = CommunityEntity()
                     community.id = uri.getQueryParameter("community_id") ?: ""
                     community.name = uri.getQueryParameter("community_name") ?: ""
@@ -247,42 +256,42 @@ object DefaultUrlHandler {
                     DirectUtils.directAskColumnDetail(context, columnId, community, entrance, "")
                 }
 
-                EntranceUtils.HOST_BLOCK -> {
+                EntranceConsts.HOST_BLOCK -> {
                     val name = uri.getQueryParameter("name")
                         ?: ""
                     val entity = SubjectRecommendEntity(link = id, name = name, text = name)
                     DirectUtils.directToBlock(context, entity, entrance)
                 }
 
-                EntranceUtils.HOST_SERVER_BLOCK -> {
+                EntranceConsts.HOST_SERVER_BLOCK -> {
                     DirectUtils.directToGameServers(context, entrance = entrance, path = "")
                 }
 
-                EntranceUtils.HOST_AMWAY_BLOCK -> {
+                EntranceConsts.HOST_AMWAY_BLOCK -> {
                     DirectUtils.directToAmway(context, entrance = entrance, path = "")
                 }
 
-                EntranceUtils.HOST_HELP -> {
+                EntranceConsts.HOST_HELP -> {
                     val name = uri.getQueryParameter("name")
                         ?: ""
                     DirectUtils.directToQa(context, name, id)
                 }
 
-                EntranceUtils.HOST_HELP_COLLECTION -> {
+                EntranceConsts.HOST_HELP_COLLECTION -> {
                     val name = uri.getQueryParameter("name")
                         ?: ""
                     DirectUtils.directToQaCollection(context, name, id)
                 }
 
-                EntranceUtils.HOST_GAME_UPLOAD -> {
+                EntranceConsts.HOST_GAME_UPLOAD -> {
                     DirectUtils.directGameUpload(context, entrance = entrance, path = "")
                 }
-                EntranceUtils.HOST_GAME_ZONE -> {
+                EntranceConsts.HOST_GAME_ZONE -> {
                     val zoneUrl = uri.getQueryParameter("url") ?: ""
                     DirectUtils.directGameZone(context, id, zoneUrl, entrance)
                 }
 
-                EntranceUtils.HOST_LINK -> {
+                EntranceConsts.HOST_LINK -> {
                     try {
                         val dataString = uri.getQueryParameter("data")
                         if (!TextUtils.isEmpty(dataString)) {
@@ -296,43 +305,43 @@ object DefaultUrlHandler {
                     }
                 }
 
-                EntranceUtils.HOST_GAME_NEWS -> {
+                EntranceConsts.HOST_GAME_NEWS -> {
                     DirectUtils.directToGameNews(
                         context,
-                        uri.getQueryParameter(EntranceUtils.KEY_GAME_ID),
-                        uri.getQueryParameter(EntranceUtils.KEY_GAME_NAME),
+                        uri.getQueryParameter(EntranceConsts.KEY_GAME_ID),
+                        uri.getQueryParameter(EntranceConsts.KEY_GAME_NAME),
                         entrance
                     );
                 }
 
-                EntranceUtils.HOST_GAME_CALENDAR -> {
-                    directToGameServerCalendar(context, uri.getQueryParameter(EntranceUtils.KEY_GAME_ID))
+                EntranceConsts.HOST_GAME_CALENDAR -> {
+                    directToGameServerCalendar(context, uri.getQueryParameter(EntranceConsts.KEY_GAME_ID))
                 }
 
-                EntranceUtils.HOST_HISTORY_APK -> {
-                    DirectUtils.directToHistoryApk(context, uri.getQueryParameter(EntranceUtils.KEY_GAME_ID))
+                EntranceConsts.HOST_HISTORY_APK -> {
+                    DirectUtils.directToHistoryApk(context, uri.getQueryParameter(EntranceConsts.KEY_GAME_ID))
                 }
 
-                EntranceUtils.HOST_FORUM_DETAIL -> {
+                EntranceConsts.HOST_FORUM_DETAIL -> {
                     DirectUtils.directForumDetail(context, id, entrance)
                 }
 
-                EntranceUtils.HOST_GAME_RATING_DETAIL -> {
+                EntranceConsts.HOST_GAME_RATING_DETAIL -> {
                     DirectUtils.directToGameRatingDetail(
                         context,
-                        uri.getQueryParameter(EntranceUtils.KEY_GAME_ID),
-                        uri.getQueryParameter(EntranceUtils.KEY_COMMENT_ID),
-                        EntranceUtils.ENTRANCE_BROWSER
+                        uri.getQueryParameter(EntranceConsts.KEY_GAME_ID),
+                        uri.getQueryParameter(EntranceConsts.KEY_COMMENT_ID),
+                        EntranceConsts.ENTRANCE_BROWSER
                     )
                 }
 
-                EntranceUtils.HOST_FORUM -> {
-                    val position = uri.getQueryParameter(EntranceUtils.KEY_POSITION)?.toInt()
+                EntranceConsts.HOST_FORUM -> {
+                    val position = uri.getQueryParameter(EntranceConsts.KEY_POSITION)?.toInt()
 
                     DirectUtils.directToForum(context, position ?: 0)
                 }
 
-                EntranceUtils.HOST_UPLOAD_VIDEO_NEW -> {
+                EntranceConsts.HOST_UPLOAD_VIDEO_NEW -> {
                     val activityName = uri.getQueryParameter("activity_name") ?: ""
                     val activityId = uri.getQueryParameter("activity_id") ?: ""
                     val original = uri.getQueryParameter("original") ?: ""
@@ -370,39 +379,39 @@ object DefaultUrlHandler {
                     )
                 }
 
-                EntranceUtils.HOST_SUGGESTION -> {
-                    val platform = uri.getQueryParameter(EntranceUtils.KEY_PLATFORM)
+                EntranceConsts.HOST_SUGGESTION -> {
+                    val platform = uri.getQueryParameter(EntranceConsts.KEY_PLATFORM)
                     val platformName = PlatformUtils.getInstance(context).getPlatformName(platform)
-                    val gameId = uri.getQueryParameter(EntranceUtils.KEY_GAMEID)
-                    val packageMd5 = uri.getQueryParameter(EntranceUtils.KEY_PACKAGE_MD5)
-                    val isQaFeedback = uri.getQueryParameter(EntranceUtils.KEY_IS_QA_FEEDBACK) == "true"
+                    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(EntranceUtils.KEY_GAME_NAME),
+                        uri.getQueryParameter(EntranceConsts.KEY_GAME_NAME),
                         if (TextUtils.isEmpty(platformName)) platform else platformName,
-                        uri.getQueryParameter(EntranceUtils.KEY_VERSION)
+                        uri.getQueryParameter(EntranceConsts.KEY_VERSION)
                     ) else String.format(
                         "%s-%s-V%s\n游戏ID：%s\n游戏包MD5：%s\n",
-                        uri.getQueryParameter(EntranceUtils.KEY_GAME_NAME),
+                        uri.getQueryParameter(EntranceConsts.KEY_GAME_NAME),
                         if (TextUtils.isEmpty(platformName)) platform else platformName,
-                        uri.getQueryParameter(EntranceUtils.KEY_VERSION), gameId, packageMd5
+                        uri.getQueryParameter(EntranceConsts.KEY_VERSION), gameId, packageMd5
                     )
                     val qaId = uri.getQueryParameter("qa_id") ?: ""
-                    val qaContentId = uri.getQueryParameter(EntranceUtils.KEY_QA_CONTENT_ID) ?: ""
-                    val qaTitle = uri.getQueryParameter(EntranceUtils.KEY_QA_TITLE)
+                    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, EntranceUtils.ENTRANCE_BROWSER)
+                        directToFeedback(context, content, null, isQaFeedback, qaContentId, EntranceConsts.ENTRANCE_BROWSER)
                     }
                 }
 
-                EntranceUtils.HOST_HELP_AND_FEEDBACK -> {
+                EntranceConsts.HOST_HELP_AND_FEEDBACK -> {
                     val position = uri.getQueryParameter("position") ?: ""
                     DirectUtils.directToHelpAndFeedback(context, position.toInt())
                 }
 
-                EntranceUtils.HOST_HELP_DETAIL -> {
+                EntranceConsts.HOST_HELP_DETAIL -> {
                     var url = uri.getQueryParameter("url")
                     if (!url.isNullOrEmpty()) {
                         context.startActivity(WebActivity.getIntent(context, url, false))
@@ -419,16 +428,19 @@ object DefaultUrlHandler {
                     }
                 }
 
-                EntranceUtils.HOST_GAME_COLLECTION_DETAIL -> {
+                EntranceConsts.HOST_GAME_COLLECTION_DETAIL -> {
                     DirectUtils.directToGameCollectionDetail(context, id, entrance)
                 }
 
-                EntranceUtils.HOST_GAME_COLLECTION_SQUARE -> {
+                EntranceConsts.HOST_GAME_COLLECTION_SQUARE -> {
                     DirectUtils.directToGameCollectionSquare(context, entrance)
                 }
 
-                EntranceUtils.HOST_GAME_COLLECTION_EDIT -> {
-                    context.startActivity(GameCollectionEditActivity.getIntent(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 -> {
@@ -492,6 +504,13 @@ object DefaultUrlHandler {
 
     @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"
@@ -503,8 +522,7 @@ object DefaultUrlHandler {
             uri.path?.apply {
                 when {
                     contains("game") -> {
-                        val gameId = uri.getQueryParameter("gameId") ?: uri.pathSegments.last()
-                        ?: ""
+                        val gameId = uri.getQueryParameter("gameId") ?: uri.pathSegments.last() ?: ""
                         DirectUtils.directToGameDetail(context, gameId, entrance, autoDownload = false, traceEvent = null)
                     }
                     contains("question") -> {
@@ -570,6 +588,55 @@ object DefaultUrlHandler {
         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 两个字段，仅供日志，不保证能用)
      */

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

@@ -2,13 +2,14 @@ package com.gh.common
 
 import com.gh.common.exposure.ExposureManager
 import com.gh.common.filter.RegionSettingHelper
-import com.gh.common.loghub.LoghubUtils
-import com.gh.common.util.doOnMainProcessOnly
-import com.gh.common.util.tryCatchInRelease
+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.retrofit.Response
+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
@@ -47,7 +48,9 @@ object FixedRateJobHelper {
 
                 // 提交曝光数据
                 if ((mExecuteCount * CHECKER_PERIOD) % EXPOSURE_PERIOD == 0L) {
-                    ExposureManager.commitSavedExposureEvents(true)
+                    runOnUiThread {
+                        ExposureManager.commitSavedExposureEvents(true)
+                    }
                 }
 
                 // 分片检测下载进度
@@ -60,7 +63,9 @@ object FixedRateJobHelper {
 
                 // 提交普通 loghub 数据
                 if ((mExecuteCount * CHECKER_PERIOD) % LOGHUB_PERIOD == 0L) {
-                    LoghubUtils.commitSavedLoghubEvents()
+                    runOnUiThread {
+                        LoghubUtils.commitSavedLoghubEvents(true)
+                    }
                 }
 
                 // 更新游戏屏蔽信息

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

@@ -1,39 +0,0 @@
-//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().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

@@ -1,117 +0,0 @@
-package com.gh.common
-
-import android.annotation.SuppressLint
-import com.gh.gamecenter.entity.AliasEntity
-import com.halo.assistant.HaloApp
-
-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) {
-//        tryWithDefaultCatch {
-//            //初始化友盟推送
-//            UMConfigure.init(mApplication, Config.UMENG_APPKEY, channel, UMConfigure.DEVICE_TYPE_PHONE, Config.UMENG_MESSAGE_SECRET)
-//
-//            val pushAgent = PushAgent.getInstance(mApplication)
-//
-//            runOnIoThread { registerDevice() }
-//
-//            // 注册小米、华为和魅族通道
-//            MiPushRegistar.register(mApplication, Config.MIPUSH_APPID, Config.MIPUSH_APPKEY)
-//            HuaWeiRegister.register(mApplication)
-//            MeizuRegister.register(mApplication, BuildConfig.MEIZUPUSH_APPID, BuildConfig.MEIZUPUSH_APPKEY)
-//
-//            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)
-//        jsonObject.put("gid", meta.gid)
-//
-//        val body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString())
-//
-//        RetrofitManager.getInstance().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/chain/BrowserInstallHandler.kt

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,28 @@
+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

@@ -0,0 +1,24 @@
+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

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,23 @@
+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

@@ -0,0 +1,19 @@
+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

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,19 @@
+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/ValidateVSpaceHandler.kt

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,18 @@
+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,27 +1,32 @@
 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 com.gh.common.util.EnvHelper;
-import com.gh.common.util.GsonUtils;
+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.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.eventbus.EBReuse;
-import com.gh.gamecenter.retrofit.BiResponse;
-import com.gh.gamecenter.retrofit.Response;
+import com.gh.gamecenter.common.eventbus.EBReuse;
+import com.gh.gamecenter.entity.VSetting;
+import com.gh.gamecenter.common.retrofit.BiResponse;
+import com.gh.gamecenter.common.retrofit.Response;
 import com.gh.gamecenter.retrofit.RetrofitManager;
+import com.gh.vspace.VHelper;
 import com.halo.assistant.HaloApp;
 import com.lightgame.utils.Utils;
 
@@ -33,8 +38,6 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Locale;
 
-import androidx.annotation.Nullable;
-
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
 import okhttp3.ResponseBody;
@@ -44,10 +47,7 @@ public class Config {
     // 这个 API_HOST 在测试包里会随着选择的环境切换，正式包里会一直保持正式 host
     public static final String API_HOST = EnvHelper.getHost();
     public static final String NEW_API_HOST = EnvHelper.getNewHost();
-
-    /**
-     * 需要配置的请使用{@link PreferenceManager#getDefaultSharedPreferences(Context)}
-     */
+    public static final String VAPI_HOST = EnvHelper.getVHost();
 
     // Third-Party confs
     public static final String WECHAT_APPID = BuildConfig.WECHAT_APPID;
@@ -59,13 +59,13 @@ public class Config {
     // http://www.ghzs666.com/article/${articleId}.html
     public static final String URL_ARTICLE = "http://www.ghzs666.com/article/"; // ghzs/ghzs666 统一
 
-    public static final String DEFAULT_CHANNEL = "GH_TEST3";
-    public static final String DEFAULT_CHANNEL_FOR_RELEASE = "GH_LOST"; // 正式包的缺省渠道，避免因渠道丢失而回落到测试渠道
-
-    private static String SETTINGS_KEY = "settingsKey";
+    private static final String SETTINGS_KEY = "settingsKey";
 
     private static SettingsEntity mSettingsEntity;
     private static NewSettingsEntity mNewSettingsEntity;
+
+    private static NewSettingsEntity.NightMode mNightModeSetting;
+    private static VSetting mVSetting;
     private static GameGuidePopupEntity mGameGuidePopupEntity;
     private static SharedPreferences mDefaultSharedPreferences;
 
@@ -93,13 +93,6 @@ 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) {
 
@@ -125,6 +118,17 @@ 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();
@@ -190,11 +194,15 @@ 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
@@ -212,6 +220,17 @@ public class Config {
         return mSettingsEntity;
     }
 
+    @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) {
@@ -227,6 +246,21 @@ public class Config {
         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;
@@ -255,7 +289,7 @@ public class Config {
 
     public static SharedPreferences getPreferences() {
         if (mDefaultSharedPreferences == null) {
-            mDefaultSharedPreferences =  PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication());
+            mDefaultSharedPreferences = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication());
         }
 
         return mDefaultSharedPreferences;
@@ -270,13 +304,6 @@ public class Config {
         return false;
     }
 
-    public static boolean isGameDomeSwitchOpen() {
-        return getSettings() != null && getSettings().getGameDomeSwitch().equals("on");
-    }
-    public static boolean isPermissionPopupSwitchOpen() {
-        return getSettings() != null && getSettings().getPermissionPopupSwitch().equals("on");
-    }
-
     public static void fixHideFunction() {
         SharedPreferences preferences = PreferenceManager.
                 getDefaultSharedPreferences(HaloApp.getInstance().getApplication());
@@ -323,10 +350,49 @@ public class Config {
                     @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) {
+            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();
+                            if (HaloApp.getInstance().isNewForThisVersion && mNightModeSetting != null && mNightModeSetting.getInstall()) {
+                                DarkModeUtils.INSTANCE.updateFollowSystemDarkModeToSp(true);
+                                DarkModeUtils.INSTANCE.updateAppDarkModeStatusToSp(true);
+                                DarkModeUtils.INSTANCE.initDarkMode();
+                            }
+
+                            if (mNewSettingsEntity != null) {
+                                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())

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

@@ -13,10 +13,10 @@ import android.widget.PopupWindow
 import androidx.core.content.ContextCompat
 import androidx.databinding.BindingAdapter
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.gh.base.OnViewClickListener
-import com.gh.common.util.dip2px
-import com.gh.common.util.toDrawable
-import com.gh.common.view.BugFixedPopupWindow
+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
@@ -87,8 +87,8 @@ object AddKaiFuBindingAdapter {
 
             })
             if (i == list.size - 1) {
-                binding.kaifuAddTime.background = R.drawable.bg_add_kaifu_bottom_left.toDrawable()
-                binding.kaifuAddServerName.background = R.drawable.bg_add_kaifu_bottom_right.toDrawable()
+                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)
             }
         }
     }

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

@@ -19,55 +19,65 @@ import androidx.core.content.ContextCompat;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.facebook.drawee.view.SimpleDraweeView;
-import com.gh.base.OnViewClickListener;
+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.common.constant.Config;
-import com.gh.common.dialog.CertificationDialog;
-import com.gh.common.dialog.PackageCheckDialogFragment;
 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.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.ExtensionsKt;
 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.NumberUtils;
 import com.gh.common.util.PackageInstaller;
 import com.gh.common.util.PackageUtils;
 import com.gh.common.util.PlatformUtils;
-import com.gh.common.util.RealNameHelper;
 import com.gh.common.util.ReservationHelper;
-import com.gh.common.view.DownloadProgressBar;
-import com.gh.common.view.DrawableView;
+import com.gh.common.view.DownloadButton;
 import com.gh.common.view.GameIconView;
 import com.gh.download.DownloadManager;
 import com.gh.download.dialog.DownloadDialog;
-import com.gh.download.server.BrowserInstallHelper;
 import com.gh.gamecenter.DownloadManagerActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.WebActivity;
-import com.gh.gamecenter.baselist.LoadStatus;
+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.databinding.KaifuDetailItemRowBinding;
 import com.gh.gamecenter.entity.ApkEntity;
 import com.gh.gamecenter.entity.GameEntity;
-import com.gh.gamecenter.entity.LinkEntity;
+import com.gh.gamecenter.common.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.eventbus.EBReuse;
+import com.gh.gamecenter.common.eventbus.EBReuse;
 import com.gh.gamecenter.gamedetail.dialog.GamePermissionDialogFragment;
 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;
@@ -331,7 +341,7 @@ public class BindingAdapters {
     }
 
     // 大图下的进度条
-    public static void setDownloadButton(DownloadProgressBar progressBar,
+    public static void setDownloadButton(DownloadButton progressBar,
                                          GameEntity gameEntity,
                                          ExposureEvent traceEvent,
                                          @Nullable View.OnClickListener clickCallBack,
@@ -354,62 +364,77 @@ public class BindingAdapters {
         // 点击事件
         progressBar.setOnClickListener(v -> {
             if (clickCallBack != null) clickCallBack.onClick(v);
-            switch (progressBar.getDownloadType()) {
+            switch (progressBar.getButtonStyle()) {
                 case DOWNLOADING_PLUGIN:
                 case DOWNLOADING_NORMAL:
-                    Intent intent = DownloadManagerActivity.getDownloadMangerIntent(v.getContext(),
-                            gameEntity.getApk().get(0).getUrl(), entrance);
-                    v.getContext().startActivity(intent);
+                    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);
+                    }
                     break;
                 case NONE:
                     Utils.toast(v.getContext(), "该游戏已关闭下载");
                     break;
                 case NORMAL:
                 case PLUGIN:
-                    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;
+                    final RegionSetting.GameH5Download gameH5Download = RegionSettingHelper.getGameH5DownloadByGameId(gameEntity.getId());
+                    if (gameH5Download != null) {
+                        DialogUtils.showGameH5DownloadDialog(v.getContext(), gameEntity, gameH5Download);
+                    } 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);
                             }
                         }
-                        RealNameHelper.checkIfAuth(v.getContext(), gameEntity, () -> {
-                            GamePermissionDialogFragment.show((AppCompatActivity) v.getContext(), gameEntity, gameEntity.getInfo(), () -> {
-                                BrowserInstallHelper.showBrowserInstallHintDialog(v.getContext(), () -> {
-                                    PackageCheckDialogFragment.show((AppCompatActivity) v.getContext(), gameEntity, () -> {
-                                        DownloadDialogHelper.findAvailableDialogAndShow(v.getContext(), gameEntity, apk, () -> {
-                                            CertificationDialog.showCertificationDialog(v.getContext(), gameEntity, () -> {
-                                                DialogUtils.showVersionNumberDialog(v.getContext(), gameEntity, () -> {
-                                                    DialogUtils.showOverseaDownloadDialog(v.getContext(), gameEntity, () -> {
-                                                        DialogUtils.checkDownload(v.getContext(), apk.getSize(),
-                                                                isSubscribe -> download(progressBar, gameEntity, traceEvent, isSubscribe, entrance, location));
-                                                    });
-                                                });
-                                            });
-                                        });
-                                    });
-                                });
-                            });
-                        });
-                    } else {
-                        RealNameHelper.checkIfAuth(v.getContext(), gameEntity, () -> {
-                            GamePermissionDialogFragment.show((AppCompatActivity) v.getContext(), gameEntity, gameEntity.getInfo(), () -> {
-                                CertificationDialog.showCertificationDialog(v.getContext(), gameEntity, () -> {
-                                    DialogUtils.showVersionNumberDialog(v.getContext(), gameEntity, () -> {
-                                        DownloadDialog.showDownloadDialog(
-                                                v.getContext(),
-                                                gameEntity,
-                                                traceEvent,
-                                                entrance,
-                                                location + ":" + gameEntity.getName());
-                                    });
-                                });
-                            });
-                        });
                     }
                     break;
                 case LAUNCH_OR_OPEN:
@@ -428,7 +453,12 @@ public class BindingAdapters {
                             }
                             return;
                         }
-                        DataUtils.onGameLaunchEvent(v.getContext(), gameEntity.getName(), gameEntity.getApk().get(0).getPlatform(), location);
+
+                        if (gameEntity.isVGame()) {
+                            VHelper.installOrLaunch((AppCompatActivity) v.getContext(), gameEntity.getApk().get(0).getPackageName());
+                            return;
+                        }
+
                         PackageUtils.launchApplicationByPackageName(v.getContext(), gameEntity.getApk().get(0).getPackageName());
                     } else {
                         DownloadDialog.showDownloadDialog(
@@ -442,20 +472,25 @@ public class BindingAdapters {
                 case INSTALL_PLUGIN:
                 case INSTALL_NORMAL:
                     if (gameEntity.getApk().size() == 1) {
-                        DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshotByUrl(gameEntity.getApk().get(0).getUrl());
+                        DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity);
+                        String packageName = gameEntity.getApk().get(0).getPackageName();
+
+                        if (gameEntity.isVGame()) {
+                            VHelper.installOrLaunch(v.getContext(), packageName);
+                            return;
+                        }
+
                         if (downloadEntity != null) {
                             PackageInstaller.install(v.getContext(), downloadEntity);
                         }
                     }
                     break;
                 case RESERVABLE:
-                    RealNameHelper.checkIfAuth(v.getContext(), gameEntity, () -> {
-                        GamePermissionDialogFragment.show((AppCompatActivity) v.getContext(), gameEntity, gameEntity.getInfo(), () -> {
-                            CheckLoginUtils.checkLogin(progressBar.getContext(), "", () -> {
-                                ReservationHelper.reserve(v.getContext(), gameEntity.getId(), () -> {
-                                    LogUtils.logReservation(gameEntity, traceEvent);
-                                    updateReservation(progressBar, gameEntity);
-                                });
+                    GamePermissionDialogFragment.show((AppCompatActivity) v.getContext(), gameEntity, gameEntity.getInfo(), () -> {
+                        CheckLoginUtils.checkLogin(progressBar.getContext(), "", () -> {
+                            ReservationHelper.reserve(v.getContext(), gameEntity.getId(), () -> {
+                                LogUtils.logReservation(gameEntity, traceEvent);
+                                updateReservation(progressBar, gameEntity);
                             });
                         });
                     });
@@ -499,10 +534,10 @@ public class BindingAdapters {
         if (gameEntity.isReservable()) {
             if (!ReservationRepository.thisGameHasBeenReserved(gameEntity.getId())) {
                 progressBar.setText("预约");
-                progressBar.setDownloadType(DownloadProgressBar.DownloadType.RESERVABLE);
+                progressBar.setButtonStyle(DownloadButton.ButtonStyle.RESERVABLE);
             } else {
                 progressBar.setText("已预约");
-                progressBar.setDownloadType(DownloadProgressBar.DownloadType.RESERVED);
+                progressBar.setButtonStyle(DownloadButton.ButtonStyle.RESERVED);
             }
             return;
         }
@@ -517,17 +552,17 @@ public class BindingAdapters {
                 } else {
                     progressBar.setText("查看");
                 }
-                progressBar.setDownloadType(DownloadProgressBar.DownloadType.H5_GAME);
+                progressBar.setButtonStyle(DownloadButton.ButtonStyle.H5_GAME);
             } else {
                 if (offStatus != null && "dialog".equals(offStatus)) {
                     progressBar.setText("查看");
-                    progressBar.setDownloadType(DownloadProgressBar.DownloadType.NONE);
+                    progressBar.setButtonStyle(DownloadButton.ButtonStyle.NONE);
                 } else if ("updating".equals(offStatus)) {
                     progressBar.setText("更新中");
-                    progressBar.setDownloadType(DownloadProgressBar.DownloadType.UPDATING);
+                    progressBar.setButtonStyle(DownloadButton.ButtonStyle.UPDATING);
                 } else {
                     progressBar.setText("暂无");
-                    progressBar.setDownloadType(DownloadProgressBar.DownloadType.NONE);
+                    progressBar.setButtonStyle(DownloadButton.ButtonStyle.NONE);
                 }
             }
 
@@ -535,14 +570,14 @@ public class BindingAdapters {
             String status = GameUtils.getDownloadBtnText(progressBar.getContext(), gameEntity, PluginLocation.only_game);
             switch (status) {
                 case "插件化":
-                    progressBar.setDownloadType(DownloadProgressBar.DownloadType.PLUGIN);
+                    progressBar.setButtonStyle(DownloadButton.ButtonStyle.PLUGIN);
                     break;
                 case "打开":
                 case "启动":
-                    progressBar.setDownloadType(DownloadProgressBar.DownloadType.LAUNCH_OR_OPEN);
+                    progressBar.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
                     break;
                 default:
-                    progressBar.setDownloadType(DownloadProgressBar.DownloadType.NORMAL);
+                    progressBar.setButtonStyle(DownloadButton.ButtonStyle.NORMAL);
                     break;
             }
             progressBar.setText(status);
@@ -550,7 +585,7 @@ public class BindingAdapters {
 
         // 显示下载过程状态
         if (gameEntity.getApk().size() == 1) {
-            DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshotByUrl(gameEntity.getApk().get(0).getUrl());
+            DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity);
             if (downloadEntity != null) {
                 progressBar.setProgress((int) (downloadEntity.getPercent() * 10));
                 switch (downloadEntity.getStatus()) {
@@ -561,18 +596,18 @@ public class BindingAdapters {
                     case waiting:
                         progressBar.setText(R.string.downloading);
                         if (downloadEntity.isPluggable() && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
-                            progressBar.setDownloadType(DownloadProgressBar.DownloadType.DOWNLOADING_PLUGIN);
+                            progressBar.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_PLUGIN);
                         } else {
-                            progressBar.setDownloadType(DownloadProgressBar.DownloadType.DOWNLOADING_NORMAL);
+                            progressBar.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
                         }
                         break;
                     case done:
                         progressBar.setText(R.string.install);
                         if (downloadEntity.isPluggable()
                                 && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
-                            progressBar.setDownloadType(DownloadProgressBar.DownloadType.INSTALL_PLUGIN);
+                            progressBar.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_PLUGIN);
                         } else {
-                            progressBar.setDownloadType(DownloadProgressBar.DownloadType.INSTALL_NORMAL);
+                            progressBar.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
                         }
                         break;
                     case cancel:
@@ -581,6 +616,7 @@ public class BindingAdapters {
                     case uncertificated:
                     case unqualified:
                     case unavailable:
+                    case banned:
                         break;
                     default:
                         break;
@@ -593,9 +629,9 @@ public class BindingAdapters {
      * 当页面完全重建时，若存在重建的DialogFragment，则需要手动恢复该DialogFragment之前配置的回调(因为DialogFragment重建时只会从arguments中获取之前的配置内容，
      * 而arguments无法传递回调)，或者dismiss该DialogFragment
      */
-    private static void restoreDialogFragment(DownloadProgressBar progressBar) {
+    private static void restoreDialogFragment(DownloadButton progressBar) {
         GamePermissionDialogFragment gamePermissionDialogFragment =
-                ((GamePermissionDialogFragment) ((AppCompatActivity) progressBar.getContext()).getSupportFragmentManager().findFragmentByTag(GamePermissionDialogFragment.class.getSimpleName()));
+                ((GamePermissionDialogFragment) ((AppCompatActivity) progressBar.getContext()).getSupportFragmentManager().findFragmentByTag(GamePermissionDialogFragment.class.getName()));
         if (gamePermissionDialogFragment != null) {
             gamePermissionDialogFragment.dismissAllowingStateLoss();
         }
@@ -619,28 +655,28 @@ public class BindingAdapters {
     }*/
 
 
-    private static void updateReservation(DownloadProgressBar progressBar, GameEntity gameEntity) {
+    private static void updateReservation(DownloadButton progressBar, GameEntity gameEntity) {
         // 显示预约
         if (gameEntity.isReservable()) {
             if (!ReservationRepository.thisGameHasBeenReserved(gameEntity.getId())) {
                 progressBar.setText("预约");
-                progressBar.setDownloadType(DownloadProgressBar.DownloadType.RESERVABLE);
+                progressBar.setButtonStyle(DownloadButton.ButtonStyle.RESERVABLE);
             } else {
                 progressBar.setText("已预约");
-                progressBar.setDownloadType(DownloadProgressBar.DownloadType.RESERVED);
+                progressBar.setButtonStyle(DownloadButton.ButtonStyle.RESERVED);
             }
         }
     }
 
 
     // 开始下载
-    private static void download(DownloadProgressBar progressBar,
+    private static void download(DownloadButton progressBar,
                                  GameEntity gameEntity,
                                  ExposureEvent traceEvent,
                                  boolean isSubscribe,
                                  String entrance,
                                  String location) {
-        String str = progressBar.getText();
+        String str = progressBar.getText().toString();
         String method;
         if (str.contains("更新")) {
             method = "更新";
@@ -652,8 +688,6 @@ 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);
-
             DownloadManager.createDownload(progressBar.getContext(),
                     apkEntity,
                     gameEntity,
@@ -664,8 +698,8 @@ public class BindingAdapters {
                     traceEvent);
 
             progressBar.setProgress(0);
-            progressBar.setDownloadType("插件化".equals(method) ?
-                    DownloadProgressBar.DownloadType.DOWNLOADING_PLUGIN : DownloadProgressBar.DownloadType.DOWNLOADING_NORMAL);
+            progressBar.setButtonStyle("插件化".equals(method) ?
+                    DownloadButton.ButtonStyle.DOWNLOADING_PLUGIN : DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
         } else {
             Utils.toast(progressBar.getContext(), msg);
         }
@@ -696,15 +730,16 @@ public class BindingAdapters {
                     tagStyle.add(typeTag);
                 } else {
                     TagStyleEntity typeTag = new TagStyleEntity();
+                    boolean isDarkModeOn = DarkModeUtils.INSTANCE.isDarkModeOn(layout.getContext());
                     typeTag.setName(test.getType() != null ? test.getType() : "");
-                    typeTag.setBackground("FFF3E0");
-                    typeTag.setColor("FA8500");
+                    typeTag.setBackground("1AFFA142");
+                    typeTag.setColor(isDarkModeOn ? "EB9238" : "FFA142");
                     tagStyle.add(typeTag);
 
                     TagStyleEntity timeTag = new TagStyleEntity();
                     timeTag.setName(GameViewUtils.getGameTestDate(test.getStart()));
-                    timeTag.setBackground("E0FFF9");
-                    timeTag.setColor("00A887");
+                    timeTag.setBackground("1A06CEA8");
+                    timeTag.setColor(isDarkModeOn ? "07A385" : "06CEA8");
                     tagStyle.add(timeTag);
                 }
             } else {
@@ -777,7 +812,7 @@ public class BindingAdapters {
     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_80, 999F));
+            mVideoDuration.setBackground(DrawableView.getOvalDrawable(R.color.black_alpha_50, 999F));
             mVideoDuration.setText(videoEntity.getDuration());
             mVideoDuration.setVisibility(View.VISIBLE);
         } else {

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

@@ -6,13 +6,13 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
-import com.gh.base.fragment.BaseDialogFragment
 import com.gh.common.util.DirectUtils
-import com.gh.common.util.EntranceUtils
-import com.gh.common.util.SpanBuilder
-import com.gh.common.util.dip2px
-import com.gh.common.view.CustomLinkMovementMethod
 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
 
 
@@ -27,7 +27,7 @@ class ApplyModeratorDialogFragment : BaseDialogFragment() {
         requireArguments().run {
             mGroupNumber = getString(KEY_GROUP_NUMBER) ?: ""
             mGroupKey = getString(KEY_GROUP_KEY) ?: ""
-            mParentTag = getString(EntranceUtils.KEY_PARENT_TAG) ?: ""
+            mParentTag = getString(EntranceConsts.KEY_PARENT_TAG) ?: ""
         }
     }
 
@@ -45,7 +45,7 @@ class ApplyModeratorDialogFragment : BaseDialogFragment() {
         val startText = "版主考核群："
         val text = "$startText$mGroupNumber\n感谢你对论坛建设的支持\n请加入版主考核群并联系群主进行版主资格考核"
         binding.desTv.text = SpanBuilder(text)
-            .click(startText.length, startText.length + mGroupNumber.length, R.color.theme_font,true) {
+            .click(requireContext(), startText.length, startText.length + mGroupNumber.length, R.color.theme_font,true) {
                 DirectUtils.directToQqGroup(
                     requireContext(),
                     mGroupKey
@@ -83,11 +83,11 @@ class ApplyModeratorDialogFragment : BaseDialogFragment() {
                 arguments = Bundle().apply {
                     putString(KEY_GROUP_NUMBER, number)
                     putString(KEY_GROUP_KEY, key)
-                    putString(EntranceUtils.KEY_PARENT_TAG, tag)
+                    putString(EntranceConsts.KEY_PARENT_TAG, tag)
                 }
             }.show(
                 activity.supportFragmentManager,
-                ApplyModeratorDialogFragment::class.java.simpleName
+                ApplyModeratorDialogFragment::class.java.name
             )
         }
     }

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

@@ -14,21 +14,25 @@ import android.view.View
 import android.widget.CheckBox
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
-import com.gh.common.avoidcallback.AvoidOnResultManager
-import com.gh.common.avoidcallback.Callback
-import com.gh.common.constant.Constants
+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.manager.UserManager
+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: DialogUtils.ConfirmListener) :
+class CertificationDialog(context: Context, private val authDialogEntity: AuthDialogEntity, val gameId: String, val listener: ConfirmListener) :
         Dialog(context, R.style.GhAlertDialog) {
 
     private lateinit var view: View
@@ -134,7 +138,7 @@ class CertificationDialog(context: Context, private val authDialogEntity: AuthDi
                     context,
                     ShellActivity.Type.REAL_NAME_INFO,
                 ).apply {
-                    putExtra(EntranceUtils.KEY_GAME_ID, gameId)
+                    putExtra(EntranceConsts.KEY_GAME_ID, gameId)
                 }, object : Callback {
                     override fun onActivityResult(resultCode: Int, data: Intent?) {
                         if (resultCode == Activity.RESULT_OK && data != null) {
@@ -152,7 +156,7 @@ class CertificationDialog(context: Context, private val authDialogEntity: AuthDi
 
     companion object {
         @JvmStatic
-        fun showCertificationDialog(context: Context, game: GameEntity, listener: DialogUtils.ConfirmListener) {
+        fun showCertificationDialog(context: Context, game: GameEntity, listener: ConfirmListener) {
             //1.先判断是否登录 是执行2 否执行3
             //2.判断是否实名认证 是终止 否执行3
             //3.判断是否需要弹出认证弹窗接口
@@ -168,7 +172,7 @@ class CertificationDialog(context: Context, private val authDialogEntity: AuthDi
         }
 
         @SuppressLint("CheckResult")
-        private fun authDialog(context: Context, game: GameEntity, listener: DialogUtils.ConfirmListener) {
+        private fun authDialog(context: Context, game: GameEntity, listener: ConfirmListener) {
             var authDialog: AuthDialogEntity? = null
             if (game.authDialog != null) {
                 authDialog = game.authDialog

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

@@ -8,7 +8,6 @@ import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.os.Message
-import android.preference.PreferenceManager
 import android.view.LayoutInflater
 import android.view.MotionEvent
 import android.view.View
@@ -19,10 +18,14 @@ import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
 import com.facebook.drawee.view.SimpleDraweeView
-import com.gh.common.constant.Constants
-import com.gh.common.util.*
+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
@@ -49,8 +52,7 @@ class DeviceRemindDialog(context: Context, val entity: DeviceDialogEntity, val g
     private val dataWatcher = object : DataWatcher() {
         override fun onDataChanged(downloadEntity: DownloadEntity) {
             if (downloadEntity.status == DownloadStatus.done && downloadEntity.name == gameEntity.name) {
-                val sp = PreferenceManager.getDefaultSharedPreferences(getContext())
-                val autoInstall = sp.getBoolean(AUTO_INSTALL_SP_KEY, true)
+                val autoInstall = SPUtils.getBoolean(AUTO_INSTALL_SP_KEY, true)
                 if (autoInstall) {
                     dismiss()
                 }

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

@@ -10,18 +10,16 @@ import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.core.text.HtmlCompat
-import com.gh.base.fragment.BaseDialogFragment
+import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
 import com.gh.common.util.DirectUtils
-import com.gh.common.util.dip2px
-import com.gh.common.util.toColor
+import com.gh.gamecenter.common.utils.dip2px
+import com.gh.gamecenter.common.utils.toColor
 import com.gh.gamecenter.R
 import com.gh.gamecenter.databinding.DialogGameOffServiceBinding
 import com.gh.gamecenter.entity.GameEntity
 
 // 游戏关闭下载弹窗
-class GameOffServiceDialogFragment
-//    : BaseTrackableDialogFragment()
-    : BaseDialogFragment() {
+class GameOffServiceDialogFragment : BaseDialogFragment() {
 
     private var mDialog: GameEntity.Dialog? = null
     private var mBinding: DialogGameOffServiceBinding? = null
@@ -59,7 +57,7 @@ class GameOffServiceDialogFragment
                         if (index == notEmptySite.size - 1) bottomMargin = 8F.dip2px()
                     }
                     siteTv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14F)
-                    siteTv.setTextColor(R.color.theme_font.toColor())
+                    siteTv.setTextColor(R.color.theme_font.toColor(requireContext()))
                     siteTv.text = site.text
                     siteTv.paintFlags = siteTv.paintFlags or Paint.UNDERLINE_TEXT_FLAG
                     siteTv.setOnClickListener {
@@ -78,14 +76,6 @@ class GameOffServiceDialogFragment
         return super.onCreateDialog(savedInstanceState).apply { setCanceledOnTouchOutside(true) }
     }
 
-//    override fun getEvent(): String {
-//        return "游戏下载状态按钮"
-//    }
-//
-//    override fun getKey(): String {
-//        return "查看详情弹窗"
-//    }
-
     companion object {
         const val KEY_DIALOG = "dialog"
 

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

@@ -13,16 +13,20 @@ 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.constant.Constants
-import com.gh.common.util.*
-import com.gh.common.util.PermissionHelper.INSTALL_PERMISSION_CODE
 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 : BaseTrackableDialogFragment() {
+class InstallPermissionDialogFragment : BaseDialogFragment() {
 
     lateinit var mView: View
     var isXapk = false
@@ -55,18 +59,15 @@ class InstallPermissionDialogFragment : BaseTrackableDialogFragment() {
         }
 
         closeTv.setOnClickListener {
-            MtaHelper.onEvent(getEvent(), getKey(), "文案样式_点击以后再说")
             if (isXapk) {
                 mCallBack?.invoke(false)
             }
             dismiss()
         }
         closeIv.setOnClickListener {
-            MtaHelper.onEvent(getEvent(), getKey(), "图标样式_点击关闭")
             dismiss()
         }
         activateTv.setOnClickListener {
-            MtaHelper.onEvent(getEvent(), getKey(), if (randomNumber == 0) "文案样式_点击立即开启" else "图标样式_点击立即开启")
             PermissionHelper.toInstallPermissionSetting(requireActivity())
             if (isXapk) {
                 SPUtils.setString(Constants.SP_XAPK_UNZIP_ACTIVITY, requireActivity().javaClass.name)
@@ -87,10 +88,6 @@ class InstallPermissionDialogFragment : BaseTrackableDialogFragment() {
         }
     }
 
-    override fun getEvent(): String = "安装引导弹窗"
-
-    override fun getKey(): String = "引导弹窗"
-
     companion object {
         @JvmStatic
         fun show(activity: AppCompatActivity, downloadEntity: DownloadEntity, callBack: ((isFromPermissionGrantedCallback: Boolean) -> Unit)?) {
@@ -117,7 +114,7 @@ class InstallPermissionDialogFragment : BaseTrackableDialogFragment() {
                     return
                 }
             }
-            var installPermissionDialogFragment = activity.supportFragmentManager.findFragmentByTag(InstallPermissionDialogFragment::class.java.simpleName) as? InstallPermissionDialogFragment
+            var installPermissionDialogFragment = activity.supportFragmentManager.findFragmentByTag(InstallPermissionDialogFragment::class.java.name) as? InstallPermissionDialogFragment
             if (installPermissionDialogFragment != null) {
                 installPermissionDialogFragment.mCallBack = callBack
                 installPermissionDialogFragment.isXapk = isXapk
@@ -131,7 +128,7 @@ class InstallPermissionDialogFragment : BaseTrackableDialogFragment() {
                     this.isXapk = isXapk
                     this.url = downloadEntity.url
                 }
-                installPermissionDialogFragment.show(activity.supportFragmentManager, InstallPermissionDialogFragment::class.java.simpleName)
+                installPermissionDialogFragment.show(activity.supportFragmentManager, InstallPermissionDialogFragment::class.java.name)
             }
         }
     }

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

@@ -0,0 +1,166 @@
+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/PackageCheckDialogFragment.kt

@@ -15,17 +15,24 @@ import androidx.fragment.app.FragmentTransaction
 import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.gh.base.BaseRecyclerViewHolder
-import com.gh.common.constant.Constants
-import com.gh.common.util.*
-import com.gh.common.view.CustomLinkMovementMethod
+import com.gh.common.util.DirectUtils
+import com.gh.common.util.LogUtils
+import com.gh.common.util.PackageUtils
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.R
+import com.gh.gamecenter.common.base.BaseRecyclerViewHolder
+import com.gh.gamecenter.common.callback.ConfirmListener
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.entity.LinkEntity
+import com.gh.gamecenter.common.utils.*
+import com.gh.gamecenter.common.view.CustomLinkMovementMethod
+import com.gh.gamecenter.core.utils.DisplayUtils
+import com.gh.gamecenter.core.utils.SPUtils
+import com.gh.gamecenter.core.utils.SpanBuilder
 import com.gh.gamecenter.databinding.FragmentPackageCheckBinding
 import com.gh.gamecenter.databinding.PackageCheckItemBinding
 import com.gh.gamecenter.entity.DetectionObjectEntity
 import com.gh.gamecenter.entity.GameEntity
-import com.gh.gamecenter.entity.LinkEntity
 import com.gh.gamecenter.entity.PackageDialogEntity
 import com.gh.gamecenter.eventbus.EBPackage
 import com.halo.assistant.HaloApp
@@ -52,7 +59,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
     private var mAdapter: PackageCheckAdapter? = null
     private var mAllInstalledPackages = PackageUtils.getInstalledPackages(HaloApp.getInstance().application, 0)
     var gameEntity: GameEntity? = null
-    var callBack: DialogUtils.ConfirmListener? = null
+    var callBack: ConfirmListener? = null
 
     private val dataWatcher = object : DataWatcher() {
         override fun onDataChanged(downloadEntity: DownloadEntity) {
@@ -101,8 +108,11 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
             val spanBuilder = SpanBuilder(it.linkHintText).build()
             it.links.forEachIndexed { index, link ->
                 val linkSpan = SpanBuilder(link.title ?: "").click(
-                    0, (link.title
-                        ?: "").length, R.color.theme_font, true
+                    requireContext(),
+                    0,
+                    (link.title ?: "").length,
+                    R.color.theme_font,
+                    true
                 ) {
                     LogUtils.uploadPackageCheck("pkg_check_pop_click", "点击链接", gameEntity, link.text, link.title, "", "")
                     DirectUtils.directToLinkPage(requireContext(), link, "包名检测弹窗", "")
@@ -318,7 +328,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
 
     companion object {
         @JvmStatic
-        fun show(activity: AppCompatActivity, gameEntity: GameEntity, callBack: DialogUtils.ConfirmListener) {
+        fun show(activity: AppCompatActivity, gameEntity: GameEntity, callBack: ConfirmListener) {
             val packageDialogEntity = gameEntity.packageDialog
             if (packageDialogEntity == null) {
                 callBack.onConfirm()
@@ -346,12 +356,12 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
             if (!activity.lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED)) return
 
             var dialogFragment =
-                activity.supportFragmentManager.findFragmentByTag(PackageCheckDialogFragment::class.java.simpleName) as? PackageCheckDialogFragment
+                activity.supportFragmentManager.findFragmentByTag(PackageCheckDialogFragment::class.java.name) as? PackageCheckDialogFragment
             if (dialogFragment == null) {
                 dialogFragment = PackageCheckDialogFragment()
                 dialogFragment.gameEntity = gameEntity
                 dialogFragment.callBack = callBack
-                dialogFragment.show(activity.supportFragmentManager, PackageCheckDialogFragment::class.java.simpleName)
+                dialogFragment.show(activity.supportFragmentManager, PackageCheckDialogFragment::class.java.name)
             } else {
                 dialogFragment.gameEntity = gameEntity
                 dialogFragment.callBack = callBack

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

@@ -12,14 +12,14 @@ import android.view.*
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.FragmentTransaction
-import com.gh.base.fragment.BaseDialogFragment
-import com.gh.common.constant.Constants
-import com.gh.common.util.SPUtils
-import com.gh.common.util.dip2px
-import com.gh.common.util.fromHtml
-import com.gh.common.view.CustomLinkMovementMethod
 import com.gh.gamecenter.R
 import com.gh.gamecenter.WebActivity
+import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.utils.dip2px
+import com.gh.gamecenter.common.utils.fromHtml
+import com.gh.gamecenter.common.view.CustomLinkMovementMethod
+import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.databinding.DialogPrivacyProtocolBinding
 import com.gh.gamecenter.entity.DialogEntity
 import com.lightgame.utils.AppManager
@@ -167,7 +167,7 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() {
         fun show(activity: FragmentActivity,
                  privacyPolicyEntity: DialogEntity.PrivacyPolicyEntity? = null,
                  callBack: ((isSuccess: Boolean) -> Unit)?) {
-            var privacyDialogFragment = activity.supportFragmentManager.findFragmentByTag(PrivacyPolicyDialogFragment::class.java.simpleName) as? PrivacyPolicyDialogFragment
+            var privacyDialogFragment = activity.supportFragmentManager.findFragmentByTag(PrivacyPolicyDialogFragment::class.java.name) as? PrivacyPolicyDialogFragment
             if (privacyDialogFragment != null) {
                 privacyDialogFragment.mCallBack = callBack
                 val transaction: FragmentTransaction = activity.supportFragmentManager.beginTransaction()
@@ -183,7 +183,7 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() {
             }
             privacyDialogFragment.show(
                 activity.supportFragmentManager,
-                PrivacyPolicyDialogFragment::class.java.simpleName
+                PrivacyPolicyDialogFragment::class.java.name
             )
         }
     }

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

@@ -1,4 +1,4 @@
-package com.gh.common.view
+package com.gh.common.dialog
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -6,12 +6,13 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.gh.base.BaseRecyclerViewHolder
-import com.gh.base.fragment.BaseDialogFragment
-import com.gh.common.util.ImageUtils
-import com.gh.common.util.fromHtml
+import com.gh.gamecenter.common.base.BaseRecyclerViewHolder
+import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
+import com.gh.gamecenter.common.utils.ImageUtils
+import com.gh.gamecenter.common.utils.fromHtml
 import com.gh.gamecenter.GameDetailActivity
 import com.gh.gamecenter.R
+import com.gh.gamecenter.common.view.FixLinearLayoutManager
 import com.gh.gamecenter.databinding.DialogReserveBinding
 import com.gh.gamecenter.databinding.DialogReserveItemBinding
 import com.gh.gamecenter.entity.SimpleGameEntity

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

@@ -1,384 +0,0 @@
-//package com.gh.common.dialog
-//
-//import android.annotation.SuppressLint
-//import android.app.Application
-//import android.os.Bundle
-//import android.text.Html
-//import android.view.*
-//import android.view.animation.AnimationUtils
-//import android.widget.EditText
-//import android.widget.TextView
-//import androidx.lifecycle.AndroidViewModel
-//import androidx.lifecycle.MutableLiveData
-//import androidx.lifecycle.Observer
-//import butterknife.BindView
-//import butterknife.ButterKnife
-//import butterknife.OnClick
-//import com.gh.base.fragment.BaseDialogFragment
-//import com.gh.common.AppExecutor
-//import com.gh.common.constant.Config
-//import com.gh.common.history.HistoryHelper
-//import com.gh.common.repository.ReservationRepository
-//import com.gh.common.util.*
-//import com.gh.gamecenter.R
-//import com.gh.gamecenter.entity.GameEntity
-//import com.gh.gamecenter.entity.NotificationUgc
-//import com.gh.gamecenter.manager.UserManager
-//import com.gh.gamecenter.retrofit.BiResponse
-//import com.gh.gamecenter.retrofit.RetrofitManager
-//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.JSONArray
-//import org.json.JSONObject
-//
-//// 预约弹窗
-//@Deprecated("v5.6.0废弃")
-//class ReserveDialogFragment
-//    : BaseDialogFragment(), KeyboardHeightObserver {
-////    : BaseTrackableDialogFragment() {
-//
-//    @BindView(R.id.reserve_hint_tv)
-//    lateinit var reserveHintTv: TextView
-//
-//    @BindView(R.id.reserve_content_tv)
-//    lateinit var reserveContentTv: TextView
-//
-//    @BindView(R.id.reserve_completed_content_tv)
-//    lateinit var reserveCompletedContentTv: TextView
-//
-//    @BindView(R.id.mobile_et)
-//    lateinit var mobileEt: EditText
-//
-//    @BindView(R.id.reserve_container)
-//    lateinit var reserveContainer: View
-//
-//    @BindView(R.id.reserve_completed_container)
-//    lateinit var reserveCompletedContainer: View
-//
-//    @BindView(R.id.customizable_btn)
-//    lateinit var customizableBtn: TextView
-//
-//    @BindView(R.id.content_container)
-//    lateinit var contentContainer: View
-//
-//    @BindView(R.id.mobile_index_container)
-//    lateinit var mobileIndexContainer: View
-//
-//    @BindView(R.id.mobile_index_reserve)
-//    lateinit var mobileIndexReserve: TextView
-//
-//    @BindView(R.id.mobile_index_user)
-//    lateinit var mobileIndexUser: TextView
-//
-//    @BindView(R.id.mobile_et_delete)
-//    lateinit var mobileEtDelete: View
-//
-//    @BindView(R.id.layout_container)
-//    lateinit var layoutContainer: View
-//
-//    private lateinit var mViewModel: ReserveViewModel
-//
-//    var successCallback: SuccessCallback? = null
-//
-//    private var mGame: GameEntity? = null
-//    private var mGameId: String = ""
-//    private var mGameName: String = ""
-//
-//    private var mKeyboardHeightProvider: KeyboardHeightProvider? = null
-//
-//    override fun onCreate(savedInstanceState: Bundle?) {
-//        super.onCreate(savedInstanceState)
-//
-//        mGame = requireArguments().getParcelable(EntranceUtils.KEY_GAME)
-//        mGameId = mGame?.id ?:""
-//        mGameName = mGame?.name ?:""
-//
-//        mViewModel = viewModelProvider()
-//        mKeyboardHeightProvider = KeyboardHeightProvider(activity)
-//        mKeyboardHeightProvider?.start()
-//    }
-//
-//    override fun onActivityCreated(savedInstanceState: Bundle?) {
-//        super.onActivityCreated(savedInstanceState)
-//        dialog?.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
-//    }
-//
-//    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-//        return inflater.inflate(R.layout.dialog_reserve_game, null)
-//    }
-//
-////    override fun getEvent(): String {
-////        return "预约游戏"
-////    }
-////
-////    override fun getKey(): String {
-////        return "预约功能操作"
-////    }
-//
-//    @Suppress("DEPRECATION")
-//    @SuppressLint("SetTextI18n")
-//    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-//        super.onViewCreated(view, savedInstanceState)
-//        ButterKnife.bind(this, view)
-//
-//        val reserveContent = "游戏上线，您将收到<font color='#1383EB'>免费短信</font>提醒"
-//        reserveContentTv.text = Html.fromHtml(reserveContent)
-//
-//
-//        mobileEt.setTextChangedListener { s, _, _, _ ->
-//            mobileIndexContainer.visibility = View.GONE
-//            mobileEtDelete.goneIf(s.trim().isEmpty())
-//        }
-//
-//        mViewModel.reservation.observeNonNull(this) {
-//            if (it.success) {
-//                showSuccessDialog(it.withMobile, it.boundWechat)
-//                successCallback?.onSuccess()
-//                HistoryHelper.insertGameEntity(mGame!!)
-//            }
-//        }
-//
-//        mViewModel.reserveMobile.observe(viewLifecycleOwner, Observer {
-//            setMobileIndexHint(it)
-//        })
-//
-//        dialog?.setCanceledOnTouchOutside(true)
-//    }
-//
-//    private fun showSuccessDialog(withMobile: Boolean, boundWechat: Boolean) {
-//        reserveHintTv.text = "游戏预约成功"
-//        reserveContainer.visibility = View.GONE
-//        reserveCompletedContainer.visibility = View.VISIBLE
-//
-//        val reservation = Config.getSettings()?.appointment
-//        val dialogConfig = if (withMobile) reservation?.withMobile else reservation?.withoutMobile
-//
-//        reserveCompletedContentTv.text = dialogConfig?.htmlContent?.fromHtml()
-//        if (dialogConfig?.text.isNullOrEmpty()
-//                || (dialogConfig?.type == "wechat_bind" && boundWechat)) {
-//            customizableBtn.visibility = View.GONE
-//        } else {
-//            customizableBtn.text = dialogConfig?.text
-//            customizableBtn.setOnClickListener {
-////                MtaHelper.onEvent("预约游戏", "预约功能操作", "点击跳转按钮")
-//                DirectUtils.directToLinkPage(
-//                        requireContext(),
-//                        dialogConfig!!.toLinkEntity(),
-//                        "(游戏预约)",
-//                        "")
-//                dismissAllowingStateLoss()
-//            }
-//        }
-//    }
-//
-//    private fun setMobileIndexHint(reserveMobile: String?) {
-//        var userMobile = UserManager.getInstance().userInfoEntity?.mobile
-//        if (reserveMobile == userMobile) userMobile = null
-//
-//        if (!reserveMobile.isNullOrEmpty()) {
-//            mobileIndexReserve.visibility = View.VISIBLE
-//            mobileIndexReserve.text = reserveMobile
-//        } else {
-//            mobileIndexReserve.visibility = View.GONE
-//        }
-//
-//        if (!userMobile.isNullOrEmpty()) {
-//            mobileIndexUser.visibility = View.VISIBLE
-//            mobileIndexUser.text = userMobile
-//        } else {
-//            mobileIndexUser.visibility = View.GONE
-//        }
-//        mobileIndexContainer.goneIf(mobileIndexUser.visibility == View.GONE && mobileIndexReserve.visibility == View.GONE)
-//        if (mobileIndexContainer.visibility ==View.VISIBLE) {
-//            mobileIndexContainer.animation = AnimationUtils.loadAnimation(requireContext(), R.anim.reserve_dialog_index_anim)
-//        }
-//    }
-//
-//    @OnClick(R.id.reserve_with_mobile_btn,
-//            R.id.reserve_without_mobile_btn,
-//            R.id.content_container,
-//            R.id.close_btn,
-//            R.id.customizable_btn,
-//            R.id.mobile_index_reserve,
-//            R.id.mobile_index_user,
-//            R.id.mobile_et_delete,
-//            R.id.mobile_et,
-//            R.id.layout_container)
-//    fun onClick(view: View) {
-//        when (view.id) {
-//            R.id.reserve_without_mobile_btn -> {
-////                MtaHelper.onEvent("预约游戏", "预约功能操作", "点击无手机号预约")
-//                if (mobileIndexContainer.visibility == View.VISIBLE) {
-//                    mobileIndexContainer.visibility = View.GONE
-//                    return
-//                }
-//
-//                mViewModel.reserve(gameId = mGameId, gameName = mGameName)
-//            }
-//
-//            R.id.reserve_with_mobile_btn -> {
-//                if (mobileIndexContainer.visibility == View.VISIBLE) {
-//                    mobileIndexContainer.visibility = View.GONE
-//                    return
-//                }
-//
-//                val mobile = mobileEt.text.toString()
-//                if (mobile.length < 11 || !mobile.startsWith("1")) {
-//                    Utils.toast(context, "手机号格式错误，请检查并重新输入")
-//                    return
-//                }
-//
-////                MtaHelper.onEvent("预约游戏", "预约功能操作", "点击立即预约")
-//                mViewModel.reserve(gameId = mGameId, gameName = mGameName, mobile = mobile)
-//            }
-//
-//            R.id.close_btn -> {
-////                MtaHelper.onEvent("预约游戏", "预约功能操作", "点击关闭")
-//                dismissAllowingStateLoss()
-//                AppExecutor.uiExecutor.executeWithDelay(Runnable {
-//                    NotificationHelper.showNotificationHintDialog(NotificationUgc.RESERVE_GAME)
-//                }, 1000)
-//            }
-//            R.id.content_container -> {
-//                mobileIndexContainer.visibility = View.GONE
-//            }
-//            R.id.mobile_index_reserve -> {
-//                mobileEt.setText(mobileIndexReserve.text.toString())
-//                mobileEt.setSelection(mobileEt.text.length)
-//                mobileIndexContainer.visibility = View.GONE
-//            }
-//            R.id.mobile_index_user -> {
-//                mobileEt.setText(mobileIndexUser.text.toString())
-//                mobileEt.setSelection(mobileEt.text.length)
-//                mobileIndexContainer.visibility = View.GONE
-//            }
-//            R.id.mobile_et_delete -> {
-//                mobileEt.setText("")
-//            }
-//            R.id.mobile_et -> {
-//                mobileIndexContainer.visibility = View.GONE
-//            }
-//            R.id.layout_container -> {
-//                dismissAllowingStateLoss()
-//            }
-//        }
-//    }
-//
-//    override fun onResume() {
-//        super.onResume()
-//        if (HaloApp.getInstance().mCacheKeyboardHeight > 0) {
-//            val attributes = dialog?.window?.attributes
-//            val heightPixels = requireContext().resources.displayMetrics.heightPixels
-//            val mCacheKeyboardHeight = HaloApp.getInstance().mCacheKeyboardHeight
-//            val statusBarHeight = DisplayUtils.getStatusBarHeight(requireContext().resources)
-//            dialog?.window?.attributes?.height = heightPixels - mCacheKeyboardHeight - statusBarHeight
-//            attributes?.gravity = Gravity.TOP
-//            dialog?.window?.attributes = attributes
-//        }
-//        mKeyboardHeightProvider?.setKeyboardHeightObserver(this)
-//    }
-//
-//    override fun onPause() {
-//        super.onPause()
-//        mKeyboardHeightProvider?.setKeyboardHeightObserver(null)
-//    }
-//
-//    override fun onDestroy() {
-//        super.onDestroy()
-//        mKeyboardHeightProvider?.close()
-//    }
-//
-//    override fun onKeyboardHeightChanged(height: Int, orientation: Int) {
-//        if (height > 0) {
-//            val attributes = dialog?.window?.attributes
-//            attributes?.gravity = Gravity.CENTER
-//            dialog?.window?.attributes = attributes
-//            HaloApp.getInstance().mCacheKeyboardHeight = height
-//        }
-//    }
-//
-//    companion object {
-//        @JvmStatic
-//        fun getInstance(gameEntity: GameEntity, successCallback: SuccessCallback) = ReserveDialogFragment().apply {
-//            arguments = Bundle().apply {
-//                putParcelable(EntranceUtils.KEY_GAME, gameEntity)
-//            }
-//            this.successCallback = successCallback
-//        }
-//    }
-//
-//    interface SuccessCallback {
-//        fun onSuccess()
-//    }
-//}
-//
-//class ReserveViewModel(application: Application) : AndroidViewModel(application) {
-//    val reservation = MutableLiveData<Reservation>()
-//
-//    val reserveMobile = MutableLiveData<String>()
-//
-//    init {
-//        getAppointmentMobile()
-//    }
-//
-//    @SuppressLint("CheckResult")
-//    fun reserve(gameId: String, gameName: String, mobile: String = "") {
-//
-//        val requestMap = hashMapOf<String, String>()
-//        requestMap["game_id"] = gameId
-//        if (mobile.isNotEmpty()) {
-//            requestMap["mobile"] = mobile
-//        }
-//
-//        RetrofitManager.getInstance().api
-//                .createNewGameReservation(requestMap.createRequestBody())
-//                .subscribeOn(Schedulers.io())
-//                .subscribe(object : BiResponse<ResponseBody>() {
-//                    override fun onSuccess(data: ResponseBody) {
-//                        var boundWechat = false
-//                        tryWithDefaultCatch {
-//                            boundWechat = JSONObject(data.string() ?: "").getBoolean("wechat_bind")
-//                        }
-//
-//                        reservation.postValue(Reservation(success = true, withMobile = mobile.isNotEmpty(), boundWechat = boundWechat))
-//                        ReservationRepository.addReservationToMemoryAndRefresh(gameId)
-//
-////                        MtaHelper.onEvent("预约游戏", "预约", gameName)
-//                    }
-//
-//                    override fun onFailure(exception: Exception) {
-//                        Utils.toast(getApplication(), exception.message)
-//                    }
-//                })
-//    }
-//
-//    @SuppressLint("CheckResult")
-//    private fun getAppointmentMobile() {
-//        RetrofitManager.getInstance().api
-//                .getAppointmentMobile(UserManager.getInstance().userId)
-//                .subscribeOn(Schedulers.io())
-//                .observeOn(AndroidSchedulers.mainThread())
-//                .subscribe(object : BiResponse<ResponseBody>() {
-//                    override fun onSuccess(data: ResponseBody) {
-//                        var mobile: String? = null
-//                        tryCatchInRelease {
-//                            val jsonArray = JSONArray(data.string())
-//                            if (jsonArray.length() > 0) {
-//                                mobile = jsonArray.get(0).toString()
-//                            }
-//                        }
-//
-//                        reserveMobile.postValue(mobile)
-//                    }
-//
-//                    override fun onFailure(exception: Exception) {
-//                        reserveMobile.postValue(null)
-//                    }
-//                })
-//    }
-//
-//    class Reservation(var success: Boolean = false, var withMobile: Boolean = false, var boundWechat: Boolean = false)
-//}

app/src/main/java/com/gh/common/exposure/ExposureConverters.kt

@@ -1,61 +0,0 @@
-package com.gh.common.exposure
-
-import androidx.room.TypeConverter
-import com.gh.common.exposure.meta.Meta
-import com.gh.common.util.GsonUtils
-import java.util.*
-import kotlin.collections.ArrayList
-
-class ExposureConverters {
-
-    @TypeConverter
-    fun convertPayload2String(any: ExposureEntity): String {
-        return GsonUtils.toJson(any)
-    }
-
-    @TypeConverter
-    fun convertString2Payload(string: String): ExposureEntity {
-        return GsonUtils.fromJson(string, ExposureEntity::class.java)
-    }
-
-    @TypeConverter
-    fun convertSource2String(sourceList: List<ExposureSource>): String {
-        return GsonUtils.toJson(sourceList)
-    }
-
-    @TypeConverter
-    fun convertString2Source(sourceList: String): List<ExposureSource> {
-        return ArrayList(Arrays.asList(GsonUtils.fromJson(sourceList, Array<ExposureSource>::class.java))) as List<ExposureSource>
-    }
-
-    @TypeConverter
-    fun convertETrace2String(sourceList: List<ExposureEvent>?): String {
-        return GsonUtils.toJson(sourceList)
-    }
-
-    @TypeConverter
-    fun convertStringToETrace(sourceList: String): List<ExposureEvent> {
-        return ArrayList(Arrays.asList(GsonUtils.fromJson(sourceList, Array<ExposureEvent>::class.java))) as List<ExposureEvent>
-    }
-
-    @TypeConverter
-    fun convertExposeType2String(exposureType: ExposureType): String {
-        return exposureType.toString()
-    }
-
-    @TypeConverter
-    fun convertStringToExposeType(exposureType: String): ExposureType {
-        return ExposureType.valueOf(exposureType)
-    }
-
-    @TypeConverter
-    fun convertMeta2String(any: Meta): String {
-        return GsonUtils.toJson(any)
-    }
-
-    @TypeConverter
-    fun convertString2Meta(string: String): Meta {
-        return GsonUtils.fromJson(string, Meta::class.java)
-    }
-
-}

app/src/main/java/com/gh/common/exposure/ExposureDatabase.kt

@@ -1,23 +0,0 @@
-package com.gh.common.exposure
-
-import androidx.room.Database
-import androidx.room.Room
-import androidx.room.RoomDatabase
-import androidx.room.TypeConverters
-import android.content.Context
-
-@TypeConverters(ExposureConverters::class)
-@Database(entities = [ExposureEvent::class], version = 1, exportSchema = false)
-abstract class ExposureDatabase : RoomDatabase() {
-    companion object {
-        private const val DATABASE = "exposure_database"
-
-        fun buildDatabase(context: Context): ExposureDatabase {
-            return Room.databaseBuilder(context, ExposureDatabase::class.java, DATABASE)
-                    .fallbackToDestructiveMigration()
-                    .build()
-        }
-    }
-
-    abstract fun logHubEventDao(): ExposureEventDao
-}

app/src/main/java/com/gh/common/exposure/ExposureEvent.kt

@@ -2,34 +2,135 @@ package com.gh.common.exposure
 
 import android.os.Parcelable
 import androidx.annotation.Keep
-import androidx.room.Entity
 import androidx.room.PrimaryKey
-import com.gh.common.constant.Constants
-import com.gh.common.exposure.meta.Meta
-import com.gh.common.exposure.meta.MetaUtil
 import com.gh.common.exposure.time.TimeUtil
-import com.gh.common.util.getFirstElementDividedByDivider
 import com.gh.download.server.BrowserInstallHelper
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.entity.ExposureEntity
+import com.gh.gamecenter.common.exposure.meta.Meta
+import com.gh.gamecenter.common.exposure.meta.MetaUtil
+import com.gh.gamecenter.common.utils.getFirstElementDividedByDivider
 import com.gh.gamecenter.entity.GameEntity
 import com.lightgame.download.DownloadEntity
+import com.lightgame.utils.Utils
+import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 import java.util.*
-import kotlin.collections.ArrayList
 
 @Keep
 @Parcelize
-@Entity(tableName = "exposureEvent")
 data class ExposureEvent(
     var payload: ExposureEntity,
-    val source: List<ExposureSource>,
+    var source: List<ExposureSource>,
     var eTrace: List<ExposureEvent>? = arrayListOf(),
-    val event: ExposureType,
+    var event: ExposureType,
     val meta: Meta = MetaUtil.getMeta(),
-    val time: Int = TimeUtil.currentTime(),
+    var time: Int = TimeUtil.currentTime(),
+    var timeInMillisecond: Long = System.currentTimeMillis(),
     @PrimaryKey
-    val id: String = UUID.randomUUID().toString()
+    var id: String = UUID.randomUUID().toString(),
 ) : Parcelable {
+
+    @Transient
+    @IgnoredOnParcel
+    var next: ExposureEvent? = null
+
+    @Transient
+    @IgnoredOnParcel
+    var flags = 0
+
+    private fun initExposureEventData(
+        gameEntity: GameEntity?,
+        source: List<ExposureSource>,
+        eTrace: List<ExposureEvent>? = null,
+        event: ExposureType = ExposureType.EXPOSURE
+    ) {
+        this.payload = ExposureEntity(
+            gameId = gameEntity?.id?.getFirstElementDividedByDivider(DownloadEntity.GAME_ID_DIVIDER),
+            gameName = eTrace?.firstOrNull()?.payload?.gameName
+                ?: gameEntity?.name?.removeSuffix(Constants.GAME_NAME_DECORATOR),
+            gameVersion = eTrace?.firstOrNull()?.payload?.gameVersion
+                ?: gameEntity?.gameVersion,
+            subjectId = eTrace?.firstOrNull()?.payload?.subjectId
+                ?: gameEntity?.subjectId
+                ?: gameEntity?.subjectData?.id,
+            isMirrorData = eTrace?.firstOrNull()?.payload?.isMirrorData
+                ?: gameEntity?.shouldUseMirrorInfo() ?: false,
+            isWebDownload = BrowserInstallHelper.isUseBrowserToInstallEnabled() && BrowserInstallHelper.shouldUseBrowserToInstall(), // 实时的值，不用从 eTrace 里取
+            sequence = eTrace?.firstOrNull()?.payload?.sequence ?: gameEntity?.sequence,
+            outerSequence = eTrace?.firstOrNull()?.payload?.outerSequence
+                ?: gameEntity?.outerSequence,
+            platform = eTrace?.firstOrNull()?.payload?.platform ?: gameEntity?.platform,
+            downloadType = gameEntity?.downloadType,
+            downloadCompleteType = gameEntity?.downloadCompleteType,
+            displayType = eTrace?.firstOrNull()?.payload?.displayType
+                ?: gameEntity?.displayContent,
+            isPlatformRecommend = gameEntity?.isPlatformRecommend,
+            // ugly
+            welcomeDialogId = gameEntity?.welcomeDialogId
+                ?: eTrace?.firstOrNull()?.payload?.welcomeDialogId,
+            welcomeDialogLinkTitle = gameEntity?.welcomeDialogTitle
+                ?: eTrace?.firstOrNull()?.payload?.welcomeDialogLinkTitle
+        )
+        this.id = UUID.randomUUID().toString()
+        this.timeInMillisecond = System.currentTimeMillis()
+        this.time = TimeUtil.currentTime()
+        this.source = source
+        this.eTrace = eTrace
+        this.event = event
+        this.also {
+            it.payload.categoryId = eTrace?.firstOrNull()?.payload?.categoryId
+            it.payload.categoryV2Id = eTrace?.firstOrNull()?.payload?.categoryV2Id
+            it.payload.testServerId = eTrace?.firstOrNull()?.payload?.testServerId
+            it.payload.blockId = eTrace?.firstOrNull()?.payload?.blockId
+
+            it.payload.setContainerInfo(
+                eTrace?.firstOrNull()?.payload?.containerId ?: gameEntity?.containerId,
+                eTrace?.firstOrNull()?.payload?.containerType ?: gameEntity?.containerType
+            )
+
+            it.payload.sourcePage = eTrace?.firstOrNull()?.payload?.sourcePage
+            it.payload.sourcePageId = eTrace?.firstOrNull()?.payload?.sourcePageId
+            it.payload.sourcePageName = eTrace?.firstOrNull()?.payload?.sourcePageName
+            gameEntity?.exposureEvent = it
+        }
+    }
+
+    fun recycle() {
+        if (inUse()) {
+            Utils.log(
+                EXPOSURE_EVENT_LOG_TAG,
+                "This ExposureEvent $this cannot be recycled because it is still in use."
+            )
+            return
+        }
+        recycleUnchecked()
+    }
+
+    private fun recycleUnchecked() {
+        this.flags = FLAG_IN_USE
+        synchronized(sPoolSync) {
+            if (sPoolSize < EXPOSURE_EVENT_MAX_POOL_SIZE) {
+                next = sPool
+                sPool = this
+                sPoolSize++
+                Utils.log(EXPOSURE_EVENT_LOG_TAG, "This ExposureEvent $this Recycled")
+            }
+        }
+    }
+
+    private fun inUse(): Boolean {
+        return flags == FLAG_IN_USE
+    }
+
     companion object {
+        private val sPoolSync = Any()
+        private var sPool: ExposureEvent? = null
+        private var sPoolSize: Int = 0
+
+        private const val EXPOSURE_EVENT_MAX_POOL_SIZE: Int = 300
+        private const val FLAG_IN_USE = 1
+        private const val EXPOSURE_EVENT_LOG_TAG = "ExposureEvent"
 
         @JvmStatic
         fun createEvent(
@@ -41,54 +142,33 @@ data class ExposureEvent(
             if (gameEntity?.getApk()?.size == 1) {
                 gameEntity.gameVersion = gameEntity.getApk().elementAtOrNull(0)?.version ?: ""
             }
-            return ExposureEvent(
-                payload = ExposureEntity(
-                    gameId = gameEntity?.id?.getFirstElementDividedByDivider(DownloadEntity.GAME_ID_DIVIDER),
-                    gameName = eTrace?.firstOrNull()?.payload?.gameName
-                        ?: gameEntity?.name?.removeSuffix(Constants.GAME_NAME_DECORATOR),
-                    gameVersion = eTrace?.firstOrNull()?.payload?.gameVersion
-                        ?: gameEntity?.gameVersion,
-                    subjectId = eTrace?.firstOrNull()?.payload?.subjectId
-                        ?: gameEntity?.subjectId
-                        ?: gameEntity?.subjectData?.id,
-                    isMirrorData = eTrace?.firstOrNull()?.payload?.isMirrorData
-                        ?: gameEntity?.shouldUseMirrorInfo() ?: false,
-                    isWebDownload = BrowserInstallHelper.isUseBrowserToInstallEnabled() && BrowserInstallHelper.shouldUseBrowserToInstall(), // 实时的值，不用从 eTrace 里取
-                    sequence = eTrace?.firstOrNull()?.payload?.sequence ?: gameEntity?.sequence,
-                    outerSequence = eTrace?.firstOrNull()?.payload?.outerSequence
-                        ?: gameEntity?.outerSequence,
-                    platform = eTrace?.firstOrNull()?.payload?.platform ?: gameEntity?.platform,
-                    downloadType = gameEntity?.downloadType,
-                    downloadCompleteType = gameEntity?.downloadCompleteType,
-                    displayType = eTrace?.firstOrNull()?.payload?.displayType
-                        ?: gameEntity?.displayContent,
-                    isPlatformRecommend = gameEntity?.isPlatformRecommend,
-                    // ugly
-                    welcomeDialogId = gameEntity?.welcomeDialogId
-                        ?: eTrace?.firstOrNull()?.payload?.welcomeDialogId,
-                    welcomeDialogLinkTitle = gameEntity?.welcomeDialogTitle
-                        ?: eTrace?.firstOrNull()?.payload?.welcomeDialogLinkTitle
-                ),
+            synchronized(sPoolSync) {
+                if (sPool != null) {
+                    val exposureEvent = sPool
+                    sPool = exposureEvent?.next
+                    exposureEvent?.next = null
+                    exposureEvent?.flags = 0
+                    sPoolSize--
+                    exposureEvent?.initExposureEventData(gameEntity, source, eTrace, event)
+                    Utils.log(
+                        EXPOSURE_EVENT_LOG_TAG,
+                        "ExposureEvent 对象 $this 正在被循环使用, 当前对象池数量还有 $sPoolSize"
+                    )
+                    return exposureEvent!!
+                }
+            }
+            Utils.log(
+                EXPOSURE_EVENT_LOG_TAG,
+                "new ExposureEvent 对象"
+            )
+            val exposureEvent = ExposureEvent(
+                payload = ExposureEntity(),
                 source = source,
                 eTrace = eTrace,
                 event = event
-            ).also {
-                it.payload.categoryId = eTrace?.firstOrNull()?.payload?.categoryId
-                it.payload.categoryV2Id = eTrace?.firstOrNull()?.payload?.categoryV2Id
-                it.payload.testServerId = eTrace?.firstOrNull()?.payload?.testServerId
-                it.payload.blockId = eTrace?.firstOrNull()?.payload?.blockId
-
-                it.payload.setContainerInfo(
-                    eTrace?.firstOrNull()?.payload?.containerId ?: gameEntity?.containerId,
-                    eTrace?.firstOrNull()?.payload?.containerType ?: gameEntity?.containerType
-                )
-
-                it.payload.sourcePage = eTrace?.firstOrNull()?.payload?.sourcePage
-                it.payload.sourcePageId = eTrace?.firstOrNull()?.payload?.sourcePageId
-                it.payload.sourcePageName = eTrace?.firstOrNull()?.payload?.sourcePageName
-
-                gameEntity?.exposureEvent = it
-            }
+            )
+            exposureEvent.initExposureEventData(gameEntity, source, eTrace, event)
+            return exposureEvent
         }
 
         @JvmStatic

app/src/main/java/com/gh/common/exposure/ExposureEventDao.kt

@@ -1,18 +0,0 @@
-package com.gh.common.exposure
-
-import androidx.room.*
-
-@Dao
-interface ExposureEventDao {
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    fun insertMany(eventList: List<ExposureEvent>)
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    fun insert(event: ExposureEvent)
-
-    @Query("SELECT * FROM exposureEvent")
-    fun getAll(): List<ExposureEvent>
-
-    @Delete
-    fun deleteMany(eventList: List<ExposureEvent>)
-}

app/src/main/java/com/gh/common/exposure/ExposureManager.kt

@@ -1,13 +1,11 @@
 package com.gh.common.exposure
 
 import com.aliyun.sls.android.producer.Log
-import com.gh.common.loghub.LoghubHelper
-import com.gh.common.util.toJson
-import com.gh.common.util.tryWithDefaultCatch
 import com.gh.gamecenter.BuildConfig
-import com.halo.assistant.HaloApp
+import com.gh.gamecenter.common.loghub.LoghubHelper
+import com.gh.gamecenter.common.utils.FixedSizeLinkedHashSet
+import com.gh.gamecenter.common.utils.toJson
 import com.lightgame.utils.Utils
-import java.util.concurrent.ExecutorService
 
 /**
  * A handful tool for committing logs to aliyun loghub.
@@ -25,40 +23,17 @@ object ExposureManager {
 
     // exposureCache 用来过滤掉具有相同 id 的曝光事件，避免重复发送事件
     private val exposureSet by lazy { hashSetOf<ExposureEvent>() }
-    private var exposureExecutor: ExecutorService? = null
     private val exposureCache by lazy { FixedSizeLinkedHashSet<String>(300) }
-    private val exposureDao by lazy { ExposureDatabase.buildDatabase(HaloApp.getInstance().application).logHubEventDao() }
-
-    @JvmStatic
-    fun init(excutor: ExecutorService) {
-        exposureExecutor = excutor
-        exposureExecutor?.execute {
-            tryWithDefaultCatch {
-                val eventList = exposureDao.getAll()
-                exposureSet.addAll(eventList)
-            }
-        }
-    }
 
     /**
      * Log a single exposure event.
      */
     fun log(event: ExposureEvent) {
-        exposureExecutor?.execute {
-            try {
-                if (!exposureCache.contains(event.id)) {
-                    // Catch `android.database.sqlite.SQLiteFullException: database or disk is full` exception.
-
-                    exposureSet.add(event)
-                    exposureDao.insert(event)
-                    exposureCache.add(event.id)
-
-                } else {
-                    Utils.log("Exposure", "遇到重复曝光事件，自动过滤 （${event.id} - ${event.payload.gameName}）")
-                }
-            } catch (e: Exception) {
-                e.printStackTrace()
-            }
+        if (!exposureCache.contains(event.id)) {
+            exposureSet.add(event)
+            exposureCache.add(event.id)
+        } else {
+            Utils.log("Exposure", "遇到重复曝光事件，自动过滤 （${event.id} - ${event.payload.gameName}）")
         }
     }
 
@@ -66,51 +41,37 @@ object ExposureManager {
      * Log a collection of exposure event.
      */
     fun log(eventList: List<ExposureEvent>) {
-        exposureExecutor?.execute {
-            for (event in eventList) {
-                try {
-                    if (!exposureCache.contains(event.id)) {
-                        // Catch `android.database.sqlite.SQLiteFullException: database or disk is full` exception.
-                        exposureSet.add(event)
-                        exposureDao.insert(event)
-                        exposureCache.add(event.id)
-                    } else {
-                        Utils.log("Exposure", "遇到重复曝光事件，自动过滤 （${event.id} - ${event.payload.gameName}）")
-                    }
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                }
+        for (event in eventList) {
+            if (!exposureCache.contains(event.id)) {
+                exposureSet.add(event)
+                exposureCache.add(event.id)
+            } else {
+                Utils.log("Exposure", "遇到重复曝光事件，自动过滤 （${event.id} - ${event.payload.gameName}）")
             }
-            commitSavedExposureEvents()
         }
+        commitSavedExposureEvents()
     }
 
     /**
-     * @param forced Ignore all restrictions.
+     * @param forcedUpload Ignore all restrictions.
      */
-    fun commitSavedExposureEvents(forced: Boolean = false) {
-        exposureExecutor?.execute {
-            tryWithDefaultCatch {
-                // TODO 初始化 loghubHelper 去掉这个 tryCatch 块
-                if (exposureSet.size < STORE_SIZE && !forced || exposureSet.size == 0) return@execute
+    fun commitSavedExposureEvents(forcedUpload: Boolean = false) {
+        if (exposureSet.size < STORE_SIZE && !forcedUpload || exposureSet.size == 0) return
 
-                val exposureList = exposureSet.toList()
-                uploadExposures(exposureList)
+        uploadExposures(exposureSet.toList(), forcedUpload)
 
-                Utils.log("Exposure", "提交了${exposureList.size}条曝光记录")
-                exposureSet.removeAll(exposureList)
-                exposureDao.deleteMany(exposureList)
-            }
-        }
+        Utils.log("Exposure", "提交了${exposureSet.size}条曝光记录")
+        exposureSet.clear()
     }
 
     private fun eliminateMultipleBrackets(jsonWithMultipleBracket: String): String {
         return jsonWithMultipleBracket.replace("[[", "[").replace("]]", "]")
     }
 
-    private fun uploadExposures(eventList: List<ExposureEvent>) {
+    private fun uploadExposures(eventList: List<ExposureEvent>, forced: Boolean) {
         eventList.forEach {
-            LoghubHelper.uploadLog(buildLog(it), LOG_STORE)
+            LoghubHelper.uploadLog(buildLog(it), LOG_STORE, forced)
+            it.recycle()
         }
     }
 
@@ -120,25 +81,13 @@ object ExposureManager {
         putContent("event", event.event.toString())
         putContent("source", eliminateMultipleBrackets(event.source.toJson()))
         putContent("meta", event.meta.toJson())
-        putContent("e-traces", if (event.eTrace != null) {
-            eliminateMultipleBrackets(event.eTrace?.toJson() ?: "")
-        } else "")
+        putContent("real_millisecond", event.timeInMillisecond.toString())
+        putContent(
+            "e-traces", if (event.eTrace != null) {
+                eliminateMultipleBrackets(event.eTrace?.toJson() ?: "")
+            } else ""
+        )
         logTime = event.time.toLong()
     }
 
-    class FixedSizeLinkedHashSet<T>(var maxSize: Int) : LinkedHashSet<T>() {
-        override fun add(element: T): Boolean {
-            if (size == maxSize) {
-                pop()
-            }
-            return super.add(element);
-        }
-
-        private fun pop() {
-            if (size > 0) {
-                remove(iterator().next())
-            }
-        }
-    }
-
 }

app/src/main/java/com/gh/common/exposure/ExposureUtils.kt

@@ -3,15 +3,17 @@ package com.gh.common.exposure
 import android.text.TextUtils
 import com.g00fy2.versioncompare.Version
 import com.gh.common.util.PackageUtils
-import com.gh.common.util.toObject
+import com.gh.gamecenter.common.utils.FixedSizeLinkedHashSet
+import com.gh.gamecenter.common.utils.toObject
 import com.gh.gamecenter.entity.ApkEntity
 import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.manager.PackagesManager
 import com.halo.assistant.HaloApp
 import com.lightgame.download.DownloadEntity
 
 object ExposureUtils {
 
-    private val mDownloadCompleteTraceEventIdSet = ExposureManager.FixedSizeLinkedHashSet<String>(3)
+    private val mDownloadCompleteTraceEventIdSet = FixedSizeLinkedHashSet<String>(3)
 
     @JvmStatic
     fun logADownloadExposureEvent(
@@ -74,44 +76,41 @@ object ExposureUtils {
         exposureEvent.payload.host = host
         exposureEvent.payload.path = path
         ExposureManager.log(exposureEvent)
-        ExposureManager.commitSavedExposureEvents(forced = true)
+        ExposureManager.commitSavedExposureEvents(forcedUpload = true)
     }
 
     @JvmStatic
-    fun getDownloadType(apkEntity: ApkEntity, gameId: String): DownloadType {
-        return if (PackageUtils.isInstalled(
+    fun getDownloadType(apkEntity: ApkEntity, gameId: String, isVGame: Boolean): DownloadType {
+        return when {
+            isVGame -> getVGameDownloadType(apkEntity, gameId)
+            PackageUtils.isInstalled(
                 HaloApp.getInstance().application,
                 apkEntity.packageName
-            )
-        ) {
-            if (PackageUtils.isSignedByGh(
-                    HaloApp.getInstance().application,
-                    apkEntity.packageName
-                )
-            ) {
-                if (PackageUtils.isCanUpdate(apkEntity, gameId)) {
-                    DownloadType.PLUGIN_UPDATE
-                } else {
-                    if (Version(apkEntity.version).isHigherThan(
-                            PackageUtils.getVersionNameByPackageName(
-                                apkEntity.packageName
-                            )
-                        )
-                    ) {
-                        DownloadType.UPDATE
-                    } else {
-                        DownloadType.DOWNLOAD
-                    }
-                }
-            } else {
-                if (!TextUtils.isEmpty(apkEntity.ghVersion)) {
-                    DownloadType.PLUGIN_DOWNLOAD
-                } else {
-                    DownloadType.UPDATE
-                }
-            }
-        } else {
-            DownloadType.DOWNLOAD
+            ) -> getInstallDownloadType(apkEntity, gameId)
+            else -> DownloadType.DOWNLOAD
+        }
+    }
+
+    private fun getVGameDownloadType(apkEntity: ApkEntity, gameId: String): DownloadType {
+        return when {
+            PackagesManager.isCanUpdate(gameId, apkEntity.packageName) -> DownloadType.FUN_UPDATE
+            else -> DownloadType.FUN_DOWNLOAD
+        }
+    }
+
+    private fun getInstallDownloadType(apkEntity: ApkEntity, gameId: String): DownloadType {
+        return when {
+            PackageUtils.isSignedByGh(HaloApp.getInstance().application, apkEntity.packageName) -> getUpdateDownloadType(apkEntity, gameId)
+            !TextUtils.isEmpty(apkEntity.ghVersion) -> DownloadType.PLUGIN_DOWNLOAD
+            else -> DownloadType.UPDATE
+        }
+    }
+
+    private fun getUpdateDownloadType(apkEntity: ApkEntity, gameId: String): DownloadType {
+        return when {
+            PackageUtils.isCanUpdate(apkEntity, gameId) -> DownloadType.PLUGIN_UPDATE
+            Version(apkEntity.version).isHigherThan(PackageUtils.getVersionNameByPackageName(apkEntity.packageName)) -> DownloadType.UPDATE
+            else -> DownloadType.DOWNLOAD
         }
     }
 
@@ -142,6 +141,10 @@ object ExposureUtils {
 
         PLUGIN_UPDATE,
 
-        PLUGIN_DOWNLOAD
+        PLUGIN_DOWNLOAD,
+
+        FUN_DOWNLOAD,
+
+        FUN_UPDATE
     }
 }

app/src/main/java/com/gh/common/filter/RegionSetting.kt

@@ -5,17 +5,45 @@ import com.google.gson.annotations.SerializedName
 
 @Keep
 data class RegionSetting(
-        @SerializedName("game_mirror")
-        var mirrorGameIdSet: HashSet<String>,
-        @SerializedName("game_block")
-        var filterGameIdSet: HashSet<String>,
-        @SerializedName("channel_control")
-        var channelControl: ChannelControl) {
+    @SerializedName("game_mirror")
+    var mirrorGameIdSet: HashSet<String>,
+    @SerializedName("game_block")
+    var filterGameIdSet: HashSet<String>,
+    @SerializedName("channel_control")
+    var channelControl: ChannelControl,
+    @SerializedName("game_h5_download")
+    var gameH5DownloadList: List<GameH5Download>,
+    @SerializedName("game_special_download")
+    var gameSpecialDownloadInfoList: List<GameSpecialDownloadInfo>
+) {
 
     @Keep
     data class ChannelControl(
-            @SerializedName("game_category")
-            var gameCategory: String,
-            @SerializedName("effect")
-            var effect: Boolean)
+        @SerializedName("game_category")
+        var gameCategory: String,
+        @SerializedName("effect")
+        var effect: Boolean
+    )
+
+    @Keep
+    data class GameH5Download(
+        @SerializedName("game_id")
+        var gameId: String,// 游戏id
+        @SerializedName("h5_link")
+        var h5Link: String,// 网页链接
+        @SerializedName("download_link")
+        var downloadLink: String,// 下载链接
+        @SerializedName("button_text")
+        var buttonText: String,// 按钮文案
+    )
+    data class GameSpecialDownloadInfo(
+        @SerializedName("game_id")
+        var gameId: String = "",
+        @SerializedName("bbs_id")
+        var bbsId: String = "",
+        @SerializedName("top_id")
+        var topId: String = "",
+        @SerializedName("hint_text")
+        var hintText: String = ""
+    )
 }

app/src/main/java/com/gh/common/filter/RegionSettingHelper.kt

@@ -1,14 +1,14 @@
 package com.gh.common.filter
 
 import android.annotation.SuppressLint
-import com.gh.common.constant.Constants
-import com.gh.common.util.SPUtils
-import com.gh.common.util.debounceActionWithInterval
-import com.gh.common.util.toJson
-import com.gh.common.util.toObject
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.core.utils.SPUtils
+import com.gh.gamecenter.common.utils.debounceActionWithInterval
+import com.gh.gamecenter.common.utils.toJson
+import com.gh.gamecenter.common.utils.toObject
 import com.gh.gamecenter.R
 import com.gh.gamecenter.entity.GameEntity
-import com.gh.gamecenter.retrofit.BiResponse
+import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
 import io.reactivex.functions.Function
@@ -19,6 +19,8 @@ object RegionSettingHelper {
     private var mChannelControl: RegionSetting.ChannelControl? = null
     private var mFilterGameIdSet: HashSet<String>? = hashSetOf()
     private var mDisplayMirrorIfoGameIdSet: HashSet<String>? = hashSetOf()
+    private var mGameH5DownloadList: List<RegionSetting.GameH5Download>? = listOf()
+    private var mGameSpecialDownloadInfoList: List<RegionSetting.GameSpecialDownloadInfo>? = listOf()
 
     private const val SP_SETTING = "region_setting"
 
@@ -31,6 +33,11 @@ object RegionSettingHelper {
         return mFilterGameIdSet?.contains(gameId) ?: false
     }
 
+    fun shouldThisGameShowSpecialDownload(gameId: String) = mGameSpecialDownloadInfoList?.any { it.gameId == gameId } ?: false
+
+    @JvmStatic
+    fun getGameSpecialDownloadInfo(gameId: String) = mGameSpecialDownloadInfoList?.find { it.gameId == gameId }
+
     @JvmStatic
     fun filterGame(list: List<GameEntity>?): ArrayList<GameEntity> {
         if (list == null) return arrayListOf()
@@ -58,27 +65,33 @@ object RegionSettingHelper {
         }
     }
 
+    @JvmStatic
+    fun getGameH5DownloadByGameId(gameId: String): RegionSetting.GameH5Download? {
+        if (mGameH5DownloadList.isNullOrEmpty()) return null
+        return mGameH5DownloadList!!.find { it.gameId == gameId }
+    }
+
     @SuppressLint("CheckResult")
     @JvmStatic
     fun getRegionSetting() {
         debounceActionWithInterval(R.string.app_name, 5000) {
             // 使用默认的 Schdulers.io() 可能会触发 OOM
             RetrofitManager.getInstance()
-                    .api
-                    .getRegionSetting(HaloApp.getInstance().channel)
-                    .subscribeOn(Schedulers.io())
-                    .subscribe(object : BiResponse<RegionSetting>() {
-                        override fun onSuccess(data: RegionSetting) {
-                            updateSettingsInMemory(data)
-                            SPUtils.setString(SP_SETTING, data.toJson())
-                        }
+                .api
+                .getRegionSetting(HaloApp.getInstance().channel)
+                .subscribeOn(Schedulers.io())
+                .subscribe(object : BiResponse<RegionSetting>() {
+                    override fun onSuccess(data: RegionSetting) {
+                        updateSettingsInMemory(data)
+                        SPUtils.setString(SP_SETTING, data.toJson())
+                    }
 
-                        override fun onFailure(exception: Exception) {
-                            SPUtils.getString(SP_SETTING)?.toObject<RegionSetting>()?.let {
-                                updateSettingsInMemory(it)
-                            }
+                    override fun onFailure(exception: Exception) {
+                        SPUtils.getString(SP_SETTING)?.toObject<RegionSetting>()?.let {
+                            updateSettingsInMemory(it)
                         }
-                    })
+                    }
+                })
         }
     }
 
@@ -86,6 +99,8 @@ object RegionSettingHelper {
         mFilterGameIdSet = data.filterGameIdSet
         mDisplayMirrorIfoGameIdSet = data.mirrorGameIdSet
         mChannelControl = data.channelControl
+        mGameH5DownloadList = data.gameH5DownloadList
+        mGameSpecialDownloadInfoList = data.gameSpecialDownloadInfoList
     }
 
     /**

app/src/main/java/com/gh/common/history/HistoryHelper.kt

@@ -1,10 +1,10 @@
 package com.gh.common.history
 
-import com.gh.common.runOnIoThread
-import com.gh.common.util.clearHtmlFormatCompletely
-import com.gh.common.util.removeInsertedContent
-import com.gh.common.util.removeVideoContent
-import com.gh.common.util.tryCatchInRelease
+import com.gh.gamecenter.common.utils.clearHtmlFormatCompletely
+import com.gh.gamecenter.common.utils.removeInsertedContent
+import com.gh.gamecenter.common.utils.removeVideoContent
+import com.gh.gamecenter.common.utils.tryCatchInRelease
+import com.gh.gamecenter.core.runOnIoThread
 import com.gh.gamecenter.entity.*
 import com.gh.gamecenter.qa.entity.AnswerDetailEntity
 import com.gh.gamecenter.qa.entity.AnswerEntity
@@ -108,7 +108,7 @@ object HistoryHelper {
 
     @JvmStatic
     fun deleteGamesCollectionEntity(gameCollectionId: String) {
-        runOnIoThread { tryCatchInRelease { HistoryDatabase.instance.gamesCollectionDao().deleteGamesCollection(GamesCollectionEntity(id = gameCollectionId)) }}
+        runOnIoThread { tryCatchInRelease { HistoryDatabase.instance.gamesCollectionDao().deleteGamesCollection(GamesCollectionEntity(id = gameCollectionId)) } }
     }
 
 

app/src/main/java/com/gh/common/im/ImHintHelper.kt

@@ -1,67 +0,0 @@
-//package com.gh.common.im
-//
-//import android.app.Activity
-//import androidx.core.view.ViewCompat
-//import android.view.View
-//import android.view.ViewGroup
-//
-//object ImHintHelper {
-//
-//    @JvmStatic
-//    fun show(activity: Activity?) {
-//        activity?.let {
-//            var hintView = retrieveHintViewFromActivity(it)
-//            if (hintView == null) {
-//                hintView = ImHintView(it)
-//                hintView.showDot(ImManager.shouldShowFloatingWindowDot)
-//
-//                val decorView = it.window.decorView as ViewGroup
-//                it.runOnUiThread {
-//                    decorView.addView(hintView)
-//                }
-//            } else {
-//                hintView.showDot(ImManager.shouldShowFloatingWindowDot)
-//            }
-//        }
-//    }
-//
-//    @JvmStatic
-//    fun dismiss(activity: Activity?) {
-//        activity?.let {
-//            clearCurrent(it)
-//        }
-//    }
-//
-//    private fun retrieveHintViewFromActivity(activity: Activity?) : ImHintView? {
-//        (activity?.window?.decorView as? ViewGroup)?.let {
-//            for (i in 0..it.childCount) {
-//                val childView = if (it.getChildAt(i) is ImHintView) it.getChildAt(i) as ImHintView else null
-//                if (childView != null && childView.windowToken != null) {
-//                    return childView
-//                }
-//            }
-//            return null
-//        }
-//        return null
-//    }
-//
-//    private fun clearCurrent(activity: Activity?) {
-//        (activity?.window?.decorView as? ViewGroup)?.let {
-//            for (i in 0..it.childCount) {
-//                val childView = if (it.getChildAt(i) is ImHintView) it.getChildAt(i) as ImHintView else null
-//                if (childView != null && childView.windowToken != null) {
-//                    ViewCompat.animate(childView).alpha(0f).withEndAction(getRemoveViewRunnable(childView))
-//                }
-//            }
-//        }
-//    }
-//
-//    private fun getRemoveViewRunnable(childView: View?): Runnable {
-//        return Runnable {
-//            childView?.let {
-//                (childView.parent as? ViewGroup)?.removeView(childView)
-//            }
-//        }
-//    }
-//
-//}

app/src/main/java/com/gh/common/im/ImHintView.kt

@@ -1,45 +0,0 @@
-//package com.gh.common.im
-//
-//import android.app.Activity
-//import android.content.Context
-//import android.util.AttributeSet
-//import android.util.TypedValue
-//import android.view.View
-//import android.widget.RelativeLayout
-//import androidx.core.view.ViewCompat
-//import com.gh.common.util.DisplayUtils
-//import com.gh.gamecenter.R
-//import kotlinx.android.synthetic.main.view_im_hint.view.*
-//
-//class ImHintView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0)
-//    : RelativeLayout(context, attrs, defStyle) {
-//
-//    init {
-//        inflate(context, R.layout.view_im_hint, this)
-//
-//        ViewCompat.setTranslationZ(this, Integer.MAX_VALUE.toFloat() - 1)
-//
-//        ivContainer.setOnClickListener {
-//            if (context is Activity) {
-//                ImManager.startChatActivity(context)
-//                ImManager.removeNotification()
-//            }
-//        }
-//
-//        val lp = ivContainer.layoutParams as RelativeLayout.LayoutParams
-//
-//        lp.setMargins(0, 0, dp2px(30f), dp2px(106f) + DisplayUtils.retrieveNavigationHeight(context))
-//    }
-//
-//    fun showDot(show: Boolean) {
-//        if (show) {
-//            unreadDot.visibility = View.VISIBLE
-//        } else {
-//            unreadDot.visibility = View.GONE
-//        }
-//    }
-//
-//    private fun dp2px(dp: Float): Int {
-//        return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, context.applicationContext.resources.displayMetrics).toInt()
-//    }
-//}

app/src/main/java/com/gh/common/im/ImManager.kt

@@ -1,145 +0,0 @@
-package com.gh.common.im
-
-import android.app.Activity
-import com.gh.gamecenter.HelpAndFeedbackActivity
-import com.gh.gamecenter.MainActivity
-import com.gh.gamecenter.MessageActivity
-
-object ImManager {
-
-    const val IM_KEY = "893be270-9c75-11e8-a344-212975ba32b9"
-    const val SP_FLOATING_WINDOW_KEY = "IM_FLOATING_WINDOW"
-    const val SP_FLOATING_WINDOW_DOT_KEY = "IM_FLOATING_WINDOW_DOT"
-
-    var shouldShowFloatingWindow = false
-    var shouldShowFloatingWindowDot = false
-
-    // 记录当前用户 ID 避免重复初始化
-    var currentUserId = ""
-
-    @JvmStatic
-    fun attachIm() {
-//        try {
-//            if (UserManager.getInstance().userInfoEntity != null &&
-//                    currentUserId != UserManager.getInstance().userId) {
-//                currentUserId = UserManager.getInstance().userId
-//                MoorUtils.init(HaloApp.getInstance().application)
-//                Utils.init(HaloApp.getInstance().application)
-//                IMChatManager.getInstance().init(
-//                        HaloApp.getInstance().application,
-//                        ImReceiver.UNIQUE_BROADCAST_ACTION,
-//                        IM_KEY,
-//                        UserManager.getInstance().userInfoEntity?.name + "(" + UserManager.getInstance().userId + ")",
-//                        UserManager.getInstance().userId)
-//
-//                shouldShowFloatingWindow = SPUtils.getBoolean(SP_FLOATING_WINDOW_KEY + UserManager.getInstance().userId)
-//                shouldShowFloatingWindowDot = SPUtils.getBoolean(SP_FLOATING_WINDOW_DOT_KEY + UserManager.getInstance().userId)
-//                updateFloatingWindow()
-//            }
-//        } catch (e: Exception) {
-//            e.printStackTrace()
-//        }
-    }
-
-    @JvmStatic
-    fun detachIm() {
-//        try {
-//            IMChatManager.getInstance().quitSDk()
-//            shouldShowFloatingWindow = false
-//            updateFloatingWindow()
-//            removeNotification()
-//        } catch (e: Exception) {
-//            e.printStackTrace()
-//        }
-    }
-
-    @JvmStatic
-    fun startChatActivity(activity: Activity, inputContent: String? = "", requestCode: Int? = null) {
-//        if (!UserManager.getInstance().userId.isNullOrEmpty()) {
-//            try {
-//                SPUtils.setBoolean(SP_FLOATING_WINDOW_DOT_KEY + UserManager.getInstance().userId, false)
-//                shouldShowFloatingWindowDot = false
-//                val chatHelper = KfStartHelper(activity, UserManager.getInstance().userInfoEntity?.icon, inputContent, requestCode)
-//                chatHelper.initSdkChat(
-//                        ImReceiver.UNIQUE_BROADCAST_ACTION,
-//                        IM_KEY,
-//                        UserManager.getInstance().userInfoEntity?.name + "(" + UserManager.getInstance().userId + ")"
-//                                + "[" + BuildConfig.VERSION_NAME + "]",
-//                        UserManager.getInstance().userId)
-//            } catch (e: Exception) {
-//                e.printStackTrace()
-//            }
-//        }
-    }
-
-    @JvmStatic
-    fun showFloatingWindow() {
-        updateShouldShowFloatingWindow(true)
-        updateShouldShowFloatingWindowDot(true)
-        updateFloatingWindow()
-    }
-
-    @JvmStatic
-    fun dismissFloatingWindow() {
-        updateShouldShowFloatingWindow(false)
-        updateShouldShowFloatingWindowDot(false)
-        updateFloatingWindow()
-    }
-
-    @JvmStatic
-    fun removeNotification() {
-//        val notificationManager = HaloApp.getInstance().application?.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-//        notificationManager.cancel(ImReceiver.NOTIFICATION_ID)
-    }
-
-    @JvmStatic
-    fun updateFloatingWindow() {
-//        try {
-//            CurrentActivityHolder.getCurrentActivity()?.let {
-//                if (isActivityValid(it)) {
-//                    if (shouldShowFloatingWindow) {
-//                        ImHintHelper.show(it)
-//                    } else {
-//                        ImHintHelper.dismiss(it)
-//                        removeNotification()
-//                    }
-//                }
-//            }
-//        } catch (e: Exception) {
-//            e.printStackTrace()
-//        }
-    }
-
-    @JvmStatic
-    fun sendFeedbackMessage(message: String) {
-//        val fromToMessage = IMMessage.createTxtMessage(message)
-//        runOnIoThread {
-//            tryWithDefaultCatch {
-//                IMChat.getInstance().sendMessage(fromToMessage, object : ChatListener {
-//                    override fun onProgress(p0: Int) {}
-//                    override fun onSuccess() {}
-//                    override fun onFailed() {}
-//                })
-//            }
-//        }
-    }
-
-    fun updateShouldShowFloatingWindow(show: Boolean) {
-//        SPUtils.setBoolean(SP_FLOATING_WINDOW_KEY + UserManager.getInstance().userId, show)
-//        shouldShowFloatingWindow = show
-    }
-
-    fun updateShouldShowFloatingWindowDot(show: Boolean) {
-//        SPUtils.setBoolean(SP_FLOATING_WINDOW_DOT_KEY + UserManager.getInstance().userId, show)
-//        shouldShowFloatingWindowDot = show
-    }
-
-    private fun isActivityValid(activity: Activity): Boolean {
-        return when (activity) {
-            is MainActivity -> true
-            is HelpAndFeedbackActivity -> true
-            is MessageActivity -> true
-            else -> false
-        }
-    }
-}

app/src/main/java/com/gh/common/im/ImReceiver.kt

@@ -1,68 +0,0 @@
-package com.gh.common.im
-
-import android.app.NotificationManager
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-
-class ImReceiver : BroadcastReceiver() {
-
-    companion object {
-        const val UNIQUE_BROADCAST_ACTION = "com.gh.im"
-        const val NOTIFICATION_ID: Int = 987321
-    }
-
-    var notificationManager: NotificationManager? = null
-
-    override fun onReceive(context: Context?, intent: Intent?) {
-//        context?.doOnMainProcessOnly {
-//            intent?.let {
-//                if (intent.action == IMChatManager.NEW_MSG_ACTION) {
-//                    notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-//                    // 判断 ImActivity 是否在最顶端
-//                    if (CurrentActivityHolder.getCurrentActivity() is ChatActivity) {
-//                        ImManager.showFloatingWindow()
-//                        ImManager.updateShouldShowFloatingWindowDot(false)
-//                    } else {
-//                        val contentIntent = Intent(Utils.getApp(), ChatActivity::class.java)
-//
-//                        contentIntent.putExtra("PeerId", "")
-//                        contentIntent.putExtra("type", "peedId")
-//
-//                        contentIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-//                        val resultPendingIntent = PendingIntent.getActivity(
-//                                Utils.getApp(),
-//                                0,
-//                                contentIntent,
-//                                PendingIntent.FLAG_UPDATE_CURRENT
-//                        )
-//
-//                        // 新的通知
-//                        val builder = NotificationCompat.Builder(Utils.getApp(), "Halo_IM")
-//                        val notification = builder.setTicker("您有新的消息")
-//                                .setDefaults(Notification.DEFAULT_ALL)
-//                                .setSmallIcon(R.drawable.ic_notification)
-//                                .setWhen(System.currentTimeMillis())
-//                                .setContentIntent(resultPendingIntent)
-//                                .setContentTitle("光环助手客服回复")
-//                                .setContentText("您有新的消息")
-//                                .setAutoCancel(true)
-//                                .build()
-//
-//                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-//                            val channel = NotificationChannel("Halo_IM", "Halo_IM", NotificationManager.IMPORTANCE_DEFAULT)
-//                            notificationManager?.createNotificationChannel(channel)
-//                        }
-//
-//                        if (notification != null) {
-//                            notificationManager?.notify(NOTIFICATION_ID, notification)
-//                            ImManager.showFloatingWindow()
-//                        }
-//                    }
-//                } else if (intent.action == IMChatManager.FINISH_ACTION) {
-//                    ImManager.dismissFloatingWindow()
-//                }
-//            }
-//        }
-    }
-}

app/src/main/java/com/gh/common/loghub/LoghubDatabase.kt

@@ -1,21 +0,0 @@
-package com.gh.common.loghub
-
-import android.content.Context
-import androidx.room.Database
-import androidx.room.Room
-import androidx.room.RoomDatabase
-
-@Database(entities = [LoghubEvent::class], version = 1, exportSchema = false)
-abstract class LoghubDatabase : RoomDatabase() {
-    companion object {
-        private const val DATABASE = "gh_loghub_database"
-
-        fun buildDatabase(context: Context): LoghubDatabase {
-            return Room.databaseBuilder(context, LoghubDatabase::class.java, DATABASE)
-                    .fallbackToDestructiveMigration()
-                    .build()
-        }
-    }
-
-    abstract fun logHubEventDao(): LoghubEventDao
-}

app/src/main/java/com/gh/common/loghub/LoghubEvent.kt

@@ -1,17 +0,0 @@
-package com.gh.common.loghub
-
-import android.os.Parcelable
-import androidx.annotation.Keep
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import kotlinx.parcelize.Parcelize
-import java.util.*
-
-@Keep
-@Parcelize
-@Entity(tableName = "loghubEvent")
-data class LoghubEvent(@PrimaryKey
-                       val id: String = UUID.randomUUID().toString(),
-                       var time: String,
-                       var content: String,
-                       var logStore: String) : Parcelable

app/src/main/java/com/gh/common/loghub/LoghubEventDao.kt

@@ -1,18 +0,0 @@
-package com.gh.common.loghub
-
-import androidx.room.*
-
-@Dao
-interface LoghubEventDao {
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    fun insertMany(eventList: List<LoghubEvent>)
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    fun insert(event: LoghubEvent)
-
-    @Query("SELECT * FROM LoghubEvent")
-    fun getAll(): List<LoghubEvent>
-
-    @Delete
-    fun deleteMany(eventList: List<LoghubEvent>)
-}

app/src/main/java/com/gh/common/loghub/LoghubUtils.kt

@@ -1,110 +0,0 @@
-package com.gh.common.loghub
-
-import android.app.Application
-import androidx.annotation.Keep
-import com.aliyun.sls.android.producer.Log
-import com.gh.common.exposure.ExposureEntity
-import com.gh.common.exposure.meta.Meta
-import com.gh.common.util.tryWithDefaultCatch
-import org.json.JSONObject
-import java.util.concurrent.ExecutorService
-
-object LoghubUtils {
-
-    private const val STORE_SIZE = 100
-    private lateinit var mApplication: Application
-
-    private val loghubEventSet by lazy { hashSetOf<LoghubEvent>() }
-    private var loghubEventExecutor: ExecutorService? = null
-    private val loghubEventDao by lazy { LoghubDatabase.buildDatabase(mApplication).logHubEventDao() }
-
-    @JvmStatic
-    fun init(application: Application, executor: ExecutorService) {
-        mApplication = application
-
-        loghubEventExecutor = executor
-        loghubEventExecutor?.execute {
-            tryWithDefaultCatch {
-                val eventList = loghubEventDao.getAll()
-                loghubEventSet.addAll(eventList)
-            }
-        }
-    }
-
-    @JvmStatic
-    fun log(logJson: JSONObject, logStore: String, forcedUpload: Boolean) {
-        loghubEventExecutor?.execute {
-            try {
-                val event = LoghubEvent(time = (System.currentTimeMillis() / 1000L).toString(), content = logJson.toString(), logStore = logStore)
-                loghubEventSet.add(event)
-                loghubEventDao.insert(event)
-            } catch (e: Exception) {
-                e.printStackTrace()
-            }
-
-            if (forcedUpload || loghubEventSet.size >= STORE_SIZE) {
-                commitSavedLoghubEvents()
-            }
-        }
-    }
-
-    @JvmStatic
-    fun log(jsonString: String, logStore: String, forcedUpload: Boolean) {
-        loghubEventExecutor?.execute {
-            try {
-                val event = LoghubEvent(time = (System.currentTimeMillis() / 1000L).toString(), content = jsonString, logStore = logStore)
-                loghubEventSet.add(event)
-                loghubEventDao.insert(event)
-            } catch (e: Exception) {
-                e.printStackTrace()
-            }
-
-            if (forcedUpload || loghubEventSet.size >= STORE_SIZE) {
-                commitSavedLoghubEvents()
-            }
-        }
-    }
-
-    fun commitSavedLoghubEvents() {
-        loghubEventExecutor?.execute {
-            // TODO 初始化 loghubHelper 去掉这个 tryCatch 块
-            tryWithDefaultCatch {
-                if (loghubEventSet.isEmpty()) return@execute
-
-                val exposureList = loghubEventSet.toList()
-
-                uploadEvents()
-                loghubEventSet.removeAll(exposureList)
-                loghubEventDao.deleteMany(exposureList)
-            }
-        }
-    }
-
-    private fun uploadEvents() {
-        for (event in loghubEventSet) {
-
-            val log = Log()
-            // 特殊处理，以下logStore不需要用content包裹数据
-            if (event.logStore == "collection" || event.logStore == "common" || event.logStore == "halo-api-device-installed") {
-                val contentJson = JSONObject(event.content)
-                for (key in contentJson.keys()) {
-                    log.putContent(key, contentJson.get(key).toString())
-                }
-            } else {
-                log.putContent("current time ", event.time)
-                log.putContent("content", event.content)
-            }
-
-            LoghubHelper.uploadLog(log, event.logStore)
-        }
-    }
-
-}
-
-@Keep
-data class SimpleLogContainerEntity(
-        var event: String? = null,
-        var action: String? = null,
-        var meta: Meta? = null,
-        var payload: ExposureEntity? = null,
-        var timestamp: Long? = 0)

app/src/main/java/com/gh/common/notifier/Notifier.kt

@@ -1,170 +0,0 @@
-package com.gh.common.notifier
-
-import android.app.Activity
-import androidx.core.view.ViewCompat
-import android.view.View
-import android.view.ViewGroup
-import com.gh.common.util.SPUtils
-import com.gh.gamecenter.*
-import java.lang.ref.WeakReference
-
-@Suppress("DEPRECATION")
-class Notifier private constructor() {
-
-    companion object {
-
-        private var activityWeakReference: WeakReference<Activity>? = null
-
-        private const val SP_VIEWED_NOTIFIER = "viewed_notifier"
-
-        /**
-         * 根据内容决定是否显示 Notifier
-         */
-        @JvmStatic
-        fun shouldShowNotifier(content: String): Boolean {
-            val viewedNotifierCollection = SPUtils.getString(SP_VIEWED_NOTIFIER)
-            return !viewedNotifierCollection.contains(content)
-        }
-
-        /**
-         * 标记相应内容的 Notifier 已经显示过了
-         */
-        @JvmStatic
-        fun tagNotifierAsShowed(content: String) {
-            val viewedNotifierCollection = SPUtils.getString(SP_VIEWED_NOTIFIER)
-            if (viewedNotifierCollection.length > 3000) {
-                SPUtils.setString(SP_VIEWED_NOTIFIER, content)
-            } else {
-                SPUtils.setString(SP_VIEWED_NOTIFIER, viewedNotifierCollection + content)
-            }
-        }
-
-        @JvmStatic
-        fun create(activity: Activity?): Notifier {
-            if (activity == null) {
-                throw IllegalArgumentException("Activity cannot be null!")
-            }
-
-            val notifier = Notifier()
-
-            // Hide current NotifierView, if one is active
-            clearCurrent(activity)
-
-            notifier.setActivity(activity)
-            notifier.notifierView = NotifierView(activity)
-
-            return notifier
-        }
-
-        @JvmStatic
-        fun isActivityValid(activity: Activity?): Boolean {
-            if (activity == null) return false
-
-            return when (activity) {
-                is MessageActivity -> false
-                is DownloadManagerActivity -> false
-                is CleanApkActivity -> false
-                is SplashScreenActivity -> false
-                else -> isNotExistInActivity(activity)
-            }
-        }
-
-        @JvmStatic
-        fun isNotExistInActivity(activity: Activity?): Boolean {
-            if (activity == null) return false
-
-            (activity.window?.decorView as? ViewGroup)?.let {
-                //Find all NotifierView Views in Parent layout
-                for (i in 0..it.childCount) {
-                    val childView = if (it.getChildAt(i) is NotifierView) it.getChildAt(i) as NotifierView else null
-                    if (childView != null && childView.windowToken != null) {
-                        return false
-                    }
-                }
-            }
-            return true
-        }
-
-        /**
-         * Cleans up the currently showing notifierView view, if one is present
-         *
-         * @param activity The current Activity
-         */
-        @JvmStatic
-        fun clearCurrent(activity: Activity?) {
-            (activity?.window?.decorView as? ViewGroup)?.let {
-                //Find all NotifierView Views in Parent layout
-                for (i in 0..it.childCount) {
-                    val childView = if (it.getChildAt(i) is NotifierView) it.getChildAt(i) as NotifierView else null
-                    if (childView != null && childView.windowToken != null) {
-                        ViewCompat.animate(childView).alpha(0f).withEndAction(getRemoveViewRunnable(childView))
-                    }
-                }
-            }
-        }
-
-        @JvmStatic
-        fun hide() {
-            activityWeakReference?.get()?.let { clearCurrent(it) }
-        }
-
-        private fun getRemoveViewRunnable(childView: NotifierView?): Runnable {
-            return Runnable {
-                childView?.let {
-                    (childView.parent as? ViewGroup)?.removeView(childView)
-                }
-            }
-        }
-    }
-
-    private var notifierView: NotifierView? = null
-
-    private val activityDecorView: ViewGroup?
-        get() {
-            var decorView: ViewGroup? = null
-
-            activityWeakReference?.get()?.let {
-                decorView = it.window.decorView as ViewGroup
-            }
-
-            return decorView
-        }
-
-    fun show(showVerticalTranslateAnimation: Boolean, delay: Long? = 0): NotifierView? {
-        activityWeakReference?.get()?.let {
-            it.runOnUiThread {
-                activityDecorView?.postDelayed({
-                    notifierView?.showVerticalTranslateAnimation = showVerticalTranslateAnimation
-                    activityDecorView?.addView(notifierView)
-                }, delay!!)
-            }
-        }
-
-        return notifierView
-    }
-
-    fun setIcon(url: String?): Notifier {
-        url?.let { notifierView?.setIcon(it) }
-        return this
-    }
-
-    fun setText(text: String?): Notifier {
-        notifierView?.setText(text)
-
-        return this
-    }
-
-    fun setDuration(time: Long): Notifier {
-        notifierView?.duration = time
-        return this
-    }
-
-    fun setOnClickListener(onClickListener: View.OnClickListener): Notifier {
-        notifierView?.findViewById<View>(R.id.cardView)?.setOnClickListener(onClickListener)
-        return this
-    }
-
-    private fun setActivity(activity: Activity) {
-        activityWeakReference = WeakReference(activity)
-    }
-}

app/src/main/java/com/gh/common/notifier/NotifierView.kt

@@ -1,312 +0,0 @@
-package com.gh.common.notifier
-
-import android.animation.*
-import android.content.Context
-import android.graphics.Path
-import android.text.TextUtils
-import android.util.AttributeSet
-import android.util.Log
-import android.util.TypedValue
-import android.view.Gravity
-import android.view.MotionEvent
-import android.view.View
-import android.view.ViewGroup
-import android.widget.FrameLayout
-import android.widget.TextView
-import androidx.cardview.widget.CardView
-import androidx.core.view.ViewCompat
-import com.facebook.drawee.view.SimpleDraweeView
-import com.gh.common.util.DisplayUtils
-import com.gh.common.util.ImageUtils
-import com.gh.common.util.doOnEnd
-import com.gh.common.util.doOnStart
-import com.gh.gamecenter.R
-
-class NotifierView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0)
-    : FrameLayout(context, attrs, defStyle) {
-
-    companion object {
-        const val SCALE_MINI = 0.2F
-        const val SCALE_DEFAULT = 1F
-
-        const val DEFAULT_DURATION = 500L
-    }
-
-    var onShowListener: OnShowNotificationListener? = null
-    var onHideListener: OnHideNotificationListener? = null
-
-    lateinit var expandAnimator: ValueAnimator
-    lateinit var shrinkAnimator: ValueAnimator
-
-    lateinit var translateUpAnimator: ObjectAnimator
-    lateinit var translateDownAnimator: ObjectAnimator
-
-    lateinit var translateToLeftAnimator: ObjectAnimator
-    lateinit var translateToRightAnimator: ObjectAnimator
-
-    lateinit var zoomInAnimator: ObjectAnimator
-    lateinit var zoomOutAnimator: ObjectAnimator
-
-    var showAnimatorSet: AnimatorSet
-    var hideAnimatorSet: AnimatorSet
-
-    var rightToLeftPath: Path
-    var leftToRightPath: Path
-
-    var veryRight: Float = 0F
-    var veryBottom: Float = 0F
-    var centerX: Float = 0F
-
-    var navigationHeight = 0
-
-    var textWidth: Int = 0
-    var cardViewWidth: Int = 0
-    var verticalAnimationOffset: Int = 0
-
-    var duration = DEFAULT_DURATION
-
-    var showVerticalTranslateAnimation: Boolean = true
-
-    private var mCardView: CardView
-    private var mContentTv: TextView
-    private var mIconIv: SimpleDraweeView
-
-    init {
-        inflate(context, R.layout.view_notifier, this)
-
-        ViewCompat.setTranslationZ(this, Integer.MAX_VALUE.toFloat())
-
-        mCardView = findViewById(R.id.cardView)
-        mContentTv = findViewById(R.id.tvText)
-        mIconIv = findViewById(R.id.ivIcon)
-
-        mCardView.scaleX = SCALE_MINI
-        mCardView.scaleY = SCALE_MINI
-
-        verticalAnimationOffset = dp2px(100F)
-
-        navigationHeight = DisplayUtils.retrieveNavigationHeight(context)
-
-        rightToLeftPath = Path()
-        leftToRightPath = Path()
-
-        showAnimatorSet = AnimatorSet()
-        hideAnimatorSet = AnimatorSet()
-    }
-
-    override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
-        super.onLayout(changed, left, top, right, bottom)
-
-        centerX = (left + right - cardViewWidth) / 2F
-
-        // TODO Provide method to change these absolute offset.
-        val r = right - dp2px(72F).toFloat()
-        val b = bottom - dp2px(145F).toFloat() - navigationHeight
-
-        // Only set
-        if (veryRight != r || veryBottom != b) {
-            veryRight = r
-            veryBottom = b
-
-            rightToLeftPath.moveTo(r, b)
-            rightToLeftPath.lineTo(centerX, b)
-
-            leftToRightPath.moveTo(centerX, b)
-            leftToRightPath.lineTo(r, b)
-
-            initAnimator()
-        }
-    }
-
-    private fun initAnimator() {
-        expandAnimator = ValueAnimator.ofFloat(0F, 1F)
-        expandAnimator.duration = DEFAULT_DURATION
-        expandAnimator.addUpdateListener { a ->
-            val progress = a?.animatedValue as Float
-            mContentTv.width = (textWidth * progress).toInt()
-        }
-        expandAnimator.doOnEnd {
-            enableSwipeToDismiss()
-            shrinkAfterDelay()
-        }
-
-        shrinkAnimator = ValueAnimator.ofFloat(1F, 0F)
-        shrinkAnimator.duration = DEFAULT_DURATION
-        shrinkAnimator.addUpdateListener { a ->
-            val progress = a?.animatedValue as Float
-            mContentTv.width = (textWidth * progress).toInt()
-        }
-        shrinkAnimator.doOnEnd {
-            val lp = FrameLayout.LayoutParams(mCardView.layoutParams)
-            lp.gravity = Gravity.NO_GRAVITY
-            mCardView.layoutParams = lp
-
-            disableSwipeToDismiss()
-        }
-
-        translateToLeftAnimator = ObjectAnimator.ofFloat(mCardView, "translationX", veryRight, centerX)
-        translateToLeftAnimator.duration = DEFAULT_DURATION
-        translateToLeftAnimator.doOnEnd {
-            onShowListener?.onShow()
-
-            val lp = FrameLayout.LayoutParams(mCardView.layoutParams)
-            lp.gravity = Gravity.CENTER_HORIZONTAL
-            mCardView.layoutParams = lp
-            mCardView.translationX = 0f
-
-            expandAnimator.start()
-        }
-
-        translateToRightAnimator = ObjectAnimator.ofFloat(mCardView, "translationX", centerX, veryRight)
-        translateToRightAnimator.duration = DEFAULT_DURATION
-
-        translateUpAnimator = ObjectAnimator.ofFloat(mCardView, "translationY", veryBottom + verticalAnimationOffset, veryBottom)
-        translateUpAnimator.duration = DEFAULT_DURATION
-        translateUpAnimator.doOnStart { mCardView.translationX = veryRight }
-
-        translateDownAnimator = ObjectAnimator.ofFloat(mCardView, "translationY", veryBottom, veryBottom + verticalAnimationOffset)
-        translateDownAnimator.duration = DEFAULT_DURATION
-
-        zoomInAnimator = ObjectAnimator.ofPropertyValuesHolder(mCardView, PropertyValuesHolder.ofFloat("scaleX", SCALE_DEFAULT),
-                PropertyValuesHolder.ofFloat("scaleY", SCALE_DEFAULT))
-        zoomInAnimator.duration = DEFAULT_DURATION
-        zoomInAnimator.doOnStart { mCardView.translationX = veryRight }
-        zoomInAnimator.doOnStart { mCardView.translationY = veryBottom }
-
-        zoomOutAnimator = ObjectAnimator.ofPropertyValuesHolder(mCardView, PropertyValuesHolder.ofFloat("scaleX", SCALE_MINI),
-                PropertyValuesHolder.ofFloat("scaleY", SCALE_MINI))
-        zoomOutAnimator.duration = DEFAULT_DURATION
-        zoomOutAnimator.doOnEnd { removeFromParent() }
-
-        if (showVerticalTranslateAnimation) {
-            showAnimatorSet.play(translateUpAnimator).with(zoomInAnimator).before(translateToLeftAnimator)
-        } else {
-            showAnimatorSet.play(zoomInAnimator).before(translateToLeftAnimator)
-        }
-        showAnimatorSet.start()
-    }
-
-    private fun enableSwipeToDismiss() {
-        mCardView?.setOnTouchListener(SwipeDismissTouchListener(mCardView, object : SwipeDismissTouchListener.DismissCallbacks {
-            override fun canDismiss(): Boolean {
-                return true
-            }
-
-            override fun onDismiss(view: View) {
-                removeFromParent()
-            }
-
-            override fun onTouch(view: View, touch: Boolean) {
-                // Ignore.
-            }
-        }))
-    }
-
-    private fun disableSwipeToDismiss() {
-        mCardView?.setOnTouchListener(null)
-    }
-
-    override fun onDetachedFromWindow() {
-        super.onDetachedFromWindow()
-
-        showAnimatorSet.cancel()
-        hideAnimatorSet.cancel()
-
-        try {
-            removeAllListeners(expandAnimator,
-                    shrinkAnimator,
-                    translateUpAnimator,
-                    translateDownAnimator,
-                    translateToLeftAnimator,
-                    translateToRightAnimator)
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-
-    private fun removeAllListeners(vararg ts: Animator) {
-        for (a in ts) {
-            a.removeAllListeners()
-            if (a is ValueAnimator) {
-                a.removeAllUpdateListeners()
-            }
-        }
-    }
-
-    override fun onTouchEvent(event: MotionEvent): Boolean {
-        performClick()
-        return super.onTouchEvent(event)
-    }
-
-    private fun shrinkAfterDelay() {
-        postDelayed({ shrink() }, duration)
-    }
-
-    private fun shrink() {
-        shrinkAnimator.doOnEnd { hide() }
-        shrinkAnimator.start()
-    }
-
-    private fun removeFromParent() {
-        clearAnimation()
-        visibility = View.GONE
-
-        postDelayed(object : Runnable {
-            override fun run() {
-                try {
-                    if (parent == null) {
-                        Log.e(javaClass.simpleName, "getParent() returning Null")
-                    } else {
-                        try {
-                            (parent as ViewGroup).removeView(this@NotifierView)
-
-                            onHideListener?.onHide()
-                        } catch (ex: Exception) {
-                            Log.e(javaClass.simpleName, "Cannot remove from parent layout")
-                        }
-                    }
-                } catch (ex: Exception) {
-                    Log.e(javaClass.simpleName, Log.getStackTraceString(ex))
-                }
-            }
-        }, 100)
-    }
-
-    fun setText(text: String?) {
-        if (!TextUtils.isEmpty(text)) {
-            mContentTv.text = text
-            mContentTv.measure(0, 0)
-            textWidth = mContentTv.measuredWidth
-            mContentTv.width = 0
-
-            mCardView.measure(0, 0)
-            cardViewWidth = mCardView.measuredWidth
-        }
-    }
-
-    fun hide() {
-        if (showVerticalTranslateAnimation) {
-            hideAnimatorSet.play(translateDownAnimator).with(zoomOutAnimator).after(translateToRightAnimator)
-        } else {
-            hideAnimatorSet.play(zoomOutAnimator).after(translateToRightAnimator)
-        }
-        hideAnimatorSet.start()
-    }
-
-    fun setIcon(url: String) {
-        ImageUtils.display(mIconIv, url)
-    }
-
-    private fun dp2px(dp: Float): Int {
-        return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, context.applicationContext.resources.displayMetrics).toInt()
-    }
-
-    interface OnShowNotificationListener {
-        fun onShow()
-    }
-
-    interface OnHideNotificationListener {
-        fun onHide()
-    }
-
-}

app/src/main/java/com/gh/common/notifier/SwipeDismissTouchListener.kt

@@ -1,238 +0,0 @@
-package com.gh.common.notifier
-
-/*
- * Copyright 2013 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Modifications Copyright (C) 2017 David Kwon
- */
-
-import android.animation.Animator
-import android.animation.AnimatorListenerAdapter
-import android.animation.ValueAnimator
-import android.os.Build
-import androidx.annotation.RequiresApi
-import android.view.MotionEvent
-import android.view.VelocityTracker
-import android.view.View
-import android.view.ViewConfiguration
-
-/**
- * A [View.OnTouchListener] that makes any [View] dismissable when the
- * user swipes (drags her finger) horizontally across the view.
- *
- * @param view     The view to make dismissable.
- * @param callbacks The callback to trigger when the user has indicated that she would like to
- * dismiss this view.
- */
-class SwipeDismissTouchListener(
-        private val mView: View,
-        private val mCallbacks: DismissCallbacks) : View.OnTouchListener {
-
-    // Cached ViewConfiguration and system-wide constant values
-    private val mSlop: Int
-    private val mMinFlingVelocity: Int
-    private val mAnimationTime: Long
-    private var mViewWidth = 1 // 1 and not 0 to prevent dividing by zero
-
-    // Transient properties
-    private var mDownX: Float = 0.toFloat()
-    private var mDownY: Float = 0.toFloat()
-    private var mSwiping: Boolean = false
-    private var mSwipingSlop: Int = 0
-    private var mVelocityTracker: VelocityTracker? = null
-    private var mTranslationX: Float = 0.toFloat()
-
-    init {
-        val vc = ViewConfiguration.get(mView.context)
-        mSlop = vc.scaledTouchSlop
-        mMinFlingVelocity = vc.scaledMinimumFlingVelocity * 16
-        mAnimationTime = mView.context.resources.getInteger(
-                android.R.integer.config_shortAnimTime).toLong()
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB_MR1)
-    override fun onTouch(view: View, motionEvent: MotionEvent): Boolean {
-        // offset because the view is translated during swipe
-        motionEvent.offsetLocation(mTranslationX, 0f)
-
-        if (mViewWidth < 2) {
-            mViewWidth = mView.width
-        }
-
-        when (motionEvent.actionMasked) {
-            MotionEvent.ACTION_DOWN -> {
-                mDownX = motionEvent.rawX
-                mDownY = motionEvent.rawY
-                if (mCallbacks.canDismiss()) {
-                    mVelocityTracker = VelocityTracker.obtain()
-                    mVelocityTracker!!.addMovement(motionEvent)
-                }
-                mCallbacks.onTouch(view, true)
-                return false
-            }
-            MotionEvent.ACTION_UP -> {
-                mVelocityTracker?.run {
-                    val deltaX = motionEvent.rawX - mDownX
-                    this.addMovement(motionEvent)
-                    this.computeCurrentVelocity(1000)
-                    val velocityX = this.xVelocity
-                    val absVelocityX = Math.abs(velocityX)
-                    val absVelocityY = Math.abs(this.yVelocity)
-                    var dismiss = false
-                    var dismissRight = false
-                    if (Math.abs(deltaX) > mViewWidth / 2 && mSwiping) {
-                        dismiss = true
-                        dismissRight = deltaX > 0
-                    } else if (mMinFlingVelocity <= absVelocityX && absVelocityY < absVelocityX && mSwiping) {
-                        // dismiss only if flinging in the same direction as dragging
-                        dismiss = velocityX < 0 == deltaX < 0
-                        dismissRight = this.xVelocity > 0
-                    }
-                    if (dismiss) {
-                        // dismiss
-                        mView.animate()
-                                .translationX((if (dismissRight) mViewWidth else -mViewWidth).toFloat())
-                                .alpha(0f)
-                                .setDuration(mAnimationTime)
-                                .setListener(object : AnimatorListenerAdapter() {
-                                    override fun onAnimationEnd(animation: Animator) {
-                                        performDismiss()
-                                    }
-                                })
-                    } else if (mSwiping) {
-                        // cancel
-                        mView.animate()
-                                .translationX(0f)
-                                .alpha(1f)
-                                .setDuration(mAnimationTime)
-                                .setListener(null)
-                        mCallbacks.onTouch(view, false)
-                    }
-                    this.recycle()
-                    mVelocityTracker = null
-                    mTranslationX = 0f
-                    mDownX = 0f
-                    mDownY = 0f
-                    mSwiping = false
-                }
-            }
-            MotionEvent.ACTION_CANCEL -> {
-                mVelocityTracker?.run {
-                    mView.animate()
-                            .translationX(0f)
-                            .alpha(1f)
-                            .setDuration(mAnimationTime)
-                            .setListener(null)
-                    this.recycle()
-                    mVelocityTracker = null
-                    mTranslationX = 0f
-                    mDownX = 0f
-                    mDownY = 0f
-                    mSwiping = false
-                }
-            }
-            MotionEvent.ACTION_MOVE -> {
-                mVelocityTracker?.run {
-                    this.addMovement(motionEvent)
-                    val deltaX = motionEvent.rawX - mDownX
-                    val deltaY = motionEvent.rawY - mDownY
-                    if (Math.abs(deltaX) > mSlop && Math.abs(deltaY) < Math.abs(deltaX) / 2) {
-                        mSwiping = true
-                        mSwipingSlop = if (deltaX > 0) mSlop else -mSlop
-                        mView.parent.requestDisallowInterceptTouchEvent(true)
-
-                        // Cancel listview's touch
-                        val cancelEvent = MotionEvent.obtain(motionEvent)
-                        cancelEvent.action = MotionEvent.ACTION_CANCEL or (motionEvent.actionIndex shl MotionEvent.ACTION_POINTER_INDEX_SHIFT)
-                        mView.onTouchEvent(cancelEvent)
-                        cancelEvent.recycle()
-                    }
-
-                    if (mSwiping) {
-                        mTranslationX = deltaX
-                        mView.translationX = deltaX - mSwipingSlop
-                        // TODO: use an ease-out interpolator or such
-                        mView.alpha = Math.max(0f, Math.min(1f,
-                                1f - 2f * Math.abs(deltaX) / mViewWidth))
-                        return true
-                    }
-                }
-            }
-            else -> {
-                view.performClick()
-                return false
-            }
-        }
-        return false
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
-    private fun performDismiss() {
-        // Animate the dismissed view to zero-height and then fire the dismiss callback.
-        // This triggers layout on each animation frame; in the future we may want to do something
-        // smarter and more performant.
-
-        val lp = mView.layoutParams
-        val originalHeight = mView.height
-
-        val animator = ValueAnimator.ofInt(originalHeight, 1).setDuration(mAnimationTime)
-
-        animator.addListener(object : AnimatorListenerAdapter() {
-            override fun onAnimationEnd(animation: Animator) {
-                mCallbacks.onDismiss(mView)
-                // Reset view presentation
-                mView.alpha = 1f
-                mView.translationX = 0f
-                lp.height = originalHeight
-                mView.layoutParams = lp
-            }
-        })
-
-        animator.addUpdateListener { valueAnimator ->
-            lp.height = valueAnimator.animatedValue as Int
-            mView.layoutParams = lp
-        }
-
-        animator.start()
-    }
-
-    /**
-     * The callback interface used by [SwipeDismissTouchListener] to inform its client
-     * about a successful dismissal of the view for which it was created.
-     */
-    interface DismissCallbacks {
-        /**
-         * Called to determine whether the view can be dismissed.
-         *
-         * @return boolean The view can dismiss.
-         */
-        fun canDismiss(): Boolean
-
-        /**
-         * Called when the user has indicated they she would like to dismiss the view.
-         *
-         * @param view  The originating [View]
-         */
-        fun onDismiss(view: View)
-
-        /**
-         * Called when the user touches the view or release the view.
-         *
-         * @param view  The originating [View]
-         * @param touch The view is being touched.
-         */
-        fun onTouch(view: View, touch: Boolean)
-    }
-}

app/src/main/java/com/gh/common/provider/ActivationProviderImpl.kt

@@ -0,0 +1,18 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.ActivationHelper
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IActivationProvider
+
+@Route(path = RouteConsts.provider.activation, name = "ActivationHelper暴露服务")
+class ActivationProviderImpl : IActivationProvider {
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+
+    override fun sendActivationInfo() {
+        ActivationHelper.sendActivationInfo()
+    }
+}

app/src/main/java/com/gh/common/provider/AppProviderImpl.kt

@@ -0,0 +1,55 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.gamecenter.R
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IAppProvider
+import com.halo.assistant.HaloApp
+
+@Route(path = RouteConsts.provider.app, name = "Application暴露服务")
+class AppProviderImpl : IAppProvider {
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+
+    override fun getAppName(): String {
+        return HaloApp.getInstance().getString(R.string.app_name)
+    }
+
+    override fun getGid(): String {
+        return HaloApp.getInstance().gid ?: ""
+    }
+
+    override fun refreshGid() {
+        HaloApp.getInstance().refreshGid()
+    }
+
+    override fun getOaid(): String {
+        return HaloApp.getInstance().oaid ?: ""
+    }
+
+    override fun getChannel(): String {
+        return HaloApp.getInstance().channel ?: ""
+    }
+
+    override fun getUserAgent(): String {
+        return HaloApp.getInstance().userAgent ?: ""
+    }
+
+    override fun getServerUserMark(): String {
+        return HaloApp.getInstance().serverUserMark ?: ""
+    }
+
+    override fun getDeviceRamSize(): Long {
+        return HaloApp.getInstance().deviceRamSize
+    }
+
+    override fun getTemporaryLocalDeviceId(): String {
+        return HaloApp.getInstance().temporaryLocalDeviceId ?: ""
+    }
+
+    override fun isUserAcceptPrivacyPolicy(context: Context): Boolean {
+        return HaloApp.isUserAcceptPrivacyPolicy(context)
+    }
+}

app/src/main/java/com/gh/common/provider/BuildConfigImpl.kt

@@ -0,0 +1,34 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.gamecenter.BuildConfig
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IBuildConfigProvider
+
+@Route(path = RouteConsts.provider.buildConfig, name = "BuildConfig暴露服务")
+class BuildConfigImpl : IBuildConfigProvider {
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+
+    override fun getApplicationId(): String = BuildConfig.APPLICATION_ID
+
+    override fun getVersionName(): String = BuildConfig.VERSION_NAME
+
+    override fun getExposureVersion(): String = BuildConfig.EXPOSURE_VERSION
+
+    override fun isDebug(): Boolean = BuildConfig.DEBUG
+
+    override fun getApiHost(): String = BuildConfig.API_HOST
+
+    override fun getDevApiHost(): String = BuildConfig.DEV_API_HOST
+
+    override fun getNewApiHost(): String = BuildConfig.NEW_API_HOST
+
+    override fun getNewDevApiHost(): String = BuildConfig.NEW_DEV_API_HOST
+
+    override fun getVApiHost(): String = BuildConfig.VAPI_HOST
+
+    override fun getVDevApiHost(): String = BuildConfig.DEV_VAPI_HOST
+}

app/src/main/java/com/gh/common/provider/CheckLoginProviderImpl.kt

@@ -0,0 +1,18 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.CheckLoginUtils
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.ICheckLoginProvider
+
+@Route(path = RouteConsts.provider.checkLogin, name = "CheckLoginUtils暴露服务")
+class CheckLoginProviderImpl : ICheckLoginProvider {
+    override fun checkLogin(context: Context, entrance: String, action: (() -> Unit)?) {
+        CheckLoginUtils.checkLogin(context, entrance, action)
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

app/src/main/java/com/gh/common/provider/ConfigProviderImpl.kt

@@ -0,0 +1,78 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.constant.Config
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IConfigProvider
+
+@Route(path = RouteConsts.provider.config, name = "Config暴露服务")
+class ConfigProviderImpl : IConfigProvider {
+    override fun getTencentAppId(): String {
+        return Config.TENCENT_APPID
+    }
+
+    override fun getWechatAppId(): String {
+        return Config.WECHAT_APPID
+    }
+
+    override fun getWechatSecret(): String {
+        return Config.WECHAT_SECRET
+    }
+
+    override fun getUploadLimitSize(): Long {
+        return Config.getSettings()?.image?.uploadLimitSize ?: 0L
+    }
+
+    override fun getSize(): Int {
+        return Config.getSettings()?.image?.size ?: 0
+    }
+
+    override fun getRatio(): Int {
+        return Config.getSettings()?.image?.ratio ?: 0
+    }
+
+    override fun getQuality(): Int {
+        return Config.getSettings()?.image?.quality ?: 0
+    }
+
+    override fun getGif(): String {
+        return Config.getSettings()?.image?.oss?.gif ?: ""
+    }
+
+    override fun getJpeg(): String {
+        return Config.getSettings()?.image?.oss?.jpeg ?: ""
+    }
+
+    override fun getWebp(): String {
+        return Config.getSettings()?.image?.oss?.webp ?: ""
+    }
+
+    override fun getGitThumb(): String {
+        return Config.getSettings()?.image?.oss?.gitThumb ?: ""
+    }
+
+    override fun getGifWaterMark(): String {
+        return Config.getSettings()?.image?.oss?.gifWaterMark ?: ""
+    }
+
+    override fun getQQ(): String {
+        return Config.getSettings()?.support?.qq ?: ""
+    }
+
+    override fun getQuickLoginAppId(): String {
+        return Config.QUICK_LOGIN_APPID
+    }
+
+    override fun getQuickLoginAppKey(): String {
+        return Config.QUICK_LOGIN_APPKEY
+    }
+
+    override fun getWeiboAppKey(): String {
+        return Config.WEIBO_APPKEY
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

app/src/main/java/com/gh/common/provider/DataUtilsProviderImpl.kt

@@ -0,0 +1,20 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.DataUtils
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IDataUtilsProvider
+import com.halo.assistant.HaloApp
+
+@Route(path = RouteConsts.provider.dataUtils, name = "DataUtils暴露服务")
+class DataUtilsProviderImpl : IDataUtilsProvider {
+
+    override fun getDeviceCertification() {
+        DataUtils.getDeviceCertification(HaloApp.getInstance().gid)
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

app/src/main/java/com/gh/common/provider/DefaultUrlHandlerProviderImpl.kt

@@ -0,0 +1,24 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.DefaultUrlHandler
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IDefaultUrlHandlerProvider
+
+@Route(path = RouteConsts.provider.defaultUrlHandler, name = "DefaultUrlHandler暴露服务")
+class DefaultUrlHandlerProviderImpl : IDefaultUrlHandlerProvider {
+
+    override fun interceptUrl(
+        context: Context,
+        url: String,
+        entrance: String,
+        bringAppToFront: Boolean
+    ): Boolean {
+        return DefaultUrlHandler.interceptUrl(context, url, entrance, bringAppToFront)
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

app/src/main/java/com/gh/common/provider/DialogUtilsProviderImpl.kt

@@ -0,0 +1,28 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.DialogUtils
+import com.gh.gamecenter.common.callback.CancelListener
+import com.gh.gamecenter.common.callback.ConfirmListener
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IDialogUtilsProvider
+
+@Route(path = RouteConsts.provider.dialogUtils, name = "DialogUtils暴露服务")
+class DialogUtilsProviderImpl : IDialogUtilsProvider {
+    override fun showRegulationTestDialog(context: Context, confirm: () -> Unit, cancel: () -> Unit) {
+        DialogUtils.showRegulationTestDialog(context, object : ConfirmListener {
+            override fun onConfirm() {
+                confirm.invoke()
+            }
+        }, object :CancelListener{
+            override fun onCancel() {
+                cancel.invoke()
+            }
+        })
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

app/src/main/java/com/gh/common/provider/DirectProviderImpl.kt

@@ -0,0 +1,55 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.DirectUtils
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IDirectProvider
+
+@Route(path = RouteConsts.provider.directUtils, name = "DirectUtils暴露服务")
+class DirectProviderImpl : IDirectProvider {
+
+    override fun directToWebView(context: Context, url: String, entrance: String?) {
+        DirectUtils.directToWebView(context, url, entrance)
+    }
+
+    override fun directToRegulationTestPage(context: Context) {
+        DirectUtils.directToRegulationTestPage(context)
+    }
+
+    override fun directToQqConversation(context: Context, qq: String) {
+        DirectUtils.directToQqConversation(context, qq)
+    }
+
+    override fun directToCommodityDetail(context: Context, commodityId: String) {
+        DirectUtils.directToCommodityDetail(context, commodityId)
+    }
+
+    override fun directToEnergyRecord(context: Context) {
+        DirectUtils.directToEnergyRecord(context)
+    }
+
+    override fun directToEnergyRulePage(context: Context) {
+        DirectUtils.directToEnergyRulePage(context)
+    }
+
+    override fun directToInviteFriends(context: Context) {
+        DirectUtils.directToInviteFriends(context)
+    }
+
+    override fun directToExchangeRulePage(context: Context) {
+        DirectUtils.directToExchangeRulePage(context)
+    }
+
+    override fun directToExchangeCommodityPage(context: Context) {
+        DirectUtils.directToExchangeCommodityPage(context)
+    }
+
+    override fun directToLotteryParadisePage(context: Context) {
+        DirectUtils.directToLotteryParadisePage(context)
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

app/src/main/java/com/gh/common/provider/DownloadManagerProviderImpl.kt

@@ -0,0 +1,25 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.download.DownloadManager
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IDownloadManagerProvider
+import com.lightgame.download.DownloadEntity
+
+@Route(path = RouteConsts.provider.downloadManager, name = "DownloadManager暴露服务")
+class DownloadManagerProviderImpl : IDownloadManagerProvider {
+
+    override fun getDownloadEntityByUrl(url: String): DownloadEntity? {
+        return DownloadManager.getInstance().getDownloadEntityByUrl(url)
+    }
+
+    override fun resumeAllInvisiblePendingTask() {
+        DownloadManager.getInstance().resumeAllInvisiblePendingTask()
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+
+}

app/src/main/java/com/gh/common/provider/EntranceUtilsProviderImpl.kt

@@ -0,0 +1,23 @@
+package com.gh.common.provider
+
+import android.content.Context
+import android.os.Bundle
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.EntranceUtils
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IEntranceUtilsProvider
+
+@Route(path = RouteConsts.provider.entranceUtils, name = "EntranceUtils暴露服务")
+class EntranceUtilsProviderImpl: IEntranceUtilsProvider {
+    override fun jumpActivity(context: Context, bundle: Bundle) {
+        EntranceUtils.jumpActivity(context, bundle)
+    }
+
+    override fun saveShortcut(activityName: String, bundle: Bundle?) {
+        EntranceUtils.saveShortcut(activityName, bundle)
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

app/src/main/java/com/gh/common/provider/ErrorHelperProviderImpl.kt

@@ -0,0 +1,28 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.ErrorHelper
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IErrorHelperProvider
+import retrofit2.HttpException
+
+@Route(path = RouteConsts.provider.errorHelper, name = "ErrorHelper暴露服务")
+class ErrorHelperProviderImpl : IErrorHelperProvider {
+
+    override fun handleError(
+        context: Context,
+        errorString: String?,
+        showHighPriorityHint: Boolean
+    ) {
+        ErrorHelper.handleError(context, errorString, showHighPriorityHint)
+    }
+
+    override fun handleLoginError(context: Context, httpException: HttpException?) {
+        ErrorHelper.handleLoginError(context, httpException)
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

app/src/main/java/com/gh/common/provider/FloatingBackViewManagerProviderImpl.kt

@@ -0,0 +1,19 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.FloatingBackViewManager
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IFloatingBackViewManagerProvider
+
+@Route(path = RouteConsts.provider.floatingBackViewManager, name = "FloatingViewBackManager暴露服务")
+class FloatingBackViewManagerProviderImpl : IFloatingBackViewManagerProvider {
+
+    override fun enableBackViewForTaskType() {
+        FloatingBackViewManager.enableBackView(FloatingBackViewManager.TYPE_TASK)
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

app/src/main/java/com/gh/common/provider/GameSubstituteRepositoryProviderImpl.kt

@@ -0,0 +1,19 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.GameSubstituteRepositoryHelper
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IGameSubstituteRepositoryProvider
+
+@Route(path = RouteConsts.provider.gameSubstituteRepository, name = "GameSubstituteRepositoryHelper暴露服务")
+class GameSubstituteRepositoryProviderImpl : IGameSubstituteRepositoryProvider {
+
+    override fun updateSubstitutableGames() {
+        GameSubstituteRepositoryHelper.updateSubstitutableGames()
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

app/src/main/java/com/gh/common/provider/HandleGameResponseProviderImpl.kt

@@ -0,0 +1,44 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.filter.RegionSettingHelper
+import com.gh.common.util.ApkActiveUtils
+import com.gh.download.DownloadManager
+import com.gh.gamecenter.common.constant.EntranceConsts
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.common.utils.countOccurrences
+import com.gh.gamecenter.core.provider.IHandleGameResponseProvider
+import com.gh.gamecenter.entity.GameEntity
+
+@Route(path = RouteConsts.provider.handleGameResponse, name = "处理游戏类型返回")
+class HandleGameResponseProviderImpl : IHandleGameResponseProvider {
+
+    override fun handleGameResponse(response: List<Any>, entrance: String): List<Any> {
+        // 针对游戏的一些操作(过滤隐藏游戏，过滤隐藏APK吗，增加下载数据)
+        if (response.isNotEmpty() && response[0] is GameEntity) {
+            val responseResult = RegionSettingHelper.filterGame(response as? List<GameEntity>?)
+            if (responseResult.isNotEmpty()) {
+                for (entity in responseResult) {
+                    val game: GameEntity = entity
+                    game.setEntryMap(DownloadManager.getInstance().getEntryMap(game.name))
+
+                    // 当页面是由启动弹窗过来的第一或第二个页面的时候添加启动弹窗信息
+                    if (entrance.contains(EntranceConsts.ENTRANCE_WELCOME)
+                        && entrance.countOccurrences("+") <= 1
+                    ) {
+                        game.setWelcomeDialogInfoIfAvailable()
+                    }
+                    ApkActiveUtils.filterHideApk(game)
+                }
+            }
+            return responseResult
+        }
+        return response
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+
+}

app/src/main/java/com/gh/common/provider/LinkDirectUtilsProviderImpl.kt

@@ -0,0 +1,26 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.DirectUtils
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.common.entity.LinkEntity
+import com.gh.gamecenter.common.provider.ILinkDirectUtilsProvider
+
+@Route(path = RouteConsts.provider.linkDirectUtils, name = "DirectUtils暴露服务，主要是暴露directToLinkPage方法")
+class LinkDirectUtilsProviderImpl : ILinkDirectUtilsProvider {
+
+    override fun directToLinkPage(
+        context: Context,
+        linkEntity: LinkEntity,
+        entrance: String,
+        path: String
+    ) {
+        DirectUtils.directToLinkPage(context, linkEntity, entrance, path)
+    }
+
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

app/src/main/java/com/gh/common/provider/LogUtilsProviderImpl.kt

@@ -0,0 +1,19 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.*
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.*
+
+@Route(path = RouteConsts.provider.logUtils, name = "LogUtils暴露服务")
+class LogUtilsProviderImpl : ILogUtilsProvider {
+
+    override fun login(loginStep: String, loginType: String, entrance: String) {
+        LogUtils.login(loginStep, loginType, entrance)
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

app/src/main/java/com/gh/common/provider/MessageUnreadRepositoryProviderImpl.kt

@@ -0,0 +1,19 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IMessageUnreadRepositoryProvider
+import com.gh.gamecenter.message.MessageUnreadRepository
+
+@Route(path = RouteConsts.provider.messageUnreadRepository, name = "MessageUnreadRepository暴露服务")
+class MessageUnreadRepositoryProviderImpl : IMessageUnreadRepositoryProvider {
+
+    override fun loadMessageUnreadData() {
+        MessageUnreadRepository.loadMessageUnreadData()
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

app/src/main/java/com/gh/common/provider/PackageHelperProviderImpl.kt

@@ -0,0 +1,19 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.PackageHelper
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IPackageHelperProvider
+
+@Route(path = RouteConsts.provider.packageHelper, name = "PackageHelper暴露服务")
+class PackageHelperProviderImpl : IPackageHelperProvider {
+
+    override fun getLocalPackageNameSet(): HashSet<String> {
+        return PackageHelper.localPackageNameSet
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

app/src/main/java/com/gh/common/provider/PackageInstallerProviderImpl.kt

@@ -0,0 +1,24 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.PackageInstaller
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IPackageInstallerProvider
+import com.lightgame.download.DownloadEntity
+
+@Route(path = RouteConsts.provider.packageInstaller, name = "PackageInstaller暴露服务")
+class PackageInstallerProviderImpl : IPackageInstallerProvider {
+
+    override fun install(context: Context, downloadEntity: DownloadEntity, showUnzipToast: Boolean) {
+        PackageInstaller.install(context, downloadEntity, showUnzipToast)
+    }
+
+    override fun uninstall(context: Context, path: String) {
+        PackageInstaller.uninstall(context, path)
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

app/src/main/java/com/gh/common/provider/PackageUtilsProviderImpl.kt

@@ -0,0 +1,39 @@
+package com.gh.common.provider
+
+import android.content.Context
+import android.content.pm.PackageInfo
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.PackageUtils
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IPackageUtilsProvider
+
+@Route(path = RouteConsts.provider.packageUtils, name = "PackageUtils暴露服务")
+class PackageUtilsProviderImpl : IPackageUtilsProvider {
+    override fun obtainProcessName(context: Context): String? {
+        return PackageUtils.obtainProcessName(context)
+    }
+
+    override fun getGhVersionName(): String {
+        return PackageUtils.getGhVersionName()
+    }
+
+    override fun getGhVersionCode(): Int {
+        return PackageUtils.getGhVersionCode()
+    }
+
+    override fun getInstalledPackages(context: Context, flag: Int): List<PackageInfo> {
+        return PackageUtils.getInstalledPackages(context, flag)
+    }
+
+    override fun getApkSignatureByPackageName(context: Context, packageName: String): Array<String> {
+        return PackageUtils.getApkSignatureByPackageName(context, packageName)
+    }
+
+    override fun getSideLoadedInfo(): MutableMap<String, String>? {
+        return PackageUtils.getSideLoadedInfo()
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

app/src/main/java/com/gh/common/provider/ReservationRepositoryProviderImpl.kt

@@ -0,0 +1,23 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.repository.ReservationRepository
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IReservationRepositoryProvider
+
+@Route(path = RouteConsts.provider.reservationRepository, name = "ReservationRepository暴露服务")
+class ReservationRepositoryProviderImpl : IReservationRepositoryProvider {
+
+    override fun refreshReservations() {
+        ReservationRepository.refreshReservations()
+    }
+
+    override fun clearReservations() {
+        ReservationRepository.clearReservations()
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

app/src/main/java/com/gh/common/provider/TimeUtilProviderImpl.kt

@@ -0,0 +1,19 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.exposure.time.TimeUtil
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.ITimeUtilProvider
+
+@Route(path = RouteConsts.provider.timeUtil, name = "TimeUtil暴露服务")
+class TimeUtilProviderImpl : ITimeUtilProvider {
+
+    override fun currentTimeMillis() = TimeUtil.currentTimeMillis()
+
+    override fun currentTime() = TimeUtil.currentTime()
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

app/src/main/java/com/gh/common/provider/WebProviderImpl.kt

@@ -0,0 +1,23 @@
+package com.gh.common.provider
+
+import android.content.Context
+import android.content.Intent
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.gamecenter.WebActivity
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IWebProvider
+
+@Route(path = RouteConsts.provider.webActivity, name = "WebActivity暴露服务")
+class WebProviderImpl : IWebProvider {
+    override fun getIntent(context: Context, url: String, autoCompletionTitle: Boolean): Intent {
+        return WebActivity.getIntent(context, url, autoCompletionTitle)
+    }
+
+    override fun getWebIntent(context: Context, title: String, url: String): Intent {
+        return WebActivity.getWebIntent(context, title, url)
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

app/src/main/java/com/gh/common/provider/WechatHelperProviderImpl.kt

@@ -0,0 +1,18 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.WechatBindHelper
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IWechatBindHelperProvider
+
+@Route(path = RouteConsts.provider.wechatHelper, name = "WechatHelper暴露服务")
+class WechatHelperProviderImpl : IWechatBindHelperProvider {
+    override fun getWechatConfig() {
+        WechatBindHelper.getWechatConfig()
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}