Bläddra i källkod

Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

Bitliker 9 år sedan
förälder
incheckning
5177d0fdd3

+ 1 - 1
WeiChat/src/main/AndroidManifest.xml

@@ -805,7 +805,7 @@
                 <action android:name="uu.step.destory" />
             </intent-filter>
         </receiver>
-
+        <activity android:name=".ui.me.SpeechrecognitionActivity"></activity>
         <activity android:name=".ui.erp.activity.oa.ErpActivity" />
         <activity android:name=".ui.erp.activity.oa.SelectAimActivity"
             android:label="@string/activity_select_aims"/>

+ 12 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/SettingActivity.java

@@ -144,7 +144,6 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
          boolean sbb = isServiceRunning(uustep_service_name);
         if (isServiceRunning(uustep_service_name)&&(isStep == -1 || isStep == 1)){
             uu_step_reply.setChecked(true);
-            speech_recognition_rl.setVisibility(View.VISIBLE);
         }else {
             speech_recognition_rl.setVisibility(View.GONE);
             uu_step_reply.setChecked(false);
@@ -171,13 +170,23 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
             @Override
             public void onClick(View v) {
                 int last_isStep = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.UU_STEP);
-                if (isServiceRunning(uustep_service_name) && last_isStep == 1){
+                if (isServiceRunning(uustep_service_name) && last_isStep == 1) {
                     startActivity(new Intent(mContext, MyPedometerActivity.class));
-                }else {
+                } else {
                     Toast.makeText(mContext, "尚未开启UU运动,或已预关闭", Toast.LENGTH_SHORT).show();
                 }
             }
         });
+        uu_step_rl.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                if (isServiceRunning(uustep_service_name) && PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.UU_STEP) == 1){
+                    speech_recognition_rl.setVisibility(View.VISIBLE);
+                }
+                return true;
+            }
+        });
+
 
         speech_recognition_rl.setOnClickListener(this);
     }

+ 2 - 1
WeiChat/src/main/res/layout/activity_setting.xml

@@ -55,7 +55,8 @@
             <RelativeLayout
                 android:id="@+id/speech_recognition_rl"
                 style="@style/IMTbleLine"
-                android:background="@drawable/selector_me_menu_item_bg">
+                android:background="@drawable/selector_me_menu_item_bg"
+                android:visibility="gone">
 
                 <TextView
                     android:layout_width="wrap_content"