diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index 4b78c46ace..4205fa5207 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -94,6 +94,8 @@ import com.mogo.utils.logger.Logger; import com.mogo.utils.storage.SharedPrefsMgr; import com.zhidao.manager.ts.TsThreshold; +import org.w3c.dom.Text; + import java.util.HashMap; import java.util.Locale; import java.util.Map; @@ -242,6 +244,7 @@ public class EntranceFragment extends MvpFragment { - Log.d(TAG,"长按显示状态工具栏"); + Log.d(TAG, "长按显示状态工具栏"); Intent intent = new Intent(); intent.putExtra("oper", 52); MogoApisHandler.getInstance().getApis().getIntentManagerApi().invoke(MogoReceiver.ACTION_MOCK, intent); @@ -395,6 +398,15 @@ public class EntranceFragment extends MvpFragment + + + //填充 + + //描边 + + + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml index 611d65ddbd..ed1e1f4e1e 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml @@ -70,19 +70,19 @@ android:id="@+id/module_switch_model_icon" android:layout_width="@dimen/module_switch_image" android:layout_height="@dimen/module_switch_image" - android:paddingLeft="@dimen/module_switch_margin_left" android:layout_gravity="left|center_vertical" + android:paddingLeft="@dimen/module_switch_margin_left" android:src="@drawable/module_switch_map_angle" /> + android:textColor="@color/module_ext_color_voice_text" + android:textSize="@dimen/module_switch_text_size" /> @@ -319,6 +319,21 @@ android:textStyle="bold" /> + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index 3964eb5b2c..342fbb514a 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -82,8 +82,6 @@ public class MainActivity extends MvpActivity implement protected ImageView mWarningRight; protected ImageView mWarningBottom; - protected Button mBtnJumpCheckPage; - protected ConstraintLayout clSpecialEffect; private boolean isFirst = false; @@ -131,16 +129,6 @@ public class MainActivity extends MvpActivity implement mWarningRight = findViewById(R.id.warning_right); mWarningBottom = findViewById(R.id.warning_bottom); - // TODO 临时入口 - mBtnJumpCheckPage = findViewById(R.id.btnJumpCheckPage); - mBtnJumpCheckPage.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - // 启动检测页面 - MogoApisHandler.getInstance().getApis().getCheckProvider().startCheckActivity(getContext()); - } - }); - clSpecialEffect = findViewById(R.id.cl_special_effect); // 避免事件穿透导致地图被滑动 diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml index c4355369fb..0c83ef1c77 100644 --- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml +++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml @@ -147,13 +147,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - -