chore: 版本更新到 5.9.2-535

fix:V5.9.2UI问题(3) https://git.shanqu.cc/pm/halo/halo-app-issues/-/issues/1922

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

.editorconfig

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

.gitlab-ci.yml

@@ -38,6 +38,7 @@ 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

@@ -2,9 +2,6 @@
 	path = libraries/LGLibrary
 	url = git@git.shanqu.cc:android/common-library.git
 	branch = master
-[submodule "vspace-bridge"]
-	path = vspace-bridge
-	url = git@git.shanqu.cc:cwzs/android/vspace-bridge.git
-[submodule "module_common/src/debug/assets/assistant-android-mock"]
-	path = module_common/src/debug/assets/assistant-android-mock
-	url = git@git.shanqu.cc:halo/android/assistant-android-mock.git
+[submodule "assistant_flutter"]
+	path = assistant_flutter
+	url = git@git.shanqu.cc:halo/android/flutter-module.git

README.md

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

app/build.gradle

@@ -43,14 +43,22 @@ android {
     }
 
     defaultConfig {
+
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = [eventBusIndex: 'com.gh.EventBusIndex']
+            }
+        }
 
         ndk {
-            // x86 本来是为了模拟器用户使用 RenderScript 用的，但是其实用到 RenderScript 的人本来就不多 (一天不到 100)，用模拟器的人就更少了
-            // 加了 x86 反而会导致用户没法使用微博登录，因为微博没有提供 x86 的 SO ...
-            // 还会增大 APK 体积，所以还是去掉吧。数据可见 https://sentry.shanqu.cc/organizations/lightgame/issues/144232/?project=22
-            abiFilters "armeabi-v7a", "arm64-v8a"
+            // 如果不添加 `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"
         }
 
         renderscriptTargetApi 18
@@ -72,11 +80,19 @@ 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）
@@ -91,12 +107,6 @@ android {
         }
     }
 
-    kapt {
-        arguments {
-            arg("AROUTER_MODULE_NAME", project.name)
-        }
-    }
-
     buildTypes {
         debug {
             debuggable true
@@ -136,10 +146,10 @@ android {
 
     sourceSets {
         publish {
-            java.srcDirs = ['src/main/java', "src/default/java"]
+            java.srcDirs = ['src/main/java']
         }
         internal {
-            java.srcDirs = ['src/main/java', "src/default/java"]
+            java.srcDirs = ['src/main/java']
         }
         tea {
             java.srcDirs = ['src/main/java', 'src/tea/java']
@@ -154,20 +164,14 @@ 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}\""
-            buildConfigField "String", "QUICK_LOGIN_APPID", "\"${DEV_QUICK_LOGIN_APPID}\""
-            buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${DEV_QUICK_LOGIN_APPKEY}\""
         }
 
-        // 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}\""
-            buildConfigField "String", "QUICK_LOGIN_APPID", "\"${QUICK_LOGIN_APPID}\""
-            buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
         }
 
         tea {
@@ -175,13 +179,15 @@ android {
 
             buildConfigField "String", "DEV_API_HOST", "\"${API_HOST}\""
             buildConfigField "String", "NEW_DEV_API_HOST", "\"${NEW_API_HOST}\""
-            buildConfigField "String", "DEV_VAPI_HOST", "\"${VAPI_HOST}\""
-            buildConfigField "String", "QUICK_LOGIN_APPID", "\"${QUICK_LOGIN_APPID}\""
-            buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
 
             manifestPlaceholders.put("APPLOG_SCHEME", "rangersapplog.byAx6uYt".toLowerCase())
         }
     }
+
+    lintOptions {
+        // For flutter release build, see https://github.com/flutter/flutter/issues/58247
+        checkReleaseBuilds false
+    }
 }
 
 repositories {
@@ -194,43 +200,86 @@ dependencies {
 
     implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
 
-    teaImplementation fileTree(include: ['*.jar', '*.aar'], dir: 'src/tea/libs')
     testImplementation 'junit:junit:4.12'
 
     debugImplementation "com.squareup.leakcanary:leakcanary-android:${leakcanary}"
-    debugImplementation "com.squareup.leakcanary:leakcanary-android-process:${leakcanary}"
-
+    debugImplementation "com.squareup.okhttp3:logging-interceptor:${okHttp}"
 //    debugImplementation "com.gu.android:toolargetool:${toolargetool}" // 需要使用调试时才启用
     debugImplementation "com.github.nichbar:WhatTheStack:${whatTheStack}"
     debugImplementation "io.github.didi.dokit:dokitx:${dokit}"
 
-
-    implementation "androidx.multidex:multidex:${multiDex}"
+    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 "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"
@@ -238,40 +287,59 @@ 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(':vspace-bridge:vspace')
-
-    implementation (project(':module_common')) {
-        exclude group: 'androidx.swiperefreshlayout'
-    }
-    implementation(project(':module_login')) {
-        exclude group: 'androidx.swiperefreshlayout'
-    }
-    // 默认不接入光能模块，提高编译速度
-//    debugImplementation(project(':module_energy')) {
-//        exclude group: 'androidx.swiperefreshlayout'
-//    }
+    implementation project(':libraries:LGLibrary')
+    implementation project(':libraries:QQShare')
+    implementation project(':libraries:Matisse')
 }
 File propFile = file('sign.properties')
 if (propFile.exists()) {
@@ -362,14 +430,36 @@ andResGuard {
             "R.drawable.bg_notification_reserve_game_style_2",
             "R.drawable.bg_notification_video_style_1",
             "R.drawable.bg_notification_video_style_2",
+            "R.drawable.ic_search_no_1",
+            "R.drawable.ic_search_no_2",
+            "R.drawable.ic_search_no_3",
+            "R.drawable.ic_search_no_4",
+            "R.drawable.ic_search_no_5",
+            "R.drawable.ic_search_no_6",
+            "R.drawable.ic_search_no_7",
+            "R.drawable.ic_search_no_8",
+            "R.drawable.ic_search_no_9",
+            "R.drawable.ic_search_no_10",
+            "R.drawable.ic_search_no_11",
+            "R.drawable.ic_search_no_12",
+            "R.drawable.ic_search_no_13",
+            "R.drawable.ic_search_no_14",
+            "R.drawable.ic_search_no_15",
+            "R.drawable.ic_search_no_16",
+            "R.drawable.ic_search_no_17",
+            "R.drawable.ic_search_no_18",
+            "R.drawable.ic_search_no_19",
+            "R.drawable.ic_search_no_20",
             "R.drawable.ic_recommend_activity",
             "R.drawable.ic_recommend_discount",
             "R.drawable.ic_recommend_function",
             "R.drawable.ic_recommend_gift",
             "R.drawable.ic_recommend_role",
-            "R.drawable.download_button_normal_style",
-            "R.drawable.ic_selector_selected",
-            "R.drawable.ic_selector_default",
+            "R.drawable.login_btn_bg",
+            "R.drawable.ic_quick_login_check",
+            "R.drawable.ic_quick_login_uncheck",
+            "R.anim.anim_auth_in",
+            "R.anim.anim_auth_out",
             "R.id.download_speed",
             "R.id.download_percentage",
             "R.id.comment",
@@ -380,9 +470,6 @@ 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",
@@ -508,4 +595,4 @@ project.afterEvaluate {
             }
         }
     }
-}
+}

app/proguard-rules-legacy.txt

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

app/proguard-rules.txt

@@ -1,6 +1,26 @@
 
-# inline getter method
--allowaccessmodification
+#--------- remove logs start  ----------------
+-assumenosideeffects class com.lightgame.config.CommonDebug {
+   private static String getLogTag(...);
+   private static String getMethodName();
+   public static void logMethodName(...);
+   public static void logParams(...);
+   public static void logFields(...);
+   public static void logMethodWithParams(...);
+}
+
+-assumenosideeffects class com.lightgame.utils.Utils {
+   public static void log(...);
+}
+#--------- remove logs end  ----------------
+
+#--------- remove useless mtahelper class --------
+-assumenosideeffects class com.gh.common.util.MtaHelper {
+    public static void onEvent(...);
+    public static void onEventWithTime(...);
+    public static void onEventWithBasicDeviceInfo(...);
+}
+#--------- remove useless mta class end ----
 
 # TODO Dicard sourceFile in final release build but remain in internal build.
 -renamesourcefileattribute SourceFile
@@ -16,6 +36,31 @@
 -keepclassmembers interface com.j256.* { *; }
 -dontwarn com.j256.**
 
+### AutoScrollViewPager
+-keep class cn.trinea.android.* { *; }
+-keepclassmembers class cn.trinea.android.* { *; }
+-dontwarn cn.trinea.android.**
+
+### eventbus
+-keepclassmembers class * {
+    @org.greenrobot.eventbus.Subscribe <methods>;
+}
+-keep enum org.greenrobot.eventbus.ThreadMode { *; }
+
+### Only required if you use AsyncExecutor
+-keepclassmembers class * extends org.greenrobot.eventbus.util.ThrowableFailureEvent {
+    <init>(java.lang.Throwable);
+}
+
+### weiboSdk
+-keep class com.sina.weibo.sdk.** { *; }
+-dontwarn android.webkit.WebView
+-dontwarn android.webkit.WebViewClient
+
+### wechatSdk
+### TODO 这里用 com.tencent.*{*;} 不起效？但其它地方可以？
+-keep class com.tencent.**{*;}
+
 ### app models
 -keep class com.gh.common.view.* {*;}
 -keep class com.gh.gamecenter.db.info.* {*;}
@@ -26,10 +71,34 @@
 -keep class com.gh.gamecenter.video.detail.* {*;}
 -keep class com.gh.gamecenter.home.gamecollection.* {*;}
 
+###
+-keepclassmembers class * extends android.webkit.WebViewClient {
+    public void *(android.webkit.WebView, java.lang.String, android.graphics.Bitmap);
+    public boolean *(android.webkit.WebView, java.lang.String);
+}
+-keepclassmembers class * extends android.webkit.WebViewClient {
+    public void *(android.webkit.WebView, java.lang.String);
+}
+
+### easypermission
+-keepclassmembers class * {
+    @pub.devrel.easypermissions.AfterPermissionGranted <methods>;
+}
 
 # TODO What's this ?
 -ignorewarnings
 
+### Keep Annotation
+-keep @androidx.annotation.Keep class *
+-keepclassmembers class * {
+    @androidx.annotation.Keep *;
+}
+
+### 阿里云上传
+-keep class com.alibaba.sdk.android.oss.* { *; }
+-dontwarn okio.**
+-dontwarn org.apache.commons.codec.binary.**
+
 ### 视频相关
 -keep class com.shuyu.gsyvideoplayer.video.* { *; }
 -dontwarn com.shuyu.gsyvideoplayer.video.**
@@ -47,12 +116,32 @@
     public <init>(android.content.Context, android.util.AttributeSet, int);
 }
 
+-keep class com.alibaba.sdk.android.*{*;}
+-keep class com.ut.*{*;}
+-keep class com.ta.*{*;}
+
 ### TEA
 -keep class com.gh.gamecenter.TeaHelper { *; }
 
+### 阿里云日志
+-keep class com.aliyun.sls.android.producer.* { *; }
+-keep interface com.aliyun.sls.android.producer.* { *; }
+
+### 中国移动一键登录
+-dontwarn com.cmic.sso.sdk.**
+-keep class com.cmic.sso.sdk.* { *; }
+
 ### EasyFloat
 -keep class com.lzf.easyfloat.* {*;}
 
+### 避免 WebChromeClient 被混淆
+-keepclassmembers class * extends android.webkit.WebChromeClient{
+    public void openFileChooser(...);
+}
+
+### emoji4j
+-keep class emoji4j.* {*;}
+
 ### dokit
 -keep class com.didichuxing.** {*;}
 

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

@@ -3,8 +3,6 @@ package com.gh.gamecenter;
 import android.app.Application;
 
 
-import com.gh.gamecenter.mock.MockConfig;
-
 import okhttp3.OkHttpClient;
 import okhttp3.logging.HttpLoggingInterceptor;
 
@@ -27,7 +25,6 @@ public class Injection {
         HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor();
         interceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
         builder.addNetworkInterceptor(interceptor);
-        MockConfig.addBuilderMock(builder);
         return builder;
     }
 

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

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

app/src/main/AndroidManifest.xml

@@ -3,9 +3,6 @@
     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卡上写文件 -->
@@ -16,6 +13,10 @@
     <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连接状态 -->
@@ -24,11 +25,8 @@
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
     <!-- 允许应用程序快捷方式 -->
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
-    <!-- 应用安装相关 -->
-    <uses-permission android:name="com.android.permission.GET_INSTALLED_APPS" />
-
     <!-- 前台服务权限-->
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
 
     <uses-permission
         android:name="android.permission.PACKAGE_USAGE_STATS"
@@ -58,14 +56,6 @@
         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"
@@ -80,6 +70,7 @@
         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"
@@ -175,7 +166,7 @@
 
         <activity
             android:name="com.gh.gamecenter.WebActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"/>
 
         <activity
             android:name="com.gh.gamecenter.SingletonWebActivity"
@@ -266,6 +257,11 @@
             android:name=".category.CategoryListActivity"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name="com.gh.gamecenter.LoginActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden" />
+
         <activity
             android:name="com.gh.gamecenter.UserInfoActivity"
             android:screenOrientation="portrait" />
@@ -291,6 +287,10 @@
             android:name="com.gh.gamecenter.qa.answer.detail.AnswerDetailActivity"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name=".qa.answer.fold.AnswerFoldActivity"
+            android:screenOrientation="portrait" />
+
         <activity
             android:name="com.gh.gamecenter.qa.answer.edit.AnswerEditActivity"
             android:screenOrientation="portrait" />
@@ -376,6 +376,10 @@
             android:name="com.gh.gamecenter.qa.article.detail.ArticleDetailActivity"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name="com.gh.gamecenter.qa.article.detail.comment.ArticleDetailCommentActivity"
+            android:screenOrientation="portrait" />
+
         <activity
             android:name="com.gh.gamecenter.qa.draft.CommunityDraftWrapperActivity"
             android:screenOrientation="portrait" />
@@ -509,6 +513,10 @@
             android:name=".video.poster.PosterClipActivity"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name=".forum.select.ForumSelectActivity"
+            android:screenOrientation="portrait" />
+
         <activity
             android:name=".forum.detail.ForumDetailActivity"
             android:screenOrientation="portrait" />
@@ -562,6 +570,19 @@
             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" />
+
         <activity
             android:name=".qa.questions.draft.QuestionDraftActivity"
             android:screenOrientation="portrait" />
@@ -630,6 +651,14 @@
             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" />
@@ -703,35 +732,16 @@
             android:name="com.gh.gamecenter.toolbox.ToolBoxBlockActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name="com.gh.vspace.VDownloadManagerActivity"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.gh.vspace.VSpaceLoadingActivity"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name="com.gh.gamecenter.qa.subject.CommunitySubjectActivity"
             android:screenOrientation="portrait" />
 
         <activity
-            android:name=".qa.comment.NewCommentDetailActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.gh.gamecenter.mypost.MyPostActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".VerifyPhoneActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".BbsCertificationActivity"
-            android:screenOrientation="portrait" />
+            android:name="${applicationId}.wxapi.WXEntryActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:launchMode="singleTop"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"></activity>
 
         <!--        <activity-->
         <!--            android:name="${applicationId}.douyinapi.DouYinEntryActivity"-->
@@ -753,19 +763,19 @@
             android:name="com.gh.gamecenter.provider.GhContentProvider"
             android:authorities="${applicationId}.provider"
             android:enabled="true"
-            android:exported="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>-->
+        <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>
 
         <receiver
             android:name="com.gh.gamecenter.receiver.DownloadReceiver"

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

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

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

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

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

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

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

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

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

app/src/main/java/androidx/swiperefreshlayout/widget/CircleImageView.java

