UI 问题

modules/mogo-module-main/src/main/res/values/styles.xml

@@ -10,6 +10,8 @@
         <item name="android:windowBackground">@color/module_main_window_background_color</item>
         <item name="android:windowTranslucentNavigation">false</item>
         <item name="android:windowAnimationStyle">@style/MainAnimation</item>
+        <item name="checkboxStyle">@style/noCheckboxStyle</item>
+        <item name="radioButtonStyle">@style/noCheckboxStyle</item>
     </style>
 
     <style name="MainAnimation">
@@ -26,4 +28,16 @@
         <item name="android:taskToBackEnterAnimation">@null</item>
         <item name="android:taskToBackExitAnimation">@null</item>
     </style>
+
+    <style name="noCheckboxStyle" parent="Widget.AppCompat.CompoundButton.CheckBox">
+        <item name="buttonCompat">@null</item>
+        <item name="android:background">@null</item>
+    </style>
+
+    <style name="noRadioButtonStyle" parent="Widget.AppCompat.CompoundButton.RadioButton">
+        <item name="buttonCompat">@null</item>
+        <item name="android:background">@null</item>
+    </style>
+
+
 </resources>

modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/CategorySearchFragment.kt

@@ -18,10 +18,10 @@ import com.mogo.module.navi.ui.adapter.SearchCategoryAdapter
 import com.mogo.module.navi.ui.base.BaseFragment
 import com.mogo.module.navi.uitls.BitmapUtils
 import kotlinx.android.synthetic.main.fragment_search_category.cv_search_result
+import kotlinx.android.synthetic.main.fragment_search_category.et_navi_search
+import kotlinx.android.synthetic.main.fragment_search_category.iv_navi_back
 import kotlinx.android.synthetic.main.fragment_search_category.rv_search_result
 import kotlinx.android.synthetic.main.fragment_search_category.tv_navi_navi
-import kotlinx.android.synthetic.main.include_search_bar.et_navi_search
-import kotlinx.android.synthetic.main.include_search_bar.iv_navi_back
 
 /**
  * @author zyz
@@ -134,7 +134,7 @@ class CategorySearchFragment : BaseFragment(), CategoryView {
       BitmapUtils.createWaterMask(
           context, decodeResource, (index+1).toString(), R.color.white, 18
       )
-    return createWaterMask
+    return decodeResource
   }
 
   override fun onActivityCreated(savedInstanceState: Bundle?) {

modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt

@@ -15,6 +15,7 @@ import com.mogo.map.navi.MogoNaviInfo
 import com.mogo.map.navi.MogoTraffic
 import com.mogo.map.search.inputtips.MogoTip
 import com.mogo.module.common.MogoModulePaths
+import com.mogo.module.navi.BuildConfig
 import com.mogo.module.navi.R
 import com.mogo.module.navi.constants.AMapConstants
 import com.mogo.module.navi.constants.SearchServiceHolder
@@ -123,15 +124,6 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB
         MogoModulePaths.PATH_FRAGMENT_CHOOSE_PAHT, true
     )
 
-    AIAssist.getInstance(context)
-        .registerUnWakeupCommand("firstPath", arrayOf<String>(firstPath), this)
-    AIAssist.getInstance(context)
-        .registerUnWakeupCommand("secondPath", arrayOf<String>(secondPath), this)
-    AIAssist.getInstance(context)
-        .registerUnWakeupCommand("thirdPath", arrayOf<String>(thirdPath), this)
-    AIAssist.getInstance(context)
-        .registerUnWakeupCommand("startNavi", arrayOf<String>(startNavi), this)
-
   }
 
   // 是否开启导航
@@ -182,11 +174,24 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB
 
     SearchServiceHolder.getMarkerManger()
         .removeMarkers()
+
+
+
+    AIAssist.getInstance(context)
+        .registerUnWakeupCommand("firstPath", arrayOf<String>(firstPath), this)
+    AIAssist.getInstance(context)
+        .registerUnWakeupCommand("secondPath", arrayOf<String>(secondPath), this)
+    AIAssist.getInstance(context)
+        .registerUnWakeupCommand("thirdPath", arrayOf<String>(thirdPath), this)
+    AIAssist.getInstance(context)
+        .registerUnWakeupCommand("startNavi", arrayOf<String>(startNavi), this)
+
+
   }
 
   private fun startNavi() {
     SearchServiceHolder.getNavi()
-        .startNavi(false)
+        .startNavi(!BuildConfig.DEBUG)
     SearchServiceHolder.getMapUIController()
         .recoverLockMode()
     isStartedNavi = true

modules/mogo-module-search/src/main/java/com/mogo/module/navi/uitls/BitmapUtils.java

@@ -22,19 +22,27 @@ public class BitmapUtils {
         //创建一个bitmap
         Rect bounds = new Rect();
         paint.getTextBounds(text, 0, text.length(), bounds);
-        // 创建一个新的和SRC长度宽度一样的位图
-        Bitmap newb = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-        //将该图片作为画布
-        Canvas canvas = new Canvas(newb);
-        //在画布 0，0坐标上开始绘制原始图片
-        canvas.drawBitmap(src, 0, 0, null);
+        //// 创建一个新的和SRC长度宽度一样的位图
+        //Bitmap newb = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        ////将该图片作为画布
+        //Canvas canvas = new Canvas(newb);
+        ////在画布 0，0坐标上开始绘制原始图片
+        //canvas.drawBitmap(src, 0, 0, null);
         //        绘制文字
+
+
+
+        Bitmap ret = src.copy(src.getConfig(), true);
+        //Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        Canvas canvas = new Canvas(ret);
+
+
+
         canvas.drawText(text, (width-bounds.width())/2.0F, (float) ( bounds.height()*1.8), paint);
         // 保存
-        canvas.save();
+        //canvas.save();
         // 存储
-        canvas.restore();
-        return newb;
+        return ret;
     }
 
     public static int dp2px(Context context, float dp) {

modules/mogo-module-search/src/main/res/layout/fragment_search_category.xml

@@ -13,6 +13,7 @@
   <androidx.cardview.widget.CardView
       android:id="@+id/cv_search_result"
       android:layout_width="@dimen/module_search_dp_838"
+      app:cardPreventCornerOverlap="false"
       android:layout_height="0dp"
       app:layout_constraintBottom_toBottomOf="parent"
       android:layout_marginTop="@dimen/dp_32"
@@ -29,7 +30,6 @@
         />
 
 
-
     <View
         android:layout_width="match_parent"
         android:layout_gravity="bottom"
@@ -56,6 +56,46 @@
         />
   </androidx.cardview.widget.CardView>
 
-  <include layout="@layout/include_search_bar" />
+  <LinearLayout
+      xmlns:tools="http://schemas.android.com/tools"
+      android:id="@+id/ll_navi_search"
+      android:layout_width="@dimen/module_search_dp_838"
+      android:layout_height="@dimen/moudle_search_et_hight"
+      android:background="@drawable/shape_round_gray"
+      android:gravity="center_vertical"
+      android:orientation="horizontal"
+      app:layout_constraintLeft_toLeftOf="parent"
+      app:layout_constraintTop_toTopOf="parent"
+      tools:showIn="@layout/fragment_search"
+      >
+    <ImageView
+        android:layout_width="@dimen/moudle_search_iv_back_hight"
+        android:id="@+id/iv_navi_back"
+        android:layout_height="@dimen/moudle_search_iv_back_hight"
+        android:layout_marginLeft="@dimen/moudle_search_iv_back_margin_left"
+        android:layout_marginRight="@dimen/moudle_search_iv_back_margin_right"
+        android:src="@mipmap/icon_back"
+        />
+    <EditText
+        android:layout_width="0dp"
+        android:singleLine="true"
+        android:layout_marginRight="@dimen/module_search_btn_width"
+        android:id="@+id/et_navi_search"
+        android:background="@null"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:ellipsize="end"
+
+        android:textSize="@dimen/module_search_et_text_size"
+        android:imeOptions="actionDone"
+        android:hint="@string/hint_map_search"
+        android:textColor="@color/white"
+        android:textColorHint="@color/white_60"
+        />
+
+
+  </LinearLayout>
+
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>

modules/mogo-module-search/src/main/res/values/styles.xml

@@ -29,7 +29,7 @@
   <style name="rb_setting">
 
     <item name="android:layout_width">@dimen/module_search_180dp</item>
-    <item name="android:button">@null</item>
+    <item name="android:button">@color/translate</item>
     <item name="android:gravity">center</item>
     <item name="android:textSize">@dimen/sp_40</item>
     <item name="android:textColor">@color/selector_white_gray</item>