@@ -151,7 +151,7 @@ class CircleImageView extends ImageView {
 
         private void updateRadialGradient(int diameter) {
             mRadialGradient = new RadialGradient(diameter / 2, diameter / 2,
-                    mShadowRadius, new int[]{FILL_SHADOW_COLOR, Color.TRANSPARENT},
+                    mShadowRadius, new int[] { FILL_SHADOW_COLOR, Color.TRANSPARENT },
                     null, Shader.TileMode.CLAMP);
             mShadowPaint.setShader(mRadialGradient);
         }

app/src/main/java/androidx/swiperefreshlayout/widget/CircularProgressDrawable.java

@@ -44,9 +44,8 @@ import androidx.annotation.RestrictTo;
 import androidx.core.util.Preconditions;
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
 
-
-import com.gh.gamecenter.common.R;
-import com.gh.gamecenter.core.HaloApp;
+import com.gh.gamecenter.R;
+import com.halo.assistant.HaloApp;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -812,7 +811,7 @@ public class CircularProgressDrawable extends Drawable implements Animatable {
 
         void drawImageToRing(Canvas canvas, Rect bounds, Animator animator) {
             Bitmap bitmap;
-            Resources resources = HaloApp.getInstance().getResources();
+            Resources resources = HaloApp.getInstance().getApplication().getResources();
 
             int offset = (int) (mInterpolatedTime * 100) / 2;
             if (!animator.isRunning()) {

app/src/main/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayout.java

@@ -137,8 +137,8 @@ public class SwipeRefreshLayout extends ViewGroup implements NestedScrollingPare
     // refresh was triggered.
     private boolean mReturningToStart;
     private final DecelerateInterpolator mDecelerateInterpolator;
-    private static final int[] LAYOUT_ATTRS = new int[]{
-            android.R.attr.enabled
+    private static final int[] LAYOUT_ATTRS = new int[] {
+        android.R.attr.enabled
     };
 
     CircleImageView mCircleView;
@@ -250,9 +250,9 @@ public class SwipeRefreshLayout extends ViewGroup implements NestedScrollingPare
      *              up rather than clipped.
      * @param start The offset in pixels from the top of this view at which the
      *              progress spinner should appear.
-     * @param end   The offset in pixels from the top of this view at which the
-     *              progress spinner should come to rest after a successful swipe
-     *              gesture.
+     * @param end The offset in pixels from the top of this view at which the
+     *            progress spinner should come to rest after a successful swipe
+     *            gesture.
      */
     public void setProgressViewOffset(boolean scale, int start, int end) {
         mScale = scale;
@@ -265,7 +265,7 @@ public class SwipeRefreshLayout extends ViewGroup implements NestedScrollingPare
 
     /**
      * @return The offset in pixels from the top of this view at which the progress spinner should
-     * appear.
+     *         appear.
      */
     public int getProgressViewStartOffset() {
         return mOriginalOffsetTop;
@@ -273,7 +273,7 @@ public class SwipeRefreshLayout extends ViewGroup implements NestedScrollingPare
 
     /**
      * @return The offset in pixels from the top of this view at which the progress spinner should
-     * come to rest after a successful swipe gesture.
+     *         come to rest after a successful swipe gesture.
      */
     public int getProgressViewEndOffset() {
         return mSpinnerOffsetEnd;
@@ -288,9 +288,9 @@ public class SwipeRefreshLayout extends ViewGroup implements NestedScrollingPare
      * @param scale Set to true if there is no view at a higher z-order than where the progress
      *              spinner is set to appear. Setting it to true will cause indicator to be scaled
      *              up rather than clipped.
-     * @param end   The offset in pixels from the top of this view at which the
-     *              progress spinner should come to rest after a successful swipe
-     *              gesture.
+     * @param end The offset in pixels from the top of this view at which the
+     *            progress spinner should come to rest after a successful swipe
+     *            gesture.
      */
     public void setProgressViewEndTarget(boolean scale, int end) {
         mSpinnerOffsetEnd = end;
@@ -304,6 +304,7 @@ public class SwipeRefreshLayout extends ViewGroup implements NestedScrollingPare
      * @param slingshotDistance The distance in pixels that the refresh indicator can be pulled
      *                          beyond its resting position. Use
      *                          {@link #DEFAULT_SLINGSHOT_DISTANCE} to reset to the default value.
+     *
      */
     public void setSlingshotDistance(@Px int slingshotDistance) {
         mCustomSlingshotDistance = slingshotDistance;
@@ -453,7 +454,6 @@ public class SwipeRefreshLayout extends ViewGroup implements NestedScrollingPare
 
     /**
      * Pre API 11, this does an alpha animation.
-     *
      * @param progress
      */
     void setAnimationProgress(float progress) {
@@ -575,7 +575,7 @@ public class SwipeRefreshLayout extends ViewGroup implements NestedScrollingPare
 
     /**
      * @return Whether the SwipeRefreshWidget is actively showing refresh
-     * progress.
+     *         progress.
      */
     public boolean isRefreshing() {
         return mRefreshing;
@@ -666,7 +666,7 @@ public class SwipeRefreshLayout extends ViewGroup implements NestedScrollingPare
 
     /**
      * @return Whether it is possible for the child view of this layout to
-     * scroll up. Override this if the child view is a custom view.
+     *         scroll up. Override this if the child view is a custom view.
      */
     public boolean canChildScrollUp() {
         if (mChildScrollUpCallback != null) {
@@ -681,7 +681,6 @@ public class SwipeRefreshLayout extends ViewGroup implements NestedScrollingPare
     /**
      * Set a callback to override {@link SwipeRefreshLayout#canChildScrollUp()} method. Non-null
      * callback will return the value provided by the callback and ignore all internal logic.
-     *
      * @param callback Callback that should be called when canChildScrollUp() is called.
      */
     public void setOnChildScrollUpCallback(@Nullable OnChildScrollUpCallback callback) {
@@ -830,7 +829,7 @@ public class SwipeRefreshLayout extends ViewGroup implements NestedScrollingPare
 
     @Override
     public void onNestedScroll(final View target, final int dxConsumed, final int dyConsumed,
-                               final int dxUnconsumed, final int dyUnconsumed) {
+            final int dxUnconsumed, final int dyUnconsumed) {
         // Dispatch up to the nested parent first
         dispatchNestedScroll(dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed,
                 mParentOffsetInWindow);
@@ -876,7 +875,7 @@ public class SwipeRefreshLayout extends ViewGroup implements NestedScrollingPare
 
     @Override
     public boolean dispatchNestedScroll(int dxConsumed, int dyConsumed, int dxUnconsumed,
-                                        int dyUnconsumed, int[] offsetInWindow) {
+            int dyUnconsumed, int[] offsetInWindow) {
         return mNestedScrollingChildHelper.dispatchNestedScroll(dxConsumed, dyConsumed,
                 dxUnconsumed, dyUnconsumed, offsetInWindow);
     }
@@ -889,13 +888,13 @@ public class SwipeRefreshLayout extends ViewGroup implements NestedScrollingPare
 
     @Override
     public boolean onNestedPreFling(View target, float velocityX,
-                                    float velocityY) {
+            float velocityY) {
         return dispatchNestedPreFling(velocityX, velocityY);
     }
 
     @Override
     public boolean onNestedFling(View target, float velocityX, float velocityY,
-                                 boolean consumed) {
+            boolean consumed) {
         return dispatchNestedFling(velocityX, velocityY, consumed);
     }
 
@@ -923,8 +922,8 @@ public class SwipeRefreshLayout extends ViewGroup implements NestedScrollingPare
         float slingshotDist = mCustomSlingshotDistance > 0
                 ? mCustomSlingshotDistance
                 : (mUsingCustomStart
-                ? mSpinnerOffsetEnd - mOriginalOffsetTop
-                : mSpinnerOffsetEnd);
+                        ? mSpinnerOffsetEnd - mOriginalOffsetTop
+                        : mSpinnerOffsetEnd);
         float tensionSlingshotPercent = Math.max(0, Math.min(extraOS, slingshotDist * 2)
                 / slingshotDist);
         float tensionPercent = (float) ((tensionSlingshotPercent / 4) - Math.pow(
@@ -1147,13 +1146,13 @@ public class SwipeRefreshLayout extends ViewGroup implements NestedScrollingPare
     };
 
     private void startScaleDownReturnToStartAnimation(int from,
-                                                      AnimationListener listener) {
+            AnimationListener listener) {
         mFrom = from;
         mStartingScale = mCircleView.getScaleX();
         mScaleDownToStartAnimation = new Animation() {
             @Override
             public void applyTransformation(float interpolatedTime, Transformation t) {
-                float targetScale = (mStartingScale + (-mStartingScale * interpolatedTime));
+                float targetScale = (mStartingScale + (-mStartingScale  * interpolatedTime));
                 setAnimationProgress(targetScale);
                 moveToStart(interpolatedTime);
             }
@@ -1204,7 +1203,8 @@ public class SwipeRefreshLayout extends ViewGroup implements NestedScrollingPare
          * is called to allow the implementer to override its behavior.
          *
          * @param parent SwipeRefreshLayout that this callback is overriding.
-         * @param child  The child view of SwipeRefreshLayout.
+         * @param child The child view of SwipeRefreshLayout.
+         *
          * @return Whether it is possible for the child view of parent layout to scroll up.
          */
         boolean canChildScrollUp(@NonNull SwipeRefreshLayout parent, @Nullable View child);

app/src/main/java/androidx/swiperefreshlayout/widget/ViewPagerSwipeRefreshLayout.java

@@ -31,7 +31,7 @@ public class ViewPagerSwipeRefreshLayout extends SwipeRefreshLayout {
                 break;
             case MotionEvent.ACTION_MOVE:
                 // 如果viewpager正在拖拽中，那么不拦截它的事件，直接return false；
-                if (mIsVpDragger) {
+                if(mIsVpDragger) {
                     return false;
                 }
 
@@ -41,7 +41,7 @@ public class ViewPagerSwipeRefreshLayout extends SwipeRefreshLayout {
                 float distanceX = Math.abs(endX - startX);
                 float distanceY = Math.abs(endY - startY);
                 // 如果X轴位移大于Y轴位移，那么将事件交给viewPager处理。
-                if (distanceX > mTouchSlop && distanceX > distanceY) {
+                if(distanceX > mTouchSlop && distanceX > distanceY) {
                     mIsVpDragger = true;
                     return false;
                 }

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

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

@@ -0,0 +1,629 @@
+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/BaseActivity_TabLayout.java

@@ -1,24 +1,24 @@
-package com.gh.gamecenter.common.base.activity;
+package com.gh.base;
 
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 
-import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
-import androidx.fragment.app.Fragment;
-import androidx.viewpager.widget.ViewPager;
-
-import com.gh.gamecenter.common.R;
-import com.gh.gamecenter.common.base.adapter.FragmentAdapter;
-import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout;
-import com.gh.gamecenter.common.view.TabIndicatorView;
+import com.gh.base.adapter.FragmentAdapter;
+import com.gh.base.fragment.BaseFragment_TabLayout;
+import com.gh.common.view.TabIndicatorView;
+import com.gh.gamecenter.R;
 import com.google.android.material.tabs.TabLayout;
 import com.lightgame.view.NoScrollableViewPager;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
+
 /**
  * Created by khy on 15/03/18.
  */
@@ -136,8 +136,8 @@ public abstract class BaseActivity_TabLayout extends ToolBarActivity implements
     }
 
     @Override
-    protected void onDarkModeChanged() {
-        super.onDarkModeChanged();
+    protected void onNightModeChange() {
+        super.onNightModeChange();
         View container = findViewById(R.id.activity_tab_container);
         if (container != null) {
             container.setBackgroundColor(ContextCompat.getColor(this, R.color.background_white));

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

@@ -1,10 +1,7 @@
-package com.gh.gamecenter.common.base;
-
-import android.view.View;
+package com.gh.base;
 
 import androidx.recyclerview.widget.RecyclerView;
-
-import com.gh.gamecenter.common.callback.OnListClickListener;
+import android.view.View;
 
 /**
  * 目前仅提供butterknife bind方法

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

@@ -14,16 +14,12 @@ import android.widget.CheckBox
 import android.widget.FrameLayout
 import android.widget.TextView
 import androidx.lifecycle.Observer
-import com.gh.common.util.DialogUtils
-import com.gh.common.util.NewLogUtils
+import com.gh.common.AppExecutor
+import com.gh.common.runOnIoThread
+import com.gh.common.util.*
 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
@@ -41,7 +37,6 @@ import org.json.JSONArray
 import org.json.JSONObject
 import java.io.File
 
-// TODO: 移动到module_bbs模块
 abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarActivity(),
     KeyboardHeightObserver, UploadVideoListener {
 
@@ -113,8 +108,7 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                 }
             }
             INSERT_GAME_COLLECTION_CODE -> {
-                val gameCollectionEntity =
-                    data?.getParcelableExtra<GamesCollectionEntity>(GamesCollectionEntity::class.java.simpleName)
+                val gameCollectionEntity = data?.getParcelableExtra<GamesCollectionEntity>(GamesCollectionEntity::class.java.simpleName)
                 if (gameCollectionEntity != null) {
                     mRichEditor.focusEditor()
                     insertData = EditorInsertEntity.transform(gameCollectionEntity)
@@ -125,9 +119,7 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                 if (data != null) mViewModel.uploadPic(data)
             }
             INSERT_MEDIA_VIDEO_CODE -> {
-                val localVideoList =
-                    data?.getParcelableArrayListExtra<LocalVideoEntity>(LocalVideoEntity::class.java.name)
-                        ?: arrayListOf()
+                val localVideoList = data?.getParcelableArrayListExtra<LocalVideoEntity>(LocalVideoEntity::class.java.name) ?: arrayListOf()
                 if (localVideoList.isNotEmpty()) {
                     mRichEditor.focusEditor()
                     uploadVideo(localVideoList)
@@ -213,7 +205,6 @@ 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")
@@ -744,14 +735,6 @@ 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,16 +9,15 @@ import android.text.TextUtils
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.MutableLiveData
-import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment
-import com.gh.gamecenter.core.runOnUiThread
+import com.gh.base.fragment.WaitingDialogFragment
+import com.gh.common.runOnUiThread
+import com.gh.common.util.*
 import com.gh.gamecenter.R
-import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.entity.ErrorEntity
 import com.gh.gamecenter.entity.LocalVideoEntity
 import com.gh.gamecenter.entity.QuoteCountEntity
 import com.gh.gamecenter.qa.BbsType
-import com.gh.gamecenter.common.retrofit.Response
+import com.gh.gamecenter.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.gh.gamecenter.retrofit.service.ApiService
 import com.gh.gamecenter.video.upload.OnUploadListener
@@ -41,7 +40,6 @@ 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>()
@@ -191,8 +189,7 @@ 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 {
@@ -311,8 +308,7 @@ 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/BaseSimpleDao.kt

@@ -1,9 +1,9 @@
-package com.gh.gamecenter.common.base
+package com.gh.base
 
 import android.content.Context
 import android.content.SharedPreferences
-import com.gh.gamecenter.common.HaloApp
-import com.gh.gamecenter.core.utils.SPUtils
+import com.gh.common.util.SPUtils
+import com.halo.assistant.HaloApp
 
 /**
  * 用 SP 实现的简单列表持久化结构
@@ -12,7 +12,7 @@ abstract class BaseSimpleDao {
 
     // 使用独有的 SP 文件
     private val mSp: SharedPreferences by lazy {
-        HaloApp.getInstance().getSharedPreferences("SimpleDao", Context.MODE_PRIVATE)
+        HaloApp.getInstance().application.getSharedPreferences("SimpleDao", Context.MODE_PRIVATE)
     }
 
     fun add(key: String) {

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.core
+package com.gh.base
 
 import java.util.concurrent.ThreadFactory
 import java.util.concurrent.atomic.AtomicInteger

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

@@ -0,0 +1,229 @@
+//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,35 +3,37 @@ package com.gh.base
 import android.app.Activity
 import android.app.Application
 import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
+import com.gh.common.notifier.Notifier
+import com.gh.common.util.DataUtils
 import com.gh.common.util.FloatingBackViewManager
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.MainActivity
 import com.gh.gamecenter.SplashScreenActivity
-import com.gh.gamecenter.common.utils.PackageFlavorHelper
+import com.gh.gamecenter.energy.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?) {
-        // do nothing
+        AppManager.getInstance().addActivity(activity)
     }
 
     override fun onActivityStarted(activity: Activity) {
-        GlobalActivityManager.currentActivity = activity
+
     }
 
     override fun onActivityResumed(activity: Activity) {
+        CurrentActivityHolder.activitySet.add(activity)
+
         // 判断是否需要显示或隐藏返回小浮窗
         if (FloatingBackViewManager.getType().isNotEmpty()) {
-            if ((activity::class.java.name == "EnergyCenterActivity")
+            if (activity is EnergyCenterActivity
                 && FloatingBackViewManager.getType() == FloatingBackViewManager.TYPE_TASK
             ) {
                 FloatingBackViewManager.disableBackView()
@@ -45,6 +47,7 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
         }
 
         if (HaloApp.isUserAcceptPrivacyPolicy(activity)) {
+            DataUtils.onResume(activity)
             // FIXME 这里应该只是部分Activity需要
             try {
                 // 初始化gameMap
@@ -55,14 +58,6 @@ 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 {
@@ -75,22 +70,28 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
     }
 
     override fun onActivityPaused(activity: Activity) {
+        CurrentActivityHolder.activitySet.remove(activity)
         FloatingBackViewManager.dismissBackView()
-        if (PackageFlavorHelper.IS_TEST_FLAVOR && activity is AppCompatActivity) {
-            DarkModeSwitchHelper.dismissDarkModeSwitchFloatingView()
+
+        if (HaloApp.isUserAcceptPrivacyPolicy(activity)) {
+            DataUtils.onPause(activity)
+        }
+
+        if (activity.isFinishing) {
+            AppManager.getInstance().finishActivity(activity)
         }
     }
 
     override fun onActivityStopped(activity: Activity) {
-        // do nothing
+        Notifier.hide()
     }
 
     override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
-        // do nothing
+
     }
 
     override fun onActivityDestroyed(activity: Activity) {
-        // do nothing
+        AppManager.getInstance().finishActivity(activity)
     }
 
 }

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

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

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

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

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

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

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

@@ -1,8 +1,8 @@
-package com.gh.gamecenter.common.callback;
+package com.gh.base;
 
 /**
  * Created by Administrator on 2016/9/8.
- * <p>
+ *
  * 逐步移除
  */
 
@@ -17,6 +17,4 @@ public interface OnRequestCallBackListener<T> {
 
     void loadEmpty();
 
-    void loadNotFound();
-
 }

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

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

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

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

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

@@ -1,16 +1,16 @@
-package com.gh.gamecenter.common.base.activity;
+package com.gh.base;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.MotionEvent;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.Window;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
@@ -18,19 +18,32 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.DrawableRes;
+import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.appcompat.widget.ActionMenuView;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
+import androidx.lifecycle.ViewModelProviders;
 
 import com.facebook.drawee.view.SimpleDraweeView;
-import com.gh.gamecenter.common.R;
-import com.gh.gamecenter.common.base.fragment.ToolbarController;
-import com.gh.gamecenter.common.base.fragment.ToolbarFragment;
-import com.gh.gamecenter.common.utils.ImageUtils;
+import com.gh.common.constant.Constants;
+import com.gh.common.util.DisplayUtils;
+import com.gh.common.util.ImageUtils;
+import com.gh.common.util.SPUtils;
+import com.gh.common.view.GameIconView;
+import com.gh.download.DownloadManager;
+import com.gh.gamecenter.DownloadManagerActivity;
+import com.gh.gamecenter.R;
+import com.gh.gamecenter.entity.GameUpdateEntity;
+import com.gh.gamecenter.eventbus.EBDownloadStatus;
+import com.gh.gamecenter.normal.ToolbarController;
+import com.gh.gamecenter.packagehelper.PackageViewModel;
 import com.lightgame.OnTitleClickListener;
 
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.List;
@@ -43,10 +56,8 @@ import java.util.List;
 
 public abstract class ToolBarActivity extends BaseActivity implements ToolbarController, ActionMenuView.OnMenuItemClickListener {
 
-    public static final String NORMAL_FRAGMENT_NAME = "normalFragmentName";
-    public static final String NORMAL_FRAGMENT_BUNDLE = "normalFragmentBundle";
-
-    private Fragment mTargetFragment;
+    @Nullable
+    private PackageViewModel mPackageViewModel;
 
     protected View mToolbarContainer;
 
@@ -64,14 +75,14 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon
 
     protected View mBackBtn;
 
+    protected GameIconView mGameIconView;
+
     protected SimpleDraweeView mUserAvatarIv;
 
     protected TextView mIconTitle;
 
-    @Override
-    protected int getLayoutId() {
-        return R.layout.activity_normal;
-    }
+    @Nullable
+    private TextView mDownloadCountHint;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -79,41 +90,12 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon
         setStatusBarDarkMode(true, this);
         initToolbar();
 
-        if (getIntent() != null) {
-            if (savedInstanceState == null) {
-                handleIntent(getIntent());
-            } else {
-                for (Fragment fragment : getSupportFragmentManager().getFragments()) {
-                    if (fragment instanceof ToolbarFragment) mTargetFragment = fragment;
-                }
-            }
+        if (!SPUtils.getBoolean(Constants.SP_TEENAGER_MODE) && showDownloadMenu()) {
+            mPackageViewModel = ViewModelProviders.of(this, new PackageViewModel.Factory()).get(PackageViewModel.class);
+            mPackageViewModel.getFilterSameUpdateLiveData().observe(this, this::updateDownloadCountHint);
         }
     }
 
-    @Override
-    protected void onNewIntent(Intent intent) {
-        super.onNewIntent(intent);
-        if (getIntent() != null) handleIntent(intent);
-    }
-
-    private void handleIntent(Intent intent) {
-        String fraName = intent.getStringExtra(NORMAL_FRAGMENT_NAME);
-        Bundle bundle = intent.getBundleExtra(NORMAL_FRAGMENT_BUNDLE);
-        if (TextUtils.isEmpty(fraName)) {
-            if (provideNormalIntent() == null) {
-                return;
-            }
-            fraName = provideNormalIntent().getStringExtra(NORMAL_FRAGMENT_NAME);
-            if (bundle == null) bundle = getIntent().getExtras();
-            if (TextUtils.isEmpty(fraName)) return;
-        }
-        mTargetFragment = getSupportFragmentManager().findFragmentByTag(fraName);
-        if (mTargetFragment == null) {
-            mTargetFragment = Fragment.instantiate(this, fraName, bundle);
-        }
-        getSupportFragmentManager().beginTransaction().replace(getFragmentPlaceholderId(), mTargetFragment, fraName).commitNowAllowingStateLoss();
-    }
-
     // 小米沉浸式黑色字体
     @SuppressLint("PrivateApi")
     public void setStatusBarDarkMode(boolean darkmode, Activity activity) {
@@ -138,10 +120,13 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon
         mIconTitleContainer = findViewById(R.id.iconTitleContainer);
         mBackContainer = findViewById(R.id.backContainer);
         mBackBtn = findViewById(R.id.backBtn);
+        mGameIconView = findViewById(R.id.gameIv);
         mUserAvatarIv = findViewById(R.id.userAvatar);
         mIconTitle = findViewById(R.id.iconTitle);
         if (mToolbar != null) {
 //            setSupportActionBar(mToolbar); // 替换actionBar后 toolBar无法控制
+//            mToolbar.setNavigationIcon(provideNavigationIcon());
+//            mToolbar.setNavigationOnClickListener(provideNavigationItemClickListener());
             if (mBackBtn != null) mBackBtn.setOnClickListener(provideNavigationItemClickListener());
             if (mBackContainer != null) mBackContainer.setOnClickListener(provideNavigationItemClickListener());
             if (mTitleTv != null) {
@@ -183,8 +168,18 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon
     @Override
     public void setToolbarMenu(int res) {
         if (mActionMenuView == null) return;
-        inflateMenu(res);
+        // 青少年模式下要隐藏下载按钮
+        if (SPUtils.getBoolean(Constants.SP_TEENAGER_MODE) && res == R.menu.menu_download) return;
+//        mToolbar.inflateMenu(res);
+//        mToolbar.setOnMenuItemClickListener(this);
+
+        getMenuInflater().inflate(res, mActionMenuView.getMenu());
         mActionMenuView.setOnMenuItemClickListener(this);
+
+        if (showDownloadMenu()) {
+            createDownloadMenu(res);
+        }
+
         Menu menu = mActionMenuView.getMenu();
         for (int i = 0; i < menu.size(); i++) {
             MenuItem menuItem = menu.getItem(i);
@@ -202,10 +197,6 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon
         setTitleCenter();
     }
 
-    public void inflateMenu(int res) {
-        getMenuInflater().inflate(res, mActionMenuView.getMenu());
-    }
-
     @Override
     protected void onResume() {
         super.onResume();
@@ -223,6 +214,13 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon
         }
     }
 
+    public void setGameIconToolbar(String icon, String iconSubscript) {
+        mTitleContainer.setVisibility(View.GONE);
+        mGameIconView.displayGameIcon(icon, iconSubscript);
+        mGameIconView.setVisibility(View.VISIBLE);
+        mIconTitleContainer.setVisibility(View.VISIBLE);
+    }
+
     public void setUserAvatarIconToolbar(String icon) {
         mTitleContainer.setVisibility(View.GONE);
         ImageUtils.display(mUserAvatarIv, icon);
@@ -230,6 +228,49 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon
         mIconTitleContainer.setVisibility(View.VISIBLE);
     }
 
+    private void createDownloadMenu(int res) {
+        if (res != R.menu.menu_download) {
+            MenuInflater inflater = getMenuInflater();
+            inflater.inflate(R.menu.menu_download, mActionMenuView.getMenu());
+        }
+
+        if (mPackageViewModel != null) {
+            updateDownloadCountHint(mPackageViewModel.getFilterSameUpdateLiveData().getValue());
+        }
+
+        View downloadMenuView = mActionMenuView.getMenu().findItem(R.id.menu_download).getActionView();
+        mDownloadCountHint = downloadMenuView.findViewById(R.id.menu_download_count_hint);
+    }
+
+    private void updateDownloadCountHint(List<GameUpdateEntity> updateList) {
+        if (mDownloadCountHint == null) return;
+
+        String count = DownloadManager.getInstance().getDownloadOrUpdateCount(updateList);
+        if (count != null) {
+            mDownloadCountHint.setVisibility(View.VISIBLE);
+            mDownloadCountHint.setText(count);
+
+            ViewGroup.LayoutParams params = mDownloadCountHint.getLayoutParams();
+            if (TextUtils.isEmpty(count)) {
+                params.width = DisplayUtils.dip2px(6);
+                params.height = DisplayUtils.dip2px(6);
+            } else {
+                params.width = DisplayUtils.dip2px(12);
+                params.height = DisplayUtils.dip2px(12);
+            }
+            mDownloadCountHint.setLayoutParams(params);
+        } else {
+            mDownloadCountHint.setVisibility(View.GONE);
+        }
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onEventMainThread(EBDownloadStatus status) {
+        if (!SPUtils.getBoolean(Constants.SP_TEENAGER_MODE) && showDownloadMenu() && mPackageViewModel != null) {
+            updateDownloadCountHint(mPackageViewModel.getFilterSameUpdateLiveData().getValue());
+        }
+    }
+
     @Override
     public MenuItem getMenuItem(int res) {
         if (mToolbar == null) return null; //后续页面做好判断
@@ -247,14 +288,12 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon
         return mActionMenuView.getMenu();
     }
 
-    public ActionMenuView getActionMenuView() {
-        return mActionMenuView;
-    }
-
     @Override
     public boolean onMenuItemClick(MenuItem item) {
-        if (mTargetFragment instanceof ToolbarFragment) {
-            ((ToolbarFragment) mTargetFragment).onMenuItemClick(item);
+        if (item.getItemId() == R.id.menu_download) {
+//            MtaHelper.onEvent("下载管理", "下载管理入口", getActivityNameInChinese());
+            Intent intent = DownloadManagerActivity.getDownloadMangerIntent(this, mEntrance);
+            startActivity(intent);
         }
         return false;
     }
@@ -263,33 +302,8 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon
         return view -> onBackPressed();
     }
 
-    @Override
-    public void onBackPressed() {
-        if (mTargetFragment != null) {
-            if (mTargetFragment instanceof ToolbarFragment
-                    && mTargetFragment.isAdded()
-                    && !((ToolbarFragment) mTargetFragment).onBackPressed()) {
-                super.onBackPressed();
-            }
-        } else {
-            super.onBackPressed();
-        }
-    }
-
-    @Override
-    public boolean dispatchTouchEvent(MotionEvent ev) {
-        if (mTargetFragment instanceof ToolbarFragment) {
-            ((ToolbarFragment) mTargetFragment).onTouchEvent(ev);
-        }
-        return super.dispatchTouchEvent(ev);
-    }
-
-    public Fragment getTargetFragment() {
-        return mTargetFragment;
-    }
-
-    public int getFragmentPlaceholderId() {
-        return R.id.normal_content;
+    protected boolean showDownloadMenu() {
+        return false;
     }
 
     @Override
@@ -299,43 +313,9 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon
         }
     }
 
-    // 针对部分跳转不符合ToolbarActivity规则的额外处理，主要绑定ToolbarFragment
-    protected Intent provideNormalIntent() {
-        return null;
-    }
-
-    protected static Intent getTargetIntent(Context context, Class<? extends ToolBarActivity> cls, Class<? extends ToolbarFragment> t, Bundle bundle) {
-        Intent intent = new Intent(context, cls);
-        intent.putExtra(NORMAL_FRAGMENT_NAME, t.getCanonicalName());
-        intent.putExtra(NORMAL_FRAGMENT_BUNDLE, bundle);
-        return intent;
-    }
-
-    protected static Intent getTargetIntent(Context context, Class<? extends ToolBarActivity> cls, Class<? extends ToolbarFragment> t) {
-        Intent intent = new Intent(context, cls);
-        intent.putExtra(NORMAL_FRAGMENT_NAME, t.getCanonicalName());
-        return intent;
-    }
-
-
-    public static void startFragmentNewTask(Context context, Class<? extends ToolbarFragment> t, Bundle bundle) {
-        Intent intent = new Intent(context, ToolBarActivity.class);
-        intent.putExtra(NORMAL_FRAGMENT_NAME, t.getCanonicalName());
-        intent.putExtra(NORMAL_FRAGMENT_BUNDLE, bundle);
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        context.startActivity(intent);
-    }
-
-    public static void startFragment(Context context, Class<? extends ToolbarFragment> t, Bundle bundle) {
-        Intent intent = new Intent(context, ToolBarActivity.class);
-        intent.putExtra(NORMAL_FRAGMENT_NAME, t.getCanonicalName());
-        intent.putExtra(NORMAL_FRAGMENT_BUNDLE, bundle);
-        context.startActivity(intent);
-    }
-
     @Override
-    protected void onDarkModeChanged() {
-        super.onDarkModeChanged();
+    protected void onNightModeChange() {
+        super.onNightModeChange();
         if (mToolbar != null) {
             mToolbar.setBackgroundColor(ContextCompat.getColor(this, R.color.background_white));
         }
@@ -349,13 +329,8 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon
         if (mTitleTv != null) {
             mTitleTv.setTextColor(ContextCompat.getColor(this, R.color.text_black));
         }
+        if (showDownloadMenu() && getMenuItem(R.id.menu_download) != null) {
+            ((ImageView) getMenuItem(R.id.menu_download).getActionView().findViewById(R.id.menu_download_iv)).setImageDrawable(ContextCompat.getDrawable(this, R.drawable.toolbar_download));
+        }
     }
-
-    /**
-     * 更新 targetFragment 引用
-     */
-    protected void updateTargetFragment(Fragment fragment) {
-        mTargetFragment = fragment;
-    }
-
 }

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

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

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

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

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

@@ -1,10 +1,18 @@
-package com.gh.gamecenter.common.base.fragment;
+package com.gh.base.fragment;
 
 import android.app.Dialog;
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.view.KeyEvent;
 
+import com.gh.common.util.ClickUtils;
+import com.gh.common.util.NightModeUtils;
+import com.gh.gamecenter.R;
+import com.lightgame.utils.RuntimeUtils;
+import com.lightgame.utils.Utils;
+
+import java.lang.reflect.Field;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
@@ -14,14 +22,6 @@ import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.Lifecycle;
 
-import com.gh.gamecenter.common.R;
-import com.gh.gamecenter.common.utils.DarkModeUtils;
-import com.gh.gamecenter.core.utils.ClickUtils;
-import com.lightgame.utils.RuntimeUtils;
-import com.lightgame.utils.Utils;
-
-import java.lang.reflect.Field;
-
 /**
  * @author CsHeng
  * @Date 17/05/2017
@@ -30,12 +30,12 @@ import java.lang.reflect.Field;
 
 public class BaseDialogFragment extends DialogFragment {
 
-    protected boolean mIsDarkModeOn;
+    protected boolean mNightMode;
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mIsDarkModeOn = DarkModeUtils.INSTANCE.isDarkModeOn(requireContext());
+        mNightMode = NightModeUtils.INSTANCE.isNightMode(requireContext());
     }
 
     @NonNull
@@ -109,13 +109,11 @@ public class BaseDialogFragment extends DialogFragment {
     @Override
     public void onConfigurationChanged(@NonNull Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
-
-        mIsDarkModeOn = DarkModeUtils.INSTANCE.isDarkModeOn(requireContext());
-        onDarkModeChanged();
+        onNightModeChange();
     }
 
-    protected void onDarkModeChanged() {
-
+    protected void onNightModeChange() {
+        mNightMode = NightModeUtils.INSTANCE.isNightMode(requireContext());
     }
 }
 

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

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

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

@@ -1,6 +1,4 @@
-package com.gh.gamecenter.common.base.fragment;
-
-import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_ENTRANCE;
+package com.gh.base.fragment;
 
 import android.content.Intent;
 import android.content.res.Configuration;
@@ -11,6 +9,7 @@ import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 
 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
@@ -20,16 +19,16 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.gh.gamecenter.common.BuildConfig;
-import com.gh.gamecenter.common.R;
-import com.gh.gamecenter.common.callback.OnListClickListener;
-import com.gh.gamecenter.common.callback.OnRequestCallBackListener;
-import com.gh.gamecenter.common.constant.Constants;
-import com.gh.gamecenter.common.eventbus.EBMiPush;
-import com.gh.gamecenter.common.syncpage.ISyncAdapterHandler;
-import com.gh.gamecenter.common.syncpage.SyncDataEntity;
-import com.gh.gamecenter.common.syncpage.SyncPageRepository;
-import com.gh.gamecenter.common.utils.DarkModeUtils;
+import com.gh.base.OnListClickListener;
+import com.gh.base.OnRequestCallBackListener;
+import com.gh.common.constant.Constants;
+import com.gh.common.syncpage.ISyncAdapterHandler;
+import com.gh.common.syncpage.SyncDataEntity;
+import com.gh.common.syncpage.SyncPageRepository;
+import com.gh.common.util.NightModeUtils;
+import com.gh.gamecenter.BuildConfig;
+import com.gh.gamecenter.R;
+import com.gh.gamecenter.eventbus.EBMiPush;
 import com.lightgame.OnTitleClickListener;
 import com.lightgame.utils.RuntimeUtils;
 import com.lightgame.utils.Utils;
@@ -47,6 +46,8 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
 import kotlin.Pair;
 
+import static com.gh.common.util.EntranceUtils.KEY_ENTRANCE;
+
 /**
  * Created by LGT on 2016/9/4.
  * Fragment 基类
@@ -60,7 +61,7 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
 
     protected boolean isEverPause;
 
-    protected boolean mIsDarkModeOn;
+    protected boolean mNightMode;
 
     @NonNull
     protected String mEntrance = "";
@@ -162,10 +163,11 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
         if (addSyncPageObserver()) {
             initSyncPageObserver();
         }
-        if (BuildConfig.IS_DARK_MODE_ON) {
-            mIsDarkModeOn = DarkModeUtils.INSTANCE.isDarkModeOn(requireContext());
+
+        if (BuildConfig.IS_NIGHT_MODE_ON) {
+            mNightMode = NightModeUtils.INSTANCE.isNightMode(requireContext());
         } else {
-            mIsDarkModeOn = false;
+            mNightMode = false;
         }
     }
 
@@ -240,10 +242,10 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
         isEverPause = false;
         startPageTime = System.currentTimeMillis();
 
-        if (BuildConfig.IS_DARK_MODE_ON
-                && !DarkModeUtils.INSTANCE.isFollowSystemDarkModeFromSp()
-                && mIsDarkModeOn != DarkModeUtils.INSTANCE.isDarkModeOn(requireContext())) {
-            onDarkModeChanged();
+        if (BuildConfig.IS_NIGHT_MODE_ON
+            && !NightModeUtils.INSTANCE.getSystemMode()
+            && mNightMode != NightModeUtils.INSTANCE.isNightMode(requireContext())) {
+            onNightModeChange();
         }
     }
 
@@ -283,27 +285,22 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
 
     @Override
     public void loadDone() {
-        // do nothing
+
     }
 
     @Override
     public void loadDone(T obj) {
-        // do nothing
+
     }
 
     @Override
     public void loadError() {
-        // do nothing
+
     }
 
     @Override
     public void loadEmpty() {
-        // do nothing
-    }
 
-    @Override
-    public void loadNotFound() {
-        // do nothing
     }
 
     @Override
@@ -357,14 +354,12 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
     @Override
     public void onConfigurationChanged(@NonNull Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
-
-        if (BuildConfig.IS_DARK_MODE_ON && mIsDarkModeOn != DarkModeUtils.INSTANCE.isDarkModeOn(requireContext())) {
-            mIsDarkModeOn = DarkModeUtils.INSTANCE.isDarkModeOn(requireContext());
-            onDarkModeChanged();
+        if (BuildConfig.IS_NIGHT_MODE_ON) {
+            onNightModeChange();
         }
     }
 
-    protected void onDarkModeChanged() {
-
+    protected void onNightModeChange() {
+        mNightMode = NightModeUtils.INSTANCE.isNightMode(requireContext());
     }
 }

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

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.base.fragment;
+package com.gh.base.fragment;
 
 import android.content.Context;
 import android.content.Intent;
@@ -15,10 +15,12 @@ import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.viewpager.widget.ViewPager;
 
-import com.gh.gamecenter.common.R;
-import com.gh.gamecenter.common.base.adapter.FragmentAdapter;
-import com.gh.gamecenter.common.view.TabIndicatorView;
+import com.gh.base.adapter.FragmentAdapter;
+import com.gh.common.view.TabIndicatorView;
+import com.gh.gamecenter.R;
+import com.gh.gamecenter.normal.NormalFragment;
 import com.google.android.material.tabs.TabLayout;
+import com.halo.assistant.HaloApp;
 import com.lightgame.utils.Utils;
 import com.lightgame.view.NoScrollableViewPager;
 
@@ -29,7 +31,7 @@ import java.util.List;
  * Created by khy on 15/03/18.
  */
 
-public abstract class BaseFragment_TabLayout extends ToolbarFragment implements ViewPager.OnPageChangeListener {
+public abstract class BaseFragment_TabLayout extends NormalFragment implements ViewPager.OnPageChangeListener {
 
     public static final String PAGE_INDEX = "PAGE_INDEX";
 
@@ -171,7 +173,7 @@ public abstract class BaseFragment_TabLayout extends ToolbarFragment implements
             return;
         }
         tabTitle.setTypeface(isChecked ? Typeface.DEFAULT_BOLD : Typeface.DEFAULT);
-        tabTitle.setTextColor(ContextCompat.getColor(tabTitle.getContext(), isChecked ? R.color.theme_font : R.color.text_subtitle));
+        tabTitle.setTextColor(ContextCompat.getColorStateList(tabTitle.getContext(), R.color.text_tabbar_style));
     }
 
     // 如果不设置View的话，无法动态设置字体样式
@@ -201,8 +203,8 @@ public abstract class BaseFragment_TabLayout extends ToolbarFragment implements
     }
 
     @Override
-    protected void onDarkModeChanged() {
-        super.onDarkModeChanged();
+    protected void onNightModeChange() {
+        super.onNightModeChange();
         View container = requireView().findViewById(R.id.fragment_tab_container);
         if (container != null) {
             container.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.background_white));

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

@@ -7,11 +7,10 @@
  * 2013-3-6			    CsHeng
  */
 
-package com.gh.gamecenter.common.base.fragment;
+package com.gh.base.fragment;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.view.View;
 
 import androidx.annotation.IdRes;
 import androidx.annotation.LayoutRes;
@@ -20,6 +19,9 @@ import androidx.fragment.app.Fragment;
 import androidx.viewpager.widget.PagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 
+import android.view.View;
+
+import com.gh.gamecenter.normal.NormalFragment;
 import com.lightgame.adapter.BaseFragmentPagerAdapter;
 import com.lightgame.config.CommonDebug;
 import com.lightgame.view.DoubleTapTextView;
@@ -34,7 +36,7 @@ import java.util.List;
  * @author CsHeng
  * @date 2013-3-6
  */
-public abstract class BaseFragment_ViewPager extends ToolbarFragment implements DoubleTapTextView.OnDoubleTapListener {
+public abstract class BaseFragment_ViewPager extends NormalFragment implements DoubleTapTextView.OnDoubleTapListener {
 
     public static final String ARGS_INDEX = "index";
     protected int mCheckedIndex = 0;

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

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

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

@@ -1,11 +1,12 @@
-package com.gh.gamecenter.common.base.fragment
+package com.gh.base.fragment
 
 import android.os.Bundle
+import com.gh.gamecenter.normal.NormalFragment
 
 /**
  * 懒加载（支持多层嵌套）
  */
-abstract class BaseLazyFragment : ToolbarFragment() {
+abstract class BaseLazyFragment : NormalFragment() {
 
     private var mIsFirstVisible = true
 

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

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.base.fragment
+package com.gh.base.fragment
 
 import android.content.Intent
 import android.os.Bundle
@@ -7,9 +7,9 @@ import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.viewpager.widget.PagerAdapter
 import androidx.viewpager.widget.ViewPager
-import com.gh.gamecenter.common.R
-import com.gh.gamecenter.common.base.adapter.FragmentAdapter
-import com.gh.gamecenter.common.view.TabIndicatorView
+import com.gh.base.adapter.FragmentAdapter
+import com.gh.common.view.TabIndicatorView
+import com.gh.gamecenter.R
 import com.google.android.material.tabs.TabLayout
 import com.lightgame.view.NoScrollableViewPager
 
@@ -122,8 +122,8 @@ abstract class BaseLazyTabFragment : BaseLazyFragment(), ViewPager.OnPageChangeL
 
     override fun onPageScrollStateChanged(state: Int) {}
 
-    override fun onDarkModeChanged() {
-        super.onDarkModeChanged()
+    override fun onNightModeChange() {
+        super.onNightModeChange()
         val container = requireView().findViewById<View>(R.id.fragment_tab_container)
         if (container != null) {
             container.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.background_white))

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

@@ -1,9 +1,9 @@
-package com.gh.gamecenter.common.base.fragment
+package com.gh.base.fragment
 
 import android.os.Bundle
 import android.view.View
 import android.view.ViewStub
-import com.gh.gamecenter.common.R
+import com.gh.gamecenter.R
 
 /**
  * 这是在 BaseLazyFragment 之上添加了一些通用功能的抽象类

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

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.callback;
+package com.gh.base.fragment;
 
 public interface OnDialogBackListener {
     void onBack();

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

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.base.fragment;
+package com.gh.base.fragment;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -11,9 +11,9 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.FragmentManager;
 
-import com.gh.gamecenter.common.R;
-import com.gh.gamecenter.common.callback.OnDialogBackListener;
-import com.gh.gamecenter.core.utils.DisplayUtils;
+import com.gh.common.util.DisplayUtils;
+import com.gh.common.util.ExtensionsKt;
+import com.gh.gamecenter.R;
 
 /**
  * @author CsHeng

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

@@ -1,12 +1,13 @@
-package com.gh.gamecenter.core
+package com.gh.common
 
 import android.os.Handler
 import android.os.Looper
-import com.gh.gamecenter.core.AppExecutor.heavyWeightIoExecutor
-import com.gh.gamecenter.core.AppExecutor.ioExecutor
-import com.gh.gamecenter.core.AppExecutor.lightWeightIoExecutor
-import com.gh.gamecenter.core.AppExecutor.logExecutor
-import com.gh.gamecenter.core.AppExecutor.uiExecutor
+import com.gh.base.GHThreadFactory
+import com.gh.common.AppExecutor.heavyWeightIoExecutor
+import com.gh.common.AppExecutor.ioExecutor
+import com.gh.common.AppExecutor.lightWeightIoExecutor
+import com.gh.common.AppExecutor.logExecutor
+import com.gh.common.AppExecutor.uiExecutor
 import io.reactivex.schedulers.Schedulers
 import java.util.concurrent.*
 
@@ -16,38 +17,34 @@ import java.util.concurrent.*
  * [ioExecutor] 是一个最大线程数固定的线程池，较为繁重的 IO 任务可以交给它
  * [uiExecutor] 是主线程的包裹，需要切换至主线程执行可以用它
  * [lightWeightIoExecutor] 是一个单线程的线程池，轻量级且需要保证同一线程的 IO 任务可以交给它
- * [heavyWeightIoExecutor] 是一个重量级任务的线程池，一些高频调用但不用保证结果的任务可以交给它
- * [logExecutor] 是单线程的日志线程池，供上报日志用
+ * [heavyWeightIoExecutor] 重量级的线程池，一些高频调用但不用保证结果的任务可以交给它
+ * [logExecutor] 只为上传 log 而使用的线程池
  */
 object AppExecutor {
 
-    private const val CORE_POOL_SIZE = 3
-    private const val MAX_POOL_SIZE = 24
+    private val mCoreSize = Runtime.getRuntime().availableProcessors()
+    private val mMinimumPoolSize = 6.coerceAtLeast(mCoreSize)
+    private val mMaximumPoolSize = 24.coerceAtLeast(mCoreSize * 3)
 
     @JvmStatic
     val uiExecutor by lazy { MainThreadExecutor() }
 
     @JvmStatic
-    val lightWeightIoExecutor: ExecutorService by lazy {
-        Executors.newSingleThreadExecutor(
-            GHThreadFactory("GH_LIGHT_WEIGHT_IO_THREAD")
-        )
-    }
+    val lightWeightIoExecutor: ExecutorService by lazy { Executors.newSingleThreadExecutor(GHThreadFactory("GH_LIGHT_WEIGHT_IO_THREAD")) }
 
     @JvmStatic
-    val heavyWeightIoExecutor: ExecutorService by lazy { Executors.newSingleThreadExecutor(GHThreadFactory("GH_HEAVY_WEIGHT_IO_THREAD")) }
+    val heavyWeightIoExecutor: ExecutorService by lazy { Executors.newFixedThreadPool(2, GHThreadFactory("GH_HEAVY_WEIGHT_IO_THREAD")) }
 
     @JvmStatic
     val logExecutor: ExecutorService by lazy { Executors.newSingleThreadExecutor(GHThreadFactory("GH_LOG_THREAD")) }
 
     @JvmStatic
     val ioExecutor = ThreadPoolExecutor(
-        CORE_POOL_SIZE,
-        MAX_POOL_SIZE,
-        20L, TimeUnit.SECONDS,
-        LinkedBlockingQueue(256),
-        GHThreadFactory("GH_IO_THREAD")
-    )
+            mMinimumPoolSize,
+            mMaximumPoolSize,
+            20L, TimeUnit.SECONDS,
+            LinkedBlockingQueue(256),
+            GHThreadFactory("GH_IO_THREAD"))
 
     val cachedScheduler by lazy { Schedulers.from(ioExecutor) }
 
@@ -64,11 +61,7 @@ object AppExecutor {
     }
 }
 
-fun runOnIoThread(
-    isLightWeightTask: Boolean = false,
-    isHeavyWightTask: Boolean = false,
-    f: () -> Unit
-) {
+fun runOnIoThread(isLightWeightTask: Boolean = false, isHeavyWightTask: Boolean = false, f: () -> Unit) {
     when {
         isLightWeightTask -> lightWeightIoExecutor.execute(f)
         isHeavyWightTask -> heavyWeightIoExecutor.execute(f)
@@ -77,9 +70,5 @@ fun runOnIoThread(
 }
 
 fun runOnUiThread(f: () -> Unit) {
-    if (Thread.currentThread() == Looper.getMainLooper().thread) {
-        f.invoke()
-    } else {
-        uiExecutor.execute(f)
-    }
+    uiExecutor.execute(f)
 }

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

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

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

@@ -8,35 +8,22 @@ 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.util.LogUtils
+import com.gh.common.view.dsbridge.CompletionHandler
 import com.gh.gamecenter.*
-import com.gh.gamecenter.common.callback.BiCallback
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.entity.NotificationUgc
-import com.gh.gamecenter.common.loghub.LoghubUtils
-import com.gh.gamecenter.common.tracker.Tracker
-import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.common.view.dsbridge.CompletionHandler
-import com.gh.gamecenter.core.AppExecutor
-import com.gh.gamecenter.core.runOnIoThread
-import com.gh.gamecenter.core.runOnUiThread
-import com.gh.gamecenter.core.utils.CurrentActivityHolder
-import com.gh.gamecenter.core.utils.DisplayUtils
-import com.gh.gamecenter.core.utils.MtaHelper
-import com.gh.gamecenter.core.utils.SPUtils
-import com.gh.gamecenter.energy.EnergyBridge
-import com.gh.gamecenter.entity.MtaEvent
+import com.gh.gamecenter.energy.EnergyCenterActivity
+import com.gh.gamecenter.energy.EnergyHouseActivity
+import com.gh.gamecenter.entity.*
 import com.gh.gamecenter.help.QaFeedbackDialogFragment
-import com.gh.gamecenter.login.entity.Badge
-import com.gh.gamecenter.login.user.LoginTag
-import com.gh.gamecenter.login.view.LoginActivity
-import com.gh.gamecenter.login.user.UserManager
+import com.gh.gamecenter.manager.UserManager
 import com.gh.gamecenter.personalhome.border.AvatarBorderActivity
 import com.gh.gamecenter.security.BindPhoneActivity
-import com.gh.gamecenter.login.user.UserRepository
-import com.gh.gamecenter.login.utils.LoginHelper
-import com.gh.gamecenter.login.utils.QuickLoginHelper
+import com.gh.gamecenter.user.LoginTag
+import com.gh.gamecenter.user.UserRepository
 import com.halo.assistant.HaloApp
 import com.lightgame.utils.Utils
 import org.json.JSONObject
@@ -45,7 +32,7 @@ import java.io.File
 import java.io.FileOutputStream
 import java.util.*
 
-class DefaultJsApi(var context: Context, val entrance: String = "") {
+class DefaultJsApi(var context: Context) {
 
     private var mLoginHandler: CompletionHandler<Any>? = null
 
@@ -128,7 +115,7 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
 
                     WechatBindHelper.bindWechat(wechatLoginInfoMap, object : BiCallback<Boolean, Boolean> {
                         override fun onFirst(first: Boolean) {
-                            EnergyBridge.postEnergyTask("bind_wechat")
+                            EnergyTaskHelper.postEnergyTask("bind_wechat")
                             handler.complete(true)
                         }
 
@@ -194,7 +181,7 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
     fun openBase64Image(event: Any) {
         val context = CurrentActivityHolder.getCurrentActivity()
 
-        ImageViewerActivity.base64Image = event.toString()
+        Base64ImageHolder.image = event.toString()
 
         context?.startActivity(ImageViewerActivity.getBase64Intent(context, true))
     }
@@ -220,7 +207,7 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
     @JavascriptInterface
     fun updateRegulationTestStatus(msg: Any) {
         if (msg.toString().toLowerCase(Locale.getDefault()) == "pass") {
-            EnergyBridge.postEnergyTask("finish_etiquette_exam")
+            EnergyTaskHelper.postEnergyTask("finish_etiquette_exam")
             SPUtils.setString(Constants.SP_REGULATION_TEST_PASS_STATUS, "pass")
         }
     }
@@ -245,7 +232,7 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
     fun shareBase64Image(event: Any) {
         val imageShareEvent = event.toString().toObject() ?: ImageShareEvent()
         val context = CurrentActivityHolder.getCurrentActivity()
-        ImageViewerActivity.base64Image = imageShareEvent.image.run {
+        Base64ImageHolder.image = imageShareEvent.image.run {
             if (this.startsWith("data:image/png;base64")) this.split(",")[1] else this
         }
         MessageShareUtils.getInstance(context).shareFromWeb(context, imageShareEvent.type)
@@ -256,7 +243,7 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
         val inviteEvent = event.toString().toObject() ?: InviteFriendsEvent()
         val context = CurrentActivityHolder.getCurrentActivity()
         if ("poster" == inviteEvent.type) {
-            ImageViewerActivity.base64Image = inviteEvent.poster.run {
+            Base64ImageHolder.image = inviteEvent.poster.run {
                 if (this.startsWith("data:image/png;base64")) this.split(",")[1] else this
             }
             MessageShareUtils.getInstance(context).shareInviteFriends(context, inviteEvent.way)
@@ -291,22 +278,22 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
 
     @JavascriptInterface
     fun openInNewWebview(url: Any) {
-        runOnUiThread { DirectUtils.directToWebView(context, url.toString(), entrance.ifBlank { "内部网页" }) }
+        runOnUiThread { DirectUtils.directToWebView(context, url.toString(), "内部网页") }
     }
 
     @JavascriptInterface
     fun postWearBadgeTask(msg: Any) {
-        EnergyBridge.postEnergyTask("wear_badge")
+        EnergyTaskHelper.postEnergyTask("wear_badge")
     }
 
     @JavascriptInterface
     fun startEnergyCenter(msg: Any) {
-        context.startActivity(EnergyBridge.getEnergyCenterIntent(context))
+        context.startActivity(EnergyCenterActivity.getIntent(context))
     }
 
     @JavascriptInterface
     fun startEnergyHouse(msg: Any) {
-        context.startActivity(EnergyBridge.getEnergyHouseIntent(context, null))
+        context.startActivity(EnergyHouseActivity.getIntent(context))
     }
 
     @JavascriptInterface
@@ -371,8 +358,7 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
                 runOnIoThread {
                     val base64String = base64StringData.replace("data:image/png;base64", "")
                     tryWithDefaultCatch {
-                        val imageFile =
-                            File(HaloApp.getInstance().cacheDir.absolutePath + File.separator + System.currentTimeMillis() + ".png")
+                        val imageFile = File(HaloApp.getInstance().cacheDir.absolutePath + File.separator + System.currentTimeMillis() + ".png")
                         val decodedString = Base64.decode(base64String, Base64.DEFAULT)
                         val bos = BufferedOutputStream(FileOutputStream(imageFile))
                         bos.write(decodedString)
@@ -399,7 +385,7 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
 
     @JavascriptInterface
     fun openInNewFullWebview(url: Any) {
-        runOnUiThread { DirectUtils.directToFullScreenWebPage(context, url.toString(), true, entrance) }
+        runOnUiThread { DirectUtils.directToFullScreenWebPage(context, url.toString(), true) }
     }
 
     @JavascriptInterface
@@ -434,11 +420,6 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
         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.gamecenter.core.utils.CurrentActivityHolder
-import com.gh.gamecenter.common.constant.Constants
+import com.gh.base.CurrentActivityHolder
+import com.gh.common.constant.Constants
 import com.gh.common.util.*
 import com.gh.common.util.DirectUtils.directToFeedback
 import com.gh.common.util.DirectUtils.directToGameDetailVideoStreaming
@@ -15,18 +15,11 @@ import com.gh.common.util.DirectUtils.directToGameVideo
 import com.gh.common.util.DirectUtils.directToLegacyVideoDetail
 import com.gh.common.util.DirectUtils.directToLinkPage
 import com.gh.common.util.DirectUtils.directToQa
-import com.gh.gamecenter.core.utils.GsonUtils.gson
+import com.gh.common.util.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
@@ -74,13 +67,7 @@ object DefaultUrlHandler {
                     entrance = entrance
                 )
 
-                "column" -> SubjectActivity.startSubjectActivity(
-                    context,
-                    id,
-                    uri.getQueryParameter("name"),
-                    false,
-                    entrance
-                )
+                "column" -> SubjectActivity.startSubjectActivity(context, id, uri.getQueryParameter("name"), false, entrance)
 
                 "libao" -> context.startActivity(LibaoDetailActivity.getIntentById(context, id, entrance))
 
@@ -91,7 +78,7 @@ object DefaultUrlHandler {
                     e.printStackTrace()
                 }
 
-                EntranceConsts.HOST_QQ_QUN -> {
+                EntranceUtils.HOST_QQ_QUN -> {
                     val key = uri.getQueryParameter("key")
                     if (!DirectUtils.directToQqGroup(context, key)) {
                         Utils.toast(context, "请检查是否已经安装手机QQ")
@@ -99,7 +86,7 @@ object DefaultUrlHandler {
                 }
 
                 "inurl" -> {
-                    DirectUtils.directToWebView(context, uri.getQueryParameter("url") ?: "", entrance)
+                    DirectUtils.directToWebView(context, uri.getQueryParameter("url") ?: "")
                 }
 
                 "outurl" -> {
@@ -116,8 +103,6 @@ object DefaultUrlHandler {
                 }
                 "question" -> DirectUtils.directToQuestionDetail(context, id, entrance, "文章链接")
 
-                "real_name" -> DirectUtils.directToRealName(context)
-
                 "community" -> {
                     val community = CommunityEntity()
                     community.id = id
@@ -161,7 +146,7 @@ object DefaultUrlHandler {
                         )
                     }
                 }
-                EntranceConsts.HOST_UPLOAD_VIDEO -> {
+                EntranceUtils.HOST_UPLOAD_VIDEO -> {
                     val titleParameter = uri.getQueryParameter("title")
                     val title = if (titleParameter.isNullOrEmpty()) "" else "#$titleParameter#"
                     val categoryId = uri.getQueryParameter("category_id") ?: ""
@@ -172,29 +157,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, EntranceConsts.ENTRANCE_BROWSER) {
-                        DirectUtils.directToVideoManager(
-                            context,
-                            linkEntity,
-                            simpleGameEntity,
-                            EntranceConsts.ENTRANCE_BROWSER,
-                            ""
-                        )
+                    CheckLoginUtils.checkLogin(context, null, true, EntranceUtils.ENTRANCE_BROWSER) {
+                        DirectUtils.directToVideoManager(context, linkEntity, simpleGameEntity, EntranceUtils.ENTRANCE_BROWSER, "")
                     }
                 }
-                EntranceConsts.HOST_USERHOME -> {
+                EntranceUtils.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,
-                        ""
-                    )
+                    DirectUtils.directToHomeActivity(context, id, subtype, if (position.isNullOrEmpty()) -1 else position.toInt(), entrance, "")
                 }
-                EntranceConsts.HOST_VIDEO_MORE -> {
+                EntranceUtils.HOST_VIDEO_MORE -> {
                     val referer = uri.getQueryParameter("referer") ?: ""
                     val type = uri.getQueryParameter("type") ?: ""
                     val act = uri.getQueryParameter("act") ?: ""
@@ -226,48 +198,48 @@ object DefaultUrlHandler {
                         sectionName
                     )
                 }
-                EntranceConsts.HOST_VIDEO_DETAIL -> {
+                EntranceUtils.HOST_VIDEO_DETAIL -> {
                     DirectUtils.directToVideoDetail(context, id, entrance, path)
                 }
-                EntranceConsts.HOST_VIDEO_SINGLE -> {
+                EntranceUtils.HOST_VIDEO_SINGLE -> {
                     val referer = uri.getQueryParameter("referer") ?: ""
                     DirectUtils.directToVideoDetail(
                         context, id, VideoDetailContainerViewModel.Location.SINGLE_VIDEO.value,
                         false, "", entrance, "", if (TextUtils.isEmpty(referer)) "" else referer
                     )
                 }
-                EntranceConsts.HOST_VIDEO_STREAMING_HOME -> {
+                EntranceUtils.HOST_VIDEO_STREAMING_HOME -> {
                     intent = Intent(context, MainActivity::class.java)
                     intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
                     intent.putExtra(MainActivity.SWITCH_TO_VIDEO, true)
                     context.startActivity(intent)
                 }
-                EntranceConsts.HOST_VIDEO_STREAMING_DESC -> {
+                EntranceUtils.HOST_VIDEO_STREAMING_DESC -> {
                     directToGameDetailVideoStreaming(context, id, entrance)
                 }
-                EntranceConsts.HOST_VIDEO_COLLECTION -> {
+                EntranceUtils.HOST_VIDEO_COLLECTION -> {
                     directToGameVideo(context, id, entrance, "")
                 }
 
-                EntranceConsts.HOST_CATEGORY -> {
+                EntranceUtils.HOST_CATEGORY -> {
                     val title = uri.getQueryParameter("title")
                     DirectUtils.directCategoryDirectory(context, id, title ?: "", entrance, "")
                 }
-                EntranceConsts.HOST_COLUMN_COLLECTION -> {
+                EntranceUtils.HOST_COLUMN_COLLECTION -> {
                     val name = uri.getQueryParameter("name")
                     DirectUtils.directToColumnCollection(context, id, -1, entrance, name ?: "")
                 }
-                EntranceConsts.HOST_COLUMN -> {
-                    DirectUtils.directToSubject(context, id, uri.getQueryParameter(EntranceConsts.KEY_NAME), entrance)
+                EntranceUtils.HOST_COLUMN -> {
+                    DirectUtils.directToSubject(context, id, uri.getQueryParameter(EntranceUtils.KEY_NAME), entrance)
                 }
-                EntranceConsts.HOST_COMMUNITY_QUESTION_LABEL_DETAIL -> {
+                EntranceUtils.HOST_COMMUNITY_QUESTION_LABEL_DETAIL -> {
                     val community = CommunityEntity()
                     community.id = uri.getQueryParameter("community_id") ?: ""
                     community.name = uri.getQueryParameter("community_name") ?: ""
                     val tag = uri.getQueryParameter("tag") ?: ""
                     DirectUtils.directAskColumnLabelDetail(context, tag, community, entrance, "")
                 }
-                EntranceConsts.HOST_COMMUNITY_COLUMN_DETAIL -> {
+                EntranceUtils.HOST_COMMUNITY_COLUMN_DETAIL -> {
                     val community = CommunityEntity()
                     community.id = uri.getQueryParameter("community_id") ?: ""
                     community.name = uri.getQueryParameter("community_name") ?: ""
@@ -275,42 +247,42 @@ object DefaultUrlHandler {
                     DirectUtils.directAskColumnDetail(context, columnId, community, entrance, "")
                 }
 
-                EntranceConsts.HOST_BLOCK -> {
+                EntranceUtils.HOST_BLOCK -> {
                     val name = uri.getQueryParameter("name")
                         ?: ""
                     val entity = SubjectRecommendEntity(link = id, name = name, text = name)
                     DirectUtils.directToBlock(context, entity, entrance)
                 }
 
-                EntranceConsts.HOST_SERVER_BLOCK -> {
+                EntranceUtils.HOST_SERVER_BLOCK -> {
                     DirectUtils.directToGameServers(context, entrance = entrance, path = "")
                 }
 
-                EntranceConsts.HOST_AMWAY_BLOCK -> {
+                EntranceUtils.HOST_AMWAY_BLOCK -> {
                     DirectUtils.directToAmway(context, entrance = entrance, path = "")
                 }
 
-                EntranceConsts.HOST_HELP -> {
+                EntranceUtils.HOST_HELP -> {
                     val name = uri.getQueryParameter("name")
                         ?: ""
                     DirectUtils.directToQa(context, name, id)
                 }
 
-                EntranceConsts.HOST_HELP_COLLECTION -> {
+                EntranceUtils.HOST_HELP_COLLECTION -> {
                     val name = uri.getQueryParameter("name")
                         ?: ""
                     DirectUtils.directToQaCollection(context, name, id)
                 }
 
-                EntranceConsts.HOST_GAME_UPLOAD -> {
+                EntranceUtils.HOST_GAME_UPLOAD -> {
                     DirectUtils.directGameUpload(context, entrance = entrance, path = "")
                 }
-                EntranceConsts.HOST_GAME_ZONE -> {
+                EntranceUtils.HOST_GAME_ZONE -> {
                     val zoneUrl = uri.getQueryParameter("url") ?: ""
                     DirectUtils.directGameZone(context, id, zoneUrl, entrance)
                 }
 
-                EntranceConsts.HOST_LINK -> {
+                EntranceUtils.HOST_LINK -> {
                     try {
                         val dataString = uri.getQueryParameter("data")
                         if (!TextUtils.isEmpty(dataString)) {
@@ -324,43 +296,43 @@ object DefaultUrlHandler {
                     }
                 }
 
-                EntranceConsts.HOST_GAME_NEWS -> {
+                EntranceUtils.HOST_GAME_NEWS -> {
                     DirectUtils.directToGameNews(
                         context,
-                        uri.getQueryParameter(EntranceConsts.KEY_GAME_ID),
-                        uri.getQueryParameter(EntranceConsts.KEY_GAME_NAME),
+                        uri.getQueryParameter(EntranceUtils.KEY_GAME_ID),
+                        uri.getQueryParameter(EntranceUtils.KEY_GAME_NAME),
                         entrance
                     );
                 }
 
-                EntranceConsts.HOST_GAME_CALENDAR -> {
-                    directToGameServerCalendar(context, uri.getQueryParameter(EntranceConsts.KEY_GAME_ID))
+                EntranceUtils.HOST_GAME_CALENDAR -> {
+                    directToGameServerCalendar(context, uri.getQueryParameter(EntranceUtils.KEY_GAME_ID))
                 }
 
-                EntranceConsts.HOST_HISTORY_APK -> {
-                    DirectUtils.directToHistoryApk(context, uri.getQueryParameter(EntranceConsts.KEY_GAME_ID))
+                EntranceUtils.HOST_HISTORY_APK -> {
+                    DirectUtils.directToHistoryApk(context, uri.getQueryParameter(EntranceUtils.KEY_GAME_ID))
                 }
 
-                EntranceConsts.HOST_FORUM_DETAIL -> {
+                EntranceUtils.HOST_FORUM_DETAIL -> {
                     DirectUtils.directForumDetail(context, id, entrance)
                 }
 
-                EntranceConsts.HOST_GAME_RATING_DETAIL -> {
+                EntranceUtils.HOST_GAME_RATING_DETAIL -> {
                     DirectUtils.directToGameRatingDetail(
                         context,
-                        uri.getQueryParameter(EntranceConsts.KEY_GAME_ID),
-                        uri.getQueryParameter(EntranceConsts.KEY_COMMENT_ID),
-                        EntranceConsts.ENTRANCE_BROWSER
+                        uri.getQueryParameter(EntranceUtils.KEY_GAME_ID),
+                        uri.getQueryParameter(EntranceUtils.KEY_COMMENT_ID),
+                        EntranceUtils.ENTRANCE_BROWSER
                     )
                 }
 
-                EntranceConsts.HOST_FORUM -> {
-                    val position = uri.getQueryParameter(EntranceConsts.KEY_POSITION)?.toInt()
+                EntranceUtils.HOST_FORUM -> {
+                    val position = uri.getQueryParameter(EntranceUtils.KEY_POSITION)?.toInt()
 
                     DirectUtils.directToForum(context, position ?: 0)
                 }
 
-                EntranceConsts.HOST_UPLOAD_VIDEO_NEW -> {
+                EntranceUtils.HOST_UPLOAD_VIDEO_NEW -> {
                     val activityName = uri.getQueryParameter("activity_name") ?: ""
                     val activityId = uri.getQueryParameter("activity_id") ?: ""
                     val original = uri.getQueryParameter("original") ?: ""
@@ -377,16 +349,11 @@ object DefaultUrlHandler {
                             GameEntity(id = gameId, mName = gameName, mIcon = icon, mIconSubscript = iconSubscript)
                         } else null
                     val activityLabelEntity = if (activityId.isNotEmpty() && activityName.isNotEmpty()) {
-                        ActivityLabelEntity(
-                            id = activityId,
-                            name = activityName,
-                            original = original.ifEmpty { "false" }.toBoolean()
-                        )
+                        ActivityLabelEntity(id = activityId, name = activityName, original = original.ifEmpty { "false" }.toBoolean())
+                    } else null
+                    val communityEntity = if (forumId.isNotEmpty() && forumName.isNotEmpty() && forumIcon.isNotEmpty()) {
+                        CommunityEntity(id = forumId, name = forumName, icon = forumIcon)
                     } else null
-                    val communityEntity =
-                        if (forumId.isNotEmpty() && forumName.isNotEmpty() && forumIcon.isNotEmpty()) {
-                            CommunityEntity(id = forumId, name = forumName, icon = forumIcon)
-                        } else null
 
                     context.startActivity(
                         VideoPublishActivity.getIntent(
@@ -403,46 +370,39 @@ object DefaultUrlHandler {
                     )
                 }
 
-                EntranceConsts.HOST_SUGGESTION -> {
-                    val platform = uri.getQueryParameter(EntranceConsts.KEY_PLATFORM)
+                EntranceUtils.HOST_SUGGESTION -> {
+                    val platform = uri.getQueryParameter(EntranceUtils.KEY_PLATFORM)
                     val platformName = PlatformUtils.getInstance(context).getPlatformName(platform)
-                    val gameId = uri.getQueryParameter(EntranceConsts.KEY_GAMEID)
-                    val packageMd5 = uri.getQueryParameter(EntranceConsts.KEY_PACKAGE_MD5)
-                    val isQaFeedback = uri.getQueryParameter(EntranceConsts.KEY_IS_QA_FEEDBACK) == "true"
+                    val 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 content = if (TextUtils.isEmpty(gameId) || TextUtils.isEmpty(packageMd5)) String.format(
                         "%s-%s-V%s，",
-                        uri.getQueryParameter(EntranceConsts.KEY_GAME_NAME),
+                        uri.getQueryParameter(EntranceUtils.KEY_GAME_NAME),
                         if (TextUtils.isEmpty(platformName)) platform else platformName,
-                        uri.getQueryParameter(EntranceConsts.KEY_VERSION)
+                        uri.getQueryParameter(EntranceUtils.KEY_VERSION)
                     ) else String.format(
                         "%s-%s-V%s\n游戏ID：%s\n游戏包MD5：%s\n",
-                        uri.getQueryParameter(EntranceConsts.KEY_GAME_NAME),
+                        uri.getQueryParameter(EntranceUtils.KEY_GAME_NAME),
                         if (TextUtils.isEmpty(platformName)) platform else platformName,
-                        uri.getQueryParameter(EntranceConsts.KEY_VERSION), gameId, packageMd5
+                        uri.getQueryParameter(EntranceUtils.KEY_VERSION), gameId, packageMd5
                     )
                     val qaId = uri.getQueryParameter("qa_id") ?: ""
-                    val qaContentId = uri.getQueryParameter(EntranceConsts.KEY_QA_CONTENT_ID) ?: ""
-                    val qaTitle = uri.getQueryParameter(EntranceConsts.KEY_QA_TITLE)
+                    val qaContentId = uri.getQueryParameter(EntranceUtils.KEY_QA_CONTENT_ID) ?: ""
+                    val qaTitle = uri.getQueryParameter(EntranceUtils.KEY_QA_TITLE)
                     if (!TextUtils.isEmpty(qaId)) {
                         directToQa(context, qaTitle, qaId)
                     } else {
-                        directToFeedback(
-                            context,
-                            content,
-                            null,
-                            isQaFeedback,
-                            qaContentId,
-                            EntranceConsts.ENTRANCE_BROWSER
-                        )
+                        directToFeedback(context, content, null, isQaFeedback, qaContentId, EntranceUtils.ENTRANCE_BROWSER)
                     }
                 }
 
-                EntranceConsts.HOST_HELP_AND_FEEDBACK -> {
+                EntranceUtils.HOST_HELP_AND_FEEDBACK -> {
                     val position = uri.getQueryParameter("position") ?: ""
                     DirectUtils.directToHelpAndFeedback(context, position.toInt())
                 }
 
-                EntranceConsts.HOST_HELP_DETAIL -> {
+                EntranceUtils.HOST_HELP_DETAIL -> {
                     var url = uri.getQueryParameter("url")
                     if (!url.isNullOrEmpty()) {
                         context.startActivity(WebActivity.getIntent(context, url, false))
@@ -455,39 +415,20 @@ object DefaultUrlHandler {
                         val id = uri.getQueryParameter("id")
                         val name = uri.getQueryParameter("name")
                         val qaCollectionId = uri.getQueryParameter("collection_id")
-                        context.startActivity(
-                            WebActivity.getIntent(
-                                context,
-                                "$url$id",
-                                name,
-                                true,
-                                !qaCollectionId.isNullOrEmpty()
-                            )
-                        )
+                        context.startActivity(WebActivity.getIntent(context, "$url$id", name, true, !qaCollectionId.isNullOrEmpty()))
                     }
                 }
 
-                EntranceConsts.HOST_GAME_COLLECTION_DETAIL -> {
+                EntranceUtils.HOST_GAME_COLLECTION_DETAIL -> {
                     DirectUtils.directToGameCollectionDetail(context, id, entrance)
                 }
 
-                EntranceConsts.HOST_GAME_COLLECTION_SQUARE -> {
+                EntranceUtils.HOST_GAME_COLLECTION_SQUARE -> {
                     DirectUtils.directToGameCollectionSquare(context, entrance)
                 }
 
-                EntranceConsts.HOST_GAME_COLLECTION_EDIT -> {
-                    val activityId = uri.getQueryParameter("activity_id") ?: ""
-                    val activityName = uri.getQueryParameter("activity_name") ?: ""
-                    val gameId = uri.getQueryParameter("game_id") ?: ""
-                    context.startActivity(
-                        GameCollectionEditActivity.getIntent(
-                            context,
-                            activityId,
-                            activityName,
-                            gameId,
-                            entrance
-                        )
-                    )
+                EntranceUtils.HOST_GAME_COLLECTION_EDIT -> {
+                    context.startActivity(GameCollectionEditActivity.getIntent(context, entrance))
                 }
 
                 else -> {
@@ -551,13 +492,6 @@ 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"
@@ -569,14 +503,9 @@ object DefaultUrlHandler {
             uri.path?.apply {
                 when {
                     contains("game") -> {
-                        val gameId = uri.getQueryParameter("gameId") ?: uri.pathSegments.last() ?: ""
-                        DirectUtils.directToGameDetail(
-                            context,
-                            gameId,
-                            entrance,
-                            autoDownload = false,
-                            traceEvent = null
-                        )
+                        val gameId = uri.getQueryParameter("gameId") ?: uri.pathSegments.last()
+                        ?: ""
+                        DirectUtils.directToGameDetail(context, gameId, entrance, autoDownload = false, traceEvent = null)
                     }
                     contains("question") -> {
                         val questionId = split("/")[2]
@@ -593,8 +522,7 @@ object DefaultUrlHandler {
                         var type = ""
                         var typeId = ""
                         val split =
-                            replace("/communities", "").replace("/bbs", "").replace(".html", "").split("/".toRegex())
-                                .dropLastWhile { it.isEmpty() }
+                            replace("/communities", "").replace("/bbs", "").replace(".html", "").split("/".toRegex()).dropLastWhile { it.isEmpty() }
                                 .toTypedArray()
                         for (text in split) {
                             if (TextUtils.isEmpty(communityId)) {
@@ -642,55 +570,6 @@ 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,14 +2,13 @@ package com.gh.common
 
 import com.gh.common.exposure.ExposureManager
 import com.gh.common.filter.RegionSettingHelper
-import com.gh.gamecenter.common.loghub.LoghubUtils
-import com.gh.gamecenter.common.utils.doOnMainProcessOnly
-import com.gh.gamecenter.common.utils.tryCatchInRelease
+import com.gh.common.loghub.LoghubUtils
+import com.gh.common.util.doOnMainProcessOnly
+import com.gh.common.util.tryCatchInRelease
 import com.gh.common.videolog.VideoRecordUtils
 import com.gh.download.DownloadDataHelper
 import com.gh.gamecenter.entity.TimeEntity
-import com.gh.gamecenter.common.retrofit.Response
-import com.gh.gamecenter.core.runOnUiThread
+import com.gh.gamecenter.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
 import io.reactivex.schedulers.Schedulers
@@ -37,22 +36,18 @@ object FixedRateJobHelper {
                 // 时间校对，10分钟一次
                 if ((mExecuteCount * CHECKER_PERIOD) % TIME_PERIOD == 0L) {
                     RetrofitManager.getInstance().api.time
-                        .subscribeOn(Schedulers.io())
-                        .subscribe(object : Response<TimeEntity>() {
-                            override fun onResponse(response: TimeEntity?) {
-                                val serverTime = response?.time
-                                serverTime?.let {
-                                    timeDeltaBetweenServerAndClient = it * 1000 - System.currentTimeMillis()
+                            .subscribeOn(Schedulers.io())
+                            .subscribe(object : Response<TimeEntity>() {
+                                override fun onResponse(response: TimeEntity?) {
+                                    val serverTime = response?.time
+                                    serverTime?.let { timeDeltaBetweenServerAndClient = it * 1000 - System.currentTimeMillis() }
                                 }
-                            }
-                        })
+                            })
                 }
 
                 // 提交曝光数据
                 if ((mExecuteCount * CHECKER_PERIOD) % EXPOSURE_PERIOD == 0L) {
-                    runOnUiThread {
-                        ExposureManager.commitSavedExposureEvents(true)
-                    }
+                    ExposureManager.commitSavedExposureEvents(true)
                 }
 
                 // 分片检测下载进度
@@ -65,9 +60,7 @@ object FixedRateJobHelper {
 
                 // 提交普通 loghub 数据
                 if ((mExecuteCount * CHECKER_PERIOD) % LOGHUB_PERIOD == 0L) {
-                    runOnUiThread {
-                        LoghubUtils.commitSavedLoghubEvents(true)
-                    }
+                    LoghubUtils.commitSavedLoghubEvents()
                 }
 
                 // 更新游戏屏蔽信息

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

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

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

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

@@ -1,13 +1,12 @@
-package com.gh.gamecenter.core.utils
+package com.gh.common
 
 import android.app.Activity
 import android.app.Application
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
-import com.gh.gamecenter.core.AppExecutor
-import com.gh.gamecenter.core.GHThreadFactory
-import com.gh.gamecenter.core.HaloApp
+import com.gh.base.GHThreadFactory
+import com.halo.assistant.HaloApp
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
 
@@ -57,32 +56,31 @@ class TimeElapsedHelper(val fragment: Fragment?, val activity: Activity?) {
 
             override fun onActivityDestroyed(a: Activity) {
                 if (activity == a) {
-                    HaloApp.getInstance().unregisterActivityLifecycleCallbacks(this)
+                    HaloApp.getInstance().application.unregisterActivityLifecycleCallbacks(this)
                 }
             }
         })
 
         fragment?.fragmentManager?.registerFragmentLifecycleCallbacks(
-            object : FragmentManager.FragmentLifecycleCallbacks() {
-                override fun onFragmentResumed(fm: FragmentManager, f: Fragment) {
-                    if (f === fragment) {
-                        resumeCounting()
+                object : FragmentManager.FragmentLifecycleCallbacks() {
+                    override fun onFragmentResumed(fm: FragmentManager, f: Fragment) {
+                        if (f === fragment) {
+                            resumeCounting()
+                        }
                     }
-                }
 
-                override fun onFragmentPaused(fm: FragmentManager, f: Fragment) {
-                    if (f === fragment) {
-                        pauseCounting()
+                    override fun onFragmentPaused(fm: FragmentManager, f: Fragment) {
+                        if (f === fragment) {
+                            pauseCounting()
+                        }
                     }
-                }
 
-                override fun onFragmentViewDestroyed(fm: FragmentManager, f: Fragment) {
-                    if (f === fragment) {
-                        fragment.fragmentManager?.unregisterFragmentLifecycleCallbacks(this)
+                    override fun onFragmentViewDestroyed(fm: FragmentManager, f: Fragment) {
+                        if (f === fragment) {
+                            fragment.fragmentManager?.unregisterFragmentLifecycleCallbacks(this)
+                        }
                     }
-                }
-            }, false
-        )
+                }, false)
     }
 
     fun resumeCounting() {

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

@@ -1,3 +1,3 @@
-package com.gh.gamecenter.common.callback
+package com.gh.common
 
 typealias OnFastClickListener = (isSuccess: Boolean) -> Unit

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

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.annotation;
+package com.gh.common.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -7,7 +7,7 @@ import java.lang.annotation.Target;
 
 /**
  * 标记那些不需要检查的同步字段
- * <p>
+ *
  * 同步字段冲突时使用
  */
 @Target(ElementType.FIELD)

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

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

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

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

app/src/main/java/com/gh/common/avoidcallback/ActivityResultInfo.java

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.avoidcallback;
+package com.gh.common.avoidcallback;
 
 import android.content.Intent;
 

app/src/main/java/com/gh/common/avoidcallback/AvoidOnResultFragment.kt

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.avoidcallback
+package com.gh.common.avoidcallback
 
 import android.content.Intent
 import android.os.Bundle

app/src/main/java/com/gh/common/avoidcallback/AvoidOnResultManager.kt

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.avoidcallback
+package com.gh.common.avoidcallback
 
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
@@ -32,9 +32,9 @@ class AvoidOnResultManager {
             avoidOnResultFragment = AvoidOnResultFragment()
             val fragmentManager = activity.supportFragmentManager
             fragmentManager
-                .beginTransaction()
-                .add(avoidOnResultFragment, TAG)
-                .commitAllowingStateLoss()
+                    .beginTransaction()
+                    .add(avoidOnResultFragment, TAG)
+                    .commitAllowingStateLoss()
             fragmentManager.executePendingTransactions()
         }
         return avoidOnResultFragment

app/src/main/java/com/gh/common/avoidcallback/Callback.kt

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.avoidcallback
+package com.gh.common.avoidcallback
 
 import android.content.Intent
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,33 +1,27 @@
 package com.gh.common.constant;
 
 import android.annotation.SuppressLint;
+import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.preference.PreferenceManager;
 import android.text.TextUtils;
 
-import androidx.annotation.Nullable;
-
-import com.gh.gamecenter.common.utils.DarkModeUtils;
-import com.gh.gamecenter.common.utils.EnvHelper;
-import com.gh.gamecenter.common.constant.Constants;
-import com.gh.gamecenter.core.utils.GsonUtils;
+import com.gh.common.util.EnvHelper;
+import com.gh.common.util.GsonUtils;
 import com.gh.common.util.PackageHelper;
 import com.gh.common.util.PackageUtils;
+import com.gh.common.util.SPUtils;
 import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.SuggestionActivity;
-import com.gh.gamecenter.core.utils.SPUtils;
 import com.gh.gamecenter.entity.GameGuidePopupEntity;
 import com.gh.gamecenter.entity.NewSettingsEntity;
 import com.gh.gamecenter.entity.NewsEntity;
 import com.gh.gamecenter.entity.SettingsEntity;
-import com.gh.gamecenter.common.eventbus.EBReuse;
-import com.gh.gamecenter.entity.SimulatorEntity;
-import com.gh.gamecenter.entity.VSetting;
-import com.gh.gamecenter.common.retrofit.BiResponse;
-import com.gh.gamecenter.common.retrofit.Response;
+import com.gh.gamecenter.eventbus.EBReuse;
+import com.gh.gamecenter.retrofit.BiResponse;
+import com.gh.gamecenter.retrofit.Response;
 import com.gh.gamecenter.retrofit.RetrofitManager;
-import com.gh.vspace.VHelper;
 import com.halo.assistant.HaloApp;
 import com.lightgame.utils.Utils;
 
@@ -39,6 +33,8 @@ 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;
@@ -48,7 +44,10 @@ public class Config {
     // 这个 API_HOST 在测试包里会随着选择的环境切换，正式包里会一直保持正式 host
     public static final String API_HOST = EnvHelper.getHost();
     public static final String NEW_API_HOST = EnvHelper.getNewHost();
-    public static final String VAPI_HOST = EnvHelper.getVHost();
+
+    /**
+     * 需要配置的请使用{@link PreferenceManager#getDefaultSharedPreferences(Context)}
+     */
 
     // Third-Party confs
     public static final String WECHAT_APPID = BuildConfig.WECHAT_APPID;
@@ -60,14 +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 统一
 
-    private static final String SETTINGS_KEY = "settingsKey";
+    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 SettingsEntity mSettingsEntity;
     private static NewSettingsEntity mNewSettingsEntity;
-
-    private static NewSettingsEntity.NightMode mNightModeSetting;
-    private static SimulatorEntity mNewSimulatorEntity;
-    private static VSetting mVSetting;
     private static GameGuidePopupEntity mGameGuidePopupEntity;
     private static SharedPreferences mDefaultSharedPreferences;
 
@@ -95,6 +93,13 @@ public class Config {
         return false;
     }
 
+    public static String getExceptionMsg() {
+        return getPreferences().getString("errMsg", null);
+    }
+
+    public static void setExceptionMsg(String errMsg) {
+        SPUtils.setString(getPreferences(), "errMsg", errMsg);  //先用apply(),保存不了再用commit() 9.0机型保存不了信息
+    }
 
     public static boolean isShowDownload(String gameId) {
 
@@ -120,17 +125,6 @@ public class Config {
         return false;
     }
 
-    /**
-     * 是否启用畅玩游戏
-     */
-    public static boolean isVGameEnabled() {
-        if (getSettings() == null) {
-            return false;
-        }
-
-        return !"off".equals(getSettings().getGameSmooth());
-    }
-
 
     public static boolean isShowPlugin(String gameId) {
         SharedPreferences preferences = getPreferences();
@@ -196,15 +190,11 @@ public class Config {
         getPreferences().edit().putString(SETTINGS_KEY, GsonUtils.toJson(settingsEntity)).apply();
         mSettingsEntity = settingsEntity;
 
-        // 更新设置状态
+        // 更新 FIX_ARTICLE_KEY 状态
         mSettingsEntity.showArticleEntrance();
-        mSettingsEntity.showCommunityEntrance();
 
         // 加载完设置后刷新下
         PackageHelper.initList();
-
-        // 初始化畅玩相关的东西
-        VHelper.init(HaloApp.getInstance());
     }
 
     @Nullable
@@ -222,29 +212,6 @@ public class Config {
         return mSettingsEntity;
     }
 
-    //新模拟器
-    @Nullable
-    public static SimulatorEntity getNewSimulatorEntitySetting() {
-        if (mNewSimulatorEntity != null) {
-            return mNewSimulatorEntity;
-        } else if (mNewSettingsEntity != null && mNewSettingsEntity.getSimulator() != null) {
-            return mNewSettingsEntity.getSimulator();
-        } else {
-            return null;
-        }
-    }
-
-    @Nullable
-    public static NewSettingsEntity.NightMode getNightModeSetting() {
-        if (mNightModeSetting != null) {
-            return mNightModeSetting;
-        } else if (mNewSettingsEntity != null && mNewSettingsEntity.getNightMode() != null) {
-            return mNewSettingsEntity.getNightMode();
-        } else {
-            return null;
-        }
-    }
-
     @Nullable
     public static NewSettingsEntity getNewSettingsEntity() {
         if (mNewSettingsEntity == null) {
@@ -260,21 +227,6 @@ 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;
@@ -303,7 +255,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;
@@ -318,6 +270,13 @@ 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());
@@ -364,51 +323,10 @@ 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 && mNewSimulatorEntity == null) {
-            RetrofitManager.getInstance()
-                    .getNewApi().getNewSettings(PackageUtils.getGhVersionName(), channel)
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new BiResponse<NewSettingsEntity>() {
-                        @Override
-                        public void onSuccess(NewSettingsEntity data) {
-                            mNightModeSetting = data.getNightMode();
-                            mNewSimulatorEntity = data.getSimulator();
-                            if (HaloApp.getInstance().isNewForThisVersion && mNightModeSetting != null && mNightModeSetting.getInstall()) {
-                                DarkModeUtils.INSTANCE.updateFollowSystemDarkModeToSp(true);
-                                DarkModeUtils.INSTANCE.updateAppDarkModeStatusToSp(true);
-                                DarkModeUtils.INSTANCE.initDarkMode();
-                            }
-
-                            if (mNewSettingsEntity != null) {
-                                mNewSettingsEntity.setSimulator(mNewSimulatorEntity);
-                                mNewSettingsEntity.setNightMode(mNightModeSetting);
-                                SPUtils.setString(Constants.SP_NEW_SETTINGS, GsonUtils.toJson(data));
-                            }
-                        }
-                    });
-        }
-
         RetrofitManager.getInstance()
                 .getApi().getGameGuidePopup(Build.MANUFACTURER, Build.VERSION.RELEASE, Build.MODEL, channel, BuildConfig.VERSION_NAME)
                 .subscribeOn(Schedulers.io())

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

@@ -1,12 +1,11 @@
-package com.gh.gamecenter.common.constant;
+package com.gh.common.constant;
 
-import com.alibaba.android.arouter.launcher.ARouter;
-import com.gh.gamecenter.core.provider.IPackageUtilsProvider;
-import com.gh.gamecenter.core.utils.TimeUtils;
+import com.gh.common.util.PackageUtils;
+import com.gh.common.util.TimeUtils;
+import com.halo.assistant.HaloApp;
 
 public class Constants {
 
-    private static final IPackageUtilsProvider packageUtilsConfig = (IPackageUtilsProvider) ARouter.getInstance().build(RouteConsts.provider.packageUtils).navigation();
     public static final int SEND_NEWS_FEEDBACK = 0x126;
     public static final int SEND_COMMENT_FEEDBACK = 0x127;
 
@@ -50,7 +49,7 @@ public class Constants {
     // 最近显示的弹窗信息
     public static final String SP_LAST_OPENING_ID = "last_opening_dialog_id";
     public static final String SP_LAST_OPENING_TIME = "last_opening_dialog_time";
-
+    
     public static final String SP_LAST_ACCEPTED_PRIVACY_DIALOG_ID = "last_accepted_privacy_dialog_id";
 
     // 游戏图标和图标角标
@@ -59,8 +58,6 @@ public class Constants {
 
     public static final String IS_PLATFORM_RECOMMEND = "isPlatformRecommend";
 
-    public static final String APK_MD5 = "apk_md5";
-
     // 下载 id，一般来说跟下载文件名一样
     public static final String DOWNLOAD_ID = "download_id";
 
@@ -71,7 +68,6 @@ public class Constants {
     public static final String SIMULATOR_DOWNLOAD = "下载模拟器";
     public static final String SIMULATOR_GAME = "simulator_game";
     public static final String SIMULATOR = "simulator";
-    public static final String SMOOTH_GAME = "smooth_game"; // 畅玩类型的游戏
     public static final String GAME_NAME = "game_name";
     public static final String SIMULATOR_DOWNLOAD_START_TIME = "simulator_download_start_time";
     public static final String LAST_GHZS_UPDATE_FILE_SIZE = "last_ghzs_update_file_size";
@@ -108,11 +104,11 @@ public class Constants {
     // 今天是否已经触发了 “通知管理” 引导弹窗
     public static final String SP_IS_SHOWED_NOTIFICATION_TODAY = "show_is_notification_today";
     // v4.0.0已废弃,标记安装的游戏为已玩过弹窗，最多取消2次 (https://gitlab.ghzs.com/pm/halo-app-issues/issues/722 调整为版本相关) (不是常量了也放这里好像有点奇怪)
-    public static final String SP_MARK_INSTALLED_GAME = "mark_installed_game" + packageUtilsConfig.getGhVersionName();
+    public static final String SP_MARK_INSTALLED_GAME = "mark_installed_game" + PackageUtils.getGhVersionName();
     // 标记安装的游戏为已玩过弹窗（个人主页最多弹一次）
-    public static final String SP_MARK_INSTALLED_GAME_USER_HOME = "mark_installed_game_user_home" + packageUtilsConfig.getGhVersionName();
+    public static final String SP_MARK_INSTALLED_GAME_USER_HOME = "mark_installed_game_user_home" + PackageUtils.getGhVersionName();
     // 标记安装的游戏为已玩过弹窗（我的游戏最多弹一次）
-    public static final String SP_MARK_INSTALLED_GAME_MY_GAME = "mark_installed_game_my_game" + packageUtilsConfig.getGhVersionName();
+    public static final String SP_MARK_INSTALLED_GAME_MY_GAME = "mark_installed_game_my_game" + PackageUtils.getGhVersionName();
     //视频详情滑动引导
     public static final String SP_SHOW_SLIDE_GUIDE = "show_slide_guide";
     //视频详情点击引导
@@ -146,10 +142,10 @@ public class Constants {
     public static final String SP_REGULATION_TEST_STATUS = "regulation_test_status";
     public static final String SP_REGULATION_TEST_PASS_STATUS = "regulation_test_pass_status";
     //相同设备号，每一种第三方登录方式登录后弹出绑定手机页面的次数
-//    public static final String SP_QQ_SHOW_BIND_PHONE_TIME = "qq_show_bind_phone_time" + HaloApp.getInstance().getGid();
-//    public static final String SP_WECHAT_SHOW_BIND_PHONE_TIME = "wechat_show_bind_phone_time" + HaloApp.getInstance().getGid();
-//    public static final String SP_WEIBO_SHOW_BIND_PHONE_TIME = "weibo_show_bind_phone_time" + HaloApp.getInstance().getGid();
-//    public static final String SP_DOUYIN_SHOW_BIND_PHONE_TIME = "douyin_show_bind_phone_time" + HaloApp.getInstance().getGid();
+    public static final String SP_QQ_SHOW_BIND_PHONE_TIME = "qq_show_bind_phone_time" + HaloApp.getInstance().getGid();
+    public static final String SP_WECHAT_SHOW_BIND_PHONE_TIME = "wechat_show_bind_phone_time" + HaloApp.getInstance().getGid();
+    public static final String SP_WEIBO_SHOW_BIND_PHONE_TIME = "weibo_show_bind_phone_time" + HaloApp.getInstance().getGid();
+    public static final String SP_DOUYIN_SHOW_BIND_PHONE_TIME = "douyin_show_bind_phone_time" + HaloApp.getInstance().getGid();
     //隐私政策是否有更新
     public static final String SP_PRIVACY_CURRENT_MD5 = "sp_privacy_current_md5";
     public static final String SP_PRIVACY_MINE_MD5 = "sp_privacy_mine_md5";
@@ -207,9 +203,6 @@ public class Constants {
     // 补充配置项
     public static final String SP_NEW_SETTINGS = "new_settings";
 
-    // 畅玩组件的配置
-    public static final String SP_V_SETTINGS = "v_settings";
-
     // 头像挂件ID
     public static final String SP_CHOOSE_AVATAR_ID = "choose_avatar_id";
 
@@ -227,6 +220,12 @@ public class Constants {
     // 新分类2.0引导
     public static final String SP_SHOW_CATEGORY_GUIDE = "show_category_guide";
 
+    // 用户是否需要 weibo x86 so
+    public static final String SP_USER_NEED_WEIBO_X86_SO = "user_need_weibo_x86_so";
+
+    // 当前设备是不是模拟器
+    public static final String SP_IS_EMULATOR = "is_emulator";
+
     // 内容视频播放选项
     public static final String SP_CONTENT_VIDEO_OPTION = "content_video_option";
     // 首页/游戏详情页视频播放选项
@@ -248,17 +247,8 @@ public class Constants {
     public static final String SP_MY_GAME_GUIDE = "my_game_guide";
     //微信绑定配置信息
     public static final String SP_WECHAT_CONFIG = "wechat_config";
-
     //游戏库导航栏小红点提示
     public static final String SP_GAME_NAVIGATION = "game_navigation";
-    // V游戏空间是否被使用过
-    public static final String SP_IS_VSPACE_USED = "is_vspace_used";
-    //webview version code
-    public static final String SP_WEBVIEW_VERSION_CODE = "webview_version_code";
-    //webview abi
-    public static final String SP_WEBVIEW_ABI_LIST = "webview_abi_list";
-    // 展示社区交流身份认证开关
-    public static final String SP_CERTIFICATION_SWITCH = "certification_switch";
 
     //手机号码匹配规则
     public static final String REGEX_MOBILE = "^((13[0-9])|(15[^4,\\D])|(18[0,5-9]))\\d{8}$";
@@ -301,9 +291,6 @@ public class Constants {
     public static final String HELP_ADDRESS_DEV = "https://static-web.ghzs.com/ghzs_help_dev/help.html?content=";
     public static final String HELP_ADDRESS = "https://static-web.ghzs.com/ghzs_help/help.html?content=";
 
-    // 畅玩助手相关
-    public static final String SMOOTH_GAME_PRIVACY_POLICY_ADDRESS = "https://sdg-static.79887.com/misc/privacy_CW.html";
-
     // 注销页面
     public static final String LOGOUT_ADDRESS_DEV = "https://static-web.ghzs.com/ghzs_help_dev/help.html?content=5f6b1f02786564003944a693&from=ghzs";
     public static final String LOGOUT_ADDRESS = "https://static-web.ghzs.com/ghzs_help/help.html?content=5f534111b1f72909fc225672&from=ghzs";
@@ -369,8 +356,8 @@ public class Constants {
     public static final String WITHDRAW_INFO_ADDRESS = "https://static-web.ghzs.com/shop/index.html#/cash?from=ghzs";
 
     // 活动详情
-    public static final String ACTIVITY_DETAIL_ADDRESS_DEV = "https://static-web.ghzs.com/ghzs_activity_dev/common.html";
-    public static final String ACTIVITY_DETAIL_ADDRESS = "https://static-web.ghzs.com/ghzs_activity_prod/common.html";
+    public static final String ACTIVITY_DETAIL_ADDRESS_DEV = "https://static-web.ghzs.com/ghzs_activity_dev/common.html?from=ghzs";
+    public static final String ACTIVITY_DETAIL_ADDRESS = "https://static-web.ghzs.com/ghzs_activity_prod/common.html?from=ghzs";
 
     // 游戏单详情分享链接
     public static final String GAME_COLLECTION_SHARE_ADDRESS_DEV = "https://dev-and-static.ghzs.com/web/game_collection/index.html#/?from=ghzs";
@@ -426,9 +413,6 @@ public class Constants {
     // 工具箱历史记录（最多4个）
     public static final String TOOLBOX_HISTORY = "toolbox_history";
 
-    // 首页畅玩广场最近在玩的区域是否显示的 SP_KEY
-    public static final String SP_HOME_VGAME_AREA_ENABLED = "home_vgame_area_enabled";
-
     // 浏览器安装说明url
     public static final String SP_BROWSER_HINT_URL = "browser_hint_url";
     public static final String DEFAULT_OPPO_BROWSER_HINT_URL = "https://static-web.ghzs.com/ghzs_help/help.html?content=5fa90fe143d91a022e0d33ff";
@@ -437,18 +421,7 @@ public class Constants {
     public static final int FOLLOW_HINT_TRIGGER_HEIGHT = 10;
 
     // 深色模式
-    public static final String SP_DARK_MODE_ENABLED = "dark_mode_is_enabled";
+    public static final String SP_NIGHT_MODE = "night_mode";
     // 跟随系统模式
-    public static final String SP_FOLLOW_SYSTEM_DARK_MODE_ENABLED = "follow_system_dark_mode_enabled";
-
-    public static final String SP_TEST_FLAVOR_CHANNEL = "sp_test_flavor_channel";
-
-    // 登入标识
-    public static final String LOGIN_TAG = "login_tag";
-    // 登出标识
-    public static final String LOGOUT_TAG = "logout_tag";
-
-    public static final String GIT_LOG_MD5 = "git_log_md5";
-
-    public static final String SP_ADDONS_RECOMMEND_HAVE_READ = "addons_recommend_have_read";
+    public static final String SP_SYSTEM_MODE = "system_mode";
 }

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

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.constant;
+package com.gh.common.constant;
 
 /**
  * Created by LGT on 2016/10/16.
@@ -38,11 +38,6 @@ public class ItemViewType {
     public static final int COMMON_LINK_COLLECTION = 30; // 通用链接合集
     public static final int RANK_COLLECTION = 31; // 排行榜样式专题合集
     public static final int GAME_COLLECTION_ITEM = 32; // 游戏单
-    public static final int DOUBLE_CARD_COLUMN = 33; // 双列卡片专题
-    public static final int BIG_IMAGE_RECOMMEND = 34; // 大图推荐专题
-
-    public static final int COMMON_LINK_COLLECTION12 = 35; // 通用链接合集(1-2样式)
-    public static final int GAME_ITEM = 36;
 
     /**
      * 普通列表

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.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.base.OnViewClickListener
+import com.gh.common.util.dip2px
+import com.gh.common.util.toDrawable
+import com.gh.common.view.BugFixedPopupWindow
 import com.gh.gamecenter.R
 import com.gh.gamecenter.databinding.KaifuAddItemBinding
 import com.gh.gamecenter.databinding.LayoutAddKaifuPopupBinding
@@ -67,7 +67,7 @@ object AddKaiFuBindingAdapter {
                     binding.kaifuAddServerName.hint = "点击填写"
                 }
             }
-            binding.kaifuAddFirstName.addTextChangedListener(object : TextWatcher {
+            binding.kaifuAddFirstName.addTextChangedListener(object :TextWatcher{
                 override fun beforeTextChanged(
                     s: CharSequence?,
                     start: Int,
@@ -77,7 +77,7 @@ object AddKaiFuBindingAdapter {
                 }
 
                 override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                    if (!s.isNullOrEmpty()) {
+                    if (!s.isNullOrEmpty()){
                         popupWindow?.dismiss()
                     }
                 }
@@ -87,8 +87,8 @@ object AddKaiFuBindingAdapter {
 
             })
             if (i == list.size - 1) {
-                binding.kaifuAddTime.background = R.drawable.bg_add_kaifu_bottom_left.toDrawable(view.context)
-                binding.kaifuAddServerName.background = R.drawable.bg_add_kaifu_bottom_right.toDrawable(view.context)
+                binding.kaifuAddTime.background = R.drawable.bg_add_kaifu_bottom_left.toDrawable()
+                binding.kaifuAddServerName.background = R.drawable.bg_add_kaifu_bottom_right.toDrawable()
             }
         }
     }
@@ -104,14 +104,12 @@ object AddKaiFuBindingAdapter {
             val format = SimpleDateFormat(pattern, Locale.CHINA)
             view.setText(format.format(time * 1000))
             if (position == 0) {
-                view.append(
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) Html.fromHtml(
-                        String.format(
-                            "<font color='#2496FF'>%1\$s</font>",
-                            "&nbsp+"
-                        ), Html.FROM_HTML_MODE_LEGACY
-                    ) else Html.fromHtml(String.format("<font color='#2496FF'>%1\$s</font>", "&nbsp+"))
-                )
+                view.append(if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) Html.fromHtml(
+                    String.format(
+                        "<font color='#2496FF'>%1\$s</font>",
+                        "&nbsp+"
+                    ), Html.FROM_HTML_MODE_LEGACY
+                ) else Html.fromHtml(String.format("<font color='#2496FF'>%1\$s</font>", "&nbsp+")))
             }
         }
     }

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

@@ -19,65 +19,55 @@ import androidx.core.content.ContextCompat;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.facebook.drawee.view.SimpleDraweeView;
-import com.gh.common.chain.BrowserInstallHandler;
-import com.gh.common.chain.CertificationHandler;
-import com.gh.common.chain.ChainBuilder;
-import com.gh.common.chain.ChainHandler;
-import com.gh.common.chain.CheckDownloadHandler;
-import com.gh.common.chain.DownloadDialogHelperHandler;
-import com.gh.common.chain.GamePermissionHandler;
-import com.gh.common.chain.OverseaDownloadHandler;
-import com.gh.common.chain.PackageCheckHandler;
-import com.gh.common.chain.ValidateVSpaceHandler;
-import com.gh.common.chain.VersionNumberHandler;
+import com.gh.base.OnViewClickListener;
 import com.gh.common.constant.Config;
+import com.gh.common.dialog.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.DownloadButton;
+import com.gh.common.view.DownloadProgressBar;
+import com.gh.common.view.DrawableView;
 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.common.baselist.LoadStatus;
-import com.gh.gamecenter.common.callback.OnViewClickListener;
-import com.gh.gamecenter.common.utils.ExtensionsKt;
-import com.gh.gamecenter.common.utils.ImageUtils;
-import com.gh.gamecenter.common.utils.DarkModeUtils;
-import com.gh.gamecenter.common.view.DrawableView;
-import com.gh.gamecenter.core.utils.DisplayUtils;
-import com.gh.gamecenter.core.utils.MtaHelper;
-import com.gh.gamecenter.core.utils.NumberUtils;
+import com.gh.gamecenter.baselist.LoadStatus;
 import com.gh.gamecenter.databinding.KaifuDetailItemRowBinding;
 import com.gh.gamecenter.entity.ApkEntity;
 import com.gh.gamecenter.entity.GameEntity;
-import com.gh.gamecenter.common.entity.LinkEntity;
+import com.gh.gamecenter.entity.LinkEntity;
 import com.gh.gamecenter.entity.PluginLocation;
 import com.gh.gamecenter.entity.ServerCalendarEntity;
 import com.gh.gamecenter.entity.TagStyleEntity;
 import com.gh.gamecenter.entity.TestEntity;
-import com.gh.gamecenter.common.eventbus.EBReuse;
+import com.gh.gamecenter.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;
@@ -341,7 +331,7 @@ public class BindingAdapters {
     }
 
     // 大图下的进度条
-    public static void setDownloadButton(DownloadButton progressBar,
+    public static void setDownloadButton(DownloadProgressBar progressBar,
                                          GameEntity gameEntity,
                                          ExposureEvent traceEvent,
                                          @Nullable View.OnClickListener clickCallBack,
@@ -364,77 +354,62 @@ public class BindingAdapters {
         // 点击事件
         progressBar.setOnClickListener(v -> {
             if (clickCallBack != null) clickCallBack.onClick(v);
-            switch (progressBar.getButtonStyle()) {
+            switch (progressBar.getDownloadType()) {
                 case DOWNLOADING_PLUGIN:
                 case DOWNLOADING_NORMAL:
-                    if (gameEntity.isVGame()) {
-                        v.getContext().startActivity(VDownloadManagerActivity.getIntent(v.getContext(), true));
-                    } else {
-                        Intent intent = DownloadManagerActivity.getDownloadMangerIntent(v.getContext(),
-                                gameEntity.getApk().get(0).getUrl(), entrance);
-                        v.getContext().startActivity(intent);
-                    }
+                    Intent intent = DownloadManagerActivity.getDownloadMangerIntent(v.getContext(),
+                            gameEntity.getApk().get(0).getUrl(), entrance);
+                    v.getContext().startActivity(intent);
                     break;
                 case NONE:
                     Utils.toast(v.getContext(), "该游戏已关闭下载");
                     break;
                 case NORMAL:
                 case PLUGIN:
-                    final RegionSetting.GameH5Download gameH5Download = RegionSettingHelper.getGameH5DownloadByGameId(gameEntity.getId());
-                    if (gameH5Download != null) {
-                        DialogUtils.showGameH5DownloadDialog(v.getContext(), gameEntity, gameH5Download);
-                    } 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);
+                    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;
                             }
                         }
+                        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:
@@ -453,12 +428,7 @@ public class BindingAdapters {
                             }
                             return;
                         }
-
-                        if (gameEntity.isVGame()) {
-                            VHelper.installOrLaunch((AppCompatActivity) v.getContext(), gameEntity.getApk().get(0).getPackageName());
-                            return;
-                        }
-
+                        DataUtils.onGameLaunchEvent(v.getContext(), gameEntity.getName(), gameEntity.getApk().get(0).getPlatform(), location);
                         PackageUtils.launchApplicationByPackageName(v.getContext(), gameEntity.getApk().get(0).getPackageName());
                     } else {
                         DownloadDialog.showDownloadDialog(
@@ -472,25 +442,20 @@ public class BindingAdapters {
                 case INSTALL_PLUGIN:
                 case INSTALL_NORMAL:
                     if (gameEntity.getApk().size() == 1) {
-                        DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity);
-                        String packageName = gameEntity.getApk().get(0).getPackageName();
-
-                        if (gameEntity.isVGame()) {
-                            VHelper.installOrLaunch(v.getContext(), packageName);
-                            return;
-                        }
-
+                        DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshotByUrl(gameEntity.getApk().get(0).getUrl());
                         if (downloadEntity != null) {
                             PackageInstaller.install(v.getContext(), downloadEntity);
                         }
                     }
                     break;
                 case RESERVABLE:
-                    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);
+                    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);
+                                });
                             });
                         });
                     });
@@ -534,10 +499,10 @@ public class BindingAdapters {
         if (gameEntity.isReservable()) {
             if (!ReservationRepository.thisGameHasBeenReserved(gameEntity.getId())) {
                 progressBar.setText("预约");
-                progressBar.setButtonStyle(DownloadButton.ButtonStyle.RESERVABLE);
+                progressBar.setDownloadType(DownloadProgressBar.DownloadType.RESERVABLE);
             } else {
                 progressBar.setText("已预约");
-                progressBar.setButtonStyle(DownloadButton.ButtonStyle.RESERVED);
+                progressBar.setDownloadType(DownloadProgressBar.DownloadType.RESERVED);
             }
             return;
         }
@@ -552,17 +517,17 @@ public class BindingAdapters {
                 } else {
                     progressBar.setText("查看");
                 }
-                progressBar.setButtonStyle(DownloadButton.ButtonStyle.H5_GAME);
+                progressBar.setDownloadType(DownloadProgressBar.DownloadType.H5_GAME);
             } else {
                 if (offStatus != null && "dialog".equals(offStatus)) {
                     progressBar.setText("查看");
-                    progressBar.setButtonStyle(DownloadButton.ButtonStyle.NONE);
+                    progressBar.setDownloadType(DownloadProgressBar.DownloadType.NONE);
                 } else if ("updating".equals(offStatus)) {
                     progressBar.setText("更新中");
-                    progressBar.setButtonStyle(DownloadButton.ButtonStyle.UPDATING);
+                    progressBar.setDownloadType(DownloadProgressBar.DownloadType.UPDATING);
                 } else {
                     progressBar.setText("暂无");
-                    progressBar.setButtonStyle(DownloadButton.ButtonStyle.NONE);
+                    progressBar.setDownloadType(DownloadProgressBar.DownloadType.NONE);
                 }
             }
 
@@ -570,14 +535,14 @@ public class BindingAdapters {
             String status = GameUtils.getDownloadBtnText(progressBar.getContext(), gameEntity, PluginLocation.only_game);
             switch (status) {
                 case "插件化":
-                    progressBar.setButtonStyle(DownloadButton.ButtonStyle.PLUGIN);
+                    progressBar.setDownloadType(DownloadProgressBar.DownloadType.PLUGIN);
                     break;
                 case "打开":
                 case "启动":
-                    progressBar.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
+                    progressBar.setDownloadType(DownloadProgressBar.DownloadType.LAUNCH_OR_OPEN);
                     break;
                 default:
-                    progressBar.setButtonStyle(DownloadButton.ButtonStyle.NORMAL);
+                    progressBar.setDownloadType(DownloadProgressBar.DownloadType.NORMAL);
                     break;
             }
             progressBar.setText(status);
@@ -585,7 +550,7 @@ public class BindingAdapters {
 
         // 显示下载过程状态
         if (gameEntity.getApk().size() == 1) {
-            DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity);
+            DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshotByUrl(gameEntity.getApk().get(0).getUrl());
             if (downloadEntity != null) {
                 progressBar.setProgress((int) (downloadEntity.getPercent() * 10));
                 switch (downloadEntity.getStatus()) {
@@ -596,18 +561,18 @@ public class BindingAdapters {
                     case waiting:
                         progressBar.setText(R.string.downloading);
                         if (downloadEntity.isPluggable() && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
-                            progressBar.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_PLUGIN);
+                            progressBar.setDownloadType(DownloadProgressBar.DownloadType.DOWNLOADING_PLUGIN);
                         } else {
-                            progressBar.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
+                            progressBar.setDownloadType(DownloadProgressBar.DownloadType.DOWNLOADING_NORMAL);
                         }
                         break;
                     case done:
                         progressBar.setText(R.string.install);
                         if (downloadEntity.isPluggable()
                                 && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
-                            progressBar.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_PLUGIN);
+                            progressBar.setDownloadType(DownloadProgressBar.DownloadType.INSTALL_PLUGIN);
                         } else {
-                            progressBar.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
+                            progressBar.setDownloadType(DownloadProgressBar.DownloadType.INSTALL_NORMAL);
                         }
                         break;
                     case cancel:
@@ -616,7 +581,6 @@ public class BindingAdapters {
                     case uncertificated:
                     case unqualified:
                     case unavailable:
-                    case banned:
                         break;
                     default:
                         break;
@@ -629,9 +593,9 @@ public class BindingAdapters {
      * 当页面完全重建时，若存在重建的DialogFragment，则需要手动恢复该DialogFragment之前配置的回调(因为DialogFragment重建时只会从arguments中获取之前的配置内容，
      * 而arguments无法传递回调)，或者dismiss该DialogFragment
      */
-    private static void restoreDialogFragment(DownloadButton progressBar) {
+    private static void restoreDialogFragment(DownloadProgressBar progressBar) {
         GamePermissionDialogFragment gamePermissionDialogFragment =
-                ((GamePermissionDialogFragment) ((AppCompatActivity) progressBar.getContext()).getSupportFragmentManager().findFragmentByTag(GamePermissionDialogFragment.class.getName()));
+                ((GamePermissionDialogFragment) ((AppCompatActivity) progressBar.getContext()).getSupportFragmentManager().findFragmentByTag(GamePermissionDialogFragment.class.getSimpleName()));
         if (gamePermissionDialogFragment != null) {
             gamePermissionDialogFragment.dismissAllowingStateLoss();
         }
@@ -655,28 +619,28 @@ public class BindingAdapters {
     }*/
 
 
-    private static void updateReservation(DownloadButton progressBar, GameEntity gameEntity) {
+    private static void updateReservation(DownloadProgressBar progressBar, GameEntity gameEntity) {
         // 显示预约
         if (gameEntity.isReservable()) {
             if (!ReservationRepository.thisGameHasBeenReserved(gameEntity.getId())) {
                 progressBar.setText("预约");
-                progressBar.setButtonStyle(DownloadButton.ButtonStyle.RESERVABLE);
+                progressBar.setDownloadType(DownloadProgressBar.DownloadType.RESERVABLE);
             } else {
                 progressBar.setText("已预约");
-                progressBar.setButtonStyle(DownloadButton.ButtonStyle.RESERVED);
+                progressBar.setDownloadType(DownloadProgressBar.DownloadType.RESERVED);
             }
         }
     }
 
 
     // 开始下载
-    private static void download(DownloadButton progressBar,
+    private static void download(DownloadProgressBar progressBar,
                                  GameEntity gameEntity,
                                  ExposureEvent traceEvent,
                                  boolean isSubscribe,
                                  String entrance,
                                  String location) {
-        String str = progressBar.getText().toString();
+        String str = progressBar.getText();
         String method;
         if (str.contains("更新")) {
             method = "更新";
@@ -688,6 +652,8 @@ 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,
@@ -698,8 +664,8 @@ public class BindingAdapters {
                     traceEvent);
 
             progressBar.setProgress(0);
-            progressBar.setButtonStyle("插件化".equals(method) ?
-                    DownloadButton.ButtonStyle.DOWNLOADING_PLUGIN : DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
+            progressBar.setDownloadType("插件化".equals(method) ?
+                    DownloadProgressBar.DownloadType.DOWNLOADING_PLUGIN : DownloadProgressBar.DownloadType.DOWNLOADING_NORMAL);
         } else {
             Utils.toast(progressBar.getContext(), msg);
         }
@@ -730,16 +696,15 @@ 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("1AFFA142");
-                    typeTag.setColor(isDarkModeOn ? "EB9238" : "FFA142");
+                    typeTag.setBackground("FFF3E0");
+                    typeTag.setColor("FA8500");
                     tagStyle.add(typeTag);
 
                     TagStyleEntity timeTag = new TagStyleEntity();
                     timeTag.setName(GameViewUtils.getGameTestDate(test.getStart()));
-                    timeTag.setBackground("1A06CEA8");
-                    timeTag.setColor(isDarkModeOn ? "07A385" : "06CEA8");
+                    timeTag.setBackground("E0FFF9");
+                    timeTag.setColor("00A887");
                     tagStyle.add(timeTag);
                 }
             } else {
@@ -812,7 +777,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_50, 999F));
+            mVideoDuration.setBackground(DrawableView.getOvalDrawable(R.color.black_alpha_80, 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(EntranceConsts.KEY_PARENT_TAG) ?: ""
+            mParentTag = getString(EntranceUtils.KEY_PARENT_TAG) ?: ""
         }
     }
 
@@ -45,13 +45,7 @@ class ApplyModeratorDialogFragment : BaseDialogFragment() {
         val startText = "版主考核群："
         val text = "$startText$mGroupNumber\n感谢你对论坛建设的支持\n请加入版主考核群并联系群主进行版主资格考核"
         binding.desTv.text = SpanBuilder(text)
-            .click(
-                requireContext(),
-                startText.length,
-                startText.length + mGroupNumber.length,
-                R.color.theme_font,
-                true
-            ) {
+            .click(startText.length, startText.length + mGroupNumber.length, R.color.theme_font,true) {
                 DirectUtils.directToQqGroup(
                     requireContext(),
                     mGroupKey
@@ -89,11 +83,11 @@ class ApplyModeratorDialogFragment : BaseDialogFragment() {
                 arguments = Bundle().apply {
                     putString(KEY_GROUP_NUMBER, number)
                     putString(KEY_GROUP_KEY, key)
-                    putString(EntranceConsts.KEY_PARENT_TAG, tag)
+                    putString(EntranceUtils.KEY_PARENT_TAG, tag)
                 }
             }.show(
                 activity.supportFragmentManager,
-                ApplyModeratorDialogFragment::class.java.name
+                ApplyModeratorDialogFragment::class.java.simpleName
             )
         }
     }

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

@@ -1,11 +1,12 @@
-package com.gh.gamecenter.common.base.fragment
+package com.gh.common.dialog
 
 import android.annotation.SuppressLint
 import android.app.Dialog
 import android.os.Bundle
 import android.view.*
-import com.gh.gamecenter.common.HaloApp
-import com.gh.gamecenter.common.R
+import com.gh.base.fragment.BaseDialogFragment
+import com.gh.gamecenter.R
+import com.halo.assistant.HaloApp
 
 abstract class BaseDraggableDialogFragment : BaseDialogFragment(), View.OnTouchListener {
     private var mInitPositionY = 0f
@@ -47,9 +48,9 @@ abstract class BaseDraggableDialogFragment : BaseDialogFragment(), View.OnTouchL
                 val dialogY = mRootView.y
                 if (dialogY + offsetY > 0) {
                     mRootView.animate()
-                        .y(offsetY)
-                        .setDuration(0)
-                        .start()
+                            .y(offsetY)
+                            .setDuration(0)
+                            .start()
                 } else {
                     resetDialogPosition()
                 }
@@ -70,9 +71,9 @@ abstract class BaseDraggableDialogFragment : BaseDialogFragment(), View.OnTouchL
 
     private fun resetDialogPosition(duration: Long = 0) {
         mRootView.animate()
-            .y(0F)
-            .setDuration(duration)
-            .start()
+                .y(0F)
+                .setDuration(duration)
+                .start()
     }
 
     private class SingleTapConfirm : GestureDetector.SimpleOnGestureListener() {
@@ -83,7 +84,7 @@ abstract class BaseDraggableDialogFragment : BaseDialogFragment(), View.OnTouchL
 
     override fun onStart() {
         super.onStart()
-        val width = HaloApp.getInstance().resources.displayMetrics.widthPixels
+        val width = HaloApp.getInstance().application.resources.displayMetrics.widthPixels
         val height = dialog?.window?.attributes?.height ?: ViewGroup.LayoutParams.WRAP_CONTENT
         dialog?.window?.setLayout(width, height)
     }

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

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.base.fragment
+package com.gh.common.dialog
 
 import android.content.DialogInterface
 import android.os.Bundle
@@ -6,7 +6,7 @@ import android.view.KeyEvent
 import android.view.View
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.FragmentManager
-import com.gh.gamecenter.core.utils.MtaHelper
+import com.gh.common.util.MtaHelper
 import com.lightgame.dialog.BaseDialogFragment
 import java.util.concurrent.atomic.AtomicBoolean
 

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

@@ -14,31 +14,22 @@ import android.view.View
 import android.widget.CheckBox
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
-import com.gh.gamecenter.common.avoidcallback.AvoidOnResultManager
-import com.gh.gamecenter.common.avoidcallback.Callback
-import com.gh.gamecenter.common.constant.Constants
+import com.gh.common.avoidcallback.AvoidOnResultManager
+import com.gh.common.avoidcallback.Callback
+import com.gh.common.constant.Constants
 import com.gh.common.util.*
 import com.gh.gamecenter.R
 import com.gh.gamecenter.ShellActivity
-import com.gh.gamecenter.common.callback.ConfirmListener
-import com.gh.gamecenter.common.constant.EntranceConsts
-import com.gh.gamecenter.core.utils.GsonUtils
-import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.entity.AuthDialogEntity
 import com.gh.gamecenter.entity.AuthDialogLevel
 import com.gh.gamecenter.entity.GameEntity
-import com.gh.gamecenter.login.user.UserManager
+import com.gh.gamecenter.manager.UserManager
 import com.google.gson.reflect.TypeToken
 import com.halo.assistant.fragment.user.UserInfoEditFragment
 import com.lightgame.utils.AppManager
 
-class CertificationDialog(
-    context: Context,
-    private val authDialogEntity: AuthDialogEntity,
-    val gameId: String,
-    val listener: ConfirmListener
-) :
-    Dialog(context, R.style.GhAlertDialog) {
+class CertificationDialog(context: Context, private val authDialogEntity: AuthDialogEntity, val gameId: String, val listener: DialogUtils.ConfirmListener) :
+        Dialog(context, R.style.GhAlertDialog) {
 
     private lateinit var view: View
     private lateinit var detailedDesTv: TextView
@@ -124,10 +115,8 @@ class CertificationDialog(
     private fun gotoLoginPage() {
         val currentActivity = AppManager.getInstance().currentActivity() ?: return
 
-        CheckLoginUtils.checkLogin(
-            currentActivity as AppCompatActivity,
-            null, true, "实名认证弹窗"
-        ) {
+        CheckLoginUtils.checkLogin(currentActivity as AppCompatActivity,
+                null, true, "实名认证弹窗") {
             if (UserManager.getInstance().isAuth) {
                 listener.onConfirm()
                 dismiss()
@@ -145,7 +134,7 @@ class CertificationDialog(
                     context,
                     ShellActivity.Type.REAL_NAME_INFO,
                 ).apply {
-                    putExtra(EntranceConsts.KEY_GAME_ID, gameId)
+                    putExtra(EntranceUtils.KEY_GAME_ID, gameId)
                 }, object : Callback {
                     override fun onActivityResult(resultCode: Int, data: Intent?) {
                         if (resultCode == Activity.RESULT_OK && data != null) {
@@ -163,7 +152,7 @@ class CertificationDialog(
 
     companion object {
         @JvmStatic
-        fun showCertificationDialog(context: Context, game: GameEntity, listener: ConfirmListener) {
+        fun showCertificationDialog(context: Context, game: GameEntity, listener: DialogUtils.ConfirmListener) {
             //1.先判断是否登录 是执行2 否执行3
             //2.判断是否实名认证 是终止 否执行3
             //3.判断是否需要弹出认证弹窗接口
@@ -179,7 +168,7 @@ class CertificationDialog(
         }
 
         @SuppressLint("CheckResult")
-        private fun authDialog(context: Context, game: GameEntity, listener: ConfirmListener) {
+        private fun authDialog(context: Context, game: GameEntity, listener: DialogUtils.ConfirmListener) {
             var authDialog: AuthDialogEntity? = null
             if (game.authDialog != null) {
                 authDialog = game.authDialog

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

@@ -8,6 +8,7 @@ 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
@@ -18,14 +19,10 @@ import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
 import com.facebook.drawee.view.SimpleDraweeView
-import com.gh.gamecenter.common.constant.Constants
+import com.gh.common.constant.Constants
+import com.gh.common.util.*
 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
@@ -40,8 +37,7 @@ import java.lang.ref.WeakReference
 /**
  * 设备提醒弹窗
  */
-class DeviceRemindDialog(context: Context, val entity: DeviceDialogEntity, val gameEntity: GameEntity) :
-    Dialog(context, R.style.GhAlertDialog) {
+class DeviceRemindDialog(context: Context, val entity: DeviceDialogEntity, val gameEntity: GameEntity) : Dialog(context, R.style.GhAlertDialog) {
     private val mBinding: DialogDeviceRemindBinding by lazy { DialogDeviceRemindBinding.inflate(layoutInflater) }
     private var currentPage = 0
     private var mSlideLooperInterval = 3000L
@@ -53,7 +49,8 @@ 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 autoInstall = SPUtils.getBoolean(AUTO_INSTALL_SP_KEY, true)
+                val sp = PreferenceManager.getDefaultSharedPreferences(getContext())
+                val autoInstall = sp.getBoolean(AUTO_INSTALL_SP_KEY, true)
                 if (autoInstall) {
                     dismiss()
                 }
@@ -79,8 +76,7 @@ class DeviceRemindDialog(context: Context, val entity: DeviceDialogEntity, val g
                 val type = object : TypeToken<List<DeviceDialogEntity>>() {}.type
                 val entities = GsonUtils.gson.fromJson<List<DeviceDialogEntity>>(datas, type)
                 //1.判断设备是否匹配
-                val entity =
-                    entities.find { it.manufacturer.toLowerCase().startsWith(Build.MANUFACTURER.toLowerCase()) }
+                val entity = entities.find { it.manufacturer.toLowerCase().startsWith(Build.MANUFACTURER.toLowerCase()) }
                         ?: return Pair(false, null)
                 //2.判断游戏不含剔除标签
                 gameEntity.tagStyle.forEach {
@@ -191,9 +187,7 @@ class DeviceRemindDialog(context: Context, val entity: DeviceDialogEntity, val g
 
     inner class BannerAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
         override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-            return object : RecyclerView.ViewHolder(
-                LayoutInflater.from(context).inflate(R.layout.item_device_remind_banner, parent, false)
-            ) {}
+            return object : RecyclerView.ViewHolder(LayoutInflater.from(context).inflate(R.layout.item_device_remind_banner, parent, false)) {}
         }
 
         override fun getItemCount(): Int = if (mDatas.size == 1) mDatas.size else Int.MAX_VALUE

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

@@ -10,16 +10,18 @@ import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.core.text.HtmlCompat
-import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
+import com.gh.base.fragment.BaseDialogFragment
 import com.gh.common.util.DirectUtils
-import com.gh.gamecenter.common.utils.dip2px
-import com.gh.gamecenter.common.utils.toColor
+import com.gh.common.util.dip2px
+import com.gh.common.util.toColor
 import com.gh.gamecenter.R
 import com.gh.gamecenter.databinding.DialogGameOffServiceBinding
 import com.gh.gamecenter.entity.GameEntity
 
 // 游戏关闭下载弹窗
-class GameOffServiceDialogFragment : BaseDialogFragment() {
+class GameOffServiceDialogFragment
+//    : BaseTrackableDialogFragment()
+    : BaseDialogFragment() {
 
     private var mDialog: GameEntity.Dialog? = null
     private var mBinding: DialogGameOffServiceBinding? = null
@@ -31,9 +33,9 @@ class GameOffServiceDialogFragment : BaseDialogFragment() {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return DialogGameOffServiceBinding
-            .inflate(inflater)
-            .apply { mBinding = this }
-            .root
+                .inflate(inflater)
+                .apply { mBinding = this }
+                .root
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -52,19 +54,16 @@ class GameOffServiceDialogFragment : BaseDialogFragment() {
 
                 notEmptySite.forEachIndexed { index, site ->
                     val siteTv = TextView(context)
-                    siteTv.layoutParams = LinearLayout.LayoutParams(
-                        ViewGroup.LayoutParams.WRAP_CONTENT,
-                        ViewGroup.LayoutParams.WRAP_CONTENT
-                    ).apply {
+                    siteTv.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply {
                         topMargin = 24F.dip2px()
                         if (index == notEmptySite.size - 1) bottomMargin = 8F.dip2px()
                     }
                     siteTv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14F)
-                    siteTv.setTextColor(R.color.theme_font.toColor(requireContext()))
+                    siteTv.setTextColor(R.color.theme_font.toColor())
                     siteTv.text = site.text
                     siteTv.paintFlags = siteTv.paintFlags or Paint.UNDERLINE_TEXT_FLAG
                     siteTv.setOnClickListener {
-                        //                    MtaHelper.onEvent("游戏下载状态按钮", getKey(), site.text)
+    //                    MtaHelper.onEvent("游戏下载状态按钮", getKey(), site.text)
                         DirectUtils.directToWebView(requireContext(), site.url, "(关闭下载弹窗)")
                         dismissAllowingStateLoss()
                     }
@@ -79,6 +78,14 @@ class GameOffServiceDialogFragment : BaseDialogFragment() {
         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,20 +13,16 @@ 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 : BaseDialogFragment() {
+class InstallPermissionDialogFragment : BaseTrackableDialogFragment() {
 
     lateinit var mView: View
     var isXapk = false
@@ -59,15 +55,18 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
         }
 
         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)
@@ -88,13 +87,13 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
         }
     }
 
+    override fun getEvent(): String = "安装引导弹窗"
+
+    override fun getKey(): String = "引导弹窗"
+
     companion object {
         @JvmStatic
-        fun show(
-            activity: AppCompatActivity,
-            downloadEntity: DownloadEntity,
-            callBack: ((isFromPermissionGrantedCallback: Boolean) -> Unit)?
-        ) {
+        fun show(activity: AppCompatActivity, downloadEntity: DownloadEntity, callBack: ((isFromPermissionGrantedCallback: Boolean) -> Unit)?) {
             val isXapk = XapkInstaller.XAPK_EXTENSION_NAME == downloadEntity.path.getExtension()
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
                 callBack?.invoke(false)
@@ -118,8 +117,7 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
                     return
                 }
             }
-            var installPermissionDialogFragment =
-                activity.supportFragmentManager.findFragmentByTag(InstallPermissionDialogFragment::class.java.name) as? InstallPermissionDialogFragment
+            var installPermissionDialogFragment = activity.supportFragmentManager.findFragmentByTag(InstallPermissionDialogFragment::class.java.simpleName) as? InstallPermissionDialogFragment
             if (installPermissionDialogFragment != null) {
                 installPermissionDialogFragment.mCallBack = callBack
                 installPermissionDialogFragment.isXapk = isXapk
@@ -133,10 +131,7 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
                     this.isXapk = isXapk
                     this.url = downloadEntity.url
                 }
-                installPermissionDialogFragment.show(
-                    activity.supportFragmentManager,
-                    InstallPermissionDialogFragment::class.java.name
-                )
+                installPermissionDialogFragment.show(activity.supportFragmentManager, InstallPermissionDialogFragment::class.java.simpleName)
             }
         }
     }